From f7847d1167991514f89f9ffcc219749a38282b7e Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Fri, 16 Sep 2022 10:03:39 +0800
Subject: [PATCH 001/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js           |  9 ++++++++-
 pages/index/index.wxml         | 14 ++++++++++++--
 pages/list/comments/index.js   | 29 ++++++++++++++++++++++++-----
 pages/list/comments/index.wxml |  3 ++-
 pages/list/comments/index.wxss | 11 ++++++++++-
 5 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 99a187c..6a0d026 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -461,7 +461,6 @@ Page({
   bannerClick: function (e) {
     if (this.data.isTest) return;
     let item = e.currentTarget.dataset.item;
-    console.log(item)
     this.pagePoint({
       event: "banner_click",
       type: 'banner'
@@ -543,6 +542,14 @@ Page({
     return;
 
   },
+  //博物馆跳转  直接跳君到苏州H5
+  goH5:function(e){
+    console.log(e.currentTarget.dataset.path);
+    app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+    wx.navigateTo({
+      url: "/pages/pbService/web/index"
+    })
+  },
   bannerClick2: function (e) {
     let item = e.currentTarget.dataset.item;
     if (item.action == 'href') {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 963ea03..ed4f960 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -159,15 +159,25 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb2.png" mode="widthFix"></image>
         <view>非遗传承</view>
       </view>
-      <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+      <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
         data-path="/pages/pbService/wwcx/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
         <view>文物查询</view>
+      </view> -->
+      <view bindtap="goH5"  data-title="文化场馆查询"
+        data-path="Museum" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
+        <view>文化场馆查询</view>
       </view>
-      <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+      <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
         data-path="/pages/pbService/museum/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
         <view>博物馆查询</view>
+      </view> -->
+      <view bindtap="goH5" data-title="数字博物馆"
+        data-path="BwsInfo" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
+        <view>数字博物馆</view>
       </view>
       <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
diff --git a/pages/list/comments/index.js b/pages/list/comments/index.js
index 9a8cced..830b9a7 100644
--- a/pages/list/comments/index.js
+++ b/pages/list/comments/index.js
@@ -23,7 +23,6 @@ Page({
       })
     }
     else if(options.sceneid){
-      console.log(options.index);
       this.setData({
         sceneid:options.sceneid,
         index:options.index,
@@ -42,8 +41,7 @@ Page({
     if(this.data.sceneid){
       service = "scene/get_comment"
     }
-    commonApi._post(service,data).then(res=>{
-      console.log(res)
+    commonApi.user_post(service,data).then(res=>{
       // this.setData({
       //   total:res.data.total,
       //   list:list.concat(res.data.list)
@@ -72,16 +70,37 @@ Page({
     })
   },
   imgsc:function(e){
-    console.log(e);
     var src = e.currentTarget.dataset.img;//获取data-src
     var imgList = e.currentTarget.dataset.list;//获取data-list
-    console.log(src)
     //图片预览
     wx.previewImage({
       current: src, // 当前显示图片的http链接
       urls: imgList // 需要预览的图片http链接列表
     })
   },
+  zan:function(e){
+      let item =  e.currentTarget.dataset.item;//获取data-src
+      let index =  e.currentTarget.dataset.index;//获取data-src
+      let arr = this.data.list
+
+      let url = "scene/comment_star"; //点
+      if (item.is_star == 1) {
+        url = "scene/comment_cancel_star"; //取消
+      }
+      commonApi.user_post(url,{comment_id: item.id}).then(res=>{
+        if (res) {
+          if (item.is_star == 1) {
+            arr[index].is_star = 0
+          }else{
+            arr[index].is_star = 1
+          }
+          this.setData({
+            list:arr
+          })
+        }
+      })
+      
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/list/comments/index.wxml b/pages/list/comments/index.wxml
index 2df031d..198a412 100644
--- a/pages/list/comments/index.wxml
+++ b/pages/list/comments/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/list/comments/index.wxml-->
 <title title="评论"></title>
 <view class="comment-title">全部评论</view>
-<view class="comment-item" wx:for="{{list}}">
+<view class="comment-item" wx:for="{{list}}" wx:for-index="index">
   <view class="comment-top">
     <image src="{{item.user.avatar}}" mode="aspectFill"></image>
     <view class="author-info">
@@ -19,6 +19,7 @@
   <view wx:if="{{item.img_list}}">
     <image class="imgs" wx:for="{{item.img_list}}" wx:for-item="Goods" mode="scaleToFill" data-img="{{Goods}}" data-list="{{item.img_list}}"  src="{{Goods}}" bindtap="imgsc"></image>
   </view>
+<view bindtap="zan" data-item="{{item}}"  data-index="{{index}}" class="iconfont icon-zan{{item.is_star==1?' active':''}}"></view>
 
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
diff --git a/pages/list/comments/index.wxss b/pages/list/comments/index.wxss
index 5300d8a..547f352 100644
--- a/pages/list/comments/index.wxss
+++ b/pages/list/comments/index.wxss
@@ -9,9 +9,10 @@
 }
 .comment-item {
   margin: 0 25rpx;
-  padding: 30rpx 0;
+  padding: 30rpx 0 40rpx 0;
   margin-top: 10rpx;
   border-bottom: 1rpx solid #d9d9d9;
+
 }
 .comment-top {
   display: flex;
@@ -71,4 +72,12 @@
   color: #666;
   margin-left:20rpx ;
   font-size: 24rpx;
+}
+.iconfont.icon-zan{
+  float: right;
+  font-size: 46rpx;
+  color: #999999;
+}
+.icon-zan.active {
+  color: red;
 }
\ No newline at end of file

From 27663c1a7fa6ebc14f0dbb531c682371bfca9212 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 16 Sep 2022 12:00:11 +0800
Subject: [PATCH 002/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 8cf9030..f259ff8 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.isTest36?true:false;
+      data.isTest = data.isTest38?true:false;
       this.globalData.configJson = data
     })
     

From 6f2595556c583c6edc0ef0c4a2b45cba23c7feff Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Sat, 17 Sep 2022 16:35:50 +0800
Subject: [PATCH 003/471] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=A2=E4=BD=93=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml |  4 ++--
 pages/user/user.js     | 16 ++++++++++++++++
 pages/user/user.wxml   |  7 +++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ed4f960..ca7f05b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -189,11 +189,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
         <view>文旅单位</view>
       </view>
-      <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+      <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
         <view>团体预约</view>
-      </view>
+      </view> -->
       <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
diff --git a/pages/user/user.js b/pages/user/user.js
index f61e938..e29318d 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -77,6 +77,22 @@ Page({
   pagePoint: function(e){
     util.pagePoint(e)
   },
+  phoneCall:function(){
+      wx.showModal({
+        cancelColor: 'cancelColor',
+        title:'呼叫人工客服',
+        content:'0512-66555111',
+        success:function(res){
+            if (res.cancel) {
+              return
+            }else{
+              wx.makePhoneCall({
+                phoneNumber:'0512-66555111',
+              })
+            }
+        }
+      })
+  },
 
   /**
    * 生命周期函数--监听页面隐藏
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 3e3cabb..942e837 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -55,9 +55,12 @@
     <!-- <navigator url="videoCoupon/index" class="user-box-line">
     中奖纪录
     </navigator> -->
-    <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
+    <!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
       在线客服
-    </navigator>
+    </navigator> -->
+    <view class="user-box-line" bindtap="phoneCall">
+      呼叫人工客服
+    </view>
     <navigator url="coupon/index" class="user-box-line" catchtap="pagePoint" data-event="mine_card">
       我的卡券
     </navigator>

From d1f36bac6a903828e9d3101d59ed92f0554c78ed Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 19 Sep 2022 17:13:48 +0800
Subject: [PATCH 004/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index f259ff8..cb6df27 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.isTest38?true:false;
+      data.isTest = data.isTest39?true:false;
       this.globalData.configJson = data
     })
     

From 7ff2e64d28edaa1bd34bf6031b87de02b100f142 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Tue, 20 Sep 2022 11:07:55 +0800
Subject: [PATCH 005/471] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dios=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/user.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/user/user.js b/pages/user/user.js
index e29318d..bd63679 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -79,7 +79,6 @@ Page({
   },
   phoneCall:function(){
       wx.showModal({
-        cancelColor: 'cancelColor',
         title:'呼叫人工客服',
         content:'0512-66555111',
         success:function(res){

From 8914bd9ba18eab48987bafa6eb614319930b210b Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Tue, 27 Sep 2022 10:52:45 +0800
Subject: [PATCH 006/471] =?UTF-8?q?=E5=B9=BF=E5=91=8A,=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js | 22 +++++++++++++++-------
 pages/user/user.js   |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 6a0d026..0f20cc1 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -327,9 +327,17 @@ Page({
   gotoPath: function (e) {
     console.log(e)
     if (e.currentTarget.dataset.event) {
-      this.pagePoint({
-        event: e.currentTarget.dataset.event
-      }, 1)
+      if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
+        wx.navigateToMiniProgram({
+          appId: 'wxd323e63a10aa6865',
+          path: 'pages/home/index'
+        })
+        return
+      }else{
+        this.pagePoint({
+          event: e.currentTarget.dataset.event
+        }, 1)
+      }
     }
     if (e.currentTarget.dataset.title == '书香借阅') {
       wx.navigateToMiniProgram({
@@ -479,7 +487,7 @@ Page({
         }
         break;
       case 3:
-        if ((item.tdata.indexOf('http://') != -1 || item.tdata.indexOf('https://') != -1) && item.tdata.indexOf('m.cloud.sz-trip.com') == -1) {
+        if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
           // 外部h5
           console.log(item.tdata)
           app.globalData.weburl = item.tdata;
@@ -487,7 +495,7 @@ Page({
             url: "/pages/pbService/web/index"
           })
         } else {
-          let page = item.tdata.split("/");
+          let page = item.tdata.url.split("/");
           page = page[page.length - 1].split("?")
           console.log(page[0])
           let url = this.data.urltopage[page[0]];
@@ -644,7 +652,7 @@ Page({
         }
         break;
       case 3:
-        if ((item.tdata.indexOf('http://') != -1 || item.tdata.indexOf('https://') != -1) && item.tdata.indexOf('m.cloud.sz-trip.com') == -1) {
+        if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
           // 外部h5
           console.log(item.tdata)
           app.globalData.weburl = item.tdata;
@@ -652,7 +660,7 @@ Page({
             url: "/pages/pbService/web/index"
           })
         } else {
-          let page = item.tdata.split("/");
+          let page = item.tdata.url.split("/");
           page = page[page.length - 1].split("?")
           console.log(page[0])
           let url = this.data.urltopage[page[0]];
diff --git a/pages/user/user.js b/pages/user/user.js
index bd63679..ed85eca 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -80,7 +80,7 @@ Page({
   phoneCall:function(){
       wx.showModal({
         title:'呼叫人工客服',
-        content:'0512-66555111',
+        content:'0512-66555111\n客服服务时间：08:30-17:30',
         success:function(res){
             if (res.cancel) {
               return

From 456f0e8461421ec99a9dd62497e00984dbc05f01 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Tue, 27 Sep 2022 18:22:54 +0800
Subject: [PATCH 007/471] =?UTF-8?q?=E5=B9=BF=E5=91=8A,=E5=A4=9A=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/TitleHeader.js         | 12 ++++---
 pages/index/index.js                   | 10 +++---
 pages/info/sceneProductInfo/index.js   | 47 ++++++++++++++------------
 pages/info/sceneProductInfo/index.wxml | 33 +++++++++++++++++-
 4 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 06a72a9..1bb59d9 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -75,15 +75,17 @@ Component({
 		  })
 	  }
 	  else if (pages[pages.length-1].route.indexOf('orderList') != -1){
+      console.log(11111);
 		  wx.navigateTo({
 		    url: '/pages/user/cartlist/list'
 		  })
 	  }
-	  else if (pages[pages.length-1].route.indexOf('scene') != -1){
-		  wx.reLaunch({
-		    url: "/pages/user/cartlist/list"
-		  })
-	  }
+	  // else if (pages[pages.length-1].route.indexOf('scene') != -1){
+    //   console.log(22222);
+		//   wx.reLaunch({
+		//     url: "/pages/user/cartlist/list"
+		//   })
+	  // }
       else if (pages.length>1){
         wx.navigateBack({
           delta: 1
diff --git a/pages/index/index.js b/pages/index/index.js
index 0f20cc1..92c95fa 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -371,7 +371,7 @@ Page({
         event: e.currentTarget.dataset.event
       }, 1)
     }
-    let url = e.currentTarget.dataset.url;
+    let url = e.currentTarget.dataset.tdata.url;
     app.globalData.weburl = url;
     wx.navigateTo({
       url: "/pages/pbService/web/index"
@@ -490,7 +490,7 @@ Page({
         if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
           // 外部h5
           console.log(item.tdata)
-          app.globalData.weburl = item.tdata;
+          app.globalData.weburl = item.tdata.url;
           wx.navigateTo({
             url: "/pages/pbService/web/index"
           })
@@ -510,7 +510,7 @@ Page({
               url: url,
             })
           } else {
-            app.globalData.weburl = item.tdata;
+            app.globalData.weburl = item.tdata.url;
             wx.navigateTo({
               url: "/pages/pbService/web/index"
             })
@@ -655,7 +655,7 @@ Page({
         if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
           // 外部h5
           console.log(item.tdata)
-          app.globalData.weburl = item.tdata;
+          app.globalData.weburl = item.tdata.url;
           wx.navigateTo({
             url: "/pages/pbService/web/index"
           })
@@ -675,7 +675,7 @@ Page({
               url: url,
             })
           } else {
-            app.globalData.weburl = item.tdata;
+            app.globalData.weburl = item.tdata.url;
             wx.navigateTo({
               url: "/pages/pbService/web/index"
             })
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 41e4c81..0b8bfa8 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -25,13 +25,14 @@ Page({
     showAllowance: false,
     allowance_data:null,
 	//购物车数量
-	producNum: 1,
-	skuIndex: 0,
-	aniSkuIndex: -1,
-	cartCount: 0,
-	cartImgInfo: null,
-	cartTop: 0,
-	top: 0
+    producNum: 1,
+    skuIndex: 0,
+    aniSkuIndex: -1,
+    cartCount: 0,
+    cartImgInfo: null,
+    cartTop: 0,
+    top: 0,
+    skuList:[],//立即预定的列表
   },
 
   /**
@@ -96,7 +97,16 @@ Page({
       this.setData({
         info: res.data
       })
+      var arr = []
       console.log(this.data.info);
+      res.data.product.forEach(item => {
+          item.sku.forEach(itemB=>{
+            arr.push(itemB)
+          })
+      });
+      this.setData({
+        skuList:arr
+      })
       util.pagePoint({ event: 'scene_view', param: { type: res.data.type, id: res.data.id } }, 1)
       this.BroswerRecord()
     })
@@ -118,7 +128,6 @@ Page({
       this.setData({
         ask: res.data.rows
       })
-      console.log(res)
     })
     // 获取评价列表
     commonApi._post("scene/get_comment", {
@@ -171,7 +180,6 @@ Page({
   },
   like: function () {
     let id = this.data.id, isLike = Number(this.data.isLike);
-    console.log(isLike)
     commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
       scene_id: id
     }).then(res => {
@@ -237,14 +245,12 @@ Page({
 	 //  	})
   // },
   selectSku: function (e) {
-  	  console.log(e)
     let index = e.currentTarget.dataset.index;
     this.setData({
       skuIndex: index
     })
   },
   order: function (e) {
-	console.log(e,e.currentTarget.dataset.product.sku[this.data.skuIndex])
 	// console.log(this.data.info,this.data.skuFlag)
 	app.globalData.postProduct = []
 	app.globalData.list = []
@@ -261,16 +267,20 @@ Page({
 		wx.setStorageSync('order_from', 'scene_order_submit')
 		app.globalData.couponInfo = null;
 		app.globalData.retailId = this.data.retailId;
-		// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-		let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
-		app.globalData.product = {...sku,...product}
+    // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+    // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+    let sku = {sku:this.data.skuList[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+    app.globalData.product = {...sku,...product}
+    console.log(this.data.skuIndex);
+    console.log(app.globalData.product);
 		// app.globalData.product = e.currentTarget.dataset;
 		wx.navigateTo({
 		  url: '/pages/order/scene/index',
 		})
 	}else {
+    console.log('111');
       commonApi.user_post("cart/add_sku", {
-        sku_id: this.data.info.product[0].sku[this.data.skuIndex].id,
+        sku_id: this.data.skuList[this.data.skuIndex].id,
         num: this.data.producNum
       }).then(res => {
         if (res.code == 1) {
@@ -280,7 +290,6 @@ Page({
             })
           })
           // 加动效
-		  console.log(this.data.skuIndex)
           this.setData({
             skuFlag: null,
             aniSkuIndex: this.data.skuIndex,
@@ -573,7 +582,6 @@ Page({
   },
   //加入购物车
   showCart: function () {
-	  console.log(this.data)
     if (this.data.info.product[0].sku.length == 0) {
       wx.showToast({
         title: '该产品未设置规格，不能加购',
@@ -586,7 +594,6 @@ Page({
     })
     let that = this
     wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
-      console.log(res)
       that.setData({
         cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
       })
@@ -646,7 +653,6 @@ Page({
    */
   onShow: function () {
 	  commonApi.user_post('cart/get_list', {}).then(res => {
-			  console.log(res,res.data)
 		this.setData({
 		  cartCount: res.data.length
 		})
@@ -661,15 +667,12 @@ Page({
         commonApi.user_post("product/getProductAllowancePrice", {
           product_code: this.data.product[0].product.product_code
         }).then(resTwo => {
-          console.log(resTwo)
           if (resTwo && resTwo.code == 1) {
             this.setData({
               allowance_data: resTwo.data
             })
             let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
             let sInfo = this.data.product[0].sku
-            console.log(9999, this.data.allowance_data.discount_rate / 100 * sInfo.price)
-            console.log(9999, spread_price)
             if (spread_price > 0) {
               if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
                 this.setData({
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 4ff2b60..c592eca 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -79,7 +79,7 @@
     <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
     <view class="cart-num">{{cartCount}}</view>
   </navigator>
-  <view class="mask" wx:if="{{skuFlag}}">
+  <!-- <view class="mask" wx:if="{{skuFlag}}">
     <view class="mask-bg" bindtap="hideSku"></view>
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
@@ -109,6 +109,37 @@
         <view class="mask-btn disable" wx:else>该商品已下架</view>
       </view>
     </view>
+  </view> -->
+  <view class="mask" wx:if="{{skuFlag}}">
+    <view class="mask-bg" bindtap="hideSku"></view>
+    <view class="mask-content">
+      <view class="iconfont icon-close" bindtap="hideSku"></view>
+      <view class="sku-info-box">
+        <image id="skuImg" src="{{info.headimg}}" mode="aspectFill"></image>
+        <view class="sku-info">
+          <view class="sku-price">{{skuList[skuIndex].price/100}}
+            <view class="allowance" wx:if="{{allowance_data}}">
+              补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+          </view>
+          <view class="sku-name">已选择：{{skuList[skuIndex].sku_name}}</view>
+        </view>
+      </view>
+      <view class="sku-names">
+        <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
+      </view>
+      <view class="number-box">
+        <text>数量</text>
+        <view class="iconfont icon-sami-select" bindtap="minus"></view>
+        <view class="number">{{producNum}}</view>
+        <view class="iconfont icon-add-select" bindtap="add"></view>
+      </view>
+      <view style="height:138rpx"></view>
+      <view class="btn-box">
+        <view class="mask-btn" bindtap="order" data-sku="{{sku}}" data-product="{{item}}" wx:if="{{info && info.flag==1}}" data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+        </view>
+        <view class="mask-btn disable" wx:else>该商品已下架</view>
+      </view>
+    </view>
   </view>
   <!-- <view class="empty-box">
     <view>这里空空如也，快去向大家提问吧!</view>

From 9142bc1945f7e81e0d0948a411b273230cb1cc13 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Wed, 28 Sep 2022 18:11:21 +0800
Subject: [PATCH 008/471] =?UTF-8?q?=E5=A4=9A=E8=A7=84=E6=A0=BC=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js   | 11 +++--------
 pages/info/sceneProductInfo/index.wxml |  2 +-
 pages/order/scene/index.js             | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 0b8bfa8..fc6256e 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -98,9 +98,9 @@ Page({
         info: res.data
       })
       var arr = []
-      console.log(this.data.info);
-      res.data.product.forEach(item => {
+      res.data.product.forEach((item,index) => {
           item.sku.forEach(itemB=>{
+            itemB.proIndex = index
             arr.push(itemB)
           })
       });
@@ -269,16 +269,12 @@ Page({
 		app.globalData.retailId = this.data.retailId;
     // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
     // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
-    let sku = {sku:this.data.skuList[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+    let sku = {sku:this.data.skuList[this.data.skuIndex]},product = {product:this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]}
     app.globalData.product = {...sku,...product}
-    console.log(this.data.skuIndex);
-    console.log(app.globalData.product);
-		// app.globalData.product = e.currentTarget.dataset;
 		wx.navigateTo({
 		  url: '/pages/order/scene/index',
 		})
 	}else {
-    console.log('111');
       commonApi.user_post("cart/add_sku", {
         sku_id: this.data.skuList[this.data.skuIndex].id,
         num: this.data.producNum
@@ -372,7 +368,6 @@ Page({
         })
       },
       complete(res) {
-        console.log(res);
         /* 这里判断一下如果没有授权重新打开设置选项 */
         wx.getSetting({
           success(res) {
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index c592eca..71178ad 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -115,7 +115,7 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{info.headimg}}" mode="aspectFill"></image>
+        <image id="skuImg" src="{{skuList[skuIndex].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
           <view class="sku-price">{{skuList[skuIndex].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 3263c0c..8bd3e44 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -93,6 +93,13 @@ Page({
     this.changePrice()
   },
   add: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
     if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
       wx.showToast({
         title: '出行人限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
@@ -107,6 +114,13 @@ Page({
     this.changePrice()
   },
   minus: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
     if (this.data.productNum == 1) return;
     if (this.data.coupon) {
       wx.showToast({

From a024b7df0b94bbab0e13f425f360f2c94459bef3 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Sun, 9 Oct 2022 17:30:35 +0800
Subject: [PATCH 009/471] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                       |  3 +-
 pages/list/comments/index.js               |  4 +
 pages/list/comments/index.wxml             | 20 +++--
 pages/list/comments/index.wxss             |  6 ++
 pages/user/order/list.js                   | 22 ++++++
 pages/user/order/list.wxml                 |  2 +-
 pages/user/order/sceneOrderInfo/index.js   | 49 +++++++++++-
 pages/user/order/sceneOrderInfo/index.wxml | 91 ++++++++++++++--------
 pages/user/order/sceneOrderInfo/index.wxss | 31 +++++++-
 9 files changed, 185 insertions(+), 43 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 92c95fa..5ebc085 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -371,7 +371,8 @@ Page({
         event: e.currentTarget.dataset.event
       }, 1)
     }
-    let url = e.currentTarget.dataset.tdata.url;
+    console.log(e.currentTarget.dataset.url);
+    let url = e.currentTarget.dataset.url;
     app.globalData.weburl = url;
     wx.navigateTo({
       url: "/pages/pbService/web/index"
diff --git a/pages/list/comments/index.js b/pages/list/comments/index.js
index 830b9a7..0a6501e 100644
--- a/pages/list/comments/index.js
+++ b/pages/list/comments/index.js
@@ -91,8 +91,12 @@ Page({
         if (res) {
           if (item.is_star == 1) {
             arr[index].is_star = 0
+            arr[index].star_count -=1
+            
           }else{
             arr[index].is_star = 1
+            arr[index].star_count +=1
+
           }
           this.setData({
             list:arr
diff --git a/pages/list/comments/index.wxml b/pages/list/comments/index.wxml
index 198a412..24fc758 100644
--- a/pages/list/comments/index.wxml
+++ b/pages/list/comments/index.wxml
@@ -5,10 +5,10 @@
   <view class="comment-top">
     <image src="{{item.user.avatar}}" mode="aspectFill"></image>
     <view class="author-info">
-    <view class="top"> 
-      <view class="author-name">{{item.nickname}}</view>
-      <view class="author-time">{{item.create_time}}</view>
-    </view>
+      <view class="top">
+        <view class="author-name">{{item.nickname}}</view>
+        <view class="author-time">{{item.create_time}}</view>
+      </view>
       <view class="bot">
         <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
         <view class="sku" wx:if="{{item.sku_name}}">{{item.sku_name}}</view>
@@ -17,9 +17,17 @@
   </view>
   <view class="comment-detail">{{item.content}}</view>
   <view wx:if="{{item.img_list}}">
-    <image class="imgs" wx:for="{{item.img_list}}" wx:for-item="Goods" mode="scaleToFill" data-img="{{Goods}}" data-list="{{item.img_list}}"  src="{{Goods}}" bindtap="imgsc"></image>
+    <image class="imgs" wx:for="{{item.img_list}}" wx:for-item="Goods" mode="scaleToFill" data-img="{{Goods}}" data-list="{{item.img_list}}" src="{{Goods}}" bindtap="imgsc"></image>
+  </view>
+  <view class="zan-box">
+    <view></view>
+    <view class="zan-box">
+    <view class="zan-count">{{item.star_count}}</view>
+      <view bindtap="zan" data-item="{{item}}" data-index="{{index}}" class="iconfont icon-zan{{item.is_star==1?' active':''}}"></view>
+    </view>
+
   </view>
-<view bindtap="zan" data-item="{{item}}"  data-index="{{index}}" class="iconfont icon-zan{{item.is_star==1?' active':''}}"></view>
+
 
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
diff --git a/pages/list/comments/index.wxss b/pages/list/comments/index.wxss
index 547f352..a23ac82 100644
--- a/pages/list/comments/index.wxss
+++ b/pages/list/comments/index.wxss
@@ -80,4 +80,10 @@
 }
 .icon-zan.active {
   color: red;
+}
+.zan-box{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #999999;
 }
\ No newline at end of file
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index ac130a6..cf87a6d 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -136,12 +136,34 @@ Page({
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
+
+    item = this.getChild(item)
+
     util.gotoOrder(item)
   },
+  
   gotoProductDetail:function(e){
     let item = e.currentTarget.dataset.item;
+
     util.orderMoreTime({order_product_list:[item]})
   },
+  getChild(list){     
+    let arr = {order_product_list:[]}
+    for (let i = 0; i < list.order_product_list.length; i++) {
+        if (list.order_product_list[i].product_model=="ticket") {
+            arr.order_product_list.push(list.order_product_list[i]) 
+            break
+        }   
+    }
+    if (arr.order_product_list.length>0) {
+        list.order_product_list = []
+        list.order_product_list.push(arr.order_product_list[0])
+        console.log(list);
+        return list
+    }else{
+        return list
+    }
+},
   changeType:function(e){
     let type = e.currentTarget.dataset.type;
     this.setData({
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index d1c53d1..ac9f677 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -40,7 +40,7 @@
   <!-- <view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">￥{{item.total_money/100}}</text></view> -->
   <view class="btns">
     <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view>
-    <view class="btn" catchtap="order" data-item="{{item}}">再次购买</view>
+    <view class="btn" wx:if="{{item.order_product_list.length==1}}" catchtap="order" data-item="{{item}}">再次购买</view>
     <!-- <view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view> -->
     <view catchtap="cancel" data-index="{{index}}" class="btn" wx:if="{{item.state=='UNPAID'}}">取消预订</view>
     <view catchtap="refund" data-index="{{index}}" class="btn" wx:if="{{item.state=='PAID'}}">取消预订</view>
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 8c64c1e..043e2c6 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -21,7 +21,13 @@ Page({
     codeImgs:[],
     minute:0,
     second:0,
-    cardTypes:{}
+    cardTypes:{},
+    cxr1:false,
+    cxr1Text:'更多',
+    sysm:false,
+    sysmText:'更多',
+    sysm2:false,
+    sysm2Text:'更多',
   },
 
   /**
@@ -183,7 +189,46 @@ Page({
       return;
     })
   },
+  goDetail(e){
+    console.log(e.currentTarget.dataset);
+    let item = e.currentTarget.dataset.set
+    if (item.product_model=='ticket') {
+      wx.navigateTo({
+        url:"/pages/info/sceneProductInfo/index?id="+item.scene_id
+      })
+    }else if (item.product_model=='post') {
+      wx.navigateTo({
+        url:"/pages/info/postProductInfo/index?id="+item.product_id
+      })
+    }
+  },
+  showMsg(e){
+    console.log(e.currentTarget.dataset);
+    let msg = e.currentTarget.dataset.msg
+    switch (msg) {
+      case 'cxr1':
+        this.setData({
+          cxr1:!this.data.cxr1,
+          cxr1Text:this.data.cxr1?'更多':'收起',
 
+        })
+        break;
+        case 'sysm1':
+          this.setData({
+            sysm:!this.data.sysm,
+            sysmText:this.data.sysm?'更多':'收起',
+          })
+          break;
+          case 'sysm2':
+            this.setData({
+              sysm2:!this.data.sysm2,
+              sysm2Text:this.data.sysm2?'更多':'收起',
+            })
+            break;
+      default:
+        break;
+    }
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -213,7 +258,7 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:"ticket"||res.data.order_product_list[0].product_model
       })
       this.getCodeImg()
       // 获取行程规划
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index dbaaa16..3ba25d5 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -24,6 +24,8 @@
       <view wx:if="{{info.state=='CLOSED' || info.state=='REFUND'}}">您的订单已取消，您可以通过苏州文旅总入口再次预订</view>
       <view wx:if="{{info.order_product_list[0].state=='WAIT_USE'}}">预定已成功，祝您出游愉快</view>
       <view>订单号：{{info.order_id}}</view>
+      <view>下单时间：{{info.create_time}}</view>
+
     </view>
     <view class="scene-box-right">
       <view class="price">￥{{info.paid_money/100}}</view>
@@ -33,7 +35,7 @@
   <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
-    <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view>
+    <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view>
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
     <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
@@ -42,46 +44,73 @@
   </view>
 </view>
 <!--景点订单详情需要这个  -->
-<navigator url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" class="box" wx:if='{{product_model=="ticket"}}' wx:for="{{info.order_product_list}}">
+<view url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" class="box" wx:if='{{product_model=="ticket"}}' wx:for="{{info.order_product_list}}" wx:for-index='index'>
   <view class="scene-box" style="align-items:center">
     <view class="scene-box-left" style="width:600rpx">
-      <view class="box-title">{{item.product_title}}</view>
-      <view>出行日期：{{item.use_date}}</view>
-    </view>
-    <view class="iconfont icon-you"></view>
-  </view>
-  <view class="detail-item">
-    <text>{{item.sku_name}}</text>
-    <text>x{{item.product_num}}</text>
-  </view>
-</navigator>
-<view class="box" wx:if="{{product_model=='ticket'}}">
-  <view class="box-title">出行人</view>
-  <view wx:for="{{info.order_product_list[0].contacts_info}}">
-    <view class="line" wx:if="{{index!=0}}"></view>
-    <view class="detail-item">
-      <text>姓名：      {{item.name}}</text>
-      <!-- <text>￥168</text> -->
-    </view>
-    <view class="detail-item">
-      <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text>
-      <!-- <text>-￥10</te、xt> -->
-    </view>
-    <view class="detail-item">
-      <text>手机号：  {{item.tel}}</text>
-      <!-- <text>-￥10</text> -->
+      <view class="box-title" bindtap="goDetail" data-set='{{item}}'>
+        <view class="title-content">{{item.product_title}}</view>
+        <view class="iconfont icon-you"></view>
+      </view>
+      <view class="detail-item">
+        <text>{{item.sku_name}}</text>
+        <text>x{{item.product_num}}</text>
+      </view>
+      <view class="childStatus" style="text-align: left;font-size: 30rpx; font-weight:bold;padding-bottom: 30rpx;color: #0b898e">
+        {{ item.state_text }}
+      </view>
+      <view class="row" wx:if="{{item.product_model == 'ticket'}}">
+        <view>出行日期：</view>
+        <view>{{item.use_date}} {{ item.start_time }}-{{ item.end_time }}</view>
+      </view>
+      <view wx:if="{{item.product_model == 'ticket'}}">
+        <view class="box-title tflex">
+          <view>出行人信息</view>
+          <view bindtap="showMsg" data-msg="cxr1" style="color: rgb(49, 154, 158);">{{cxr1Text}}</view>
+        </view>
+        <view wx:if="{{cxr1}}" wx:for="{{item.contacts_info}}">
+          <view class="line" wx:if="{{index!=0}}"></view>
+          <view class="detail-item">
+            <text>姓名： {{item.name}}</text>
+            <!-- <text>￥168</text> -->
+          </view>
+          <view class="detail-item">
+            <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text>
+            <!-- <text>-￥10</te、xt> -->
+          </view>
+          <view class="detail-item">
+            <text>手机号： {{item.tel}}</text>
+            <!-- <text>-￥10</text> -->
+          </view>
+        </view>
+      </view>
+      <view wx:if="{{item.product_model=='ticket'}}">
+        <view class="box-title tflex">
+          <view>使用说明</view>
+          <view bindtap="showMsg" data-msg="sysm1" style="color: rgb(49, 154, 158);">{{sysmText}}</view>
+        </view>
+        <rich-text wx:if="{{sysm}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.bookinfo)}}"></rich-text>
+      </view>
+      <view wx:if="{{item.product_model=='post'}}">
+        <view class="box-title tflex">
+          <view>使用说明</view>
+          <view bindtap="showMsg" data-msg="sysm2" style="color: rgb(49, 154, 158);">{{sysm2Text}}</view>
+        </view>
+        <rich-text wx:if="{{sysm2}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+      </view>
+      <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view>
     </view>
   </view>
+
 </view>
-<view class="box" wx:if="{{product_model=='ticket'}}">
+<!-- <view class="box" wx:if="{{product_model=='ticket'}}">
   <view class="box-title">使用说明</view>
   <rich-text class="detail-item" style="display:block" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.bookinfo)}}"></rich-text>
-  <!-- <view class="line"></view>
+   <view class="line"></view>
   <view class="box-title">退款说明</view>
   <view class="detail-item">
     <text>退款条件：{{info.order_product_list[0].sku_model.refund_policy_text}}</text>
-  </view> -->
-</view>
+  </view>
+</view> -->
 <navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
   <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 91d860c..6ba4e9b 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -58,8 +58,9 @@ page {
   justify-content: space-between;
   align-items: center;
   min-height: 45rpx;
-  color: #333;
-  font-size: 26rpx;
+  color: #000;
+  font-size: 30rpx;
+  padding-bottom:30rpx ;
 }
 .all-total-item {
   font-weight: bold;
@@ -101,6 +102,20 @@ page {
   font-size: 30rpx;
   font-weight: bold;
   margin-bottom: 10rpx;
+  display: flex;
+  text-align: center;
+  justify-content: space-between;
+}
+.box-title.tflex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.title-content{
+  overflow-x: hidden;
+  overflow-y: inherit;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .scene-box {
   display: flex;
@@ -286,4 +301,16 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
+}
+.row{
+  display: flex;
+  align-items: center;
+  justify-content:space-between;
+  padding-bottom: 30rpx;
+}
+.showmsg{
+  display: none;
+}
+.btn{
+  float: right;
 }
\ No newline at end of file

From 4da5d03fa9dd601707bdb50aa44b9f0e81661612 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 10 Oct 2022 09:15:51 +0800
Subject: [PATCH 010/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js               | 2 +-
 pages/index/index.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index cb6df27..1fdd3c6 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.isTest39?true:false;
+      data.isTest = data.isTest40?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/index/index.js b/pages/index/index.js
index 92c95fa..0e9d25a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -366,12 +366,13 @@ Page({
     }
   },
   gotoUrl: function (e) {
+	  console.log(e)
     if (e.currentTarget.dataset.event) {
       this.pagePoint({
         event: e.currentTarget.dataset.event
       }, 1)
     }
-    let url = e.currentTarget.dataset.tdata.url;
+    let url = e.currentTarget.dataset.url;
     app.globalData.weburl = url;
     wx.navigateTo({
       url: "/pages/pbService/web/index"

From 07441189df44bc3a4b23c59f1b17e6d02cbdb868 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 10 Oct 2022 09:20:38 +0800
Subject: [PATCH 011/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 1fdd3c6..5acc553 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.isTest40?true:false;
+      data.isTest = data.isTest41?true:false;
       this.globalData.configJson = data
     })
     

From e9048a7c2584b82c471e5fd0800d35fa13b71298 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Mon, 10 Oct 2022 13:23:07 +0800
Subject: [PATCH 012/471] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 3ba25d5..89a50c3 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -46,7 +46,7 @@
 <!--景点订单详情需要这个  -->
 <view url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" class="box" wx:if='{{product_model=="ticket"}}' wx:for="{{info.order_product_list}}" wx:for-index='index'>
   <view class="scene-box" style="align-items:center">
-    <view class="scene-box-left" style="width:600rpx">
+    <view class="scene-box-left" style="width:630rpx">
       <view class="box-title" bindtap="goDetail" data-set='{{item}}'>
         <view class="title-content">{{item.product_title}}</view>
         <view class="iconfont icon-you"></view>
@@ -88,7 +88,7 @@
           <view>使用说明</view>
           <view bindtap="showMsg" data-msg="sysm1" style="color: rgb(49, 154, 158);">{{sysmText}}</view>
         </view>
-        <rich-text wx:if="{{sysm}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.bookinfo)}}"></rich-text>
+        <rich-text wx:if="{{sysm}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
       </view>
       <view wx:if="{{item.product_model=='post'}}">
         <view class="box-title tflex">

From 8dfdbc8543f778a1c56eba71816da87f557cbdfa Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 11 Oct 2022 10:15:57 +0800
Subject: [PATCH 013/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.wxml | 6 +++---
 pages/list/theatre/index.wxml          | 3 ++-
 pages/order/components/date/index.wxml | 2 +-
 pages/order/show/index.wxml            | 2 +-
 utils/filter.wxs                       | 6 +++++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 71178ad..ae91060 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/info/sceneProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<title title="产品详情"></title>
+<title title="景点详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
 <!-- <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}" bindtap="like"></view> -->
 <image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
@@ -51,7 +51,7 @@
         <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
       </view>
       <view class="product-right">
-        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text><text>起</text></view>
+        <view class="price"><text>￥</text><text>{{sku.price?tool.toFix(sku.price):0}}</text><text>起</text></view>
         <!-- <view bindtap="order" data-sku="{{sku}}" data-product="{{item}}"
           data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
           class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">立即预订</view> -->
@@ -117,7 +117,7 @@
       <view class="sku-info-box">
         <image id="skuImg" src="{{skuList[skuIndex].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
-          <view class="sku-price">{{skuList[skuIndex].price/100}}
+          <view class="sku-price">{{tool.toFix(skuList[skuIndex].price)}}
             <view class="allowance" wx:if="{{allowance_data}}">
               补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
           </view>
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index 61ded54..ae70777 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -1,4 +1,5 @@
 <!--pages/list/theatre/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
 <search bind:onload="search"></search>
 <view class="sale-types">
   <view class="sale-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">综合排序</view>
@@ -14,7 +15,7 @@
     <view class="textOver subtitle">{{item.subtitle?item.subtitle:""}}</view>
     <view class="tags textOver">
       <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view>
-      <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
+      <view class="price"><text>￥</text><text>{{item.price?tool.toFix(item.price):0}}</text><text>起</text></view>
     </view>
   </view>
 </view>
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 85a2a7a..b390736 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -18,7 +18,7 @@
     </view>
   </view>
   <view class="date-times" wx:if="{{timelist.length>0}}">
-    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 无票</text><text wx:elif="{{item.stock_number==-1}}">不开放</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
+    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}">不开放</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
   </view>
   <!-- <view class="date-times" wx:elif="{{activeDate.is_time_stock}}">
     <view>已售罄</view>
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index 9276448..775597f 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -7,7 +7,7 @@
 <view class="box">
   <view class="order-name box-title">场次</view>
   <view wx:for="{{times}}" wx:for-item="date" wx:for-index="dateIndex">
-    <view wx:for="{{date.screen}}" bindtap="selectTime" data-dateindex="{{dateIndex}}" data-timeindex="{{index}}" class="order-line-item{{item.is_ticket==0?' disable':''}}{{timeindex==index && dateIndex==dateindex?' active':''}}" ><text>{{date.sale_date}}</text><text>{{item.start_time}} ~ {{item.end_time}}</text> <view class="state">{{item.is_ticket==1?'有票':'无票'}}</view></view>
+    <view wx:for="{{date.screen}}" bindtap="selectTime" data-dateindex="{{dateIndex}}" data-timeindex="{{index}}" class="order-line-item{{item.is_ticket==0?' disable':''}}{{timeindex==index && dateIndex==dateindex?' active':''}}" ><text>{{date.sale_date}}</text><text>{{item.start_time}} ~ {{item.end_time}}</text> <view class="state">{{item.is_ticket==1?'有票':'售罄'}}</view></view>
   </view>
   
 </view>
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 0db8f64..abc5cd1 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -25,7 +25,11 @@ var gotoUrl = function(item){
   str += "/index?id="+item.id;
   return str;
 }
+var toFix = function(value) {
+      return (value / 100).toFixed(2);
+};
 module.exports = {
   formateRichText:formateRichText,
-  gotoUrl:gotoUrl
+  gotoUrl:gotoUrl,
+  toFix:toFix
 };
\ No newline at end of file

From 515d0d28d3b2d585c50772aef9b9158d54283890 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Tue, 11 Oct 2022 14:56:12 +0800
Subject: [PATCH 014/471] =?UTF-8?q?903=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            | 36 +++++++++++++++++++++++++++++++
 pages/list/six/index.json         |  3 ++-
 pages/list/six/index.wxml         | 15 +++++++------
 pages/list/six/index.wxss         | 22 +++++++++++++++++++
 pages/list/strategy/index.js      |  2 +-
 pages/list/strategy/index.wxml    | 13 +++++------
 pages/map/index.json              |  4 +++-
 pages/map/index.wxml              |  1 +
 pages/user/likes/index.js         |  2 +-
 pages/user/likes/index.wxml       |  2 +-
 pages/user/order/team/list.wxml   |  2 +-
 pages/user/personalInfo/index.js  |  2 +-
 pages/user/user.wxml              |  2 +-
 pages/user/userPrivacy/index.js   |  3 ++-
 pages/user/userPrivacy/index.wxml |  7 +++---
 15 files changed, 92 insertions(+), 24 deletions(-)

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

From 7d6a6d0fda5d64a4d406f433c63ce0f1f745ed6d Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 11 Oct 2022 14:57:23 +0800
Subject: [PATCH 015/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml                |  4 ++--
 pages/info/postProductInfo/index.wxml |  2 +-
 pages/info/roadInfo/index.wxml        |  2 +-
 pages/list/food/index.js              | 27 +++++++++++++++++++++++----
 pages/list/food/index.wxml            |  2 +-
 pages/list/food/index.wxss            |  7 ++++---
 pages/list/hotel/index.wxml           |  2 +-
 pages/list/scene/index.js             |  2 +-
 pages/list/techan/index.wxml          |  6 +++---
 pages/pbService/feiyi/index.wxml      |  2 +-
 10 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ca7f05b..178a657 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -155,9 +155,9 @@
   </view>
   <scroll-view scroll-x style="height:360rpx" bindscroll="listenScroll" class="slide-box">
     <view class="pbservice" style="margin-bottom:30rpx">
-      <view bindtap="gotoPath" data-title="非遗传承" data-path="/pages/pbService/feiyi/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-title="非遗鉴赏" data-path="/pages/pbService/feiyi/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb2.png" mode="widthFix"></image>
-        <view>非遗传承</view>
+        <view>非遗鉴赏</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
         data-path="/pages/pbService/wwcx/index" class="pbservice-item">
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7d06781..d9fb7cd 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -102,7 +102,7 @@
   <view style="flex:1"></view>
   <view class="btns">
     <view class="btn" bindtap="showCart">加入购物车</view>
-    <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view>
+    <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
     <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
   </view>
 </view>
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index 6e11237..d4b563e 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -22,7 +22,7 @@
     <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">费用说明</view>
     <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">预定须知</view>
     <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">退改说明</view>
-    <view class="scroll-menu-item{{type==4?' active':''}}" bindtap="changeMenu" data-index="4">产品详情</view>
+    <view class="scroll-menu-item{{type==4?' active':''}}" bindtap="changeMenu" data-index="4">详情</view>
   </view>
   <view style="height:85rpx" wx:if="{{fixed}}"></view>
   <view class="info-box" id="box1" wx:if="{{info}}">
diff --git a/pages/list/food/index.js b/pages/list/food/index.js
index 1d64595..7b4ab9c 100644
--- a/pages/list/food/index.js
+++ b/pages/list/food/index.js
@@ -12,14 +12,32 @@ Page({
     list:[],
     total:1,
     sort:"weight",
-    keywords:""
+    keywords:"",
+	lat: '',
+	lon: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getList()
+	  wx.getLocation({
+	    type: 'gcj02',
+	    success:(res)=>{
+	      this.setData({
+	        lat:res.latitude,
+	        lon:res.longitude
+	      })
+	  	  this.getList()
+	    },
+	    fail:()=>{
+	      wx.showToast({
+	        title: '请打开位置授权',
+	        icon:'none'
+	      })
+	    }
+	  })
+    
   },
   setSort:function(){
     this.setData({
@@ -69,13 +87,15 @@ Page({
       offset:list.length,
       limit:1000,
       sort:this.data.sort,
-      order:this.data.sort=='weight'?'desc':'asc'
+      order:this.data.sort=='weight'?'desc':'asc',
     },that = this;
     if(list.length>=this.data.total) return;
     if(this.data.typeIndex==0){
       // 景点
       service = "scene/get_scene_by_tag";
       data.tag_id = "12"
+	  data.lat = this.data.lat
+	  data.lon = this.data.lon
     }
     if(this.data.sort=='distance' && !this.data.latitude){
       wx.getLocation({
@@ -112,7 +132,6 @@ Page({
           item.distance = item.distance>=1000?(item.distance/1000+'km'):(item.distance+'m');
         }
       })
-      console.log(res.data)
       this.setData({
         list:list.concat(res.data.list),
         total:this.data.type==0?res.data.total:res.data.count
diff --git a/pages/list/food/index.wxml b/pages/list/food/index.wxml
index 0029940..ec4019b 100644
--- a/pages/list/food/index.wxml
+++ b/pages/list/food/index.wxml
@@ -20,7 +20,7 @@
       <view class="distance" wx:if="{{item.distance}}">距您直线距离{{item.distance}}</view>
       <view class="bottom-infos">
         <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view>
-        <view class="price"><text>￥</text><text>{{item.price/100}}</text><text>起</text></view>
+        <!-- <view class="price"><text>￥</text><text>{{item.price/100}}</text><text>起</text></view> -->
       </view>
     </view>
     <view class="iconfont icon-arrow-line-right"></view>
diff --git a/pages/list/food/index.wxss b/pages/list/food/index.wxss
index b49988e..554f85d 100644
--- a/pages/list/food/index.wxss
+++ b/pages/list/food/index.wxss
@@ -57,7 +57,7 @@ page {
 }
 .infos .title {
   line-height: 47rpx;
-  height: 94rpx;
+  /* height: 94rpx; */
   font-size: 35rpx;
   color: #202020;
   font-weight: 500;
@@ -76,7 +76,7 @@ page {
 .bottom-infos {
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  /* justify-content: space-between; */
 }
 .bottom-infos .tag {
   position: relative;
@@ -85,6 +85,7 @@ page {
   font-weight: 500;
   line-height: 39rpx;
   height: 39rpx;
+  margin-right: 10rpx;
 }
 .bottom-infos .tag::after {
   content: "1";
@@ -120,7 +121,7 @@ page {
   font-size: 40rpx;
   position: absolute;
   right: 0;
-  bottom: 5rpx;
+  bottom: 30rpx;
   z-index: 1;
 }
 .order-btn {
diff --git a/pages/list/hotel/index.wxml b/pages/list/hotel/index.wxml
index 48cf1ef..855294c 100644
--- a/pages/list/hotel/index.wxml
+++ b/pages/list/hotel/index.wxml
@@ -12,7 +12,7 @@
   
 </view>
 <view class="sort-btn" style="{{isDistanceSort?'':'color:#333'}}">
-  <view bindtap="changeSort">距离排序</view>
+  <view bindtap="changeSort">距离最近</view>
 </view>
 <view bindtap="gotoDetail" data-item="{{item}}" url="/pages/info/hotelProductInfo/index?id={{item.id}}" class="hotel-item" wx:for="{{list}}">
   <image mode="aspectFill" class="headimg" src="{{item.headimg}}"></image>
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index a7c5971..7b1dbeb 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -67,7 +67,7 @@ Page({
       area_id:this.data.area_id
     }).then(res=>{
       res.data.list.map(item=>{
-        item.tags = item.tags?item.tags.split(","):[];
+        item.tags = item.display_tags?item.display_tags.split(","):[];
         item.tags = item.tags.splice(0,2);
         if(item.distance && item.distance>=1000){
           item.distance = item.distance/1000 + "km"
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 875b22e..7a992ad 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/feiyi/list/index.wxml-->
 <!-- 非遗列表页面 -->
-<!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
+<wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="文创特产"></title>
 <image class="heaimg" src="https://static.ticket.sz-trip.com/xcxImages/techan/top1.png" mode="widthFix"></image>
 <view style="position:relative;margin-top: -107rpx;">
@@ -19,13 +19,13 @@
         </view>
         <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text>{{item.address}}</view>
       </view>
-      <view class="supplier-price"><text>￥</text><text>{{item.start_price/100}}</text><text>起</text></view>
+      <view class="supplier-price"><text>￥</text><text>{{tool.toFix(item.start_price)}}</text><text>起</text></view>
     </view>
     <view class="product-list">
       <view data-item="{{item}}" class="product-item" wx:for="{{item.product}}">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="product-title textOver2">{{item.title}}</view>
-        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{item.price/100}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
+        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{tool.toFix(item.price)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
       </view>
     </view>
   </view>
diff --git a/pages/pbService/feiyi/index.wxml b/pages/pbService/feiyi/index.wxml
index 8a49db4..a0b2b03 100644
--- a/pages/pbService/feiyi/index.wxml
+++ b/pages/pbService/feiyi/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/pbService/feiyi/index.wxml-->
-<title title="非遗传承"></title>
+<title title="非遗鉴赏"></title>
 <picker mode="selector" value="{{date}}" range="{{types}}" range-key="class_name" bindchange="changeType">
   <view class="picker feiyi-picker">
     <text>{{types[typeIndex].class_name}}</text>

From e1b367cc05bef6a71395966376de26136f8e12d3 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 12 Oct 2022 14:07:28 +0800
Subject: [PATCH 016/471] =?UTF-8?q?=E5=A4=AA=E4=BB=93=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=B8=9A=E5=9B=AD=E5=8C=BA=E8=B7=B3=E8=BD=AC=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                    |  2 +-
 pages/index/index.js      | 26 +++++++++++++-------------
 pages/list/six/index.js   | 13 +++++++++++++
 pages/list/six/index.wxml |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app.js b/app.js
index cd1024b..eced86f 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.isTest41?true:false;
+      data.isTest = data.isTest42?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/index/index.js b/pages/index/index.js
index 0e9d25a..c823537 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -326,19 +326,19 @@ Page({
   },
   gotoPath: function (e) {
     console.log(e)
-    if (e.currentTarget.dataset.event) {
-      if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
-        wx.navigateToMiniProgram({
-          appId: 'wxd323e63a10aa6865',
-          path: 'pages/home/index'
-        })
-        return
-      }else{
-        this.pagePoint({
-          event: e.currentTarget.dataset.event
-        }, 1)
-      }
-    }
+    // if (e.currentTarget.dataset.event) {
+    //   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
+    //     wx.navigateToMiniProgram({
+    //       appId: 'wxd323e63a10aa6865',
+    //       path: 'pages/home/index'
+    //     })
+    //     return
+    //   }else{
+    //     this.pagePoint({
+    //       event: e.currentTarget.dataset.event
+    //     }, 1)
+    //   }
+    // }
     if (e.currentTarget.dataset.title == '书香借阅') {
       wx.navigateToMiniProgram({
         appId: 'wx165d4f1727f6bdb0',
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index 1966539..a3b816e 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -35,6 +35,19 @@ Page({
       this.getTypes()
     })
   },
+  gotoPath:function(e){
+	if(e.currentTarget.dataset.event.area_key == 'taicang'){
+		wx.navigateToMiniProgram({
+		  appId: 'wx8853b0d93cbca75e',
+		  path: 'pages/home/home'
+		})
+	}else if(e.currentTarget.dataset.event.area_key == 'gongyeyuanqu'){
+		wx.navigateToMiniProgram({
+		  appId: 'wxd323e63a10aa6865',
+		  path: 'pages/home/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 e19a8a8..075a0fc 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -3,7 +3,7 @@
 <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>
+<image src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>
 <view class="types-box">
   <picker mode="selector" range="{{areas}}" range-key="area_title" bindchange="changeArea">
     <view class="picker active">

From 8d742a2a3488fdf5b187cc9ab58fb9ccc9ba15cd Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 12 Oct 2022 17:09:10 +0800
Subject: [PATCH 017/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js | 127 ++++++++++++++-------------
 1 file changed, 68 insertions(+), 59 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index fc6256e..f7d0c0f 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -251,65 +251,74 @@ Page({
     })
   },
   order: function (e) {
-	// console.log(this.data.info,this.data.skuFlag)
-	app.globalData.postProduct = []
-	app.globalData.list = []
-	if (this.data.skuFlag == 'order'){
-		if (e.currentTarget.dataset.disable == 1) return;
-		util.pagePoint({
-		  event: 'scene_order',
-		  param: {
-		    type: this.data.info.type,
-		    id: this.data.info.id
-		  }
-		}, 1)
-		wx.setStorageSync('login_from', 'scene_order_login')
-		wx.setStorageSync('order_from', 'scene_order_submit')
-		app.globalData.couponInfo = null;
-		app.globalData.retailId = this.data.retailId;
-    // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-    // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
-    let sku = {sku:this.data.skuList[this.data.skuIndex]},product = {product:this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]}
-    app.globalData.product = {...sku,...product}
-		wx.navigateTo({
-		  url: '/pages/order/scene/index',
-		})
-	}else {
-      commonApi.user_post("cart/add_sku", {
-        sku_id: this.data.skuList[this.data.skuIndex].id,
-        num: this.data.producNum
-      }).then(res => {
-        if (res.code == 1) {
-          commonApi.user_post('cart/get_list', {}).then(res => {
-            this.setData({
-              cartCount: res.data.length
-            })
-          })
-          // 加动效
-          this.setData({
-            skuFlag: null,
-            aniSkuIndex: this.data.skuIndex,
-            cartImgInfo: null
-          })
-          setTimeout(() => {
-            this.setData({
-              aniSkuIndex: -1
-            })
-            wx.showModal({
-              title: "提示",
-              content: "去购物车结算？",
-              success: function (res) {
-                if (res.confirm) {
-                  wx.navigateTo({
-                    url: '/pages/user/cartlist/list',
-                  })
-                }
-              }
-            })
-          }, 650)
-        }
-      })
-    }
+	commonApi.user_post("/product/checkStock",{
+		sku_id: this.data.skuList[this.data.skuIndex].id,
+	}).then(res => {
+		console.log(res)
+		if(res && res.code != 1){
+			return;
+		}else{
+			// console.log(this.data.info,this.data.skuFlag)
+			app.globalData.postProduct = []
+			app.globalData.list = []
+			if (this.data.skuFlag == 'order'){
+				if (e.currentTarget.dataset.disable == 1) return;
+				util.pagePoint({
+				  event: 'scene_order',
+				  param: {
+				    type: this.data.info.type,
+				    id: this.data.info.id
+				  }
+				}, 1)
+				wx.setStorageSync('login_from', 'scene_order_login')
+				wx.setStorageSync('order_from', 'scene_order_submit')
+				app.globalData.couponInfo = null;
+				app.globalData.retailId = this.data.retailId;
+			// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+			// let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+			let sku = {sku:this.data.skuList[this.data.skuIndex]},product = {product:this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]}
+			app.globalData.product = {...sku,...product}
+				wx.navigateTo({
+				  url: '/pages/order/scene/index',
+				})
+			}else {
+			  commonApi.user_post("cart/add_sku", {
+			    sku_id: this.data.skuList[this.data.skuIndex].id,
+			    num: this.data.producNum
+			  }).then(res => {
+			    if (res.code == 1) {
+			      commonApi.user_post('cart/get_list', {}).then(res => {
+			        this.setData({
+			          cartCount: res.data.length
+			        })
+			      })
+			      // 加动效
+			      this.setData({
+			        skuFlag: null,
+			        aniSkuIndex: this.data.skuIndex,
+			        cartImgInfo: null
+			      })
+			      setTimeout(() => {
+			        this.setData({
+			          aniSkuIndex: -1
+			        })
+			        wx.showModal({
+			          title: "提示",
+			          content: "去购物车结算？",
+			          success: function (res) {
+			            if (res.confirm) {
+			              wx.navigateTo({
+			                url: '/pages/user/cartlist/list',
+			              })
+			            }
+			          }
+			        })
+			      }, 650)
+			    }
+			  })
+			}
+		}
+	})
   },
   pagePoint: function (e) {
     util.pagePoint({

From e0142ba7c6867df4792750b26a9a3a0f55c99401 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Mon, 17 Oct 2022 15:54:04 +0800
Subject: [PATCH 018/471] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=A4=E6=96=AD=20?=
 =?UTF-8?q?=20=E9=A6=96=E9=A1=B5=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                 |   5 +-
 pages/index/index.wxml               |   2 +-
 pages/index/index.wxss               |   4 +-
 pages/info/postProductInfo/index.js  | 200 ++++++++++---------
 pages/info/sceneProductInfo/index.js | 284 ++++++++++++++-------------
 5 files changed, 260 insertions(+), 235 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index c823537..0fcd33d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -46,7 +46,7 @@ Page({
     wx.hideTabBar() //这里隐藏了底部导航栏
     commonApi._post("adv/getAdv", {
       position: 2,
-      type_id: 5
+      type_id: 3
     }).then(res => {
       if (res.data.length > 0) {
         this.setData({
@@ -191,7 +191,7 @@ Page({
     //弹窗广告
     commonApi._post("adv/getAdv", {
       position: 3,
-      type_id: 5
+      type_id: 3
     }).then(res => {
       if (res.data.length > 0) {
         this.setData({
@@ -631,7 +631,6 @@ Page({
     })
   },
   bannerJumpNew(item) {
-   
     let that = this
     item = item.currentTarget.dataset.item
     if (item.tdata == '') return
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 178a657..5be2ee0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -433,7 +433,7 @@
   <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
     <block wx:for="{{alertSwipeList}}" wx:key="*this">
     <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
-      <image src="{{item.head_img}}" style="width: 100%;height: 100%;" mode="widthFix"></image>
+      <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
     </swiper-item>
     </block>
   </swiper>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index a70741b..959a2ef 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -684,11 +684,11 @@
 }
 .alertavd{
   width: 500rpx;
-  height: 500rpx;
+  height: 700rpx;
   position: fixed;
   top: 50%;
   left: 50%;
-  transform: translate(-250rpx,-150rpx);
+  transform: translate(-250rpx,-300rpx);
   z-index: 999;
 
 }
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index b2dfec6..ec827b6 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -37,7 +37,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let rect = wx.getMenuButtonBoundingClientRect(), that = this;
+    let rect = wx.getMenuButtonBoundingClientRect(),
+      that = this;
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
     this.setData({
       top: height,
@@ -45,7 +46,7 @@ Page({
     })
     // 获取购物车按钮的位置
     wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-		console.log(res)
+      console.log(res)
       that.setData({
         cartTop: res.top
       })
@@ -87,7 +88,7 @@ Page({
     }).then(res => {
       res.data.list.map(item => {
         item.rate = Number(item.rate)
-        item.create_time = item.create_time.substring(0,10)
+        item.create_time = item.create_time.substring(0, 10)
 
       })
       this.setData({
@@ -95,15 +96,15 @@ Page({
         commentTotal: res.data.total
       })
       let arr = this.data.comment
-      arr.map((item)=>{
+      arr.map((item) => {
         if (item.img_list) {
           item.img_list = item.img_list.split(',')
-        }else{
-          item.img_list=[]
+        } else {
+          item.img_list = []
         }
       })
       this.setData({
-        comment:arr
+        comment: arr
       })
     })
 
@@ -123,16 +124,15 @@ Page({
           source_id: this.data.info.id,
           url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
           uuid: app.globalData.uuid
-        }).then(res => {
-        })
-      }
-      else {
+        }).then(res => {})
+      } else {
         this.BroswerRecord();
       }
     }, 500)
   },
   like: function () {
-    let id = this.data.id, isLike = this.data.isLike;
+    let id = this.data.id,
+      isLike = this.data.isLike;
     commonApi.user_post("product/" + (isLike == 1 ? "product_cancel_collection" : "product_collection"), {
       product_id: id
     }).then(res => {
@@ -144,10 +144,11 @@ Page({
     })
   },
   changeMenu: function (e) {
-    let index = e.currentTarget.dataset.index, that = this;
-    const query = wx.createSelectorQuery();  //创建节点查询器
-    query.select("#box" + index).boundingClientRect()  //选择toViewid获取位置信息
-    query.selectViewport().scrollOffset()  //获取页面查询位置的
+    let index = e.currentTarget.dataset.index,
+      that = this;
+    const query = wx.createSelectorQuery(); //创建节点查询器
+    query.select("#box" + index).boundingClientRect() //选择toViewid获取位置信息
+    query.selectViewport().scrollOffset() //获取页面查询位置的
     query.exec(function (res) {
       let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
       wx.pageScrollTo({
@@ -160,7 +161,8 @@ Page({
     })
   },
   onPageScroll: function (e) {
-    let that = this, height = this.data.top;
+    let that = this,
+      height = this.data.top;
     let topHeight = height;
     wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
       if (rect.top <= topHeight) {
@@ -168,30 +170,27 @@ Page({
         that.setData({
           fixed: true
         })
-      }
-      else {
+      } else {
         that.setData({
           fixed: false
         })
       }
       // 滚动时判断滚动到哪个部分了
-      const query = wx.createSelectorQuery();  //创建节点查询器
-      query.select("#box1").boundingClientRect()  //选择toViewid获取位置信息
-      query.select("#box2").boundingClientRect()  //选择toViewid获取位置信息
-      query.select("#box3").boundingClientRect()  //选择toViewid获取位置信息
+      const query = wx.createSelectorQuery(); //创建节点查询器
+      query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
+      query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
+      query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
       let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
       query.exec(function (res) {
         if (res[2].top < minHeight) {
           that.setData({
             type: 3
           })
-        }
-        else if (res[1].top < minHeight) {
+        } else if (res[1].top < minHeight) {
           that.setData({
             type: 2
           })
-        }
-        else {
+        } else {
           that.setData({
             type: 1
           })
@@ -256,67 +255,75 @@ Page({
     })
   },
   order: function () {
-	app.globalData.postProduct = null
-	app.globalData.list = []
-    if (this.data.skuFlag == 'order') {
-      util.pagePoint({
-        event: 'product_order',
-        param: {
-          id: this.data.info.id,
-          type: this.data.info.type
-        }
-      }, 1)
-      wx.setStorageSync('login_from', 'product_order_login')
-      wx.setStorageSync('order_from', 'product_order_submit')
-      app.globalData.couponInfo = null;
-      // 购买
-      let product = [{
-        product: this.data.info,
-        sku: this.data.info.sku[this.data.skuIndex],
-        productNum: this.data.producNum
-      }];
-      app.globalData.postProduct = product;
-      app.globalData.retailId = this.data.retailId;
-      wx.navigateTo({
-        url: '/pages/order/postOrder/index',
-      })
-    }
-    else {
-      commonApi.user_post("cart/add_sku", {
-        sku_id: this.data.info.sku[this.data.skuIndex].id,
-        num: this.data.producNum
-      }).then(res => {
-        if (res.code == 1) {
-          commonApi.user_post('cart/get_list', {}).then(res => {
-            this.setData({
-              cartCount: res.data.length
-            })
+    app.globalData.postProduct = null
+    app.globalData.list = []
+    // commonApi.user_post("/product/checkStock", {
+    //   sku_id: this.data.info.sku[this.data.skuIndex].id,
+    // }).then(res => {
+    //   if (res && res.code != 1) {
+    //     return;
+    //   } else {
+        if (this.data.skuFlag == 'order') {
+          util.pagePoint({
+            event: 'product_order',
+            param: {
+              id: this.data.info.id,
+              type: this.data.info.type
+            }
+          }, 1)
+          wx.setStorageSync('login_from', 'product_order_login')
+          wx.setStorageSync('order_from', 'product_order_submit')
+          app.globalData.couponInfo = null;
+          // 购买
+          let product = [{
+            product: this.data.info,
+            sku: this.data.info.sku[this.data.skuIndex],
+            productNum: this.data.producNum
+          }];
+          app.globalData.postProduct = product;
+          app.globalData.retailId = this.data.retailId;
+          wx.navigateTo({
+            url: '/pages/order/postOrder/index',
           })
-          // 加动效
-          this.setData({
-            skuFlag: null,
-            aniSkuIndex: this.data.skuIndex,
-            cartImgInfo: null
+        } else {
+          commonApi.user_post("cart/add_sku", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+            num: this.data.producNum
+          }).then(res => {
+            if (res.code == 1) {
+              commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                  cartCount: res.data.length
+                })
+              })
+              // 加动效
+              this.setData({
+                skuFlag: null,
+                aniSkuIndex: this.data.skuIndex,
+                cartImgInfo: null
+              })
+              setTimeout(() => {
+                this.setData({
+                  aniSkuIndex: -1
+                })
+                wx.showModal({
+                  title: "提示",
+                  content: "去购物车结算？",
+                  success: function (res) {
+                    if (res.confirm) {
+                      wx.navigateTo({
+                        url: '/pages/user/cartlist/list',
+                      })
+                    }
+                  }
+                })
+              }, 650)
+            }
           })
-          setTimeout(() => {
-            this.setData({
-              aniSkuIndex: -1
-            })
-            wx.showModal({
-              title: "提示",
-              content: "去购物车结算？",
-              success: function (res) {
-                if (res.confirm) {
-                  wx.navigateTo({
-                    url: '/pages/user/cartlist/list',
-                  })
-                }
-              }
-            })
-          }, 650)
         }
-      })
-    }
+    //   }
+    // })
+
   },
   // 分享
   share: function () {
@@ -344,7 +351,8 @@ Page({
   },
   // 保存
   save() {
-    let url = this.data.shareImg, that = this;
+    let url = this.data.shareImg,
+      that = this;
     wx.authorize({
       /* 这个就是保存相册的 */
       scope: 'scope.writePhotosAlbum',
@@ -397,7 +405,8 @@ Page({
   },
   // 绘制海报
   drawImg: function () {
-    var that = this, userinfo = wx.getStorageSync('jstrip_userInfo');
+    var that = this,
+      userinfo = wx.getStorageSync('jstrip_userInfo');
     if (!userinfo) {
       // 去登录
       return false;
@@ -436,7 +445,7 @@ Page({
       ctx.save();
       ctx.beginPath(); //开始绘制
       that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
-      ctx.clip();//画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+      ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
       ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
       ctx.restore();
       ctx.save();
@@ -547,12 +556,13 @@ Page({
   },
   // 绘制两行文字
   drawText: function (ctx, str, x, y, canvasWidth, ratio) {
-    let row = [], temp = "", chr = str.split("");
+    let row = [],
+      temp = "",
+      chr = str.split("");
     for (var a = 0; a < chr.length; a++) {
       if (ctx.measureText(temp).width < canvasWidth) {
         temp += chr[a];
-      }
-      else {
+      } else {
         a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
         row.push(temp);
         temp = "";
@@ -569,13 +579,12 @@ Page({
       for (var a = 0; a < rowPart.length; a++) {
         if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
           test += rowPart[a];
-        }
-        else {
+        } else {
           break;
         }
       }
       empty.push(test);
-      var group = empty[0] + "..."//这里只显示两行，超出的用...表示
+      var group = empty[0] + "..." //这里只显示两行，超出的用...表示
       rowCut.splice(1, 1, group);
       row = rowCut;
     }
@@ -611,8 +620,7 @@ Page({
           cartCount: res.data.length
         })
       })
-    }
-    else {
+    } else {
       setTimeout(() => {
         this.onShow()
       }, 200)
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index f7d0c0f..bfb2b67 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -6,7 +6,6 @@ import util from "../../../utils/util"
 import QRCode from '../../../utils/weapp-qrcode.js'
 let app = getApp()
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -23,8 +22,8 @@ Page({
     shareImg: null,
     showShareFlag: false,
     showAllowance: false,
-    allowance_data:null,
-	//购物车数量
+    allowance_data: null,
+    //购物车数量
     producNum: 1,
     skuIndex: 0,
     aniSkuIndex: -1,
@@ -32,7 +31,7 @@ Page({
     cartImgInfo: null,
     cartTop: 0,
     top: 0,
-    skuList:[],//立即预定的列表
+    skuList: [], //立即预定的列表
   },
 
   /**
@@ -98,16 +97,22 @@ Page({
         info: res.data
       })
       var arr = []
-      res.data.product.forEach((item,index) => {
-          item.sku.forEach(itemB=>{
-            itemB.proIndex = index
-            arr.push(itemB)
-          })
+      res.data.product.forEach((item, index) => {
+        item.sku.forEach(itemB => {
+          itemB.proIndex = index
+          arr.push(itemB)
+        })
       });
       this.setData({
-        skuList:arr
+        skuList: arr
       })
-      util.pagePoint({ event: 'scene_view', param: { type: res.data.type, id: res.data.id } }, 1)
+      util.pagePoint({
+        event: 'scene_view',
+        param: {
+          type: res.data.type,
+          id: res.data.id
+        }
+      }, 1)
       this.BroswerRecord()
     })
     // 获取收藏的状态
@@ -141,17 +146,17 @@ Page({
         commentTotal: res.data.total
       })
       let arr = this.data.comment
-      arr.map((item)=>{
+      arr.map((item) => {
         if (item.img_list) {
-          let arr  = item.img_list.split(',')
+          let arr = item.img_list.split(',')
           item.img_list = arr
-          
-        }else{
-          item.img_list=[]
+
+        } else {
+          item.img_list = []
         }
       })
       this.setData({
-        comment:arr
+        comment: arr
       })
     })
   },
@@ -170,16 +175,15 @@ Page({
           source_id: this.data.info.id,
           url: "/pages/info/sceneProductInfo/index?id=" + this.data.info.id,
           uuid: app.globalData.uuid
-        }).then(res => {
-        })
-      }
-      else {
+        }).then(res => {})
+      } else {
         this.BroswerRecord();
       }
     }, 500)
   },
   like: function () {
-    let id = this.data.id, isLike = Number(this.data.isLike);
+    let id = this.data.id,
+      isLike = Number(this.data.isLike);
     commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
       scene_id: id
     }).then(res => {
@@ -225,24 +229,24 @@ Page({
     })
   },
   // order: function(e){
-	 //  console.log(e)
-	 //  	if (e.currentTarget.dataset.disable == 1) return;
-	 //  	util.pagePoint({
-	 //  	  event: 'scene_order',
-	 //  	  param: {
-	 //  	    type: this.data.info.type,
-	 //  	    id: this.data.info.id
-	 //  	  }
-	 //  	}, 1)
-	 //  	wx.setStorageSync('login_from', 'scene_order_login')
-	 //  	wx.setStorageSync('order_from', 'scene_order_submit')
-	 //  	app.globalData.couponInfo = null;
-	 //  	app.globalData.retailId = this.data.retailId;
-	 //  	// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-	 //  	app.globalData.product = e.currentTarget.dataset;
-	 //  	wx.navigateTo({
-	 //  	  url: '/pages/order/scene/index',
-	 //  	})
+  //  console.log(e)
+  //  	if (e.currentTarget.dataset.disable == 1) return;
+  //  	util.pagePoint({
+  //  	  event: 'scene_order',
+  //  	  param: {
+  //  	    type: this.data.info.type,
+  //  	    id: this.data.info.id
+  //  	  }
+  //  	}, 1)
+  //  	wx.setStorageSync('login_from', 'scene_order_login')
+  //  	wx.setStorageSync('order_from', 'scene_order_submit')
+  //  	app.globalData.couponInfo = null;
+  //  	app.globalData.retailId = this.data.retailId;
+  //  	// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+  //  	app.globalData.product = e.currentTarget.dataset;
+  //  	wx.navigateTo({
+  //  	  url: '/pages/order/scene/index',
+  //  	})
   // },
   selectSku: function (e) {
     let index = e.currentTarget.dataset.index;
@@ -251,74 +255,85 @@ Page({
     })
   },
   order: function (e) {
-	commonApi.user_post("/product/checkStock",{
-		sku_id: this.data.skuList[this.data.skuIndex].id,
-	}).then(res => {
-		console.log(res)
-		if(res && res.code != 1){
-			return;
-		}else{
-			// console.log(this.data.info,this.data.skuFlag)
-			app.globalData.postProduct = []
-			app.globalData.list = []
-			if (this.data.skuFlag == 'order'){
-				if (e.currentTarget.dataset.disable == 1) return;
-				util.pagePoint({
-				  event: 'scene_order',
-				  param: {
-				    type: this.data.info.type,
-				    id: this.data.info.id
-				  }
-				}, 1)
-				wx.setStorageSync('login_from', 'scene_order_login')
-				wx.setStorageSync('order_from', 'scene_order_submit')
-				app.globalData.couponInfo = null;
-				app.globalData.retailId = this.data.retailId;
-			// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-			// let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
-			let sku = {sku:this.data.skuList[this.data.skuIndex]},product = {product:this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]}
-			app.globalData.product = {...sku,...product}
-				wx.navigateTo({
-				  url: '/pages/order/scene/index',
-				})
-			}else {
-			  commonApi.user_post("cart/add_sku", {
-			    sku_id: this.data.skuList[this.data.skuIndex].id,
-			    num: this.data.producNum
-			  }).then(res => {
-			    if (res.code == 1) {
-			      commonApi.user_post('cart/get_list', {}).then(res => {
-			        this.setData({
-			          cartCount: res.data.length
-			        })
-			      })
-			      // 加动效
-			      this.setData({
-			        skuFlag: null,
-			        aniSkuIndex: this.data.skuIndex,
-			        cartImgInfo: null
-			      })
-			      setTimeout(() => {
-			        this.setData({
-			          aniSkuIndex: -1
-			        })
-			        wx.showModal({
-			          title: "提示",
-			          content: "去购物车结算？",
-			          success: function (res) {
-			            if (res.confirm) {
-			              wx.navigateTo({
-			                url: '/pages/user/cartlist/list',
-			              })
-			            }
-			          }
-			        })
-			      }, 650)
-			    }
-			  })
-			}
-		}
-	})
+    // commonApi.user_post("/product/checkStock", {
+    //   sku_id: this.data.skuList[this.data.skuIndex].id,
+    // }).then(res => {
+    //   if (res && res.code != 1) {
+    //     wx.showModal({
+    //       title: "温馨提示",
+    //       content: '商品已经被抢光啦~要不要瞧瞧别的~',
+    //       showCancel: false
+    //     })
+    //     return;
+    //   } else {
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        if (this.data.skuFlag == 'order') {
+          if (e.currentTarget.dataset.disable == 1) return;
+          util.pagePoint({
+            event: 'scene_order',
+            param: {
+              type: this.data.info.type,
+              id: this.data.info.id
+            }
+          }, 1)
+          wx.setStorageSync('login_from', 'scene_order_login')
+          wx.setStorageSync('order_from', 'scene_order_submit')
+          app.globalData.couponInfo = null;
+          app.globalData.retailId = this.data.retailId;
+          // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+          // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+          let sku = {
+              sku: this.data.skuList[this.data.skuIndex]
+            },
+            product = {
+              product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
+            }
+          app.globalData.product = {
+            ...sku,
+            ...product
+          }
+          wx.navigateTo({
+            url: '/pages/order/scene/index',
+          })
+        } else {
+          commonApi.user_post("cart/add_sku", {
+            sku_id: this.data.skuList[this.data.skuIndex].id,
+            num: this.data.producNum
+          }).then(res => {
+            if (res.code == 1) {
+              commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                  cartCount: res.data.length
+                })
+              })
+              // 加动效
+              this.setData({
+                skuFlag: null,
+                aniSkuIndex: this.data.skuIndex,
+                cartImgInfo: null
+              })
+              setTimeout(() => {
+                this.setData({
+                  aniSkuIndex: -1
+                })
+                wx.showModal({
+                  title: "提示",
+                  content: "去购物车结算？",
+                  success: function (res) {
+                    if (res.confirm) {
+                      wx.navigateTo({
+                        url: '/pages/user/cartlist/list',
+                      })
+                    }
+                  }
+                })
+              }, 650)
+            }
+          })
+        }
+    //   }
+    // })
   },
   pagePoint: function (e) {
     util.pagePoint({
@@ -333,9 +348,7 @@ Page({
   share: function () {
     if (!wx.getStorageSync("jstrip_token")) {
       wx.setStorageSync('login_from', 'scene_share_login')
-      commonApi.user_post("user/getMyInfo", {}).then(res => {
-      }).catch(err => {
-      })
+      commonApi.user_post("user/getMyInfo", {}).then(res => {}).catch(err => {})
       return;
     }
     if (!this.data.shareImg) {
@@ -351,7 +364,8 @@ Page({
   },
   // 保存
   save() {
-    let url = this.data.shareImg, that = this;
+    let url = this.data.shareImg,
+      that = this;
     wx.authorize({
       /* 这个就是保存相册的 */
       scope: 'scope.writePhotosAlbum',
@@ -366,7 +380,13 @@ Page({
             that.setData({
               showShareFlag: !that.data.showShareFlag
             })
-            util.pagePoint({ event: 'scene_share_save', param: { type: that.data.info.type, id: that.data.info.id } }, 1)
+            util.pagePoint({
+              event: 'scene_share_save',
+              param: {
+                type: that.data.info.type,
+                id: that.data.info.id
+              }
+            }, 1)
           },
           fail(res) {
             wx.showToast({
@@ -396,7 +416,8 @@ Page({
   },
   // 绘制海报
   drawImg: function () {
-    var that = this, userinfo = wx.getStorageSync('jstrip_userInfo');
+    var that = this,
+      userinfo = wx.getStorageSync('jstrip_userInfo');
     if (!userinfo) {
       // 去登录
       return false;
@@ -434,7 +455,7 @@ Page({
       ctx.save();
       ctx.beginPath(); //开始绘制
       that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
-      ctx.clip();//画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+      ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
       ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
       ctx.restore();
       ctx.save();
@@ -548,12 +569,13 @@ Page({
   },
   // 绘制两行文字
   drawText: function (ctx, str, x, y, canvasWidth, ratio) {
-    let row = [], temp = "", chr = str.split("");
+    let row = [],
+      temp = "",
+      chr = str.split("");
     for (var a = 0; a < chr.length; a++) {
       if (ctx.measureText(temp).width < canvasWidth) {
         temp += chr[a];
-      }
-      else {
+      } else {
         a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
         row.push(temp);
         temp = "";
@@ -570,13 +592,12 @@ Page({
       for (var a = 0; a < rowPart.length; a++) {
         if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
           test += rowPart[a];
-        }
-        else {
+        } else {
           break;
         }
       }
       empty.push(test);
-      var group = empty[0] + "..."//这里只显示两行，超出的用...表示
+      var group = empty[0] + "..." //这里只显示两行，超出的用...表示
       rowCut.splice(1, 1, group);
       row = rowCut;
     }
@@ -602,7 +623,7 @@ Page({
         cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
       })
     }).exec()
-  
+
   },
   hideSku: function () {
     this.setData({
@@ -644,8 +665,7 @@ Page({
       this.setData({
         isTest: app.globalData.configJson.isTest
       })
-    }
-    else {
+    } else {
       setTimeout(() => {
         this.onReady()
       }, 300)
@@ -656,11 +676,11 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-	  commonApi.user_post('cart/get_list', {}).then(res => {
-		this.setData({
-		  cartCount: res.data.length
-		})
-	  })
+    commonApi.user_post('cart/get_list', {}).then(res => {
+      this.setData({
+        cartCount: res.data.length
+      })
+    })
     if (!wx.getStorageSync('jstrip_token')) {
       return;
     }
@@ -696,8 +716,7 @@ Page({
           }
         })
       }
-    }
-    else {
+    } else {
       setTimeout(() => {
         this.onShow()
       }, 200)
@@ -736,6 +755,5 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-  }
+  onShareAppMessage: function () {}
 })
\ No newline at end of file

From c569d881ff3911c9cd20dc6f4c3de60899cc1df8 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Fri, 21 Oct 2022 15:23:44 +0800
Subject: [PATCH 019/471] =?UTF-8?q?=E6=97=A0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js    | 126 ++++++++++++------------
 pages/info/sceneProductInfo/index.js   |  38 +++++---
 pages/info/sceneProductInfo/index.wxml |   4 +-
 pages/info/sceneProductInfo/index.wxss |   6 ++
 pages/order/postOrder/index.js         |   8 +-
 pages/order/scene/index.js             |   1 +
 pages/user/cartlist/list.wxml          |   2 +-
 pages/user/coupon/index.js             |  12 ++-
 pages/user/coupon/index.wxml           |   6 +-
 pages/user/coupon/index.wxss           |   5 +-
 pages/user/user.js                     | 127 ++++++++++++++++++++++++-
 pages/user/user.wxml                   |  16 +++-
 pages/user/user.wxss                   |  59 +++++++++++-
 13 files changed, 317 insertions(+), 93 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index ec827b6..c38f82f 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -257,72 +257,72 @@ Page({
   order: function () {
     app.globalData.postProduct = null
     app.globalData.list = []
-    // commonApi.user_post("/product/checkStock", {
-    //   sku_id: this.data.info.sku[this.data.skuIndex].id,
-    // }).then(res => {
-    //   if (res && res.code != 1) {
-    //     return;
-    //   } else {
-        if (this.data.skuFlag == 'order') {
-          util.pagePoint({
-            event: 'product_order',
-            param: {
-              id: this.data.info.id,
-              type: this.data.info.type
-            }
-          }, 1)
-          wx.setStorageSync('login_from', 'product_order_login')
-          wx.setStorageSync('order_from', 'product_order_submit')
-          app.globalData.couponInfo = null;
-          // 购买
-          let product = [{
-            product: this.data.info,
-            sku: this.data.info.sku[this.data.skuIndex],
-            productNum: this.data.producNum
-          }];
-          app.globalData.postProduct = product;
-          app.globalData.retailId = this.data.retailId;
-          wx.navigateTo({
-            url: '/pages/order/postOrder/index',
+    commonApi.user_post("/product/checkStock", {
+      sku_id: this.data.info.sku[this.data.skuIndex].id,
+    }).then(res => {
+      if (res && res.code != 1) {
+        return;
+      } else {
+    if (this.data.skuFlag == 'order') {
+      util.pagePoint({
+        event: 'product_order',
+        param: {
+          id: this.data.info.id,
+          type: this.data.info.type
+        }
+      }, 1)
+      wx.setStorageSync('login_from', 'product_order_login')
+      wx.setStorageSync('order_from', 'product_order_submit')
+      app.globalData.couponInfo = null;
+      // 购买
+      let product = [{
+        product: this.data.info,
+        sku: this.data.info.sku[this.data.skuIndex],
+        productNum: this.data.producNum
+      }];
+      app.globalData.postProduct = product;
+      app.globalData.retailId = this.data.retailId;
+      wx.navigateTo({
+        url: '/pages/order/postOrder/index',
+      })
+    } else {
+      commonApi.user_post("cart/add_sku", {
+        sku_id: this.data.info.sku[this.data.skuIndex].id,
+        num: this.data.producNum
+      }).then(res => {
+        if (res.code == 1) {
+          commonApi.user_post('cart/get_list', {}).then(res => {
+            this.setData({
+              cartCount: res.data.length
+            })
           })
-        } else {
-          commonApi.user_post("cart/add_sku", {
-            sku_id: this.data.info.sku[this.data.skuIndex].id,
-            num: this.data.producNum
-          }).then(res => {
-            if (res.code == 1) {
-              commonApi.user_post('cart/get_list', {}).then(res => {
-                this.setData({
-                  cartCount: res.data.length
-                })
-              })
-              // 加动效
-              this.setData({
-                skuFlag: null,
-                aniSkuIndex: this.data.skuIndex,
-                cartImgInfo: null
-              })
-              setTimeout(() => {
-                this.setData({
-                  aniSkuIndex: -1
-                })
-                wx.showModal({
-                  title: "提示",
-                  content: "去购物车结算？",
-                  success: function (res) {
-                    if (res.confirm) {
-                      wx.navigateTo({
-                        url: '/pages/user/cartlist/list',
-                      })
-                    }
-                  }
-                })
-              }, 650)
-            }
+          // 加动效
+          this.setData({
+            skuFlag: null,
+            aniSkuIndex: this.data.skuIndex,
+            cartImgInfo: null
           })
+          setTimeout(() => {
+            this.setData({
+              aniSkuIndex: -1
+            })
+            wx.showModal({
+              title: "提示",
+              content: "去购物车结算？",
+              success: function (res) {
+                if (res.confirm) {
+                  wx.navigateTo({
+                    url: '/pages/user/cartlist/list',
+                  })
+                }
+              }
+            })
+          }, 650)
         }
-    //   }
-    // })
+      })
+    }
+      }
+    })
 
   },
   // 分享
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index bfb2b67..4337e9f 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -249,27 +249,37 @@ Page({
   //  	})
   // },
   selectSku: function (e) {
+    console.log(e.currentTarget.dataset.item);
+    if (e.currentTarget.dataset.item.stock == 0) {
+      wx.showToast({
+        title: "该商品暂无库存",
+        icon: 'none'
+      })
+      return
+
+    }
     let index = e.currentTarget.dataset.index;
     this.setData({
       skuIndex: index
     })
   },
   order: function (e) {
-    // commonApi.user_post("/product/checkStock", {
-    //   sku_id: this.data.skuList[this.data.skuIndex].id,
-    // }).then(res => {
-    //   if (res && res.code != 1) {
-    //     wx.showModal({
-    //       title: "温馨提示",
-    //       content: '商品已经被抢光啦~要不要瞧瞧别的~',
-    //       showCancel: false
-    //     })
-    //     return;
-    //   } else {
+    commonApi.user_post("/product/checkStock", {
+      sku_id: this.data.skuList[this.data.skuIndex].id,
+    }).then(res => {
+      if (res && res.code != 1) {
+        wx.showModal({
+          title: "温馨提示",
+          content: '商品已经被抢光啦~要不要瞧瞧别的~',
+          showCancel: false
+        })
+        return;
+      } else {
+        
         app.globalData.postProduct = []
         app.globalData.list = []
         if (this.data.skuFlag == 'order') {
-          if (e.currentTarget.dataset.disable == 1) return;
+          if (e.currentTarget.dataset.disable === 1) return;
           util.pagePoint({
             event: 'scene_order',
             param: {
@@ -332,8 +342,8 @@ Page({
             }
           })
         }
-    //   }
-    // })
+      }
+    })
   },
   pagePoint: function (e) {
     util.pagePoint({
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index ae91060..d8d9145 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -125,7 +125,7 @@
         </view>
       </view>
       <view class="sku-names">
-        <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
+        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
       </view>
       <view class="number-box">
         <text>数量</text>
@@ -135,7 +135,7 @@
       </view>
       <view style="height:138rpx"></view>
       <view class="btn-box">
-        <view class="mask-btn" bindtap="order" data-sku="{{sku}}" data-product="{{item}}" wx:if="{{info && info.flag==1}}" data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+        <view class="mask-btn" bindtap="order"  data-product="{{item}}" wx:if="{{info && info.flag==1}}">{{skuFlag=='cart'?'确认':'立即购买'}}
         </view>
         <view class="mask-btn disable" wx:else>该商品已下架</view>
       </view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index e90e3f3..982711e 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -717,6 +717,12 @@ page {
   color: #999;
 }
 
+.sku-name-item.disable {
+  border-color: transparent;
+  color: #fff;
+  background: #d7d7d7;
+}
+
 .number-box view.number {
   width: 94rpx;
   margin: 0 15rpx;
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 6dcbca9..16edcbe 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -28,6 +28,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
     this.setData({
       from: options.from,
       kjId: app.globalData.kjId,
@@ -186,8 +187,11 @@ Page({
 	}else{
 		app.globalData.productPrice = (this.data.showPrice + this.data.postFee - (this.data.coupon?this.data.coupon.activity.money:0))/100;
 		app.globalData.createDate = data
-		console.log(app.globalData.createDate)
-		wx.navigateTo({
+    console.log(app.globalData.product)
+    if (!app.globalData.product) {
+      app.globalData.product = app.globalData.list[0]
+    }
+		wx.redirectTo({
 		  url: '/pages/order/scene/index?flag='+this.data.flag,
 		})
 	}
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 8bd3e44..c00611d 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -361,6 +361,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+
 	if(app.globalData.list && app.globalData.list.length != 0){
 		app.globalData.product = app.globalData.list[app.globalData.index]
 	}
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index 2123667..073eed0 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -33,6 +33,6 @@
   <view class="tip">合计：</view>
   <view class="bottom-price">¥{{allPrice/100}} </view>
   <view style="margin-right: 10rpx; font-size: 29rpx;color: #000;">起</view>
-  <view style="flex:1">不含运费</view>
+  <view style="flex:1"></view>
   <view class="btn" bindtap="order">去下单</view>
 </view>
diff --git a/pages/user/coupon/index.js b/pages/user/coupon/index.js
index c9d6425..0e83f5e 100644
--- a/pages/user/coupon/index.js
+++ b/pages/user/coupon/index.js
@@ -8,7 +8,8 @@ Page({
   data: {
     list:[],
     moreFlag:true,
-    index:0
+    index:0,
+    showR:false
   },
 
   /**
@@ -43,6 +44,15 @@ Page({
     })
     this.getList()
   },
+  showRule(e){
+   
+   wx.showModal({
+     cancelColor: 'cancelColor',
+     showCancel:false,
+     title:"使用规则",
+     content:e.currentTarget.dataset.item.activity.use_rule_text
+   })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 9cd1416..c5db573 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -11,10 +11,12 @@
     <view class="title textOver">{{item.activity.name}}</view>
     <view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
   </view>
-  <view class="coupon-tip"><text>使用条件：</text>全场可用</view>
+  <view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
   <view class="coupon-tip"><text>有效期：</text>{{item.activity.end_time}}</view>
   <view class="coupon-tip"><text>优惠码：</text>{{item.key}}</view>
-  <view class="coupon-rule">使用规则 <text class="iconfont icon-xia"></text></view>
+  <view class="coupon-rule">
+  <view bindtap="showRule" data-item="{{item}}">使用规则  <text class="iconfont icon-xia"></text></view>
+  </view>
 </view>
 <!-- <view class="coupon-item">
   <view class="title-box">
diff --git a/pages/user/coupon/index.wxss b/pages/user/coupon/index.wxss
index e26f303..a600eb0 100644
--- a/pages/user/coupon/index.wxss
+++ b/pages/user/coupon/index.wxss
@@ -83,10 +83,9 @@ page {
   color: #999999;
 }
 .coupon-rule {
-  line-height: 79rpx;
+  line-height: 100rpx;
   font-size: 26rpx;
-  position: absolute;
-  bottom: 0;
+
 }
 .coupon-rule .iconfont {
   font-size: 28rpx;
diff --git a/pages/user/user.js b/pages/user/user.js
index ed85eca..ab9607c 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -2,6 +2,7 @@ import common from "../../utils/https/common";
 // pages/user/user.js
 import userApi from "../../utils/https/user"
 import util from '../../utils/util'
+import commonApi from "../../utils/https/common"
 let app = getApp()
 Page({
 
@@ -10,7 +11,12 @@ Page({
    */
   data: {
     height: 0,
-    info: null
+    info: null,
+    list: [], //待付款列表
+    orderList: [],//订单列表
+    timeList: [],//倒计时
+    timerOut: null,//定时器
+    formatTime:[]
   },
 
   /**
@@ -73,6 +79,7 @@ Page({
     util.pagePoint({
       event:'mine_view'
     },1)
+    this.getList()
   },
   pagePoint: function(e){
     util.pagePoint(e)
@@ -92,12 +99,126 @@ Page({
         }
       })
   },
-
+  getList:function(){
+    commonApi.user_post("order/list",{
+      state:'WAIT_PAYMENT',
+      offset:0,
+      limit:10,
+      keywords:''
+    }).then(res=>{
+      console.log(res);
+      let arr = []
+      let trr = []
+      let yrr = []
+      let reslist = res.data.list
+      this.setData({})
+      let nowDateTime = parseInt(new Date().getTime() / 1000)
+      for (let i = 0; i < reslist.length; i++) {
+        let del = nowDateTime - this.strtotime(reslist[i].create_time)
+        if (del < reslist[i].auto_close_time) {
+          trr.push(reslist[i].auto_close_time - del)
+          yrr.push(this.formatSeconds(reslist[i].auto_close_time - del))
+          arr.push(reslist[i].order_product_list[0])
+        }
+      }
+      this.setData({
+        list: arr,
+        orderList: reslist,
+        timeList: trr,
+        formatTime:yrr
+      })
+      this.timer(this.data.timeList)
+    })
+  },
+  strtotime(str) {
+    var _arr = str.split(' ');
+    var _day = _arr[0].split('-');
+    _arr[1] = (_arr[1] == null) ? '0:0:0' : _arr[1];
+    var _time = _arr[1].split(':');
+    for (let i = _day.length - 1; i >= 0; i--) {
+      _day[i] = isNaN(parseInt(_day[i])) ? 0 : parseInt(_day[i]);
+    }
+    for (let i = _time.length - 1; i >= 0; i--) {
+      _time[i] = isNaN(parseInt(_time[i])) ? 0 : parseInt(_time[i]);
+    }
+    let _temp = new Date(_day[0], _day[1] - 1, _day[2], _time[0], _time[1], _time[2]);
+    return _temp.getTime() / 1000;
+  },
+  formatSeconds(value) {
+    let secondTime = parseInt(value);
+    let minuteTime = 0;
+    let hourTime = 0;
+    if (secondTime >= 60) {
+      minuteTime = parseInt(secondTime / 60);
+      secondTime = parseInt(secondTime % 60);
+      if (minuteTime >= 60) {
+        hourTime = parseInt(minuteTime / 60);
+        minuteTime = parseInt(minuteTime % 60);
+      }
+    }
+    // 补0
+    hourTime = hourTime < 10 ? "0" + hourTime : hourTime;
+    minuteTime = minuteTime < 10 ? "0" + minuteTime : minuteTime;
+    secondTime = secondTime < 10 ? "0" + secondTime : secondTime;
+    let res = hourTime + ":" + minuteTime + ":" + secondTime;
+    return res;
+  },
+  timer(arr) {
+    let trr = []
+    let list = this.data.list
+    this.data.timerOut = setInterval(() => {
+      for (let i = 0; i < arr.length; i++) {
+        arr[i]--
+        trr[i] = this.formatSeconds(arr[i])
+        if (arr[i] == 0) {
+          arr.splice(i, 1)
+          list.splice(i, 1)
+          trr.splice(i, 1)
+        }
+      }
+      this.setData({
+        timeList: arr,
+        formatTime:trr,
+        list:list
+      })
+    }, 1000)
+  },
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    console.log(item);
+    item = this.getChild(item)
+    util.gotoOrder(item)
+  },
+  getChild(list){     
+    console.log(list);
+    let arr = {order_product_list:[]}
+    for (let i = 0; i < list.order_product_list.length; i++) {
+        if (list.order_product_list[i].product_model=="ticket") {
+            arr.order_product_list.push(list.order_product_list[i]) 
+            break
+        }   
+    }
+    if (arr.order_product_list.length>0) {
+        list.order_product_list = []
+        list.order_product_list.push(arr.order_product_list[0])
+        console.log(list);
+        return list
+    }else{
+        return list
+    }
+},
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-
+    let that = this
+    clearInterval(that.data.timerOut);
+    this.setData({
+      list: [], //待付款列表
+      orderList: [],//订单列表
+      timeList: [],//倒计时
+      formatTime:[]
+    })
   },
 
   /**
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 6fb1606..9cc4f84 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -12,7 +12,7 @@
       <view>id：{{info.id}}</view>
     </view>
   </navigator>
-  <view class="user-box" style="padding-bottom:0">
+  <view class="user-box" style="padding-bottom:20rpx">
     <navigator url="order/list" catchtap="pagePoint" data-event="mine_order" class="user-box-top">
       <text>我的订单</text>
       <view class="all-text">全部订单 <text class="iconfont icon-you"></text></view>
@@ -43,6 +43,20 @@
         <view>退货/退款</view>
       </navigator>
     </view>
+    <view class="pay" wx:if="{{list[0]}}" >
+      <swiper autoplay interval="{{3500}}" circular="true"  class="swiper">
+        <swiper-item wx:for="{{list}}">
+          <view class="s-box" bindtap="gotoDetail" data-item="{{orderList[index]}}">
+              <image style="width:248rpx;height:168rpx" mode="aspectFill" src="{{item.product_img}}"></image>
+              <view class="box-r">
+                <view class="wpay">等待付款</view>
+                <view class="time">剩余时间: <text>{{formatTime[index]}}</text></view>
+                <navigator class="btn" url="/pages/order/pay/index?id={{orderList[index].order_id}}">去支付</navigator>
+              </view>
+          </view>
+        </swiper-item>
+      </swiper>
+    </view>
   </view>
   <view class="user-box">
     <navigator url="cartlist/list" class="user-box-line" catchtap="pagePoint" data-event="mine_cart">
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index 1dc496c..d503b9e 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -43,9 +43,10 @@ page {
   margin-bottom: 20rpx;
   background: white;
   border-radius: 20rpx;
-  padding: 0 20rpx;
+  padding: 0rpx 20rpx;
   font-size: 29rpx;
   color: #333;
+
 }
 .user-box-top {
   display: flex;
@@ -87,4 +88,60 @@ page {
 }
 .user-box .user-box-line:last-child {
   border-bottom: none;
+}
+
+
+.pay {
+  width: 648rpx;
+  height: 204rpx;
+  margin: 0 auto;
+  background: #F6F6F6;
+  padding: 18rpx;
+  box-sizing: border-box;
+
+}
+
+.s-box {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.btn {
+  width: 162rpx;
+  height: 56rpx;
+  background: #FB6E4D;
+  border-radius: 28rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 56rpx;
+  text-align: center;
+  margin-top: 10rpx;
+  float:right;
+}
+.swiper{
+  height: 100% !important;
+}
+.box-r{
+  margin-left: 30rpx;
+  width: 388rpx;
+}
+.wpay{
+
+font-size: 32rpx;
+font-family: PingFang SC;
+font-weight: 400;
+color: #333333;
+
+}
+.time{
+font-size: 28rpx;
+font-family: PingFang SC;
+font-weight: 400;
+color: #666666;
+margin-top: 10rpx;
 }
\ No newline at end of file

From 2363e3d0b8fb766d18cc101eae293b36c64e4b97 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 27 Oct 2022 13:59:38 +0800
Subject: [PATCH 020/471] =?UTF-8?q?10.26=E6=96=87=E6=A1=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/profile/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/user/profile/index.js b/pages/user/profile/index.js
index 8774ede..2154e6e 100644
--- a/pages/user/profile/index.js
+++ b/pages/user/profile/index.js
@@ -174,7 +174,7 @@ Page({
       this.setData({
         info:res.data,
         avatar:res.data.avatar,
-        birthday:res.data.birthday
+        birthday:res.data.birthday?res.data.birthday:""
       })
       if(res.data.gender==2){
         this.setData({

From 129b8b85862812673135904ce63878c7d472bbb6 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Sat, 29 Oct 2022 16:54:36 +0800
Subject: [PATCH 021/471] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=95=86=E5=93=81=E4=B8=80=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js       | 145 +++++++++++++---------
 pages/info/postProductInfo/index.wxml     |  53 +++++---
 pages/info/postProductInfo/index.wxss     |  58 +++++++++
 pages/info/sceneProductInfo/index.js      |   2 +-
 pages/user/order/postOrderInfo/index.js   |  42 ++++++-
 pages/user/order/postOrderInfo/index.wxml |  17 +++
 pages/user/order/postOrderInfo/index.wxss |  53 ++++++++
 7 files changed, 290 insertions(+), 80 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index c38f82f..5135dbe 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -30,7 +30,8 @@ Page({
     shareImg: null,
     showShareFlag: false,
     allowance_data: null,
-    showAllowance: false
+    showAllowance: false,
+    tjList: [], //推荐商品列表
   },
 
   /**
@@ -108,6 +109,20 @@ Page({
       })
     })
 
+    commonApi._post("product/get_product_by_type", {
+      offset: 0,
+      limit: 6,
+      rand: true,
+      type: 'post'
+    }).then(res => {
+      try {
+        this.setData({
+          tjList: res.data.list
+        })
+      } catch (error) {
+        console.log(error);
+      }
+    })
   },
   changeAllowance: function () {
     this.setData({
@@ -263,64 +278,64 @@ Page({
       if (res && res.code != 1) {
         return;
       } else {
-    if (this.data.skuFlag == 'order') {
-      util.pagePoint({
-        event: 'product_order',
-        param: {
-          id: this.data.info.id,
-          type: this.data.info.type
-        }
-      }, 1)
-      wx.setStorageSync('login_from', 'product_order_login')
-      wx.setStorageSync('order_from', 'product_order_submit')
-      app.globalData.couponInfo = null;
-      // 购买
-      let product = [{
-        product: this.data.info,
-        sku: this.data.info.sku[this.data.skuIndex],
-        productNum: this.data.producNum
-      }];
-      app.globalData.postProduct = product;
-      app.globalData.retailId = this.data.retailId;
-      wx.navigateTo({
-        url: '/pages/order/postOrder/index',
-      })
-    } else {
-      commonApi.user_post("cart/add_sku", {
-        sku_id: this.data.info.sku[this.data.skuIndex].id,
-        num: this.data.producNum
-      }).then(res => {
-        if (res.code == 1) {
-          commonApi.user_post('cart/get_list', {}).then(res => {
-            this.setData({
-              cartCount: res.data.length
-            })
+        if (this.data.skuFlag == 'order') {
+          util.pagePoint({
+            event: 'product_order',
+            param: {
+              id: this.data.info.id,
+              type: this.data.info.type
+            }
+          }, 1)
+          wx.setStorageSync('login_from', 'product_order_login')
+          wx.setStorageSync('order_from', 'product_order_submit')
+          app.globalData.couponInfo = null;
+          // 购买
+          let product = [{
+            product: this.data.info,
+            sku: this.data.info.sku[this.data.skuIndex],
+            productNum: this.data.producNum
+          }];
+          app.globalData.postProduct = product;
+          app.globalData.retailId = this.data.retailId;
+          wx.navigateTo({
+            url: '/pages/order/postOrder/index',
           })
-          // 加动效
-          this.setData({
-            skuFlag: null,
-            aniSkuIndex: this.data.skuIndex,
-            cartImgInfo: null
+        } else {
+          commonApi.user_post("cart/add_sku", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+            num: this.data.producNum
+          }).then(res => {
+            if (res.code == 1) {
+              commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                  cartCount: res.data.length
+                })
+              })
+              // 加动效
+              this.setData({
+                skuFlag: null,
+                aniSkuIndex: this.data.skuIndex,
+                cartImgInfo: null
+              })
+              setTimeout(() => {
+                this.setData({
+                  aniSkuIndex: -1
+                })
+                wx.showModal({
+                  title: "提示",
+                  content: "去购物车结算？",
+                  success: function (res) {
+                    if (res.confirm) {
+                      wx.navigateTo({
+                        url: '/pages/user/cartlist/list',
+                      })
+                    }
+                  }
+                })
+              }, 650)
+            }
           })
-          setTimeout(() => {
-            this.setData({
-              aniSkuIndex: -1
-            })
-            wx.showModal({
-              title: "提示",
-              content: "去购物车结算？",
-              success: function (res) {
-                if (res.confirm) {
-                  wx.navigateTo({
-                    url: '/pages/user/cartlist/list',
-                  })
-                }
-              }
-            })
-          }, 650)
         }
-      })
-    }
       }
     })
 
@@ -592,6 +607,24 @@ Page({
       ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
     }
   },
+  gotoDetail: function (e) {
+    let item = e.currentTarget.dataset.item;
+    util.pagePoint({
+      event: 'recommend_click',
+      param: {
+        id: item.id,
+        type: item.type
+      }
+    }, 1)
+    if (item.type == 'travels') {
+      // 游记做特殊处理 其他都按照原来的来
+      wx.navigateTo({
+        url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+      })
+    } else {
+      util.gotoDetail(item);
+    }
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index d9fb7cd..4a088a5 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,10 +2,8 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}"
-  class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
-<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}"
-  duration="{{300}}">
+<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
+<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
   <block wx:if="{{info.videourl}}" wx:key="*this">
     <swiper-item>
       <video bindplay="playVideo" src="{{info.videourl}}" controls></video>
@@ -54,22 +52,20 @@
 </view>
 <view class="box">
   <view class="box-top">
-    <text class="iconfont icon-tiwen"></text><text>游客点评</text><text class="score"
-      wx:if="{{info && info.rate && commentTotal>0}}">{{info.rate}}分</text>
-      <navigator url="/pages/list/comments/index?productid={{id}}"  style="display: inline;">  <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong; font-weight: bold;color: #000;">></text></text>
-     </navigator>
+    <text class="iconfont icon-tiwen"></text><text>游客点评</text><text class="score" wx:if="{{info && info.rate && commentTotal>0}}">{{info.rate}}分</text>
+    <navigator url="/pages/list/comments/index?productid={{id}}" style="display: inline;"> <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong; font-weight: bold;color: #000;">></text></text>
+    </navigator>
   </view>
   <view class="empty-box" wx:if="{{!comment || comment.length==0}}">
     <view>这里空空如也，快去点评吧!</view>
     <!-- <navigator url="/pages/ask/index?id={{id}}" class="empty-btn">去点评</navigator> -->
   </view>
-  <navigator wx:for="{{comment}}" wx:for-index="index"  url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
+  <navigator wx:for="{{comment}}" wx:for-index="index" url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
     <view class="product-comment-top">
       <image src="{{item.user.avatar}}" mode="aspectFill"></image>
       <view class="comment-info">
         <view class="nickname">{{item.nickname}}</view>
-        <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text
-            wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
+        <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
       </view>
       <!-- <view class="comment-date">{{item.create_time}}</view> -->
     </view>
@@ -78,9 +74,9 @@
       <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
         <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
         </image>
-        <view class="all" wx:if="{{index==5}}" >
-        <view>共{{item.img_list.length}}张</view>
-        <view>查看全部</view>
+        <view class="all" wx:if="{{index==5}}">
+          <view>共{{item.img_list.length}}张</view>
+          <view>查看全部</view>
         </view>
       </view>
     </view>
@@ -88,6 +84,26 @@
   </navigator>
   <navigator url="/pages/list/comments/index?productid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">
     查看全部点评<text class="iconfont icon-you"></text></navigator>
+
+</view>
+<view class="proad">
+  <view class="proad-title">
+    <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
+  </view>
+  <view class="pro-list">
+    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+    <view class="item-hd">
+      <image src="{{item.headimg}}"></image>
+    </view>
+    <view class="item-bm">
+      <view class="protitle textOver">{{item.title}}</view>
+      <view class="pro-price">
+        {{item.price/100}}
+      </view>
+    </view>
+  </view>
+  </view>
+
 </view>
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
@@ -107,8 +123,7 @@
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box"
-  id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
@@ -127,8 +142,7 @@
       </view>
     </view>
     <view class="sku-names">
-      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}"
-        wx:for="{{info.sku}}">{{item.sku_name}}</view>
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{info.sku}}">{{item.sku_name}}</view>
     </view>
     <view class="number-box">
       <text>数量</text>
@@ -162,8 +176,7 @@
           <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png"
-        mode="widthFix"></image>
+      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
         <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
         </image>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index ec28d92..5896343 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -842,4 +842,62 @@ page {
   color: #666;
   font-size: 24rpx;
   margin-top: 8rpx;
+}
+.proad{
+  margin: 20rpx;
+}
+.proad-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+}
+.proad-title image{
+  width: 292rpx;
+  height: 34rpx;
+}
+.pro-list{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.proitem{
+  width: 226rpx;
+  height: 234rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+}
+.item-hd image{
+  width: 226rpx;
+  height: 130rpx;
+  border-radius: 10rpx 10rpx 0px 0px;
+}
+.item-bm{
+  padding: 8rpx 12rpx;
+}
+.protitle{
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #000000;
+}
+.pro-price{
+  color: #D62828;
+  font-weight: 500;
+  font-size: 30rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #D62828;
+  font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
+  color: #999999;
+  font-size: 10px;
 }
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 4337e9f..9ff83c7 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -250,7 +250,7 @@ Page({
   // },
   selectSku: function (e) {
     console.log(e.currentTarget.dataset.item);
-    if (e.currentTarget.dataset.item.stock == 0) {
+    if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock!=1) {
       wx.showToast({
         title: "该商品暂无库存",
         icon: 'none'
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 3f28c4e..8982e37 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -20,7 +20,9 @@ Page({
     minute:"",
     second:"",
     id:null,
-    pay_methods:app.globalData.pay_methods
+    pay_methods:app.globalData.pay_methods,
+    tjList:[],
+    showLoading:true
   },
 
   /**
@@ -30,7 +32,23 @@ Page({
     this.setData({
       id:options.id
     })
-   
+    commonApi._post("product/get_product_by_type", {
+      offset: 0,
+      limit: 6,
+      rand: true,
+      type:"venue,post,line,ticket"
+    }).then(res => {
+      this.setData({
+        showLoading:false
+      })
+      try {
+        this.setData({
+          tjList: res.data.list
+        })
+      } catch (error) {
+        console.log(error);
+      }
+    })
   },
   close:function(){
     let _this = this,info = _this.data.info;
@@ -189,6 +207,25 @@ Page({
       this.daojishi(time);
     },1000)
   },
+
+  gotoDetail: function (e) {
+    let item = e.currentTarget.dataset.item;
+    util.pagePoint({
+      event: 'recommend_click',
+      param: {
+        id: item.id,
+        type: item.type
+      }
+    }, 1)
+    if (item.type == 'travels') {
+      // 游记做特殊处理 其他都按照原来的来
+      wx.navigateTo({
+        url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+      })
+    } else {
+      util.gotoDetail(item);
+    }
+  },
   /**
    * 生命周期函数--监听页面显示
    */
@@ -234,7 +271,6 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-
   },
 
   /**
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 329d809..b60f190 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -12,6 +12,23 @@
   <view class="box-title" style="margin-top:15rpx"><text style="margin-right:20rpx">{{info.order_product_list[0].consignee_info.name}}</text><text>{{info.order_product_list[0].consignee_info.tel}}</text></view>
   <view style="font-size:26rpx;color:#333;line-height:50rpx"><text style="color:#0B898E;margin-right:10rpx" class="iconfont icon-location"></text>{{info.order_product_list[0].consignee_info.address}}</view>
 </view>
+<view class="box">
+  <view class="tj-title">商品推荐</view>
+  <view wx:if="{{showLoading}}">加载中...</view>
+  <view class="tj-list" wx:else>
+    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+    <view class="item-hd">
+      <image src="{{item.headimg}}"></image>
+    </view>
+    <view class="item-bm">
+      <view class="protitle textOver">{{item.title}}</view>
+      <view class="pro-price">
+        {{item.price/100}}
+      </view>
+    </view>
+  </view>
+  </view>
+</view>
 <view class="box" wx:if="{{info}}" style="padding-bottom:0">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
     <view class="product-info-top">
diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss
index 4e93140..eeab2be 100644
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@@ -291,4 +291,57 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
+}
+.tj-title{
+font-size: 30rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #333333;
+}
+.tj-list{
+  display: flex;
+  align-items: center;
+  overflow-x: scroll;
+  overflow-y: hidden;
+}
+
+.proitem{
+  width: 226rpx;
+  height: 234rpx;
+  background: #F5F5F5;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+  margin-right: 20rpx;
+}
+.item-hd image{
+  width: 226rpx;
+  height: 130rpx;
+  border-radius: 10rpx 10rpx 0px 0px;
+}
+.item-bm{
+  padding: 8rpx 12rpx;
+}
+.protitle{
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #000000;
+}
+.pro-price{
+  color: #D62828;
+  font-weight: 500;
+  font-size: 30rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #D62828;
+  font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
+  color: #999999;
+  font-size: 10px;
 }
\ No newline at end of file

From 5311e594aabe6b5c5f66d2dd2235e1eef12b52af Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Mon, 7 Nov 2022 09:55:49 +0800
Subject: [PATCH 022/471] =?UTF-8?q?=E5=95=86=E5=93=81=E6=8E=A8=E8=8D=90,?=
 =?UTF-8?q?=20=E6=97=A0=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/proRec/proRec.js            |  78 ++++++
 pages/component/proRec/proRec.json          |   4 +
 pages/component/proRec/proRec.wxml          |  17 ++
 pages/component/proRec/proRec.wxss          |  53 ++++
 pages/info/sceneProductInfo/index.js        |   3 +-
 pages/info/sceneProductInfo/index.wxml      |   8 +-
 pages/user/cartlist/list.js                 | 287 ++++++++++++--------
 pages/user/cartlist/list.wxml               |  12 +-
 pages/user/cartlist/list.wxss               |  17 ++
 pages/user/order/hotelOrderInfo/index.json  |   4 +-
 pages/user/order/hotelOrderInfo/index.wxml  |   1 +
 pages/user/order/hotelOrderInfo/index.wxss  |   3 +-
 pages/user/order/lineOrderInfo/index.json   |   3 +-
 pages/user/order/lineOrderInfo/index.wxml   |   3 +
 pages/user/order/museumOrderInfo/index.json |   4 +-
 pages/user/order/museumOrderInfo/index.wxml |   2 +
 pages/user/order/postOrderInfo/index.json   |   3 +-
 pages/user/order/postOrderInfo/index.wxml   |  18 +-
 pages/user/order/sceneOrderInfo/index.json  |   4 +-
 pages/user/order/sceneOrderInfo/index.wxml  |   4 +-
 20 files changed, 382 insertions(+), 146 deletions(-)
 create mode 100644 pages/component/proRec/proRec.js
 create mode 100644 pages/component/proRec/proRec.json
 create mode 100644 pages/component/proRec/proRec.wxml
 create mode 100644 pages/component/proRec/proRec.wxss

diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
new file mode 100644
index 0000000..1a34128
--- /dev/null
+++ b/pages/component/proRec/proRec.js
@@ -0,0 +1,78 @@
+// pages/component/TitleHeader.js
+import commonApi from "../../../utils/https/common.js"
+import util from '../../../utils/util'
+var app = getApp()
+Component({
+  options: {
+    styleIsolation: 'apply-shared',
+    addGlobalClass: true
+  },
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    title: {
+      type: String,
+      value: ""
+    },
+    transparent: {
+      type: String,
+      value: "0"
+    },
+    clickid: {
+      type: String,
+      value: ""
+    }
+  },
+  lifetimes: {
+    created() {
+      commonApi._post("product/get_product_by_type", {
+        offset: 0,
+        limit: 6,
+        rand: true,
+        type: "venue,post,line,ticket"
+      }).then(res => {
+        this.setData({
+          showLoading: false
+        })
+        try {
+          this.setData({
+            tjList: res.data.list
+          })
+        } catch (error) {
+          console.log(error);
+        }
+      })
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    tjList: [],
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    gotoDetail: function (e) {
+      let item = e.currentTarget.dataset.item;
+      util.pagePoint({
+        event: 'recommend_click',
+        param: {
+          id: item.id,
+          type: item.type
+        }
+      }, 1)
+      if (item.type == 'travels') {
+        // 游记做特殊处理 其他都按照原来的来
+        wx.navigateTo({
+          url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+        })
+      } else {
+        util.gotoDetail(item);
+      }
+    },
+  }
+})
\ No newline at end of file
diff --git a/pages/component/proRec/proRec.json b/pages/component/proRec/proRec.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/component/proRec/proRec.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/component/proRec/proRec.wxml b/pages/component/proRec/proRec.wxml
new file mode 100644
index 0000000..cd6fe91
--- /dev/null
+++ b/pages/component/proRec/proRec.wxml
@@ -0,0 +1,17 @@
+<view class="box">
+  <view class="tj-title">商品推荐</view>
+  <view wx:if="{{showLoading}}">加载中...</view>
+  <view class="tj-list" wx:else>
+    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+    <view class="item-hd">
+      <image src="{{item.headimg}}"></image>
+    </view>
+    <view class="item-bm">
+      <view class="protitle textOver">{{item.title}}</view>
+      <view class="pro-price">
+        {{item.price/100}}
+      </view>
+    </view>
+  </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/component/proRec/proRec.wxss b/pages/component/proRec/proRec.wxss
new file mode 100644
index 0000000..a1a7b78
--- /dev/null
+++ b/pages/component/proRec/proRec.wxss
@@ -0,0 +1,53 @@
+.tj-title{
+  font-size: 30rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  }
+  .tj-list{
+    display: flex;
+    align-items: center;
+    overflow-x: scroll;
+    overflow-y: hidden;
+  }
+  
+  .proitem{
+    width: 226rpx;
+    height: 234rpx;
+    background: #F5F5F5;
+    border-radius: 10rpx;
+    margin-top: 20rpx;
+    margin-right: 20rpx;
+  }
+  .item-hd image{
+    width: 226rpx;
+    height: 130rpx;
+    border-radius: 10rpx 10rpx 0px 0px;
+  }
+  .item-bm{
+    padding: 8rpx 12rpx;
+  }
+  .protitle{
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #000000;
+  }
+  .pro-price{
+    color: #D62828;
+    font-weight: 500;
+    font-size: 30rpx;
+  }
+  .pro-price:before {
+    display: inline-block;
+    content:"￥";
+    color: #D62828;
+    font-size: 20rpx;
+  }
+  
+  .pro-price:after {
+    display: inline-block;
+    content:'起';
+    color: #999999;
+    font-size: 10px;
+  }
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 9ff83c7..4303194 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -25,7 +25,7 @@ Page({
     allowance_data: null,
     //购物车数量
     producNum: 1,
-    skuIndex: 0,
+    skuIndex:null,
     aniSkuIndex: -1,
     cartCount: 0,
     cartImgInfo: null,
@@ -256,7 +256,6 @@ Page({
         icon: 'none'
       })
       return
-
     }
     let index = e.currentTarget.dataset.index;
     this.setData({
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index d8d9145..56416ff 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -115,17 +115,17 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{skuList[skuIndex].headimg}}" mode="aspectFill"></image>
+        <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
-          <view class="sku-price">{{tool.toFix(skuList[skuIndex].price)}}
+          <view class="sku-price">{{ isNaN(tool.toFix(skuList[skuIndex].price))?tool.toFix(skuList[skuIndex].price):tool.toFix(skuList[0].price) }}
             <view class="allowance" wx:if="{{allowance_data}}">
               补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
           </view>
-          <view class="sku-name">已选择：{{skuList[skuIndex].sku_name}}</view>
+          <view class="sku-name">已选择：{{skuList[skuIndex].sku_name || skuList[0].sku_name}}</view>
         </view>
       </view>
       <view class="sku-names">
-        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
+        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}} {{item.stock==0&&item.is_third_stock!=1?' disable':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
       </view>
       <view class="number-box">
         <text>数量</text>
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index d6a16bb..66b35b2 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -1,5 +1,6 @@
 // pages/user/cartlist/list.js
-const device = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
+const device = wx.getSystemInfoSync(),
+  rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
 const ratio = 750 / device.windowWidth;
 console.log(rect)
 const width = device.windowWidth // 示例为一个与屏幕等宽的正方形裁剪框
@@ -13,12 +14,13 @@ Page({
    * 页面的初始数据
    */
   data: {
-    menuWidth:width - rect.right + rect.width + 6,
-    list:[],
-    allChecked:false,
-    allPrice:0,
-    productType:'',
-    flag:false,//判断订单是否同时有商品和票
+    menuWidth: width - rect.right + rect.width + 6,
+    list: [],
+    allChecked: false,
+    allPrice: 0,
+    productType: '',
+    manageFlag: false,
+    flag: false, //判断订单是否同时有商品和票
   },
 
   /**
@@ -27,145 +29,164 @@ Page({
   onLoad: function (options) {
     this.getList();
   },
-  gotoDetail:function(e){
-	console.log(e)
+  manage: function () {
+    let list = this.data.list;
+    list.map(item => {
+      item.checked = 0;
+    })
+    this.setData({
+      manageFlag: !this.data.manageFlag,
+      allChecked: 0,
+      list: list,
+      allPrice: 0
+    })
+  },
+  gotoDetail: function (e) {
+    console.log(e)
     let item = e.currentTarget.dataset.item.product;
-    util.gotoDetail(item,1);
+    util.gotoDetail(item, 1);
   },
-  getList:function(){
-    commonApi.user_post("cart/get_list",{
-		// type: '1'
-    }).then(res=>{
+  getList: function () {
+    commonApi.user_post("cart/get_list", {
+      // type: '1'
+    }).then(res => {
       this.setData({
-        list:res.data
+        list: res.data
       })
     })
   },
-  minus:function(e){
-    let index = e.currentTarget.dataset.index,list = this.data.list;
+  minus: function (e) {
+    let index = e.currentTarget.dataset.index,
+      list = this.data.list;
     let num = list[index].num;
-    if(num<=1) return;
+    if (num <= 1) return;
     num = num - 1;
     list[index].num = num;
     this.setData({
-      list:list
+      list: list
     })
     this.changeNumber(list[index])
     this.updatePrice()
   },
-  add:function(e){
-    let index = e.currentTarget.dataset.index,list = this.data.list;
-    let num = list[index].num+1;
+  add: function (e) {
+    let index = e.currentTarget.dataset.index,
+      list = this.data.list;
+    let num = list[index].num + 1;
     list[index].num = num;
     this.setData({
-      list:list
+      list: list
     })
     this.changeNumber(list[index])
     this.updatePrice()
   },
-  select:function(e){
-    let index = e.currentTarget.dataset.index,list = this.data.list;
-    if(list[index].product.flag!=1 || list[index].sku.flag!='on'){
+  select: function (e) {
+    let index = e.currentTarget.dataset.index,
+      list = this.data.list;
+    if (list[index].product.flag != 1 || list[index].sku.flag != 'on') {
       wx.showToast({
         title: '产品已下架',
-        icon:'none'
+        icon: 'none'
       })
       return;
     }
-    list[index].checked = list[index].checked?false:true;
+    list[index].checked = list[index].checked ? false : true;
     this.setData({
-      list:list
+      list: list
     })
     this.updatePrice()
   },
-  selectAll:function(){
-    let list = this.data.list,allChecked = this.data.allChecked?false:true;
-    list.map(item=>{
-      if(item.sku.flag=='on' && item.product.flag==1){
+  selectAll: function () {
+    let list = this.data.list,
+      allChecked = this.data.allChecked ? false : true;
+    list.map(item => {
+      if (item.sku.flag == 'on' && item.product.flag == 1) {
         item.checked = allChecked;
       }
     })
     this.setData({
-      allChecked:allChecked,
-      list:list
+      allChecked: allChecked,
+      list: list
     })
     this.updatePrice()
   },
-  changeNumber(item){
-    commonApi.user_post("cart/update_sku",{
-      sku_id:item.sku.id,
-      num:item.num
-    }).then(res=>{
-    })
+  changeNumber(item) {
+    commonApi.user_post("cart/update_sku", {
+      sku_id: item.sku.id,
+      num: item.num
+    }).then(res => {})
   },
-  updatePrice:function(){
-    let list = this.data.list,price=0;
-    list.map(item=>{
-      if(item.checked){
+  updatePrice: function () {
+    let list = this.data.list,
+      price = 0;
+    list.map(item => {
+      if (item.checked) {
         price = price + item.sku.price * item.num;
       }
     })
     this.setData({
-      allPrice:price
+      allPrice: price
     })
   },
-  order:function(){
+  order: function () {
     app.globalData.couponInfo = null;
     util.pagePoint({
-      event:'cart_order'
-    },1)
-    let list = this.data.list,price=0,product=[],product1=[]
-    list.map(item=>{
-      if(item.checked){
+      event: 'cart_order'
+    }, 1)
+    let list = this.data.list,
+      price = 0,
+      product = [],
+      product1 = []
+    list.map(item => {
+      if (item.checked) {
         // item.product.type="post";
-        if(item.product.type == 'post'){
-			product.push({
-			  product:item.product,
-			  sku:item.sku,
-			  productNum:item.num
-			})
-		}else{
-			product1.push(item)
-			app.globalData.list = product1
-    }
-		if(item.product.type.includes('post')){
-			this.data.productType = 'post'
-		}
+        if (item.product.type == 'post') {
+          product.push({
+            product: item.product,
+            sku: item.sku,
+            productNum: item.num
+          })
+        } else {
+          product1.push(item)
+          app.globalData.list = product1
+        }
+        if (item.product.type.includes('post')) {
+          this.data.productType = 'post'
+        }
       }
     })
-    if(product.length==0 && product1.length==0) {
+    if (product.length == 0 && product1.length == 0) {
       wx.showToast({
         title: '请先选择产品',
         icon: 'none'
       })
       return;
     }
-    if (product.length>0 && product1.length>0) {
+    if (product.length > 0 && product1.length > 0) {
       this.setData({
         flag: 'mix'
       })
     }
     app.globalData.postProduct = product;
-	if(app.globalData.list){
-		app.globalData.product = app.globalData.list[app.globalData.index]
-  }
-    if(this.data.productType == 'post'){
+    if (app.globalData.list) {
+      app.globalData.product = app.globalData.list[app.globalData.index]
+    }
+    if (this.data.productType == 'post') {
       console.log(this.data.flag);
-		wx.navigateTo({
-		  url: '/pages/order/postOrder/index?from=cart&flag='+this.data.flag,
-		})
-	}else{
-		wx.navigateTo({
-		  url: '/pages/order/scene/index',
-		})
-	}
+      wx.navigateTo({
+        url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
+      })
+    } else {
+      wx.navigateTo({
+        url: '/pages/order/scene/index',
+      })
+    }
   },
-  touchStart(e){//移动前点击的位置
+  touchStart(e) { //移动前点击的位置
     console.log(e)
     // 在开始触摸时将所有startTouchMove设置为flase,对当前的为true
-    this.data.list.forEach(cart =>{
-      if(cart.isTouchMove)//当istouchMove为true
-        cart.isTouchMove = false;//其它的对象都为false
+    this.data.list.forEach(cart => {
+      if (cart.isTouchMove) //当istouchMove为true
+        cart.isTouchMove = false; //其它的对象都为false
     })
     this.setData({
       startX: e.changedTouches[0].clientX,
@@ -173,61 +194,101 @@ Page({
       list: this.data.list
     })
   },
-  touchmove(e){//移动的位置,用于计算用户滑动的弧度向左还是向右,移动了多少,可以确定删除功能的显示和隐藏
+  touchmove(e) { //移动的位置,用于计算用户滑动的弧度向左还是向右,移动了多少,可以确定删除功能的显示和隐藏
     let index = e.currentTarget.dataset.index;
     // 获取开始的x,y坐标
     let startX = this.data.startX,
-        startY = this.data.startY;
+      startY = this.data.startY;
     // 获取移动的x,x坐标
     let touchMoveX = e.changedTouches[0].clientX,
-        touchMoveY = e.changedTouches[0].clientY;
+      touchMoveY = e.changedTouches[0].clientY;
     // 调用计算角度的方法,获取角度
-    var angel = this.angel({ X: startX, Y: startY }, { X: touchMoveX, Y: touchMoveY })
+    var angel = this.angel({
+      X: startX,
+      Y: startY
+    }, {
+      X: touchMoveX,
+      Y: touchMoveY
+    })
     // 遍历cartArray
-    this.data.list.forEach((cart, i ) =>{
+    this.data.list.forEach((cart, i) => {
       cart.isTouchMove = false;
       // 滑动角度大于30,直接return 视为非滑动意思
-      if(Math.abs(angel) > 30) return;
+      if (Math.abs(angel) > 30) return;
       // 匹配当前所点击的list和滑动的list
-      if(i == index){
+      if (i == index) {
         // 匹配上后判断滑动方向
-        if (touchMoveX > startX){//左滑动隐藏删除
+        if (touchMoveX > startX) { //左滑动隐藏删除
           cart.isTouchMove = false;
-        }else{
+        } else {
           cart.isTouchMove = true;
         }
       }
     })
     // 更新数据
     this.setData({
-      list:this.data.list
+      list: this.data.list
     })
   },
-  angel(start,end){//计算滑动的角度 
+  angel(start, end) { //计算滑动的角度 
     // console.log(start,end)
     // 移动坐标减去对应的开始坐标
     var _X = end.X - start.X,
       _Y = end.Y - start.Y;
-      // 返回角度 Math.atan() 返回数字的正切值
-      return 360 * Math.atan(_Y / _X) / (2 * Math.PI)
+    // 返回角度 Math.atan() 返回数字的正切值
+    return 360 * Math.atan(_Y / _X) / (2 * Math.PI)
   },
-  del:function(e){
-    let index = e.currentTarget.dataset.index,list = this.data.list;
-    commonApi.user_post("cart/del_sku",{
-      sku_id:list[index].sku_id
-    }).then(res=>{
-      if(res.code==1){
+  del: function (e) {
+    let index = e.currentTarget.dataset.index,
+      list = this.data.list;
+    commonApi.user_post("cart/del_sku", {
+      sku_id: list[index].sku_id
+    }).then(res => {
+      if (res.code == 1) {
         wx.showToast({
           title: '删除成功',
-          icon:"success"
+          icon: "success"
         })
-        list.splice(index,1);
+        list.splice(index, 1);
         this.setData({
-          list:list
+          list: list
         })
       }
     })
   },
+  delM() {
+    let that = this
+    let arr = this.data.list
+    let suid = []
+    arr.forEach(item => {
+      if (item.checked) {
+        suid.push(item.sku_id)
+      }
+    });
+    let skuids = suid.join(',')
+    wx.showModal({
+      title: '提示',
+      content: '确定要删除选定的产品？',
+      success: function (res) {
+        if (res.confirm) {
+          commonApi.user_post("cart/del_sku", {
+            sku_id:skuids
+          }).then(res => {
+            if (res.code == 1) {
+              wx.showToast({
+                title: '删除成功',
+                icon: "success"
+              })
+              that.getList();
+            }
+          })
+          
+        } else {
+          console.log('取消')
+        }
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -240,14 +301,14 @@ Page({
    */
   onShow: function () {
     util.pagePoint({
-      event:'cart_view'
-    },1)
-	app.globalData.list = null
-	app.globalData.createDate = null
-	app.globalData.index = 0  
-	app.globalData.productPrice = 0
-	app.globalData.ticketPrice = 0
-	this.data.productType = ''
+      event: 'cart_view'
+    }, 1)
+    app.globalData.list = null
+    app.globalData.createDate = null
+    app.globalData.index = 0
+    app.globalData.productPrice = 0
+    app.globalData.ticketPrice = 0
+    this.data.productType = ''
   },
 
   /**
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index 073eed0..970316e 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -1,11 +1,11 @@
 <!--pages/user/cartlist/list.wxml-->
 <title title="购物车">
-  <!-- <view class="edit-btn" style="right:{{menuWidth}}px">管理</view> -->
+  <view class="edit-btn" style="right:{{menuWidth}}px" wx:if="{{list.length>0}}" bindtap="manage">{{manageFlag?'关闭':'管理'}}</view>
 </title>
 <view wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
   <view class="item{{(item.product.flag!=1 || item.sku.flag!='on')?' disable':''}}">
     <view class="iconfont{{item.checked?' icon-gou':' icon-quan'}}" bindtap="select" data-index="{{index}}"></view>
-    <image src="{{item.sku.headimg}}" mode="aspectFill"  bindtap="gotoDetail" data-item="{{item}}"></image>
+    <image src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
     <view class="item-info textOver">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="sku-title textOver">
@@ -28,7 +28,7 @@
   <view>暂无内容</view>
 </view>
 <view style="height:113rpx"></view>
-<view class="fixed-bottom" wx:if="{{list.length>0}}">
+<view class="fixed-bottom" wx:if="{{list.length>0&&manageFlag===false}}">
   <view bindtap="selectAll" class="iconfont{{allChecked?' icon-gou':' icon-quan'}}"></view>
   <view class="tip">合计：</view>
   <view class="bottom-price">¥{{allPrice/100}} </view>
@@ -36,3 +36,9 @@
   <view style="flex:1"></view>
   <view class="btn" bindtap="order">去下单</view>
 </view>
+
+<view class="fixed-bottom" wx:if="{{list.length>0&&manageFlag===true}}">
+  <view class="iconfont{{allChecked?' icon-gou':' icon-quan'}}" bindtap="selectAll"></view>
+  <text style="color:#666;font-size:26rpx;flex-shrink:0;margin-left:10rpx;flex:1">全选</text>
+  <view class="fixed-btn del-btn" bindtap="delM">删除</view>
+</view>
\ No newline at end of file
diff --git a/pages/user/cartlist/list.wxss b/pages/user/cartlist/list.wxss
index 6904e2d..4f59ab3 100644
--- a/pages/user/cartlist/list.wxss
+++ b/pages/user/cartlist/list.wxss
@@ -157,4 +157,21 @@ page {
 }
 .icon-gou {
   color: #D62828;
+}
+.fixed-btn {
+  width: 202rpx;
+  line-height: 84rpx;
+  background: #FB6E4D;
+  border-radius: 42rpx;
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #fff;
+  text-align: center;
+}
+.del-btn {
+  box-sizing: border-box;
+  border: 1rpx solid #FB6E4D;
+  color: #FB6E4D;
+  background: white;
+  margin-right:40rpx ;
 }
\ No newline at end of file
diff --git a/pages/user/order/hotelOrderInfo/index.json b/pages/user/order/hotelOrderInfo/index.json
index 35cf02f..cef374c 100644
--- a/pages/user/order/hotelOrderInfo/index.json
+++ b/pages/user/order/hotelOrderInfo/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec"
+
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index 5d14b9a..11bbfd8 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -40,6 +40,7 @@
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
   </view>
 </view>
+<sptj></sptj>
 <navigator url="/pages/info/hotelProductInfo/index?id={{item.scene_detail.id}}" class="box" wx:if='{{info}}' wx:for="{{info.order_product_list}}" style="padding-bottom:0">
   <view class="scene-box" style="align-items:center">
     <view class="scene-box-left">
diff --git a/pages/user/order/hotelOrderInfo/index.wxss b/pages/user/order/hotelOrderInfo/index.wxss
index c20a26f..dc9d442 100644
--- a/pages/user/order/hotelOrderInfo/index.wxss
+++ b/pages/user/order/hotelOrderInfo/index.wxss
@@ -281,4 +281,5 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
-}
\ No newline at end of file
+}
+
diff --git a/pages/user/order/lineOrderInfo/index.json b/pages/user/order/lineOrderInfo/index.json
index 35cf02f..3418379 100644
--- a/pages/user/order/lineOrderInfo/index.json
+++ b/pages/user/order/lineOrderInfo/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec"
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml
index 728b55d..47f7682 100644
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@@ -44,6 +44,9 @@
     <!-- <view class="scene-btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
   </view>
 </view>
+
+<sptj></sptj>
+
 <!--景点订单详情需要这个  -->
 <navigator url="/pages/info/roadInfo/index?id={{info.order_product_list[0].product_id}}" class="box" wx:if='{{info}}'>
   <view class="scene-box" style="align-items:center">
diff --git a/pages/user/order/museumOrderInfo/index.json b/pages/user/order/museumOrderInfo/index.json
index 35cf02f..cef374c 100644
--- a/pages/user/order/museumOrderInfo/index.json
+++ b/pages/user/order/museumOrderInfo/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec"
+
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 18db481..df360d4 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -55,6 +55,8 @@
     <!-- <view class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
   </view>
 </view>
+
+<sptj></sptj>
 <view class="box" wx:if="{{info}}">
   <view class="box-title">{{info.order_product_list[0].scene_detail.title}}</view>
   <view class="detail-item">
diff --git a/pages/user/order/postOrderInfo/index.json b/pages/user/order/postOrderInfo/index.json
index 35cf02f..3418379 100644
--- a/pages/user/order/postOrderInfo/index.json
+++ b/pages/user/order/postOrderInfo/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec"
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index b60f190..e7a33ed 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -12,23 +12,7 @@
   <view class="box-title" style="margin-top:15rpx"><text style="margin-right:20rpx">{{info.order_product_list[0].consignee_info.name}}</text><text>{{info.order_product_list[0].consignee_info.tel}}</text></view>
   <view style="font-size:26rpx;color:#333;line-height:50rpx"><text style="color:#0B898E;margin-right:10rpx" class="iconfont icon-location"></text>{{info.order_product_list[0].consignee_info.address}}</view>
 </view>
-<view class="box">
-  <view class="tj-title">商品推荐</view>
-  <view wx:if="{{showLoading}}">加载中...</view>
-  <view class="tj-list" wx:else>
-    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
-    <view class="item-hd">
-      <image src="{{item.headimg}}"></image>
-    </view>
-    <view class="item-bm">
-      <view class="protitle textOver">{{item.title}}</view>
-      <view class="pro-price">
-        {{item.price/100}}
-      </view>
-    </view>
-  </view>
-  </view>
-</view>
+<sptj></sptj>
 <view class="box" wx:if="{{info}}" style="padding-bottom:0">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
     <view class="product-info-top">
diff --git a/pages/user/order/sceneOrderInfo/index.json b/pages/user/order/sceneOrderInfo/index.json
index 35cf02f..cef374c 100644
--- a/pages/user/order/sceneOrderInfo/index.json
+++ b/pages/user/order/sceneOrderInfo/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec"
+
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 89a50c3..e304840 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -16,6 +16,9 @@
   <view class="code-state">{{info.order_product_list[0].qrcode[codeIndex].stateText}} {{codeIndex+1}}/{{codeImgs.length}}</view>
   <!-- <view bindtap="gotoSku" class="code-btn">查看苏康码</view> -->
 </view>
+
+<sptj></sptj>
+
 <!-- 景点订单详情需要这个 -->
 <view class="box" wx:if='{{product_model=="ticket"}}'>
   <view class="scene-box">
@@ -100,7 +103,6 @@
       <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view>
     </view>
   </view>
-
 </view>
 <!-- <view class="box" wx:if="{{product_model=='ticket'}}">
   <view class="box-title">使用说明</view>

From 5cdb84c9f5ee99dba2e617498e1223122ed0d0f6 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Mon, 7 Nov 2022 11:04:03 +0800
Subject: [PATCH 023/471] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 56416ff..57b1e32 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -117,7 +117,7 @@
       <view class="sku-info-box">
         <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
-          <view class="sku-price">{{ isNaN(tool.toFix(skuList[skuIndex].price))?tool.toFix(skuList[skuIndex].price):tool.toFix(skuList[0].price) }}
+          <view class="sku-price">{{skuIndex||skuIndex==0?tool.toFix(skuList[skuIndex].price):tool.toFix(skuList[0].price)}}
             <view class="allowance" wx:if="{{allowance_data}}">
               补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
           </view>

From b4ab53427da138cbcbc12157eb65a21cc8f6731a Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 8 Nov 2022 09:52:51 +0800
Subject: [PATCH 024/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index eced86f..cc29b65 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.isTest42?true:false;
+      data.isTest = data.isTest44?true:false;
       this.globalData.configJson = data
     })
     

From 7f414b5800e34a9e508cacc193b96b79b866bbc6 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Sat, 12 Nov 2022 16:43:55 +0800
Subject: [PATCH 025/471] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81,=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js   | 84 ++++++++++++++------------
 pages/info/sceneProductInfo/index.wxml |  8 +--
 pages/info/sceneProductInfo/index.wxss |  3 +
 pages/order/road/index.js              |  1 +
 4 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 4303194..aad07af 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -74,8 +74,8 @@ Page({
       // 如果带有指定skuid的话 那么取指定的sku展示
       if (options.skuid) {
         let pItem = null;
-        for (let i = 0; i < res.data.product.length; i++) {
-          for (let j = 0; j < res.data.product[i].sku.length; j++) {
+        for (let i = 0; i < res.data.product.length; i++) {//3
+          for (let j = 0; j < res.data.product[i].sku.length; j++) {//4
             if (res.data.product[i].sku[j].id == options.skuid) {
               res.data.product[i].sku = [res.data.product[i].sku[j]];
               pItem = res.data.product[i];
@@ -274,7 +274,6 @@ Page({
         })
         return;
       } else {
-        
         app.globalData.postProduct = []
         app.globalData.list = []
         if (this.data.skuFlag == 'order') {
@@ -302,9 +301,10 @@ Page({
             ...sku,
             ...product
           }
-          wx.navigateTo({
-            url: '/pages/order/scene/index',
-          })
+    
+            wx.navigateTo({
+              url: '/pages/order/scene/index',
+            })
         } else {
           commonApi.user_post("cart/add_sku", {
             sku_id: this.data.skuList[this.data.skuIndex].id,
@@ -313,7 +313,7 @@ Page({
             if (res.code == 1) {
               commonApi.user_post('cart/get_list', {}).then(res => {
                 this.setData({
-                  cartCount: res.data.length
+                  cartCount: res.data.length//5
                 })
               })
               // 加动效
@@ -661,6 +661,12 @@ Page({
       })
       return;
     }
+    if (this.data.info.product[0].type=='line') {
+      wx.navigateTo({
+        url: '/pages/order/road/index?id=' + this.data.info.product[0].id
+      })
+      return
+    }
     this.setData({
       skuFlag: 'order'
     })
@@ -687,7 +693,7 @@ Page({
   onShow: function () {
     commonApi.user_post('cart/get_list', {}).then(res => {
       this.setData({
-        cartCount: res.data.length
+        cartCount: res.data.length//1
       })
     })
     if (!wx.getStorageSync('jstrip_token')) {
@@ -695,36 +701,38 @@ Page({
     }
     if (this.data.info && this.data.info.id) {
       this.drawImg()
-      // 获取补贴
-      if (this.data.product.length == 1) {
-        commonApi.user_post("product/getProductAllowancePrice", {
-          product_code: this.data.product[0].product.product_code
-        }).then(resTwo => {
-          if (resTwo && resTwo.code == 1) {
-            this.setData({
-              allowance_data: resTwo.data
-            })
-            let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
-            let sInfo = this.data.product[0].sku
-            if (spread_price > 0) {
-              if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
-                this.setData({
-                  allowance_price: spread_price
-                })
-              } else {
-                this.setData({
-                  allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
-                })
-              }
-              this.changePrice()
-            } else {
-              this.setData({
-                allowance_price: 0
-              })
-            }
-          }
-        })
-      }
+      //// 获取补贴
+      // if (this.data.product.length == 1) {
+      //   commonApi.user_post("product/getProductAllowancePrice", {
+      //     product_code: this.data.product[0].product.product_code
+      //   }).then(resTwo => {
+      //     if (resTwo && resTwo.code == 1) {
+      //       this.setData({
+      //         allowance_data: resTwo.data
+      //       })
+      //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+      //       let sInfo = this.data.product[0].sku
+      //       if (spread_price > 0) {
+      //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+      //           this.setData({
+      //             allowance_price: spread_price
+      //           })
+      //         } else {
+      //           this.setData({
+      //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+      //           })
+      //         }
+      //         this.changePrice()
+      //       } else {
+      //         this.setData({
+      //           allowance_price: 0
+      //         })
+      //       }
+      //     }
+      //   })
+      // }
+      //// 获取补贴结束
+
     } else {
       setTimeout(() => {
         this.onShow()
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 57b1e32..6c68ef6 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -26,9 +26,9 @@
     <view class="info-address">开园时间：{{info.open_time}}</view>
     <navigator url="/pages/info/sceneInfo/index?id={{info.id}}" catchtap="pagePoint" data-event="scene_detail" class="iconfont" style="font-size:27rpx;flex-shrink:0">优待政策 | 景点介绍 <text class="iconfont icon-you" style="font-size:24rpx"></text></navigator>
   </view>
-  <view class="tags-box textOver address-box">
+  <view class="tags-box textOver address-box" bindtap="gotolocation">
     <view class="info-address">地址：{{info.address}}</view>
-    <view class="iconfont icon-daohang" bindtap="gotolocation"></view>
+    <view class="iconfont icon-daohang"></view>
   </view>
   <view class="status-text{{info.garden_flag==0?' disable':''}}" wx:if="{{info.garden_flag_text && info.garden_flag!=1}}">{{info.garden_flag_text}}</view>
 </view>
@@ -69,8 +69,8 @@
     </view>
     <view style="flex:1"></view>
     <view class="btns">
-      <view class="btn" bindtap="showCart">加入购物车</view>
-      <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view>
+      <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line'}}">加入购物车</view>
+      <view class="btn {{info.product[0].type=='line' ? 'btn-r':''}}" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view>
       <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
     </view>
   </view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 982711e..6afe625 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -840,4 +840,7 @@ page {
   color: #666;
   font-size: 24rpx;
   margin-top: 8rpx;
+}
+.btn-r{
+  border-radius: 39rpx !important;
 }
\ No newline at end of file
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 793ffdc..12379be 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -26,6 +26,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options.skuid);
     this.setData({
       id:options.id
     })

From 8485f01584fb686ca5fa79971df83e2ebc3fd900 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 14 Nov 2022 16:56:32 +0800
Subject: [PATCH 026/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index cc29b65..ea58fb9 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.isTest44?true:false;
+      data.isTest = data.isTest45?true:false;
       this.globalData.configJson = data
     })
     

From c325bc7abc36aa4daf77bb6f78f81fce59fb606c Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 21 Nov 2022 09:51:59 +0800
Subject: [PATCH 027/471] =?UTF-8?q?=E8=A1=97=E5=B7=B7=E7=BE=8E=E9=A3=9F?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         | 2 +-
 pages/info/foodInfo/index.js   | 8 +++++++-
 pages/info/foodInfo/index.wxml | 5 ++++-
 pages/info/foodInfo/index.wxss | 5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index ea58fb9..8a66e1b 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.isTest45?true:false;
+      data.isTest = data.isTest46?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/info/foodInfo/index.js b/pages/info/foodInfo/index.js
index 0314c80..a24e091 100644
--- a/pages/info/foodInfo/index.js
+++ b/pages/info/foodInfo/index.js
@@ -53,7 +53,13 @@ Page({
       }
     },500)
   },
-
+  gotolocation: function () {
+    let info = this.data.info;
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon)
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */
diff --git a/pages/info/foodInfo/index.wxml b/pages/info/foodInfo/index.wxml
index 603b3f1..61d240c 100644
--- a/pages/info/foodInfo/index.wxml
+++ b/pages/info/foodInfo/index.wxml
@@ -10,7 +10,10 @@
 </swiper>
 <view class="top-box" wx:if="{{info}}">
   <view class="title">{{info.title}}</view>
-  <view class="info-address">{{info.address}}</view>
+  <view class="info-address"  bindtap="gotolocation">
+	{{info.address}}
+	<view class="iconfont icon-daohang">
+  </view></view>
 </view>
 <view class="content">
   <rich-text nodes="{{tool.formateRichText(info.content)}}"></rich-text>
diff --git a/pages/info/foodInfo/index.wxss b/pages/info/foodInfo/index.wxss
index 10f6761..37a209a 100644
--- a/pages/info/foodInfo/index.wxss
+++ b/pages/info/foodInfo/index.wxss
@@ -26,6 +26,11 @@ page {
   color: #666;
   font-size: 27rpx;
   margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.info-address .iconfont{
+	color: #0B898E;
 }
 .content {
   font-size: 30rpx;

From 904574650d9a3dfd33ab852196e1170b19e46d6b Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 30 Nov 2022 20:38:52 +0800
Subject: [PATCH 028/471] =?UTF-8?q?=E7=BD=AE=E7=81=B0=20=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      |  2 +-
 app.wxss                    |  3 +++
 pages/user/cartlist/list.js | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 8a66e1b..34fc096 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.isTest46?true:false;
+      data.isTest = data.isTest47?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/app.wxss b/app.wxss
index 6469318..3348400 100644
--- a/app.wxss
+++ b/app.wxss
@@ -137,4 +137,7 @@ page{
   background-size: 100% 100%;
   background-repeat: no-repeat;
   margin: 0 auto;
+}
+page {
+  filter: grayscale(100%);
 }
\ No newline at end of file
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 66b35b2..ddd0c1c 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -93,6 +93,16 @@ Page({
     this.setData({
       list: list
     })
+    let flag = true
+    list.forEach(item => {
+       if (!item.checked) {
+        flag = false
+        return
+       }
+    });
+    this.setData({
+      allChecked:flag
+    })
     this.updatePrice()
   },
   selectAll: function () {

From c9fd0b07a2be25211831677f725f0c5f9321f349 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 7 Dec 2022 20:03:35 +0800
Subject: [PATCH 029/471] =?UTF-8?q?=E5=BD=A9=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js   | 2 +-
 app.wxss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 34fc096..f9630bd 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.isTest47?true:false;
+      data.isTest = data.isTest48?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/app.wxss b/app.wxss
index 3348400..7ef7977 100644
--- a/app.wxss
+++ b/app.wxss
@@ -138,6 +138,6 @@ page{
   background-repeat: no-repeat;
   margin: 0 auto;
 }
-page {
+/* page {
   filter: grayscale(100%);
-}
\ No newline at end of file
+} */
\ No newline at end of file

From 636778d8ae20d4e3290e01085f16ca4611ed5543 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 21 Dec 2022 14:04:44 +0800
Subject: [PATCH 030/471] =?UTF-8?q?=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/user/likes/index.wxml                | 2 +-
 pages/user/order/hotelOrderInfo/index.wxml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index f9630bd..a80c018 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.isTest48?true:false;
+      data.isTest = data.isTest49?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/user/likes/index.wxml b/pages/user/likes/index.wxml
index 8a55177..248ee03 100644
--- a/pages/user/likes/index.wxml
+++ b/pages/user/likes/index.wxml
@@ -11,7 +11,7 @@
     <view class="right-info">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="price">￥{{item.product.price/100}}</view>
-      <view class="location"><text class="iconfont icon-location"></text> {{item.product.address}}</view>
+      <view class="location" wx:if="{{item.product.address}}"><text class="iconfont icon-location"></text> {{item.product.address}}</view>
     </view>
   </view>
   <view class='del' catchtap="del1" data-index="{{index}}">删除</view>
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index 11bbfd8..4dc4ec0 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -55,7 +55,7 @@
   <view class="box-title">{{info.order_product_list[0].sku_name}} <text style="margin-left:10rpx">{{info.order_product_list[0].order_product_extend.days}}晚</text></view>
   <view style="margin:10rpx auto;font-size:26rpx;color:#333">房间数：{{info.order_product_list[0].product_num}}间</view>
   <view class="hotel-tips"><text class="hotel-date">{{info.order_product_list[0].order_product_extend.start_date_text}}</text><view class="hotel-days-num">{{info.order_product_list[0].order_product_extend.days}}晚</view><text class="hotel-date">{{info.order_product_list[0].order_product_extend.end_date_text}}</text></view>
-  <view class="hotel-tip">{{info.order_product_list[0].sku_model.bed_type}}  |  {{info.order_product_list[0].sku_model.breakfast}}  |  {{info.order_product_list[0].sku_model.area}}  |  {{info.order_product_list[0].sku_model.max_room_num}}人入住</view>
+  <!-- <view class="hotel-tip">{{info.order_product_list[0].sku_model.bed_type}}  |  {{info.order_product_list[0].sku_model.breakfast}}  |  {{info.order_product_list[0].sku_model.area}}  |  {{info.order_product_list[0].sku_model.max_room_num}}人入住</view> -->
 </view>
 
 <view class="box" wx:if="{{info}}">

From 97950a73cd19c517e7e2d0ad3df0034d84c2fad9 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 3 Jan 2023 11:09:44 +0800
Subject: [PATCH 031/471] =?UTF-8?q?=E8=BF=91=E6=9C=9F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/index/index.wxml                | 13 +++++++++----
 pages/info/postProductInfo/index.wxss |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index a80c018..7acd514 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.isTest49?true:false;
+      data.isTest = data.isTest50?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5be2ee0..cfbcb92 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -155,8 +155,8 @@
   </view>
   <scroll-view scroll-x style="height:360rpx" bindscroll="listenScroll" class="slide-box">
     <view class="pbservice" style="margin-bottom:30rpx">
-      <view bindtap="gotoPath" data-title="非遗鉴赏" data-path="/pages/pbService/feiyi/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb2.png" mode="widthFix"></image>
+      <view bindtap="gotoUrl" data-title="非遗鉴赏" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
         <view>非遗鉴赏</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
@@ -235,6 +235,11 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
       </view>
+	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化数字共享平台" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
+	    class="pbservice-item">
+	    <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+	    <view>公共文化数字共享平台</view>
+	  </view>
     </view>
   </scroll-view>
   <view class="scroll-line">
@@ -350,8 +355,8 @@
         <view wx:else class="hot-item">
           <view style="position:relative">
             <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <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 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>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 5896343..23dd449 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -20,7 +20,7 @@ page {
   background: white;
   position: relative;
   z-index: 1;
-  margin-top: -60rpx;
+  margin-top: -20rpx;
   padding: 20rpx 40rpx;
 }
 

From 9be8235642aea1a60b7d0f605961cae9cc386401 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 3 Jan 2023 20:58:25 +0800
Subject: [PATCH 032/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index cfbcb92..9a6d415 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -199,12 +199,12 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view>
       </view>
-      <view bindtap="gotoUrl" data-title="廉洁地图"
+      <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
         data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
-      </view>
+      </view> -->
       <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
@@ -235,10 +235,10 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
       </view>
-	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化数字共享平台" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
+	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
 	    class="pbservice-item">
 	    <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-	    <view>公共文化数字共享平台</view>
+	    <view>公共文化资源库</view>
 	  </view>
     </view>
   </scroll-view>

From ad616b543e5ba2e959d62771b3ee1165051fbad1 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sun, 29 Jan 2023 10:41:06 +0800
Subject: [PATCH 033/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5ui=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 279 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 146 insertions(+), 133 deletions(-)

diff --git a/app.js b/app.js
index 7acd514..b38ef2f 100644
--- a/app.js
+++ b/app.js
@@ -2,17 +2,16 @@
 import commonApi from "./utils/https/common"
 App({
   onLaunch: function (options) {
-    if(options.query.authCode){
+    if (options.query.authCode) {
       wx.setStorageSync('authCode', options.query.authCode)
-    }
-    else {
+    } else {
       wx.removeStorageSync('authCode')
     }
     this.updateApp()
     let rect = wx.getSystemInfoSync();
-    this.globalData.safeBottom = rect.safeArea?(rect.safeArea.bottom - rect.safeArea.height):0
+    this.globalData.safeBottom = rect.safeArea ? (rect.safeArea.bottom - rect.safeArea.height) : 0
     // 获取uuid
-    commonApi._post("browse/get_uuid",{}).then(res=>{
+    commonApi._post("browse/get_uuid", {}).then(res => {
       // console.log('uuid',res);
       this.globalData.uuid = res.data.uuid;
       wx.setStorageSync('uuid', res.data.uuid)
@@ -22,10 +21,21 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest50?true:false;
+      data.isTest = data.isTest51 ? true : false;
       this.globalData.configJson = data
+    }).then(() => {
+      // 获取ui配置文件
+      commonApi._post("adv/get_home_ui", {}).then(res => {
+        let obj = {}
+        res.data.content.forEach(item => {
+          obj[item.id] = item.image
+        });
+        this.globalData.configJson.indexSeason = obj
+      })
     })
-    
+
+
+
 
     // 获取用户信息
     // wx.getSetting({
@@ -50,40 +60,43 @@ App({
     this.getShareCategoryId()
   },
   // 更新提示
-  updateApp:function(){
+  updateApp: function () {
     const updateManager = wx.getUpdateManager()
     updateManager.onCheckForUpdate(function (res) {
       // 请求完新版本信息的回调
       if (res.hasUpdate) {
         wx.showLoading({
-          title:'更新下载中...',
+          title: '更新下载中...',
         })
       }
     })
     updateManager.onUpdateReady(function () {
       wx.hideLoading();
       wx.showModal({
-        title:'更新提示',
-        content:'新版本已经准备好，是否重启应用？',
-        success:function (res) {
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success: function (res) {
           if (res.confirm) {
             // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
             updateManager.applyUpdate()
           }
         }
       })
- 
+
     })
     updateManager.onUpdateFailed(function () {
       // 新的版本下载失败
       wx.hideLoading();
-      wx.showToast({ title:'下载失败...', icon:"none" });
+      wx.showToast({
+        title: '下载失败...',
+        icon: "none"
+      });
     })
   },
-  getShareCategoryId:function(){
-    commonApi._post("share/getShareList",{}).then(res=>{
+  getShareCategoryId: function () {
+    commonApi._post("share/getShareList", {}).then(res => {
       let CategoryIds = {}
-      res.data.map(item=>{
+      res.data.map(item => {
         CategoryIds[item.mini] = item.id;
       })
       this.globalData.CategoryIds = CategoryIds;
@@ -91,154 +104,154 @@ App({
     })
   },
   //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");
+  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 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, "");
+    //-- 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 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 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');
+    //-- 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;
-},
+    return returnText;
+  },
   //重写分享方法
   overShare: function () {
     //监听路由切换
     //间接实现全局设置分享内容
     let that = this;
     wx.onAppRoute(function (res) {
-        //获取加载的页面
-        let pages = getCurrentPages(),
-            //获取当前页面的对象
-            view = pages[pages.length - 1];
-        if(view &&  view.options && view.options.category_id){
-          that.globalData.category_id = view.options.category_id;
-          commonApi._post("share/share",{
-            id:view.options.category_id,
-            url:view.route
-          }).then(res=>{
-            console.log(res)
-          })
-        }
-        let category_id = that.globalData.CategoryIds[view.route] || null;
-        if(view.route.indexOf('bike/index')!=-1 && !category_id){
-          category_id = that.globalData.CategoryIds[view.route+'?type='+view.options.type]
+      //获取加载的页面
+      let pages = getCurrentPages(),
+        //获取当前页面的对象
+        view = pages[pages.length - 1];
+      if (view && view.options && view.options.category_id) {
+        that.globalData.category_id = view.options.category_id;
+        commonApi._post("share/share", {
+          id: view.options.category_id,
+          url: view.route
+        }).then(res => {
+          console.log(res)
+        })
+      }
+      let category_id = that.globalData.CategoryIds[view.route] || null;
+      if (view.route.indexOf('bike/index') != -1 && !category_id) {
+        category_id = that.globalData.CategoryIds[view.route + '?type=' + view.options.type]
+      }
+      if (category_id) {
+        view.options = view.options ? view.options : {};
+        let str = [];
+        for (let i in view.options) {
+          str.push(i + '=' + view.options[i])
         }
-        if (category_id) {
-          view.options = view.options?view.options:{};
-          let str=[];
-          for(let i in view.options){
-            str.push(i+'='+view.options[i])
-          }
-          str = str.join("&");
-          view.onShareAppMessage = function () {
-            //你的分享配置
-            return {
-                path: view.route+'?'+str+'&category_id='+category_id
-            };
-          }
+        str = str.join("&");
+        view.onShareAppMessage = function () {
+          //你的分享配置
+          return {
+            path: view.route + '?' + str + '&category_id=' + category_id
+          };
         }
+      }
     })
-},
+  },
   globalData: {
-    CategoryIds:{},//分享出去的页面id
-    category_id:"",//分享进来的参数
-    from:"",// 是否是从其他小程序跳转过来的 如果是从其他小程序跳转的话 会记录
-    uuid:null,// 设备唯一uuid
+    CategoryIds: {}, //分享出去的页面id
+    category_id: "", //分享进来的参数
+    from: "", // 是否是从其他小程序跳转过来的 如果是从其他小程序跳转的话 会记录
+    uuid: null, // 设备唯一uuid
     // 苏州市政府的经纬度
-    latitude:"31.297401",//纬度
-    longitude:"120.585639",//经度
+    latitude: "31.297401", //纬度
+    longitude: "120.585639", //经度
     userInfo: null,
-    couponInfo:null,
-    mapKey:"DEUBZ-GG7RR-UZDWR-WXZD3-TARU5-4TB42",
-    safeBottom:0,
-    product:null,
-    postProduct:[],
-	ticketProduct:[],
-	index: 0,
-	createDate: null,
-	list: null,
-	productPrice: 0,
-	ticketPrice: 0,
-    productState:{
-      "WAIT_PAYMENT":"待付款",
-      "WAIT_CONFIRM":"待确认",
-      "WAIT_POST":"待发货",
-      "WAIT_USE":"待出行",
-      'WAIT_DELIVERY':'待收货',
-      'WAIT_COMMENT':'待评价',
-      "NEED_REFUND":"退款退货",
+    couponInfo: null,
+    mapKey: "DEUBZ-GG7RR-UZDWR-WXZD3-TARU5-4TB42",
+    safeBottom: 0,
+    product: null,
+    postProduct: [],
+    ticketProduct: [],
+    index: 0,
+    createDate: null,
+    list: null,
+    productPrice: 0,
+    ticketPrice: 0,
+    productState: {
+      "WAIT_PAYMENT": "待付款",
+      "WAIT_CONFIRM": "待确认",
+      "WAIT_POST": "待发货",
+      "WAIT_USE": "待出行",
+      'WAIT_DELIVERY': '待收货',
+      'WAIT_COMMENT': '待评价',
+      "NEED_REFUND": "退款退货",
       "CLOSED": "已取消",
       "PAID": "已支付",
-      "WAIT_REFUND":"待退款",
-      "REFUND":"已退款",
-      "COMPLETED":"已完成",
-      "EXPIRED":"已过期/已失效",
-      "REFUNDING":"退款中" ,
-      "TICKET_ERROR":"出票失败",
-      "REFUND_FAIL":"退订失败"
+      "WAIT_REFUND": "待退款",
+      "REFUND": "已退款",
+      "COMPLETED": "已完成",
+      "EXPIRED": "已过期/已失效",
+      "REFUNDING": "退款中",
+      "TICKET_ERROR": "出票失败",
+      "REFUND_FAIL": "退订失败"
     },
-    orderState:{
-      "UNPAID":"待付款",
+    orderState: {
+      "UNPAID": "待付款",
       // "WAIT_PAYMENT":"待付款",
       // "WAIT_CONFIRM":"待确认",
       // "WAIT_POST":"待发货",
       // "WAIT_USE":"待出行",
       // 'WAIT_DELIVERY':'待收货',
-      'WAIT_COMMENT':'待评价',
+      'WAIT_COMMENT': '待评价',
       // "NEED_REFUND":"退款退货",
       "CLOSED": "已取消",
       "PAID": "已支付",
-      "WAIT_REFUND":"待退款",
-      "REFUND":"已退款",
-      "COMPLETED":"已完成",
+      "WAIT_REFUND": "待退款",
+      "REFUND": "已退款",
+      "COMPLETED": "已完成",
       // "EXPIRED":"已过期/已失效",
-      "REFUNDING":"退款中" ,
-      'REFUND_REFUSE':'退款拒绝',
-      'REFUND_ERROR':'退款异常',
-      'OFFLINE_REFUND':'线下退款完成',
-      'OFFLINE_WAIT':'线下退款处理中'
+      "REFUNDING": "退款中",
+      'REFUND_REFUSE': '退款拒绝',
+      'REFUND_ERROR': '退款异常',
+      'OFFLINE_REFUND': '线下退款完成',
+      'OFFLINE_WAIT': '线下退款处理中'
     },
-    codeState:['未使用','已使用','已失效','已取消'],
-    weburl:"",
-    pay_methods:{
-      NONE:"无需支付",
-      WEIXIN:"微信支付",
-      JIANSHEYINHANG:"建行支付",
-      ZHIFUBAO:"支付宝支付"
+    codeState: ['未使用', '已使用', '已失效', '已取消'],
+    weburl: "",
+    pay_methods: {
+      NONE: "无需支付",
+      WEIXIN: "微信支付",
+      JIANSHEYINHANG: "建行支付",
+      ZHIFUBAO: "支付宝支付"
     },
-    kjId:null,
-    gp_id:null,
-    team_id:null,
-    retailId:"",
-    configJson:null,
-    prizeId:null,
-    loginPageEvent:{
+    kjId: null,
+    gp_id: null,
+    team_id: null,
+    retailId: "",
+    configJson: null,
+    prizeId: null,
+    loginPageEvent: {
       "pages/list/message/index": 'message_login_'
     }
   }

From 189bf0bd44340a207c6606733f9e72df890a0c5c Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 30 Jan 2023 14:04:29 +0800
Subject: [PATCH 034/471] =?UTF-8?q?=E7=94=B5=E5=BD=B1=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            | 4 ++--
 pages/list/activitynew/index.wxml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index b38ef2f..62c9fb0 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.isTest51 ? true : false;
+      data.isTest = data.isTest52 ? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
@@ -30,7 +30,7 @@ App({
         res.data.content.forEach(item => {
           obj[item.id] = item.image
         });
-        this.globalData.configJson.indexSeason = obj
+        this.globalData.configJson.indexSeason = obj 
       })
     })
 
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index e74532c..1de916c 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -31,10 +31,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
     </view> -->
-    <view class="type-item" bindtap="changeType" data-type="4">
+    <!-- <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view>
+    </view> -->
     <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>

From 1f3c7be72049ef1cda34588d3bdc3a939cd08bad Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 31 Jan 2023 17:42:30 +0800
Subject: [PATCH 035/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/TitleHeader.js        | 10 +++---
 pages/index/index.wxml                | 46 ++++++++++++++-------------
 pages/index/index.wxss                |  2 ++
 pages/list/activitynew/index.js       |  1 +
 pages/list/museum/index.wxml          |  4 +--
 pages/list/scene/index.js             |  3 +-
 pages/list/six/index.wxml             |  4 +--
 pages/list/six/index.wxss             |  3 +-
 pages/list/strategy/index.js          |  8 +++--
 pages/pbService/appreciate/index.js   |  1 +
 pages/pbService/appreciate/index.wxml |  4 +--
 pages/user/service/index.js           |  2 +-
 12 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 1bb59d9..3791421 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -69,11 +69,11 @@ Component({
           })
         }
       }
-	  else if (pages[pages.length-1].route.indexOf('cartlist') != -1){
-		  wx.switchTab({
-		    url: '/pages/user/user'
-		  })
-	  }
+	  // else if (pages[pages.length-1].route.indexOf('cartlist') != -1){
+		//   wx.switchTab({
+		//     url: '/pages/user/user'
+		//   })
+	  // }
 	  else if (pages[pages.length-1].route.indexOf('orderList') != -1){
       console.log(11111);
 		  wx.navigateTo({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9a6d415..5bf0986 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,11 +179,21 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <view bindtap="gotoUrl" data-title="数字文物"
+      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+        <view>云上文博会</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
+        <view>投资导引图</view>
+      </view>
+      <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
         <view>数字文物</view>
-      </view>
+      </view> -->
       <view bindtap="gotoPath" data-event="institution_click" 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>
@@ -194,21 +204,22 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
         <view>团体预约</view>
       </view> -->
-      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-        <view>投资导引图</view>
-      </view>
+
       <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
         data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
-      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-        <view>云上文博会</view>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view>
+      </view>
+      <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+        <view>文化配送</view>
       </view>
       <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
         data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
@@ -225,16 +236,7 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
         <view>视觉中心</view>
       </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view>
-      </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-        <view>文化配送</view>
-      </view>
+
 	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
 	    class="pbservice-item">
 	    <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
@@ -360,9 +362,9 @@
           </view>
           <view class="hot-info">
             <view class="hot-title">{{item.title}}</view>
-            <view class="tags textOver">
+            <!-- <view class="tags textOver">
               <view wx:for="{{item.ext.display_tags}}" class="tag textOver">{{item}}</view>
-            </view>
+            </view> -->
             <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>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 959a2ef..80f2505 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -376,6 +376,8 @@
 .hot-price {
   color: #D62828;
   font-size: 24rpx;
+  margin-top:28rpx;
+
 }
 .hot-price text:nth-child(2){
   font-size: 33rpx;
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index f3ae26e..a094d64 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -108,6 +108,7 @@ Page({
       pageNo:1,
       total:1,
       moreFlag:true,
+      selectDay:null
     })
     this.getList()
   },
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 0157b4b..7d1b16a 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -26,13 +26,13 @@
           </view>
           <view class="iconfont icon-you"></view>
         </view>
-        <view class="com-flex" style="margin-bottom:0" catchtap="gotoDetailOther" data-id='52136'>
+        <!-- <view class="com-flex" style="margin-bottom:0" catchtap="gotoDetailOther" data-id='52136'>
           <view>
             <text>探索体验馆</text>
             <view style="color:#888888;font-size:21rpx">含博物馆西馆</view>
           </view>
           <view class="iconfont icon-you"></view>
-        </view>
+        </view> -->
       </view>
     </view>
   </view>
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 7b1dbeb..eb9e183 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -70,7 +70,8 @@ Page({
         item.tags = item.display_tags?item.display_tags.split(","):[];
         item.tags = item.tags.splice(0,2);
         if(item.distance && item.distance>=1000){
-          item.distance = item.distance/1000 + "km"
+          item.distance = item.distance/1000 
+          item.distance = item.distance.toFixed(1) + "km"
         }
         else if(item.distance){
           item.distance = item.distance + "m"
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 075a0fc..e3e1e40 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -32,10 +32,10 @@
     <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
   </navigator>
-  <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+  <!-- <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
     <image class="purple-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon4.png" mode="widthFix"></image>
     <view>电影购票</view>
-  </navigator>
+  </navigator> -->
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
diff --git a/pages/list/six/index.wxss b/pages/list/six/index.wxss
index 01e1376..a8ad548 100644
--- a/pages/list/six/index.wxss
+++ b/pages/list/six/index.wxss
@@ -95,7 +95,7 @@
 }
 .new-icons {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   text-align: center;
   margin: 0 25rpx;
   font-size: 27rpx;
@@ -113,6 +113,7 @@
 .new-icon {
   width: 131rpx;
   margin-bottom: 20rpx;
+  margin-right: 15rpx;
 }
 .new-icon image.green-shadow {
   box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(41, 176, 100, 0.24);
diff --git a/pages/list/strategy/index.js b/pages/list/strategy/index.js
index 723c474..a69bf5b 100644
--- a/pages/list/strategy/index.js
+++ b/pages/list/strategy/index.js
@@ -19,7 +19,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getList()
   },
   changeType:function(e){
     let type = e.currentTarget.dataset.type;
@@ -116,7 +115,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.setData({
+      list:[],
+      page_no:1,
+      total:1,
+    })
+    this.getList()
   },
 
   /**
diff --git a/pages/pbService/appreciate/index.js b/pages/pbService/appreciate/index.js
index 7857825..5703e2d 100644
--- a/pages/pbService/appreciate/index.js
+++ b/pages/pbService/appreciate/index.js
@@ -103,6 +103,7 @@ Page({
   },
   gotoDetail:function(e){
     let info = e.currentTarget.dataset.info;
+    console.log(this.data.type);
     if(this.data.type==2) {
       if(this.data.isIos==false){
         this.setData({
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index 1850f03..7cecc02 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -19,7 +19,7 @@
     <view class="subtitle textOver">{{item.CatalogName || item.Tag}}</view>
   </view>
 </view>
-<view class="mask"  wx:if="{{imgInfo}}" catchtouchmove="preventTouchMove">
+<!-- <view class="mask"  wx:if="{{imgInfo}}" catchtouchmove="preventTouchMove">
   <view class="mask-bg" bindtap="closeImg"></view>
   <image bindtap="closeImg" style="width:100%;height:100%;display:block" src="{{imgInfo.Pic}}" mode="aspectFit"></image>
-</view>
\ No newline at end of file
+</view> -->
\ No newline at end of file
diff --git a/pages/user/service/index.js b/pages/user/service/index.js
index 214336e..4b01b44 100644
--- a/pages/user/service/index.js
+++ b/pages/user/service/index.js
@@ -53,7 +53,7 @@ Page({
     commonApi._post("ics/getQuestionByTypeId",{
       type_id:this.data.typeId,
       page_no:1,
-      page_num:10
+      page_num:5
     }).then(res=>{
       this.setData({
         list:res.data.rows,

From 563c29d97ee6cc4cc752f3579879e645cef57400 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 31 Jan 2023 17:44:56 +0800
Subject: [PATCH 036/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 62c9fb0..4d36d15 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.isTest52 ? true : false;
+      data.isTest = data.isTest53? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From f0478926f9d3a090d45ea5864ebd41b667c02292 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 1 Feb 2023 10:18:18 +0800
Subject: [PATCH 037/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=8B?=
 =?UTF-8?q?=E6=9E=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/cartlist/list.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index ddd0c1c..5ee79aa 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -83,11 +83,13 @@ Page({
     let index = e.currentTarget.dataset.index,
       list = this.data.list;
     if (list[index].product.flag != 1 || list[index].sku.flag != 'on') {
-      wx.showToast({
-        title: '产品已下架',
-        icon: 'none'
-      })
-      return;
+      if (!this.data.manageFlag) {
+        wx.showToast({
+          title: '产品已下架',
+          icon: 'none'
+        })
+        return;
+      }
     }
     list[index].checked = list[index].checked ? false : true;
     this.setData({

From 5c189125604d7e58f562eb1e685621805003fb16 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 3 Feb 2023 17:12:52 +0800
Subject: [PATCH 038/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.js | 406 +++++++++++++++++---------------
 pages/list/scene/index.js       |   1 -
 2 files changed, 211 insertions(+), 196 deletions(-)

diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index a094d64..0ba8d01 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -8,25 +8,25 @@ Page({
    * 页面的初始数据
    */
   data: {
-    isYL:false,
-    selectDay:new Date().getTime(),
-    days: ['日','一','二','三','四','五','六'],
-    types:[null,'show','exhibition','scene','movie','lecture','other'],
-    weeks:[],
-    pageNo:1,
-    sort:"",
-    list:[],
-    date:null,
-    total:1,
-    areas:['姑苏','吴江','苏州'],
-    area:0,
-    type:2,
-    movieType:1,
-    moreFlag:true,
-    lat:"",
-    lon:"",
-    keywords:"",
-    realKeywords:""
+    isYL: false,
+    selectDay: new Date().getTime(),
+    days: ['日', '一', '二', '三', '四', '五', '六'],
+    types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other'],
+    weeks: [],
+    pageNo: 1,
+    sort: "",
+    list: [],
+    date: null,
+    total: 1,
+    areas: ['姑苏', '吴江', '苏州'],
+    area: 0,
+    type: 2,
+    movieType: 1,
+    moreFlag: true,
+    lat: "",
+    lon: "",
+    keywords: "",
+    realKeywords: ""
   },
 
   /**
@@ -34,317 +34,333 @@ Page({
    */
   onLoad: function (options) {
     let d = new Date();
-    let month = d.getMonth() + 1,day = d.getDate();
-    month = month>10?month:("0"+month);
-    day = day>10?day:("0"+day);
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
     this.setData({
-      selectDay:d.getTime(),
-      date:d.getFullYear()+"-"+month+"-"+day
+      selectDay: d.getTime(),
+      date: d.getFullYear() + "-" + month + "-" + day
     })
     this.getWeekDay();
-    commonApi._post("pbservice/Other/getSuzhouAreas").then(res=>{
+    commonApi._post("pbservice/Other/getSuzhouAreas").then(res => {
       res.data.unshift({
-        area_code:"",
-        area_name:"苏州市"
+        area_code: "",
+        area_name: "苏州市"
       })
-      if(options.area_code){
-        let index = res.data.findIndex(item=>item.area_code==options.area_code);
+      if (options.area_code) {
+        let index = res.data.findIndex(item => item.area_code == options.area_code);
         this.setData({
-          area:index
+          area: index
         })
       }
       this.setData({
-        areas:res.data
+        areas: res.data
+      })
+      let that = this
+      wx.getLocation({
+        type: 'gcj02',
+        success: function (res) {
+          that.setData({
+            lat: res.latitude,
+            lon: res.longitude
+          })
+          that.getList()
+        },
+        fail: function () {
+          that.getList()
+        }
       })
-      this.getList()
     })
   },
-  changeType:function(e){
+  changeType: function (e) {
     this.setData({
-      type:e.currentTarget.dataset.type,
-      list:[],
-      total:1,
-      pageNo:1,
-      moreFlag:true,
-      keywords:"",
-      realKeywords:""
+      type: e.currentTarget.dataset.type,
+      list: [],
+      total: 1,
+      pageNo: 1,
+      moreFlag: true,
+      keywords: "",
+      realKeywords: ""
     })
     this.getList();
   },
-  changeArea:function(e){
+  changeArea: function (e) {
     this.setData({
-      area:e.detail.value,
-      list:[],
-      total:1,
-      pageNo:1,
-      moreFlag:true
+      area: e.detail.value,
+      list: [],
+      total: 1,
+      pageNo: 1,
+      moreFlag: true
     })
     this.getList()
   },
   // 获取当前选择日期的一周日期范围
-  getWeekDay:function(){
-    var myDate = this.data.selectDay, daySecond = 24 * 60 * 60 * 1000,reslist=[];
-    for (let i = myDate - daySecond * 3; i <= myDate + daySecond * 3; i = i + daySecond){
-      let day = new Date(i),putDate = day.getDate();
-      putDate = putDate>=10?putDate:'0'+putDate
+  getWeekDay: function () {
+    var myDate = this.data.selectDay,
+      daySecond = 24 * 60 * 60 * 1000,
+      reslist = [];
+    for (let i = myDate - daySecond * 3; i <= myDate + daySecond * 3; i = i + daySecond) {
+      let day = new Date(i),
+        putDate = day.getDate();
+      putDate = putDate >= 10 ? putDate : '0' + putDate
       let item = {
-        times:i,
-        day:this.data.days[day.getDay()],
-        date:putDate,
-        isSelect:i==myDate
-      }; 
+        times: i,
+        day: this.data.days[day.getDay()],
+        date: putDate,
+        isSelect: i == myDate
+      };
       reslist.push(item);
     }
     this.setData({
       weeks: reslist
     })
   },
-  yulan:function(e){
+  yulan: function (e) {
     let flag = e.currentTarget.dataset.flag;
-    if(flag==0 && this.data.isYL || flag==1 && this.data.isYL==false) return;
+    if (flag == 0 && this.data.isYL || flag == 1 && this.data.isYL == false) return;
     this.setData({
-      isYL:flag==0,
-      list:[],
-      pageNo:1,
-      total:1,
-      moreFlag:true,
-      selectDay:null
+      isYL: flag == 0,
+      list: [],
+      pageNo: 1,
+      total: 1,
+      moreFlag: true,
+      selectDay: null
     })
     this.getList()
   },
-  getYL:function(){
+  getYL: function () {
     let list = this.data.list;
-    commonApi._post("pbservice/Actcalendar/getActPrevList",{
-      page_no:this.data.pageNo,
-      category:this.data.types[this.data.type],
-      keywords:this.data.realKeywords,
-      area_key:this.data.areas[this.data.area].area_code,
-      page_num:10
-    }).then(res=>{
+    commonApi._post("pbservice/Actcalendar/getActPrevList", {
+      page_no: this.data.pageNo,
+      category: this.data.types[this.data.type],
+      keywords: this.data.realKeywords,
+      area_key: this.data.areas[this.data.area].area_code,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      page_num: 10
+    }).then(res => {
       this.setData({
-        total:res.data.total,
-        list:list.concat(res.data.rows),
-        pageNo:this.data.pageNo+1
+        total: res.data.total,
+        list: list.concat(res.data.rows),
+        pageNo: this.data.pageNo + 1
       })
     })
   },
   // picker修改日期
-  bindDateChange:function(e){
+  bindDateChange: function (e) {
     this.setData({
       selectDay: new Date(e.detail.value).getTime(),
-      list:[],
-      pageNo:1,
-      total:1,
-      date:e.detail.value,
-      moreFlag:true,
-      isYL:false
+      list: [],
+      pageNo: 1,
+      total: 1,
+      date: e.detail.value,
+      moreFlag: true,
+      isYL: false
     })
     this.getWeekDay();
     this.getList();
   },
   // 点击修改日期
-  changeDate:function(e){
-    let times = e.currentTarget.dataset.times,d = new Date(times);
-    let month = d.getMonth()+1,day = d.getDate();
-    month = month>10?month:('0'+month);
-    day = day>10?day:('0'+day);
+  changeDate: function (e) {
+    let times = e.currentTarget.dataset.times,
+      d = new Date(times);
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ('0' + month);
+    day = day > 10 ? day : ('0' + day);
     this.setData({
       selectDay: times,
-      date:d.getFullYear()+"-"+month+"-"+day,
-      list:[],
-      pageNo:1,
-      total:1,
-      moreFlag:true,
-      isYL:false
+      date: d.getFullYear() + "-" + month + "-" + day,
+      list: [],
+      pageNo: 1,
+      total: 1,
+      moreFlag: true,
+      isYL: false
     })
     this.getList();
   },
-  getList:function(){
+  getList: function () {
     let list = this.data.list;
-    if(this.data.isYL){
+    if (this.data.isYL) {
       this.getYL();
       return;
     }
-    if(this.data.type==4){
+    if (this.data.type == 4) {
       this.getMovie();
       return;
     }
-    if(list.length>=this.data.total) return;
-    commonApi._post('pbservice/Actcalendar/getActList',{
-      page_no:this.data.pageNo,
-      date:this.data.date,
-      category:this.data.types[this.data.type],
-      keywords:this.data.realKeywords,
-      area_key:this.data.areas[this.data.area].area_code,
-      page_num:10
-    }).then(res=>{
+    if (list.length >= this.data.total) return;
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: this.data.pageNo,
+      date: this.data.date,
+      category: this.data.types[this.data.type],
+      keywords: this.data.realKeywords,
+      area_key: this.data.areas[this.data.area].area_code,
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 10
+    }).then(res => {
       let now = new Date().getTime();
-      res.data.rows.map(item=>{
-        if(item.end_date){
+      res.data.rows.map(item => {
+        if (item.end_date) {
           let end_date = item.end_date;
-          if(end_date.indexOf(":")==-1){
-            end_date = end_date+" 23:59:59";
+          if (end_date.indexOf(":") == -1) {
+            end_date = end_date + " 23:59:59";
           }
-         end_date = new Date(end_date.replace(/-/g,'/')).getTime();
-          if(end_date<now){
+          end_date = new Date(end_date.replace(/-/g, '/')).getTime();
+          if (end_date < now) {
             item.is_end = true;
-          }
-          else {
+          } else {
             item.is_end = false;
           }
         }
       })
       this.setData({
-        total:res.data.total,
-        list:list.concat(res.data.rows),
-        pageNo:this.data.pageNo+1
+        total: res.data.total,
+        list: list.concat(res.data.rows),
+        pageNo: this.data.pageNo + 1
       })
     })
   },
-  getMovie:function(e){
-    if(!this.data.moreFlag) return;
-    let service={
-      1:"getHotMovieList",
-      2:"getCinemaList",
-      3:'getSoonShowsList'
+  getMovie: function (e) {
+    if (!this.data.moreFlag) return;
+    let service = {
+      1: "getHotMovieList",
+      2: "getCinemaList",
+      3: 'getSoonShowsList'
     };
     let data = {
-      page:this.data.pageNo,
-      pageSize:10
+      page: this.data.pageNo,
+      pageSize: 10
     };
-    if(this.data.movieType==2){
+    if (this.data.movieType == 2) {
       data.lat = this.data.lat;
       data.lon = this.data.lon;
-      data.is_price_sort = this.data.sort=='price';
-      data.is_distance_sort = this.data.sort=='distance';
+      data.is_price_sort = this.data.sort == 'price';
+      data.is_distance_sort = this.data.sort == 'distance';
     }
     // if(this.data.movieType==1){
     //   data.queryDate = this.data.date
     // }
-    if(this.data.movieType==2 && !this.data.lon){
+    if (this.data.movieType == 2 && !this.data.lon) {
       wx.getLocation({
         type: 'gcj02',
-        success:(res)=>{
+        success: (res) => {
           this.setData({
-            lat:res.latitude,
-            lon:res.longitude
+            lat: res.latitude,
+            lon: res.longitude
           })
-          data.lat =res.latitude;
-          data.lon =res.longitude;
-          commonApi._post('Cinema/'+service[this.data.movieType],data).then(res=>{
-            res.data.map(item=>{
-              if(item.distance || item.distance==0){
-                if(item.distance>=1000){
-                  item.distance = (item.distance/1000).toFixed(2)+'km';
-                }
-                else {
-                  item.distance = (item.distance).toFixed(2)+'m';
+          data.lat = res.latitude;
+          data.lon = res.longitude;
+          commonApi._post('Cinema/' + service[this.data.movieType], data).then(res => {
+            res.data.map(item => {
+              if (item.distance || item.distance == 0) {
+                if (item.distance >= 1000) {
+                  item.distance = (item.distance / 1000).toFixed(2) + 'km';
+                } else {
+                  item.distance = (item.distance).toFixed(2) + 'm';
                 }
               }
             })
             this.setData({
-              list:this.data.list.concat(res.data),
-              pageNo:this.data.pageNo+1,
-              moreFlag:res.data.length<10?false:true
+              list: this.data.list.concat(res.data),
+              pageNo: this.data.pageNo + 1,
+              moreFlag: res.data.length < 10 ? false : true
             })
           })
         },
-        fail:()=>{
+        fail: () => {
           wx.showToast({
             title: '请打开位置授权',
-            icon:'none'
+            icon: 'none'
           })
-          commonApi._post('Cinema/'+service[this.data.movieType],data).then(res=>{
+          commonApi._post('Cinema/' + service[this.data.movieType], data).then(res => {
             this.setData({
-              list:this.data.list.concat(res.data),
-              pageNo:this.data.pageNo+1,
-              moreFlag:res.data.length<10?false:true
+              list: this.data.list.concat(res.data),
+              pageNo: this.data.pageNo + 1,
+              moreFlag: res.data.length < 10 ? false : true
             })
           })
         }
       })
-    }
-    else {
-      commonApi._post('Cinema/'+service[this.data.movieType],data).then(res=>{
-        res.data.map(item=>{
-          if(item.distance || item.distance==0){
-            if(item.distance>=1000){
-              item.distance = (item.distance/1000).toFixed(2)+'km';
-            }
-            else {
-              item.distance = (item.distance).toFixed(2)+'m';
+    } else {
+      commonApi._post('Cinema/' + service[this.data.movieType], data).then(res => {
+        res.data.map(item => {
+          if (item.distance || item.distance == 0) {
+            if (item.distance >= 1000) {
+              item.distance = (item.distance / 1000).toFixed(2) + 'km';
+            } else {
+              item.distance = (item.distance).toFixed(2) + 'm';
             }
           }
         })
         this.setData({
-          list:this.data.list.concat(res.data),
-          pageNo:this.data.pageNo+1,
-          moreFlag:res.data.length<10?false:true
+          list: this.data.list.concat(res.data),
+          pageNo: this.data.pageNo + 1,
+          moreFlag: res.data.length < 10 ? false : true
         })
       })
     }
   },
-  setSort:function(e){
+  setSort: function (e) {
     let sort = e.currentTarget.dataset.sort;
-    if(this.data.sort==sort) sort="";
+    if (this.data.sort == sort) sort = "";
     this.setData({
-      sort:sort,
-      list:[],
-      total:1,
-      pageNo:1,
-      moreFlag:true
+      sort: sort,
+      list: [],
+      total: 1,
+      pageNo: 1,
+      moreFlag: true
     })
     this.getList();
   },
-  changeMovieType:function(e){
+  changeMovieType: function (e) {
     let type = e.currentTarget.dataset.type;
     this.setData({
-      movieType:type,
-      list:[],
-      pageNo:1,
-      total:1,
-      moreFlag:true
+      movieType: type,
+      list: [],
+      pageNo: 1,
+      total: 1,
+      moreFlag: true
     })
     this.getList()
   },
-  gotoDetail:function(e){
+  gotoDetail: function (e) {
     let item = e.currentTarget.dataset.item;
-    if(this.data.type==4 && this.data.movieType!=2){
+    if (this.data.type == 4 && this.data.movieType != 2) {
       wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id='+item.third_id
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
       })
-    }
-    else if(this.data.type==4){
+    } else if (this.data.type == 4) {
       wx.navigateTo({
-        url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id
+        url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
       })
-    }
-    else {
+    } else {
       wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id='+item.id,
+        url: '/pages/info/activityInfo/index?id=' + item.id,
       })
     }
   },
-  changeKeywords:function(e){
+  changeKeywords: function (e) {
     this.setData({
-      keywords:e.detail.value
+      keywords: e.detail.value
     })
   },
-  search:function(){
+  search: function () {
     this.setData({
-      realKeywords:this.data.keywords,
-      list:[],
-      pageNo:1,
-      total:1,
-      moreFlag:true
+      realKeywords: this.data.keywords,
+      list: [],
+      pageNo: 1,
+      total: 1,
+      moreFlag: true
     })
     this.getList();
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
-  },
+  onReady: function () {},
 
   /**
    * 生命周期函数--监听页面显示
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index eb9e183..3c2655c 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -39,7 +39,6 @@ Page({
         that.getList()
       }
     })
-    
   },
   search:function(e){
     this.setData(e.detail);

From c627426aa0175a43cb28cacb69c5221ad68ba9ff Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 6 Feb 2023 09:42:42 +0800
Subject: [PATCH 039/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/activityInfo/index.js   | 9 +++++++++
 pages/info/activityInfo/index.wxml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pages/info/activityInfo/index.js b/pages/info/activityInfo/index.js
index e9e56b2..a2082a2 100644
--- a/pages/info/activityInfo/index.js
+++ b/pages/info/activityInfo/index.js
@@ -34,6 +34,15 @@ Page({
       showShareFlag: !this.data.showShareFlag
     })
   },
+  gotolocation: function () {
+    let info = this.data.info;
+    if (this.data.info.lat&&this.data.info.lon) {
+      wx.openLocation({
+        latitude: Number(info.lat),
+        longitude: Number(info.lon)
+      })
+    }
+  },
   pagePoint(e,type) {
     util.pagePoint(e,type)
   },
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 7cfa8fd..08f705a 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -18,7 +18,7 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activity/time.png" mode="widthFix"></image>
       <text>活动时间：{{info.begin_date}} ~ {{info.end_date}}</text>
     </view>
-    <view class="top-tip-box" wx:if="{{info.detail_address}}">
+    <view class="top-tip-box" wx:if="{{info.detail_address}}" bindtap="gotolocation">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activity/location.png" mode="widthFix"></image>
       <text>活动地点：{{info.detail_address}}</text>
     </view>

From 7d4fb24cba5108bcb9669597c2a99b3702b20128 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 9 Feb 2023 17:19:02 +0800
Subject: [PATCH 040/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |  2 +-
 pages/component/TitleHeader.js              | 10 +++-
 pages/info/postProductInfo/index.js         | 18 +++---
 pages/list/activitynew/index.js             | 16 +++--
 pages/list/activitynew/index.wxml           | 17 +++++-
 pages/list/activitynew/index.wxss           | 23 +++++---
 pages/map/index.wxml                        |  4 +-
 pages/order/components/address/index.js     | 20 ++++++-
 pages/order/postOrder/index.js              | 65 ++++++++++-----------
 pages/user/address/add/index.wxml           |  2 +-
 pages/user/order/museumOrderInfo/index.wxml |  7 ++-
 11 files changed, 118 insertions(+), 66 deletions(-)

diff --git a/app.js b/app.js
index 4d36d15..981ebb5 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.isTest53? true : false;
+      data.isTest = data.isTest54? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 3791421..7c384b3 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -73,7 +73,15 @@ Component({
 		//   wx.switchTab({
 		//     url: '/pages/user/user'
 		//   })
-	  // }
+    // }
+     else if (pages[pages.length-1].route.indexOf('pages/order/pay/index') != -1){
+       console.log(pages[pages.length-1]);
+       wx.redirectTo({
+		    url:'/pages/user/order/list'
+		  })
+    }
+    
+   
 	  else if (pages[pages.length-1].route.indexOf('orderList') != -1){
       console.log(11111);
 		  wx.navigateTo({
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 5135dbe..ba80c6e 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -72,15 +72,15 @@ Page({
       })
 
       // 获取补贴
-      commonApi.user_post("product/getProductAllowancePrice", {
-        product_code: res.data.product_code
-      }).then(resTwo => {
-        if (resTwo && resTwo.code == 1) {
-          this.setData({
-            allowance_data: resTwo.data
-          })
-        }
-      })
+      // commonApi.user_post("product/getProductAllowancePrice", {
+      //   product_code: res.data.product_code
+      // }).then(resTwo => {
+      //   if (resTwo && resTwo.code == 1) {
+      //     this.setData({
+      //       allowance_data: resTwo.data
+      //     })
+      //   }
+      // })
       this.BroswerRecord()
     })
     // 获取评价列表
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 0ba8d01..acb4921 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -10,7 +10,7 @@ Page({
   data: {
     isYL: false,
     selectDay: new Date().getTime(),
-    days: ['日', '一', '二', '三', '四', '五', '六'],
+    days: [ '日','一', '二', '三', '四', '五', '六'],
     types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other'],
     weeks: [],
     pageNo: 1,
@@ -20,7 +20,7 @@ Page({
     total: 1,
     areas: ['姑苏', '吴江', '苏州'],
     area: 0,
-    type: 2,
+    type: 9,
     movieType: 1,
     moreFlag: true,
     lat: "",
@@ -80,9 +80,10 @@ Page({
       total: 1,
       pageNo: 1,
       moreFlag: true,
-      keywords: "",
-      realKeywords: ""
+      // keywords: "",
+      // realKeywords: ""
     })
+    console.log(this.data.type);
     this.getList();
   },
   changeArea: function (e) {
@@ -110,6 +111,7 @@ Page({
         date: putDate,
         isSelect: i == myDate
       };
+
       reslist.push(item);
     }
     this.setData({
@@ -353,7 +355,11 @@ Page({
       list: [],
       pageNo: 1,
       total: 1,
-      moreFlag: true
+      moreFlag: true,
+      date:null,
+      isYL: true,
+      selectDay: null
+
     })
     this.getList();
   },
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 1de916c..9d75834 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -15,6 +15,10 @@
     </view>
   </view>
   <view scroll-x enable-flex class="types">
+    <view class="type-item" bindtap="changeType" data-type="9">
+      <image src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
+      <view style="{{type==9?'color: #0B898E':''}}">全部</view>
+    </view>
     <view class="type-item" bindtap="changeType" data-type="2">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==2?'color:#C155E9':''}}">展览</view>
@@ -42,14 +46,21 @@
     <view style="width:1rpx;flex-shrink:0;height:1rpx"></view>
   </view>
   <view class="date-box" hidden="{{type==4}}">
-    <view class="yulan{{isYL?' active':''}}" data-flag="0" bindtap="yulan">全部</view>
+    <view class="yulan{{isYL?' active':''}}" data-flag="0" bindtap="yulan">
+      <view>
+        全部
+      </view>
+      <view>
+        日期
+      </view>
+    </view>
     <view class="date-item {{item.times==selectDay?'active':''}}" wx:for="{{weeks}}" bindtap="changeDate" data-times="{{item.times}}">
-      <view>{{item.date}}</view>
       <view>周{{item.day}}</view>
+      <view>{{item.date}}</view>
     </view>
     <picker mode="date" value="{{date}}" start="1970-01-01" end="2027-09-01" bindchange="bindDateChange">
       <view class="picker calendar-img{{isYL?'':' active'}}">
-        <image width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/xcxImages/activity/calendar{{isYL?'':'1'}}.png"></image>
+        <image width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20230208/967796a90039681fee47e9271c2207d7.png"></image>
       </view>
     </picker>
   </view>
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index aa2624a..c53c97a 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -65,18 +65,18 @@ border-radius: 3rpx;
 .yulan {
   flex-shrink: 0;
   width: 60rpx;
-  padding-right: 20rpx;
-  line-height: 80rpx;
   text-align: right;
   background: #fff;
   border-radius: 0px 30rpx 30rpx 0px;
-  color: #0B898E;
+  color: #333333;
   white-space: nowrap;
   font-size: 26rpx;
+  display: flex;
+  flex-direction: column;
+
 }
 .yulan.active {
-  background:#0B898E;
-  color:#fff;
+  color: #0B898E;
 }
 .date-item {
   font-size: 26rpx;
@@ -85,10 +85,17 @@ border-radius: 3rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
+  width: 79rpx;
+height:100%;
+
+
+
 }
 .date-item.active {
   font-weight:500;
   color: #0B898E;
+
+background: rgba(11, 137, 142, .1);
 }
 .calendar-img {
   width: 70rpx;
@@ -101,12 +108,12 @@ border-radius: 3rpx;
   border-radius: 30rpx 0px 0px 30rpx;
 }
 .calendar-img image {
-  width: 56rpx;
-  height: 60rpx;
+  width: 50rpx;
+  height: 50rpx;
   display: block;
 }
 .calendar-img.active {
-  background-color: #0B898E;
+
 }
 .top-fixed-activity {
   background: #f7f7f7;
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index fb97d33..639b2c4 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -31,10 +31,10 @@
     <text style="color:#00B3C8" class="iconfont icon-location"></text>
     <text>文保单位</text>
   </view>
-  <view class="right-menu-item{{type==7?' active':''}}" bindtap="changeType" data-title="影院" data-type="7">
+  <!-- <view class="right-menu-item{{type==7?' active':''}}" bindtap="changeType" data-title="影院" data-type="7">
     <text style="color:#9342CB" class="iconfont icon-location"></text>
     <text>影院</text>
-  </view>
+  </view> -->
   <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
     <text style="color:#EB3C70" class="iconfont icon-location"></text>
     <text>运河十景</text>
diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js
index 28fcdb0..8be68f1 100644
--- a/pages/order/components/address/index.js
+++ b/pages/order/components/address/index.js
@@ -85,7 +85,7 @@ Component({
       else {
         commonApi.user_post("token/check").then(res=>{
           if(res.code==1){
-            this.getLinkmanList()
+            this.getDefault()
           }
         })
       }
@@ -227,6 +227,24 @@ Component({
         showMask:false
       })
       this.triggerEvent("setAddress",item)
+    },
+    getDefault:function(e){
+      commonApi.user_post("token/check").then(res=>{
+        if(res.code==1){
+          userApi.user_post("user/getDefaultContact",{
+            contactType:"CONSIGNEE"
+          }).then(res=>{
+            console.log(res)
+            this.setData({
+              selectLinkman:res.data
+            })
+            if(res.data){
+              this.triggerEvent("setAddress",res.data)
+            }
+            this.getLinkmanList()
+          })
+        }
+      })
     }
   }
 })
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 16edcbe..5248ae4 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -28,7 +28,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
     this.setData({
       from: options.from,
       kjId: app.globalData.kjId,
@@ -269,38 +268,38 @@ Page({
       coupon: app.globalData.couponInfo
     })
     // 获取补贴
-    if (this.data.product.length == 1) {
-      commonApi.user_post("product/getProductAllowancePrice", {
-        product_code: this.data.product[0].product.product_code
-      }).then(resTwo => {
-        console.log(resTwo)
-        if (resTwo && resTwo.code == 1) {
-          this.setData({
-            allowance_data: resTwo.data
-          })
-          let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
-          let sInfo = this.data.product[0].sku
-          console.log(9999, this.data.allowance_data.discount_rate / 100 * sInfo.price)
-          console.log(9999, spread_price)
-          if (spread_price > 0) {
-            if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
-              this.setData({
-                allowance_price: spread_price
-              })
-            } else {
-              this.setData({
-                allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
-              })
-            }
-            this.changePrice()
-          } else {
-            this.setData({
-              allowance_price: 0
-            })
-          }
-        }
-      })
-    }
+    // if (this.data.product.length == 1) {
+    //   commonApi.user_post("product/getProductAllowancePrice", {
+    //     product_code: this.data.product[0].product.product_code
+    //   }).then(resTwo => {
+    //     console.log(resTwo)
+    //     if (resTwo && resTwo.code == 1) {
+    //       this.setData({
+    //         allowance_data: resTwo.data
+    //       })
+    //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+    //       let sInfo = this.data.product[0].sku
+    //       console.log(9999, this.data.allowance_data.discount_rate / 100 * sInfo.price)
+    //       console.log(9999, spread_price)
+    //       if (spread_price > 0) {
+    //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+    //           this.setData({
+    //             allowance_price: spread_price
+    //           })
+    //         } else {
+    //           this.setData({
+    //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+    //           })
+    //         }
+    //         this.changePrice()
+    //       } else {
+    //         this.setData({
+    //           allowance_price: 0
+    //         })
+    //       }
+    //     }
+    //   })
+    // }
   },
 
   /**
diff --git a/pages/user/address/add/index.wxml b/pages/user/address/add/index.wxml
index 42336f3..48a27e6 100644
--- a/pages/user/address/add/index.wxml
+++ b/pages/user/address/add/index.wxml
@@ -24,7 +24,7 @@
     </view>
     <view class="input-item">
       <text class="input-label">设为默认</text>
-      <switch checked="{{formData.isDefault}}" bindchange="setDefault" />
+      <switch checked="{{formData.is_default}}" bindchange="setDefault" />
     </view>
   </view>
   <view class="btn" bindtap="save">保存</view>
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index df360d4..04d9025 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -32,11 +32,11 @@
     <text>商品总价</text>
     <text>￥{{info.total_money/100}}</text>
   </view>
-  <view class="detail-item" wx:if="{{info.total_post_fee}}">
+  <view class="detail-item">
     <text>运费</text>
     <text>￥{{info.total_post_fee/100}}</text>
   </view>
-  <view class="detail-item" wx:if="{{info.preference_money}}">
+  <view class="detail-item">
     <text>优惠券抵扣</text>
     <text>-￥{{info.preference_money/100}}</text>
   </view>
@@ -78,6 +78,9 @@
     <view class="detail-item">
       <text>{{item.title}}：{{item.id_number}}</text>
     </view>
+    <view class="detail-item" wx:if="{{item.tel}}">
+      <text>手机号：{{item.tel}}</text>
+    </view>
   </view>
 </view>
 <view class="box" wx:if="{{info}}">

From 047d41adbe62db367ea78da5be2b8de7baa93c61 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 14 Feb 2023 16:29:23 +0800
Subject: [PATCH 041/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                  |  2 +-
 pages/component/TitleHeader.js          |  7 ++-
 pages/order/scene/index.js              | 58 ++++++++++++-------------
 pages/pbService/wwcx/index.wxml         |  4 +-
 pages/search/list/index.wxml            |  4 +-
 pages/user/address/add/index.js         |  8 ++--
 pages/user/order/list.js                |  8 ++--
 pages/user/order/postOrderInfo/index.js |  3 ++
 8 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/app.js b/app.js
index 981ebb5..fab4ac5 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.isTest54? true : false;
+      data.isTest = data.isTest55? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 7c384b3..6aaafbf 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -75,15 +75,18 @@ Component({
 		//   })
     // }
      else if (pages[pages.length-1].route.indexOf('pages/order/pay/index') != -1){
-       console.log(pages[pages.length-1]);
        wx.redirectTo({
 		    url:'/pages/user/order/list'
 		  })
     }
+    else if (pages[pages.length-1].route.indexOf('pages/user/order/list') != -1){
+		  wx.switchTab({
+		    url: '/pages/user/user'
+		  })
+    }
     
    
 	  else if (pages[pages.length-1].route.indexOf('orderList') != -1){
-      console.log(11111);
 		  wx.navigateTo({
 		    url: '/pages/user/cartlist/list'
 		  })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index c00611d..6ba8417 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -378,35 +378,35 @@ Page({
       coupon: app.globalData.couponInfo
     })
     // 获取补贴
-    if (this.data.product) {
-      commonApi.user_post("product/getProductAllowancePrice", {
-        product_code: this.data.product.product.product_code
-      }).then(resTwo => {
-        if (resTwo && resTwo.code == 1) {
-          this.setData({
-            allowance_data: resTwo.data
-          })
-          let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
-          let sInfo = this.data.product.sku
-          if (spread_price > 0) {
-            if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
-              this.setData({
-                allowance_price: spread_price
-              })
-            } else {
-              this.setData({
-                allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
-              })
-            }
-            this.changePrice()
-          } else {
-            this.setData({
-              allowance_price: 0
-            })
-          }
-        }
-      })
-    }
+    // if (this.data.product) {
+    //   commonApi.user_post("product/getProductAllowancePrice", {
+    //     product_code: this.data.product.product.product_code
+    //   }).then(resTwo => {
+    //     if (resTwo && resTwo.code == 1) {
+    //       this.setData({
+    //         allowance_data: resTwo.data
+    //       })
+    //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+    //       let sInfo = this.data.product.sku
+    //       if (spread_price > 0) {
+    //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+    //           this.setData({
+    //             allowance_price: spread_price
+    //           })
+    //         } else {
+    //           this.setData({
+    //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+    //           })
+    //         }
+    //         this.changePrice()
+    //       } else {
+    //         this.setData({
+    //           allowance_price: 0
+    //         })
+    //       }
+    //     }
+    //   })
+    // }
   },
 
   /**
diff --git a/pages/pbService/wwcx/index.wxml b/pages/pbService/wwcx/index.wxml
index 7193b9e..2eb35d0 100644
--- a/pages/pbService/wwcx/index.wxml
+++ b/pages/pbService/wwcx/index.wxml
@@ -35,8 +35,8 @@
   <image src="{{item.logo}}" mode="aspectFill"></image>
   <view class="feiyiinfo textOver">
     <view class="title textOver">{{item.name}}</view>
-    <view class="subtitle textOver" wx:if="{{type==1}}"><text>藏于</text>{{item.collection_name}}</view>
-    <view class="subtitle textOver" wx:if="{{type==1}}"><text>入藏时间</text>{{item.age}}</view>
+    <view class="subtitle textOver" wx:if="{{type==1 && item.collection_name}}"><text>藏于</text>{{item.collection_name}}</view>
+    <view class="subtitle textOver" wx:if="{{type==1 && item.age}}"><text>入藏时间</text>{{item.age}}</view>
     <view class="subtitle textOver" wx:if="{{type==2}}"><text>等级</text>{{item.level_name}}</view>
     <view class="subtitle textOver" wx:if="{{type==2}}"><text>区域</text>{{item.area?areaName[item.area]:'苏州'}}</view>
     <view class="subtitle textOver" wx:if="{{type==2}}"><text>历史年代</text>{{item.age}}</view>
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index e70d080..6e2a3f6 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -102,8 +102,8 @@
     <view class="product-info show-info">
       <view class="product-title">{{item.title}}</view>
       <view class="show-info">  
-        <view>电话：{{item.ext.tel}}</view>
-        <view>地址：{{item.ext.address}}</view>
+        <view>电话：{{item.ext.tel||item.ext.scene_tel}}</view>
+        <view>地址：{{item.ext.address||item.ext.supplier_address}}</view>
       </view>
     </view>
   </view>
diff --git a/pages/user/address/add/index.js b/pages/user/address/add/index.js
index 7186676..647d084 100644
--- a/pages/user/address/add/index.js
+++ b/pages/user/address/add/index.js
@@ -9,7 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    isDefault:true,
+    is_default:true,
     region: [],
     customItem: '',
     formData:{
@@ -38,7 +38,7 @@ Page({
       if(this.data.id){
         // 获取当前收货地址详情
         user.user_post("user/getContactInfoById",{id:this.data.id}).then(res=>{
-          res.data.isDefault = res.data.isDefault=='1';
+          res.data.is_default = res.data.is_default=='1';
           res.data.mobile = res.data.tel;
           res.data.username = res.data.name;
           res.data.address = res.data.detail_addr;
@@ -117,7 +117,7 @@ Page({
   // 设为默认
   setDefault:function(e){
     var formData = this.data.formData;
-    formData.isDefault = e.detail.value;
+    formData.is_default = e.detail.value;
     this.setData({
       formData: formData
     })
@@ -268,7 +268,7 @@ Page({
     data.province_id = areaList.filter(item => item.name == province)[0].id;
     data.city_id = areaList.filter(item => item.name == city && item.pid == data.province_id)[0].id;
     data.district_id = areaList.filter(item => item.name == area && item.pid == data.city_id)[0].id;
-    data.is_default = data.isDefault?'1':'0';
+    data.is_default = data.is_default?'1':'0';
     data.detail_addr = data.address
     let service ="addNewConsignee";
     if(this.data.id){
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index cf87a6d..de965af 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -133,12 +133,11 @@ Page({
       })
       
     })
+    
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
-
     item = this.getChild(item)
-
     util.gotoOrder(item)
   },
   
@@ -247,7 +246,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.setData({
+      list:[]
+    })
+    this.getList()
   },
 
   /**
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 8982e37..ae80367 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -66,8 +66,11 @@ Page({
                 icon:'success'
               })
               info.state = "CLOSED";
+              info.state_text = "已关闭";
+
               info.order_product_list.map(item=>{
                 item.state='CLOSED'
+                item.state_text='已关闭'
               })
               _this.setData({
                 info:info

From f31c23fede02128682a4ff9cbecefc4c556d06ec Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 15 Feb 2023 16:52:58 +0800
Subject: [PATCH 042/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                               |  2 +-
 pages/info/sceneProductInfo/index.js | 77 +++++++++++++++++++++++-----
 pages/user/user.wxml                 |  4 +-
 pages/user/videoCoupon/index.js      |  4 +-
 project.private.config.json          |  3 +-
 5 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/app.js b/app.js
index fab4ac5..7fe404f 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.isTest55? true : false;
+      data.isTest = data.isTest56? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index aad07af..5f9657f 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -25,19 +25,55 @@ Page({
     allowance_data: null,
     //购物车数量
     producNum: 1,
-    skuIndex:null,
+    skuIndex: null,
     aniSkuIndex: -1,
     cartCount: 0,
     cartImgInfo: null,
     cartTop: 0,
     top: 0,
     skuList: [], //立即预定的列表
+    sku_ids: [
+      353954,
+      353950,
+      353949,
+      353951,
+      353947,
+      353953,
+      353685,
+      353684,
+      353952,
+      353686,
+      353948,
+      354730,
+      354409,
+      354359,
+      345343,
+      354756,
+      354385,
+      354360,
+      354361,
+      354362,
+      355466,
+      355465,
+      356230,
+      356223,
+      356207,
+      346648,
+      357518,
+      356233,
+      354381,
+      354384,
+      356324,
+      354737,
+      355467,
+    ]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options);
     if (!options.id) {
       util.back()
       return;
@@ -74,8 +110,8 @@ Page({
       // 如果带有指定skuid的话 那么取指定的sku展示
       if (options.skuid) {
         let pItem = null;
-        for (let i = 0; i < res.data.product.length; i++) {//3
-          for (let j = 0; j < res.data.product[i].sku.length; j++) {//4
+        for (let i = 0; i < res.data.product.length; i++) { //3
+          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
             if (res.data.product[i].sku[j].id == options.skuid) {
               res.data.product[i].sku = [res.data.product[i].sku[j]];
               pItem = res.data.product[i];
@@ -86,6 +122,21 @@ Page({
         if (pItem) {
           res.data.product = [pItem];
         }
+
+      } else if (options.zhuanti_type == "yihuFree") {
+
+        let skuArr = this.data.sku_ids
+        let newArr = []
+        for (let i = 0; i < res.data.product.length; i++) { //3
+          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+            for (let k = 0; k < skuArr.length; k++) {
+              if (res.data.product[i].sku[j].id == skuArr[k]) {
+                newArr.push(res.data.product[i].sku[j])
+              }
+            }
+          }
+          res.data.product[i].sku = newArr;
+        }
       }
       // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
       res.data.product.map(product => {
@@ -250,7 +301,7 @@ Page({
   // },
   selectSku: function (e) {
     console.log(e.currentTarget.dataset.item);
-    if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock!=1) {
+    if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock != 1) {
       wx.showToast({
         title: "该商品暂无库存",
         icon: 'none'
@@ -301,10 +352,10 @@ Page({
             ...sku,
             ...product
           }
-    
-            wx.navigateTo({
-              url: '/pages/order/scene/index',
-            })
+
+          wx.navigateTo({
+            url: '/pages/order/scene/index',
+          })
         } else {
           commonApi.user_post("cart/add_sku", {
             sku_id: this.data.skuList[this.data.skuIndex].id,
@@ -313,7 +364,7 @@ Page({
             if (res.code == 1) {
               commonApi.user_post('cart/get_list', {}).then(res => {
                 this.setData({
-                  cartCount: res.data.length//5
+                  cartCount: res.data.length //5
                 })
               })
               // 加动效
@@ -661,7 +712,7 @@ Page({
       })
       return;
     }
-    if (this.data.info.product[0].type=='line') {
+    if (this.data.info.product[0].type == 'line') {
       wx.navigateTo({
         url: '/pages/order/road/index?id=' + this.data.info.product[0].id
       })
@@ -691,9 +742,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    console.log(11111);
     commonApi.user_post('cart/get_list', {}).then(res => {
       this.setData({
-        cartCount: res.data.length//1
+        cartCount: res.data.length //1
       })
     })
     if (!wx.getStorageSync('jstrip_token')) {
@@ -734,8 +786,9 @@ Page({
       //// 获取补贴结束
 
     } else {
+      console.log(2222);
       setTimeout(() => {
-        this.onShow()
+        // this.onShow()
       }, 200)
     }
 
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 9cc4f84..d39a015 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -66,9 +66,9 @@
     <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
       团体预约订单
     </navigator>
-    <!-- <navigator url="videoCoupon/index" class="user-box-line">
+    <navigator url="videoCoupon/index" class="user-box-line">
     中奖纪录
-    </navigator> -->
+    </navigator>
     <!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
       在线客服
     </navigator> -->
diff --git a/pages/user/videoCoupon/index.js b/pages/user/videoCoupon/index.js
index 2f98442..1eb9f1b 100644
--- a/pages/user/videoCoupon/index.js
+++ b/pages/user/videoCoupon/index.js
@@ -21,8 +21,8 @@ Page({
   },
   getList(){
     if(this.data.list.length>=this.data.total) return;
-    commonApi.user_post("actonline/video_act/prizeLog",{
-      id:5,
+    commonApi.user_post("sweepstakes/sweepstakes_act/prizeLog",{
+      sweepstakes_id:6,
       page:this.data.page,
       limit:20
     }).then(res=>{
diff --git a/project.private.config.json b/project.private.config.json
index d03db11..eedf488 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -65,5 +65,6 @@
     }
   },
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "libVersion": "2.30.0"
 }
\ No newline at end of file

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 043/471] =?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>

From e57295fbd9814e4d9f924c2ec65df755a46c05a9 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 27 Feb 2023 08:41:28 +0800
Subject: [PATCH 044/471] =?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

---
 pages/index/index.wxml                |  8 ++++----
 pages/info/postProductInfo/index.js   |  7 ++++++-
 pages/info/postProductInfo/index.wxml | 14 +++++++++++---
 pages/info/postProductInfo/index.wxss | 23 +++++++++++++++++++++++
 pages/list/store/index.js             |  2 ++
 pages/old/linkman/add/index.wxss      |  6 +++---
 pages/order/hotel/index.wxml          |  2 +-
 pages/order/hotel/index.wxss          |  2 +-
 pages/order/scene/index.js            | 14 +++++++-------
 pages/search/list/index.wxml          |  4 ++--
 pages/user/address/add/index.wxml     |  4 ++++
 utils/util.js                         | 17 ++++++++++++++---
 12 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5bf0986..193659b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,16 +179,16 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+      <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+      </view> -->
+      <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view>
-      </view>
+      </view> -->
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index ba80c6e..6fd1215 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -32,18 +32,23 @@ Page({
     allowance_data: null,
     showAllowance: false,
     tjList: [], //推荐商品列表
+    iShop:false,
+    supplierId:null
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options);
     let rect = wx.getMenuButtonBoundingClientRect(),
       that = this;
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
     this.setData({
       top: height,
-      id: options.id
+      id: options.id,
+      iShop:options.iShop||false,
+      supplierId:options.supplierId
     })
     // 获取购物车按钮的位置
     wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 4a088a5..5ef87e9 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -107,15 +107,23 @@
 </view>
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
-  <navigator url="/pages/user/service/index" catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+<view class="['left-img',{{!iShop?'no-shop':''}}]">
+  <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <view class="shop-box">
+    <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
+    <view>店铺</view>
+  </view>
+  </navigator>
+  <navigator url="/pages/user/service/index"  catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
     <view class="iconfont icon-kefu"></view>
     <view>客服</view>
   </navigator>
-  <view bindtap="like" class="kefu-box" style="margin-left:70rpx">
+  <view bindtap="like" class="kefu-box">
     <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
     <view>收藏</view>
   </view>
-  <view style="flex:1"></view>
+</view>
+
   <view class="btns">
     <view class="btn" bindtap="showCart">加入购物车</view>
     <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 23dd449..bd1b85f 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -408,6 +408,7 @@ page {
   font-size: 23rpx;
   justify-content: space-between;
   text-align: center;
+  padding-left: 0;
 }
 
 .fixed-bottom .iconfont {
@@ -900,4 +901,26 @@ page {
   content:'起';
   color: #999999;
   font-size: 10px;
+}
+.icon-shop{
+  width: 34rpx;
+  height: 36rpx;
+}
+.left-img{
+  display: flex;
+  width: 290rpx;
+  flex-shrink: 0;
+  justify-content: space-between;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.no-shop{
+  width: 230rpx;
+}
+.shop-box{
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  height: 70rpx;
 }
\ No newline at end of file
diff --git a/pages/list/store/index.js b/pages/list/store/index.js
index a0ba36d..58fead4 100644
--- a/pages/list/store/index.js
+++ b/pages/list/store/index.js
@@ -44,6 +44,8 @@ Page({
       },
       type:item.type
     },1)
+    item.iShop = true
+    item.supplierId = this.data.id
     util.gotoDetail(item);
   },
   getList(){
diff --git a/pages/old/linkman/add/index.wxss b/pages/old/linkman/add/index.wxss
index 3905c92..6a0cb55 100644
--- a/pages/old/linkman/add/index.wxss
+++ b/pages/old/linkman/add/index.wxss
@@ -6,7 +6,7 @@ page {
   display: flex;
   align-items: center;
   height: 185rpx;
-  font-size: 49rpx;
+  font-size: 31rpx;
   font-weight: 500;
   margin: 0 30rpx;
   justify-content: space-between;
@@ -17,7 +17,7 @@ page {
   flex: 1;
 }
 .input-item textarea.weui-input {
-  height: 120rpx;
+  height: 40rpx;
 }
 .picker {
   height: 80rpx;
@@ -45,7 +45,7 @@ page {
   right: 27rpx;
   bottom: 27rpx;
   justify-content: space-between;
-  font-size: 49rpx;
+  font-size: 31rpx;
   font-weight: bold;
 }
 .btns view {
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index f59a916..694fdbd 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -68,7 +68,7 @@
     </view>
   </view>
 </view>
-<coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon>
+<!-- <coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon> -->
 <!-- 支付按钮 -->
 <view style="height:{{100 }}rpx"></view>
 <view class="fixed-bottom">
diff --git a/pages/order/hotel/index.wxss b/pages/order/hotel/index.wxss
index 765c9a1..7be5117 100644
--- a/pages/order/hotel/index.wxss
+++ b/pages/order/hotel/index.wxss
@@ -164,7 +164,7 @@ page {
   z-index: 98;
 }
 .price-all {
-  line-height: 100rpx;
+  /* line-height: 100rpx; */
   flex: 1;
 }
 .price-all text {
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6ba8417..a17e7c5 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -191,13 +191,13 @@ Page({
   order: function () {
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
-    if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-      wx.showToast({
-        title: '请选择' + productNum + "个出行人",
-        icon: "none"
-      })
-      return;
-    }
+    // if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+    //   wx.showToast({
+    //     title: '请选择' + productNum + "个出行人",
+    //     icon: "none"
+    //   })
+    //   return;
+    // }
     if (!date) {
       wx.showToast({
         title: '请选择使用日期',
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index dbcbb41..5c718ec 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -28,7 +28,7 @@
     </view>
   </navigator>
   <!-- 景点、门票 -->
-  <view class="product-item" wx:if="{{item.ext.type=='scenic' || item.ext.type=='ticket'}}">
+  <view class="product-item" wx:if="{{item.ext.type=='scenic' || item.ext.type=='ticket'||item.ext.type=='tenscenic'}}">
     <common-image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
     <!-- <image></image> -->
     <view class="product-info">
@@ -40,7 +40,7 @@
       <view class="price-box">
         <view class="textOver" wx:if="{{item.ext.distance}}">距您直线距离{{item.ext.distance}}km</view>
         <view wx:else></view>
-        <view class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+        <view wx:if="{{item.ext.type!='tenscenic'}}" class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
       </view>
     </view>
   </view>
diff --git a/pages/user/address/add/index.wxml b/pages/user/address/add/index.wxml
index 48a27e6..ad93f4e 100644
--- a/pages/user/address/add/index.wxml
+++ b/pages/user/address/add/index.wxml
@@ -16,7 +16,11 @@
         <view class="picker" style="line-height:90rpx;height:90rpx;">
       {{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}{{multiArray[2][multiIndex[2]]}}
         </view>
+       
       </picker>
+      <view>
+           >
+        </view>
     </view>
     <view class="input-item">
       <text class="input-label">详细地址</text>
diff --git a/utils/util.js b/utils/util.js
index 3fb54d1..cf8390c 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -200,9 +200,20 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePointData.id = item.id
         pagePoint(pagePointData,1)
       }
-      wx.navigateTo({
-        url: '/pages/info/postProductInfo/index?id='+item.id
-      })
+      try {
+        if (item.iShop) {
+          wx.navigateTo({
+            url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId
+          })
+        }else{
+          wx.navigateTo({
+            url: '/pages/info/postProductInfo/index?id='+item.id
+          })
+        }
+      } catch (error) {
+        
+      }
+
       break;
     case "line":
       // 产品 线路

From 6e449bf9181a39e5c2e4b886cdb63d7a415583e9 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 27 Feb 2023 08:43:12 +0800
Subject: [PATCH 045/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 3214fff..1933352 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.isTest57? true : false;
+      data.isTest = data.isTest58? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From ae78fd5d857d593070017578089ed017708daf11 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 6 Mar 2023 17:33:01 +0800
Subject: [PATCH 046/471] =?UTF-8?q?=E5=BA=97=E9=93=BA,=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              | 2 +-
 pages/info/postProductInfo/index.js | 8 ++++----
 pages/list/activitynew/index.wxml   | 4 ++--
 pages/list/techan/index.wxml        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 1933352..14672bf 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.isTest58? true : false;
+      data.isTest = data.isTest59? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 6fd1215..2f1ce66 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -46,9 +46,7 @@ Page({
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
     this.setData({
       top: height,
-      id: options.id,
-      iShop:options.iShop||false,
-      supplierId:options.supplierId
+      id: options.id
     })
     // 获取购物车按钮的位置
     wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
@@ -73,7 +71,9 @@ Page({
       }
       res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
       this.setData({
-        info: res.data
+        info: res.data,
+        supplierId:res.data.supplier_id,
+        iShop:res.data.supplier_id?true:false
       })
 
       // 获取补贴
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 9d75834..7fc61dd 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -35,10 +35,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
     </view> -->
-    <!-- <view class="type-item" bindtap="changeType" data-type="4">
+    <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view> -->
+    </view>
     <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 7a992ad..9d8e3df 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -19,13 +19,13 @@
         </view>
         <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text>{{item.address}}</view>
       </view>
-      <view class="supplier-price"><text>￥</text><text>{{tool.toFix(item.start_price)}}</text><text>起</text></view>
+      <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
     </view>
     <view class="product-list">
       <view data-item="{{item}}" class="product-item" wx:for="{{item.product}}">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="product-title textOver2">{{item.title}}</view>
-        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{tool.toFix(item.price)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
+        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
       </view>
     </view>
   </view>

From a4b533f4d70088f365a55fe8600820c0e368ddcb Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 7 Mar 2023 17:15:20 +0800
Subject: [PATCH 047/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E7=94=B5=E5=BD=B1=E8=B4=AD=E4=B9=B0=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      | 2 +-
 pages/list/movieticket/list/info/index.js   | 2 +-
 pages/list/movieticket/list/info/index.wxml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 14672bf..1188526 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.isTest59? true : false;
+      data.isTest = data.isTest60? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/movieticket/list/info/index.js b/pages/list/movieticket/list/info/index.js
index 6246e89..829bd7f 100644
--- a/pages/list/movieticket/list/info/index.js
+++ b/pages/list/movieticket/list/info/index.js
@@ -18,7 +18,7 @@ Page({
     commonApi._post("Cinema/getMovieDetail",{
       show_id:options.id
     }).then(res=>{
-      let showFlag = new Date(res.data.open_day.replace(/-/g,'/')).getTime()<=new Date().getTime();
+      let showFlag = new Date(res.data.open_time.replace(/-/g,'/')).getTime()<=new Date().getTime();
       res.data.listimg = res.data.listimg.split(",") || []
       this.setData({
         info:res.data,
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 8960ea8..8076186 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -4,7 +4,7 @@
   <image src="{{info.headimg}}" mode="aspectFill"></image>
   <view class="info-box">
     <view class="title">{{info.title}}</view>
-    <view wx:if="{{info.duration || info.type || info.country}}">{{info.duration?(info.duration+'分钟/'):''}}{{info.type?(info.type+'/'):''}}{{info.country}}</view>
+    <view wx:if="{{info.duration || info.type || info.country}}">{{info.duration?(info.duration+'分钟/'):''}}{{info.type?(info.type):''}}{{info.country?'/'+info.country:''}}</view>
     <view wx:if="{{info.open_day || info.country}}">{{info.open_day}}{{info.country?('在'+info.country):''}}上映</view>
     <view wx:if="{{info.remark}}">评分：{{info.remark}}</view>
   </view>
@@ -25,5 +25,5 @@
 </view>
 <view style="height:104rpx" wx:if="{{showFlag}}"></view>
 <navigator wx:if="{{info && showFlag}}" url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
-  <view class="order-btn">立即购票</view>
+  <!-- <view class="order-btn">立即购票</view> -->
 </navigator>
\ No newline at end of file

From 456ffc9c6ccf6e3c8bd8891066739c94daee3ba6 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 16 Mar 2023 17:06:48 +0800
Subject: [PATCH 048/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9B=B4=E6=8E=A5=E8=B7=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/index/index.js                   | 18 ++++++++++++++++++
 pages/index/index.wxml                 |  8 ++++----
 pages/index/index.wxss                 |  2 +-
 pages/info/sceneProductInfo/index.wxml |  4 ++--
 pages/list/activitynew/index.wxml      |  2 +-
 pages/list/museum/index.wxml           | 18 +++++-------------
 pages/list/museum/index.wxss           | 26 +++++++++++++++++++++-----
 pages/list/six/index.js                |  8 +++++++-
 pages/list/six/index.wxml              |  4 ++--
 pages/list/theatre/index.wxml          |  2 +-
 11 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/app.js b/app.js
index 1188526..803dea3 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.isTest60? true : false;
+      data.isTest = data.isTest62? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 0fcd33d..33e2454 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -351,6 +351,24 @@ Page({
         path: 'pages/index/index'
       })
       return;
+    }else if (e.currentTarget.dataset.event == 'kunshan_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx8888a3fd0862b4c8',
+        path: 'pages/index/index'
+      })
+      return;
+    }else if (e.currentTarget.dataset.event == 'taicang_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx8853b0d93cbca75e',
+        path: 'pages/home/home'
+      })
+      return;
+    }else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wxd323e63a10aa6865',
+        path: 'pages/home/index'
+      })
+      return;
     }
     wx.navigateTo({
       url: e.currentTarget.dataset.path,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 193659b..5bf0986 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,16 +179,16 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
-      </view> -->
-      <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+      </view>
+      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view>
-      </view> -->
+      </view>
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 80f2505..1186938 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -293,7 +293,7 @@
   font-size: 22rpx;
 }
 .pbservice {
-  width: calc(175rpx * 8);
+  width: calc(175rpx * 6);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 6c68ef6..923f0f1 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -51,7 +51,7 @@
         <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
       </view>
       <view class="product-right">
-        <view class="price"><text>￥</text><text>{{sku.price?tool.toFix(sku.price):0}}</text><text>起</text></view>
+        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text><text>起</text></view>
         <!-- <view bindtap="order" data-sku="{{sku}}" data-product="{{item}}"
           data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
           class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">立即预订</view> -->
@@ -117,7 +117,7 @@
       <view class="sku-info-box">
         <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
-          <view class="sku-price">{{skuIndex||skuIndex==0?tool.toFix(skuList[skuIndex].price):tool.toFix(skuList[0].price)}}
+          <view class="sku-price">{{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
               补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
           </view>
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 7fc61dd..68718d7 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -86,7 +86,7 @@
           </view>
         </view>
         <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
-        <view class="end-mask" wx:if="{{item.is_end}}">已结束</view>
+        <view class="end-mask" wx:if="{{item.is_act_end}}">已结束</view>
       </view>
       <view class="new-tip">{{item.from_platform}}</view>
     </view>
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 7d1b16a..22a5544 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -3,7 +3,7 @@
 <view class="list">
   <view bindtap="gotoDetail" wx:if="{{item.title!=='苏州博物馆西馆' && item.title!=='苏州博物馆西馆探索体验馆'}}" data-item="{{item}}" url="/pages/info/museumInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
     <view style="position:relative">
-      <image src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx'}}" mode="aspectFill"></image>
+      <image src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx;'}}" mode="aspectFill"></image>
       <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view>
     </view>
     <view class="info textOver" wx:if="{{item.title!='苏州博物馆'}}">
@@ -12,27 +12,19 @@
       <view class="tel textOver">电话：{{item.tel}}</view>
       <view class="btn">点击预约</view>
     </view>
-    <view class="info textOver" wx:else style="height:320rpx">
+    <view class="info textOver" wx:else style="height:320rpx;">
       <view class="title textOver">{{item.title}}</view>
-      <view class="com-flex">
+      <view class="com-flex border">
         <text>博物馆本馆</text>
-        <view class="iconfont icon-you"></view>
+        <view class="btn-yy">预约</view>
       </view>
       <view class="tip-box">
         <view class="com-flex" catchtap="gotoDetailOther" data-id='44703'>
           <view>
             <text>博物馆西馆</text>
-            <view style="color:#888888;font-size:21rpx">不含探索体验馆</view>
           </view>
-          <view class="iconfont icon-you"></view>
+          <view class="btn-yy">预约</view>
         </view>
-        <!-- <view class="com-flex" style="margin-bottom:0" catchtap="gotoDetailOther" data-id='52136'>
-          <view>
-            <text>探索体验馆</text>
-            <view style="color:#888888;font-size:21rpx">含博物馆西馆</view>
-          </view>
-          <view class="iconfont icon-you"></view>
-        </view> -->
       </view>
     </view>
   </view>
diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss
index a3564c8..88ee367 100644
--- a/pages/list/museum/index.wxss
+++ b/pages/list/museum/index.wxss
@@ -28,6 +28,10 @@ page {
   font-size: 19rpx;
   color: #666;
   align-items: center;
+ 
+}
+.border{
+  
 }
 .item:nth-child(2n) .info {
   border-radius: 17rpx 0 0 17rpx;
@@ -56,14 +60,25 @@ page {
   width: 240rpx;
   height: 67rpx;
   background: #FFFFFF;
-  box-shadow: 0px 0px 6rpx 0px rgba(108, 74, 33, 0.35);
+  /* box-shadow: 0px 0px 6rpx 0px rgba(108, 74, 33, 0.35); */
   border-radius: 33rpx;
   justify-content: center;
   font-size: 28rpx;
   color: #333333;
   font-weight: bold;
-  margin: 0 auto;
-  margin-bottom: 13rpx;
+  margin: 18rpx auto;
+
+}
+.btn-yy{
+
+background: #CA2A28;
+border-radius: 36rpx;
+font-size: 27rpx;
+font-family: PingFangSC;
+font-weight: 500;
+color: #FFFFFF;
+padding: 6rpx 18rpx;
+margin-left:16rpx ;
 }
 .info .com-flex .iconfont {
   width: 27rpx;
@@ -76,13 +91,14 @@ page {
   margin-left: 10rpx;
 }
 .info .tip-box {
-  height: 180rpx;
-  background: #FBECDC;
+  /* height: 180rpx; */
+  /* background: #FBECDC; */
   width: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  border-top:1rpx solid rgba(216, 216, 216, 1) ;
 }
 .info .tip-box .com-flex {
   height: 71rpx;
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index 22781a5..b2c94be 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -38,6 +38,7 @@ Page({
     })
   },
   gotoPath:function(e){
+    console.log(e);
 	if(e.currentTarget.dataset.event.area_key == 'taicang'){
 		wx.navigateToMiniProgram({
 		  appId: 'wx8853b0d93cbca75e',
@@ -48,7 +49,12 @@ Page({
 		  appId: 'wxd323e63a10aa6865',
 		  path: 'pages/home/index'
 		})
-	}
+	}else if (e.currentTarget.dataset.event.area_key == 'kunshan') {
+    wx.navigateToMiniProgram({
+		  appId: 'wx8888a3fd0862b4c8',
+		  path: 'pages/index/index'
+		})
+  }
   },
   goH5(e){
     let url = e.currentTarget.dataset.url;
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 8beacd3..c571922 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -55,10 +55,10 @@
     <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
   </navigator> -->
-  <view  data-url="https://m.cloud.sz-trip.com/CulturalRelics?area_key={{areas[areaIndex].area_key}}" bindtap="goH5"  class="new-icon">
+  <!-- <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>
 <view class="new-title">周边推荐</view>
 <view class="list">
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index ae70777..849b02e 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -15,7 +15,7 @@
     <view class="textOver subtitle">{{item.subtitle?item.subtitle:""}}</view>
     <view class="tags textOver">
       <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view>
-      <view class="price"><text>￥</text><text>{{item.price?tool.toFix(item.price):0}}</text><text>起</text></view>
+      <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
     </view>
   </view>
 </view>

From 3e6dbab085b2f07aa8cad0a85669256b07e7caaa Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 21 Mar 2023 09:17:31 +0800
Subject: [PATCH 049/471] =?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/pbService/activity/index.js   | 4 ++--
 pages/pbService/activity/index.wxml | 4 ++--
 pages/pbService/activity/index.wxss | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 803dea3..666f9e3 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.isTest62? true : false;
+      data.isTest = data.isTest63? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/pbService/activity/index.js b/pages/pbService/activity/index.js
index 8cd4c6e..1bfa95e 100644
--- a/pages/pbService/activity/index.js
+++ b/pages/pbService/activity/index.js
@@ -10,7 +10,7 @@ Page({
     list:[],
     page:1,
     total:1,
-    navList: [{title: '精彩2022', year: 2022}, {title: '回顾2021', year: 2021}],
+    // navList: [{title: '精彩2022', year: 2022}, {title: '回顾2021', year: 2021}],
     navIndex: 0
   },
 
@@ -33,7 +33,7 @@ Page({
     https._post("review/getList",{
       limit:10,
       page:this.data.page,
-      year: this.data.navList[this.data.navIndex].year
+      year:''
     }).then(res=>{
       this.setData({
         total:res.data.total,
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index 3df0999..d63a517 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -1,9 +1,9 @@
 <!--pages/pbService/activity/index.wxml-->
 <title title="精彩回顾"></title>
 <image mode="widthFix" class="topimg" src="https://static.ticket.sz-trip.com/activity/WonderfulReview/topBacNew.png"></image>
-<view class="nav-box com-flex-tao">
+<!-- <view class="nav-box com-flex-tao">
   <view class="nav-item com-bac  {{index == navIndex ? 'active' : ''}}" bindtap="onReload"  wx:for="{{navList}}" data-index="{{index}}">{{ item.title }}</view>
-</view>
+</view> -->
 <view class="list">
   <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>
diff --git a/pages/pbService/activity/index.wxss b/pages/pbService/activity/index.wxss
index 29de696..1c4fc25 100644
--- a/pages/pbService/activity/index.wxss
+++ b/pages/pbService/activity/index.wxss
@@ -4,7 +4,7 @@
   width: 100%;
 }
 .list{
-  margin-top: 90rpx;
+  margin-top: 10rpx;
 }
 .item {
   margin: 40rpx 27rpx;

From e53d3bf4aa6b192e606b0dd1a16a00e35b76d29f Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 21 Mar 2023 14:09:06 +0800
Subject: [PATCH 050/471] =?UTF-8?q?=E5=BE=80=E6=9C=9F=E5=9B=9E=E9=A1=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              |  2 +-
 pages/pbService/activity/index.js   | 16 +++++++++++++---
 pages/pbService/activity/index.wxml |  9 +++++++--
 pages/pbService/activity/index.wxss | 22 +++++++++++++++++++++-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 666f9e3..5b1572c 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.isTest63? true : false;
+      data.isTest = data.isTest64? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/pbService/activity/index.js b/pages/pbService/activity/index.js
index 1bfa95e..f5ef5fb 100644
--- a/pages/pbService/activity/index.js
+++ b/pages/pbService/activity/index.js
@@ -10,8 +10,10 @@ Page({
     list:[],
     page:1,
     total:1,
-    // navList: [{title: '精彩2022', year: 2022}, {title: '回顾2021', year: 2021}],
-    navIndex: 0
+    navList: [{title: '精彩2023', year: 2023}, {title: '往期回顾', year: 2022}],
+    navIndex: 0,
+    sNavIndex:0,
+    sNavList:[{title: '回顾2022', year: 2022}, {title: '回顾2021', year: 2021}]
   },
 
   /**
@@ -28,12 +30,20 @@ Page({
     })
     this.getList()
   },
+  changeSNav(e){
+    this.setData({
+      page:0,
+      list:[],
+      sNavIndex:e.currentTarget.dataset.index
+    })
+    this.getList()
+  },
   getList:function(){
     if(this.data.list.length>=this.data.total) return;
     https._post("review/getList",{
       limit:10,
       page:this.data.page,
-      year:''
+      year:this.data.sNavIndex===0?this.data.navList[this.data.navIndex].year:this.data.sNavList[this.data.sNavIndex].year
     }).then(res=>{
       this.setData({
         total:res.data.total,
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index d63a517..13cb93c 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -1,9 +1,14 @@
 <!--pages/pbService/activity/index.wxml-->
 <title title="精彩回顾"></title>
 <image mode="widthFix" class="topimg" src="https://static.ticket.sz-trip.com/activity/WonderfulReview/topBacNew.png"></image>
-<!-- <view class="nav-box com-flex-tao">
+<view class="nav-box com-flex-tao">
   <view class="nav-item com-bac  {{index == navIndex ? 'active' : ''}}" bindtap="onReload"  wx:for="{{navList}}" data-index="{{index}}">{{ item.title }}</view>
-</view> -->
+</view>
+<view class="s_menu" wx:if="{{navIndex==1}}">
+    <view class="s_item {{index == sNavIndex ? 's_active' : ''}}" wx:for="{{sNavList}}" bindtap="changeSNav" data-index="{{index}}">
+      {{ item.title }}
+    </view>
+</view>
 <view class="list">
   <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>
diff --git a/pages/pbService/activity/index.wxss b/pages/pbService/activity/index.wxss
index 1c4fc25..55e544c 100644
--- a/pages/pbService/activity/index.wxss
+++ b/pages/pbService/activity/index.wxss
@@ -4,7 +4,7 @@
   width: 100%;
 }
 .list{
-  margin-top: 10rpx;
+  margin-top: 90rpx;
 }
 .item {
   margin: 40rpx 27rpx;
@@ -69,3 +69,23 @@ page {
   margin-bottom: -20rpx;
   background-image: url("https://static.ticket.sz-trip.com/activity/WonderfulReview/select.png");
 }
+.s_menu{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 122rpx;
+  margin-top: 45rpx;
+}
+.s_item{
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #695A56;
+  padding: 4rpx 20rpx;
+}
+.s_item.s_active{
+  background: #6A5B58;
+  border: 1rpx solid #6A5B58;
+  border-radius: 7rpx;
+  color: #FFFFFF;
+}

From a45e39aafc6def3c8f2754c7a542ea58596317e0 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 29 Mar 2023 17:40:58 +0800
Subject: [PATCH 051/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A8=E8=8D=90,?=
 =?UTF-8?q?=E6=9C=9F=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 pages/index/index.js                       |  4 +++-
 pages/index/index.wxss                     |  4 ++--
 pages/info/sceneProductInfo/index.js       |  1 -
 pages/order/scene/index.js                 | 11 +++++++----
 pages/order/scene/index.wxml               |  2 +-
 pages/user/cartlist/list.js                |  2 +-
 pages/user/order/sceneOrderInfo/index.wxml |  7 ++++++-
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app.js b/app.js
index 5b1572c..c37935d 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.isTest64? true : false;
+      data.isTest = data.isTest65? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 33e2454..71f024e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -458,7 +458,9 @@ Page({
     })
   },
   onReachBottom: function () {
-    // this.getList()
+     if (this.data.list.length<30) {
+             this.getList()
+     }
   },
   gotoDetail: function (e) {
     let item = e.currentTarget.dataset.item;
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1186938..649f537 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -473,11 +473,11 @@
 }
 .more-btn-text {
   text-align: center;
-  color: #999;
+  color: #0b898e;
   font-size: 27rpx;
   width: 200rpx;
   line-height: 65rpx;
-  border: 1px solid #999999;
+  border: 1px solid #0b898e;
   border-radius: 33rpx;
   margin: 20rpx auto;
 }
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 5f9657f..bb1a3df 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -352,7 +352,6 @@ Page({
             ...sku,
             ...product
           }
-
           wx.navigateTo({
             url: '/pages/order/scene/index',
           })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index a17e7c5..3aa31dd 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -28,6 +28,7 @@ Page({
     allowance_price: 0,
     pIndex: 0,
     flag:null,
+    ticket_type:1
   },
 
   /**
@@ -39,7 +40,8 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
-      flag:options.flag
+      flag:options.flag,
+      ticket_type:app.globalData.product.sku.ticket_type || 1
     })
     if (!app.globalData.product) {
       util.back();
@@ -198,7 +200,7 @@ Page({
     //   })
     //   return;
     // }
-    if (!date) {
+    if (!date && this.data.ticket_type == 1) {
       wx.showToast({
         title: '请选择使用日期',
         icon: 'none'
@@ -265,8 +267,9 @@ Page({
 	if(app.globalData.list){
 		app.globalData.list[app.globalData.index] = this.data.product
 	}
-	app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
-	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){
+  app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+  console.log(app.globalData);
+	if(app.globalData.list.list && app.globalData.list.length > app.globalData.index + 1){
 		if(app.globalData.createDate){
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 79c3f8d..f4ee161 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -5,7 +5,7 @@
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
-  <date wx:if="{{isLogin && type!='activity'}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 5ee79aa..3065686 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -165,7 +165,7 @@ Page({
           this.data.productType = 'post'
         }
       }
-    })
+    }) 
     if (product.length == 0 && product1.length == 0) {
       wx.showToast({
         title: '请先选择产品',
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index e304840..2512257 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -61,10 +61,15 @@
       <view class="childStatus" style="text-align: left;font-size: 30rpx; font-weight:bold;padding-bottom: 30rpx;color: #0b898e">
         {{ item.state_text }}
       </view>
-      <view class="row" wx:if="{{item.product_model == 'ticket'}}">
+      <view class="row" wx:if="{{item.product_model == 'ticket' && !item.order_advance.id}}">
         <view>出行日期：</view>
         <view>{{item.use_date}} {{ item.start_time }}-{{ item.end_time }}</view>
       </view>
+
+      <view class="row" wx:if="{{item.product_model == 'ticket' && item.order_advance.id}}">
+        <view>使用日期：</view>
+        <view>{{ item.order_advance.start_time }}-{{ item.order_advance.end_time }}</view>
+      </view>
       <view wx:if="{{item.product_model == 'ticket'}}">
         <view class="box-title tflex">
           <view>出行人信息</view>

From b982c5752e8fc3b8824b09787182af421ee5a5f1 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 30 Mar 2023 15:05:15 +0800
Subject: [PATCH 052/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/order/scene/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index c37935d..4c767d4 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.isTest65? true : false;
+      data.isTest = data.isTest66? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 3aa31dd..15a8be3 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -269,7 +269,7 @@ Page({
 	}
   app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
   console.log(app.globalData);
-	if(app.globalData.list.list && app.globalData.list.length > app.globalData.index + 1){
+	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){
 		if(app.globalData.createDate){
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{

From a8d9ea4e35561e5d8b6f91c504a7c34fdc1dee75 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 31 Mar 2023 15:49:16 +0800
Subject: [PATCH 053/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             | 2 +-
 pages/info/activityInfo/index.wxml | 2 +-
 pages/list/activitynew/index.wxml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 4c767d4..96d82b9 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.isTest66? true : false;
+      data.isTest = data.isTest67? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 08f705a..e5770bc 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -32,7 +32,7 @@
   </view>
   <view class="box-title">活动详情</view>
   <rich-text class="box-content" nodes="{{tool.formateRichText(info.intro)}}"></rich-text>
-  <view class="box-tip" wx:if="{{info && (info.is_bind_our_sku==0 || info.is_can_booking==0)}}">* 本活动无需在线预约，可直接前往。</view>
+  <!-- <view class="box-tip" wx:if="{{info && (info.is_bind_our_sku==0 || info.is_can_booking==0)}}">* 本活动无需在线预约，可直接前往。</view> -->
 </view>
 <navigator url="/pages/info/sceneProductInfo/index?id={{info.scene_data.id}}"
   wx:if="{{info && info.scene_data && info.scene_data.id}}" class="scene-box" catchtap="pagePoint" data-event='activity_detail_click' data-id='{{info.scene.data.id}}' data-type='scene'>
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 68718d7..65c01e8 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -103,7 +103,7 @@
     </view>
   </view>
   <view wx:if="{{list.length>0 && type==4 && movieType==2}}">
-    <view bindtap="gotoDetail" data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
+    <view  data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
       <view class="activity-info" style="height:160rpx;width:500rpx">
         <view class="activity-title textOver2">{{item.title}}</view>
         <view class="textOver" wx:if="{{item.address}}">{{item.address}}</view>

From 5764db5d847b561240337a436dd7fa3e329243d5 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 31 Mar 2023 18:52:17 +0800
Subject: [PATCH 054/471] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                               |  2 +-
 pages/info/museumInfo/index.js       |  1 +
 pages/info/sceneProductInfo/index.js |  1 +
 pages/order/scene/index.js           | 12 ++++++++----
 pages/order/scene/index.wxml         |  4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 96d82b9..a60eb32 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.isTest67? true : false;
+      data.isTest = data.isTest68? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index 28f17ec..af26a02 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -451,6 +451,7 @@ Page({
       isGroup: this.data.isGroup,
       isTeam: this.data.info.team_order && this.data.isGroup?1:0
     }
+    app.globalData.index = 0
     wx.navigateTo({
       url: '/pages/order/scene/index?type=museum'
     })
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index bb1a3df..0981ea2 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -352,6 +352,7 @@ Page({
             ...sku,
             ...product
           }
+          app.globalData.index = 0
           wx.navigateTo({
             url: '/pages/order/scene/index',
           })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 15a8be3..2e38932 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    product: app.globalData.product,
+    product:null,
     productNum: 1,
     linkmanList: [],
     date: "",
@@ -35,12 +35,16 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(app.globalData.product);
+    console.log(this.data.date);
     this.setData({
+      product: app.globalData.product,
       type: options.type,
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
+      date:null,
       ticket_type:app.globalData.product.sku.ticket_type || 1
     })
     if (!app.globalData.product) {
@@ -60,6 +64,7 @@ Page({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
+   console.log(this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
@@ -269,7 +274,7 @@ Page({
 	}
   app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
   console.log(app.globalData);
-	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){
+	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
 		if(app.globalData.createDate){
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{
@@ -364,8 +369,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
-	if(app.globalData.list && app.globalData.list.length != 0){
+	if(app.globalData.list && app.globalData.list.length != 0 && this.data.type!='museum'){
 		app.globalData.product = app.globalData.list[app.globalData.index]
 	}
     if (!this.data.isLogin) {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index f4ee161..69dd90f 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -1,11 +1,11 @@
 <!--pages/order/scene/index.wxml-->
-<view class="{{product && product.isGroup==1?'group-order':''}}">
+<view  class="{{product && product.isGroup==1?'group-order':''}}">
   <title title="订单填写"></title>
   <view class="product-info" wx:if="{{product}}">
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
-  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date  wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">

From 8a985c61e1c5b86a41b0db868034c46473cee683 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 12 Apr 2023 08:54:38 +0800
Subject: [PATCH 055/471] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |  6 +-
 pages/index/index.js                        | 34 +++++---
 pages/index/index.wxml                      |  4 +-
 pages/info/sceneProductInfo/index.js        | 97 +++++++++++----------
 pages/list/activitynew/index.wxml           |  5 +-
 pages/list/activitynew/index.wxss           |  9 ++
 pages/list/movieticket/list/info/index.wxss |  1 +
 pages/list/museum/index.wxss                |  1 +
 8 files changed, 91 insertions(+), 66 deletions(-)

diff --git a/app.js b/app.js
index a60eb32..ab55933 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.isTest68? true : false;
+      data.isTest = data.isTest71? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
@@ -31,6 +31,7 @@ App({
           obj[item.id] = item.image
         });
         this.globalData.configJson.indexSeason = obj 
+        this.globalData.loadIndexSeason = true
       })
     })
 
@@ -253,6 +254,7 @@ App({
     prizeId: null,
     loginPageEvent: {
       "pages/list/message/index": 'message_login_'
-    }
+    },
+    loadIndexSeason:false
   }
 })
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 71f024e..f7d1ec7 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -206,6 +206,16 @@ Page({
     })
 
   },
+  //获取季节配置
+  getIndexSeason(){
+    this.setData({
+      indexHot: app.globalData.configJson.indexHot,
+      isTest: app.globalData.configJson.isTest,
+      otherPlat: app.globalData.configJson.otherPlats,
+      indexSeason: app.globalData.configJson.indexSeason
+    })
+    this.getFourProduct()
+  },
   //关闭弹窗广告
   closeAdv: function () {
     this.setData({
@@ -735,20 +745,8 @@ Page({
     return
   },
   onReady: function () {
-    if (app.globalData.configJson) {
-      this.setData({
-        indexHot: app.globalData.configJson.indexHot,
-        isTest: app.globalData.configJson.isTest,
-        otherPlat: app.globalData.configJson.otherPlats,
-        indexSeason: app.globalData.configJson.indexSeason
-      })
-      console.log(app.globalData.configJson)
-      this.getFourProduct()
-    } else {
-      setTimeout(() => {
-        this.onReady()
-      }, 300)
-    }
+
+
   },
   gotoOther: function (e) {
     let item = e.currentTarget.dataset.item;
@@ -772,6 +770,14 @@ Page({
     util.pagePoint(e, type)
   },
   onShow: function () {
+    if (app.globalData.loadIndexSeason) {
+      this.getIndexSeason()
+    } else {
+      setTimeout(() => {
+        this.getIndexSeason()
+      }, 500)
+    }
+
     this.pagePoint({
       event: 'home_view'
     }, 1)
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5bf0986..307b4d7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -216,11 +216,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
         <view>书香借阅</view>
       </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+      <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
-      </view>
+      </view> -->
       <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
         data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 0981ea2..ab71a71 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -32,41 +32,7 @@ Page({
     cartTop: 0,
     top: 0,
     skuList: [], //立即预定的列表
-    sku_ids: [
-      353954,
-      353950,
-      353949,
-      353951,
-      353947,
-      353953,
-      353685,
-      353684,
-      353952,
-      353686,
-      353948,
-      354730,
-      354409,
-      354359,
-      345343,
-      354756,
-      354385,
-      354360,
-      354361,
-      354362,
-      355466,
-      355465,
-      356230,
-      356223,
-      356207,
-      346648,
-      357518,
-      356233,
-      354381,
-      354384,
-      356324,
-      354737,
-      355467,
-    ]
+    sku_ids: []
   },
 
   /**
@@ -89,6 +55,7 @@ Page({
     commonApi._post("scene/detail", {
       id: options.id
     }).then(res => {
+      let flag = false
       if (!res.data) {
         wx.showToast({
           title: '产品已下架',
@@ -122,22 +89,58 @@ Page({
         if (pItem) {
           res.data.product = [pItem];
         }
-
-      } else if (options.zhuanti_type == "yihuFree") {
-
-        let skuArr = this.data.sku_ids
-        let newArr = []
-        for (let i = 0; i < res.data.product.length; i++) { //3
-          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
-            for (let k = 0; k < skuArr.length; k++) {
-              if (res.data.product[i].sku[j].id == skuArr[k]) {
-                newArr.push(res.data.product[i].sku[j])
+      } else if (options.zhuanti_type) {
+        flag = true
+        commonApi._post("theme/getYihuFreeList", {
+          zhuanti_type: options.zhuanti_type
+        }).then(res1 => {
+          let skuArr = res1.data.sku_ids
+          let newArr = []
+          for (let i = 0; i < res.data.product.length; i++) { //3
+            for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+              for (let k = 0; k < skuArr.length; k++) {
+                if (res.data.product[i].sku[j].id == skuArr[k]) {
+                  newArr.push(res.data.product[i].sku[j])
+                }
               }
             }
+            res.data.product[i].sku = newArr;
           }
-          res.data.product[i].sku = newArr;
-        }
+          res.data.product.map(product => {
+            product.sku.map(sku => {
+              sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+            })
+          })
+          this.setData({
+            info: res.data
+          })
+          var arr = []
+          res.data.product.forEach((item, index) => {
+            item.sku.forEach(itemB => {
+              itemB.proIndex = index
+              arr.push(itemB)
+            })
+          });
+          this.setData({
+            skuList: arr
+          })
+          util.pagePoint({
+            event: 'scene_view',
+            param: {
+              type: res.data.type,
+              id: res.data.id
+            }
+          }, 1)
+          this.BroswerRecord()
+        })
+
       }
+      console.log(res.data.product);
+        if (flag) {
+          return
+        }
+
+
       // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
       res.data.product.map(product => {
         product.sku.map(sku => {
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 65c01e8..9cb8dee 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -95,11 +95,14 @@
   <view wx:if="{{list.length>0 && type==4 && movieType!=2}}">
     <view bindtap="gotoDetail" data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0" wx:for="{{list}}">
       <common-image width="180rpx" height='180rpx' src="{{item.headimg}}" mode="aspectFill"></common-image>
-      <view style="height:180rpx;margin:0;margin-left:20rpx;display:block" class="activity-info">
+      <view style="height:180rpx;margin:0;margin-left:20rpx;display:block;max-width:327rpx" class="activity-info">
         <view class="activity-title textOver2" style="margin-bottom:20rpx">{{item.title}}</view>
         <view class="textOver" wx:if="{{item.director}}" style="margin-bottom:10rpx">导演：{{item.director}}</view>
         <view class="textOver2" wx:if="{{item.leading_role}}">主演：{{item.leading_role}}</view>
       </view>
+      <view class="btn">
+          查看
+      </view>
     </view>
   </view>
   <view wx:if="{{list.length>0 && type==4 && movieType==2}}">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index c53c97a..50ae31f 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -290,4 +290,13 @@ background: rgba(11, 137, 142, .1);
 .new-top-search-box {
   display: flex;
   justify-content: space-between;
+}
+.btn{
+flex-shrink: 0;
+ color: #fff;
+ background: #f55;
+ font-size: 26rpx;
+ padding: 6rpx 20rpx;
+ border-radius: 40rpx;
+ margin-left: 10rpx;
 }
\ No newline at end of file
diff --git a/pages/list/movieticket/list/info/index.wxss b/pages/list/movieticket/list/info/index.wxss
index 8bb62ff..a35a1b3 100644
--- a/pages/list/movieticket/list/info/index.wxss
+++ b/pages/list/movieticket/list/info/index.wxss
@@ -34,6 +34,7 @@
   box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.06);
   border-radius: 27rpx 27rpx 0px 0px;
   padding: 0 40rpx;
+  padding-bottom: 60rpx;
 }
 .content .title {
   font-size: 33rpx;
diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss
index 88ee367..41f26cf 100644
--- a/pages/list/museum/index.wxss
+++ b/pages/list/museum/index.wxss
@@ -55,6 +55,7 @@ page {
 }
 .info .address {
   margin-bottom: 15rpx;
+  max-width: 320rpx;
 }
 .info .com-flex {
   width: 240rpx;

From 68dfb6019f4c69059366418733d6e97d693450bf Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sat, 15 Apr 2023 15:49:04 +0800
Subject: [PATCH 056/471] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5id=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             |  2 +-
 pages/info/groupOrderInfo/index.js | 57 ++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/app.js b/app.js
index ab55933..c95d57e 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.isTest71? true : false;
+      data.isTest = data.isTest72? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js
index f85a2fe..412a43e 100644
--- a/pages/info/groupOrderInfo/index.js
+++ b/pages/info/groupOrderInfo/index.js
@@ -14,7 +14,8 @@ Page({
     restTime:null,
     countdown:0,
     codeImg:null,
-    showShareMask:false
+    showShareMask:false,
+    from:null
   },
 
   /**
@@ -22,25 +23,26 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      id:options.id
+      id:options.id,
+      from:options.from
     })
     // 获取二维码
-    commonApi.user_post("team_order/get_qrcode",{
-      url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id
-    }).then(res=>{
-      this.setData({
-        codeImg:res.data
-      })
-    })
-    if(options.from=='order'){
-      wx.showModal({
-        title:"提示",
-        content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
-        success:function(){
+    // commonApi.user_post("team_order/get_qrcode",{
+    //   url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id
+    // }).then(res=>{
+    //   this.setData({
+    //     codeImg:res.data
+    //   })
+    // })
+    // if(options.from=='order'){
+    //   wx.showModal({
+    //     title:"提示",
+    //     content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
+    //     success:function(){
           
-        }
-      })
-    }
+    //     }
+    //   })
+    // }
   },
   showShare(){
     this.setData({
@@ -107,7 +109,24 @@ Page({
       }
     })
   },
-
+  getQrcode(id){
+    commonApi.user_post("team_order/get_qrcode",{
+      url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+id
+    }).then(res=>{
+      this.setData({
+        codeImg:res.data
+      })
+    })
+    if(this.data.from=='order'){
+      wx.showModal({
+        title:"提示",
+        content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
+        success:function(){
+          
+        }
+      })
+    }
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -123,6 +142,7 @@ Page({
       order_id:this.data.id
     }).then(res=>{
       if(res.code==1){
+        this.getQrcode(res.data.list.id)
         res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null;
         res.data.list.members.reverse()
         this.setData({
@@ -141,6 +161,7 @@ Page({
         
       }
     })
+
   },
   setTime(){
     if(this.data.countdown && this.data.countdown>0){

From 940c39d6a424fd4b265d2df04a8a7439a19ffb52 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 21 Apr 2023 17:34:14 +0800
Subject: [PATCH 057/471] =?UTF-8?q?=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 app.json                                      |  1 +
 pages/list/activitynew/index.js               |  1 +
 pages/list/activitynew/index.wxml             | 19 ++---
 pages/list/movieticket/list/cinema/index.js   | 49 +++++++++++-
 pages/list/movieticket/list/cinema/index.wxml |  6 +-
 pages/list/movieticket/list/seats/index.js    | 28 ++++---
 pages/list/movieticket/list/web/index.js      | 79 +++++++++++++++++++
 pages/list/movieticket/list/web/index.json    |  3 +
 pages/list/movieticket/list/web/index.wxml    |  4 +
 pages/list/movieticket/list/web/index.wxss    |  1 +
 pages/list/techan/index.wxml                  |  2 +-
 pages/order/coupon/index.js                   |  2 +-
 pages/order/hotel/index.wxml                  |  2 +-
 pages/order/movie/index.js                    | 45 ++++++-----
 pages/order/orderList/index.js                |  3 +
 pages/order/pay/index.js                      | 50 ++++++++++--
 pages/order/pay/index.wxml                    | 20 ++++-
 pages/order/scene/index.js                    |  2 +-
 pages/pbService/web/index.js                  |  1 -
 20 files changed, 259 insertions(+), 61 deletions(-)
 create mode 100644 pages/list/movieticket/list/web/index.js
 create mode 100644 pages/list/movieticket/list/web/index.json
 create mode 100644 pages/list/movieticket/list/web/index.wxml
 create mode 100644 pages/list/movieticket/list/web/index.wxss

diff --git a/app.js b/app.js
index c95d57e..81893c1 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.isTest72? true : false;
+      data.isTest = data.isTest73? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 23d26ac..7de07ea 100644
--- a/app.json
+++ b/app.json
@@ -104,6 +104,7 @@
     "pages/list/movieticket/list/seats/index",
     "pages/list/movieticket/list/cinema/index",
     "pages/list/movieticket/list/ticket/index",
+    "pages/list/movieticket/list/web/index",
     "pages/list/movieticket/list/info/index",
     "pages/list/theatre/index",
     "pages/list/card/index",
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index acb4921..604547e 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -335,6 +335,7 @@ Page({
         url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
       })
     } else if (this.data.type == 4) {
+      return
       wx.navigateTo({
         url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
       })
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 9cb8dee..6cc988f 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -19,10 +19,6 @@
       <image src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
       <view style="{{type==9?'color: #0B898E':''}}">全部</view>
     </view>
-    <view class="type-item" bindtap="changeType" data-type="2">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==2?'color:#C155E9':''}}">展览</view>
-    </view>
     <view class="type-item" bindtap="changeType" data-type="3">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon3{{type==3?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==3?'color:#358FE4':''}}">景区</view>
@@ -31,14 +27,19 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==1?'color:#FFB423':''}}">演出</view>
     </view>
-    <!-- <view class="type-item" bindtap="changeType" data-type="5">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
-    </view> -->
     <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
     </view>
+    <view class="type-item" bindtap="changeType" data-type="2">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==2?'color:#C155E9':''}}">展览</view>
+    </view>
+    <!-- <view class="type-item" bindtap="changeType" data-type="5">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
+    </view> -->
+
     <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>
@@ -106,7 +107,7 @@
     </view>
   </view>
   <view wx:if="{{list.length>0 && type==4 && movieType==2}}">
-    <view  data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
+    <view bindtap="gotoDetail"  data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
       <view class="activity-info" style="height:160rpx;width:500rpx">
         <view class="activity-title textOver2">{{item.title}}</view>
         <view class="textOver" wx:if="{{item.address}}">{{item.address}}</view>
diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js
index 072bcb5..c84d836 100644
--- a/pages/list/movieticket/list/cinema/index.js
+++ b/pages/list/movieticket/list/cinema/index.js
@@ -1,4 +1,5 @@
 // pages/list/movieticket/list/cinema/index.js
+let app = getApp()
 import commonApi from "../../../../../utils/https/common"
 import util from "../../../../../utils/util"
 Page({
@@ -13,7 +14,8 @@ Page({
     dates:[],
     dateIndex:0,
     list:[],
-    name:""
+    name:"",
+    invoiceId:null,
   },
 
   /**
@@ -97,6 +99,49 @@ Page({
       console.log(res)
     })
   },
+  selectMovieSeat(e){
+    let info = e.currentTarget.dataset.info
+    const areaInfo = JSON.parse(info.schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
+    let planData = {
+      areaInfo,
+      fee:info.service_fee,
+      movieName: this.data.movie[this.data.currentNum].title,
+      planId : info.schedule_id,
+      planTime : info.show_time,
+      type:'WECHATXCX',
+      remake : ''
+    }
+    let show_id = info.show_id
+    let cinema_id = info.cinema_id
+    // let schedule_id = info.schedule_id
+
+    commonApi._post('Cinema/getProductAndSku',{
+      show_id,
+      cinema_id,
+    }).then(res=>{
+      this.setData({
+        productInfo:res.data
+      })
+      app.globalData.product ={ 
+        product:this.data.productInfo,
+        info:{
+          hallName:this.data.name,
+          show_date:info.show_date,
+          start_end_time:info.show_time,
+          movieName:this.data.movie[this.data.currentNum].title,
+          show_version:info.show_version,
+          selectSeatInfo:null,
+          schedule_id:info.schedule_id
+        }
+      }
+      wx.navigateTo({
+        url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
+      })
+    })
+    // wx.navigateTo({
+    //   url: '/pages/list/movieticket/list/seats/index?show_id='+show_id+'&cinema_id='+cinema_id+'&schedule_id='+schedule_id+'&planData='+JSON.stringify(planData),
+    // })
+  },
   onChange:function(e){
     console.log(e)
     this.setData({
@@ -140,7 +185,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    console.log(123123123213);
   },
 
   /**
diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml
index 8c03f56..a1a90d9 100644
--- a/pages/list/movieticket/list/cinema/index.wxml
+++ b/pages/list/movieticket/list/cinema/index.wxml
@@ -16,7 +16,7 @@
 <view class="dates-list">
   <view class="date-item{{index==dateIndex?' active':''}}" bindtap="changeDate" data-index="{{index}}" wx:for="{{dates}}">{{item.name}}</view>
 </view>
-<navigator url="../seats/index?show_id={{movie[currentNum].show_id}}&cinema_id={{id}}&schedule_id={{item.schedule_id}}" class="movie-item" wx:for="{{list}}">
+<div class="movie-item" wx:for="{{list}}" data-info="{{item}}" bindtap="selectMovieSeat">
   <view style="width:167rpx;flex-shrink:0">
     <view class="time">{{item.show_time}}</view>
     <view>{{item.close_time}}散场</view>
@@ -25,11 +25,11 @@
     <view class="type">{{item.show_version}}</view>
     <view>{{item.hall_name}}</view>
   </view>
-  <view class="price"><text>￥</text>{{item.price/100}}</view>
+  <view class="price"><text>￥</text>{{item.price}}</view>
   <view class="btn">
     购票
   </view>
-</navigator>
+</div>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
   <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
diff --git a/pages/list/movieticket/list/seats/index.js b/pages/list/movieticket/list/seats/index.js
index a44f10f..6e885ba 100644
--- a/pages/list/movieticket/list/seats/index.js
+++ b/pages/list/movieticket/list/seats/index.js
@@ -137,6 +137,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options);
     this.setData({
       options:options
     })
@@ -147,13 +148,16 @@ Page({
       this.setData({
         productInfo:res.data
       })
+      wx.navigateTo({
+        url:"/pages/list/movieticket/list/web/index?planData="+options.planData,
+      })
     })
-    let that = this;
-    let sys = wx.getSystemInfoSync()
-    that.setData({
-      seatArea: sys.screenHeight - sys.statusBarHeight - (500 * sys.screenWidth / 750),
-      rpxToPx: sys.screenWidth / 750
-    });
+    // let that = this;
+    // let sys = wx.getSystemInfoSync()
+    // that.setData({
+    //   seatArea: sys.screenHeight - sys.statusBarHeight - (500 * sys.screenWidth / 750),
+    //   rpxToPx: sys.screenWidth / 750
+    // });
   },
 
   /**
@@ -167,12 +171,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post("Cinema/getLockSeatInfo",{
-      schedule_id:this.data.options.schedule_id
-    }).then(res=>{
-      console.log(res)
-      this.getInfo();
-    })
+    // commonApi.user_post("Cinema/getLockSeatInfo",{
+    //   schedule_id:this.data.options.schedule_id
+    // }).then(res=>{
+    //   console.log(res)
+    //   this.getInfo();
+    // })
     
     
     //---这此替换成自己的接口请求成功后--end--
diff --git a/pages/list/movieticket/list/web/index.js b/pages/list/movieticket/list/web/index.js
new file mode 100644
index 0000000..0dcf23c
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.js
@@ -0,0 +1,79 @@
+// pages/pbService/web/index.js
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    webUrl:""
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      webUrl:'https://online.suiyuaninfo.com/?planData='+options.planData
+    })
+    console.log(this.data.webUrl);
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+   
+  },
+  handleGetMessage: function(e) {
+    console.log(e.target.data)
+    console.log(app.globalData.product);
+    return
+    app.globalData.product ={ 
+      product:this.data.productInfo,
+      info:{
+        hallName:this.data.hallName,
+        show_date:this.data.show_date,
+        start_end_time:this.data.start_end_time,
+        cinema_title:this.data.cinema_title,
+        movieName:this.data.movieName,
+        show_version:this.data.show_version,
+        selectSeatInfo:selectSeatInfo,
+        schedule_id:this.data.schedule_id
+      }
+    }
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+      
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/list/movieticket/list/web/index.json b/pages/list/movieticket/list/web/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/list/movieticket/list/web/index.wxml b/pages/list/movieticket/list/web/index.wxml
new file mode 100644
index 0000000..5d9fd35
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.wxml
@@ -0,0 +1,4 @@
+<!--pages/pbService/web/index.wxml-->
+<view wx:if="{{webUrl}}">
+  <web-view bindmessage="handleGetMessage" src="{{webUrl}}"></web-view>
+</view>
diff --git a/pages/list/movieticket/list/web/index.wxss b/pages/list/movieticket/list/web/index.wxss
new file mode 100644
index 0000000..3d9e18a
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.wxss
@@ -0,0 +1 @@
+/* pages/pbService/web/index.wxss */
\ No newline at end of file
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 9d8e3df..5ba68e6 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -17,7 +17,7 @@
         <view class="supplier-tags">
           <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
         </view>
-        <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text>{{item.address}}</view>
+        <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
       </view>
       <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
     </view>
diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index ac70388..1b7c0c3 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -71,7 +71,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    app.globalData.couponInfo = null;
   },
 
   /**
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index 694fdbd..f59a916 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -68,7 +68,7 @@
     </view>
   </view>
 </view>
-<!-- <coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon> -->
+<coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon>
 <!-- 支付按钮 -->
 <view style="height:{{100 }}rpx"></view>
 <view class="fixed-bottom">
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index 21a32fc..f33494f 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -21,22 +21,19 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let key = options.key;
-    if(!key){
-      util.back()
-      return;
-    }
+    console.log(options.selectSeatInfo);
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
     let product = app.globalData.product,price=0;
-    product.info.selectSeatInfo.map(item=>{
-      price = Number(item.price) + Number(price)
+    product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
+    product.info.selectSeatInfo.seatPriceInfo.map(item=>{
+      price =price + Number(item.split('-')[1]) 
     })
+    console.log(price);
     this.setData({
       product:product,
-      key:key,
-      price:price
+      price:price*100
     })
     userApi.user_post("user/getMyInfo").then(res=>{
       this.setData({
@@ -63,30 +60,30 @@ Page({
       })
       return;
     }
-    let product = this.data.product,seats_list=[],seats_ids=[];
-    product.info.selectSeatInfo.map(item=>{
-      seats_list.push(item.name);
-      seats_ids.push({
-        ext_id:item.ext_id,
-        area:item.area || "",
-        flag:Number(item.flag)
-      })
-    })
+    let product = this.data.product
+    // product.info.selectSeatInfo.map(item=>{
+    //   seats_list.push(item.name);
+    //   seats_ids.push({
+    //     ext_id:item.ext_id,
+    //     area:item.area || "",
+    //     flag:Number(item.flag)
+    //   })
+    // })
     let product_list = [{
       "type" : "movie",//电影,必填
       "product_id": product.product.id,
       "sku_id": product.product.sku_info.id,
-      "product_num": product.info.selectSeatInfo.length,//也就是锁定的座位数,必填
+      "product_num": product.info.selectSeatInfo.seatInfo.length,//也就是锁定的座位数,必填
       "reserve_mobile": this.data.tel,
       "use_date": product.info.show_date,//使用日期，Y-m-d日期格式字符串,必填
       "use_time": product.info.start_end_time,//场次时间,直接传字符串,必填
       "show_version": product.info.show_version,//场次版本,必填
       "scene_id": product.product.scene_id,//场景id，我方系统的场景id,必填
       "schedules_name": product.info.hallName,//放映厅名称,必填
-      "seats_list": seats_list.join(","),//座位中文名称,多个座位逗号分隔,必填
-      "key": this.data.key,//锁座返回的key,必填
+      "seats_list": product.info.selectSeatInfo.seatInfo.join(","),//座位中文名称,多个座位逗号分隔,必填
+      // "key": this.data.key,//锁座返回的key,必填
       "schedules_id": product.info.schedule_id,//淘票票场次id,必填
-      "seats_ids": seats_ids
+      "seats_ids": product.info.selectSeatInfo.seatPriceInfo
     }];
     let data = {
       product_list:product_list,
@@ -110,6 +107,7 @@ Page({
       data:JSON.stringify(data)
     }).then(res=>{
       console.log(res)
+
     })
   },
 
@@ -120,13 +118,14 @@ Page({
     this.setData({
       coupon:app.globalData.couponInfo
     })
+    console.log(this.coupon);
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-
+    app.globalData.couponInfo = null
   },
 
   /**
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 16f787c..220d57c 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -21,6 +21,7 @@ Page({
   select_allowance: false,
   allowance_data: null,
   allowance_price: 0,
+  flag:null
   },
 
   /**
@@ -32,7 +33,9 @@ Page({
       ticketList: app.globalData.list,
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
+      flag:options.flag
     })
+    console.log(this.data.flag);
     console.log(app.globalData);
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index c99612d..7481d63 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -13,8 +13,11 @@ Page({
     second:"00",
     minute:"00",
     payIndex:-1,
-    numIndex: 0,
-    showNumMask: false
+    numIndex:0,
+    showNumMask: false,
+    activePay:false,//是否活动支付
+    SUBWALLET:false,
+    wxPay:false
   },
 
   /**
@@ -85,9 +88,24 @@ Page({
       else {
         util.back()
       }
-      this.setData({
-        info:res.data
-      })
+      if (Object.keys(res.data.coupon_activity).length != 0) {
+        this.setData({
+          info:res.data,
+          activePay: Object.keys(res.data.coupon_activity).length === 0 ?false:true,
+          SUBWALLET:res.data.coupon_activity.pay_type.includes('SUBWALLET') || !res.data.coupon_activity.pay_type,
+          wxPay:res.data.coupon_activity.pay_type.includes('WEIXIN') || !res.data.coupon_activity.pay_type,
+          payIndex:Object.keys(res.data.coupon_activity).length === 0 ?-1:0,
+        })
+        console.log(this.data.wxPay);
+      }else{
+        this.setData({
+          info:res.data,
+        })
+      }
+     
+      
+      console.log(this.data.ERMB);
+
     })
     this.checkPay();
    
@@ -111,6 +129,28 @@ Page({
     })
   },
   pay:function(){
+    if (this.data.activePay) {
+      let flag = false
+      if (this.data.payList.length!=0 && !this.data.info.coupon_activity.pay_type.includes('SUBWALLET')) {
+        flag = true
+      }
+      if (this.data.activePay && flag && !this.data.wxPay) {
+         wx.showToast({
+           title: '暂无支付方式请前往其它端付款',
+           icon:'none'
+         })
+         return
+      }
+      console.log(this.data.payIndex);
+      if (this.data.payIndex===0) {
+        wx.showToast({
+          title: '请选择支付方式',
+          icon:'none'
+        })
+        return
+      }
+    }
+
     let _this = this;
     if(this.data.payIndex==1) {
       this.setData({
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 44d2fb9..834cbb6 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -8,7 +8,25 @@
     <view class="price">¥{{info.paid_money/100}}</view>
   </view>
 </view>
-<view class="pay-methods-box">
+<view class="pay-methods-box" wx:if="{{activePay}}">
+  <view>支付方式：</view>
+  <view class="pay-method" bindtap="changePayMethod" data-index="-1" wx:if="{{wxPay}}">
+    <view class="iconfont icon-weixin1"></view>
+    <view class="method-name">微信支付</view>
+    <view class="iconfont {{payIndex==-1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
+  </view>
+  <view class="pay-method" wx:if="{{payList.length>0 && SUBWALLET}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
+    <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
+    <view class="method-name">数字人民币</view>
+    <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
+  </view>
+  <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
+    <image src="https://static.ticket.sz-trip.com/xcxImages/numLogo.png" mode="aspectFill"></image>
+    <view class="red-num">君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权</view>
+  </view>
+</view>
+
+<view class="pay-methods-box" wx:if="{{!activePay}}">
   <view>支付方式：</view>
   <view class="pay-method" bindtap="changePayMethod" data-index="-1">
     <view class="iconfont icon-weixin1"></view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 2e38932..64ce73a 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -292,7 +292,7 @@ Page({
 				app.globalData.createDate.product_list.push(data.product_list[0])
 			}
 			wx.redirectTo({
-			  url: '/pages/order/orderList/index'
+			  url: '/pages/order/orderList/index?flag='+ this.data.flag
 			})
 		}else{
 			commonApi.user_post(service, postData).then(res => {
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 97bbea4..f5c5555 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -51,7 +51,6 @@ Page({
       })
     }
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

From 95b033d0fcc322a45049e73f5bf64735c78a8e12 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 25 Apr 2023 09:28:20 +0800
Subject: [PATCH 058/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E6=9C=9F=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                          | 2 +-
 pages/list/activitynew/index.js | 1 -
 pages/order/coupon/index.wxml   | 2 +-
 pages/order/movie/index.js      | 2 +-
 pages/user/coupon/index.wxml    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 81893c1..70097da 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.isTest73? true : false;
+      data.isTest = data.isTest74? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 604547e..acb4921 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -335,7 +335,6 @@ Page({
         url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
       })
     } else if (this.data.type == 4) {
-      return
       wx.navigateTo({
         url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
       })
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 704ff1e..6ee7140 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -5,7 +5,7 @@
     <view class="money">{{item.activity.money/100}}</view>
     <view class="coupon-info">
       <view>满{{item.activity.mini_money/100}}元可用</view>
-      <view class="couon-date">{{item.activity.end_time}}到期</view>
+      <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
     </view>
     <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
   </view>
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index f33494f..efa2c54 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -28,7 +28,7 @@ Page({
     let product = app.globalData.product,price=0;
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
     product.info.selectSeatInfo.seatPriceInfo.map(item=>{
-      price =price + Number(item.split('-')[1]) 
+      price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
     })
     console.log(price);
     this.setData({
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index c5db573..8d46f82 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -12,7 +12,7 @@
     <view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
   </view>
   <view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
-  <view class="coupon-tip"><text>有效期：</text>{{item.activity.end_time}}</view>
+  <view class="coupon-tip"><text>有效期：</text>{{item.end_time}}</view>
   <view class="coupon-tip"><text>优惠码：</text>{{item.key}}</view>
   <view class="coupon-rule">
   <view bindtap="showRule" data-item="{{item}}">使用规则  <text class="iconfont icon-xia"></text></view>

From c1692094c19269d32c73d6443d79cfac3fcd1eb1 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 26 Apr 2023 18:19:01 +0800
Subject: [PATCH 059/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=20=E5=BD=B1=E9=99=A2=E8=B4=AD=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 pages/list/activitynew/index.js               |  2 +-
 pages/list/activitynew/index.wxml             |  2 +-
 pages/list/movieticket/list/cinema/index.js   | 16 +++----
 pages/list/movieticket/list/cinema/index.wxml |  2 +-
 pages/list/movieticket/list/info/index.wxml   |  2 +-
 pages/list/movieticket/list/ticket/index.js   | 46 ++++++++++++++++++-
 pages/list/movieticket/list/ticket/index.wxml |  6 +--
 pages/order/movie/index.js                    | 11 +++--
 pages/order/movie/index.wxml                  |  7 +--
 pages/order/movie/index.wxss                  |  1 -
 pages/order/orderList/index.wxml              |  2 +-
 pages/order/scene/index.js                    | 12 +++--
 pages/order/scene/index.wxml                  |  4 +-
 pages/user/cartlist/list.js                   | 17 +++++--
 15 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/app.js b/app.js
index 70097da..cca10f2 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.isTest74? true : false;
+      data.isTest = data.isTest75? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index acb4921..2e38e77 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -14,7 +14,7 @@ Page({
     types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other'],
     weeks: [],
     pageNo: 1,
-    sort: "",
+    sort: "distance",
     list: [],
     date: null,
     total: 1,
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 6cc988f..887a8eb 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -102,7 +102,7 @@
         <view class="textOver2" wx:if="{{item.leading_role}}">主演：{{item.leading_role}}</view>
       </view>
       <view class="btn">
-          查看
+          {{movieType==1?'购买':'查看'}}
       </view>
     </view>
   </view>
diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js
index c84d836..e00b4b3 100644
--- a/pages/list/movieticket/list/cinema/index.js
+++ b/pages/list/movieticket/list/cinema/index.js
@@ -113,8 +113,8 @@ Page({
     }
     let show_id = info.show_id
     let cinema_id = info.cinema_id
-    // let schedule_id = info.schedule_id
-
+		// let schedule_id = info.schedule_id
+		console.log(info);
     commonApi._post('Cinema/getProductAndSku',{
       show_id,
       cinema_id,
@@ -125,22 +125,22 @@ Page({
       app.globalData.product ={ 
         product:this.data.productInfo,
         info:{
-          hallName:this.data.name,
+					hallName:info.hall_name,
+					cinemaName:this.data.name,
           show_date:info.show_date,
-          start_end_time:info.show_time,
+					show_time:info.show_time,
+					close_time:info.close_time,
           movieName:this.data.movie[this.data.currentNum].title,
           show_version:info.show_version,
           selectSeatInfo:null,
-          schedule_id:info.schedule_id
+					schedule_id:info.schedule_id,
+					start_end_time:info.show_time
         }
       }
       wx.navigateTo({
         url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
       })
     })
-    // wx.navigateTo({
-    //   url: '/pages/list/movieticket/list/seats/index?show_id='+show_id+'&cinema_id='+cinema_id+'&schedule_id='+schedule_id+'&planData='+JSON.stringify(planData),
-    // })
   },
   onChange:function(e){
     console.log(e)
diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml
index a1a90d9..30ab097 100644
--- a/pages/list/movieticket/list/cinema/index.wxml
+++ b/pages/list/movieticket/list/cinema/index.wxml
@@ -25,7 +25,7 @@
     <view class="type">{{item.show_version}}</view>
     <view>{{item.hall_name}}</view>
   </view>
-  <view class="price"><text>￥</text>{{item.price}}</view>
+  <view class="price"><text>￥</text>{{item.price}}<text style="font-size: 20rpx; color:#999 ;"> 起</text></view>
   <view class="btn">
     购票
   </view>
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 8076186..4910bdb 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -25,5 +25,5 @@
 </view>
 <view style="height:104rpx" wx:if="{{showFlag}}"></view>
 <navigator wx:if="{{info && showFlag}}" url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
-  <!-- <view class="order-btn">立即购票</view> -->
+  <view class="order-btn">立即购票</view>
 </navigator>
\ No newline at end of file
diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js
index a368215..1767689 100644
--- a/pages/list/movieticket/list/ticket/index.js
+++ b/pages/list/movieticket/list/ticket/index.js
@@ -1,4 +1,5 @@
 // pages/list/movieticket/list/ticket/index.js
+let app = getApp()
 import commonApi from "../../../../../utils/https/common"
 import util from "../../../../../utils/util"
 Page({
@@ -159,7 +160,50 @@ Page({
       console.log(res)
     })
   },
-
+  selectMovieSeat(e){
+		let info = e.currentTarget.dataset.info
+		let index = e.currentTarget.dataset.index
+		console.log(index);
+		console.log(info.schedules);
+    const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
+    let planData = {
+      areaInfo,
+      fee:info.schedules[index].service_fee,
+      movieName: this.data.title,
+      planId : info.schedules[index].schedule_id,
+      planTime : info.schedules[index].show_time,
+      type:'WECHATXCX',
+      remake : ''
+    }
+    let show_id = info.schedules[index].show_id
+    let cinema_id = info.schedules[index].cinema_id
+		// let schedule_id = info.schedule_id
+		console.log(info);
+    commonApi._post('Cinema/getProductAndSku',{
+      show_id,
+      cinema_id,
+    }).then(res=>{
+      app.globalData.product ={ 
+        product:res.data,
+        info:{
+					hallName:info.schedules[index].hall_name,
+					cinemaName:info.title,
+          show_date:info.schedules[index].show_date,
+					show_time:info.schedules[index].show_time,
+					close_time:info.schedules[index].close_time,
+					movieName:this.data.title,
+					start_end_time:info.schedules[index].show_time,
+          show_version:info.schedules[index].show_version,
+          selectSeatInfo:null,
+          schedule_id:info.schedules[index].schedule_id
+        }
+			}
+			console.log(planData);
+      wx.navigateTo({
+        url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
+      })
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml
index de209c1..d24b82e 100644
--- a/pages/list/movieticket/list/ticket/index.wxml
+++ b/pages/list/movieticket/list/ticket/index.wxml
@@ -32,11 +32,11 @@
       <view class="ciname-distance" wx:if="{{item.distance}}">{{item.distanceText}}</view>
     </view>
     <view class="tickets-list">
-      <navigator url="../seats/index?schedule_id={{schedule.schedule_id}}&show_id={{schedule.show_id}}&cinema_id={{schedule.cinema_id}}" class="ticket-item" catchtap="pagePoint" data-event="movie_detail_click" wx:for="{{item.schedules}}" wx:for-item="schedule">
+      <view  data-info="{{item}}" data-index="{{indexY}}"  wx:for-index="indexY" class="ticket-item" data-event="movie_detail_click" wx:for="{{item.schedules}}" wx:for-item="schedule" bindtap="selectMovieSeat">
         <view style="color:#000;font-size:33rpx">{{schedule.show_time}}</view>
         <view style="margin:10rpx 0">{{schedule.show_version}}</view>
-        <view style="color:#D62828">¥{{schedule.price/100}}</view>
-      </navigator>
+        <view style="color:#D62828">¥{{schedule.price}}</view>
+      </view>
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index efa2c54..a3e29d8 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -14,14 +14,14 @@ Page({
     product:null,
     price:0,
     coupon:null,
-    prizeId:null
+		prizeId:null,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    console.log(options.selectSeatInfo);
+	onLoad: function (options) {
+		console.log(options);
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
@@ -29,7 +29,8 @@ Page({
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
     product.info.selectSeatInfo.seatPriceInfo.map(item=>{
       price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
-    })
+		})
+		console.log(product);
     console.log(price);
     this.setData({
       product:product,
@@ -76,7 +77,7 @@ Page({
       "product_num": product.info.selectSeatInfo.seatInfo.length,//也就是锁定的座位数,必填
       "reserve_mobile": this.data.tel,
       "use_date": product.info.show_date,//使用日期，Y-m-d日期格式字符串,必填
-      "use_time": product.info.start_end_time,//场次时间,直接传字符串,必填
+      "use_time": product.info.show_time+'-'+product.info.close_time,//场次时间,直接传字符串,必填
       "show_version": product.info.show_version,//场次版本,必填
       "scene_id": product.product.scene_id,//场景id，我方系统的场景id,必填
       "schedules_name": product.info.hallName,//放映厅名称,必填
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 7ad82ae..96ec340 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -5,9 +5,10 @@
     <image src="{{product.product.headimg}}" mode="aspectFill"></image>
     <view class="info">
       <view class="title">{{product.info.movieName}}</view>
-      <view>{{product.info.show_date}}  {{product.info.start_end_time}}{{product.info.show_version}}</view>
-      <view>{{product.info.cinema_title}}</view>
-      <view>{{product.info.hallName}} <text wx:for="{{product.info.selectSeatInfo}}">{{item.name}}</text></view>
+      <view>{{product.info.show_date}}  {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
+      <!-- <view>{{product.info.cinema_title}}</view> -->
+      <view>{{product.info.cinemaName}}</view>
+      <view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
     </view>
   </view>
   <view class="tel-box">
diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss
index 11ba0af..c2c042b 100644
--- a/pages/order/movie/index.wxss
+++ b/pages/order/movie/index.wxss
@@ -34,7 +34,6 @@ page {
   font-size: 35rpx;
   color: #000;
   font-weight: 500;
-  margin-bottom: 20rpx;
 }
 .tel-box {
   display: flex;
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index fe628a0..b9a3b52 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -52,7 +52,7 @@
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view>
-<coupon id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
 <view class="fixed-bottom">
     <view class="fixed-price-box">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 64ce73a..84b6aea 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -28,15 +28,16 @@ Page({
     allowance_price: 0,
     pIndex: 0,
     flag:null,
-    ticket_type:1
+		ticket_type:1,
+		isCar:'single'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(app.globalData.product);
-    console.log(this.data.date);
+		console.log(app.globalData.product);
+		console.log(options.isCar);
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -45,8 +46,9 @@ Page({
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
       date:null,
-      ticket_type:app.globalData.product.sku.ticket_type || 1
-    })
+			ticket_type:app.globalData.product.sku.ticket_type || 1,
+			isCar:options.isCar
+		})
     if (!app.globalData.product) {
       util.back();
       return;
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 69dd90f..a454ed2 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -34,8 +34,10 @@
       </view>
     </view>
   </view>
-  <coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && flag!='mix'}}" id="coupon"
+
+  <coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
+
   <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
     <view class="box-title" wx:if="{{flag!='mix'}}">
       <view style="flex-shrink:0">订单备注</view>
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 3065686..bd08800 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -20,7 +20,8 @@ Page({
     allPrice: 0,
     productType: '',
     manageFlag: false,
-    flag: false, //判断订单是否同时有商品和票
+		flag: false, //判断订单是否同时有商品和票
+		isCar:'single',//判断是否购物车
   },
 
   /**
@@ -177,7 +178,17 @@ Page({
       this.setData({
         flag: 'mix'
       })
-    }
+		}
+		if ( product1.length > 1) {
+      this.setData({
+        isCar:'multiple'
+      })
+		}else{
+			this.setData({
+        isCar:'single'
+      })
+		}
+		console.log(product1);
     app.globalData.postProduct = product;
     if (app.globalData.list) {
       app.globalData.product = app.globalData.list[app.globalData.index]
@@ -189,7 +200,7 @@ Page({
       })
     } else {
       wx.navigateTo({
-        url: '/pages/order/scene/index',
+        url: '/pages/order/scene/index?isCar=' + this.data.isCar,
       })
     }
   },

From fc441c93702b40709ebb1a112866488286b461fe Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 26 Apr 2023 18:26:13 +0800
Subject: [PATCH 060/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/postOrder/index.js | 6 ++++--
 pages/order/scene/index.js     | 2 +-
 pages/user/cartlist/list.js    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 5248ae4..be9edfe 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -22,6 +22,7 @@ Page({
     allowance_price: 0,
     showAllowance: false,
     flag:null,
+    isCar:'single'
   },
 
   /**
@@ -33,7 +34,8 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
-      flag:options.flag
+      flag:options.flag,
+      isCar:options.isCar
     })
     let price = 0, sku_id = [];
     app.globalData.postProduct.map(item => {
@@ -191,7 +193,7 @@ Page({
       app.globalData.product = app.globalData.list[0]
     }
 		wx.redirectTo({
-		  url: '/pages/order/scene/index?flag='+this.data.flag,
+		  url: '/pages/order/scene/index?flag='+this.data.flag+'&isCar='+this.data.isCar,
 		})
 	}
   },
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 84b6aea..0db83ec 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -285,7 +285,7 @@ Page({
 		app.globalData.index = app.globalData.index + 1
 		app.globalData.product = app.globalData.list[app.globalData.index]
 		wx.redirectTo({
-		  url: '/pages/order/scene/index?flag='+ this.data.flag,
+		  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
 		})
 		return
 	}else{
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index bd08800..ad38fe5 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -176,7 +176,8 @@ Page({
     }
     if (product.length > 0 && product1.length > 0) {
       this.setData({
-        flag: 'mix'
+        flag: 'mix',
+        isCar:'multiple'
       })
 		}
 		if ( product1.length > 1) {

From 43af8cfd9dd3c38c57134a64027c4503ebb78eb9 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 26 Apr 2023 18:44:26 +0800
Subject: [PATCH 061/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/TitleHeader.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 6aaafbf..31dd347 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -83,6 +83,10 @@ Component({
 		  wx.switchTab({
 		    url: '/pages/user/user'
 		  })
+    } else if (pages[pages.length-1].route.indexOf('pages/user/cartlist/list') != -1){
+		  wx.switchTab({
+		    url: '/pages/user/user'
+		  })
     }
     
    

From 4dcd6ea75fe81c589a844881a43e309e42110fd8 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 27 Apr 2023 12:13:44 +0800
Subject: [PATCH 062/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/order/scene/index.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index a60eb32..6adc98f 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.isTest68? true : false;
+      data.isTest = data.isTest76? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 2e38932..f159d0f 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -196,6 +196,7 @@ Page({
 	
   },
   order: function () {
+	  console.log(this.data)
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
     // if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
@@ -212,7 +213,7 @@ Page({
       })
       return
     }
-    if (!time && date.is_time_stock == true) {
+    if (!time && date && date.is_time_stock == true) {
       wx.showToast({
         title: '请选择使用时间',
         icon: 'none'
@@ -229,16 +230,17 @@ Page({
     linkmanList.map(item => {
       linkmanIds.push(item.id)
     })
+	console.log(date)
     let data = {
       coupon_id: this.data.coupon ? this.data.coupon.id : null,
       source: "WECHATXCX",
       product_list: [{
         type: product.product.type,
         product_id: product.product.id,
-        sku_id: date.sku_id ? date.sku_id : product.sku.id,
+        sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
         start_time: time.start_time,
         end_time: time.end_time,
-        use_date: date.date,
+        use_date: date ? date.date : '',
         visitors: linkmanIds.join(","),
         remark: remark,
         product_num: app.globalData.product.isGroup == 1 ? 1 : productNum

From 001146847bf6136e3889839d0c84db675cf6cbd4 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 8 May 2023 08:41:33 +0800
Subject: [PATCH 063/471] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 pages/index/index.wxml                        | 12 ++-
 pages/list/activitynew/index.wxml             |  4 +-
 pages/list/activitynew/index.wxss             |  3 +-
 pages/list/movieticket/index.js               |  2 +-
 pages/list/movieticket/list/ticket/index.js   |  2 +-
 pages/list/movieticket/list/ticket/index.wxml |  4 +-
 pages/list/scene/index.wxml                   |  2 +-
 pages/map/index.js                            |  2 +-
 pages/map/index.wxml                          | 47 ++++++----
 pages/map/index.wxss                          | 21 ++++-
 pages/order/coupon/index.wxml                 |  2 +-
 pages/order/movie/index.js                    | 34 ++++---
 pages/order/movie/index.wxml                  | 93 ++++++++++++++-----
 pages/order/movie/index.wxss                  | 63 +++++++++++++
 pages/pbService/sceneComfort/index.js         | 10 ++
 pages/pbService/sceneComfort/index.wxml       | 22 ++++-
 pages/pbService/sceneComfort/index.wxss       | 60 ++++++++++++
 pages/user/coupon/index.wxml                  | 43 ++++++---
 pages/user/coupon/index.wxss                  | 38 ++++++--
 pages/user/user.wxml                          |  2 +-
 21 files changed, 375 insertions(+), 93 deletions(-)

diff --git a/app.js b/app.js
index d9c428b..101aeb0 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.isTest76? true : false;
+      data.isTest = data.isTest78? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 307b4d7..73f6710 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -211,11 +211,12 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
-      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
+			<view bindtap="gotoPath" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
+        <view>苏影通</view>
       </view>
+
       <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
@@ -236,6 +237,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
         <view>视觉中心</view>
       </view>
+			<view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view>
+      </view>
 
 	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
 	    class="pbservice-item">
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 887a8eb..5dc5b51 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -21,7 +21,7 @@
     </view>
     <view class="type-item" bindtap="changeType" data-type="3">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon3{{type==3?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==3?'color:#358FE4':''}}">景区</view>
+      <view style="{{type==3?'color:#358FE4':''}}">景区活动</view>
     </view>
     <view class="type-item" bindtap="changeType" data-type="1">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
@@ -102,7 +102,7 @@
         <view class="textOver2" wx:if="{{item.leading_role}}">主演：{{item.leading_role}}</view>
       </view>
       <view class="btn">
-          {{movieType==1?'购买':'查看'}}
+          {{movieType==1?'购票':'查看'}}
       </view>
     </view>
   </view>
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 50ae31f..5765cfc 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -43,7 +43,7 @@ border-radius: 3rpx;
   text-align: center;
   line-height: 27rpx;
   color: #333;
-  font-size: 28rpx;
+  font-size: 24rpx;
   margin-right: 70rpx;
 }
 .type-item:nth-child(1){
@@ -125,6 +125,7 @@ background: rgba(11, 137, 142, .1);
 .activity-list {
   padding: 0 24rpx;
   background: #0B898E;
+  min-height:1300rpx;
 }
 .acitivity-search-box {
   display: flex;
diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js
index df8c5d5..1f147c2 100644
--- a/pages/list/movieticket/index.js
+++ b/pages/list/movieticket/index.js
@@ -9,7 +9,7 @@ Page({
     type:1,
     areas:[],
     areaIndex:0,
-    sort:null,
+    sort:'distance',
     lat:null,
     lon:null,
     page:1,
diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js
index 1767689..79931ff 100644
--- a/pages/list/movieticket/list/ticket/index.js
+++ b/pages/list/movieticket/list/ticket/index.js
@@ -16,7 +16,7 @@ Page({
     areaIndex:0,
     lat:"",
     lon:"",
-    sort:null,
+    sort:'distance',
     list:[],
     title:"",
     page:1,
diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml
index d24b82e..3e24bca 100644
--- a/pages/list/movieticket/list/ticket/index.wxml
+++ b/pages/list/movieticket/list/ticket/index.wxml
@@ -20,11 +20,11 @@
   <view class="cinema" wx:for="{{list}}" bindtap="gotoDetail2">
     <view class="cinema-title">
       <view class="textOver">{{item.title}}</view>
-      <view class="cinema-price">
+      <!-- <view class="cinema-price">
         <text>￥</text>
         <text>{{item.min_price/100}}</text>
         <text>起</text>
-      </view>
+      </view> -->
     </view>
     <view class="ciname-location textOver">
       <view class="iconfont icon-location"></view>
diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml
index 6c6df21..cbb3e41 100644
--- a/pages/list/scene/index.wxml
+++ b/pages/list/scene/index.wxml
@@ -8,7 +8,7 @@
 <view style="height:30rpx"></view>
 <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/sceneProductInfo/index?id={{item.id}}" class="item">
   <image src="{{item.headimg}}" mode="aspectFill"></image>
-  <view class="no-text" wx:if="{{index<3 && keywords==''}}">NO.{{index+1}}</view>
+  <!-- <view class="no-text" wx:if="{{index<3 && keywords==''}}">NO.{{index+1}}</view> -->
   <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view>
   <view class="right-info">
     <view class="title textOver2">{{item.title}}</view>
diff --git a/pages/map/index.js b/pages/map/index.js
index 9d7016d..f2de0cf 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -450,7 +450,7 @@ Page({
             mapItem.id = index;
             mapItem.info = item;
             if(item.type=='red_map'){
-              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20211022/4bb3b753c625e89e1214105c03390e54.png";
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png";
             }
             else {
               mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 639b2c4..7451de1 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -12,40 +12,55 @@
 </picker>
 <view class="right-menus" style="top:{{seachHeight}}px">
   <view class="right-menu-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
-    <text style="color:#0A9947" class="iconfont icon-location"></text>
-    <text>景点</text>
+    <!-- <text style="color:#0A9947" class="iconfont icon-location"></text> -->
+    <image src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/5ec907e6ff03f558b1f6a3bf96894ccb.png'}}" mode="aspectFill"/>
+    <text class="text">景点</text>
   </view>
   <view class="right-menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
-    <text style="color:#3D77D8" class="iconfont icon-location"></text>
-    <text>场馆</text>
+    <image src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/4019480777583c7efcf18943b21b1ba3.png'}}" mode="aspectFill"/>
+
+    <!-- <text style="color:#3D77D8" class="iconfont icon-location"></text> -->
+    <text class="text">场馆</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==3?' active':''}}" data-title="特产" bindtap="changeType" data-type="3">
-    <text style="color:#C02C2C" class="iconfont icon-location"></text>
-    <text>特产</text>
+    <!-- <text style="color:#C02C2C" class="iconfont icon-location"></text> -->
+
+    <image src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
+
+    <text class="text">特产</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==4?' active':''}}" data-title="美食" bindtap="changeType" data-type="4">
-    <text style="color:#EE641B" class="iconfont icon-location"></text>
-    <text>美食</text>
+    <!-- <text style="color:#EE641B" class="iconfont icon-location"></text> -->
+    <image src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/04c558efe2650ca21f4612d60cc02a32.png'}}" mode="aspectFill"/>
+
+    <text class="text">美食</text>
   </view>
   <view class="right-menu-item{{type==5?' active':''}}" bindtap="changeType" data-title="文物" data-type="5">
-    <text style="color:#00B3C8" class="iconfont icon-location"></text>
-    <text>文保单位</text>
+    <!-- <text style="color:#00B3C8" class="iconfont icon-location"></text> -->
+    <image src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/be9f147b71b30acb0cd210b973787a31.png'}}" mode="aspectFill"/>
+
+    <text class="text">文保单位</text>
   </view>
   <!-- <view class="right-menu-item{{type==7?' active':''}}" bindtap="changeType" data-title="影院" data-type="7">
     <text style="color:#9342CB" class="iconfont icon-location"></text>
     <text>影院</text>
   </view> -->
   <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
-    <text style="color:#EB3C70" class="iconfont icon-location"></text>
-    <text>运河十景</text>
+    <!-- <text style="color:#EB3C70" class="iconfont icon-location"></text> -->
+    <image src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/848919fa7df7d7a2cac6c671ff36c28c.png'}}" mode="aspectFill"/>
+
+    <text class="text">运河十景</text>
   </view>
   <view class="right-menu-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
-    <text style="color:#9d6b00" class="iconfont icon-location"></text>
-    <text>江南小书场</text>
+    <!-- <text style="color:#9d6b00" class="iconfont icon-location"></text> -->
+    <image src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/825ba0d2c4879e5609ecd1f585e48df8.png'}}" mode="aspectFill"/>
+
+    <text class="text">江南小书场</text>
   </view>
   <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="9">
-    <text style="color:#F60C1C" class="iconfont icon-location"></text>
-    <text>红色地图</text>
+    <!-- <text style="color:#F60C1C" class="iconfont icon-location"></text> -->
+    <image src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
+    <text class="text">红色地图</text>
   </view>
   <!-- <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="文化单位" data-type="9">
     <text style="color:rgb(160, 248, 248)" class="iconfont icon-location"></text>
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index bfa04b5..ed6e56b 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -42,16 +42,18 @@
   overflow: hidden;
 }
 .right-menu-item {
-  margin: 0 10rpx;
+  margin: 0 18rpx;
   border-top: 3px solid #E0E0E0;
   text-align: active;
-  text-align: center;
+  display: flex;
+  align-items: center;
+  /* text-align: center; */
 }
 .right-menu-item.active {
   background: #0A9947;
   color: #fff;
   margin: 0;
-  padding: 0 10rpx;
+  padding: 0 18rpx;
   border-color: #0A9947;
 }
 .right-menu-item.active+view {
@@ -73,11 +75,11 @@
   background: #00B3C8;
   border-color: #00B3C8;
 }
-.right-menus .right-menu-item:nth-child(7).active {
+.right-menus .right-menu-item:nth-child(6).active {
   background: #EB3C70;
   border-color: #EB3C70;
 }
-.right-menus .right-menu-item:nth-child(6).active {
+.right-menus .right-menu-item:nth-child(7).active {
   background: #9342CB;
   border-color: #9342CB;
 }
@@ -470,4 +472,13 @@
 }
 .video-bottom .iconfont {
   margin-right: 10rpx;
+}
+.text{
+  display: inline-block;
+  width: 138rpx;
+  text-align: center;
+}
+.right-menu-item image{
+  width:21.33rpx;
+  height:25.33rpx;
 }
\ No newline at end of file
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 6ee7140..1713323 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -4,7 +4,7 @@
   <view class="coupon-item" wx:for="{{list}}">
     <view class="money">{{item.activity.money/100}}</view>
     <view class="coupon-info">
-      <view>满{{item.activity.mini_money/100}}元可用</view>
+      <view>{{item.activity.name}}</view>
       <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
     </view>
     <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index a3e29d8..7a449ef 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -15,6 +15,9 @@ Page({
     price:0,
     coupon:null,
 		prizeId:null,
+		num:0,
+		sPrice:0,
+		hideMx:false
   },
 
   /**
@@ -25,17 +28,22 @@ Page({
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
-    let product = app.globalData.product,price=0;
+    let product = app.globalData.product,price=0,num=0,sPrice=0;
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
     product.info.selectSeatInfo.seatPriceInfo.map(item=>{
-      price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
+			price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
+			num = num + 1
+			sPrice = Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
 		})
-		console.log(product);
-    console.log(price);
+		console.log(price*100);
+		
     this.setData({
       product:product,
-      price:price*100
-    })
+			price:(price*100).toFixed(2),
+			num:num,
+			sPrice:sPrice
+		})
+		console.log(this.data.price);
     userApi.user_post("user/getMyInfo").then(res=>{
       this.setData({
         tel:res.data.mobile
@@ -110,16 +118,20 @@ Page({
       console.log(res)
 
     })
-  },
+	},
+	mingxi(){
+		this.setData({
+			hideMx:!this.data.hideMx
+		})
+	},
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      coupon:app.globalData.couponInfo
-    })
-    console.log(this.coupon);
+		this.setData({
+			coupon:app.globalData.couponInfo,
+		})
   },
 
   /**
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 96ec340..a88c5b5 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -1,28 +1,79 @@
 <!--pages/order/movie/index.wxml-->
 <title title="订单填写"></title>
 <view class="info-box" wx:if="{{product}}">
-  <view class="info-top">
-    <image src="{{product.product.headimg}}" mode="aspectFill"></image>
-    <view class="info">
-      <view class="title">{{product.info.movieName}}</view>
-      <view>{{product.info.show_date}}  {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
-      <!-- <view>{{product.info.cinema_title}}</view> -->
-      <view>{{product.info.cinemaName}}</view>
-      <view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
-    </view>
-  </view>
-  <view class="tel-box">
-    <text>手机号码：</text>
-    <input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
-  </view>
+	<view class="info-top">
+		<image src="{{product.product.headimg}}" mode="aspectFill"></image>
+		<view class="info">
+			<view class="title">{{product.info.movieName}}</view>
+			<view>{{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
+			<!-- <view>{{product.info.cinema_title}}</view> -->
+			<view>{{product.info.cinemaName}}</view>
+			<view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
+		</view>
+	</view>
+
+	<view class="tel-box">
+		<text>手机号码：</text>
+		<input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
+	</view>
+</view>
+
+<view class="tips">
+	<view class="tips-box">
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha.png" mode="aspectFit" />
+		<view>
+			不支持退票
+		</view>
+	</view>
+	<view class="tips-box">
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha.png" mode="aspectFit" alt="" />
+		<view>
+			不支持改签
+		</view>
+	</view>
 </view>
 <coupon money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
+
+
+<view class="fix-info {{!hideMx?'hide':''}}">
+	<view class="info-item">
+		<view>
+			费用明细
+		</view>
+		<view>
+			￥{{price/100}}
+		</view>
+	</view>
+	<view  class="info-item">
+		<view>
+			票价
+		</view>
+		<view>
+			￥{{sPrice}} x {{num}}
+		</view>
+	</view>
+	<view  class="info-item">
+		<view>
+			优惠券
+		</view>
+		<view>
+			- ￥{{coupon?coupon.activity.money/100:0}}
+		</view>
+	</view>
+	<view  class="info-item">
+		<view>
+		</view>
+		<view>
+			订单总额:<text style="color: #D62828; font-weight: bold;">¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</text>
+		</view>
+	</view>
+</view>
 <view class="fixed-bottom">
-  <view class="money-box">
-    <view class="price" wx:if="{{prizeId}}">¥0</view>
-    <view class="price" wx:else>¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</view>
-    <view wx:if="{{coupon}}">总计优惠{{coupon?coupon.activity.money/100:0}}元</view>
-  </view>
-  <!-- <view class="tip">明细</view> -->
-  <view class="btn" bindtap="order">立即付款</view>
+	<view class="money-box">
+		<view class="price" wx:if="{{prizeId}}">¥0</view>
+		<view class="price" wx:else>¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</view>
+		<view>总计优惠{{coupon?coupon.activity.money/100:0}}元</view>
+	</view>
+	<view class="tip" bindtap="mingxi">明细</view>
+	<view class="btn" bindtap="order">立即付款</view>
 </view>
\ No newline at end of file
diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss
index c2c042b..79403a9 100644
--- a/pages/order/movie/index.wxss
+++ b/pages/order/movie/index.wxss
@@ -104,4 +104,67 @@ page {
   background: #D62828;
   font-size: 36rpx;
   font-weight: 500;
+}
+.tips{
+	display: flex;
+	margin-left: 25.3rpx;
+}
+.tips-box{
+	display: flex;
+	align-items: center;
+	margin-right: 27rpx;
+	font-size: 27rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #111111;
+
+}
+.tips-box image{
+	width: 26.6rpx;
+	height: 26.6rpx;
+}
+.fix-info{
+	width: 750rpx;
+	min-height: 305rpx;
+	background: #FFFFFF;
+	padding: 36rpx 46rpx 36rpx 46rpx;
+	box-sizing: border-box;
+	position: fixed;
+	bottom:113rpx;
+}
+.info-item{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.info-item:first-child{
+	font-size: 31rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #000000;
+}
+.info-item:nth-child(2){
+	margin-top: 40rpx;
+	font-size: 31rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #999999;
+
+}
+.info-item:nth-child(3){
+	margin-top: 31rpx;
+	font-size: 31rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #999999;
+}
+.info-item:nth-child(4){
+	margin-top: 40rpx;
+	font-size: 31rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #999999;
+}
+.fix-info.hide{
+	bottom:-300rpx;
 }
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index b299a62..db8e5d5 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -121,6 +121,16 @@ Page({
         list:this.data.list.concat(res.data.rows),
         total:res.data.total
       })
+      console.log(this.data.list.length);
+      console.log(res.data.total);
+
+      if (this.data.list.length<res.data.total) {
+        console.log(111);
+        this.setData({
+          pageNo:this.data.pageNo+1
+        
+        })
+      }
     })
   },
   search:function(){
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index de32e12..0e43790 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -40,12 +40,26 @@
     <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
     <text>{{sceneLevelObj[item.scene_level]}}</text>
   </view>
-  <view class="progress-item">
+  <!-- <view class="progress-item">
     <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
     <view class="progress-text">{{comfortObj[item.comfort_level].name}}/{{item.ins_carry_capacity}}人</view>
-  </view>
-  <view class="other-tip">
+  </view> -->
+
+	<view class="'info'{{item.comfort_level==5?'shushi':''}}{{item.comfort_level==4?'jiaoshushi':''}}{{item.comfort_level==3?'yiban':''}}{{item.comfort_level==2?'jiaoyongji':''}}{{item.comfort_level==1?'yongji':''}}">
+	<view class="top-info">
+		<view class="comft">
+		<view>
+			当前舒适度:
+		</view>
+		<view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
+	</view>
+	<view class="num">
+		瞬时承载量:{{item.ins_carry_capacity}}人
+	</view>
+	</view>
+	<view class="other-tip">
     <text>更新时间:{{item.status_time}}</text>
-    <text>当前舒适度/瞬时承载量</text>
   </view>
+  </view>
+
 </view>
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index 4ce2ac2..c801dbe 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -118,4 +118,64 @@ page {
   line-height: 38rpx;
   border: 1rpx solid;
   margin-right: 20rpx;
+}
+.two {
+	padding: 0 12rpx;
+  border-radius: 20rpx;
+  line-height: 38rpx;
+  border: 1rpx solid;
+	margin-left: 10rpx;
+	
+
+font-size: 24rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #83D851;
+}
+.info{
+	width: 650rpx;
+	min-height: 134rpx;
+	border-radius: 10rpx;
+	padding: 28rpx 20rpx;
+	box-sizing: border-box;
+}
+.yongji{
+	background: rgba(204, 25, 25, .08);
+}
+.jiaoyongji{
+background: rgba(252, 133, 58, .08);
+}
+.yiban{
+	background: rgba(255, 198, 41, .08);
+}
+.info.jiaoshushi{
+	background: rgba(66, 146, 201, .08);
+}
+.shushi{
+	background: rgba(131, 216, 81, .08);
+}
+.top-info{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.comft{
+	display: flex;
+
+
+font-size: 26rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #333333;
+align-items: center;
+}
+.num{
+	border-left: 1rpx solid #D8D8D8;
+	padding-left: 50rpx;
+
+
+font-size: 26rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #333333;
 }
\ No newline at end of file
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 8d46f82..1d26442 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -1,22 +1,35 @@
 <!--pages/user/coupon/index.wxml-->
 <title title="我的优惠券"></title>
 <view class="types">
-  <view class="type-item{{index==0?' active':''}}" bindtap="changeType" data-index="0">可使用</view>
-  <view class="type-item{{index==1?' active':''}}" bindtap="changeType" data-index="1">已使用</view>
-  <view class="type-item{{index==2?' active':''}}" bindtap="changeType" data-index="2">已失效</view>
+	<view class="type-item{{index==0?' active':''}}" bindtap="changeType" data-index="0">可使用</view>
+	<view class="type-item{{index==1?' active':''}}" bindtap="changeType" data-index="1">已使用</view>
+	<view class="type-item{{index==2?' active':''}}" bindtap="changeType" data-index="2">已失效</view>
 </view>
 <view style="height:100rpx"></view>
 <view class="coupon-item{{index==0?' active':''}}" wx:for="{{list}}" wx:for-index="i">
-  <view class="title-box">
-    <view class="title textOver">{{item.activity.name}}</view>
-    <view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
-  </view>
-  <view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
-  <view class="coupon-tip"><text>有效期：</text>{{item.end_time}}</view>
-  <view class="coupon-tip"><text>优惠码：</text>{{item.key}}</view>
-  <view class="coupon-rule">
-  <view bindtap="showRule" data-item="{{item}}">使用规则  <text class="iconfont icon-xia"></text></view>
-  </view>
+	<view class="title-box">
+		<view class="title textOver">{{item.activity.name}}</view>
+		<view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
+	</view>
+	<view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
+	<view class="coupon-tip"><text>有效期：</text>{{item.end_time}} 前使用</view>
+	<view class="coupon-tip"><text>优惠码：</text>{{item.key}}</view>
+	<view class="line-box">
+		<view class="yuan l">
+		</view>
+		<view class="line">
+			---------------------------------------------
+		</view>
+		<view class="yuan r">
+		</view>
+	</view>
+	<view class="coupon-rule">
+		<!-- <view bindtap="showRule" data-item="{{item}}">使用规则  <text class="iconfont icon-xia"></text></view> -->
+		<view>使用规则</view>
+		<view class="rule-text">
+		{{item.note}}
+		</view>
+	</view>
 </view>
 <!-- <view class="coupon-item">
   <view class="title-box">
@@ -31,6 +44,6 @@
 <view style="height:110rpx"></view>
 <navigator url="../couponCenter/index" class="fixed-btn">前往<text>领券中心</text></navigator>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
-  <view>暂无内容</view>
+	<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/user/coupon/index.wxss b/pages/user/coupon/index.wxss
index a600eb0..236613c 100644
--- a/pages/user/coupon/index.wxss
+++ b/pages/user/coupon/index.wxss
@@ -38,11 +38,31 @@ page {
 }
 .coupon-item {
   margin: 20rpx 30rpx;
-  background: url(https://static.ticket.sz-trip.com/xcxImages/user/coupon.png) no-repeat;
-  background-size: 100% 100%;
-  height: 300rpx;
-  position: relative;
-  color: #999;
+  /* background: url(https://static.ticket.sz-trip.com/xcxImages/user/coupon.png) no-repeat;
+	background-size: 100% 100%; */
+	background: white;
+  min-height: 320rpx;
+	position: relative;
+	border-radius: 20rpx;
+	color: #999;
+	padding-bottom:10rpx ;
+}
+.yuan{
+	width: 50rpx;
+	height: 50rpx;
+	background: #f6f6f6;
+	position: absolute;
+	border-radius: 50%;
+}
+.yuan.l{
+	left: -25rpx;
+}
+.yuan.r{
+	right:-25rpx;
+	top: 0;
+}
+.line-box{
+	position: relative;
 }
 .coupon-item>view {
   padding: 0 30rpx;
@@ -75,18 +95,24 @@ page {
 .coupon-tip {
   line-height: 45rpx;
   font-size: 26rpx;
+  height: 50rpx;
 }
 .coupon-item.active .coupon-tip {
   color: #333;
 }
 .coupon-tip text {
   color: #999999;
+  display: inline-block;
+  width: 160rpx;
 }
 .coupon-rule {
-  line-height: 100rpx;
   font-size: 26rpx;
 
 }
+.rule-text{
+	margin-top:10rpx;
+	color: #333;
+}
 .coupon-rule .iconfont {
   font-size: 28rpx;
 }
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index d39a015..3702040 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -67,7 +67,7 @@
       团体预约订单
     </navigator>
     <navigator url="videoCoupon/index" class="user-box-line">
-    中奖纪录
+    		中奖记录
     </navigator>
     <!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
       在线客服

From 4ea8c503a4986e1cd7b1bb76ef636450e03bd51d Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 18 May 2023 17:27:03 +0800
Subject: [PATCH 064/471] =?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

---
 pages/info/postProductInfo/index.js        |   3 +-
 pages/list/activitynew/index.wxml          |   9 +-
 pages/order/components/address/index.js    | 227 +++++++++++----------
 pages/order/postOrder/index.js             |   8 +-
 pages/pbService/sceneComfort/index.wxml    |   4 +-
 pages/pbService/sceneComfort/index.wxss    |   2 +-
 pages/user/cartlist/list.js                |   1 +
 pages/user/coupon/index.wxml               |   1 -
 pages/user/coupon/index.wxss               |   9 +-
 pages/user/order/movieOrderInfo/index.wxml |   3 +
 pages/user/order/sceneOrderInfo/index.js   |  54 ++---
 11 files changed, 178 insertions(+), 143 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 2f1ce66..8bc8423 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -40,7 +40,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(options);
+    //删除临时存储的联系人
+    wx.removeStorageSync('linkMan')
     let rect = wx.getMenuButtonBoundingClientRect(),
       that = this;
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 5dc5b51..3470235 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -27,14 +27,15 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==1?'color:#FFB423':''}}">演出</view>
     </view>
-    <view class="type-item" bindtap="changeType" data-type="4">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view>
     <view class="type-item" bindtap="changeType" data-type="2">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==2?'color:#C155E9':''}}">展览</view>
     </view>
+    <view class="type-item" bindtap="changeType" data-type="4">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==4?'color:#63B71F':''}}">电影</view>
+    </view>
+
     <!-- <view class="type-item" bindtap="changeType" data-type="5">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js
index 8be68f1..98e5ad6 100644
--- a/pages/order/components/address/index.js
+++ b/pages/order/components/address/index.js
@@ -18,82 +18,94 @@ Component({
    * 组件的初始数据
    */
   data: {
-    selectLinkman:null,
-    linkmanList:[],
-    showMask:false,
-    editId:null
+    selectLinkman: null,
+    linkmanList: [],
+    showMask: false,
+    editId: null
   },
   lifetimes: {
-    attached: function() {
+    attached: function () {
       // 在组件实例进入页面节点树时执行
-      // 获取默认联系人
-      commonApi.user_post("token/check").then(res=>{
-        if(res.code==1){
-          userApi.user_post("user/getDefaultContact",{
-            contactType:"CONSIGNEE"
-          }).then(res=>{
-            console.log(res)
-            this.setData({
-              selectLinkman:res.data
-            })
-            if(res.data){
-              this.triggerEvent("setAddress",res.data)
-            }
+      // 获取默认联系人 如果有临时存储的联系人则不获取默认联系人
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          console.log(wx.getStorageSync('linkMan'));
+          if (wx.getStorageSync('linkMan')) {
             this.getLinkmanList()
-          })
+          } else {
+            userApi.user_post("user/getDefaultContact", {
+              contactType: "CONSIGNEE"
+            }).then(res => {
+              this.setData({
+                selectLinkman: res.data
+              })
+              if (res.data) {
+                this.triggerEvent("setAddress", res.data)
+              }
+              this.getLinkmanList()
+            })
+          }
+
         }
       })
-      
+
     },
-    detached: function() {
+    detached: function () {
       // 在组件实例被从页面节点树移除时执行
     },
   },
   pageLifetimes: {
-    show: function() {
+    show: function () {
       // 页面被展示
-      if(this.data.editId){
+      if (this.data.editId) {
         let editId = this.data.editId;
-        userApi.user_post("user/getContactInfoById",{
-          id:editId
-        }).then(res=>{
-          let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
-          if(selectLinkman.id==editId){
+        userApi.user_post("user/getContactInfoById", {
+          id: editId
+        }).then(res => {
+          let selectLinkman = this.data.selectLinkman,
+            linkmanList = this.data.linkmanList;
+          if (selectLinkman.id == editId) {
             selectLinkman.name = res.data.name;
             selectLinkman.tel = res.data.tel;
             selectLinkman.address = res.data.address;
             selectLinkman.is_default = res.data.is_default;
           }
-          linkmanList.map(item=>{
-            if(item.id==editId){
+          linkmanList.map(item => {
+            if (item.id == editId) {
               item.name = res.data.name;
               item.tel = res.data.tel;
               item.address = res.data.address;
               item.is_default = res.data.is_default;
-            }
-            else if(res.data.is_default==1 && item.is_default==1){
+            } else if (res.data.is_default == 1 && item.is_default == 1) {
               item.is_default = 0;
             }
           })
           this.setData({
-            linkmanList:linkmanList,
-            selectLinkman:selectLinkman
+            linkmanList: linkmanList,
+            selectLinkman: selectLinkman
           })
-          this.triggerEvent("setAddress",res.data)
+          this.triggerEvent("setAddress", res.data)
         })
-      }
-      else {
-        commonApi.user_post("token/check").then(res=>{
-          if(res.code==1){
-            this.getDefault()
+      } else {
+        commonApi.user_post("token/check").then(res => {
+          if (res.code == 1) {
+            if (!wx.getStorageSync('linkMan')) {
+                this.getDefault()
+            }else{
+              this.setData({
+                selectLinkman: wx.getStorageSync('linkMan')
+              })
+              this.triggerEvent("setAddress",wx.getStorageSync('linkMan'))
+              this.getLinkmanList()
+            }
           }
         })
       }
     },
-    hide: function() {
+    hide: function () {
       // 页面被隐藏
     },
-    resize: function(size) {
+    resize: function (size) {
       // 页面尺寸变化
     }
   },
@@ -102,23 +114,23 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    gotoEdit:function(e){
+    gotoEdit: function (e) {
       this.setData({
-        editId:e.currentTarget.dataset.item.id
+        editId: e.currentTarget.dataset.item.id
       })
       wx.navigateTo({
-        url: '/pages/user/address/add/index?id='+this.data.editId+'&from=order',
+        url: '/pages/user/address/add/index?id=' + this.data.editId + '&from=order',
       })
       this.setData({
-        editId:null
+        editId: null
       })
     },
-    showLinkman:function(){
+    showLinkman: function () {
       this.setData({
-        showMask:!this.data.showMask
+        showMask: !this.data.showMask
       })
     },
-    cancel:function(){
+    cancel: function () {
       // let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
       // linkmanList.map(linkman=>{
       //   linkman.selected = 0;
@@ -131,85 +143,90 @@ Component({
       // })
       this.showLinkman()
     },
-    confirm:function(){
-      let linkmanList = this.data.linkmanList,selectLinkman = null;
-      linkmanList.map(linkman=>{
-        if(linkman.selected==1){
+    confirm: function () {
+      let linkmanList = this.data.linkmanList,
+        selectLinkman = null;
+      linkmanList.map(linkman => {
+        if (linkman.selected == 1) {
           selectLinkman = (linkman);
         }
       })
       this.setData({
-        selectLinkman:selectLinkman
+        selectLinkman: selectLinkman
       })
-      this.triggerEvent("setAddress",selectLinkman)
+      this.triggerEvent("setAddress", selectLinkman)
       this.showLinkman()
     },
-    getLinkmanList:function(){
+    getLinkmanList: function () {
       // 直接获取1000条出行人信息 就不要分页了
-      userApi.user_post("user/getContactOrConsignee",{
-        contactType:"CONSIGNEE",
-        offset:0,
-        limit:1000
-      }).then(res=>{
+      userApi.user_post("user/getContactOrConsignee", {
+        contactType: "CONSIGNEE",
+        offset: 0,
+        limit: 1000
+      }).then(res => {
         let list = res.data;
         this.setData({
-          linkmanList:list
+          linkmanList: list
         })
       })
     },
-    setDefault:function(e){
-      let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList;
-      userApi.user_post("user/setDefaultConsignee",{
-        id:item.id
-      }).then(res=>{
-        if(res.code==1){
+    setDefault: function (e) {
+      let item = e.currentTarget.dataset.item,
+        linkmanList = this.data.linkmanList;
+      userApi.user_post("user/setDefaultConsignee", {
+        id: item.id
+      }).then(res => {
+        if (res.code == 1) {
           wx.showToast({
             title: '设置成功',
             icon: 'success'
           })
-          linkmanList.map(linkman=>{
-            if(linkman.id==item.id){
-              linkman.is_default=1;
-            }
-            else {
+          linkmanList.map(linkman => {
+            if (linkman.id == item.id) {
+              linkman.is_default = 1;
+            } else {
               linkman.is_default = 0;
             }
           })
           this.setData({
-            linkmanList:linkmanList
+            linkmanList: linkmanList
           })
         }
       })
     },
-    delLinkman:function(e){
+    delLinkman: function (e) {
       wx.showLoading({
         title: '加载中',
       })
-      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman;
-      selectLinkman.splice(index,1);
+      let index = e.currentTarget.dataset.index,
+        selectLinkman = this.data.selectLinkman;
+      selectLinkman.splice(index, 1);
       this.setData({
-        selectLinkman:selectLinkman
+        selectLinkman: selectLinkman
       })
       wx.hideLoading()
     },
-    del:function(e){
-      let item = e.currentTarget.dataset.item,index = e.currentTarget.dataset.index,that = this,linkmanList=this.data.linkmanList;
+    del: function (e) {
+      let item = e.currentTarget.dataset.item,
+        index = e.currentTarget.dataset.index,
+        that = this,
+        linkmanList = this.data.linkmanList;
       wx.showModal({
-        title:"提示",
-        content:"确定删除吗？",
-        success (res) {
+        title: "提示",
+        content: "确定删除吗？",
+        success(res) {
           if (res.confirm) {
-            userApi.user_post("user/delConsignee",{
-              id:item.id
-            }).then(res=>{
-              if(res.code==1){
+            userApi.user_post("user/delConsignee", {
+              id: item.id
+            }).then(res => {
+              if (res.code == 1) {
                 wx.showToast({
                   title: '删除成功',
-                  icon:"success"
+                  icon: "success"
                 })
-                linkmanList.splice(index,1);
+                linkmanList.splice(index, 1);
                 that.setData({
-                  linkmanList:linkmanList
+                  linkmanList: linkmanList
                 })
               }
             })
@@ -220,26 +237,28 @@ Component({
         }
       })
     },
-    selectIt:function(e){
+    selectIt: function (e) {
       let item = e.currentTarget.dataset.item;
       this.setData({
-        selectLinkman:item,
-        showMask:false
+        selectLinkman: item,
+        showMask: false
       })
-      this.triggerEvent("setAddress",item)
+      wx.setStorageSync('linkMan', item)
+      console.log(wx.getStorageSync('linkMan'));
+      this.triggerEvent("setAddress", item)
     },
-    getDefault:function(e){
-      commonApi.user_post("token/check").then(res=>{
-        if(res.code==1){
-          userApi.user_post("user/getDefaultContact",{
-            contactType:"CONSIGNEE"
-          }).then(res=>{
+    getDefault: function (e) {
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          userApi.user_post("user/getDefaultContact", {
+            contactType: "CONSIGNEE"
+          }).then(res => {
             console.log(res)
             this.setData({
-              selectLinkman:res.data
+              selectLinkman: res.data
             })
-            if(res.data){
-              this.triggerEvent("setAddress",res.data)
+            if (res.data) {
+              this.triggerEvent("setAddress", res.data)
             }
             this.getLinkmanList()
           })
@@ -247,4 +266,4 @@ Component({
       })
     }
   }
-})
+})
\ No newline at end of file
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index be9edfe..f847587 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -70,9 +70,10 @@ Page({
     })
   },
   setAddress: function (e) {
-    this.setData({
-      address: e.detail
-    })
+    console.log('我触发了');
+      this.setData({
+        address: e.detail
+      })
     this.getPostFee()
   },
   minus: function (e) {
@@ -308,6 +309,7 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
+    console.log(12312312321);
 
   },
 
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 0e43790..deb8f2e 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -53,9 +53,9 @@
 		</view>
 		<view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
 	</view>
-	<view class="num">
+	<!-- <view class="num">
 		瞬时承载量:{{item.ins_carry_capacity}}人
-	</view>
+	</view> -->
 	</view>
 	<view class="other-tip">
     <text>更新时间:{{item.status_time}}</text>
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index c801dbe..b699e0b 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -133,7 +133,7 @@ font-weight: 500;
 color: #83D851;
 }
 .info{
-	width: 650rpx;
+	width: 630rpx;
 	min-height: 134rpx;
 	border-radius: 10rpx;
 	padding: 28rpx 20rpx;
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index ad38fe5..c51d1b1 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -28,6 +28,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.removeStorageSync('linkMan')
     this.getList();
   },
   manage: function () {
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 1d26442..bf54959 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -18,7 +18,6 @@
 		<view class="yuan l">
 		</view>
 		<view class="line">
-			---------------------------------------------
 		</view>
 		<view class="yuan r">
 		</view>
diff --git a/pages/user/coupon/index.wxss b/pages/user/coupon/index.wxss
index 236613c..c7faac0 100644
--- a/pages/user/coupon/index.wxss
+++ b/pages/user/coupon/index.wxss
@@ -103,11 +103,12 @@ page {
 .coupon-tip text {
   color: #999999;
   display: inline-block;
-  width: 160rpx;
+  width: 130rpx;
 }
 .coupon-rule {
   font-size: 26rpx;
-
+  margin-top: 20rpx;
+  
 }
 .rule-text{
 	margin-top:10rpx;
@@ -131,4 +132,8 @@ page {
 }
 .fixed-btn text {
   color: #0B898E;
+}
+.line{
+  height: 25rpx;
+  border-bottom: dashed 1rpx #D8D8D8;
 }
\ No newline at end of file
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index aa385b4..556623e 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -71,6 +71,9 @@
   <view class="detail-item">
     <text>座位：{{info.order_product_list[0].order_product_extend.seats_list}}</text>
   </view>
+  <view class="detail-item" wx:if="{{info.order_product_list[0].order_product_extend.ticket_code}}">
+    <text style="color: #D62828;">{{info.order_product_list[0].order_product_extend.ticket_code}} 请凭取票凭证码至影院大厅内影院自有取票机或前台进行取票</text>
+  </view>
 </view>
 <view class="box">
   <view class="box-title">出行人</view>
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 043e2c6..3e293b9 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -49,33 +49,37 @@ Page({
   },
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
-    qrcode.map((item,index)=>{
-      if(item.use_url){
-        codeImgs.push(item.use_url);
-        if(codeImgs.length==qrcode.length){
-          that.setData({
-            codeImgs:codeImgs
-          })
+
+    this.data.info.order_product_list.forEach(qrcode=>{
+      qrcode.qrcode.map((item,index)=>{
+        if(item.use_url){
+          codeImgs.push(item.use_url);
+          if(codeImgs.length==qrcode.qrcode.length){
+            that.setData({
+              codeImgs:codeImgs
+            })
+          }
         }
-      }
-      else {
-        new QRCode('damocode'+index,{
-          text: item.use_code,
-          width: 300 * radio,
-          height: 300 * radio,
-          padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-          correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
-          callback: (res) => {
-            codeImgs.push(res.path);
-            if(codeImgs.length==qrcode.length){
-              that.setData({
-                codeImgs:codeImgs
-              })
+        else {
+          new QRCode('damocode'+index,{
+            text: item.use_code,
+            width: 300 * radio,
+            height: 300 * radio,
+            padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+            correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
+            callback: (res) => {
+              codeImgs.push(res.path);
+              if(codeImgs.length==qrcode.qrcode.length){
+                that.setData({
+                  codeImgs:codeImgs
+                })
+              }
             }
-          }
-        })
-      }
-    }) 
+          })
+        }
+      }) 
+    })
+
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;

From 17f498baaf3bbf74a934fdba5f2fe3b338a5a5b8 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 18 May 2023 17:28:29 +0800
Subject: [PATCH 065/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 101aeb0..a70fde6 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.isTest78? true : false;
+      data.isTest = data.isTest79? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From d2737182e498448fe0ea7c8833a2187a88456396 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 22 May 2023 17:30:27 +0800
Subject: [PATCH 066/471] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 pages/user/order/sceneOrderInfo/index.js   | 52 +++++++++++++---------
 pages/user/order/sceneOrderInfo/index.wxml | 15 +++++--
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/app.js b/app.js
index a70fde6..e1789b7 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.isTest79? true : false;
+      data.isTest = data.isTest80? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 3e293b9..b06dc2b 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -27,7 +27,7 @@ Page({
     sysm:false,
     sysmText:'更多',
     sysm2:false,
-    sysm2Text:'更多',
+    sysm2Text:'更多'
   },
 
   /**
@@ -48,38 +48,46 @@ Page({
     })
   },
   getCodeImg:function(){
-    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
+    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0;
+  
 
     this.data.info.order_product_list.forEach(qrcode=>{
-      qrcode.qrcode.map((item,index)=>{
-        if(item.use_url){
-          codeImgs.push(item.use_url);
-          if(codeImgs.length==qrcode.qrcode.length){
-            that.setData({
-              codeImgs:codeImgs
-            })
-          }
+      qrcode.qrcode.map((item)=>{
+        if(item.use_url&&item.use_code){
+          codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText});
+          // if(codeImgs.length==qrcode.qrcode.length){
+          //   that.setData({
+          //     codeImgs:codeImgs
+          //   })
+          // }
+          that.setData({
+            codeImgs:codeImgs
+          })
         }
         else {
-          new QRCode('damocode'+index,{
+          console.log(1231231232131);
+          console.log(codeId);
+          new QRCode('damocode'+codeId,{
             text: item.use_code,
             width: 300 * radio,
             height: 300 * radio,
-            padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-            correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
+            padding:10, // 生成二维码四周自动留边宽度，不传入默认为0
+            correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
             callback: (res) => {
-              codeImgs.push(res.path);
-              if(codeImgs.length==qrcode.qrcode.length){
-                that.setData({
-                  codeImgs:codeImgs
-                })
-              }
+              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText});
+              that.setData({
+                codeImgs:codeImgs
+              })
+             
+              // if(codeImgs.length==qrcode.qrcode.length){
+
+              // }
             }
           })
+          codeId = codeId + 1
         }
       }) 
     })
-
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
@@ -95,13 +103,15 @@ Page({
     }
   },
   nextCodeImg:function(){
-    let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
+    console.log(this.data.codeImgs);
+    let qrcode=this.data.codeImgs,codeIndex = this.data.codeIndex;
     codeIndex = codeIndex + 1;
     if(codeIndex==qrcode.length){
       codeIndex = 0;
     }
     this.setData({
       codeIndex:codeIndex
+
     })
   },
   showFeeInfo:function(){
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 2512257..1e497f9 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -2,19 +2,26 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="订单详情"></title>
 <view class="top-bg"></view>
-<canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
+<canvas wx:for="{{info.order_product_list}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
 <view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
-<view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
+<!-- <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
     <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
-  <!-- <view class="code-img"></view> -->
   <view class="code-text" wx:if="{{info.order_product_list[0].qrcode[codeIndex].use_url}}">{{info.order_product_list[0].qrcode[codeIndex].use_code_display_text}}:{{info.order_product_list[0].qrcode[codeIndex].use_code}}</view>
   <view class="code-text" wx:if="{{!info.order_product_list[0].qrcode[codeIndex].use_url}}">核销码:{{info.order_product_list[0].qrcode[codeIndex].use_code}}</view>
   <view class="code-state">{{info.order_product_list[0].qrcode[codeIndex].stateText}} {{codeIndex+1}}/{{codeImgs.length}}</view>
-  <!-- <view bindtap="gotoSku" class="code-btn">查看苏康码</view> -->
+</view> -->
+<view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
+  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
+  <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}">
+    <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
+  </view>
+  <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
+  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}</view>
+  <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
 </view>
 
 <sptj></sptj>

From eca0d6eee11f3c7f99bdc8482b528b1ed2162085 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 24 May 2023 09:08:03 +0800
Subject: [PATCH 067/471] =?UTF-8?q?=E7=94=B5=E5=BD=B1=E7=A5=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            |  2 +-
 pages/list/activitynew/index.wxml |  2 +-
 pages/list/activitynew/index.wxss |  5 +++--
 pages/list/movieticket/index.wxml |  2 +-
 pages/order/movie/index.wxml      |  4 ++--
 pages/order/movie/index.wxss      | 28 ++++++++++++++++++++--------
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app.js b/app.js
index e1789b7..3199bb7 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.isTest80? true : false;
+      data.isTest = data.isTest81? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 3470235..8deb5c0 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -71,7 +71,7 @@
   <view class="movie-types" wx:if="{{type==4}}">
     <view bindtap="changeMovieType" data-type='1' class="movie-type {{movieType==1?'active':''}}">热映</view>
     <view bindtap="changeMovieType" data-type='2' class="movie-type {{movieType==2?'active':''}}">影院</view>
-    <view bindtap="changeMovieType" data-type='3' class="movie-type {{movieType==3?'active':''}}">即将上映</view>
+    <!-- <view bindtap="changeMovieType" data-type='3' class="movie-type {{movieType==3?'active':''}}">即将上映</view> -->
   </view>
   <view class="sort-box" wx:if="{{type==4 && movieType==2}}">
     <view class="{{sort=='distance'?'active':''}}" bindtap="setSort" data-sort="distance">离我最近</view>
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 5765cfc..8f3167e 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -225,11 +225,12 @@ background: rgba(11, 137, 142, .1);
 .movie-types {
   display: flex;
   justify-content: space-between;
-  padding: 30rpx;
+  padding: 30rpx 14rpx;
   background: #0B898E;
 }
 .movie-type {
-  width: 180rpx;
+  width: 330rpx;
+
   height: 60rpx;
   display: flex;
   align-items: center;
diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index 276c8b7..0ae5aa5 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -2,7 +2,7 @@
 <view class="movie-types">
   <view class="movie-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">热映</view>
   <view class="movie-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">影院</view>
-  <view class="movie-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">即将上映</view>
+  <!-- <view class="movie-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">即将上映</view> -->
 </view>
 <view style="height:87rpx"></view>
 <!-- 热映 -->
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index a88c5b5..c39a4e0 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -20,13 +20,13 @@
 
 <view class="tips">
 	<view class="tips-box">
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha.png" mode="aspectFit" />
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" />
 		<view>
 			不支持退票
 		</view>
 	</view>
 	<view class="tips-box">
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha.png" mode="aspectFit" alt="" />
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" alt="" />
 		<view>
 			不支持改签
 		</view>
diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss
index 79403a9..91509b5 100644
--- a/pages/order/movie/index.wxss
+++ b/pages/order/movie/index.wxss
@@ -4,9 +4,11 @@ page {
 }
 .info-box {
   background: white;
-  border-radius: 7rpx;
+  border-radius: 9rpx;
   margin: 25rpx;
   padding: 0 21rpx;
+  position: relative;
+  z-index:11;
 }
 .info-top {
   display: flex;
@@ -107,21 +109,31 @@ page {
 }
 .tips{
 	display: flex;
-	margin-left: 25.3rpx;
+  margin-left:25rpx;
+  padding-left: 20rpx;
+  box-sizing: border-box;
+  width: 700rpx;
+  height: 80rpx;
+  background: #D62828;
+  border-radius:0 0 9rpx 9rpx ;
+  position: relative;
+  margin-top: -32rpx;
 }
 .tips-box{
 	display: flex;
 	align-items: center;
 	margin-right: 27rpx;
-	font-size: 27rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #111111;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #FFFFFF;
+  line-height: 57rpx;
 
 }
 .tips-box image{
-	width: 26.6rpx;
-	height: 26.6rpx;
+	width: 26.7rpx;
+  height: 26.7rpx;
+  margin-right:10rpx ;
 }
 .fix-info{
 	width: 750rpx;

From 4b9ef94616c68f095498a3e479a1069d065fd4b9 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 7 Jun 2023 09:06:50 +0800
Subject: [PATCH 068/471] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/card/index.wxss                  | 2 ++
 pages/list/movieticket/list/info/index.wxml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/list/card/index.wxss b/pages/list/card/index.wxss
index 4260079..3364af0 100644
--- a/pages/list/card/index.wxss
+++ b/pages/list/card/index.wxss
@@ -7,6 +7,8 @@
   margin-top: 417rpx;
   position: relative;
   z-index: 2;
+  background: url(https://static.ticket.sz-trip.com/xcxImages/card/bg.png) repeat-y;
+
 }
 .item {
   display: flex;
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 4910bdb..651fcac 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -24,6 +24,6 @@
   <!-- <view class="line"></view> -->
 </view>
 <view style="height:104rpx" wx:if="{{showFlag}}"></view>
-<navigator wx:if="{{info && showFlag}}" url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
+<navigator  url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
   <view class="order-btn">立即购票</view>
 </navigator>
\ No newline at end of file

From 7d5086374c2bf9b1e33ca2682713c055302f9fc7 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 13 Jun 2023 15:36:55 +0800
Subject: [PATCH 069/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.wxss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 8f3167e..32d235f 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -212,7 +212,7 @@ background: rgba(11, 137, 142, .1);
   font-size: 23rpx;
   color: #999;
   flex: 1;
-  height: 220rpx;
+  min-height: 220rpx;
   margin-right: 28rpx;
 }
 .activity-title {

From b4edfb6d4e03b96a6ef5e31965a263c046db0f49 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 21 Jun 2023 17:02:35 +0800
Subject: [PATCH 070/471] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E5=85=B3=E6=B3=A8,?=
 =?UTF-8?q?=E7=94=B5=E5=BD=B1=E4=B8=8B=E5=8D=95=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/hotelProductInfo/index.js          |  102 +-
 pages/info/hotelProductInfo/index.json        |    4 +-
 pages/info/hotelProductInfo/index.wxml        |    9 +-
 pages/info/museumInfo/index.js                |   57 +-
 pages/info/museumInfo/index.json              |    4 +-
 pages/info/museumInfo/index.wxml              |    4 +-
 pages/info/postProductInfo/index.js           | 1331 +++++++-------
 pages/info/postProductInfo/index.json         |    4 +-
 pages/info/postProductInfo/index.wxml         |    4 +-
 pages/info/roadInfo/index.js                  |  933 +++++-----
 pages/info/roadInfo/index.json                |    4 +-
 pages/info/roadInfo/index.wxml                |    4 +-
 pages/info/sceneProductInfo/index.js          | 1580 +++++++++--------
 pages/info/sceneProductInfo/index.json        |    5 +-
 pages/info/sceneProductInfo/index.wxml        |    4 +-
 pages/list/movieticket/list/ticket/index.js   |  473 ++---
 pages/list/movieticket/list/ticket/index.json |    3 +-
 pages/list/movieticket/list/ticket/index.wxml |    4 +-
 pages/order/components/wxqrCode/index.js      |   42 +
 pages/order/components/wxqrCode/index.json    |    4 +
 pages/order/components/wxqrCode/index.wxml    |   13 +
 pages/order/components/wxqrCode/index.wxss    |   70 +
 pages/order/movie/index.wxml                  |    9 +-
 pages/order/movie/index.wxss                  |    8 +-
 pages/user/cartlist/list.js                   |  688 +++----
 pages/user/cartlist/list.json                 |    3 +-
 pages/user/cartlist/list.wxml                 |    4 +-
 27 files changed, 2841 insertions(+), 2529 deletions(-)
 create mode 100644 pages/order/components/wxqrCode/index.js
 create mode 100644 pages/order/components/wxqrCode/index.json
 create mode 100644 pages/order/components/wxqrCode/index.wxml
 create mode 100644 pages/order/components/wxqrCode/index.wxss

diff --git a/pages/info/hotelProductInfo/index.js b/pages/info/hotelProductInfo/index.js
index b42b444..d5942c6 100644
--- a/pages/info/hotelProductInfo/index.js
+++ b/pages/info/hotelProductInfo/index.js
@@ -37,7 +37,9 @@ Page({
     roomInfo: null,
     retailId: "",
     shareImg: null,
-    showShareFlag: false
+    showShareFlag: false,
+    showQrCode: false,
+    wxqrcode: null
   },
 
   /**
@@ -127,44 +129,72 @@ Page({
     })
   },
   order: function (e) {
-    let item = e.currentTarget.dataset.item;
-    item.startDate = this.data.startDate;
-    item.endDate = this.data.endDate;
-    item.startDateText = this.data.startDateText;
-    item.endDateText = this.data.endDateText;
-    item.startDay = this.getDay(item.startDate);
-    item.endDay = this.getDay(item.endDate);
-    item.days = this.data.days;
-    app.globalData.product = item;
-    app.globalData.couponInfo = null;
-    wx.navigateTo({
-      url: '/pages/order/hotel/index',
+      console.log(this.data.sceneInfo);
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/info/hotelProductInfo/index?id=' + this.data.id,
+        title: this.data.sceneInfo.title,
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            let item = e.currentTarget.dataset.item;
+            item.startDate = this.data.startDate;
+            item.endDate = this.data.endDate;
+            item.startDateText = this.data.startDateText;
+            item.endDateText = this.data.endDateText;
+            item.startDay = this.getDay(item.startDate);
+            item.endDay = this.getDay(item.endDate);
+            item.days = this.data.days;
+            app.globalData.product = item;
+            app.globalData.couponInfo = null;
+            wx.navigateTo({
+              url: '/pages/order/hotel/index',
+            })
+        }
     })
   },
   orderMt: function (e) {
-    let item = e.currentTarget.dataset.item, product = e.currentTarget.dataset.product;
-    item.startDate = this.data.startDate;
-    item.endDate = this.data.endDate;
-    item.startDateText = this.data.startDateText;
-    item.endDateText = this.data.endDateText;
-    item.startDay = this.getDay(item.startDate);
-    item.endDay = this.getDay(item.endDate);
-    item.days = this.data.days;
-    item.id = item.sku_id;
-    // item.product_id = product.real_room_id;
-    item.sku_name = product.room_name;
-    item.sku_model = {};
-    item.sku_model.area = product.useable_area + "m²";
-    item.sku_model.bed_type = item.bed_type;
-    item.sku_model.breakfast = item.breakfast;
-    item.sku_model.max_room_num = item.max_room_num;
-    app.globalData.product = item;
-    app.globalData.retailId = this.data.retailId;
-    // return;
-    app.globalData.couponInfo = null;
-    wx.navigateTo({
-      url: '/pages/order/hotel/index',
-    })
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/info/hotelProductInfo/index?id=' + this.data.id,
+        title: this.data.sceneInfo.title,
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            let item = e.currentTarget.dataset.item, product = e.currentTarget.dataset.product;
+            item.startDate = this.data.startDate;
+            item.endDate = this.data.endDate;
+            item.startDateText = this.data.startDateText;
+            item.endDateText = this.data.endDateText;
+            item.startDay = this.getDay(item.startDate);
+            item.endDay = this.getDay(item.endDate);
+            item.days = this.data.days;
+            item.id = item.sku_id;
+            // item.product_id = product.real_room_id;
+            item.sku_name = product.room_name;
+            item.sku_model = {};
+            item.sku_model.area = product.useable_area + "m²";
+            item.sku_model.bed_type = item.bed_type;
+            item.sku_model.breakfast = item.breakfast;
+            item.sku_model.max_room_num = item.max_room_num;
+            app.globalData.product = item;
+            app.globalData.retailId = this.data.retailId;
+            // return;
+            app.globalData.couponInfo = null;
+            wx.navigateTo({
+              url: '/pages/order/hotel/index',
+            })
+        }})
+
+
   },
   getDay: function (date) {
     let d = new Date(date.replace(/-/g, '/')).getDay();
diff --git a/pages/info/hotelProductInfo/index.json b/pages/info/hotelProductInfo/index.json
index eb3533f..dba6e62 100644
--- a/pages/info/hotelProductInfo/index.json
+++ b/pages/info/hotelProductInfo/index.json
@@ -1,6 +1,8 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "common-image":"/pages/component/commonImage/index"
+    "common-image":"/pages/component/commonImage/index",
+    "code":"../../order/components/wxqrCode/index"
+
   }
 }
\ No newline at end of file
diff --git a/pages/info/hotelProductInfo/index.wxml b/pages/info/hotelProductInfo/index.wxml
index 92fe16a..5c77760 100644
--- a/pages/info/hotelProductInfo/index.wxml
+++ b/pages/info/hotelProductInfo/index.wxml
@@ -53,8 +53,9 @@
     <common-image src="{{item.img_list[0]}}" mode="aspectFill"></common-image>
     <view class="product-info textOver">
       <view class="title textOver"><view class="textOver">{{item.room_name}}</view></view>
-      <view class="subtitle textOver2">{{item.useable_area?(item.useable_area+'m²'):''}} <text wx:for="{{item.bed_info}}">{{item.bedDesc}}{{item.bedType}}x{{item.bedCount}}</text> {{item.window?item.window:''}}</view>
-      <view class="mt-price">{{item.low_price>0?item.low_price/100:'0'}}</view>
+      <!-- <view class="subtitle textOver2">{{item.useable_area?(item.useable_area+'m²'):''}} <text wx:for="{{item.bed_info}}">{{item.bedDesc}}{{item.bedType}}x{{item.bedCount}}</text> {{item.window?item.window:''}}</view> -->
+			<view class="subtitle textOver2">{{item.useable_area?(item.useable_area+'m²'):''}} {{item.window?item.window:''}} <text>{{item.capacity?item.capacity+'人入住':''}}</text></view>
+			<view class="mt-price">{{item.low_price>0?item.low_price/100:'0'}}</view>
     </view>
     <view class="product-right">
       <image class="product-arrow-img" bindtap="getSkuList" data-id="{{item.real_room_id}}" data-index="{{index}}" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow{{activeSkuIndex==index?'1':''}}.png" mode="widthFix"></image>
@@ -216,4 +217,6 @@
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index af26a02..a4f8e8a 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -26,7 +26,9 @@ Page({
     retailId: "",
     isGroup: null,
     shareImg: null,
-    showShareFlag: false
+    showShareFlag: false,
+    showQrCode:false,
+    wxqrcode:null
   },
 
   /**
@@ -399,27 +401,38 @@ Page({
     })
   },
   order: function () {
-	this.data.isGroup = null
-    if(this.data.product.product.flag!=1 || this.data.product.sku.flag=='off') return;
-    if(this.data.isGroup){
-      // 如果是团队预约的话 是需要判断是否需要审核的
-      commonApi.user_post("team_order/is_apply",{
-        id:this.data.id
-      }).then(res=>{
-        // 0 无需资质申请 1 需要资质申请跳转资质申请页面
-        if(res && res.data==1){
-          wx.navigateTo({
-            url: '/pages/group/apply/index?id='+this.data.id,
-          })
-          return;
-        }
-        this.realOrder()
-      })
-    }
-    else {
-      this.realOrder()
-    }
-    
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/info/museumInfo/index?id='+this.data.id,
+        title:this.data.info.title,
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            this.data.isGroup = null
+            if(this.data.product.product.flag!=1 || this.data.product.sku.flag=='off') return;
+            if(this.data.isGroup){
+              // 如果是团队预约的话 是需要判断是否需要审核的
+              commonApi.user_post("team_order/is_apply",{
+                id:this.data.id
+              }).then(res=>{
+                // 0 无需资质申请 1 需要资质申请跳转资质申请页面
+                if(res && res.data==1){
+                  wx.navigateTo({
+                    url: '/pages/group/apply/index?id='+this.data.id,
+                  })
+                  return;
+                }
+                this.realOrder()
+              })
+            }
+            else {
+              this.realOrder()
+            }
+        }})
   },
   order1: function () {
 	  this.data.isGroup = 1
diff --git a/pages/info/museumInfo/index.json b/pages/info/museumInfo/index.json
index 5e61cff..bfbc88d 100644
--- a/pages/info/museumInfo/index.json
+++ b/pages/info/museumInfo/index.json
@@ -1,6 +1,8 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "date":"/pages/order/components/date/index"
+    "date":"/pages/order/components/date/index",
+    "code":"../../order/components/wxqrCode/index"
+
   }
 }
\ No newline at end of file
diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml
index 529faa3..0094ca3 100644
--- a/pages/info/museumInfo/index.wxml
+++ b/pages/info/museumInfo/index.wxml
@@ -99,4 +99,6 @@
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 8bc8423..738a610 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -7,703 +7,730 @@ import util from '../../../utils/util'
 let app = getApp()
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    autoPlay: true,
-    fixed: false,
-    type: 1,
-    top: 0,
-    isLike: 0,
-    commentTotal: 0,
-    comment: [],
-    info: null,
-    skuFlag: null,
-    producNum: 1,
-    skuIndex: 0,
-    aniSkuIndex: -1,
-    retailId: "",
-    cartTop: 0,
-    cartImgInfo: null,
-    cartCount: 0,
-    shareImg: null,
-    showShareFlag: false,
-    allowance_data: null,
-    showAllowance: false,
-    tjList: [], //推荐商品列表
-    iShop:false,
-    supplierId:null
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        autoPlay: true,
+        fixed: false,
+        type: 1,
+        top: 0,
+        isLike: 0,
+        commentTotal: 0,
+        comment: [],
+        info: null,
+        skuFlag: null,
+        producNum: 1,
+        skuIndex: 0,
+        aniSkuIndex: -1,
+        retailId: "",
+        cartTop: 0,
+        cartImgInfo: null,
+        cartCount: 0,
+        shareImg: null,
+        showShareFlag: false,
+        allowance_data: null,
+        showAllowance: false,
+        tjList: [], //推荐商品列表
+        iShop: false,
+        supplierId: null,
+        showQrCode: false,
+        wxqrcode: null
+    },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    //删除临时存储的联系人
-    wx.removeStorageSync('linkMan')
-    let rect = wx.getMenuButtonBoundingClientRect(),
-      that = this;
-    let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
-    this.setData({
-      top: height,
-      id: options.id
-    })
-    // 获取购物车按钮的位置
-    wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-      console.log(res)
-      that.setData({
-        cartTop: res.top
-      })
-    }).exec()
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        //删除临时存储的联系人
+        wx.removeStorageSync('linkMan')
+        let rect = wx.getMenuButtonBoundingClientRect(),
+            that = this;
+        let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+        this.setData({
+            top: height,
+            id: options.id
+        })
+        // 获取购物车按钮的位置
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
 
-    if (options.retailId) {
-      this.setData({
-        retailId: options.retailId
-      })
-    }
-    commonApi._post("product/get_product_detail", {
-      id: options.id
-    }).then(res => {
-      res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
-      if (options.skuid) {
-        let sku = res.data.sku.find(item => item.id == options.skuid);
-        res.data.sku = [sku];
-      }
-      res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
-      this.setData({
-        info: res.data,
-        supplierId:res.data.supplier_id,
-        iShop:res.data.supplier_id?true:false
-      })
+        if (options.retailId) {
+            this.setData({
+                retailId: options.retailId
+            })
+        }
+        commonApi._post("product/get_product_detail", {
+            id: options.id
+        }).then(res => {
+            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+            if (options.skuid) {
+                let sku = res.data.sku.find(item => item.id == options.skuid);
+                res.data.sku = [sku];
+            }
+            res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+            this.setData({
+                info: res.data,
+                supplierId: res.data.supplier_id,
+                iShop: res.data.supplier_id ? true : false
+            })
 
-      // 获取补贴
-      // commonApi.user_post("product/getProductAllowancePrice", {
-      //   product_code: res.data.product_code
-      // }).then(resTwo => {
-      //   if (resTwo && resTwo.code == 1) {
-      //     this.setData({
-      //       allowance_data: resTwo.data
-      //     })
-      //   }
-      // })
-      this.BroswerRecord()
-    })
-    // 获取评价列表
-    commonApi._post("product/product_comment_list", {
-      product_id: options.id
-    }).then(res => {
-      res.data.list.map(item => {
-        item.rate = Number(item.rate)
-        item.create_time = item.create_time.substring(0, 10)
+            // 获取补贴
+            // commonApi.user_post("product/getProductAllowancePrice", {
+            //   product_code: res.data.product_code
+            // }).then(resTwo => {
+            //   if (resTwo && resTwo.code == 1) {
+            //     this.setData({
+            //       allowance_data: resTwo.data
+            //     })
+            //   }
+            // })
+            this.BroswerRecord()
+        })
+        // 获取评价列表
+        commonApi._post("product/product_comment_list", {
+            product_id: options.id
+        }).then(res => {
+            res.data.list.map(item => {
+                item.rate = Number(item.rate)
+                item.create_time = item.create_time.substring(0, 10)
 
-      })
-      this.setData({
-        comment: res.data.list.splice(0, 2),
-        commentTotal: res.data.total
-      })
-      let arr = this.data.comment
-      arr.map((item) => {
-        if (item.img_list) {
-          item.img_list = item.img_list.split(',')
-        } else {
-          item.img_list = []
-        }
-      })
-      this.setData({
-        comment: arr
-      })
-    })
+            })
+            this.setData({
+                comment: res.data.list.splice(0, 2),
+                commentTotal: res.data.total
+            })
+            let arr = this.data.comment
+            arr.map((item) => {
+                if (item.img_list) {
+                    item.img_list = item.img_list.split(',')
+                } else {
+                    item.img_list = []
+                }
+            })
+            this.setData({
+                comment: arr
+            })
+        })
 
-    commonApi._post("product/get_product_by_type", {
-      offset: 0,
-      limit: 6,
-      rand: true,
-      type: 'post'
-    }).then(res => {
-      try {
-        this.setData({
-          tjList: res.data.list
+        commonApi._post("product/get_product_by_type", {
+            offset: 0,
+            limit: 6,
+            rand: true,
+            type: 'post'
+        }).then(res => {
+            try {
+                this.setData({
+                    tjList: res.data.list
+                })
+            } catch (error) {
+                console.log(error);
+            }
         })
-      } catch (error) {
-        console.log(error);
-      }
-    })
-  },
-  changeAllowance: function () {
-    this.setData({
-      showAllowance: !this.data.showAllowance
-    })
-  },
-  BroswerRecord: function () {
-    setTimeout(() => {
-      if (app.globalData.uuid) {
-        commonApi._post('browse/browse_record', {
-          type: "goods",
-          title: this.data.info.title,
-          drive: "mini",
-          source_id: this.data.info.id,
-          url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
-          uuid: app.globalData.uuid
-        }).then(res => {})
-      } else {
-        this.BroswerRecord();
-      }
-    }, 500)
-  },
-  like: function () {
-    let id = this.data.id,
-      isLike = this.data.isLike;
-    commonApi.user_post("product/" + (isLike == 1 ? "product_cancel_collection" : "product_collection"), {
-      product_id: id
-    }).then(res => {
-      if (res.code == 1) {
+    },
+    changeAllowance: function () {
         this.setData({
-          isLike: isLike == 1 ? 0 : 1
+            showAllowance: !this.data.showAllowance
         })
-      }
-    })
-  },
-  changeMenu: function (e) {
-    let index = e.currentTarget.dataset.index,
-      that = this;
-    const query = wx.createSelectorQuery(); //创建节点查询器
-    query.select("#box" + index).boundingClientRect() //选择toViewid获取位置信息
-    query.selectViewport().scrollOffset() //获取页面查询位置的
-    query.exec(function (res) {
-      let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
-      wx.pageScrollTo({
-        scrollTop: scrollTop + 4,
-        duration: 0
-      })
-      that.setData({
-        type: index
-      })
-    })
-  },
-  onPageScroll: function (e) {
-    let that = this,
-      height = this.data.top;
-    let topHeight = height;
-    wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
-      if (rect.top <= topHeight) {
-        // 此时应该把menus固定在顶部
-        that.setData({
-          fixed: true
+    },
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "goods",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
+            }
+        }, 500)
+    },
+    like: function () {
+        let id = this.data.id,
+            isLike = this.data.isLike;
+        commonApi.user_post("product/" + (isLike == 1 ? "product_cancel_collection" : "product_collection"), {
+            product_id: id
+        }).then(res => {
+            if (res.code == 1) {
+                this.setData({
+                    isLike: isLike == 1 ? 0 : 1
+                })
+            }
         })
-      } else {
-        that.setData({
-          fixed: false
+    },
+    changeMenu: function (e) {
+        let index = e.currentTarget.dataset.index,
+            that = this;
+        const query = wx.createSelectorQuery(); //创建节点查询器
+        query.select("#box" + index).boundingClientRect() //选择toViewid获取位置信息
+        query.selectViewport().scrollOffset() //获取页面查询位置的
+        query.exec(function (res) {
+            let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
+            wx.pageScrollTo({
+                scrollTop: scrollTop + 4,
+                duration: 0
+            })
+            that.setData({
+                type: index
+            })
         })
-      }
-      // 滚动时判断滚动到哪个部分了
-      const query = wx.createSelectorQuery(); //创建节点查询器
-      query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
-      query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
-      query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
-      let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
-      query.exec(function (res) {
-        if (res[2].top < minHeight) {
-          that.setData({
-            type: 3
-          })
-        } else if (res[1].top < minHeight) {
-          that.setData({
-            type: 2
-          })
-        } else {
-          that.setData({
-            type: 1
-          })
-        }
-      })
-    }).exec()
-
-  },
-  showCart: function () {
-    if (this.data.info.sku.length == 0) {
-      wx.showToast({
-        title: '该产品未设置规格，不能加购',
-        icon: 'none'
-      })
-      return;
-    }
-    this.setData({
-      skuFlag: "cart"
-    })
-    let that = this
-    wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
-      console.log(res)
-      that.setData({
-        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
-      })
-    }).exec()
-
-  },
-  hideSku: function () {
-    this.setData({
-      skuFlag: null,
-      cartImgInfo: null
-    })
-  },
-  minus: function () {
-    if (this.data.producNum == 1) return;
-    this.setData({
-      producNum: this.data.producNum - 1
-    })
-  },
-  add: function () {
-    this.setData({
-      producNum: this.data.producNum + 1
-    })
-  },
-  selectSku: function (e) {
-    let index = e.currentTarget.dataset.index;
-    this.setData({
-      skuIndex: index
-    })
-  },
-  showOrder: function () {
-    if (this.data.info.sku.length == 0) {
-      wx.showToast({
-        title: '该产品未设置规格，不能购买',
-        icon: 'none'
-      })
-      return;
-    }
-    this.setData({
-      skuFlag: 'order'
-    })
-  },
-  order: function () {
-    app.globalData.postProduct = null
-    app.globalData.list = []
-    commonApi.user_post("/product/checkStock", {
-      sku_id: this.data.info.sku[this.data.skuIndex].id,
-    }).then(res => {
-      if (res && res.code != 1) {
-        return;
-      } else {
-        if (this.data.skuFlag == 'order') {
-          util.pagePoint({
-            event: 'product_order',
-            param: {
-              id: this.data.info.id,
-              type: this.data.info.type
+    },
+    onPageScroll: function (e) {
+        let that = this,
+            height = this.data.top;
+        let topHeight = height;
+        wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
+            if (rect.top <= topHeight) {
+                // 此时应该把menus固定在顶部
+                that.setData({
+                    fixed: true
+                })
+            } else {
+                that.setData({
+                    fixed: false
+                })
             }
-          }, 1)
-          wx.setStorageSync('login_from', 'product_order_login')
-          wx.setStorageSync('order_from', 'product_order_submit')
-          app.globalData.couponInfo = null;
-          // 购买
-          let product = [{
-            product: this.data.info,
-            sku: this.data.info.sku[this.data.skuIndex],
-            productNum: this.data.producNum
-          }];
-          app.globalData.postProduct = product;
-          app.globalData.retailId = this.data.retailId;
-          wx.navigateTo({
-            url: '/pages/order/postOrder/index',
-          })
-        } else {
-          commonApi.user_post("cart/add_sku", {
-            sku_id: this.data.info.sku[this.data.skuIndex].id,
-            num: this.data.producNum
-          }).then(res => {
-            if (res.code == 1) {
-              commonApi.user_post('cart/get_list', {}).then(res => {
+            // 滚动时判断滚动到哪个部分了
+            const query = wx.createSelectorQuery(); //创建节点查询器
+            query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
+            let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
+            query.exec(function (res) {
+                if (res[2].top < minHeight) {
+                    that.setData({
+                        type: 3
+                    })
+                } else if (res[1].top < minHeight) {
+                    that.setData({
+                        type: 2
+                    })
+                } else {
+                    that.setData({
+                        type: 1
+                    })
+                }
+            })
+        }).exec()
+
+    },
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
                 this.setData({
-                  cartCount: res.data.length
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
                 })
-              })
-              // 加动效
-              this.setData({
-                skuFlag: null,
-                aniSkuIndex: this.data.skuIndex,
-                cartImgInfo: null
-              })
-              setTimeout(() => {
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
                 this.setData({
-                  aniSkuIndex: -1
+                    skuFlag: "cart"
                 })
-                wx.showModal({
-                  title: "提示",
-                  content: "去购物车结算？",
-                  success: function (res) {
-                    if (res.confirm) {
-                      wx.navigateTo({
-                        url: '/pages/user/cartlist/list',
-                      })
-                    }
-                  }
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    console.log(res)
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+    },
+    hideSku: function () {
+        this.setData({
+            skuFlag: null,
+            cartImgInfo: null
+        })
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+    selectSku: function (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            skuIndex: index
+        })
+    },
+    showOrder: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能购买',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: 'order'
                 })
-              }, 650)
             }
-          })
-        }
-      }
-    })
-
-  },
-  // 分享
-  share: function () {
-    if (!wx.getStorageSync("jstrip_token")) {
-      util.pagePoint({
-        event: 'product_share_login',
-        type: this.data.info.type,
-        id: this.data.info.id
-      }, 1)
-      commonApi.user_post("user/getMyInfo", {}).then(res => {
+        })
+    },
+    order: function () {
+        app.globalData.postProduct = null
+        app.globalData.list = []
+        commonApi.user_post("/product/checkStock", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+        }).then(res => {
+            if (res && res.code != 1) {
+                return;
+            } else {
+                if (this.data.skuFlag == 'order') {
+                    util.pagePoint({
+                        event: 'product_order',
+                        param: {
+                            id: this.data.info.id,
+                            type: this.data.info.type
+                        }
+                    }, 1)
+                    wx.setStorageSync('login_from', 'product_order_login')
+                    wx.setStorageSync('order_from', 'product_order_submit')
+                    app.globalData.couponInfo = null;
+                    // 购买
+                    let product = [{
+                        product: this.data.info,
+                        sku: this.data.info.sku[this.data.skuIndex],
+                        productNum: this.data.producNum
+                    }];
+                    app.globalData.postProduct = product;
+                    app.globalData.retailId = this.data.retailId;
+                    wx.navigateTo({
+                        url: '/pages/order/postOrder/index',
+                    })
+                } else {
+                    commonApi.user_post("cart/add_sku", {
+                        sku_id: this.data.info.sku[this.data.skuIndex].id,
+                        num: this.data.producNum
+                    }).then(res => {
+                        if (res.code == 1) {
+                            commonApi.user_post('cart/get_list', {}).then(res => {
+                                this.setData({
+                                    cartCount: res.data.length
+                                })
+                            })
+                            // 加动效
+                            this.setData({
+                                skuFlag: null,
+                                aniSkuIndex: this.data.skuIndex,
+                                cartImgInfo: null
+                            })
+                            setTimeout(() => {
+                                this.setData({
+                                    aniSkuIndex: -1
+                                })
+                                wx.showModal({
+                                    title: "提示",
+                                    content: "去购物车结算？",
+                                    success: function (res) {
+                                        if (res.confirm) {
+                                            wx.navigateTo({
+                                                url: '/pages/user/cartlist/list',
+                                            })
+                                        }
+                                    }
+                                })
+                            }, 650)
+                        }
+                    })
+                }
+            }
+        })
 
-      })
-      return;
-    }
-    if (!this.data.shareImg) {
-      wx.showToast({
-        title: '图片生成中，稍后再试',
-        icon: 'none'
-      })
-      return;
-    }
-    this.setData({
-      showShareFlag: !this.data.showShareFlag
-    })
-  },
-  // 保存
-  save() {
-    let url = this.data.shareImg,
-      that = this;
-    wx.authorize({
-      /* 这个就是保存相册的 */
-      scope: 'scope.writePhotosAlbum',
-      success() {
-        wx.saveImageToPhotosAlbum({
-          filePath: url,
-          success(res) {
-            wx.showToast({
-              title: '保存成功',
-              icon: "success"
-            })
-            that.setData({
-              showShareFlag: !this.data.showShareFlag
-            })
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
             util.pagePoint({
-              event: 'product_share_save',
-              type: that.data.info.type,
-              id: that.data.info.id
+                event: 'product_share_login',
+                type: this.data.info.type,
+                id: this.data.info.id
             }, 1)
-          },
-          fail(res) {
+            commonApi.user_post("user/getMyInfo", {}).then(res => {
+
+            })
+            return;
+        }
+        if (!this.data.shareImg) {
             wx.showToast({
-              title: '保存失败',
-              icon: 'none'
+                title: '图片生成中，稍后再试',
+                icon: 'none'
             })
-          }
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
         })
-      },
-      complete(res) {
-        console.log(res);
-        /* 这里判断一下如果没有授权重新打开设置选项 */
-        wx.getSetting({
-          success(res) {
-            if (!res.authSetting['scope.writePhotosAlbum']) {
-              /* 打开设置的方法 */
-              // opensit();
-              wx.showToast({
-                title: '请打开权限后再试',
-                icon: 'none'
-              })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !this.data.showShareFlag
+                        })
+                        util.pagePoint({
+                            event: 'product_share_save',
+                            type: that.data.info.type,
+                            id: that.data.info.id
+                        }, 1)
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                console.log(res);
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
             }
-          }
         });
-      }
-    });
-
-  },
-  pagePoint: function (e) {
-    util.pagePoint(e)
-  },
-  // 绘制海报
-  drawImg: function () {
-    var that = this,
-      userinfo = wx.getStorageSync('jstrip_userInfo');
-    if (!userinfo) {
-      // 去登录
-      return false;
-    }
-    const ctx = wx.createCanvasContext('imageCanvas');
-    // const device = wx.getSystemInfoSync();
-    // const ratio = device.screenWidth / 750;
 
-    // 先获取到图片信息
-    let promise2 = new Promise(function (resolve, reject) {
-      wx.getImageInfo({
-        src: that.data.info.headimg,
-        success: function (res) {
-          resolve(res);
-        },
-        fail: function (res) {
-          reject(res);
-        }
-      })
-    })
-    let promise3 = new Promise(function (resolve, reject) {
-      let userid = wx.getStorageSync('jstrip_userid')
-      new QRCode('myQrcode', {
-        text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
-        width: 500,
-        height: 500,
-        padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-        correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
-        callback: (res) => {
-          resolve(res);
+    },
+    pagePoint: function (e) {
+        util.pagePoint(e)
+    },
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
         }
-      })
-    })
-    //成功得到图片信息后，开始绘图
-    Promise.all([promise2, promise3]).then(imgs => {
-      ctx.save();
-      ctx.beginPath(); //开始绘制
-      that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
-      ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
-      ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
-      ctx.restore();
-      ctx.save();
-      that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
-      ctx.restore();
-      // 绘制二维码
-      ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
-      // 开始文字绘制
-      ctx.setFillStyle("#000");
-      ctx.setFontSize(30 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
-      // 售价
-      ctx.setFillStyle("#D62828");
-      ctx.setFontSize(40 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let price = "￥" + (that.data.info.price / 100);
-      let width = ctx.measureText(price).width;
-      ctx.fillText(price, 25 * ratio, 620 * ratio);
-      // 副标题
-      ctx.setFillStyle("#999999");
-      ctx.setFontSize(28 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let subtitle = that.data.info.subtitle;
-      if (that.data.info.subtitle.length > 10) {
-        subtitle = that.data.info.subtitle.substr(0, 10) + '...'
-      }
-      ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
-      // ctx.draw();
-      // 划线价
-      ctx.setFillStyle("#999999");
-      ctx.setFontSize(32 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let market_price = "￥" + (that.data.info.market_price / 100)
-      ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
-      let market_price_width = ctx.measureText(market_price).width;
-      // 划线
-      ctx.beginPath()
-      ctx.setLineWidth(1)
-      ctx.moveTo(40 * ratio + width, 608 * ratio)
-      ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
-      ctx.stroke();
-      // 长按识别二维码
-      // ctx.setFillStyle("#666");
-      // ctx.setFontSize(22 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
-      // 长按图片转发或保存
-      // ctx.setFillStyle("#000");
-      // ctx.setFontSize(24 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
-      ctx.draw();
-      // 转为图片
-      setTimeout(() => {
-        wx.canvasToTempFilePath({
-          x: 0,
-          y: 0,
-          canvasId: 'imageCanvas',
-          success: function (res) {
-            that.setData({
-              shareImg: res.tempFilePath
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
+
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
             })
-          },
-          fail(err) {
-            console.log('agdgjgdajhg', err)
-          }
         })
-      }, 500)
-      return false;
-    }).catch(err => {
-      console.log("this err", err)
-    })
-  },
-  // 圆角矩形
-  handleBorderRect(ctx, x, y, w, h, r, color) {
-    ctx.beginPath();
-    ctx.moveTo(x + w, y + h);
-    ctx.lineTo(x, y + h)
-    // 左上角
-    ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
-    ctx.moveTo(x + r, y);
-    ctx.lineTo(x + w - r, y);
-    ctx.lineTo(x + w, y + r);
-    // 右上角
-    ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
-    ctx.lineTo(x + w, y + h);
-    ctx.lineTo(x + w - r, y + h);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.closePath();
-  },
-  handleBorderRect2(ctx, x, y, w, h, r, color) {
-    ctx.beginPath();
-    ctx.moveTo(x, y);
-    ctx.lineTo(x + w, y)
-    // 右下角
-    ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
-    ctx.lineTo(x + r, y + h);
-    ctx.lineTo(x, y + h - r);
-    // 左下角
-    ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
-    ctx.lineTo(x, y);
-    ctx.lineTo(x, y);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.closePath();
-  },
-  // 绘制两行文字
-  drawText: function (ctx, str, x, y, canvasWidth, ratio) {
-    let row = [],
-      temp = "",
-      chr = str.split("");
-    for (var a = 0; a < chr.length; a++) {
-      if (ctx.measureText(temp).width < canvasWidth) {
-        temp += chr[a];
-      } else {
-        a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
+            })
+        })
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = "￥" + (that.data.info.price / 100);
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.subtitle;
+            if (that.data.info.subtitle.length > 10) {
+                subtitle = that.data.info.subtitle.substr(0, 10) + '...'
+            }
+            ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            // ctx.draw();
+            // 划线价
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(32 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let market_price = "￥" + (that.data.info.market_price / 100)
+            ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
+            let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            ctx.beginPath()
+            ctx.setLineWidth(1)
+            ctx.moveTo(40 * ratio + width, 608 * ratio)
+            ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
+            ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
         row.push(temp);
-        temp = "";
-      }
-    }
-    row.push(temp);
 
-    //如果数组长度大于2 则截取前两个
-    if (row.length > 2) {
-      var rowCut = row.slice(0, 2);
-      var rowPart = rowCut[1];
-      var test = "";
-      var empty = [];
-      for (var a = 0; a < rowPart.length; a++) {
-        if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
-          test += rowPart[a];
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
+        }
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+        }
+    },
+    gotoDetail: function (e) {
+        let item = e.currentTarget.dataset.item;
+        util.pagePoint({
+            event: 'recommend_click',
+            param: {
+                id: item.id,
+                type: item.type
+            }
+        }, 1)
+        if (item.type == 'travels') {
+            // 游记做特殊处理 其他都按照原来的来
+            wx.navigateTo({
+                url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+            })
         } else {
-          break;
+            util.gotoDetail(item);
         }
-      }
-      empty.push(test);
-      var group = empty[0] + "..." //这里只显示两行，超出的用...表示
-      rowCut.splice(1, 1, group);
-      row = rowCut;
-    }
-    for (var b = 0; b < row.length; b++) {
-      ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
-    }
-  },
-  gotoDetail: function (e) {
-    let item = e.currentTarget.dataset.item;
-    util.pagePoint({
-      event: 'recommend_click',
-      param: {
-        id: item.id,
-        type: item.type
-      }
-    }, 1)
-    if (item.type == 'travels') {
-      // 游记做特殊处理 其他都按照原来的来
-      wx.navigateTo({
-        url: '/pages/info/strategyInfo/index?id=' + item.s_id,
-      })
-    } else {
-      util.gotoDetail(item);
-    }
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    if (!wx.getStorageSync('jstrip_token')) {
-      return;
-    }
-    if (this.data.info && this.data.info.id) {
-      commonApi.user_post("product/is_product_collection", {
-        product_id: this.data.info.id
-      }).then(res => {
-        this.setData({
-          isLike: res.data
-        })
-        this.drawImg()
-      })
-      commonApi.user_post('cart/get_list', {}).then(res => {
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+        if (this.data.info && this.data.info.id) {
+            commonApi.user_post("product/is_product_collection", {
+                product_id: this.data.info.id
+            }).then(res => {
+                this.setData({
+                    isLike: res.data
+                })
+                this.drawImg()
+            })
+            commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                    cartCount: res.data.length
+                })
+            })
+        } else {
+            setTimeout(() => {
+                this.onShow()
+            }, 200)
+        }
+    },
+    playVideo() {
+        // 播放视频需要把autoplay暂停
         this.setData({
-          cartCount: res.data.length
+            autoPlay: false
         })
-      })
-    } else {
-      setTimeout(() => {
-        this.onShow()
-      }, 200)
-    }
-  },
-  playVideo() {
-    // 播放视频需要把autoplay暂停
-    this.setData({
-      autoPlay: false
-    })
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
 
-  },
+    },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
 
-  },
+    },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
 
-  },
+    },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
 
-  }
+    }
 })
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.json b/pages/info/postProductInfo/index.json
index 35cf02f..ab4ec76 100644
--- a/pages/info/postProductInfo/index.json
+++ b/pages/info/postProductInfo/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "code":"../../order/components/wxqrCode/index"
+
   }
 }
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 5ef87e9..2c9a219 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -203,4 +203,6 @@
     <view class="rule-title">{{allowance_data.title}}</view>
     <rich-text nodes="{{allowance_data.content}}"></rich-text>
   </view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index e65f076..18ed345 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -7,500 +7,515 @@ import util from '../../../utils/util'
 let app = getApp()
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    fixed: false,
-    type: 1,
-    top: 0,
-    info: null,
-    comment: [],
-    commentTotal: 0,
-    retailId: "",
-    retailSkuId: "",
-    shareImg: null,
-    showShareFlag: false
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        fixed: false,
+        type: 1,
+        top: 0,
+        info: null,
+        comment: [],
+        commentTotal: 0,
+        retailId: "",
+        retailSkuId: "",
+        shareImg: null,
+        showShareFlag: false,
+        showQrCode: false,
+        wxqrcode: null
+    },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    let rect = wx.getMenuButtonBoundingClientRect();
-    let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
-    this.setData({
-      top: height,
-      id: options.id
-    })
-    if (options.retailId) {
-      this.setData({
-        retailId: options.retailId
-      })
-    }
-    let api = commonApi._post;
-    if (wx.getStorageSync("jstrip_token")) {
-      api = commonApi.user_post;
-    }
-    api("product/get_product_detail", {
-      id: options.id
-    }).then(res => {
-      res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
-      
-      if (options.skuid) {
-        let sku = res.data.sku.find(item => item.id == options.skuid);
-        res.data.sku = [sku];
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        let rect = wx.getMenuButtonBoundingClientRect();
+        let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
         this.setData({
-          retailSkuId: options.skuid
-        })
-      }
-      res.data.flag = res.data.sku.find(item=>item.flag=='on')?res.data.flag:0
-      
-      this.setData({
-        info: res.data
-      })
-      this.BroswerRecord()
-    })
-    commonApi._post("product/product_comment_list", {
-      product_id: options.id,
-      offset: 0,
-      limit: 3
-    }).then(res => {
-      res.data.list.map(item => {
-        item.rate = Number(item.rate)
-      })
-      this.setData({
-        commentTotal: res.data.total,
-        comment: res.data.list
-      })
-    })
-  },
-  BroswerRecord: function () {
-    setTimeout(() => {
-      if (app.globalData.uuid) {
-        commonApi._post('browse/browse_record', {
-          type: "goods",
-          title: this.data.info.title,
-          drive: "mini",
-          source_id: this.data.info.id,
-          url: "/pages/info/cardInfo/index?id=" + this.data.info.id,
-          uuid: app.globalData.uuid
-        }).then(res => {
+            top: height,
+            id: options.id
         })
-      }
-      else {
-        this.BroswerRecord();
-      }
-    }, 500)
-  },
-  changeMenu: function (e) {
-    let index = e.currentTarget.dataset.index, that = this;
-    const query = wx.createSelectorQuery();  //创建节点查询器
-    query.select("#box" + index).boundingClientRect()  //选择toViewid获取位置信息
-    query.selectViewport().scrollOffset()  //获取页面查询位置的
-    query.exec(function (res) {
-      let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
-      wx.pageScrollTo({
-        scrollTop: scrollTop + 4,
-        duration: 0
-      })
-      that.setData({
-        type: index
-      })
-    })
-  },
-  onPageScroll: function (e) {
-    let that = this, height = this.data.top;
-    let topHeight = height;
-    wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
-      console.log(rect.top, topHeight)
-      if (rect.top <= topHeight) {
-        // 此时应该把menus固定在顶部
-        that.setData({
-          fixed: true
-        })
-      }
-      else {
-        that.setData({
-          fixed: false
-        })
-      }
-      // 滚动时判断滚动到哪个部分了
-      const query = wx.createSelectorQuery();  //创建节点查询器
-      query.select("#box1").boundingClientRect()  //选择toViewid获取位置信息
-      query.select("#box2").boundingClientRect()  //选择toViewid获取位置信息
-      query.select("#box3").boundingClientRect()  //选择toViewid获取位置信息
-      query.select("#box4").boundingClientRect()  //选择toViewid获取位置信息
-      let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
-      query.exec(function (res) {
-        if (res[3].top < minHeight) {
-          that.setData({
-            type: 4
-          })
-        }
-        else if (res[2].top < minHeight) {
-          that.setData({
-            type: 3
-          })
-        }
-        else if (res[1].top < minHeight) {
-          that.setData({
-            type: 2
-          })
+        if (options.retailId) {
+            this.setData({
+                retailId: options.retailId
+            })
         }
-        else {
-          that.setData({
-            type: 1
-          })
+        let api = commonApi._post;
+        if (wx.getStorageSync("jstrip_token")) {
+            api = commonApi.user_post;
         }
-      })
-    }).exec()
+        api("product/get_product_detail", {
+            id: options.id
+        }).then(res => {
+            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
 
-  },
-  order: function () {
-    app.globalData.couponInfo = null;
-    app.globalData.product = {
-      product: this.data.info
-    }
-    app.globalData.retailId = this.data.retailId;
-    util.pagePoint({
-      event:'product_order',
-      param:{
-        id:this.data.info.id,
-        type:this.data.info.type
-      }
-    },1)
-    wx.setStorageSync('login_from', 'product_order_login')
-    wx.setStorageSync('order_from', 'product_order_submit')
-    wx.navigateTo({
-      url: '/pages/order/road/index?id=' + this.data.info.id + (this.data.retailSkuId ? ('&skuid=' + this.data.retailSkuId) : '')
-    })
-  },
-  pagePoint:function(e){
-    util.pagePoint(e)
-  },
-  // 分享
-  share: function () {
-    if (!wx.getStorageSync("jstrip_token")) {
-      util.pagePoint({
-        event:'product_share_login',
-        param:{
-          id:that.data.info.id,
-          type:that.data.info.type
-        }
-      },1)
-      commonApi.user_post("user/getMyInfo", {}).then(res => {
+            if (options.skuid) {
+                let sku = res.data.sku.find(item => item.id == options.skuid);
+                res.data.sku = [sku];
+                this.setData({
+                    retailSkuId: options.skuid
+                })
+            }
+            res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
 
-      })
-      return;
-    }
-    if (!this.data.shareImg) {
-      wx.showToast({
-        title: '图片生成中，稍后再试',
-        icon: 'none'
-      })
-      return;
-    }
-    this.setData({
-      showShareFlag: !this.data.showShareFlag
-    })
-  },
-  // 保存
-  save() {
-    let url = this.data.shareImg, that = this;
-    wx.authorize({
-      /* 这个就是保存相册的 */
-      scope: 'scope.writePhotosAlbum',
-      success() {
-        wx.saveImageToPhotosAlbum({
-          filePath: url,
-          success(res) {
-            wx.showToast({
-              title: '保存成功',
-              icon: "success"
+            this.setData({
+                info: res.data
+            })
+            this.BroswerRecord()
+        })
+        commonApi._post("product/product_comment_list", {
+            product_id: options.id,
+            offset: 0,
+            limit: 3
+        }).then(res => {
+            res.data.list.map(item => {
+                item.rate = Number(item.rate)
+            })
+            this.setData({
+                commentTotal: res.data.total,
+                comment: res.data.list
+            })
+        })
+    },
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "goods",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/cardInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
+            }
+        }, 500)
+    },
+    changeMenu: function (e) {
+        let index = e.currentTarget.dataset.index,
+            that = this;
+        const query = wx.createSelectorQuery(); //创建节点查询器
+        query.select("#box" + index).boundingClientRect() //选择toViewid获取位置信息
+        query.selectViewport().scrollOffset() //获取页面查询位置的
+        query.exec(function (res) {
+            let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
+            wx.pageScrollTo({
+                scrollTop: scrollTop + 4,
+                duration: 0
             })
             that.setData({
-              showShareFlag: !that.data.showShareFlag
+                type: index
             })
+        })
+    },
+    onPageScroll: function (e) {
+        let that = this,
+            height = this.data.top;
+        let topHeight = height;
+        wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
+            console.log(rect.top, topHeight)
+            if (rect.top <= topHeight) {
+                // 此时应该把menus固定在顶部
+                that.setData({
+                    fixed: true
+                })
+            } else {
+                that.setData({
+                    fixed: false
+                })
+            }
+            // 滚动时判断滚动到哪个部分了
+            const query = wx.createSelectorQuery(); //创建节点查询器
+            query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box4").boundingClientRect() //选择toViewid获取位置信息
+            let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
+            query.exec(function (res) {
+                if (res[3].top < minHeight) {
+                    that.setData({
+                        type: 4
+                    })
+                } else if (res[2].top < minHeight) {
+                    that.setData({
+                        type: 3
+                    })
+                } else if (res[1].top < minHeight) {
+                    that.setData({
+                        type: 2
+                    })
+                } else {
+                    that.setData({
+                        type: 1
+                    })
+                }
+            })
+        }).exec()
+
+    },
+    order: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/roadInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                app.globalData.couponInfo = null;
+                app.globalData.product = {
+                    product: this.data.info
+                }
+                app.globalData.retailId = this.data.retailId;
+                util.pagePoint({
+                    event: 'product_order',
+                    param: {
+                        id: this.data.info.id,
+                        type: this.data.info.type
+                    }
+                }, 1)
+                wx.setStorageSync('login_from', 'product_order_login')
+                wx.setStorageSync('order_from', 'product_order_submit')
+                wx.navigateTo({
+                    url: '/pages/order/road/index?id=' + this.data.info.id + (this.data.retailSkuId ? ('&skuid=' + this.data.retailSkuId) : '')
+                })
+            }
+        })
+
+
+
+    },
+    pagePoint: function (e) {
+        util.pagePoint(e)
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
             util.pagePoint({
-              event:'product_share_save',
-              param:{
-                id:that.data.info.id,
-                type:that.data.info.type
-              }
-            },1)
-          },
-          fail(res) {
+                event: 'product_share_login',
+                param: {
+                    id: that.data.info.id,
+                    type: that.data.info.type
+                }
+            }, 1)
+            commonApi.user_post("user/getMyInfo", {}).then(res => {
+
+            })
+            return;
+        }
+        if (!this.data.shareImg) {
             wx.showToast({
-              title: '保存失败',
-              icon: 'none'
+                title: '图片生成中，稍后再试',
+                icon: 'none'
             })
-          }
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
         })
-      },
-      complete(res) {
-        console.log(res);
-        /* 这里判断一下如果没有授权重新打开设置选项 */
-        wx.getSetting({
-          success(res) {
-            if (!res.authSetting['scope.writePhotosAlbum']) {
-              /* 打开设置的方法 */
-              // opensit();
-              wx.showToast({
-                title: '请打开权限后再试',
-                icon: 'none'
-              })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !that.data.showShareFlag
+                        })
+                        util.pagePoint({
+                            event: 'product_share_save',
+                            param: {
+                                id: that.data.info.id,
+                                type: that.data.info.type
+                            }
+                        }, 1)
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                console.log(res);
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
             }
-          }
         });
-      }
-    });
 
-  },
-  // 绘制海报
-  drawImg: function () {
-    var that = this, userinfo = wx.getStorageSync('jstrip_userInfo');
-    if (!userinfo) {
-      // 去登录
-      return false;
-    }
-    const ctx = wx.createCanvasContext('imageCanvas');
-    // const device = wx.getSystemInfoSync();
-    // const ratio = device.screenWidth / 750;
-    // 先获取到图片信息
-    let promise2 = new Promise(function (resolve, reject) {
-      wx.getImageInfo({
-        src: that.data.info.headimg,
-        success: function (res) {
-          resolve(res);
-        },
-        fail: function (res) {
-          reject(res);
-        }
-      })
-    })
-    let promise3 = new Promise(function (resolve, reject) {
-      let userid = wx.getStorageSync('jstrip_userid')
-      new QRCode('myQrcode', {
-        text: 'https://m.cloud.sz-trip.com/LineDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
-        width: 500,
-        height: 500,
-        padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-        correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
-        callback: (res) => {
-          resolve(res);
+    },
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
         }
-      })
-    })
-    //成功得到图片信息后，开始绘图
-    Promise.all([promise2, promise3]).then(imgs => {
-      ctx.save();
-      ctx.beginPath(); //开始绘制
-      that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
-      ctx.clip();//画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
-      ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
-      ctx.restore();
-      ctx.save();
-      that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
-      ctx.restore();
-      // 绘制二维码
-      ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
-      // 开始文字绘制
-      ctx.setFillStyle("#000");
-      ctx.setFontSize(30 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
-      // 售价
-      ctx.setFillStyle("#D62828");
-      ctx.setFontSize(40 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let price = that.data.info.price ? ("￥" + (that.data.info.price / 100)) : '免费';
-      let width = ctx.measureText(price).width;
-      ctx.fillText(price, 25 * ratio, 620 * ratio);
-      // 副标题
-      ctx.setFillStyle("#999999");
-      ctx.setFontSize(28 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let subtitle = that.data.info.display_tags[0];
-      if (subtitle.length > 10) {
-        subtitle = subtitle.substr(0, 10) + '...'
-      }
-      ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
-      // ctx.draw();
-      // 划线价
-      // ctx.setFillStyle("#999999");
-      // ctx.setFontSize(32 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // let market_price = "￥" + (Number(that.data.info.market_price) / 100)
-      // ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
-      // let market_price_width = ctx.measureText(market_price).width;
-      // 划线
-      // ctx.beginPath()
-      // ctx.setLineWidth(1)
-      // ctx.moveTo(40 * ratio + width, 608 * ratio)
-      // ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
-      // ctx.stroke();
-      // 长按识别二维码
-      // ctx.setFillStyle("#666");
-      // ctx.setFontSize(22 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
-      // 长按图片转发或保存
-      // ctx.setFillStyle("#000");
-      // ctx.setFontSize(24 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
-      ctx.draw();
-      // 转为图片
-      setTimeout(() => {
-        wx.canvasToTempFilePath({
-          x: 0,
-          y: 0,
-          canvasId: 'imageCanvas',
-          success: function (res) {
-            that.setData({
-              shareImg: res.tempFilePath
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
+            })
+        })
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/LineDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
             })
-          },
-          fail(err) {
-            console.log('agdgjgdajhg', err)
-          }
         })
-      }, 500)
-      return false;
-    }).catch(err => {
-      console.log("this err", err)
-    })
-  },
-  // 圆角矩形
-  handleBorderRect(ctx, x, y, w, h, r, color) {
-    ctx.beginPath();
-    ctx.moveTo(x + w, y + h);
-    ctx.lineTo(x, y + h)
-    // 左上角
-    ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
-    ctx.moveTo(x + r, y);
-    ctx.lineTo(x + w - r, y);
-    ctx.lineTo(x + w, y + r);
-    // 右上角
-    ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
-    ctx.lineTo(x + w, y + h);
-    ctx.lineTo(x + w - r, y + h);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.closePath();
-  },
-  handleBorderRect2(ctx, x, y, w, h, r, color) {
-    ctx.beginPath();
-    ctx.moveTo(x, y);
-    ctx.lineTo(x + w, y)
-    // 右下角
-    ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
-    ctx.lineTo(x + r, y + h);
-    ctx.lineTo(x, y + h - r);
-    // 左下角
-    ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
-    ctx.lineTo(x, y);
-    ctx.lineTo(x, y);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.closePath();
-  },
-  // 绘制两行文字
-  drawText: function (ctx, str, x, y, canvasWidth, ratio) {
-    let row = [], temp = "", chr = str.split("");
-    for (var a = 0; a < chr.length; a++) {
-      if (ctx.measureText(temp).width < canvasWidth) {
-        temp += chr[a];
-      }
-      else {
-        a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = that.data.info.price ? ("￥" + (that.data.info.price / 100)) : '免费';
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.display_tags[0];
+            if (subtitle.length > 10) {
+                subtitle = subtitle.substr(0, 10) + '...'
+            }
+            ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            // ctx.draw();
+            // 划线价
+            // ctx.setFillStyle("#999999");
+            // ctx.setFontSize(32 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // let market_price = "￥" + (Number(that.data.info.market_price) / 100)
+            // ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
+            // let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            // ctx.beginPath()
+            // ctx.setLineWidth(1)
+            // ctx.moveTo(40 * ratio + width, 608 * ratio)
+            // ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
+            // ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
         row.push(temp);
-        temp = "";
-      }
-    }
-    row.push(temp);
 
-    //如果数组长度大于2 则截取前两个
-    if (row.length > 2) {
-      var rowCut = row.slice(0, 2);
-      var rowPart = rowCut[1];
-      var test = "";
-      var empty = [];
-      for (var a = 0; a < rowPart.length; a++) {
-        if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
-          test += rowPart[a];
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
         }
-        else {
-          break;
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
         }
-      }
-      empty.push(test);
-      var group = empty[0] + "..."//这里只显示两行，超出的用...表示
-      rowCut.splice(1, 1, group);
-      row = rowCut;
-    }
-    for (var b = 0; b < row.length; b++) {
-      ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
-    }
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    if (!wx.getStorageSync('jstrip_token')) {
-      return;
-    }
-    if (this.data.info && this.data.info.id) {
-      this.drawImg()
-    }
-    else {
-      setTimeout(() => {
-        this.onShow()
-      }, 200)
-    }
-  },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+        if (this.data.info && this.data.info.id) {
+            this.drawImg()
+        } else {
+            setTimeout(() => {
+                this.onShow()
+            }, 200)
+        }
+    },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
 
-  },
+    },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
 
-  },
+    },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
 
-  },
+    },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
 
-  }
+    }
 })
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.json b/pages/info/roadInfo/index.json
index 35cf02f..ab4ec76 100644
--- a/pages/info/roadInfo/index.json
+++ b/pages/info/roadInfo/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "code":"../../order/components/wxqrCode/index"
+
   }
 }
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index d4b563e..cb33ef6 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -118,4 +118,6 @@
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index ab71a71..15387b9 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -6,827 +6,861 @@ import util from "../../../utils/util"
 import QRCode from '../../../utils/weapp-qrcode.js'
 let app = getApp()
 Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    info: null,
-    bookingInfo: null,
-    bookingInfoTitle: "",
-    safeBottom: app.globalData.safeBottom,
-    isLike: 0,
-    comment: [],
-    commentTotal: 0,
-    isTest: true,
-    retailId: "",
-    shareImg: null,
-    showShareFlag: false,
-    showAllowance: false,
-    allowance_data: null,
-    //购物车数量
-    producNum: 1,
-    skuIndex: null,
-    aniSkuIndex: -1,
-    cartCount: 0,
-    cartImgInfo: null,
-    cartTop: 0,
-    top: 0,
-    skuList: [], //立即预定的列表
-    sku_ids: []
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        info: null,
+        bookingInfo: null,
+        bookingInfoTitle: "",
+        safeBottom: app.globalData.safeBottom,
+        isLike: 0,
+        comment: [],
+        commentTotal: 0,
+        isTest: true,
+        retailId: "",
+        shareImg: null,
+        showShareFlag: false,
+        showAllowance: false,
+        allowance_data: null,
+        //购物车数量
+        producNum: 1,
+        skuIndex: null,
+        aniSkuIndex: -1,
+        cartCount: 0,
+        cartImgInfo: null,
+        cartTop: 0,
+        top: 0,
+        skuList: [], //立即预定的列表
+        sku_ids: [],
+        showQrCode: false,
+        wxqrcode: null
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    console.log(options);
-    if (!options.id) {
-      util.back()
-      return;
-    }
-    if (options.retailId) {
-      this.setData({
-        retailId: options.retailId
-      })
-    }
-    this.setData({
-      id: options.id
-    })
-    commonApi._post("scene/detail", {
-      id: options.id
-    }).then(res => {
-      let flag = false
-      if (!res.data) {
-        wx.showToast({
-          title: '产品已下架',
-          icon: 'none'
-        })
-        setTimeout(() => {
-          util.back();
-        }, 1000)
-        return;
-      }
-      res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
-      // 如果是带有指定good_id的 那么取指定的
-      if (options.gid) {
-        let pItem = res.data.product.find(item => item.id == options.gid);
-        if (pItem) {
-          res.data.product = [pItem];
-        }
-      }
-      // 如果带有指定skuid的话 那么取指定的sku展示
-      if (options.skuid) {
-        let pItem = null;
-        for (let i = 0; i < res.data.product.length; i++) { //3
-          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
-            if (res.data.product[i].sku[j].id == options.skuid) {
-              res.data.product[i].sku = [res.data.product[i].sku[j]];
-              pItem = res.data.product[i];
-              break;
-            }
-          }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        console.log(options);
+        if (!options.id) {
+            util.back()
+            return;
         }
-        if (pItem) {
-          res.data.product = [pItem];
+        if (options.retailId) {
+            this.setData({
+                retailId: options.retailId
+            })
         }
-      } else if (options.zhuanti_type) {
-        flag = true
-        commonApi._post("theme/getYihuFreeList", {
-          zhuanti_type: options.zhuanti_type
-        }).then(res1 => {
-          let skuArr = res1.data.sku_ids
-          let newArr = []
-          for (let i = 0; i < res.data.product.length; i++) { //3
-            for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
-              for (let k = 0; k < skuArr.length; k++) {
-                if (res.data.product[i].sku[j].id == skuArr[k]) {
-                  newArr.push(res.data.product[i].sku[j])
-                }
-              }
+        this.setData({
+            id: options.id
+        })
+        commonApi._post("scene/detail", {
+            id: options.id
+        }).then(res => {
+            let flag = false
+            if (!res.data) {
+                wx.showToast({
+                    title: '产品已下架',
+                    icon: 'none'
+                })
+                setTimeout(() => {
+                    util.back();
+                }, 1000)
+                return;
             }
-            res.data.product[i].sku = newArr;
-          }
-          res.data.product.map(product => {
-            product.sku.map(sku => {
-              sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
-            })
-          })
-          this.setData({
-            info: res.data
-          })
-          var arr = []
-          res.data.product.forEach((item, index) => {
-            item.sku.forEach(itemB => {
-              itemB.proIndex = index
-              arr.push(itemB)
-            })
-          });
-          this.setData({
-            skuList: arr
-          })
-          util.pagePoint({
-            event: 'scene_view',
-            param: {
-              type: res.data.type,
-              id: res.data.id
+            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+            // 如果是带有指定good_id的 那么取指定的
+            if (options.gid) {
+                let pItem = res.data.product.find(item => item.id == options.gid);
+                if (pItem) {
+                    res.data.product = [pItem];
+                }
             }
-          }, 1)
-          this.BroswerRecord()
-        })
+            // 如果带有指定skuid的话 那么取指定的sku展示
+            if (options.skuid) {
+                let pItem = null;
+                for (let i = 0; i < res.data.product.length; i++) { //3
+                    for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+                        if (res.data.product[i].sku[j].id == options.skuid) {
+                            res.data.product[i].sku = [res.data.product[i].sku[j]];
+                            pItem = res.data.product[i];
+                            break;
+                        }
+                    }
+                }
+                if (pItem) {
+                    res.data.product = [pItem];
+                }
+            } else if (options.zhuanti_type) {
+                flag = true
+                commonApi._post("theme/getYihuFreeList", {
+                    zhuanti_type: options.zhuanti_type
+                }).then(res1 => {
+                    let skuArr = res1.data.sku_ids
+                    let newArr = []
+                    for (let i = 0; i < res.data.product.length; i++) { //3
+                        for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+                            for (let k = 0; k < skuArr.length; k++) {
+                                if (res.data.product[i].sku[j].id == skuArr[k]) {
+                                    newArr.push(res.data.product[i].sku[j])
+                                }
+                            }
+                        }
+                        res.data.product[i].sku = newArr;
+                    }
+                    res.data.product.map(product => {
+                        product.sku.map(sku => {
+                            sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+                        })
+                    })
+                    this.setData({
+                        info: res.data
+                    })
+                    var arr = []
+                    res.data.product.forEach((item, index) => {
+                        item.sku.forEach(itemB => {
+                            itemB.proIndex = index
+                            arr.push(itemB)
+                        })
+                    });
+                    this.setData({
+                        skuList: arr
+                    })
+                    util.pagePoint({
+                        event: 'scene_view',
+                        param: {
+                            type: res.data.type,
+                            id: res.data.id
+                        }
+                    }, 1)
+                    this.BroswerRecord()
+                })
 
-      }
-      console.log(res.data.product);
-        if (flag) {
-          return
-        }
+            }
+            console.log(res.data.product);
+            if (flag) {
+                return
+            }
 
 
-      // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
-      res.data.product.map(product => {
-        product.sku.map(sku => {
-          sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
-        })
-      })
-      this.setData({
-        info: res.data
-      })
-      var arr = []
-      res.data.product.forEach((item, index) => {
-        item.sku.forEach(itemB => {
-          itemB.proIndex = index
-          arr.push(itemB)
+            // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
+            res.data.product.map(product => {
+                product.sku.map(sku => {
+                    sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+                })
+            })
+            this.setData({
+                info: res.data
+            })
+            var arr = []
+            res.data.product.forEach((item, index) => {
+                item.sku.forEach(itemB => {
+                    itemB.proIndex = index
+                    arr.push(itemB)
+                })
+            });
+            this.setData({
+                skuList: arr
+            })
+            util.pagePoint({
+                event: 'scene_view',
+                param: {
+                    type: res.data.type,
+                    id: res.data.id
+                }
+            }, 1)
+            this.BroswerRecord()
         })
-      });
-      this.setData({
-        skuList: arr
-      })
-      util.pagePoint({
-        event: 'scene_view',
-        param: {
-          type: res.data.type,
-          id: res.data.id
+        // 获取收藏的状态
+        if (wx.getStorageSync("jstrip_token")) {
+            commonApi.user_post("scene/is_scene_collection", {
+                scene_id: options.id
+            }).then(res => {
+                this.setData({
+                    isLike: res.data
+                })
+            })
         }
-      }, 1)
-      this.BroswerRecord()
-    })
-    // 获取收藏的状态
-    if (wx.getStorageSync("jstrip_token")) {
-      commonApi.user_post("scene/is_scene_collection", {
-        scene_id: options.id
-      }).then(res => {
-        this.setData({
-          isLike: res.data
+        commonApi._post("ask/getQuestionList", {
+            scene_id: options.id,
+            page_no: 1,
+            page_num: 3
+        }).then(res => {
+            this.setData({
+                ask: res.data.rows
+            })
         })
-      })
-    }
-    commonApi._post("ask/getQuestionList", {
-      scene_id: options.id,
-      page_no: 1,
-      page_num: 3
-    }).then(res => {
-      this.setData({
-        ask: res.data.rows
-      })
-    })
-    // 获取评价列表
-    commonApi._post("scene/get_comment", {
-      scene_id: options.id
-    }).then(res => {
-      res.data.list.map(item => {
-        item.rate = Number(item.rate)
-      })
-      this.setData({
-        comment: res.data.list.splice(0, 2),
-        commentTotal: res.data.total
-      })
-      let arr = this.data.comment
-      arr.map((item) => {
-        if (item.img_list) {
-          let arr = item.img_list.split(',')
-          item.img_list = arr
+        // 获取评价列表
+        commonApi._post("scene/get_comment", {
+            scene_id: options.id
+        }).then(res => {
+            res.data.list.map(item => {
+                item.rate = Number(item.rate)
+            })
+            this.setData({
+                comment: res.data.list.splice(0, 2),
+                commentTotal: res.data.total
+            })
+            let arr = this.data.comment
+            arr.map((item) => {
+                if (item.img_list) {
+                    let arr = item.img_list.split(',')
+                    item.img_list = arr
 
-        } else {
-          item.img_list = []
-        }
-      })
-      this.setData({
-        comment: arr
-      })
-    })
-  },
-  changeAllowance: function () {
-    this.setData({
-      showAllowance: !this.data.showAllowance
-    })
-  },
-  BroswerRecord: function () {
-    setTimeout(() => {
-      if (app.globalData.uuid) {
-        commonApi._post('browse/browse_record', {
-          type: "scene",
-          title: this.data.info.title,
-          drive: "mini",
-          source_id: this.data.info.id,
-          url: "/pages/info/sceneProductInfo/index?id=" + this.data.info.id,
-          uuid: app.globalData.uuid
-        }).then(res => {})
-      } else {
-        this.BroswerRecord();
-      }
-    }, 500)
-  },
-  like: function () {
-    let id = this.data.id,
-      isLike = Number(this.data.isLike);
-    commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
-      scene_id: id
-    }).then(res => {
-      if (res.code == 1) {
-        wx.showToast({
-          title: '操作成功',
+                } else {
+                    item.img_list = []
+                }
+            })
+            this.setData({
+                comment: arr
+            })
         })
+    },
+    changeAllowance: function () {
         this.setData({
-          isLike: isLike == 1 ? 0 : 1
+            showAllowance: !this.data.showAllowance
         })
-      }
-    })
-  },
-  gotolocation: function () {
-    let info = this.data.info;
-    wx.openLocation({
-      latitude: Number(info.lat),
-      longitude: Number(info.lon)
-    })
-  },
-  audioGuide: function () {
-    wx.navigateToMiniProgram({
-      appId: 'wx74f380bc721a0379',
-      path: '/pages/listen/listen?title=君到苏州'
-    })
-  },
-  showBookingInfo: function (e) {
-    this.setData({
-      bookingInfo: e.currentTarget.dataset.item.sku_model,
-      bookingInfoTitle: e.currentTarget.dataset.item.sku_name
-    })
-    util.pagePoint({
-      event: "scene_notice",
-      param: {
-        type: this.data.info.type,
-        id: this.data.info.id
-      }
-    }, 1)
-  },
-  closeMask: function () {
-    this.setData({
-      bookingInfo: null
-    })
-  },
-  // order: function(e){
-  //  console.log(e)
-  //  	if (e.currentTarget.dataset.disable == 1) return;
-  //  	util.pagePoint({
-  //  	  event: 'scene_order',
-  //  	  param: {
-  //  	    type: this.data.info.type,
-  //  	    id: this.data.info.id
-  //  	  }
-  //  	}, 1)
-  //  	wx.setStorageSync('login_from', 'scene_order_login')
-  //  	wx.setStorageSync('order_from', 'scene_order_submit')
-  //  	app.globalData.couponInfo = null;
-  //  	app.globalData.retailId = this.data.retailId;
-  //  	// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-  //  	app.globalData.product = e.currentTarget.dataset;
-  //  	wx.navigateTo({
-  //  	  url: '/pages/order/scene/index',
-  //  	})
-  // },
-  selectSku: function (e) {
-    console.log(e.currentTarget.dataset.item);
-    if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock != 1) {
-      wx.showToast({
-        title: "该商品暂无库存",
-        icon: 'none'
-      })
-      return
-    }
-    let index = e.currentTarget.dataset.index;
-    this.setData({
-      skuIndex: index
-    })
-  },
-  order: function (e) {
-    commonApi.user_post("/product/checkStock", {
-      sku_id: this.data.skuList[this.data.skuIndex].id,
-    }).then(res => {
-      if (res && res.code != 1) {
-        wx.showModal({
-          title: "温馨提示",
-          content: '商品已经被抢光啦~要不要瞧瞧别的~',
-          showCancel: false
-        })
-        return;
-      } else {
-        app.globalData.postProduct = []
-        app.globalData.list = []
-        if (this.data.skuFlag == 'order') {
-          if (e.currentTarget.dataset.disable === 1) return;
-          util.pagePoint({
-            event: 'scene_order',
-            param: {
-              type: this.data.info.type,
-              id: this.data.info.id
-            }
-          }, 1)
-          wx.setStorageSync('login_from', 'scene_order_login')
-          wx.setStorageSync('order_from', 'scene_order_submit')
-          app.globalData.couponInfo = null;
-          app.globalData.retailId = this.data.retailId;
-          // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-          // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
-          let sku = {
-              sku: this.data.skuList[this.data.skuIndex]
-            },
-            product = {
-              product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
+    },
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "scene",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/sceneProductInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
             }
-          app.globalData.product = {
-            ...sku,
-            ...product
-          }
-          app.globalData.index = 0
-          wx.navigateTo({
-            url: '/pages/order/scene/index',
-          })
-        } else {
-          commonApi.user_post("cart/add_sku", {
-            sku_id: this.data.skuList[this.data.skuIndex].id,
-            num: this.data.producNum
-          }).then(res => {
+        }, 500)
+    },
+    like: function () {
+        let id = this.data.id,
+            isLike = Number(this.data.isLike);
+        commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
+            scene_id: id
+        }).then(res => {
             if (res.code == 1) {
-              commonApi.user_post('cart/get_list', {}).then(res => {
-                this.setData({
-                  cartCount: res.data.length //5
+                wx.showToast({
+                    title: '操作成功',
                 })
-              })
-              // 加动效
-              this.setData({
-                skuFlag: null,
-                aniSkuIndex: this.data.skuIndex,
-                cartImgInfo: null
-              })
-              setTimeout(() => {
                 this.setData({
-                  aniSkuIndex: -1
+                    isLike: isLike == 1 ? 0 : 1
                 })
+            }
+        })
+    },
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+            latitude: Number(info.lat),
+            longitude: Number(info.lon)
+        })
+    },
+    audioGuide: function () {
+        wx.navigateToMiniProgram({
+            appId: 'wx74f380bc721a0379',
+            path: '/pages/listen/listen?title=君到苏州'
+        })
+    },
+    showBookingInfo: function (e) {
+        this.setData({
+            bookingInfo: e.currentTarget.dataset.item.sku_model,
+            bookingInfoTitle: e.currentTarget.dataset.item.sku_name
+        })
+        util.pagePoint({
+            event: "scene_notice",
+            param: {
+                type: this.data.info.type,
+                id: this.data.info.id
+            }
+        }, 1)
+    },
+    closeMask: function () {
+        this.setData({
+            bookingInfo: null
+        })
+    },
+    // order: function(e){
+    //  console.log(e)
+    //  	if (e.currentTarget.dataset.disable == 1) return;
+    //  	util.pagePoint({
+    //  	  event: 'scene_order',
+    //  	  param: {
+    //  	    type: this.data.info.type,
+    //  	    id: this.data.info.id
+    //  	  }
+    //  	}, 1)
+    //  	wx.setStorageSync('login_from', 'scene_order_login')
+    //  	wx.setStorageSync('order_from', 'scene_order_submit')
+    //  	app.globalData.couponInfo = null;
+    //  	app.globalData.retailId = this.data.retailId;
+    //  	// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+    //  	app.globalData.product = e.currentTarget.dataset;
+    //  	wx.navigateTo({
+    //  	  url: '/pages/order/scene/index',
+    //  	})
+    // },
+    selectSku: function (e) {
+        console.log(e.currentTarget.dataset.item);
+        if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock != 1) {
+            wx.showToast({
+                title: "该商品暂无库存",
+                icon: 'none'
+            })
+            return
+        }
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            skuIndex: index
+        })
+    },
+    order: function (e) {
+        commonApi.user_post("/product/checkStock", {
+            sku_id: this.data.skuList[this.data.skuIndex].id,
+        }).then(res => {
+            if (res && res.code != 1) {
                 wx.showModal({
-                  title: "提示",
-                  content: "去购物车结算？",
-                  success: function (res) {
-                    if (res.confirm) {
-                      wx.navigateTo({
-                        url: '/pages/user/cartlist/list',
-                      })
-                    }
-                  }
+                    title: "温馨提示",
+                    content: '商品已经被抢光啦~要不要瞧瞧别的~',
+                    showCancel: false
                 })
-              }, 650)
+                return;
+            } else {
+                app.globalData.postProduct = []
+                app.globalData.list = []
+                if (this.data.skuFlag == 'order') {
+                    if (e.currentTarget.dataset.disable === 1) return;
+                    util.pagePoint({
+                        event: 'scene_order',
+                        param: {
+                            type: this.data.info.type,
+                            id: this.data.info.id
+                        }
+                    }, 1)
+                    wx.setStorageSync('login_from', 'scene_order_login')
+                    wx.setStorageSync('order_from', 'scene_order_submit')
+                    app.globalData.couponInfo = null;
+                    app.globalData.retailId = this.data.retailId;
+                    // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+                    // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+                    let sku = {
+                            sku: this.data.skuList[this.data.skuIndex]
+                        },
+                        product = {
+                            product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
+                        }
+                    app.globalData.product = {
+                        ...sku,
+                        ...product
+                    }
+                    app.globalData.index = 0
+                    wx.navigateTo({
+                        url: '/pages/order/scene/index',
+                    })
+                } else {
+                    commonApi.user_post("cart/add_sku", {
+                        sku_id: this.data.skuList[this.data.skuIndex].id,
+                        num: this.data.producNum
+                    }).then(res => {
+                        if (res.code == 1) {
+                            commonApi.user_post('cart/get_list', {}).then(res => {
+                                this.setData({
+                                    cartCount: res.data.length //5
+                                })
+                            })
+                            // 加动效
+                            this.setData({
+                                skuFlag: null,
+                                aniSkuIndex: this.data.skuIndex,
+                                cartImgInfo: null
+                            })
+                            setTimeout(() => {
+                                this.setData({
+                                    aniSkuIndex: -1
+                                })
+                                wx.showModal({
+                                    title: "提示",
+                                    content: "去购物车结算？",
+                                    success: function (res) {
+                                        if (res.confirm) {
+                                            wx.navigateTo({
+                                                url: '/pages/user/cartlist/list',
+                                            })
+                                        }
+                                    }
+                                })
+                            }, 650)
+                        }
+                    })
+                }
+            }
+        })
+    },
+    pagePoint: function (e) {
+        util.pagePoint({
+            event: e.currentTarget.dataset.event,
+            param: {
+                type: this.data.info.type,
+                id: this.data.info.id
             }
-          })
+        }, 1)
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
+            wx.setStorageSync('login_from', 'scene_share_login')
+            commonApi.user_post("user/getMyInfo", {}).then(res => {}).catch(err => {})
+            return;
         }
-      }
-    })
-  },
-  pagePoint: function (e) {
-    util.pagePoint({
-      event: e.currentTarget.dataset.event,
-      param: {
-        type: this.data.info.type,
-        id: this.data.info.id
-      }
-    }, 1)
-  },
-  // 分享
-  share: function () {
-    if (!wx.getStorageSync("jstrip_token")) {
-      wx.setStorageSync('login_from', 'scene_share_login')
-      commonApi.user_post("user/getMyInfo", {}).then(res => {}).catch(err => {})
-      return;
-    }
-    if (!this.data.shareImg) {
-      wx.showToast({
-        title: '图片生成中，稍后再试',
-        icon: 'none'
-      })
-      return;
-    }
-    this.setData({
-      showShareFlag: !this.data.showShareFlag
-    })
-  },
-  // 保存
-  save() {
-    let url = this.data.shareImg,
-      that = this;
-    wx.authorize({
-      /* 这个就是保存相册的 */
-      scope: 'scope.writePhotosAlbum',
-      success() {
-        wx.saveImageToPhotosAlbum({
-          filePath: url,
-          success(res) {
-            wx.showToast({
-              title: '保存成功',
-              icon: "success"
-            })
-            that.setData({
-              showShareFlag: !that.data.showShareFlag
-            })
-            util.pagePoint({
-              event: 'scene_share_save',
-              param: {
-                type: that.data.info.type,
-                id: that.data.info.id
-              }
-            }, 1)
-          },
-          fail(res) {
+        if (!this.data.shareImg) {
             wx.showToast({
-              title: '保存失败',
-              icon: 'none'
+                title: '图片生成中，稍后再试',
+                icon: 'none'
             })
-          }
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
         })
-      },
-      complete(res) {
-        /* 这里判断一下如果没有授权重新打开设置选项 */
-        wx.getSetting({
-          success(res) {
-            if (!res.authSetting['scope.writePhotosAlbum']) {
-              /* 打开设置的方法 */
-              // opensit();
-              wx.showToast({
-                title: '请打开权限后再试',
-                icon: 'none'
-              })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !that.data.showShareFlag
+                        })
+                        util.pagePoint({
+                            event: 'scene_share_save',
+                            param: {
+                                type: that.data.info.type,
+                                id: that.data.info.id
+                            }
+                        }, 1)
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
             }
-          }
         });
-      }
-    });
 
-  },
-  // 绘制海报
-  drawImg: function () {
-    var that = this,
-      userinfo = wx.getStorageSync('jstrip_userInfo');
-    if (!userinfo) {
-      // 去登录
-      return false;
-    }
-    const ctx = wx.createCanvasContext('imageCanvas');
-    // const device = wx.getSystemInfoSync();
-    // const ratio = device.screenWidth / 750;
-    // 先获取到图片信息
-    let promise2 = new Promise(function (resolve, reject) {
-      wx.getImageInfo({
-        src: that.data.info.headimg,
-        success: function (res) {
-          resolve(res);
-        },
-        fail: function (res) {
-          reject(res);
+    },
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
         }
-      })
-    })
-    let promise3 = new Promise(function (resolve, reject) {
-      let userid = wx.getStorageSync('jstrip_userid')
-      new QRCode('myQrcode', {
-        text: 'https://m.cloud.sz-trip.com/ScenicDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
-        width: 500,
-        height: 500,
-        padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-        correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
-        callback: (res) => {
-          resolve(res);
-        }
-      })
-    })
-    //成功得到图片信息后，开始绘图
-    Promise.all([promise2, promise3]).then(imgs => {
-      ctx.save();
-      ctx.beginPath(); //开始绘制
-      that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
-      ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
-      ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
-      ctx.restore();
-      ctx.save();
-      that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
-      ctx.restore();
-      // 绘制二维码
-      ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
-      // 开始文字绘制
-      ctx.setFillStyle("#000");
-      ctx.setFontSize(30 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
-      // 售价
-      ctx.setFillStyle("#D62828");
-      ctx.setFontSize(40 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let price = "￥" + (that.data.info.price / 100);
-      let width = ctx.measureText(price).width;
-      ctx.fillText(price, 25 * ratio, 620 * ratio);
-      // 副标题
-      ctx.setFillStyle("#999999");
-      ctx.setFontSize(28 * ratio); //字大小
-      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      let subtitle = that.data.info.sub_title
-      if (subtitle && subtitle.length > 10) {
-        subtitle = subtitle.substr(0, 10) + '...'
-      }
-      if (subtitle) {
-        ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
-      }
-
-      // ctx.draw();
-      // 划线价
-      // ctx.setFillStyle("#999999");
-      // ctx.setFontSize(32 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // let market_price = "￥"+(Number(that.data.info.market_price)/100)
-      // ctx.fillText(market_price, 40*ratio + width, 620*ratio);
-      // let market_price_width = ctx.measureText(market_price).width;
-      // 划线
-      // ctx.beginPath()
-      // ctx.setLineWidth(1)
-      // ctx.moveTo(40*ratio + width, 608*ratio)
-      // ctx.lineTo(45*ratio + width, 608*ratio)
-      // ctx.stroke();
-      // 长按识别二维码
-      // ctx.setFillStyle("#666");
-      // ctx.setFontSize(22 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
-      // 长按图片转发或保存
-      // ctx.setFillStyle("#000");
-      // ctx.setFontSize(24 * ratio); //字大小
-      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-      // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
-      ctx.draw();
-      // 转为图片
-      setTimeout(() => {
-        wx.canvasToTempFilePath({
-          x: 0,
-          y: 0,
-          canvasId: 'imageCanvas',
-          success: function (res) {
-            that.setData({
-              shareImg: res.tempFilePath
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
             })
-          },
-          fail(err) {
-            console.log('agdgjgdajhg', err)
-          }
         })
-      }, 500)
-      return false;
-    }).catch(err => {
-      console.log("this err", err)
-    })
-  },
-  // 圆角矩形
-  handleBorderRect(ctx, x, y, w, h, r, color) {
-    ctx.beginPath();
-    ctx.moveTo(x + w, y + h);
-    ctx.lineTo(x, y + h)
-    // 左上角
-    ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
-    ctx.moveTo(x + r, y);
-    ctx.lineTo(x + w - r, y);
-    ctx.lineTo(x + w, y + r);
-    // 右上角
-    ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
-    ctx.lineTo(x + w, y + h);
-    ctx.lineTo(x + w - r, y + h);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.closePath();
-  },
-  handleBorderRect2(ctx, x, y, w, h, r, color) {
-    ctx.beginPath();
-    ctx.moveTo(x, y);
-    ctx.lineTo(x + w, y)
-    // 右下角
-    ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
-    ctx.lineTo(x + r, y + h);
-    ctx.lineTo(x, y + h - r);
-    // 左下角
-    ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
-    ctx.lineTo(x, y);
-    ctx.lineTo(x, y);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.closePath();
-  },
-  // 绘制两行文字
-  drawText: function (ctx, str, x, y, canvasWidth, ratio) {
-    let row = [],
-      temp = "",
-      chr = str.split("");
-    for (var a = 0; a < chr.length; a++) {
-      if (ctx.measureText(temp).width < canvasWidth) {
-        temp += chr[a];
-      } else {
-        a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/ScenicDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
+            })
+        })
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = "￥" + (that.data.info.price / 100);
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.sub_title
+            if (subtitle && subtitle.length > 10) {
+                subtitle = subtitle.substr(0, 10) + '...'
+            }
+            if (subtitle) {
+                ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            }
+
+            // ctx.draw();
+            // 划线价
+            // ctx.setFillStyle("#999999");
+            // ctx.setFontSize(32 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // let market_price = "￥"+(Number(that.data.info.market_price)/100)
+            // ctx.fillText(market_price, 40*ratio + width, 620*ratio);
+            // let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            // ctx.beginPath()
+            // ctx.setLineWidth(1)
+            // ctx.moveTo(40*ratio + width, 608*ratio)
+            // ctx.lineTo(45*ratio + width, 608*ratio)
+            // ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
         row.push(temp);
-        temp = "";
-      }
-    }
-    row.push(temp);
 
-    //如果数组长度大于2 则截取前两个
-    if (row.length > 2) {
-      var rowCut = row.slice(0, 2);
-      var rowPart = rowCut[1];
-      var test = "";
-      var empty = [];
-      for (var a = 0; a < rowPart.length; a++) {
-        if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
-          test += rowPart[a];
-        } else {
-          break;
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
         }
-      }
-      empty.push(test);
-      var group = empty[0] + "..." //这里只显示两行，超出的用...表示
-      rowCut.splice(1, 1, group);
-      row = rowCut;
-    }
-    for (var b = 0; b < row.length; b++) {
-      ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
-    }
-  },
-  //加入购物车
-  showCart: function () {
-    if (this.data.info.product[0].sku.length == 0) {
-      wx.showToast({
-        title: '该产品未设置规格，不能加购',
-        icon: 'none'
-      })
-      return;
-    }
-    this.setData({
-      skuFlag: "cart"
-    })
-    let that = this
-    wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
-      that.setData({
-        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
-      })
-    }).exec()
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+        }
+    },
+    //加入购物车
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.product[0].sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: "cart"
+                })
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+
+
+
+
+    },
+    hideSku: function () {
+        this.setData({
+            skuFlag: null,
+            cartImgInfo: null
+        })
+    },
+    //加减数量
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+    //立即预定
+    showOrder: function () {
+        console.log(this.data.id);
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.product[0].sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能购买',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                if (this.data.info.product[0].type == 'line') {
+                    wx.navigateTo({
+                        url: '/pages/order/road/index?id=' + this.data.info.product[0].id
+                    })
+                    return
+                }
+                this.setData({
+                    skuFlag: 'order'
+                })
+            }
+        })
 
-  },
-  hideSku: function () {
-    this.setData({
-      skuFlag: null,
-      cartImgInfo: null
-    })
-  },
-  //加减数量
-  minus: function () {
-    if (this.data.producNum == 1) return;
-    this.setData({
-      producNum: this.data.producNum - 1
-    })
-  },
-  add: function () {
-    this.setData({
-      producNum: this.data.producNum + 1
-    })
-  },
-  //立即预定
-  showOrder: function () {
-    if (this.data.info.product[0].sku.length == 0) {
-      wx.showToast({
-        title: '该产品未设置规格，不能购买',
-        icon: 'none'
-      })
-      return;
-    }
-    if (this.data.info.product[0].type == 'line') {
-      wx.navigateTo({
-        url: '/pages/order/road/index?id=' + this.data.info.product[0].id
-      })
-      return
-    }
-    this.setData({
-      skuFlag: 'order'
-    })
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-    if (app.globalData.configJson) {
-      this.setData({
-        isTest: app.globalData.configJson.isTest
-      })
-    } else {
-      setTimeout(() => {
-        this.onReady()
-      }, 300)
-    }
-  },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+        if (app.globalData.configJson) {
+            this.setData({
+                isTest: app.globalData.configJson.isTest
+            })
+        } else {
+            setTimeout(() => {
+                this.onReady()
+            }, 300)
+        }
+    },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    console.log(11111);
-    commonApi.user_post('cart/get_list', {}).then(res => {
-      this.setData({
-        cartCount: res.data.length //1
-      })
-    })
-    if (!wx.getStorageSync('jstrip_token')) {
-      return;
-    }
-    if (this.data.info && this.data.info.id) {
-      this.drawImg()
-      //// 获取补贴
-      // if (this.data.product.length == 1) {
-      //   commonApi.user_post("product/getProductAllowancePrice", {
-      //     product_code: this.data.product[0].product.product_code
-      //   }).then(resTwo => {
-      //     if (resTwo && resTwo.code == 1) {
-      //       this.setData({
-      //         allowance_data: resTwo.data
-      //       })
-      //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
-      //       let sInfo = this.data.product[0].sku
-      //       if (spread_price > 0) {
-      //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
-      //           this.setData({
-      //             allowance_price: spread_price
-      //           })
-      //         } else {
-      //           this.setData({
-      //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
-      //           })
-      //         }
-      //         this.changePrice()
-      //       } else {
-      //         this.setData({
-      //           allowance_price: 0
-      //         })
-      //       }
-      //     }
-      //   })
-      // }
-      //// 获取补贴结束
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        console.log(11111);
+        commonApi.user_post('cart/get_list', {}).then(res => {
+            this.setData({
+                cartCount: res.data.length //1
+            })
+        })
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+        if (this.data.info && this.data.info.id) {
+            this.drawImg()
+            //// 获取补贴
+            // if (this.data.product.length == 1) {
+            //   commonApi.user_post("product/getProductAllowancePrice", {
+            //     product_code: this.data.product[0].product.product_code
+            //   }).then(resTwo => {
+            //     if (resTwo && resTwo.code == 1) {
+            //       this.setData({
+            //         allowance_data: resTwo.data
+            //       })
+            //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+            //       let sInfo = this.data.product[0].sku
+            //       if (spread_price > 0) {
+            //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+            //           this.setData({
+            //             allowance_price: spread_price
+            //           })
+            //         } else {
+            //           this.setData({
+            //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+            //           })
+            //         }
+            //         this.changePrice()
+            //       } else {
+            //         this.setData({
+            //           allowance_price: 0
+            //         })
+            //       }
+            //     }
+            //   })
+            // }
+            //// 获取补贴结束
 
-    } else {
-      console.log(2222);
-      setTimeout(() => {
-        // this.onShow()
-      }, 200)
-    }
+        } else {
+            console.log(2222);
+            setTimeout(() => {
+                // this.onShow()
+            }, 200)
+        }
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
 
-  },
+    },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
 
-  },
+    },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
 
-  },
+    },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {}
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {}
 })
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.json b/pages/info/sceneProductInfo/index.json
index b5d8d8b..58e1fcb 100644
--- a/pages/info/sceneProductInfo/index.json
+++ b/pages/info/sceneProductInfo/index.json
@@ -1,6 +1,9 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "notice":"/pages/component/notice/notice"
+		"notice":"/pages/component/notice/notice",
+    "code":"../../order/components/wxqrCode/index"
+
+		
   }
 }
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 923f0f1..04562e2 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -251,4 +251,6 @@
     <view class="rule-title">{{info.allowance.title}}</view>
     <rich-text nodes="{{info.allowance.content}}"></rich-text>
   </view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js
index 79931ff..8dacd88 100644
--- a/pages/list/movieticket/list/ticket/index.js
+++ b/pages/list/movieticket/list/ticket/index.js
@@ -4,252 +4,269 @@ import commonApi from "../../../../../utils/https/common"
 import util from "../../../../../utils/util"
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    id:null,
-    dates:[],
-    days:['周日','周一','周二','周三','周四','周五','周六'],
-    dateIndex:0,
-    areas:[],
-    areaIndex:0,
-    lat:"",
-    lon:"",
-    sort:'distance',
-    list:[],
-    title:"",
-    page:1,
-    isMore:true
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        id: null,
+        dates: [],
+        days: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+        dateIndex: 0,
+        areas: [],
+        areaIndex: 0,
+        lat: "",
+        lon: "",
+        sort: 'distance',
+        list: [],
+        title: "",
+        page: 1,
+        isMore: true,
+        showQrCode: false,
+        wxqrcode: null
+    },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  pagePoint(e) {
-    util.pagePoint(e)
-  },
-  onLoad: function (options) {
-    this.setData({
-      id:options.id,
-      title:options.title
-    })
-    commonApi._post("act/get_suzhou_areas").then(res=>{
-      res.data.unshift({
-        area_id:"",
-        area_title:"苏州"
-      })
-      this.setData({
-        areas:res.data
-      })
-    })
-    this.initDate();
-    wx.getLocation({
-      type: 'gcj02',
-      success:(res)=>{
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    pagePoint(e) {
+        util.pagePoint(e)
+    },
+    onLoad: function (options) {
         this.setData({
-          lat:res.latitude,
-          lon:res.longitude
+            id: options.id,
+            title: options.title
+        })
+        commonApi._post("act/get_suzhou_areas").then(res => {
+            res.data.unshift({
+                area_id: "",
+                area_title: "苏州"
+            })
+            this.setData({
+                areas: res.data
+            })
+        })
+        this.initDate();
+        wx.getLocation({
+            type: 'gcj02',
+            success: (res) => {
+                this.setData({
+                    lat: res.latitude,
+                    lon: res.longitude
+                })
+                this.getList()
+            },
+            fail: () => {
+                this.getList()
+            }
+        })
+    },
+    changeSort: function (e) {
+        let sort = e.currentTarget.dataset.sort;
+        this.setData({
+            sort: this.data.sort == sort ? null : sort,
+            list: [],
+            page: 1,
+            isMore: true
+        })
+        if (this.data.sort == 'distance' && !this.data.lon) {
+            wx.getLocation({
+                type: 'gcj02',
+                success: (res) => {
+                    this.setData({
+                        lat: res.latitude,
+                        lon: res.longitude
+                    })
+                    this.getList()
+                },
+                fail: () => {
+                    this.getList()
+                }
+            })
+        } else {
+            this.getList()
+        }
+
+    },
+    changeDateIndex: function (e) {
+        this.setData({
+            dateIndex: e.currentTarget.dataset.index,
+            list: [],
+            page: 1,
+            isMore: true
         })
         this.getList()
-      },
-      fail:()=>{
+    },
+    changeArea: function (e) {
+        this.setData({
+            areaIndex: e.detail.value,
+            list: [],
+            page: 1,
+            isMore: true
+        })
         this.getList()
-      }
-    })
-  },
-  changeSort:function(e){
-    let sort = e.currentTarget.dataset.sort;
-    this.setData({
-      sort:this.data.sort==sort?null:sort,
-      list:[],
-      page:1,
-      isMore:true
-    })
-    if(this.data.sort=='distance' && !this.data.lon){
-      wx.getLocation({
-        type: 'gcj02',
-        success:(res)=>{
-          this.setData({
-            lat:res.latitude,
-            lon:res.longitude
-          })
-          this.getList()
-        },
-        fail:()=>{
-          this.getList()
+    },
+    initDate: function () {
+        let today = new Date(util.formatDate(new Date()).replace(/-/g, '/')).getTime(),
+            single = 24 * 60 * 60 * 1000,
+            dates = [];
+        for (let i = 0; i < 7; i++) {
+            let item = new Date(today + i * single);
+            let name = this.data.days[item.getDay()]
+            if (i == 0) {
+                name = "今天"
+            } else if (i == 1) {
+                name = "明天"
+            }
+            dates.push({
+                date: util.formatDate(item),
+                dateShort: util.formatDate(item).substr(5, 5),
+                name: name
+            })
         }
-      })
-    }
-    else {
-      this.getList()
-    }
-    
-  },
-  changeDateIndex:function(e){
-    this.setData({
-      dateIndex:e.currentTarget.dataset.index,
-      list:[],
-      page:1,
-      isMore:true
-    })
-    this.getList()
-  },
-  changeArea:function(e){
-    this.setData({
-      areaIndex:e.detail.value,
-      list:[],
-      page:1,
-      isMore:true
-    })
-    this.getList()
-  },
-  initDate:function(){
-    let today = new Date(util.formatDate(new Date()).replace(/-/g,'/')).getTime(),single = 24 * 60 * 60 *1000,dates=[];
-    for(let i=0;i<7;i++){
-      let item = new Date(today+i * single);
-      let name = this.data.days[item.getDay()]
-      if(i==0){
-        name="今天"
-      }
-      else if(i==1){
-        name="明天"
-      }
-      dates.push({
-        date:util.formatDate(item),
-        dateShort:util.formatDate(item).substr(5,5),
-        name:name
-      })
-    }
-    this.setData({
-      dates:dates
-    })
-    console.log(dates)
-  },
-  getList:function(){
-    if(!this.data.isMore) return
-    commonApi._post("Cinema/getCinemaListByShowId",{
-      third_id:this.data.id,
-      show_date:this.data.dates[this.data.dateIndex].date,
-      city_code:this.data.areas[this.data.areaIndex]?this.data.areas[this.data.areaIndex].area_id:"",
-      lon:this.data.lon,
-      lat:this.data.lat,
-      is_price_sort:this.data.sort=='price'?true:false,
-      is_distance_sort:this.data.sort=='distance',
-      page:this.data.page,
-      pageSize:10
-    }).then(res=>{
-      res.data.map(item=>{
-        if(item.distance>1000){
-          item.distanceText = (item.distance/1000).toFixed(2) + 'km';
-        }
-        else if(item.distance>0){
-          item.distanceText = (item.distance).toFixed(2) + 'm';
-        }
-      })
-      let list = this.data.list;
-      this.setData({
-        list:list.concat(res.data),
-        page:this.data.page+1
-      })
-      if(res.data.length<10){
         this.setData({
-          isMore:false
+            dates: dates
         })
-      }
-      console.log(res)
-    })
-  },
-  selectMovieSeat(e){
-		let info = e.currentTarget.dataset.info
-		let index = e.currentTarget.dataset.index
-		console.log(index);
-		console.log(info.schedules);
-    const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
-    let planData = {
-      areaInfo,
-      fee:info.schedules[index].service_fee,
-      movieName: this.data.title,
-      planId : info.schedules[index].schedule_id,
-      planTime : info.schedules[index].show_time,
-      type:'WECHATXCX',
-      remake : ''
-    }
-    let show_id = info.schedules[index].show_id
-    let cinema_id = info.schedules[index].cinema_id
-		// let schedule_id = info.schedule_id
-		console.log(info);
-    commonApi._post('Cinema/getProductAndSku',{
-      show_id,
-      cinema_id,
-    }).then(res=>{
-      app.globalData.product ={ 
-        product:res.data,
-        info:{
-					hallName:info.schedules[index].hall_name,
-					cinemaName:info.title,
-          show_date:info.schedules[index].show_date,
-					show_time:info.schedules[index].show_time,
-					close_time:info.schedules[index].close_time,
-					movieName:this.data.title,
-					start_end_time:info.schedules[index].show_time,
-          show_version:info.schedules[index].show_version,
-          selectSeatInfo:null,
-          schedule_id:info.schedules[index].schedule_id
-        }
-			}
-			console.log(planData);
-      wx.navigateTo({
-        url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
-      })
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+        console.log(dates)
+    },
+    getList: function () {
+        if (!this.data.isMore) return
+        commonApi._post("Cinema/getCinemaListByShowId", {
+            third_id: this.data.id,
+            show_date: this.data.dates[this.data.dateIndex].date,
+            city_code: this.data.areas[this.data.areaIndex] ? this.data.areas[this.data.areaIndex].area_id : "",
+            lon: this.data.lon,
+            lat: this.data.lat,
+            is_price_sort: this.data.sort == 'price' ? true : false,
+            is_distance_sort: this.data.sort == 'distance',
+            page: this.data.page,
+            pageSize: 10
+        }).then(res => {
+            res.data.map(item => {
+                if (item.distance > 1000) {
+                    item.distanceText = (item.distance / 1000).toFixed(2) + 'km';
+                } else if (item.distance > 0) {
+                    item.distanceText = (item.distance).toFixed(2) + 'm';
+                }
+            })
+            let list = this.data.list;
+            this.setData({
+                list: list.concat(res.data),
+                page: this.data.page + 1
+            })
+            if (res.data.length < 10) {
+                this.setData({
+                    isMore: false
+                })
+            }
+            console.log(res)
+        })
+    },
+    selectMovieSeat(e) {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/list/movieticket/list/ticket/index?id=' + this.data.id,
+            title: this.data.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                let info = e.currentTarget.dataset.info
+                let index = e.currentTarget.dataset.index
+                console.log(index);
+                console.log(info.schedules);
+                const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({
+                    ...item,
+                    price: item.areaPrice,
+                    areaId: item.seatAreaId
+                }));
+                let planData = {
+                    areaInfo,
+                    fee: info.schedules[index].service_fee,
+                    movieName: this.data.title,
+                    planId: info.schedules[index].schedule_id,
+                    planTime: info.schedules[index].show_time,
+                    type: 'WECHATXCX',
+                    remake: ''
+                }
+                let show_id = info.schedules[index].show_id
+                let cinema_id = info.schedules[index].cinema_id
+                // let schedule_id = info.schedule_id
+                console.log(info);
+                commonApi._post('Cinema/getProductAndSku', {
+                    show_id,
+                    cinema_id,
+                }).then(res => {
+                    app.globalData.product = {
+                        product: res.data,
+                        info: {
+                            hallName: info.schedules[index].hall_name,
+                            cinemaName: info.title,
+                            show_date: info.schedules[index].show_date,
+                            show_time: info.schedules[index].show_time,
+                            close_time: info.schedules[index].close_time,
+                            movieName: this.data.title,
+                            start_end_time: info.schedules[index].show_time,
+                            show_version: info.schedules[index].show_version,
+                            selectSeatInfo: null,
+                            schedule_id: info.schedules[index].schedule_id
+                        }
+                    }
+                    console.log(planData);
+                    wx.navigateTo({
+                        url: "/pages/list/movieticket/list/web/index?planData=" + JSON.stringify(planData),
+                    })
+                })
+            }})
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
 
-  },
+    },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
 
-  },
+    },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.getList()
-  },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+        this.getList()
+    },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
 
-  }
+    }
 })
\ No newline at end of file
diff --git a/pages/list/movieticket/list/ticket/index.json b/pages/list/movieticket/list/ticket/index.json
index 35cf02f..321981d 100644
--- a/pages/list/movieticket/list/ticket/index.json
+++ b/pages/list/movieticket/list/ticket/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "code":"../../../../order/components/wxqrCode/index"
   }
 }
\ No newline at end of file
diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml
index 3e24bca..622fdb0 100644
--- a/pages/list/movieticket/list/ticket/index.wxml
+++ b/pages/list/movieticket/list/ticket/index.wxml
@@ -43,4 +43,6 @@
     <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
     <view>暂无内容</view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/order/components/wxqrCode/index.js b/pages/order/components/wxqrCode/index.js
new file mode 100644
index 0000000..7cfee1b
--- /dev/null
+++ b/pages/order/components/wxqrCode/index.js
@@ -0,0 +1,42 @@
+// pages/order/components/coupon/index.js
+let app = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    showModel:{
+      type:Boolean,
+      value:false
+    },
+    qrcode:{
+        type:String,
+        value:null
+    }
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+   
+  },
+  pageLifetimes: {
+    show: function() {
+			console.log(123123);
+    }
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    submit: function() {
+			this.setData({
+				showModel:false
+			})
+	}
+
+  }
+})
diff --git a/pages/order/components/wxqrCode/index.json b/pages/order/components/wxqrCode/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/order/components/wxqrCode/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/order/components/wxqrCode/index.wxml b/pages/order/components/wxqrCode/index.wxml
new file mode 100644
index 0000000..36bf915
--- /dev/null
+++ b/pages/order/components/wxqrCode/index.wxml
@@ -0,0 +1,13 @@
+<view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModel}}"></view>
+<view class="modalDlg" wx:if="{{showModel}}">
+	<view class="img-box">
+		<image class="codeImg" src="{{qrcode}}" show-menu-by-longpress="{{true}}"></image>
+	</view>
+	<view class="text-box">
+		扫码关注<text>【君到苏州】</text> 微信公众号
+	</view>
+	<view class="more">
+		查看更多旅游资讯
+	</view>
+	<image bindtap="submit" class="close" src="https://static.ticket.sz-trip.com/uploads/20230619/c62511826c880bddc20f98011a87a5a9.png" mode=""/>
+</view>
\ No newline at end of file
diff --git a/pages/order/components/wxqrCode/index.wxss b/pages/order/components/wxqrCode/index.wxss
new file mode 100644
index 0000000..3135ada
--- /dev/null
+++ b/pages/order/components/wxqrCode/index.wxss
@@ -0,0 +1,70 @@
+.mask{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background: #000;
+	z-index: 9000;
+	opacity: 0.7;
+}
+
+.modalDlg{
+	width: 500rpx;
+	height: 660rpx;
+	background-image:url('https://static.ticket.sz-trip.com/uploads/20230619/12a423ee9510a8e5c9c92696e52fcc3c.png') ;
+	background-size: 100% 100%;
+	position: fixed;
+	top: 50%;
+	left: 0;
+	z-index: 9999;
+	margin: -370rpx 125rpx;
+	background-color: #fff;
+	border-radius: 36rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.img-box{
+	width: 300rpx;
+	height: 300rpx;
+	background: #FFFFFF;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-top: 79rpx;
+
+
+}
+.img-box image{
+	width: 310rpx;
+	height: 310rpx;
+	border-radius: 10rpx;
+}
+.text-box{
+	width: 300rpx;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	text-align: center;
+	margin-top: 40rpx;
+}
+.text-box text{
+	color: rgba(255, 255, 85, 1);
+}
+.more{
+	margin-top: 80rpx;
+font-size: 30rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #0B898E;
+}
+.close{
+	position: absolute;
+	bottom: -120rpx;
+	left: 50%;
+	height: 80rpx;
+	width: 80rpx;
+	transform: translate(-40rpx,0);
+}
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index c39a4e0..a749339 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -11,11 +11,6 @@
 			<view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
 		</view>
 	</view>
-
-	<view class="tel-box">
-		<text>手机号码：</text>
-		<input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
-	</view>
 </view>
 
 <view class="tips">
@@ -32,6 +27,10 @@
 		</view>
 	</view>
 </view>
+<view class="tel-box">
+		<text>手机号码：</text>
+		<input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
+	</view>
 <coupon money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
 
 
diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss
index 91509b5..8b58f41 100644
--- a/pages/order/movie/index.wxss
+++ b/pages/order/movie/index.wxss
@@ -14,7 +14,7 @@ page {
   display: flex;
   padding-top: 30rpx;
   padding-bottom: 41rpx;
-  border-bottom: 1rpx solid #ccc;
+  /* border-bottom: 1rpx solid #ccc; */
   font-size: 27rpx;
   color: #999;
   justify-content: space-between;
@@ -42,7 +42,11 @@ page {
   align-items: center;
   height: 126rpx;
   font-size: 31rpx;
-  justify-content: space-between;
+	justify-content: space-between;
+	margin: 30rpx 25rpx;
+	background: white;
+	border-radius: 9rpx;
+	padding: 0 20rpx;
 }
 .tel-box>text {
   color: #000;
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index c51d1b1..4c7bbc2 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -1,6 +1,6 @@
 // pages/user/cartlist/list.js
 const device = wx.getSystemInfoSync(),
-  rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
+    rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
 const ratio = 750 / device.windowWidth;
 console.log(rect)
 const width = device.windowWidth // 示例为一个与屏幕等宽的正方形裁剪框
@@ -10,357 +10,373 @@ import util from '../../../utils/util'
 let app = getApp()
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    menuWidth: width - rect.right + rect.width + 6,
-    list: [],
-    allChecked: false,
-    allPrice: 0,
-    productType: '',
-    manageFlag: false,
-		flag: false, //判断订单是否同时有商品和票
-		isCar:'single',//判断是否购物车
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        menuWidth: width - rect.right + rect.width + 6,
+        list: [],
+        allChecked: false,
+        allPrice: 0,
+        productType: '',
+        manageFlag: false,
+        flag: false, //判断订单是否同时有商品和票
+        isCar: 'single', //判断是否购物车
+        showQrCode: false,
+        wxqrcode: null
+    },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    wx.removeStorageSync('linkMan')
-    this.getList();
-  },
-  manage: function () {
-    let list = this.data.list;
-    list.map(item => {
-      item.checked = 0;
-    })
-    this.setData({
-      manageFlag: !this.data.manageFlag,
-      allChecked: 0,
-      list: list,
-      allPrice: 0
-    })
-  },
-  gotoDetail: function (e) {
-    console.log(e)
-    let item = e.currentTarget.dataset.item.product;
-    util.gotoDetail(item, 1);
-  },
-  getList: function () {
-    commonApi.user_post("cart/get_list", {
-      // type: '1'
-    }).then(res => {
-      this.setData({
-        list: res.data
-      })
-    })
-  },
-  minus: function (e) {
-    let index = e.currentTarget.dataset.index,
-      list = this.data.list;
-    let num = list[index].num;
-    if (num <= 1) return;
-    num = num - 1;
-    list[index].num = num;
-    this.setData({
-      list: list
-    })
-    this.changeNumber(list[index])
-    this.updatePrice()
-  },
-  add: function (e) {
-    let index = e.currentTarget.dataset.index,
-      list = this.data.list;
-    let num = list[index].num + 1;
-    list[index].num = num;
-    this.setData({
-      list: list
-    })
-    this.changeNumber(list[index])
-    this.updatePrice()
-  },
-  select: function (e) {
-    let index = e.currentTarget.dataset.index,
-      list = this.data.list;
-    if (list[index].product.flag != 1 || list[index].sku.flag != 'on') {
-      if (!this.data.manageFlag) {
-        wx.showToast({
-          title: '产品已下架',
-          icon: 'none'
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        wx.removeStorageSync('linkMan')
+        this.getList();
+    },
+    manage: function () {
+        let list = this.data.list;
+        list.map(item => {
+            item.checked = 0;
         })
-        return;
-      }
-    }
-    list[index].checked = list[index].checked ? false : true;
-    this.setData({
-      list: list
-    })
-    let flag = true
-    list.forEach(item => {
-       if (!item.checked) {
-        flag = false
-        return
-       }
-    });
-    this.setData({
-      allChecked:flag
-    })
-    this.updatePrice()
-  },
-  selectAll: function () {
-    let list = this.data.list,
-      allChecked = this.data.allChecked ? false : true;
-    list.map(item => {
-      if (item.sku.flag == 'on' && item.product.flag == 1) {
-        item.checked = allChecked;
-      }
-    })
-    this.setData({
-      allChecked: allChecked,
-      list: list
-    })
-    this.updatePrice()
-  },
-  changeNumber(item) {
-    commonApi.user_post("cart/update_sku", {
-      sku_id: item.sku.id,
-      num: item.num
-    }).then(res => {})
-  },
-  updatePrice: function () {
-    let list = this.data.list,
-      price = 0;
-    list.map(item => {
-      if (item.checked) {
-        price = price + item.sku.price * item.num;
-      }
-    })
-    this.setData({
-      allPrice: price
-    })
-  },
-  order: function () {
-    app.globalData.couponInfo = null;
-    util.pagePoint({
-      event: 'cart_order'
-    }, 1)
-    let list = this.data.list,
-      price = 0,
-      product = [],
-      product1 = []
-    list.map(item => {
-      if (item.checked) {
-        // item.product.type="post";
-        if (item.product.type == 'post') {
-          product.push({
-            product: item.product,
-            sku: item.sku,
-            productNum: item.num
-          })
-        } else {
-          product1.push(item)
-          app.globalData.list = product1
-        }
-        if (item.product.type.includes('post')) {
-          this.data.productType = 'post'
-        }
-      }
-    }) 
-    if (product.length == 0 && product1.length == 0) {
-      wx.showToast({
-        title: '请先选择产品',
-        icon: 'none'
-      })
-      return;
-    }
-    if (product.length > 0 && product1.length > 0) {
-      this.setData({
-        flag: 'mix',
-        isCar:'multiple'
-      })
-		}
-		if ( product1.length > 1) {
-      this.setData({
-        isCar:'multiple'
-      })
-		}else{
-			this.setData({
-        isCar:'single'
-      })
-		}
-		console.log(product1);
-    app.globalData.postProduct = product;
-    if (app.globalData.list) {
-      app.globalData.product = app.globalData.list[app.globalData.index]
-    }
-    if (this.data.productType == 'post') {
-      console.log(this.data.flag);
-      wx.navigateTo({
-        url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
-      })
-    } else {
-      wx.navigateTo({
-        url: '/pages/order/scene/index?isCar=' + this.data.isCar,
-      })
-    }
-  },
-  touchStart(e) { //移动前点击的位置
-    console.log(e)
-    // 在开始触摸时将所有startTouchMove设置为flase,对当前的为true
-    this.data.list.forEach(cart => {
-      if (cart.isTouchMove) //当istouchMove为true
-        cart.isTouchMove = false; //其它的对象都为false
-    })
-    this.setData({
-      startX: e.changedTouches[0].clientX,
-      startY: e.changedTouches[0].clientY,
-      list: this.data.list
-    })
-  },
-  touchmove(e) { //移动的位置,用于计算用户滑动的弧度向左还是向右,移动了多少,可以确定删除功能的显示和隐藏
-    let index = e.currentTarget.dataset.index;
-    // 获取开始的x,y坐标
-    let startX = this.data.startX,
-      startY = this.data.startY;
-    // 获取移动的x,x坐标
-    let touchMoveX = e.changedTouches[0].clientX,
-      touchMoveY = e.changedTouches[0].clientY;
-    // 调用计算角度的方法,获取角度
-    var angel = this.angel({
-      X: startX,
-      Y: startY
-    }, {
-      X: touchMoveX,
-      Y: touchMoveY
-    })
-    // 遍历cartArray
-    this.data.list.forEach((cart, i) => {
-      cart.isTouchMove = false;
-      // 滑动角度大于30,直接return 视为非滑动意思
-      if (Math.abs(angel) > 30) return;
-      // 匹配当前所点击的list和滑动的list
-      if (i == index) {
-        // 匹配上后判断滑动方向
-        if (touchMoveX > startX) { //左滑动隐藏删除
-          cart.isTouchMove = false;
-        } else {
-          cart.isTouchMove = true;
+        this.setData({
+            manageFlag: !this.data.manageFlag,
+            allChecked: 0,
+            list: list,
+            allPrice: 0
+        })
+    },
+    gotoDetail: function (e) {
+        console.log(e)
+        let item = e.currentTarget.dataset.item.product;
+        util.gotoDetail(item, 1);
+    },
+    getList: function () {
+        commonApi.user_post("cart/get_list", {
+            // type: '1'
+        }).then(res => {
+            this.setData({
+                list: res.data
+            })
+        })
+    },
+    minus: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        let num = list[index].num;
+        if (num <= 1) return;
+        num = num - 1;
+        list[index].num = num;
+        this.setData({
+            list: list
+        })
+        this.changeNumber(list[index])
+        this.updatePrice()
+    },
+    add: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        let num = list[index].num + 1;
+        list[index].num = num;
+        this.setData({
+            list: list
+        })
+        this.changeNumber(list[index])
+        this.updatePrice()
+    },
+    select: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        if (list[index].product.flag != 1 || list[index].sku.flag != 'on') {
+            if (!this.data.manageFlag) {
+                wx.showToast({
+                    title: '产品已下架',
+                    icon: 'none'
+                })
+                return;
+            }
         }
-      }
-    })
-    // 更新数据
-    this.setData({
-      list: this.data.list
-    })
-  },
-  angel(start, end) { //计算滑动的角度 
-    // console.log(start,end)
-    // 移动坐标减去对应的开始坐标
-    var _X = end.X - start.X,
-      _Y = end.Y - start.Y;
-    // 返回角度 Math.atan() 返回数字的正切值
-    return 360 * Math.atan(_Y / _X) / (2 * Math.PI)
-  },
-  del: function (e) {
-    let index = e.currentTarget.dataset.index,
-      list = this.data.list;
-    commonApi.user_post("cart/del_sku", {
-      sku_id: list[index].sku_id
-    }).then(res => {
-      if (res.code == 1) {
-        wx.showToast({
-          title: '删除成功',
-          icon: "success"
+        list[index].checked = list[index].checked ? false : true;
+        this.setData({
+            list: list
+        })
+        let flag = true
+        list.forEach(item => {
+            if (!item.checked) {
+                flag = false
+                return
+            }
+        });
+        this.setData({
+            allChecked: flag
+        })
+        this.updatePrice()
+    },
+    selectAll: function () {
+        let list = this.data.list,
+            allChecked = this.data.allChecked ? false : true;
+        list.map(item => {
+            if (item.sku.flag == 'on' && item.product.flag == 1) {
+                item.checked = allChecked;
+            }
+        })
+        this.setData({
+            allChecked: allChecked,
+            list: list
+        })
+        this.updatePrice()
+    },
+    changeNumber(item) {
+        commonApi.user_post("cart/update_sku", {
+            sku_id: item.sku.id,
+            num: item.num
+        }).then(res => { })
+    },
+    updatePrice: function () {
+        let list = this.data.list,
+            price = 0;
+        list.map(item => {
+            if (item.checked) {
+                price = price + item.sku.price * item.num;
+            }
         })
-        list.splice(index, 1);
         this.setData({
-          list: list
+            allPrice: price
         })
-      }
-    })
-  },
-  delM() {
-    let that = this
-    let arr = this.data.list
-    let suid = []
-    arr.forEach(item => {
-      if (item.checked) {
-        suid.push(item.sku_id)
-      }
-    });
-    let skuids = suid.join(',')
-    wx.showModal({
-      title: '提示',
-      content: '确定要删除选定的产品？',
-      success: function (res) {
-        if (res.confirm) {
-          commonApi.user_post("cart/del_sku", {
-            sku_id:skuids
-          }).then(res => {
+    },
+    order: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/user/cartlist/list',
+            title: '购物车',
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                app.globalData.couponInfo = null;
+                util.pagePoint({
+                    event: 'cart_order'
+                }, 1)
+                let list = this.data.list,
+                    price = 0,
+                    product = [],
+                    product1 = []
+                list.map(item => {
+                    if (item.checked) {
+                        // item.product.type="post";
+                        if (item.product.type == 'post') {
+                            product.push({
+                                product: item.product,
+                                sku: item.sku,
+                                productNum: item.num
+                            })
+                        } else {
+                            product1.push(item)
+                            app.globalData.list = product1
+                        }
+                        if (item.product.type.includes('post')) {
+                            this.data.productType = 'post'
+                        }
+                    }
+                })
+                if (product.length == 0 && product1.length == 0) {
+                    wx.showToast({
+                        title: '请先选择产品',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                if (product.length > 0 && product1.length > 0) {
+                    this.setData({
+                        flag: 'mix',
+                        isCar: 'multiple'
+                    })
+                }
+                if (product1.length > 1) {
+                    this.setData({
+                        isCar: 'multiple'
+                    })
+                } else {
+                    this.setData({
+                        isCar: 'single'
+                    })
+                }
+                console.log(product1);
+                app.globalData.postProduct = product;
+                if (app.globalData.list) {
+                    app.globalData.product = app.globalData.list[app.globalData.index]
+                }
+                if (this.data.productType == 'post') {
+                    console.log(this.data.flag);
+                    wx.navigateTo({
+                        url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
+                    })
+                } else {
+                    wx.navigateTo({
+                        url: '/pages/order/scene/index?isCar=' + this.data.isCar,
+                    })
+                }
+            }
+        })
+
+    },
+    touchStart(e) { //移动前点击的位置
+        console.log(e)
+        // 在开始触摸时将所有startTouchMove设置为flase,对当前的为true
+        this.data.list.forEach(cart => {
+            if (cart.isTouchMove) //当istouchMove为true
+                cart.isTouchMove = false; //其它的对象都为false
+        })
+        this.setData({
+            startX: e.changedTouches[0].clientX,
+            startY: e.changedTouches[0].clientY,
+            list: this.data.list
+        })
+    },
+    touchmove(e) { //移动的位置,用于计算用户滑动的弧度向左还是向右,移动了多少,可以确定删除功能的显示和隐藏
+        let index = e.currentTarget.dataset.index;
+        // 获取开始的x,y坐标
+        let startX = this.data.startX,
+            startY = this.data.startY;
+        // 获取移动的x,x坐标
+        let touchMoveX = e.changedTouches[0].clientX,
+            touchMoveY = e.changedTouches[0].clientY;
+        // 调用计算角度的方法,获取角度
+        var angel = this.angel({
+            X: startX,
+            Y: startY
+        }, {
+            X: touchMoveX,
+            Y: touchMoveY
+        })
+        // 遍历cartArray
+        this.data.list.forEach((cart, i) => {
+            cart.isTouchMove = false;
+            // 滑动角度大于30,直接return 视为非滑动意思
+            if (Math.abs(angel) > 30) return;
+            // 匹配当前所点击的list和滑动的list
+            if (i == index) {
+                // 匹配上后判断滑动方向
+                if (touchMoveX > startX) { //左滑动隐藏删除
+                    cart.isTouchMove = false;
+                } else {
+                    cart.isTouchMove = true;
+                }
+            }
+        })
+        // 更新数据
+        this.setData({
+            list: this.data.list
+        })
+    },
+    angel(start, end) { //计算滑动的角度 
+        // console.log(start,end)
+        // 移动坐标减去对应的开始坐标
+        var _X = end.X - start.X,
+            _Y = end.Y - start.Y;
+        // 返回角度 Math.atan() 返回数字的正切值
+        return 360 * Math.atan(_Y / _X) / (2 * Math.PI)
+    },
+    del: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        commonApi.user_post("cart/del_sku", {
+            sku_id: list[index].sku_id
+        }).then(res => {
             if (res.code == 1) {
-              wx.showToast({
-                title: '删除成功',
-                icon: "success"
-              })
-              that.getList();
+                wx.showToast({
+                    title: '删除成功',
+                    icon: "success"
+                })
+                list.splice(index, 1);
+                this.setData({
+                    list: list
+                })
             }
-          })
-          
-        } else {
-          console.log('取消')
-        }
-      }
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+        })
+    },
+    delM() {
+        let that = this
+        let arr = this.data.list
+        let suid = []
+        arr.forEach(item => {
+            if (item.checked) {
+                suid.push(item.sku_id)
+            }
+        });
+        let skuids = suid.join(',')
+        wx.showModal({
+            title: '提示',
+            content: '确定要删除选定的产品？',
+            success: function (res) {
+                if (res.confirm) {
+                    commonApi.user_post("cart/del_sku", {
+                        sku_id: skuids
+                    }).then(res => {
+                        if (res.code == 1) {
+                            wx.showToast({
+                                title: '删除成功',
+                                icon: "success"
+                            })
+                            that.getList();
+                        }
+                    })
 
-  },
+                } else {
+                    console.log('取消')
+                }
+            }
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    util.pagePoint({
-      event: 'cart_view'
-    }, 1)
-    app.globalData.list = null
-    app.globalData.createDate = null
-    app.globalData.index = 0
-    app.globalData.productPrice = 0
-    app.globalData.ticketPrice = 0
-    this.data.productType = ''
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        util.pagePoint({
+            event: 'cart_view'
+        }, 1)
+        app.globalData.list = null
+        app.globalData.createDate = null
+        app.globalData.index = 0
+        app.globalData.productPrice = 0
+        app.globalData.ticketPrice = 0
+        this.data.productType = ''
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    },
 
-  },
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    },
 
-  }
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    }
 })
\ No newline at end of file
diff --git a/pages/user/cartlist/list.json b/pages/user/cartlist/list.json
index 18a9446..58d0c51 100644
--- a/pages/user/cartlist/list.json
+++ b/pages/user/cartlist/list.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title": "/pages/component/TitleHeader"
+    "title": "/pages/component/TitleHeader",
+    "code":"../../order/components/wxqrCode/index"
   }
 }
\ No newline at end of file
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index 970316e..c8478c6 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -41,4 +41,6 @@
   <view class="iconfont{{allChecked?' icon-gou':' icon-quan'}}" bindtap="selectAll"></view>
   <text style="color:#666;font-size:26rpx;flex-shrink:0;margin-left:10rpx;flex:1">全选</text>
   <view class="fixed-btn del-btn" bindtap="delM">删除</view>
-</view>
\ No newline at end of file
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file

From 56819d449f2581c13e0f105fc98c655b0f1b98d1 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 23 Jun 2023 13:32:57 +0800
Subject: [PATCH 071/471] =?UTF-8?q?=E4=B9=A6=E5=88=B8=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/order/pay/index.js   | 9 ++++++++-
 pages/order/pay/index.wxml | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 3199bb7..73e4dbc 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.isTest81? true : false;
+      data.isTest = data.isTest82? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 7481d63..53f5e68 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -17,7 +17,8 @@ Page({
     showNumMask: false,
     activePay:false,//是否活动支付
     SUBWALLET:false,
-    wxPay:false
+    wxPay:false,
+	isBook:false
   },
 
   /**
@@ -81,6 +82,12 @@ Page({
     commonApi.user_post("order/query",{
       order_id:this.data.id
     }).then(res=>{
+	  // 书券产品
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013){
+		  this.setData({
+		    isBook:true
+		  })
+	  }
       if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 834cbb6..80c6d17 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -28,7 +28,7 @@
 
 <view class="pay-methods-box" wx:if="{{!activePay}}">
   <view>支付方式：</view>
-  <view class="pay-method" bindtap="changePayMethod" data-index="-1">
+  <view class="pay-method" bindtap="changePayMethod" data-index="-1" wx:if="{{!isBook}}">
     <view class="iconfont icon-weixin1"></view>
     <view class="method-name">微信支付</view>
     <view class="iconfont {{payIndex==-1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>

From 97c6001038d46ad2d0a5d9fb13b0be9392447505 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sat, 1 Jul 2023 16:21:32 +0800
Subject: [PATCH 072/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/coupon/index.js | 48 +++++++++++++++++++++++---
 pages/order/coupon/index.js            | 33 ++++++++++++++++--
 pages/order/movie/index.js             | 21 +++++++----
 pages/order/movie/index.wxml           |  2 +-
 pages/order/postOrder/index.js         | 14 +++++---
 pages/order/postOrder/index.wxml       |  2 +-
 pages/order/roadOrder/index.js         | 11 +++---
 pages/order/roadOrder/index.wxml       |  2 +-
 pages/order/scene/index.js             | 30 +++++++++-------
 pages/order/scene/index.wxml           |  2 +-
 10 files changed, 125 insertions(+), 40 deletions(-)

diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 14cf5dc..0fbb534 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -1,4 +1,5 @@
 // pages/order/components/coupon/index.js
+import commonApi from "../../../../utils/https/common"
 let app = getApp()
 Component({
   /**
@@ -23,20 +24,57 @@ Component({
   },
   pageLifetimes: {
     show: function() {
-      this.setData({
-        coupon:app.globalData.couponInfo
-      })
+      this.getMaxCoupon()
     }
   },
-
+  lifetimes:{
+    attached(){
+    },
+  },
   /**
    * 组件的方法列表
    */
   methods: {
     setNullCoupon:function(){
+      app.globalData.couponInfo = null
       this.setData({
         coupon:null
       })
-    }
+    },
+    getMaxCoupon(){
+      // console.log(app.globalData.couponInfo);
+      console.log(this.data.coupon);
+      if (app.globalData.couponInfo===false) {
+        this.setData({
+          coupon:null
+        })
+        this.triggerEvent('getNewCoupon',null);
+      }else{
+        commonApi.user_post('coupon/use_max_coupon_list',{
+          money:this.data.money,
+          sku_ids:this.data.sku
+        }).then(res=>{
+          if (app.globalData.couponInfo&&app.globalData.couponInfo.hasOwnProperty('SubCoupon')) {
+            this.setData({
+              coupon:app.globalData.couponInfo
+            })
+            this.triggerEvent('getNewCoupon',app.globalData.couponInfo);
+            console.log("我用的原来的数据");
+          }else{
+            console.log("我用的新的数据");
+            if ( Object.keys(res.data).length!=0) {
+              app.globalData.couponInfo = res.data
+              this.setData({
+                coupon:res.data
+              })
+               console.log(this.data.coupon);
+              this.triggerEvent('getNewCoupon',res.data);
+            }
+          }
+        })
+      }
+
   }
+  },
+
 })
diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index 1b7c0c3..5a3d7b1 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -15,6 +15,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
+  
   onLoad: function (options) {
     this.getList(options)
   },
@@ -30,6 +31,27 @@ Page({
       this.setData({
         list:res.data
       })
+      this.getMaxC(options)
+    })
+  },
+  //获取最高优惠
+  getMaxC(options){
+    commonApi.user_post('coupon/use_max_coupon_list',{
+      money:options.money,
+      sku_ids:options.sku
+    }).then(res=>{
+      console.log(app.globalData.couponInfo);
+
+      app.globalData.couponInfo?app.globalData.couponInfo:app.globalData.couponInfo= res.data;
+      let listT = this.data.list
+      listT.forEach(item => {
+          if (item.id ==  app.globalData.couponInfo.id) {
+              item.selected = true
+          }
+      });
+      this.setData({
+        list:listT
+      })
     })
   },
   selectIt:function(e){
@@ -53,10 +75,15 @@ Page({
     list.map(item=>{
       if(item.selected){
         coupon = item;
+        item.SubCoupon = true
       }
     })
-    console.log(coupon)
-    app.globalData.couponInfo = coupon;
+    if (coupon===null) {
+      app.globalData.couponInfo = false
+    }else{
+      app.globalData.couponInfo = coupon;
+    }
+
     util.back()
   },
 
@@ -71,7 +98,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    app.globalData.couponInfo = null;
+
   },
 
   /**
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index 7a449ef..d722ee3 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -13,7 +13,7 @@ Page({
     tel:'',
     product:null,
     price:0,
-    coupon:null,
+    coupon:app.globalData.couponInfo,
 		prizeId:null,
 		num:0,
 		sPrice:0,
@@ -24,7 +24,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
 	onLoad: function (options) {
-		console.log(options);
+    app.globalData.couponInfo = null
+    this.setData({
+      coupon:app.globalData.couponInfo
+    })
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
@@ -123,22 +126,26 @@ Page({
 		this.setData({
 			hideMx:!this.data.hideMx
 		})
-	},
+  },
+  //获取最高优惠券
+      getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-		this.setData({
-			coupon:app.globalData.couponInfo,
-		})
+
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    app.globalData.couponInfo = null
+  
   },
 
   /**
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index a749339..0172212 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -31,7 +31,7 @@
 		<text>手机号码：</text>
 		<input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
 	</view>
-<coupon money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon' money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
 
 
 <view class="fix-info {{!hideMx?'hide':''}}">
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index f847587..265207d 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -12,7 +12,7 @@ Page({
     from: null,
     address: null,
     postFee: 0,
-    coupon: null,
+    coupon:app.globalData.couponInfo,
     sku_id: '',
     kjId: null,
     gp_id: null,
@@ -255,6 +255,12 @@ Page({
     })
     this.changePrice()
   },
+    //获取最高优惠券
+    getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -267,9 +273,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      coupon: app.globalData.couponInfo
-    })
+    // this.setData({
+    //   coupon: app.globalData.couponInfo
+    // })
     // 获取补贴
     // if (this.data.product.length == 1) {
     //   commonApi.user_post("product/getProductAllowancePrice", {
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 6c3ab93..8753b18 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -47,7 +47,7 @@
     </view>
   </view>
 </view>
-<coupon id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 <view style="height:113rpx"></view>
 <view class="fixed-bottom" wx:if="{{product}}">
   <view class="fixed-price-box" wx:if="{{!prizeId}}"><text>合计：</text><text
diff --git a/pages/order/roadOrder/index.js b/pages/order/roadOrder/index.js
index 06cffba..1c222ff 100644
--- a/pages/order/roadOrder/index.js
+++ b/pages/order/roadOrder/index.js
@@ -20,7 +20,7 @@ Page({
     remark:"",
     editId:null,
     price:0,
-    coupon:null,
+    coupon:app.globalData.couponInfo,
     sku_ids:"",
     prizeId:null
   },
@@ -270,6 +270,12 @@ Page({
     })
     
   },
+      //获取最高优惠券
+  getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
   // 一日游合同确认签字
   // ondayConfirm:function(){
   //   let linkmans = this.data.linkmans,tourist_info=[],sku=this.data.sku;
@@ -324,9 +330,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      coupon:app.globalData.couponInfo
-    })
     if(this.data.editId){
       // 如果是去编辑的
       let editId = this.data.editId;
diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml
index c28f663..f81629e 100644
--- a/pages/order/roadOrder/index.wxml
+++ b/pages/order/roadOrder/index.wxml
@@ -29,7 +29,7 @@
     <input type="text" bindinput="inputRemark" placeholder="选填"></input>
   </view>
 </view>
-<coupon money="{{price}}" sku="{{sku_ids}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon' money="{{price}}" sku="{{sku_ids}}"></coupon>
 <!-- <view class="user-box">
   <view class="user-item" style="border:none">
     <image style="width:32rpx" src="https://static.ticket.sz-trip.com/xcxImages/other/hetong.png" mode="widthFix"></image>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index e388033..ebf2e9c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -16,7 +16,7 @@ Page({
     remark: "",
     singlePrice: 0,
     type: null,
-    coupon: app.globalData.couponInfo,
+    coupon:null,
     isLogin: false,
     kjId: null,
     gp_id: null,
@@ -36,8 +36,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-		console.log(app.globalData.product);
-		console.log(options.isCar);
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -83,13 +81,13 @@ Page({
         title: '订单价格发生变化，请重新选择优惠券',
         icon: 'none'
       })
-      if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
-        this.couponCom.setNullCoupon()
-      }
-      app.globalData.couponInfo = null;
-      this.setData({
-        coupon: null
-      })
+      // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
+      //   this.couponCom.setNullCoupon()
+      // }
+      // app.globalData.couponInfo = null;
+      // this.setData({
+      //   coupon: null
+      // })
     }
     let productNum = linkmanList.length == 0 ? 1 : this.data.productNum > linkmanList.length ? this.data.productNum : linkmanList.length;
     if (this.data.gp_id) {
@@ -361,6 +359,12 @@ Page({
     })
     this.changePrice()
   },
+  //获取最高优惠券
+  getNewCoupon(e){
+   this.setData({
+      coupon:e.detail
+   })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -385,9 +389,9 @@ Page({
         }
       })
     }
-    this.setData({
-      coupon: app.globalData.couponInfo
-    })
+    // this.setData({
+    //   coupon: app.globalData.couponInfo
+    // })
     // 获取补贴
     // if (this.data.product) {
     //   commonApi.user_post("product/getProductAllowancePrice", {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index a454ed2..0dac30d 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -35,7 +35,7 @@
     </view>
   </view>
 
-  <coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
+  <coupon bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
 
   <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">

From 9a3fa9f9d4bb0ec0d9b8d0d7f065409f0d48cdf2 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sat, 1 Jul 2023 16:26:07 +0800
Subject: [PATCH 073/471] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA,=E7=A9=BA=E5=BA=93=E5=AD=98=E4=BC=9A=E6=9C=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 15387b9..e08b365 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -25,7 +25,7 @@ Page({
         allowance_data: null,
         //购物车数量
         producNum: 1,
-        skuIndex: null,
+        skuIndex: 0,
         aniSkuIndex: -1,
         cartCount: 0,
         cartImgInfo: null,

From b1d0646c192409bdb49f8938af36f01e7d3c582f Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sun, 16 Jul 2023 12:46:35 +0800
Subject: [PATCH 074/471] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |  2 +-
 pages/index/index.wxml                      | 19 +++++++++------
 pages/index/index.wxss                      |  2 +-
 pages/info/groupOrderInfo/index.js          |  5 ++++
 pages/info/groupOrderInfo/index.wxml        |  9 +++++++
 pages/info/groupOrderInfo/index.wxss        | 21 +++++++++++++++++
 pages/info/sceneProductInfo/index.js        | 26 +++++++++++++--------
 pages/info/sceneProductInfo/index.wxml      |  2 +-
 pages/list/movieticket/index.js             |  2 +-
 pages/list/movieticket/list/ticket/index.js |  2 +-
 pages/order/road/index.wxml                 |  2 +-
 pages/order/scene/index.js                  |  3 ++-
 pages/user/order/list.js                    |  4 ++++
 13 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/app.js b/app.js
index 73e4dbc..8619030 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.isTest82? true : false;
+      data.isTest = data.isTest84? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 73f6710..ec59efe 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,7 +179,12 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+      <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+        <view>云上文博会</view>
+      </view> -->
+      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
@@ -259,17 +264,17 @@
   <view class="pic-list" style="margin-top:20rpx">
     <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs0.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
     <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
       data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs1.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
     <image bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs2.png" mode="aspectFill">
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
     </image>
     <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs3.png" mode="aspectFill"></image>
-    <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-      mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image>
+    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
+      mode="aspectFill"></image> -->
   </view>
   <view class="sale-road-boxes" style="margin-top:0;align-items:center">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 649f537..5858b74 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -281,7 +281,7 @@
   margin: 60rpx 0;
 }
 .pic-list image {
-  width: 122rpx;
+  width: 155.33rpx;
   height: 200rpx;
   display: block;
 }
diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js
index 412a43e..65f25de 100644
--- a/pages/info/groupOrderInfo/index.js
+++ b/pages/info/groupOrderInfo/index.js
@@ -127,6 +127,11 @@ Page({
       })
     }
   },
+  goOrder(){
+    wx.navigateTo({
+      url: '/pages/user/order/museumOrderInfo/index?id='+ this.data.id,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml
index abab27b..d76bc7e 100644
--- a/pages/info/groupOrderInfo/index.wxml
+++ b/pages/info/groupOrderInfo/index.wxml
@@ -58,4 +58,13 @@
       <view>截屏分享给团员</view>
     </view>
   </view>
+</view>
+<view class="order-btn" bindtap="goOrder"> 
+  <view>
+    查看
+  </view>
+  <view>
+    订单
+  </view>
+
 </view>
\ No newline at end of file
diff --git a/pages/info/groupOrderInfo/index.wxss b/pages/info/groupOrderInfo/index.wxss
index e8cb5af..13d8fb0 100644
--- a/pages/info/groupOrderInfo/index.wxss
+++ b/pages/info/groupOrderInfo/index.wxss
@@ -169,4 +169,25 @@ page {
   position: absolute;
   right: 20rpx;
   top: 20rpx;
+}
+.order-btn{
+  width: 110rpx;
+height: 110rpx;
+background: #FFFFFF;
+box-shadow: 0rpx 0rpx 11rpx 0rpx rgba(17,17,17,0.2);
+border-radius: 55rpx;
+display: flex;
+flex-direction: column;
+align-items: center;
+justify-content: center;
+position: fixed;
+bottom: 120rpx;
+right: 20rpx;
+box-sizing: border-box;
+font-size: 28rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #0B898E;
+
+
 }
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index e08b365..2abd7b0 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -24,7 +24,7 @@ Page({
         showAllowance: false,
         allowance_data: null,
         //购物车数量
-        producNum: 1,
+        productNum: 1,
         skuIndex: 0,
         aniSkuIndex: -1,
         cartCount: 0,
@@ -316,8 +316,10 @@ Page({
         }
         let index = e.currentTarget.dataset.index;
         this.setData({
-            skuIndex: index
+            skuIndex: index,
+            productNum:1
         })
+        
     },
     order: function (e) {
         commonApi.user_post("/product/checkStock", {
@@ -354,6 +356,7 @@ Page({
                         product = {
                             product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
                         }
+                        product.productNum = this.data.productNum
                     app.globalData.product = {
                         ...sku,
                         ...product
@@ -365,7 +368,7 @@ Page({
                 } else {
                     commonApi.user_post("cart/add_sku", {
                         sku_id: this.data.skuList[this.data.skuIndex].id,
-                        num: this.data.producNum
+                        num: this.data.productNum
                     }).then(res => {
                         if (res.code == 1) {
                             commonApi.user_post('cart/get_list', {}).then(res => {
@@ -702,10 +705,6 @@ Page({
                 }).exec()
             }
         })
-
-
-
-
     },
     hideSku: function () {
         this.setData({
@@ -715,15 +714,22 @@ Page({
     },
     //加减数量
     minus: function () {
-        if (this.data.producNum == 1) return;
+        if (this.data.productNum == 1) return;
         this.setData({
-            producNum: this.data.producNum - 1
+            productNum: this.data.productNum - 1
         })
     },
     add: function () {
+      if (this.data.productNum == this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num){
+        wx.showToast({
+          title: '本产品单笔限购'+this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num,
+          icon:'none'
+        });
+      }else{
         this.setData({
-            producNum: this.data.producNum + 1
+          productNum: this.data.productNum + 1
         })
+      }
     },
     //立即预定
     showOrder: function () {
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 04562e2..11a7cae 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -130,7 +130,7 @@
       <view class="number-box">
         <text>数量</text>
         <view class="iconfont icon-sami-select" bindtap="minus"></view>
-        <view class="number">{{producNum}}</view>
+        <view class="number">{{productNum}}</view>
         <view class="iconfont icon-add-select" bindtap="add"></view>
       </view>
       <view style="height:138rpx"></view>
diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js
index 1f147c2..021a01c 100644
--- a/pages/list/movieticket/index.js
+++ b/pages/list/movieticket/index.js
@@ -21,7 +21,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    commonApi._post("act/get_suzhou_areas").then(res=>{
+    commonApi._post("act/get_suzhou_areas_syt").then(res=>{
       res.data.unshift({
         area_id:"",
         area_title:"苏州"
diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js
index 8dacd88..7fdd246 100644
--- a/pages/list/movieticket/list/ticket/index.js
+++ b/pages/list/movieticket/list/ticket/index.js
@@ -36,7 +36,7 @@ Page({
             id: options.id,
             title: options.title
         })
-        commonApi._post("act/get_suzhou_areas").then(res => {
+        commonApi._post("act/get_suzhou_areas_syt").then(res => {
             res.data.unshift({
                 area_id: "",
                 area_title: "苏州"
diff --git a/pages/order/road/index.wxml b/pages/order/road/index.wxml
index 11185fd..9d857f5 100644
--- a/pages/order/road/index.wxml
+++ b/pages/order/road/index.wxml
@@ -24,7 +24,7 @@
      <view class="day-item{{selectDate.selectMonth==month[monthIndex] && selectDate.selectDate==(index+1)?' active':''}}" wx:for="{{monthIndex==1?monthDays2[0]:monthDays1[0]}}">
       <view class="date-item-in" bindtap="selectDate" data-item="{{item}}">
         <view class="date-num{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!=null?' active':''}}">{{(index+1)>=10?(index+1):("0"+(index+1))}}</view>
-        <view class="price" wx:if="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!==null && prices[month[monthIndex]+'-'+(index+1)].stock!==null}}">￥{{prices[month[monthIndex]+'-'+(index+1)].product_price/100}}</view>
+        <view class="price" wx:if="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!==null && prices[month[monthIndex]+'-'+(index+1)].stock!==null}}">￥{{prices[month[monthIndex]+'-'+(index+1)].m_price/100}}</view>
         <view class="date-price-place" wx:elif="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].stock==0}}">售罄</view>
         <view class="date-price-place" wx:else></view>
       </view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index ebf2e9c..009d5cf 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -46,7 +46,8 @@ Page({
       date:null,
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
 			isCar:options.isCar
-		})
+    })
+    console.log(app.globalData);
     if (!app.globalData.product) {
       util.back();
       return;
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index de965af..584fcc5 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -95,10 +95,14 @@ Page({
         let orderNum = 0;
         item.order_product_list.map(order=>{
           orderNum = orderNum + order.product_num;
+          ///
           // 景点线路场馆酒店四类产品的订单 如果是已支付未出票的显示出票中
           if(order.state=='PAID' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){
             item.orderStateText="出票中"
           }
+          if(order.state=='WAIT_USE' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){
+            item.orderStateText="已出票"
+          }
         })
         if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1 && this.data.lon && this.data.lat){
           let ajax = commonApi.user_post("order/tripplan",{

From 2d74e1b57017448f756e6912768ac0797a7a443b Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sun, 16 Jul 2023 13:16:09 +0800
Subject: [PATCH 075/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.js   | 20 +++++++++-----------
 pages/user/order/sceneOrderInfo/index.wxml |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index b06dc2b..69f972d 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -27,7 +27,8 @@ Page({
     sysm:false,
     sysmText:'更多',
     sysm2:false,
-    sysm2Text:'更多'
+    sysm2Text:'更多',
+    imgLen:[]
   },
 
   /**
@@ -48,11 +49,13 @@ Page({
     })
   },
   getCodeImg:function(){
-    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0;
-  
-
+    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0,arr = [];
     this.data.info.order_product_list.forEach(qrcode=>{
-      qrcode.qrcode.map((item)=>{
+      qrcode.qrcode.map((item,index)=>{
+        arr.push(index)
+        this.setData({
+          imgLen:arr
+        })
         if(item.use_url&&item.use_code){
           codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText});
           // if(codeImgs.length==qrcode.qrcode.length){
@@ -65,8 +68,6 @@ Page({
           })
         }
         else {
-          console.log(1231231232131);
-          console.log(codeId);
           new QRCode('damocode'+codeId,{
             text: item.use_code,
             width: 300 * radio,
@@ -74,14 +75,11 @@ Page({
             padding:10, // 生成二维码四周自动留边宽度，不传入默认为0
             correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
             callback: (res) => {
+              console.log(res);
               codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText});
               that.setData({
                 codeImgs:codeImgs
               })
-             
-              // if(codeImgs.length==qrcode.qrcode.length){
-
-              // }
             }
           })
           codeId = codeId + 1
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 1e497f9..3e1836f 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -2,7 +2,7 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="订单详情"></title>
 <view class="top-bg"></view>
-<canvas wx:for="{{info.order_product_list}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
+<canvas wx:for="{{imgLen}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
 <view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <!-- <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>

From 59b750428e1cd43f0e530cb36860f0a72a94eee4 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 20 Jul 2023 11:05:01 +0800
Subject: [PATCH 076/471] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                  |  2 +-
 pages/info/groupOrderInfo/index.wxml    | 24 +++++++++++-------------
 pages/info/groupOrderInfo/index.wxss    | 10 ++++------
 pages/order/card/index.js               |  2 +-
 pages/order/components/contact/index.js |  2 +-
 pages/order/components/date/index.wxml  |  4 ++--
 pages/order/scene/index.js              |  2 +-
 pages/order/sceneCart/index.js          |  2 +-
 8 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/app.js b/app.js
index 8619030..a5fb48f 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.isTest84? true : false;
+      data.isTest = data.isTest85? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml
index d76bc7e..6491d0a 100644
--- a/pages/info/groupOrderInfo/index.wxml
+++ b/pages/info/groupOrderInfo/index.wxml
@@ -1,29 +1,27 @@
 <!--pages/info/groupOrderInfo/index.wxml-->
 <title title="团体信息"></title>
-<view class="box" wx:if="{{info && info.list && info.list.state==0}}">
-  <view class="code">{{info.list.state_text}}</view>
-  <view class="code">{{info.list.team_name}}</view>
+<view class="box">
+  <view wx:if="{{info.list.state!=2}}" class="code"  style="margin: 42rpx;">{{info.list.team_name}}</view>
+  <view wx:if="{{info.list.state==2}}">
+  <view class="code" style="margin-top: 42rpx;">成功预约人数</view>
+  <view class="code" style="margin: 42rpx;">{{info.list.members_count}}</view>
+</view>
   <view class="top-tips top-new-tips">
     <view class="top-tip">场馆名称：{{info.list.scene.title}}</view>
     <view class="line" style="height:25rpx"></view>
     <view class="top-tip">预约时间：{{info.list.order_info.product_list[0].start_time}} ~ {{info.list.order_info.product_list[0].end_time}}</view>
   </view>
-  <view class="top-tips">
+  <view class="top-tips" wx:if="{{info.list.state!=2}}">
     <view class="top-tip">预约人数：{{info.list.member_num}}</view>
     <view class="line"></view>
     <view class="top-tip">填写信息人数：{{info.list.members_count}}</view>
   </view>
-  <button bindtap="showShare" style="width:100%" class="top-btn">立即邀请</button>
-  <view class="top-btn full" bindtap="order">提交订单</view>
-  <view class="count-down" wx:if="{{restTime}}">组团中({{restTime}})</view>
-</view>
-<view wx:else class="box">
-  <view class="code">{{info.list.state_text}}</view>
-  <view class="code">成功预约人数</view>
-  <view class="code" style="margin-top:50rpx">{{info.list.members_count}}</view>
+  <button wx:if="{{info.list.state==0}}" bindtap="showShare" style="width:100%" class="top-btn">立即邀请</button>
+  <view wx:if="{{info.list.state==0}}" class="top-btn full" bindtap="order">提交订单</view>
+  <view class="count-down" >{{info.list.state_text}} <text wx:if="{{restTime}}">{{(restTime)}}</text> </view>
 </view>
 <view class="box" wx:if="{{info && info.list}}">
-  <view wx:if="{{info.list.state==0}}" class="new-tip">倒计时结束后订单将自动提交至后台，订单提交后团员信息将无法修改</view>
+  <view wx:if="{{info.list.state!=2}}" class="new-tip">倒计时结束后订单将自动提交至后台，订单提交后团员信息将无法修改</view>
   <view class="box-title" wx:if="{{info.list.state==0}}">已填写信息团员</view>
   <view class="box-title" wx:else>预约成功团员</view>
   <view class="search-box">
diff --git a/pages/info/groupOrderInfo/index.wxss b/pages/info/groupOrderInfo/index.wxss
index 13d8fb0..d93f1d9 100644
--- a/pages/info/groupOrderInfo/index.wxss
+++ b/pages/info/groupOrderInfo/index.wxss
@@ -15,8 +15,6 @@ page {
 .code {
   color: #0B898E;
   font-size: 40rpx;
-  font-weight: bold;
-  line-height: 100rpx;
 }
 .top-tips {
   display: flex;
@@ -128,14 +126,14 @@ page {
 .count-down {
   position: absolute;
   left: 50%;
-  line-height: 40rpx;
+  line-height: 50rpx;
   background: #0B898E;
   border-radius: 0px 0px 20rpx 20rpx;
   text-align: center;
   color: #fff;
-  font-size: 26rpx;
-  width: 300rpx;
-  margin-left: -150rpx;
+  font-size: 32rpx;
+  width: 320rpx;
+  margin-left: -160rpx;
   top: 0;
 }
 .top-new-tips {
diff --git a/pages/order/card/index.js b/pages/order/card/index.js
index d46a8ce..daa974d 100644
--- a/pages/order/card/index.js
+++ b/pages/order/card/index.js
@@ -90,7 +90,7 @@ Page({
   add:function(){
     if(this.data.product.sku.sku_model.traveller_limit_num!=0 && this.data.productNum==this.data.product.sku.sku_model.traveller_limit_num){
       wx.showToast({
-        title: '出行人限购'+this.data.product.sku.sku_model.traveller_limit_num+"份",
+        title: '本产品单笔限购'+this.data.product.sku.sku_model.traveller_limit_num+"份",
         icon:'none'
       })
       return;
diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js
index 57ad8ab..980d2a3 100644
--- a/pages/order/components/contact/index.js
+++ b/pages/order/components/contact/index.js
@@ -253,7 +253,7 @@ Component({
       }
       else if(item.selected!=1 && traveller_limit_num!=0 && num>=traveller_limit_num && traveller_limit_num!=-1){
         wx.showToast({
-          title: '出行人限购'+traveller_limit_num+"份",
+          title: '本产品单笔限购'+traveller_limit_num+"份",
           icon:'none'
         })
         return;
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index b390736..aa27875 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -4,7 +4,7 @@
   <view class="dates-boxes">
     <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for="{{threeDays}}">
       <view>{{item.date}}</view>
-      <view class="price" wx:if="{{ !isTeam && item.stock==-1}}">不开放</view>
+      <view class="price" wx:if="{{ !isTeam && item.stock==-1}}">不可定</view>
       <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
       <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
       <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
@@ -18,7 +18,7 @@
     </view>
   </view>
   <view class="date-times" wx:if="{{timelist.length>0}}">
-    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}">不开放</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
+    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number<=0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}">不可定</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
   </view>
   <!-- <view class="date-times" wx:elif="{{activeDate.is_time_stock}}">
     <view>已售罄</view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 009d5cf..6e3dbd9 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -110,7 +110,7 @@ Page({
     }
     if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
       wx.showToast({
-        title: '出行人限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
         icon: 'none'
       })
       return;
diff --git a/pages/order/sceneCart/index.js b/pages/order/sceneCart/index.js
index 9a44ffe..924fa93 100644
--- a/pages/order/sceneCart/index.js
+++ b/pages/order/sceneCart/index.js
@@ -88,7 +88,7 @@ Page({
   add: function () {
     if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
       wx.showToast({
-        title: '出行人限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
         icon: 'none'
       })
       return;

From a7ea04a5ae58c8311c46044a220b8ba7604b4632 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 20 Jul 2023 15:04:14 +0800
Subject: [PATCH 077/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index a5fb48f..10916a2 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.isTest85? true : false;
+      data.isTest = data.isTest86? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 476787cbff0e4326284b543509ee02d033a854d3 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 21 Jul 2023 10:11:52 +0800
Subject: [PATCH 078/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.js   | 30 +++++++++++++++++++++++-------
 pages/order/orderList/index.wxml |  4 ++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 220d57c..0ae9234 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -17,7 +17,7 @@ Page({
   gp_id: null,
   showPrice: 0,
   postFee: 0,
-  coupon:null,
+  coupon:app.globalData.couponInfo,
   select_allowance: false,
   allowance_data: null,
   allowance_price: 0,
@@ -35,8 +35,6 @@ Page({
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       flag:options.flag
     })
-    console.log(this.data.flag);
-    console.log(app.globalData);
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
       if (!app.globalData.kjId && !this.data.gp_id) {
@@ -107,14 +105,32 @@ Page({
         item.remark = e.detail.value;
       }
     })
-  },
+	},
+	    //获取最高优惠券
+			getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      coupon: app.globalData.couponInfo
-    })
+		try {
+			if (Object.keys(app.globalData.couponInfo).length!=0) {
+				this.setData({
+					coupon: app.globalData.couponInfo
+				})
+			}else{
+				this.setData({
+					coupon:null
+				})
+			}
+		} catch (error) {
+			this.setData({
+				coupon:null
+			})
+		}
   },
 
   /**
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index b9a3b52..2e1cc30 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -52,11 +52,11 @@
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view>
-<coupon id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
 <view class="fixed-bottom">
     <view class="fixed-price-box">
-		<text>合计：</text>
+		<text>合计:</text>
 		<text class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
     </view>
     <view class="fixed-btn" bindtap="order">下一步</view>

From 6882a26ad1ee26a1c5dbf086a9f2984542ca597d Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 27 Jul 2023 18:01:37 +0800
Subject: [PATCH 079/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=20=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/myCalendar/index.js    |   3 +
 pages/component/myCalendar/index.wxml  |   6 +-
 pages/order/components/date/index.wxml |   9 +-
 pages/order/movie/index.js             |  22 +++-
 pages/order/movie/index.wxml           | 153 ++++++++++++++-----------
 pages/order/movie/index.wxss           | 101 +++++++++++++++-
 pages/order/orderList/index.wxss       |   1 -
 pages/user/cartlist/list.js            |  24 +++-
 pages/user/cartlist/list.wxml          |  23 +++-
 pages/user/cartlist/list.wxss          |  67 ++++++++++-
 utils/filter.wxs                       |  17 ++-
 11 files changed, 345 insertions(+), 81 deletions(-)

diff --git a/pages/component/myCalendar/index.js b/pages/component/myCalendar/index.js
index d338df6..3890b73 100644
--- a/pages/component/myCalendar/index.js
+++ b/pages/component/myCalendar/index.js
@@ -144,6 +144,9 @@ Component({
     onTapDay:function(e){
       let date = e.currentTarget.dataset.date;
       console.log(date)
+      if (date.stock==-1||date.stock==null) {
+        return
+      }
       if(!date || date.price===null || date.stock==null || date.stock==0) return;
       this.triggerEvent("onTapDay",date)
     },
diff --git a/pages/component/myCalendar/index.wxml b/pages/component/myCalendar/index.wxml
index 4f32041..e6aa9c1 100644
--- a/pages/component/myCalendar/index.wxml
+++ b/pages/component/myCalendar/index.wxml
@@ -11,11 +11,11 @@
     </view>
     <view class='date-box'>
         <view bindtap="onTapDay" wx:for='{{dateArr}}' class='{{activeDay == item.date ? "nowDay" : ""}}' data-date='{{dates[item.date]}}' style="flex-direction:column">
-            <view class='date-head{{(!dates[item.date] || dates[item.date].stock<=0 || dates[item.date].stock==null || dates[item.date].price==null)?" disable":""}}'>
+            <view class='date-head{{(!dates[item.date] || dates[item.date].stock<=0 || dates[item.date].stock==null  || dates[item.date].price==null)?" disable":""}}'>
                 <view>{{item.dateNum}}</view>
             </view>
-            <view class="date-tip" wx:if="{{dates[item.date] && dates[item.date].price!==null && dates[item.date].stock!=0 && dates[item.date].stock!==null}}">￥{{dates[item.date].price==0 || isKj?'免费':(dates[item.date].price/100)}}</view>
-            <!-- <view class="date-tip disable" wx:if="{{dates[item.date] && (dates[item.date].stock==null || dates[item.date].price==null)}}">不可定</view> -->
+            <view class="date-tip" wx:if="{{dates[item.date] && dates[item.date].price!==null && dates[item.date].stock!=0 && dates[item.date].stock!==null&& dates[item.date].stock!==-1}}">￥{{dates[item.date].price==0 || isKj?'免费':(dates[item.date].price/100)}}</view>
+            <!-- <view class="date-tip disable" wx:if="{{dates[item.date] && (dates[item.date].stock==null || dates[item.date].stock==-1)}}">不可定</view> -->
             <view class="date-tip disable" wx:if="{{dates[item.date] && dates[item.date].stock==0}}">{{dates[item.date].tipText?dates[item.date].tipText:'售罄'}}</view>
             <!-- <view class='date-weight'>{{item.weight}}</view> -->
         </view>
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index aa27875..13a90d3 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -1,10 +1,11 @@
 <!--pages/order/components/date/index.wxml-->
+<wxs src="../../../../utils/filter.wxs" module="tool" />
 <view class="date-box">
   <view class="box-title">使用日期</view>
   <view class="dates-boxes">
-    <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for="{{threeDays}}">
-      <view>{{item.date}}</view>
-      <view class="price" wx:if="{{ !isTeam && item.stock==-1}}">不可定</view>
+    <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{threeDays}}">
+      <view>{{tool.showAllSeldDate(item.date,index)}}</view>
+      <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
       <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
       <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
       <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
@@ -18,7 +19,7 @@
     </view>
   </view>
   <view class="date-times" wx:if="{{timelist.length>0}}">
-    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number<=0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}">不可定</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
+    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}"> 不可定</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
   </view>
   <!-- <view class="date-times" wx:elif="{{activeDate.is_time_stock}}">
     <view>已售罄</view>
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index d722ee3..dd5b2bd 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -17,7 +17,9 @@ Page({
 		prizeId:null,
 		num:0,
 		sPrice:0,
-		hideMx:false
+    hideMx:false,
+    showModel:false,
+    agree:false
   },
 
   /**
@@ -65,6 +67,13 @@ Page({
 
   },
   order:function(){
+    if (!this.data.agree) {
+      wx.showToast({
+        title: '请您先同意购票退改规则',
+        icon:'none'
+      })
+      return
+    }
     if(!this.data.tel){
       wx.showToast({
         title: '请输入手机号',
@@ -127,6 +136,17 @@ Page({
 			hideMx:!this.data.hideMx
 		})
   },
+  closeModel(){
+    this.setData({
+      showModel:!this.data.showModel,
+      agree:false
+    })
+  },
+  changeAgree(){
+    this.setData({
+      agree:!this.data.agree
+    })
+  },
   //获取最高优惠券
       getNewCoupon(e){
         this.setData({
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 0172212..3565da2 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -1,78 +1,99 @@
 <!--pages/order/movie/index.wxml-->
 <title title="订单填写"></title>
 <view class="info-box" wx:if="{{product}}">
-	<view class="info-top">
-		<image src="{{product.product.headimg}}" mode="aspectFill"></image>
-		<view class="info">
-			<view class="title">{{product.info.movieName}}</view>
-			<view>{{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
-			<!-- <view>{{product.info.cinema_title}}</view> -->
-			<view>{{product.info.cinemaName}}</view>
-			<view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
-		</view>
-	</view>
+  <view class="info-top">
+    <image src="{{product.product.headimg}}" mode="aspectFill"></image>
+    <view class="info">
+      <view class="title">{{product.info.movieName}}</view>
+      <view>{{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
+      <!-- <view>{{product.info.cinema_title}}</view> -->
+      <view>{{product.info.cinemaName}}</view>
+      <view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
+    </view>
+  </view>
 </view>
 
 <view class="tips">
-	<view class="tips-box">
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" />
-		<view>
-			不支持退票
-		</view>
-	</view>
-	<view class="tips-box">
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" alt="" />
-		<view>
-			不支持改签
-		</view>
-	</view>
+  <view class="tips-box">
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" />
+    <view>
+      不支持退票
+    </view>
+  </view>
+  <view class="tips-box">
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" alt="" />
+    <view>
+      不支持改签
+    </view>
+  </view>
 </view>
 <view class="tel-box">
-		<text>手机号码：</text>
-		<input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
-	</view>
-<coupon bind:getNewCoupon = 'getNewCoupon' money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
-
-
+  <text>手机号码：</text>
+  <input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
+</view>
+<coupon bind:getNewCoupon='getNewCoupon' money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
 <view class="fix-info {{!hideMx?'hide':''}}">
-	<view class="info-item">
-		<view>
-			费用明细
-		</view>
-		<view>
-			￥{{price/100}}
-		</view>
-	</view>
-	<view  class="info-item">
-		<view>
-			票价
-		</view>
-		<view>
-			￥{{sPrice}} x {{num}}
-		</view>
-	</view>
-	<view  class="info-item">
-		<view>
-			优惠券
-		</view>
-		<view>
-			- ￥{{coupon?coupon.activity.money/100:0}}
-		</view>
-	</view>
-	<view  class="info-item">
-		<view>
-		</view>
-		<view>
-			订单总额:<text style="color: #D62828; font-weight: bold;">¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</text>
-		</view>
-	</view>
+  <view class="info-item">
+    <view>
+      费用明细
+    </view>
+    <view>
+      ￥{{price/100}}
+    </view>
+  </view>
+  <view class="info-item">
+    <view>
+      票价
+    </view>
+    <view>
+      ￥{{sPrice}} x {{num}}
+    </view>
+  </view>
+  <view class="info-item">
+    <view>
+      优惠券
+    </view>
+    <view>
+      - ￥{{coupon?coupon.activity.money/100:0}}
+    </view>
+  </view>
+  <view class="info-item">
+    <view>
+    </view>
+    <view>
+      订单总额:<text style="color: #D62828; font-weight: bold;">¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</text>
+    </view>
+  </view>
 </view>
 <view class="fixed-bottom">
-	<view class="money-box">
-		<view class="price" wx:if="{{prizeId}}">¥0</view>
-		<view class="price" wx:else>¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</view>
-		<view>总计优惠{{coupon?coupon.activity.money/100:0}}元</view>
-	</view>
-	<view class="tip" bindtap="mingxi">明细</view>
-	<view class="btn" bindtap="order">立即付款</view>
+  <view class="money-box">
+    <view class="price" wx:if="{{prizeId}}">¥0</view>
+    <view class="price" wx:else>¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</view>
+    <view>总计优惠{{coupon?coupon.activity.money/100:0}}元</view>
+  </view>
+  <view class="tip" bindtap="mingxi">明细</view>
+  <view class="btn" bindtap="closeModel">立即付款</view>
+</view>
+<view class="mask" wx:if="{{showModel}}">
+  <view class="model">
+    <image bindtap="closeModel" class="close-img" src="https://static.ticket.sz-trip.com/uploads/20230725/e63b0a4ec4063bb92767690bbf857bb9.png" mode="" />
+    <view class="model-title">
+      退改须知
+    </view>
+    <view class="model-content">
+      <text>该产品一经购买，不支持退票/改签，</text> 您的订单页面会显示【不支持退票】【不支持改签】提示，此时 <text>平台无法为您处理退。</text> 请您提前规划好出行时间，按时观影。
+    </view>
+    <view class="select-btn" bindtap="changeAgree">
+      <image src="{{agree?'https://static.ticket.sz-trip.com/uploads/20230725/9eda0f72b566f904b40c1a493b3c4c44.png':'https://static.ticket.sz-trip.com/uploads/20230725/0f6634ada1fc348a10a818b6f77239cd.png'}}" mode="aspectFill" />
+      <view class="select-text">
+        我已认可此规则
+      </view>
+    </view>
+    <view class="btn-send {{agree?'send':''}}" bindtap="order">
+      继续购票
+    </view>
+    <view class="btn-close" bindtap="closeModel">
+      暂不购票
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss
index 8b58f41..044ca49 100644
--- a/pages/order/movie/index.wxss
+++ b/pages/order/movie/index.wxss
@@ -183,4 +183,103 @@ page {
 }
 .fix-info.hide{
 	bottom:-300rpx;
-}
\ No newline at end of file
+}
+
+.mask {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 999;
+  }
+  .model{
+    width: 600rpx;
+    min-height: 667rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    position: absolute;
+    box-sizing: border-box;
+
+  }
+  .model-title{
+    text-align: center;
+    font-size: 34rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+    margin-top: 40rpx;
+    box-sizing: border-box;
+
+  }
+  .model-content{
+    margin-top:44rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: rgba(102, 102, 102, 1);
+    padding: 0 45rpx;
+    line-height: 51rpx;
+  }
+  .btn-send{
+
+    width: 440rpx;
+  height: 87rpx;
+
+  color: #FFFFFF;
+background: #CCCCCC;
+  border-radius: 43rpx;
+  margin: 0 auto;
+  margin-top: 40rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    line-height: 87rpx;
+    text-align: center;
+  
+  }
+  .model-content text{
+      color: #D62828;
+      font-weight: bold;
+  }
+  .select-btn{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top:90rpx;
+  }
+  .select-btn image{
+    width: 33.33rpx;
+    height: 33.33rpx;
+  }
+  .select-text{
+    margin-left: 19rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #666666;
+
+  }
+  .btn-close{
+    position: absolute;
+    bottom: -70rpx;
+    text-align: center;
+    width: 100%;
+      font-size: 32rpx;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #FFFFFF;
+  }
+  .close-img{
+    width: 33.33rpx;
+    height: 33.33rpx;
+    position: absolute;
+    right: 32rpx;
+    top: 30rpx;
+  }
+  .btn-send.send{
+  background: #D62828;
+  color: #FFFFFF;
+
+  }
\ No newline at end of file
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 5685983..17386b9 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -61,5 +61,4 @@ page{
   align-items: center;
   background-color: #fff;
 	margin: 30rpx 25rpx;
-
 }
\ No newline at end of file
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 4c7bbc2..5c4dfc4 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -23,7 +23,8 @@ Page({
         flag: false, //判断订单是否同时有商品和票
         isCar: 'single', //判断是否购物车
         showQrCode: false,
-        wxqrcode: null
+        wxqrcode: null,
+        showModel:false
     },
 
     /**
@@ -222,6 +223,27 @@ Page({
         })
 
     },
+  checkOrder(){
+        console.log(this.data.list);
+        let list = this.data.list,product = []
+        list.map(item => {
+          if (item.checked) {
+            product.push(item)
+          }
+      })
+      if (product.length>1) {
+        this.setData({
+          showModel:true
+        })
+      }else{
+        this.order()
+      }
+    },
+    closeModel(){
+      this.setData({
+        showModel:false
+      })
+    },
     touchStart(e) { //移动前点击的位置
         console.log(e)
         // 在开始触摸时将所有startTouchMove设置为flase,对当前的为true
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index c8478c6..0db4975 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -34,7 +34,7 @@
   <view class="bottom-price">¥{{allPrice/100}} </view>
   <view style="margin-right: 10rpx; font-size: 29rpx;color: #000;">起</view>
   <view style="flex:1"></view>
-  <view class="btn" bindtap="order">去下单</view>
+  <view class="btn" bindtap="checkOrder">去下单</view>
 </view>
 
 <view class="fixed-bottom" wx:if="{{list.length>0&&manageFlag===true}}">
@@ -43,4 +43,23 @@
   <view class="fixed-btn del-btn" bindtap="delM">删除</view>
 </view>
 <code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
-</code>
\ No newline at end of file
+</code>
+<view class="mask" wx:if="{{showModel}}"> 
+  <view class="model">
+    <view class="model-title">
+      购买须知
+    </view>
+    <view class="model-content">
+      <view>多产品订单一经购买</view>
+      <view style="color:rgba(196, 0, 0, 1);margin-top: 10rpx;">不支持部分退改</view>
+    </view>
+    <view class="btn-list">
+        <view class="model-btn" bindtap="closeModel">
+          取消
+        </view>
+        <view class="model-btn" style="color:#0B898E;border-left:#D8D8D8 solid 1rpx;" bindtap="order">
+          确定
+        </view>
+    </view>
+  </view>
+</view>
diff --git a/pages/user/cartlist/list.wxss b/pages/user/cartlist/list.wxss
index 4f59ab3..c5c40fd 100644
--- a/pages/user/cartlist/list.wxss
+++ b/pages/user/cartlist/list.wxss
@@ -174,4 +174,69 @@ page {
   color: #FB6E4D;
   background: white;
   margin-right:40rpx ;
-}
\ No newline at end of file
+}
+  .mask {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 999;
+    }
+    .model{
+      width: 561rpx;
+      min-height: 449rpx;
+      background: #FFFFFF;
+      border-radius: 13rpx;
+      position: absolute;
+      box-sizing: border-box;
+
+    }
+    .model-title{
+      text-align: center;
+      font-size: 34rpx;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #333333;
+      margin-top: 32rpx;
+      box-sizing: border-box;
+
+    }
+    .model-content{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      flex-wrap: wrap;
+      margin-top: 100rpx;
+      font-size: 34rpx;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #333333;
+    }
+    .btn-list{
+      height: 106rpx;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      border-top: 1rpx solid rgba(216, 216, 216, .99);
+      padding: 10rpx;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+    }
+    .model-btn{
+      width: 50%;
+      text-align: center;
+      height: 86rpx;
+      line-height: 86rpx;
+
+    font-size: 34rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    }
+
diff --git a/utils/filter.wxs b/utils/filter.wxs
index abc5cd1..8fe5028 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -25,11 +25,26 @@ var gotoUrl = function(item){
   str += "/index?id="+item.id;
   return str;
 }
+  // 价格日历显示返回
+var showAllSeldDate = function (date, index) {
+    // return date.substring(5, 10)
+    switch (index) {
+      case 0:
+        return '今天' + date.substring(5, 10)
+      case 1:
+        return '明天' + date.substring(5, 10)
+      case 2:
+        return '后天' + date.substring(5, 10)
+      default:
+        return date.substring(5, 10)
+    }
+  }
 var toFix = function(value) {
       return (value / 100).toFixed(2);
 };
 module.exports = {
   formateRichText:formateRichText,
   gotoUrl:gotoUrl,
-  toFix:toFix
+  toFix:toFix,
+  showAllSeldDate:showAllSeldDate
 };
\ No newline at end of file

From fe3d8f20a793db9b784321203a96d2af2a7e2fec Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 28 Jul 2023 17:49:46 +0800
Subject: [PATCH 080/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js |  3 +-
 pages/list/museum/index.js          |  9 ++++
 pages/order/card/index.js           |  8 ++-
 pages/order/card/index.wxml         |  2 +-
 pages/order/postOrder/index.js      |  2 -
 pages/order/scene/index.js          |  3 +-
 pages/order/scene/index.wxml        |  2 +-
 pages/user/user.js                  | 24 ++++-----
 pages/user/user.wxml                | 19 ++++++-
 pages/user/user.wxss                | 80 ++++++++++++++++++++++++++++-
 10 files changed, 129 insertions(+), 23 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 738a610..cf996ad 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -303,7 +303,7 @@ Page({
         })
     },
     order: function () {
-        app.globalData.postProduct = null
+        app.globalData.postProduct = []
         app.globalData.list = []
         commonApi.user_post("/product/checkStock", {
             sku_id: this.data.info.sku[this.data.skuIndex].id,
@@ -669,6 +669,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
+        app.globalData.postProduct = []
         if (!wx.getStorageSync('jstrip_token')) {
             return;
         }
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index 4f0d59a..aa11408 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -20,6 +20,15 @@ Page({
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
+    console.log(item);
+    if (item.id==5461) {
+        wx.navigateToMiniProgram({
+            appId: 'wxfef80ee1ab7e58a2',
+            path: 'pages/inners/main'
+          })
+          return;
+    }
+
     util.gotoDetail(item,1);
   },
   gotoDetailOther: function(e) {
diff --git a/pages/order/card/index.js b/pages/order/card/index.js
index daa974d..dbe8f82 100644
--- a/pages/order/card/index.js
+++ b/pages/order/card/index.js
@@ -76,7 +76,7 @@ Page({
   setLinkman:function(e){
     let linkmanList = e.detail;
     this.setData({
-      productNum:linkmanList.length==0?1:linkmanList.length,
+    //   productNum:linkmanList.length==0?1:linkmanList.length,
       linkmanList:linkmanList
     })
   },
@@ -196,6 +196,12 @@ Page({
       console.log(res)
     })
   },
+      //获取最高优惠券
+    getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/order/card/index.wxml b/pages/order/card/index.wxml
index dc5a550..638aeb7 100644
--- a/pages/order/card/index.wxml
+++ b/pages/order/card/index.wxml
@@ -32,7 +32,7 @@
     <view wx:if="{{product.sku.sku_model.fetch_type!='selffetch'}}" class="fill-item{{type==1?' active':''}}" bindtap="changeType" data-type="1">邮寄</view>
   </view>
 </view>
-<coupon id="coupon" money="{{productNum *(product.sku.price +  1 * (product.sku.sku_model.recharge[skuIndex] || 0)) + 1 *postFee}}" sku="{{product.sku.id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon' id="coupon" money="{{productNum *(product.sku.price +  1 * (product.sku.sku_model.recharge[skuIndex] || 0)) + 1 *postFee}}" sku="{{product.sku.id}}"></coupon>
 
 <view class="box" wx:if="{{type==1}}">
   <view class="box-title">
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 265207d..f48f637 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -315,8 +315,6 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    console.log(12312312321);
-
   },
 
   /**
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6e3dbd9..bb104c2 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -36,6 +36,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+      
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -47,7 +48,7 @@ Page({
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
 			isCar:options.isCar
     })
-    console.log(app.globalData);
+
     if (!app.globalData.product) {
       util.back();
       return;
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 0dac30d..efebf2e 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -35,7 +35,7 @@
     </view>
   </view>
 
-  <coupon bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
 
   <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
diff --git a/pages/user/user.js b/pages/user/user.js
index ab9607c..7fcff9d 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -16,7 +16,8 @@ Page({
     orderList: [],//订单列表
     timeList: [],//倒计时
     timerOut: null,//定时器
-    formatTime:[]
+    formatTime:[],
+    showModel:false
   },
 
   /**
@@ -60,6 +61,11 @@ Page({
       }
     })
   },
+  closeModel(){
+    this.setData({
+      showModel:false
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -85,19 +91,9 @@ Page({
     util.pagePoint(e)
   },
   phoneCall:function(){
-      wx.showModal({
-        title:'呼叫人工客服',
-        content:'0512-66555111\n客服服务时间：08:30-17:30',
-        success:function(res){
-            if (res.cancel) {
-              return
-            }else{
-              wx.makePhoneCall({
-                phoneNumber:'0512-66555111',
-              })
-            }
-        }
-      })
+        this.setData({
+            showModel:true
+        })
   },
   getList:function(){
     commonApi.user_post("order/list",{
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 3702040..27baf57 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -73,7 +73,7 @@
       在线客服
     </navigator> -->
     <view class="user-box-line" bindtap="phoneCall">
-      呼叫人工客服
+      人工客服
     </view>
     <navigator url="coupon/index" class="user-box-line" catchtap="pagePoint" data-event="mine_card">
       我的卡券
@@ -121,4 +121,21 @@
     </navigator>
   </view>
 </view>
+<view class="mask" wx:if="{{showModel}}"> 
+  <view class="model">
+
+    <view class="model-content">
+      <view>即将跳转人工客服</view>
+      <view style="margin-top: 40rpx;">客服服务时间：08：30-17：30</view>
+    </view>
+    <view class="btn-list">
+        <button class="model-btn" bindtap="closeModel">
+          取消
+        </button>
+        <button class="model-btn" style="color:#0B898E;border-left:#D8D8D8 solid 1rpx;" open-type="contact">  
+        确定
+        </button>
+    </view>
+  </view>
+</view>
 <view style="height:20rpx"></view>
\ No newline at end of file
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index d503b9e..34d22ba 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -144,4 +144,82 @@ font-family: PingFang SC;
 font-weight: 400;
 color: #666666;
 margin-top: 10rpx;
-}
\ No newline at end of file
+}
+.mask {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 999;
+    }
+    .model{
+      width: 561rpx;
+      min-height: 449rpx;
+      background: #FFFFFF;
+      border-radius: 13rpx;
+      position: absolute;
+      box-sizing: border-box;
+
+    }
+    .model-title{
+      text-align: center;
+      font-size: 34rpx;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #333333;
+      margin-top: 32rpx;
+      box-sizing: border-box;
+
+    }
+    .model-content{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      flex-wrap: wrap;
+      margin-top: 100rpx;
+      font-size: 34rpx;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #333333;
+    }
+    .btn-list{
+      height: 106rpx;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      border-top: 1rpx solid rgba(216, 216, 216, .99);
+      padding: 10rpx;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+    }
+    .model-btn{
+      width: 50%;
+      text-align: center;
+      height: 86rpx;
+      line-height: 86rpx;
+
+    font-size: 34rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    }
+
+    button{
+        margin:0;
+        padding:0;
+        border-radius:0;
+        border:none;
+        background-color:transparent;
+    }
+    
+    button::after{
+        border: none;
+    }
+    
+    
\ No newline at end of file

From 55e3ee61dd4fa15b8427aab44a2abfe1b2cb560d Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 31 Jul 2023 09:28:37 +0800
Subject: [PATCH 081/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/scene/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index bb104c2..0472109 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -67,7 +67,7 @@ Page({
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
    console.log(this.data.product);
-    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
   },
@@ -137,8 +137,9 @@ Page({
         icon: 'none'
       })
     }
-    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag) {
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag && this.data.type!='museum') {
       this.couponCom.setNullCoupon()
+
     }
     app.globalData.couponInfo = null;
     this.setData({
@@ -157,7 +158,7 @@ Page({
       this.setData({
         coupon: null
       })
-      if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
+      if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
         this.couponCom.setNullCoupon()
       }
       app.globalData.couponInfo = null;

From 42a5925dddc37e08b0dd76b22cae918549871754 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 3 Aug 2023 17:40:48 +0800
Subject: [PATCH 082/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86,=E7=94=B5?=
 =?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            |  2 +-
 pages/list/activitynew/index.js   | 29 ++++++++++++++++++++++++++++-
 pages/list/activitynew/index.wxml | 12 ++++++++++--
 pages/list/activitynew/index.wxss | 29 +++++++++++++++++++++++------
 pages/list/museum/index.js        |  7 +++++++
 5 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 10916a2..a2fc7bd 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.isTest86? true : false;
+      data.isTest = data.isTest87? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 2e38e77..5f4c314 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -26,13 +26,17 @@ Page({
     lat: "",
     lon: "",
     keywords: "",
-    realKeywords: ""
+    realKeywords: "",
+    movieAreas:[],
+    movieArea:0
+
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.getMovieArea()
     let d = new Date();
     let month = d.getMonth() + 1,
       day = d.getDate();
@@ -86,6 +90,18 @@ Page({
     console.log(this.data.type);
     this.getList();
   },
+  getMovieArea(){
+    commonApi._post("act/get_suzhou_areas_syt").then(res => {
+      res.data.unshift({
+        area_id: "",
+        area_title: "苏州市"
+      })
+      this.setData({
+        movieAreas:res.data
+      })
+      this.getList()
+    })
+  },
   changeArea: function (e) {
     this.setData({
       area: e.detail.value,
@@ -241,6 +257,7 @@ Page({
       data.lon = this.data.lon;
       data.is_price_sort = this.data.sort == 'price';
       data.is_distance_sort = this.data.sort == 'distance';
+      data.city_code=this.data.movieAreas[this.data.movieArea].area_id||""
     }
     // if(this.data.movieType==1){
     //   data.queryDate = this.data.date
@@ -317,6 +334,16 @@ Page({
     })
     this.getList();
   },
+setCity(e){
+  this.setData({
+    movieArea: e.detail.value,
+    list: [],
+    total: 1,
+    pageNo: 1,
+    moreFlag: true
+  })
+  this.getList()
+},
   changeMovieType: function (e) {
     let type = e.currentTarget.dataset.type;
     this.setData({
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 8deb5c0..30c41da 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -74,8 +74,16 @@
     <!-- <view bindtap="changeMovieType" data-type='3' class="movie-type {{movieType==3?'active':''}}">即将上映</view> -->
   </view>
   <view class="sort-box" wx:if="{{type==4 && movieType==2}}">
-    <view class="{{sort=='distance'?'active':''}}" bindtap="setSort" data-sort="distance">离我最近</view>
-    <view class="{{sort=='price'?'active':''}}" bindtap="setSort" data-sort="price">价格最低</view>
+    <picker class="m-sort" mode="selector" value="{{movieArea}}" range="{{movieAreas}}" range-key="area_title" bindchange="setCity">
+      <view class="m-picker">
+        <view class="active">{{movieAreas[movieArea].area_title}}</view>
+        <view class="sjx">
+          
+        </view>
+      </view>
+    </picker>
+    <view class="{{sort=='distance'?'active':''}} m-sort" bindtap="setSort" data-sort="distance">离我最近</view>
+    <view class="{{sort=='price'?'active':''}} m-sort" bindtap="setSort" data-sort="price">价格最低</view>
   </view>
   <view wx:if="{{list.length>0 && type!=4}}" style="background:#0B898E;padding:1rpx 0">
     <view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="activity-item-out">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 32d235f..e2f4f27 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -147,6 +147,25 @@ background: rgba(11, 137, 142, .1);
   flex-shrink: 0;
   margin-left: 10rpx;
 }
+.m-picker {
+  display: flex;
+  color: #0B898E;
+}
+.sjx{
+  width: 0;
+  height: 0;
+  border-top: 9rpx solid #fff; 
+  border-right: 9rpx solid transparent;
+  border-left: 9rpx solid transparent;
+  border-bottom: 9rpx solid transparent;
+  margin-top:16rpx;
+  margin-left: 8rpx;
+}
+
+.m-sort{
+  width: 130rpx;
+  text-align: center;
+}
 .activity-search-bg {
   width: 422rpx;
   height: 56rpx;
@@ -248,16 +267,14 @@ background: rgba(11, 137, 142, .1);
 }
 .sort-box {
   display: flex;
-  justify-content: flex-end;
-  padding: 30rpx;
-  padding-top: 0;
+  justify-content: space-between;
+  margin: 20rpx 0 50rpx 0;
   background: #0B898E;
   color: #D8D8D8;
   font-size: 26rpx;
+  padding:  0 60rpx 0 70rpx;
 }
-.sort-box view:nth-child(1){
-  margin-right: 50rpx;
-}
+
 .sort-box view.active {
   color: #fff;
 }
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index aa11408..0fa2339 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -32,6 +32,13 @@ Page({
     util.gotoDetail(item,1);
   },
   gotoDetailOther: function(e) {
+    if (e.currentTarget.dataset.id==44703) {
+      wx.navigateToMiniProgram({
+          appId: 'wxfef80ee1ab7e58a2',
+          path: 'pages/inners/main'
+        })
+        return;
+  }
     wx.navigateTo({
       url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
     })

From 2cc32266f2d75df80c3252366f3a86e5fad3db1d Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 8 Aug 2023 17:28:46 +0800
Subject: [PATCH 083/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=8C=E6=9D=8E=20=E7=89=B9=E4=BA=A7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/index/index.wxml       |  9 +++++++--
 pages/list/feiyi/index.wxss  | 26 ++++++++++++--------------
 pages/list/techan/index.wxss | 17 +++++++++++++----
 pages/pbService/index.wxml   |  5 +++++
 5 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/app.js b/app.js
index a2fc7bd..18597dd 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.isTest87? true : false;
+      data.isTest = data.isTest88? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ec59efe..8f80ede 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -288,6 +288,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
+        <view>行李寄存</view>
+      </view>
       <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
         data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
@@ -302,11 +307,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view> -->
-      <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
+      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
         <view>12348</view>
-      </view>
+      </view> -->
     </view>
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
diff --git a/pages/list/feiyi/index.wxss b/pages/list/feiyi/index.wxss
index 76e134e..3fe4b0d 100644
--- a/pages/list/feiyi/index.wxss
+++ b/pages/list/feiyi/index.wxss
@@ -16,13 +16,16 @@ page {
 }
 .store-in-box {
   padding: 20rpx 30rpx;
+  padding-right: 0;
   background: #1d3256;
   border-left: 6rpx solid #c7a668;
   border-right: 6rpx solid #c7a668;
 }
+
 .store-item-top {
   display: flex;
   align-items: center;
+  padding-right: 20rpx;
 }
 .main-store-img {
   width: 136rpx;
@@ -75,27 +78,22 @@ page {
 .store-product-list {
   display: flex;
   margin-top: 30rpx;
+  overflow-x: scroll;
+}
+.store-product-list::-webkit-scrollbar {
+  display: none;
 }
 .product-item {
   margin-right: 20rpx;
 }
-.store-product-list .product-item:nth-child(1) .product-img{
-  border-top-left-radius: 16rpx;
-  border-bottom-left-radius: 16rpx;
-}
-.store-product-list .product-item:last-child .product-img{
-  border-top-right-radius: 16rpx;
-  border-bottom-right-radius: 16rpx;
-}
-.store-product-list .product-item:nth-child(3n){
-  margin-right: 0;
-}
+
+
 .product-img {
   display: block;
-  width: 100%;
-  width: 194rpx;
+
+  width: 220rpx;
   margin-bottom:20rpx;
-  height: 194rpx;
+  height: 220rpx;
   object-fit: cover;
 }
 .product-title {
diff --git a/pages/list/techan/index.wxss b/pages/list/techan/index.wxss
index 5e76619..da18a26 100644
--- a/pages/list/techan/index.wxss
+++ b/pages/list/techan/index.wxss
@@ -33,6 +33,9 @@ page {
   margin: 0 auto;
   margin-bottom: 15rpx;
   color: #704436;
+  /* padding: 0 10rpx; */
+  box-sizing: border-box;
+  
 }
 .list {
   background: url(https://static.ticket.sz-trip.com/xcxImages/techan/bg1.png);
@@ -88,10 +91,16 @@ page {
 }
 .product-list {
   display: flex;
-  margin: 0 30rpx;
+  margin: 0 20rpx 0 30rpx;
+  overflow-x:scroll ;
+  box-sizing: border-box;
+  padding-right:30rpx ;
+}
+.product-list::-webkit-scrollbar {
+  display: none;
 }
 .product-item {
-  width: 200rpx;
+  width: 212rpx;
   font-size: 28rpx;
   margin-right: 19rpx;
 }
@@ -99,8 +108,8 @@ page {
   margin-right: 0;
 }
 .product-item image {
-  width: 200rpx;
-  height: 200rpx;
+  width: 212rpx;
+  height: 209rpx;
 }
 .market_price {
   color: #C6937F;
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 1940aff..bc8607f 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -14,6 +14,11 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
       <view>安全服务</view>
     </view>
+    <view class="pb-item" bindtap="gotoUrl" data-event="xlqc" 
+    data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
+      <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
+      <view>行李寄存</view>
+    </view>
     <view class="pb-item" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=1">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>

From 689f5d83bf0d75641b9a34935baa3bbbf688f862 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 9 Aug 2023 14:57:06 +0800
Subject: [PATCH 084/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=96=87=E5=8C=96=E6=83=A0=E6=B0=91?=
 =?UTF-8?q?=E6=9D=BF=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.js   | 2 +-
 pages/list/activitynew/index.wxml | 4 ++++
 project.config.json               | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 5f4c314..de9d388 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -11,7 +11,7 @@ Page({
     isYL: false,
     selectDay: new Date().getTime(),
     days: [ '日','一', '二', '三', '四', '五', '六'],
-    types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other'],
+    types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other','huimin'],
     weeks: [],
     pageNo: 1,
     sort: "distance",
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 30c41da..6c831a6 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -35,6 +35,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
     </view>
+    <view class="type-item" bindtap="changeType" data-type="7">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==7?'color:#F75D2A':''}}">文化惠民</view>
+    </view>
 
     <!-- <view class="type-item" bindtap="changeType" data-type="5">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
diff --git a/project.config.json b/project.config.json
index 68c7558..165be03 100644
--- a/project.config.json
+++ b/project.config.json
@@ -44,7 +44,8 @@
     "showES6CompileOption": false,
     "disableUseStrict": false,
     "useCompilerPlugins": false,
-    "minifyWXML": true
+    "minifyWXML": true,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.0",

From d379ede98287ca190e2b5487921b5b57bdc89b08 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 11 Aug 2023 10:33:57 +0800
Subject: [PATCH 085/471] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E5=9B=BE=E6=B8=B8?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/map/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 7451de1..18b3a69 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -1,7 +1,7 @@
 <!--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 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" scale='13'>
 </map>
 <view style="height:{{topHeight}}px"></view>
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">

From 0826ec798e97cb86807aabf1d8ddccc2fa38a0ea Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Mon, 14 Aug 2023 15:33:40 +0800
Subject: [PATCH 086/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 18597dd..c0b4cf3 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.isTest88? true : false;
+      data.isTest = data.isTest89? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 0d1106359316c683a9e5a49868e83a62bf76d65d Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 17 Aug 2023 11:21:44 +0800
Subject: [PATCH 087/471] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8f80ede..adf3c58 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -41,7 +41,7 @@
     </swiper-item>
   </block>
 </swiper> -->
-<view class="top-icons">
+<view class="top-icons" wx:if="{{!isTest}}">
   <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
     class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image>

From 442e777bf1992e1ab97b34c14a99f6b22e688252 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 17 Aug 2023 14:33:41 +0800
Subject: [PATCH 088/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/list/techan/index.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app.js b/app.js
index c0b4cf3..4302a85 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.isTest89? true : false;
+      data.isTest = data.isTest90? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/techan/index.js b/pages/list/techan/index.js
index 669d3b6..607990a 100644
--- a/pages/list/techan/index.js
+++ b/pages/list/techan/index.js
@@ -65,7 +65,6 @@ Page({
       res.data.list.map(item=>{
         item.display_tags = item.display_tags?item.display_tags.split(","):[];
         item.display_tags = item.display_tags.splice(0,2);
-        item.product = item.product?item.product.splice(0,3):[]
       })
       this.setData({
         list:list.concat(res.data.list),

From 82433c4f0bc8f27892a6a5f97b9ee9c22c5a4dd4 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 17 Aug 2023 15:29:41 +0800
Subject: [PATCH 089/471] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/feiyi/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/list/feiyi/index.js b/pages/list/feiyi/index.js
index dc2e6c5..433554a 100644
--- a/pages/list/feiyi/index.js
+++ b/pages/list/feiyi/index.js
@@ -35,7 +35,6 @@ Page({
       limit:10
     }).then(res=>{
       res.data.list.map(item=>{
-        item.product = item.product?item.product.splice(0,3):[];
         item.display_tags = (item.display_tags?item.display_tags.split(","):[]).splice(0,2)
       })
       this.setData({

From b02c1b69f82814554bf5386f61ba3e8a752125b0 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 30 Aug 2023 08:35:18 +0800
Subject: [PATCH 090/471] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 | 2 +-
 pages/index/index.wxml                 | 7 ++++++-
 pages/list/techan/index.wxss           | 2 +-
 pages/user/order/refundInfo/index.wxml | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 4302a85..3b9ca60 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.isTest90? true : false;
+      data.isTest = data.isTest92? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index adf3c58..b5e372f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -283,10 +283,15 @@
   </view>
   <view style="overflow-x:auto">
     <view class="pbservice" style="width:100%">
-      <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
+      <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
         data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
+      </view> -->
+      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+        <view>景区舒适度</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item">
diff --git a/pages/list/techan/index.wxss b/pages/list/techan/index.wxss
index da18a26..7377ecc 100644
--- a/pages/list/techan/index.wxss
+++ b/pages/list/techan/index.wxss
@@ -105,7 +105,7 @@ page {
   margin-right: 19rpx;
 }
 .product-item:nth-child(3){
-  margin-right: 0;
+  /* margin-right: 0; */
 }
 .product-item image {
   width: 212rpx;
diff --git a/pages/user/order/refundInfo/index.wxml b/pages/user/order/refundInfo/index.wxml
index b850981..bf74460 100644
--- a/pages/user/order/refundInfo/index.wxml
+++ b/pages/user/order/refundInfo/index.wxml
@@ -3,10 +3,10 @@
 <view class="top-box" wx:if="{{info}}">
   <view class="order-state">{{state[info.order.state]}}</view>
   <view class="state-tip">{{info.remark}}</view>
-  <view class="top-item">
+  <!-- <view class="top-item">
     <text>退款金额</text>
     <text>￥{{info.refund_money/100}}</text>
-  </view>
+  </view> -->
   <view class="top-item">
     <text>支付渠道</text>
     <text>{{info.pay_method}}</text>

From 67eb1823d15058cb643f0614fe68d938921623ad Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 5 Sep 2023 16:28:21 +0800
Subject: [PATCH 091/471] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/index/index.wxml                | 19 +++++++++------
 pages/list/feiyi/index.js             | 11 +++++++++
 pages/list/feiyi/index.wxml           | 33 ++++++++++++++++-----------
 pages/list/feiyi/index.wxss           | 28 +++++++++++++++++++++--
 pages/list/techan/index.js            |  9 ++++++--
 pages/list/techan/index.wxml          | 20 +++++++++++-----
 pages/list/techan/index.wxss          | 26 ++++++++++++++++++++-
 pages/order/road/index.js             |  4 +++-
 pages/pbService/appreciate/index.wxss |  4 ++++
 pages/user/profile/index.wxml         |  1 +
 project.private.config.json           |  7 ++++++
 12 files changed, 131 insertions(+), 33 deletions(-)

diff --git a/app.js b/app.js
index 3b9ca60..2127815 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.isTest92? true : false;
+      data.isTest = data.isTest94? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b5e372f..36d7b71 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -288,6 +288,10 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view> -->
+            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
+        <view>安全服务</view>
+      </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
@@ -298,19 +302,20 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
-      <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
+        <view>实时路况</view>
+      </view>
+      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
         data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
         <view>找厕所</view>
-      </view>
-      <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
+      </view> -->
+      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
         data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
         <view>停车场</view>
-      </view>
-      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
-        <view>安全服务</view>
       </view> -->
       <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
         class="pbservice-item">
diff --git a/pages/list/feiyi/index.js b/pages/list/feiyi/index.js
index 433554a..261d038 100644
--- a/pages/list/feiyi/index.js
+++ b/pages/list/feiyi/index.js
@@ -26,6 +26,16 @@ Page({
       }
     },1)
   },
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  goShop(e){
+    wx.navigateTo({
+      url: '/pages/list/store/index?id='+e.currentTarget.dataset.id,
+    })
+  },
   getList:function(){
     let list = this.data.list;
     if(list.length>=this.data.total) return;
@@ -45,6 +55,7 @@ Page({
     })
   },
 
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/list/feiyi/index.wxml b/pages/list/feiyi/index.wxml
index 407d87a..fd547a7 100644
--- a/pages/list/feiyi/index.wxml
+++ b/pages/list/feiyi/index.wxml
@@ -1,31 +1,38 @@
 <!--pages/list/feiyi/index.wxml-->
 <title title="非遗专卖"></title>
 <image src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyinew_02.jpg" mode="widthFix" class="main-img"></image>
-<navigator url="../store/index?id={{item.id}}" wx:for="{{list}}" class="store-item" catchtap="pagePoint" data-id="{{item.id}}" data-event="legacy_shop">
+<view  wx:for="{{list}}" class="store-item" >
   <image class="top-img" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_03.png" mode="widthFix"></image>
   <view class="store-in-box">
-    <view class="store-item-top">
+    <view class="store-item-top" bindtap="goShop" data-id="{{item.id}}">
       <image src="{{item.headimg}}" mode="aspectFill" class="main-store-img"></image>
       <!-- <image mode="aspectFill" src="" class="main-store-img"><image> -->
       <view class="store-main-info">
-        <view>{{item.supplier_name}}</view>
-        <view class="store-main-tags">
-          <view class="store-main-tag" wx:for="{{item.display_tags}}">{{item}}</view>
+        <view>{{item.shop_name}}</view>
+        <view class="mid-box">
+          <view class="store-main-tags">
+            <view class="store-main-tag" wx:for="{{item.display_tags}}">{{item}}</view>
+          </view>
+      <view class="store-main-price">{{item.start_price/100}}</view>
+
+        </view>
+        <view class="bottom-box">
+         <view class="store-main-location">{{item.address}}</view>
+        <view class="shopbtn">进店看看</view>
+          
         </view>
-        <view class="store-main-location">{{item.address}}</view>
       </view>
-      <view class="store-main-price">{{item.start_price/100}}</view>
     </view>
     <view class="store-product-list" wx:if="{{item.product.length>0}}">
-      <view class="product-item" wx:for="{{item.product}}">
-        <image class="product-img" src="{{item.headimg}}" mode="aspectFill" ></image>
-        <view class="product-title">{{item.title}}</view>
+      <view class="product-item" wx:for="{{item.product}}" wx:for-item="goods" bindtap="goodsDetail" data-goods="{{goods}}">
+        <image class="product-img" src="{{goods.headimg}}" mode="aspectFill" ></image>
+        <view class="product-title">{{goods.title}}</view>
         <view class="price-box">
-          <text class="now-price">{{item.price/100}}</text>
-          <text class="old-price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">￥{{item.market_price/100}}</text>
+          <text class="now-price">{{goods.price/100}}</text>
+          <text class="old-price" wx:if="{{goods.market_price && goods.market_price!=0 && goods.market_price>goods.price}}">￥{{goods.market_price/100}}</text>
         </view>
       </view>
     </view>
   </view>
   <image class="top-img" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_06.png"></image>
-</navigator>
+</view>
diff --git a/pages/list/feiyi/index.wxss b/pages/list/feiyi/index.wxss
index 3fe4b0d..7930846 100644
--- a/pages/list/feiyi/index.wxss
+++ b/pages/list/feiyi/index.wxss
@@ -35,6 +35,7 @@ page {
   object-fit: cover;
 }
 .store-main-info {
+  height: 136rpx;
   flex:1;
   font-size: 34rpx;
 }
@@ -68,12 +69,11 @@ page {
 .store-main-price {
   font-size: 44rpx;
   color: #f9e498;
-  margin-left: 20rpx;
 }
 .store-main-price:after {
   content: "起";
   font-size: 24rpx;
-  margin-left: 20rpx;
+  margin-left:8rpx;
 }
 .store-product-list {
   display: flex;
@@ -119,4 +119,28 @@ page {
   font-size: 24rpx;
   color: #ccc;
   text-decoration: line-through;
+}
+
+.shopbtn{
+width: 120rpx;
+height: 33rpx;
+background: #C7A668;
+border-radius: 16rpx;
+font-size: 23rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #1D3256;
+line-height: 33rpx;
+text-align: center;
+}
+.mid-box{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.bottom-box{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
 }
\ No newline at end of file
diff --git a/pages/list/techan/index.js b/pages/list/techan/index.js
index 607990a..aceba4c 100644
--- a/pages/list/techan/index.js
+++ b/pages/list/techan/index.js
@@ -27,7 +27,12 @@ Page({
     })
     this.getList();
   },
-  gotoDetail:function(e){
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  goShop(e){
     let id = e.currentTarget.dataset.id;
     util.pagePoint({
       event: 'legacy_shop',
@@ -37,7 +42,7 @@ Page({
       type:'supplier'
     },1)
     wx.navigateTo({
-      url: '../store/index?type=specialty_detail&id='+id,
+      url: '/pages/list/store/index?id='+id,
     })
   },
   gotoProduct:function(e){
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 5ba68e6..f1338c0 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -9,20 +9,28 @@
   <view class="type-text" bindtap="changeType" data-type="2" style="left:auto;right:135rpx"><text>文</text><text>创</text></view>
 </view>
 <view class="list">
-  <view bindtap="gotoDetail" data-id="{{item.id}}" class="item" wx:for="{{list}}">
-    <view class="top-info">
+  <view  class="item" wx:for="{{list}}">
+    <view class="top-info" bindtap="goShop" data-id="{{item.id}}">
       <common-image mode="aspectFill" src="{{item.headimg}}"></common-image>
       <view class="supplier-info">
         <view class="supplier-name textOver">{{item.shop_name}}</view>
-        <view class="supplier-tags">
+        <view class="mid-box">
+          <view class="supplier-tags">
           <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
         </view>
-        <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
-      </view>
       <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
+        </view>
+        <view class="bottom-box">
+          <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
+          <view class="btn">
+              进店看看
+          </view>
+        </view>
+
+      </view>
     </view>
     <view class="product-list">
-      <view data-item="{{item}}" class="product-item" wx:for="{{item.product}}">
+      <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="product-title textOver2">{{item.title}}</view>
         <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
diff --git a/pages/list/techan/index.wxss b/pages/list/techan/index.wxss
index 7377ecc..d9c7fc7 100644
--- a/pages/list/techan/index.wxss
+++ b/pages/list/techan/index.wxss
@@ -58,7 +58,7 @@ page {
   display: flex;
   flex-direction: column;
   height: 136rpx;
-  justify-content: space-around;
+  justify-content:space-between;
   flex: 1;
   width: 300rpx;
 }
@@ -116,4 +116,28 @@ page {
   font-size: 24rpx;
   margin-left: 10rpx;
   text-decoration: line-through;
+}
+.mid-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.bottom-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.btn{
+width: 120rpx;
+flex-shrink: 0;
+height: 33rpx;
+background: #C6937F;
+border-radius: 16rpx;
+line-height: 33rpx;
+text-align: center;
+
+font-size: 23rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #FDF6E8;
 }
\ No newline at end of file
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 12379be..1446a15 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -40,7 +40,9 @@ Page({
         res.data.sku = [sku];
       }
       res.data.sku.map(item=>{
-        nums.push(0)
+        console.log(item);
+        item.stock>0?nums.push(1):nums.push(0)
+        
       })
       for(let i=0;i<res.data.sku.length;i++){
         for(let j=i+1;j<res.data.sku.length;j++){
diff --git a/pages/pbService/appreciate/index.wxss b/pages/pbService/appreciate/index.wxss
index 7ce2f70..9f1edb1 100644
--- a/pages/pbService/appreciate/index.wxss
+++ b/pages/pbService/appreciate/index.wxss
@@ -39,6 +39,10 @@ page {
    margin-top: 10rpx;
    height: 50rpx;
    overflow-x: auto;
+   overflow-y:hidden;
+}
+.tags::-webkit-scrollbar{
+	display:none;
 }
 .tag {
   font-size: 26rpx;
diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml
index 8836103..033373a 100644
--- a/pages/user/profile/index.wxml
+++ b/pages/user/profile/index.wxml
@@ -50,6 +50,7 @@
 </view>
 <navigator url="../logout/index" class="profile-item">
   <text>注销账号</text>
+  <view class="info">注销后账号无法恢复，请谨慎操作</view>
   <view class="iconfont icon-you"></view>
 </navigator>
 <view class="cropper-wrapper" wx:if="{{showCropper}}">
diff --git a/project.private.config.json b/project.private.config.json
index eedf488..8749612 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -60,6 +60,13 @@
           "pathName": "pages/pbService/group/index",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/supplier/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

From 334d9bf6a226c0c971ec7f0eb34b8f2738c84b77 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 14 Sep 2023 13:55:01 +0800
Subject: [PATCH 092/471] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js         | 6 ++++++
 pages/index/index.wxml       | 2 +-
 pages/order/hotel/index.wxml | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index f7d1ec7..2ad8c63 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -361,6 +361,12 @@ Page({
         path: 'pages/index/index'
       })
       return;
+    }else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wxdd39069b9a91dbfe',
+        path: 'pages/index/index'
+      })
+      return;
     }else if (e.currentTarget.dataset.event == 'kunshan_click') {
       wx.navigateToMiniProgram({
         appId: 'wx8888a3fd0862b4c8',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 36d7b71..1384ddf 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -21,7 +21,7 @@
   </navigator>
 </view>
 <view style="position:relative" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex">
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
     <block wx:for="{{banner}}" wx:key="*this">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index f59a916..3619f74 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -68,7 +68,8 @@
     </view>
   </view>
 </view>
-<coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon>
+<!-- 2023/9/14隐藏酒店下单页优惠券入口 -->
+<!-- <coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon> -->
 <!-- 支付按钮 -->
 <view style="height:{{100 }}rpx"></view>
 <view class="fixed-bottom">

From 4af8e95dce893b966e88ccb255a07c2a2e490f6e Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 20 Sep 2023 10:45:14 +0800
Subject: [PATCH 093/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=81=9C=E8=BD=A6=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/index.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index bc8607f..e50a660 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -59,11 +59,11 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
       <view>实时公交</view>
     </view> -->
-    <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
+    <!-- <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=2">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
       <view>停车场</view>
-    </view>
+    </view> -->
     <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=0">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>

From b39c0ee9d2720b39746154b9823a4ab19ae1bd2b Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 20 Sep 2023 16:38:47 +0800
Subject: [PATCH 094/471] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=B7=AF=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/index.wxml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index e50a660..721fdc0 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -78,6 +78,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png" mode="widthFix"></image>
       <view>P+R停车场</view>
     </view>
+    <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pb-item">
+      <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
+      <view>实时路况</view>
+    </view>
   </view>
 </view>
 <!-- <view class="pb-box">

From 85e65d0053c40847826c9e8b8e9ac0a4b8c4855d Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 27 Sep 2023 11:10:21 +0800
Subject: [PATCH 095/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=8B=E5=8F=8B?=
 =?UTF-8?q?=E5=9C=88,=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             | 2 +-
 app.json                           | 3 ++-
 pages/index/index.js               | 7 +++++++
 pages/user/service/list/index.js   | 4 ++--
 pages/user/service/list/index.wxml | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 2127815..7959862 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.isTest94? true : false;
+      data.isTest = data.isTest95? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 7de07ea..a1a1761 100644
--- a/app.json
+++ b/app.json
@@ -220,7 +220,8 @@
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
         "selectedIconPath": "/images/homeSel.png",
-        "text": "首页"
+        "text": "首页",
+        "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
diff --git a/pages/index/index.js b/pages/index/index.js
index 2ad8c63..88032db 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -795,5 +795,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州（文化旅游总入口）',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js
index 51b8f3d..0b7a418 100644
--- a/pages/user/service/list/index.js
+++ b/pages/user/service/list/index.js
@@ -58,12 +58,12 @@ Page({
     },1)
     wx.showModal({
       title: '提示',
-      content: '呼叫人工客服\n0512-66555111',
+      content: '呼叫人工客服\n18136165673',
       confirmColor:"#0B898E",
       success (res) {
         if (res.confirm) {
           wx.makePhoneCall({
-            phoneNumber: '0512-66555111',
+            phoneNumber: '18136165673',
           })
         } else if (res.cancel) {
         }
diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml
index 4b548a6..1915d84 100644
--- a/pages/user/service/list/index.wxml
+++ b/pages/user/service/list/index.wxml
@@ -23,7 +23,7 @@
     <view class="modal-dialog" wx:if="{{showModal && ses}}">
       <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
  <view>客服服务时间：08:30-17:30</view>
-如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view></view></view>
+如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 18136165673 </view></view></view>
       <view class="modal-footer">
         <view
           class="btn-confirms two"

From 05a7ddf6c4c7b0c326638627560af75baf0b6b8b Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 27 Sep 2023 14:47:50 +0800
Subject: [PATCH 096/471] =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.js | 13 +++++++++++++
 pages/list/feiyi/index.js       | 11 +++++++++++
 pages/list/hotel/index.js       | 11 +++++++++++
 pages/list/museum/index.js      | 11 +++++++++++
 pages/list/night/index.js       | 11 +++++++++++
 pages/list/scene/index.js       | 11 +++++++++++
 pages/list/techan/index.js      | 11 +++++++++++
 pages/list/theatre/index.js     | 11 +++++++++++
 pages/pbService/web/index.js    |  2 +-
 9 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index de9d388..e537870 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -36,6 +36,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     this.getMovieArea()
     let d = new Date();
     let month = d.getMonth() + 1,
@@ -435,5 +439,14 @@ setCity(e){
    */
   onShareAppMessage: function () {
 
+  },
+
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-活动日历',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png'
+    }
   }
+
 })
\ No newline at end of file
diff --git a/pages/list/feiyi/index.js b/pages/list/feiyi/index.js
index 261d038..5af54c6 100644
--- a/pages/list/feiyi/index.js
+++ b/pages/list/feiyi/index.js
@@ -15,6 +15,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     this.getList()
   },
   pagePoint(e){
@@ -103,5 +107,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-非遗专卖',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/list/hotel/index.js b/pages/list/hotel/index.js
index 8b539e8..fccc67d 100644
--- a/pages/list/hotel/index.js
+++ b/pages/list/hotel/index.js
@@ -20,6 +20,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     if(options.area_id){
       this.setData({
         area_id:options.area_id
@@ -179,5 +183,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-酒店住宿',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index 0fa2339..a559a86 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -16,6 +16,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     this.getList()
   },
   gotoDetail:function(e){
@@ -116,5 +120,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },  
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-场馆预约',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/list/night/index.js b/pages/list/night/index.js
index bb6c56b..422ab83 100644
--- a/pages/list/night/index.js
+++ b/pages/list/night/index.js
@@ -17,6 +17,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     this.getList()
   },
   search:function(){
@@ -106,5 +110,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-夜游苏州',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 3c2655c..6c7b01e 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -20,6 +20,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     let that = this;
     if(options.area_id){
       this.setData({
@@ -131,5 +135,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-景点门票',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/list/techan/index.js b/pages/list/techan/index.js
index aceba4c..a14f48b 100644
--- a/pages/list/techan/index.js
+++ b/pages/list/techan/index.js
@@ -17,6 +17,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     this.getList()
   },
   search:function(e){
@@ -124,5 +128,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-文创特产',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js
index 5d90f48..97dc1fa 100644
--- a/pages/list/theatre/index.js
+++ b/pages/list/theatre/index.js
@@ -23,6 +23,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
     this.getList();
   },
   search:function(e){
@@ -144,5 +148,12 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-剧场演出',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png'
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index f5c5555..4a33728 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -91,5 +91,5 @@ Page({
    */
   onReachBottom: function () {
 
-  }
+  },
 })
\ No newline at end of file

From 76afadf7b6426a98c1777c1c5831d43960f327c2 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 28 Sep 2023 13:41:23 +0800
Subject: [PATCH 097/471] =?UTF-8?q?=E5=8F=B7=E7=A0=81=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             | 2 +-
 pages/user/service/list/index.js   | 4 ++--
 pages/user/service/list/index.wxml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 7959862..e345e37 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.isTest95? true : false;
+      data.isTest = data.isTest96? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js
index 0b7a418..51b8f3d 100644
--- a/pages/user/service/list/index.js
+++ b/pages/user/service/list/index.js
@@ -58,12 +58,12 @@ Page({
     },1)
     wx.showModal({
       title: '提示',
-      content: '呼叫人工客服\n18136165673',
+      content: '呼叫人工客服\n0512-66555111',
       confirmColor:"#0B898E",
       success (res) {
         if (res.confirm) {
           wx.makePhoneCall({
-            phoneNumber: '18136165673',
+            phoneNumber: '0512-66555111',
           })
         } else if (res.cancel) {
         }
diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml
index 1915d84..4b548a6 100644
--- a/pages/user/service/list/index.wxml
+++ b/pages/user/service/list/index.wxml
@@ -23,7 +23,7 @@
     <view class="modal-dialog" wx:if="{{showModal && ses}}">
       <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
  <view>客服服务时间：08:30-17:30</view>
-如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 18136165673 </view></view></view>
+如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view></view></view>
       <view class="modal-footer">
         <view
           class="btn-confirms two"

From 1d3e68310f43a85ac8aaa83790cb6b31529e062e Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 11 Oct 2023 16:35:42 +0800
Subject: [PATCH 098/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=89=8D=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.js   |  6 ++-
 pages/order/orderList/index.wxml |  6 +++
 pages/order/orderList/index.wxss | 12 ++++++
 pages/order/scene/index.js       | 22 +++++++++--
 pages/order/scene/index.wxml     | 31 +++++++++++++++-
 pages/order/scene/index.wxss     | 64 ++++++++++++++++++++++++++++++++
 6 files changed, 134 insertions(+), 7 deletions(-)

diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 0ae9234..12bc3c1 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -21,7 +21,8 @@ Page({
   select_allowance: false,
   allowance_data: null,
   allowance_price: 0,
-  flag:null
+  flag:null,
+  linkmanList:[]
   },
 
   /**
@@ -33,7 +34,8 @@ Page({
       ticketList: app.globalData.list,
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
-      flag:options.flag
+      flag:options.flag,
+      // linkmanList: app.globalData.linkmanList
     })
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 2e1cc30..56db585 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -45,6 +45,12 @@
 				X{{item.num}}
 			</view>
 		</view>
+    <view style="padding-left: 10rpx;margin: 30rpx 0 22.67rpx;">出行人信息</view>
+    <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
+      <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
+      <view class="text"><view class="text-left">身份证：</view>{{items.id_number}}</view>
+      <view class="text"><view class="text-left">手机号：</view>{{items.tel}}</view>
+    </view>
 	</view>
 </view>
 
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 17386b9..3f7a203 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -61,4 +61,16 @@ page{
   align-items: center;
   background-color: #fff;
 	margin: 30rpx 25rpx;
+}
+
+.text {
+  margin-bottom: 22.67rpx;
+  color: #333;
+  font-size: 28rpx;
+  font-weight: 500;
+  display: flex;
+}
+
+.text-left {
+  color: #999;
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 0472109..7546be7 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -29,7 +29,8 @@ Page({
     pIndex: 0,
     flag:null,
 		ticket_type:1,
-		isCar:'single'
+    isCar:'single',
+    showMask: false
   },
 
   /**
@@ -71,6 +72,16 @@ Page({
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
   },
+  next: function () {
+    this.setData({
+      showMask:true
+    })
+  },
+  cancel: function () {
+    this.setData({
+      showMask:false
+    })
+  },
   changeGroupName: function (e) {
     this.setData({
       groupName: e.detail.value
@@ -250,7 +261,8 @@ Page({
       }],
       originate_order_id: this.data.kjId,
       gp_id: app.globalData.gp_id,
-      team_id: app.globalData.team_id
+      team_id: app.globalData.team_id,
+      linkmanList:this.data.linkmanList
     }
     if (app.globalData.from) {
       data.system_name = app.globalData.from;
@@ -276,7 +288,9 @@ Page({
     }
 	if(app.globalData.list){
 		app.globalData.list[app.globalData.index] = this.data.product
-	}
+		app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+  }
+  // app.globalData.linkmanList = this.data.linkmanList
   app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
   console.log(app.globalData);
 	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
@@ -284,7 +298,7 @@ Page({
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{
 			app.globalData.createDate = data
-		}
+    }
 		app.globalData.index = app.globalData.index + 1
 		app.globalData.product = app.globalData.list[app.globalData.index]
 		wx.redirectTo({
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index efebf2e..d1e0bbc 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -52,10 +52,39 @@
     <view class="fixed-price-box" wx:else><text>合计：</text><text
         class="price">¥{{((singlePrice * productNum - (coupon?coupon.activity.money:0))>0?(singlePrice * productNum - (coupon?coupon.activity.money:0)):0)/ 100}}</text>
     </view>
-    <view class="fixed-btn" bindtap="order">下一步</view>
+    <view class="fixed-btn" bindtap="next">下一步</view>
   </view>
   <view class="fixed-bottom yuyue-box" wx:else>
     <view class="fixed-btn yuyue-btn" bindtap="order" wx:if="{{type=='museum'}}">立即预约</view>
     <view class="fixed-btn yuyue-btn" bindtap="activityOrder" wx:else>立即预约</view>
   </view>
+  <view class="mask" style="align-items:flex-end" wx:if="{{showMask}}">
+  <view class="mask-bg" bindtap="cancel"></view>
+  <view class="mask-content1">
+      <view class="dialog-top">
+        <view class="scene-title">拙政园-旺季成人票</view>
+        <view class="people-message">出行人信息</view>
+        <view style="max-height:430rpx;overflow: scroll;">
+          <view class="people" wx:for="{{linkmanList}}">
+            <view class="flex">
+              <view>姓名：</view>
+              <view style="color: #333;">{{item.name}}</view>
+            </view>
+            <view class="flex" style="margin: 19.33rpx 0;">
+              <view>身份证：</view>
+              <view style="color: #333;">{{item.id_number}}</view>
+            </view>
+            <view class="flex">
+              <view>手机号：</view>
+              <view style="color: #333;">{{item.tel}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="bottom-btn">
+        <view class="cancle" bindtap="cancel">取消</view>
+        <view class="confirm" bindtap="order">无问题，去支付</view>
+      </view>
+  </view>
+</view>
 </view>
\ No newline at end of file
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index bd1bf08..945fd9b 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -276,4 +276,68 @@ page {
 .mask-allowance .mask-content .rule-title {
   text-align: center;
   margin-bottom: 20rpx;
+}
+
+.dialog-top {
+  color: #999;
+  font-weight: 500;
+  padding: 40rpx 33.33rpx 0;
+}
+
+.scene-title {
+  font-size: 35rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 32.67rpx;
+}
+
+.people-message {
+  margin-bottom: 26.67rpx;
+  /* padding-bottom: 26.67rpx; */
+  /* border-bottom: 1px solid #F0F0F0; */
+  font-weight: bold;
+  font-size: 32rpx;
+}
+
+.people {
+  border-top: 1rpx solid #F0F0F0;
+  padding: 26.67rpx 0 24rpx;
+}
+
+.flex {
+  display: flex;
+}
+
+.bottom-btn {
+  display: flex;
+  border-top: 1rpx solid #F0F0F0;
+  height: 96rpx;
+  /* padding: 32.67rpx 0; */
+}
+
+.cancle {
+  width: 50%;
+  color: #999;
+  text-align: center;
+  line-height: 96rpx;
+}
+
+.confirm {
+  width: 50%;
+  text-align: center;
+  color: #D62828;
+  line-height: 96rpx;
+  border-left: 1rpx solid #F0F0F0;
+}
+
+.mask-content1 {
+  max-height: 710rpx;
+  position: relative;
+  z-index: 1;
+  width: 80%;
+  background: white;
+  border-radius: 12rpx;
+  /* margin-bottom: 45%; */
+  overflow-y: auto;
+  margin: auto;
 }
\ No newline at end of file

From f577705ebc78ff31e195268dc6367fe89efbe032 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 13 Oct 2023 17:35:03 +0800
Subject: [PATCH 099/471] =?UTF-8?q?=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                  |  6 ++
 pages/index/index.wxml                |  2 +-
 pages/info/postProductInfo/index.js   | 11 +++-
 pages/info/postProductInfo/index.wxml |  8 ++-
 pages/info/postProductInfo/index.wxss | 23 +++++--
 pages/order/comment/index.js          | 22 ++++++-
 pages/order/comment/index.wxml        | 20 +++++-
 pages/order/comment/index.wxss        | 89 +++++++++++++++++++++++++-
 pages/order/payresult/index.js        | 21 ++++++-
 pages/order/payresult/index.wxml      | 23 ++++++-
 pages/order/payresult/index.wxss      | 90 ++++++++++++++++++++++++++-
 project.private.config.json           | 14 +++++
 12 files changed, 307 insertions(+), 22 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 88032db..a6c88e5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -121,6 +121,12 @@ Page({
     })
     this.getVideoPrize()
   },
+  goFeiyi: function () {
+    app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupon'
+    wx.navigateTo({
+      url:"/pages/pbService/web/index"
+    })
+  },
   onTabItemTap: function (e) {
     console.log(e, 99999999)
   },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1384ddf..f8c490f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -52,7 +52,7 @@
     <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image>
     <view class="top-icon-text">场馆预约</view>
   </view>
-  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+  <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image>
     <view class="top-icon-text">非遗专卖</view>
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index cf996ad..5da8ee5 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -117,7 +117,7 @@ Page({
             })
         })
 
-        commonApi._post("product/get_product_by_type", {
+        commonApi._post("search/product_recommend", {
             offset: 0,
             limit: 6,
             rand: true,
@@ -203,13 +203,18 @@ Page({
             query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
             query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
             query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box4").boundingClientRect() //选择toViewid获取位置信息
             let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
             query.exec(function (res) {
-                if (res[2].top < minHeight) {
+                if (res[3].top < minHeight) {
+                    that.setData({
+                        type: 4
+                    })
+                } else if (res[2].top < minHeight) {
                     that.setData({
                         type: 3
                     })
-                } else if (res[1].top < minHeight) {
+                }else if (res[1].top < minHeight) {
                     that.setData({
                         type: 2
                     })
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 2c9a219..fb79d30 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -35,6 +35,7 @@
     <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">产品特色</view>
     <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">费用说明</view>
     <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">预定须知</view>
+    <view class="scroll-menu-item{{type==4?' active':''}}" bindtap="changeMenu" data-index="4">产品推荐</view>
   </view>
   <view style="height:85rpx" wx:if="{{fixed}}"></view>
   <view class="info-box" id="box1">
@@ -49,8 +50,7 @@
     <view class="info-title">预订须知</view>
     <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
   </view>
-</view>
-<view class="box">
+  <view class="box">
   <view class="box-top">
     <text class="iconfont icon-tiwen"></text><text>游客点评</text><text class="score" wx:if="{{info && info.rate && commentTotal>0}}">{{info.rate}}分</text>
     <navigator url="/pages/list/comments/index?productid={{id}}" style="display: inline;"> <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong; font-weight: bold;color: #000;">></text></text>
@@ -86,7 +86,7 @@
     查看全部点评<text class="iconfont icon-you"></text></navigator>
 
 </view>
-<view class="proad">
+<view class="proad" id="box4">
   <view class="proad-title">
     <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
   </view>
@@ -105,6 +105,8 @@
   </view>
 
 </view>
+</view>
+
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index bd1b85f..f1f5005 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -228,9 +228,11 @@ page {
 }
 
 .box {
-  margin: 20rpx;
-  background: white;
-  border-radius: 13rpx;
+  /* margin: 20rpx; */
+  /* background: white; */
+  /* border-radius: 13rpx; */
+  background: #f2f2f2;
+  padding: 20rpx;
 }
 
 .box-top {
@@ -240,6 +242,8 @@ page {
   color: #000;
   font-size: 35rpx;
   padding: 0 20rpx;
+  background: #fff;
+  border-radius: 13rpx 13rpx 0 0;
 }
 
 .box-top .iconfont {
@@ -253,6 +257,8 @@ page {
   padding: 40rpx 0;
   font-size: 23rpx;
   color: #333;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
 }
 
 .empty-btn {
@@ -275,9 +281,11 @@ page {
 }
 
 .product-comment {
-  margin: 0 20rpx;
+  /* margin: 0 20rpx; */
   border-bottom: 1rpx solid #ccc;
-  padding: 33rpx 0;
+  /* padding: 33rpx 0; */
+  padding: 33rpx 20rpx;
+  background: #fff;
 }
 
 .product-comment-top {
@@ -320,11 +328,14 @@ page {
 
 .more-comment-btn {
   line-height: 93rpx;
-  margin-right: 20rpx;
+  /* margin-right: 20rpx; */
   text-align: right;
   color: #999;
   font-size: 27rpx;
   font-weight: 500;
+  padding-right: 20rpx;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
 }
 
 .more-comment-btn .iconfont {
diff --git a/pages/order/comment/index.js b/pages/order/comment/index.js
index 5fa253d..dbf3c12 100644
--- a/pages/order/comment/index.js
+++ b/pages/order/comment/index.js
@@ -1,5 +1,6 @@
 // pages/order/comment/index.js
 import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
 Page({
 
   /**
@@ -10,7 +11,8 @@ Page({
     imgs: [],
     upImgs:[],
     checked:false,
-    rate:0
+    rate:0,
+    tjList: [], //推荐商品列表
   },
 
   /**
@@ -43,6 +45,24 @@ Page({
         info: res.data
       })
     })
+    commonApi._post("search/product_recommend", {
+      offset: 0,
+      limit: 6,
+      rand: true,
+      type: 'post'
+  }).then(res => {
+      try {
+          this.setData({
+              tjList: res.data.list
+          })
+      } catch (error) {
+          console.log(error);
+      }
+  })
+  },
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.gotoDetail(item)
   },
   changeStar: function (e) {
     wx.showLoading({
diff --git a/pages/order/comment/index.wxml b/pages/order/comment/index.wxml
index 646d050..3f59adc 100644
--- a/pages/order/comment/index.wxml
+++ b/pages/order/comment/index.wxml
@@ -35,4 +35,22 @@
   </label>
 </checkbox-group>
 <view style="height:80rpx"></view>
-<view class="btn" bindtap="submit">提交</view>
\ No newline at end of file
+<view class="btn" bindtap="submit">提交</view>
+<view class="proad" id="box4">
+  <view class="proad-title">
+    <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/25af23290c0e6ed438f9c4f2222dd81c.png"></image>
+  </view>
+  <view class="pro-list">
+    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+      <view class="item-hd">
+        <image src="{{item.headimg}}"></image>
+      </view>
+      <view class="item-bm">
+        <view class="protitle text-overflowRows">{{item.title}}</view>
+        <view class="pro-price">
+          {{item.price/100}}
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/order/comment/index.wxss b/pages/order/comment/index.wxss
index df3f7b3..66bfbb7 100644
--- a/pages/order/comment/index.wxss
+++ b/pages/order/comment/index.wxss
@@ -1,6 +1,7 @@
 /* pages/order/comment/index.wxss */
 page{
   background-color: #FBF8FB;
+  padding-bottom: 50rpx;
 }
 .product-box {
   padding: 0 30rpx 10rpx 30rpx;
@@ -71,7 +72,9 @@ page{
   height: 210rpx;
 }
 .btn {
-  width: 360rpx;
+  margin: 0 30rpx;
+  margin-bottom: 79rpx;
+  /* width: 360rpx; */
   line-height: 80rpx;
   text-align: center;
   color: #fff;
@@ -79,10 +82,10 @@ page{
   font-size: 30rpx;
   font-weight: 500;
   border-radius: 40rpx;
-  position: fixed;
+  /* position: fixed;
   bottom: 40rpx;
   left: 50%;
-  margin-left: -180rpx;
+  margin-left: -180rpx; */
 }
 
 /* 图片 */
@@ -147,3 +150,83 @@ page{
   checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
     color:#fff;
   }
+  .proad{
+    margin: 20rpx;
+  }
+  .proad-title{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 14rpx;
+  }
+  .proad-title image{
+    width: 292rpx;
+    height: 34rpx;
+  }
+  .pro-list{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+  .proitem{
+    width: 335rpx;
+    background: #FFFFFF;
+    border-radius: 13rpx;
+    margin-top: 26.67rpx;
+    box-shadow: 0rpx 2rpx 11rpx 0rpx rgba(201,201,201,0.3);
+  }
+  .item-hd {
+    width: 335rpx;
+    height: 278rpx;
+  }
+  .item-hd image{
+    width: 100%;
+      height: 100%;
+      border-radius: 13rpx 13rpx 0px 0px;
+  }
+  .item-bm{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 120rpx;
+    padding: 13rpx 14rpx;
+    text-align: left;
+  }
+  .protitle{
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #000000;
+  }
+  .pro-price{
+    color: #D10000;
+    font-weight: bold;
+    font-size: 36rpx;
+  }
+  .pro-price:before {
+    display: inline-block;
+    content:"￥";
+    color: #D62828;
+    font-size: 20rpx;
+  }
+  
+  .pro-price:after {
+    display: inline-block;
+    content:'起';
+    color: #999999;
+    font-size: 10px;
+  }
+  .proitem image:nth-child(1) {
+    display: block;
+    width: 100%;
+    border-radius: 13rpx 13rpx 0 0;
+  }
+  .text-overflowRows {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    word-break: break-all;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+  }
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index b39042a..cc73a61 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -8,7 +8,8 @@ Page({
    */
   data: {
     tid:null,
-    info:null
+    info:null,
+    tjList: [], //推荐商品列表
   },
 
   /**
@@ -27,6 +28,24 @@ Page({
       })
       console.log(res)
     })
+    commonApi._post("search/product_recommend", {
+      offset: 0,
+      limit: 6,
+      rand: true,
+      type: 'post'
+  }).then(res => {
+      try {
+          this.setData({
+              tjList: res.data.list
+          })
+      } catch (error) {
+          console.log(error);
+      }
+  })
+  },
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.gotoDetail(item)
   },
   gotoOrderList:function(){
     if(!this.data.info) return;
diff --git a/pages/order/payresult/index.wxml b/pages/order/payresult/index.wxml
index cd55a1e..ea70e50 100644
--- a/pages/order/payresult/index.wxml
+++ b/pages/order/payresult/index.wxml
@@ -1,7 +1,26 @@
 <!--pages/order/payresult/index.wxml-->
 <title title="订单"></title>
-<view class="iconfont icon-gou1"></view>
+<!-- <view class="iconfont icon-gou1"></view> -->
+<image class="gou" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/5d53ee0d2e6136d634202b9651984d60.png"></image>
 <view class="order-tip">订单正在处理中</view>
 <view>具体出票/发货状态</view>
 <view>将会通过短信/订单状态进行通知</view>
-<view class="btn" bindtap="gotoOrderList">查看订单</view>
\ No newline at end of file
+<view class="btn" bindtap="gotoOrderList">查看订单</view>
+<view class="proad" id="box4">
+  <view class="proad-title">
+    <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/25af23290c0e6ed438f9c4f2222dd81c.png"></image>
+  </view>
+  <view class="pro-list">
+    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+      <view class="item-hd">
+        <image src="{{item.headimg}}"></image>
+      </view>
+      <view class="item-bm">
+        <view class="protitle text-overflowRows">{{item.title}}</view>
+        <view class="pro-price">
+          {{item.price/100}}
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/order/payresult/index.wxss b/pages/order/payresult/index.wxss
index 90fb22e..70fcc42 100644
--- a/pages/order/payresult/index.wxss
+++ b/pages/order/payresult/index.wxss
@@ -13,12 +13,15 @@
   margin: 0 auto;
   font-size: 36rpx;
   font-weight: 500;
-  margin-top: 200rpx;
+  margin-top: 76.67rpx;
+  margin-bottom: 79.33rpx;
+  /* margin-top: 200rpx; */
 }
 page {
   text-align: center;
   color: #999;
   font-size: 32rpx;
+  padding-bottom: 50rpx;
 }
 .order-tip {
   color: #009944;
@@ -26,4 +29,89 @@ page {
   font-weight: 500;
   margin-top: 30rpx;
   margin-bottom: 50rpx;
+}
+.gou {
+  width: 180.13rpx;
+  height: 180.13rpx;
+  margin-top: 40rpx;
+}
+.proad{
+  margin: 20rpx;
+}
+.proad-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 14rpx;
+}
+.proad-title image{
+  width: 292rpx;
+  height: 34rpx;
+}
+.pro-list{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.proitem{
+  width: 335rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  margin-top: 26.67rpx;
+  box-shadow: 0rpx 2rpx 11rpx 0rpx rgba(201,201,201,0.3);
+}
+.item-hd {
+  width: 335rpx;
+  height: 278rpx;
+}
+.item-hd image{
+  width: 100%;
+    height: 100%;
+    border-radius: 13rpx 13rpx 0px 0px;
+}
+.item-bm{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 120rpx;
+  padding: 13rpx 14rpx;
+  text-align: left;
+}
+.protitle{
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #000000;
+}
+.pro-price{
+  color: #D10000;
+  font-weight: bold;
+  font-size: 36rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #D62828;
+  font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
+  color: #999999;
+  font-size: 10px;
+}
+.proitem image:nth-child(1) {
+  display: block;
+  width: 100%;
+  border-radius: 13rpx 13rpx 0 0;
+}
+.text-overflowRows {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 8749612..71b8843 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -67,6 +67,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/order/payresult/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/order/comment/index",
+          "query": "id=82342309051435565877",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

From 4f099c68bd8bc140476be1664a85bdf7c0ad787d Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 20 Oct 2023 15:22:48 +0800
Subject: [PATCH 100/471] =?UTF-8?q?=E5=85=88=E5=88=A4=E6=96=AD=E5=87=BA?=
 =?UTF-8?q?=E8=A1=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.js   |   3 +-
 pages/order/orderList/index.wxml |   3 +-
 pages/order/scene/index.js       | 173 ++++++++++++++++++++++++-------
 pages/order/scene/index.wxml     |   2 +-
 4 files changed, 142 insertions(+), 39 deletions(-)

diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 12bc3c1..ac9592b 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -37,6 +37,7 @@ Page({
       flag:options.flag,
       // linkmanList: app.globalData.linkmanList
     })
+    console.log('-------------',app.globalData.list);
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
       if (!app.globalData.kjId && !this.data.gp_id) {
@@ -49,7 +50,7 @@ Page({
       sku_id.push(item.sku.id)
     })
     app.globalData.list.map(item => {
-      price = price + item.sku.price * item.num;
+      price = price + item.sku.price * item.linkmanList.length;
       sku_id.push(item.sku.id)
     })
     this.setData({
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 56db585..9514af6 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -42,7 +42,8 @@
 				{{item.sku.sku_name}}
 			</view>
 			<view>
-				X{{item.num}}
+				<!-- X{{item.num}} -->
+				X{{item.linkmanList.length}}
 			</view>
 		</view>
     <view style="padding-left: 10rpx;margin: 30rpx 0 22.67rpx;">出行人信息</view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 7546be7..f75b2eb 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -72,11 +72,11 @@ Page({
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
   },
-  next: function () {
-    this.setData({
-      showMask:true
-    })
-  },
+  // next: function () {
+  //   this.setData({
+  //     showMask:true
+  //   })
+  // },
   cancel: function () {
     this.setData({
       showMask:false
@@ -209,42 +209,12 @@ Page({
     })
 	
   },
-  order: function () {
-	  console.log(this.data)
+  order:function() {
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
-    // if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-    //   wx.showToast({
-    //     title: '请选择' + productNum + "个出行人",
-    //     icon: "none"
-    //   })
-    //   return;
-    // }
-    if (!date && this.data.ticket_type == 1) {
-      wx.showToast({
-        title: '请选择使用日期',
-        icon: 'none'
-      })
-      return
-    }
-    if (!time && date && date.is_time_stock == true) {
-      wx.showToast({
-        title: '请选择使用时间',
-        icon: 'none'
-      })
-      return
-    }
-    if (app.globalData.product.isGroup == 1 && !this.data.groupName) {
-      wx.showToast({
-        title: '请输入团队主体名称',
-        icon: 'none'
-      })
-      return;
-    }
     linkmanList.map(item => {
       linkmanIds.push(item.id)
     })
-	console.log(date)
     let data = {
       coupon_id: this.data.coupon ? this.data.coupon.id : null,
       source: "WECHATXCX",
@@ -337,6 +307,137 @@ Page({
 		}
 	}
   },
+  next: function () {
+	  console.log(this.data)
+    let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
+    let linkmanIds = [];
+    if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+      wx.showToast({
+        title: '请添加出行人',
+        icon: "none"
+      })
+      return;
+    }
+    if (!date && this.data.ticket_type == 1) {
+      wx.showToast({
+        title: '请选择使用日期',
+        icon: 'none'
+      })
+      return
+    }
+    if (!time && date && date.is_time_stock == true) {
+      wx.showToast({
+        title: '请选择使用时间',
+        icon: 'none'
+      })
+      return
+    }
+    if (app.globalData.product.isGroup == 1 && !this.data.groupName) {
+      wx.showToast({
+        title: '请输入团队主体名称',
+        icon: 'none'
+      })
+      return;
+    }
+    this.setData({
+      showMask:true
+    })
+  //   linkmanList.map(item => {
+  //     linkmanIds.push(item.id)
+  //   })
+	// console.log(date)
+  //   let data = {
+  //     coupon_id: this.data.coupon ? this.data.coupon.id : null,
+  //     source: "WECHATXCX",
+  //     product_list: [{
+  //       type: product.product.type,
+  //       product_id: product.product.id,
+  //       sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+  //       start_time: time.start_time,
+  //       end_time: time.end_time,
+  //       use_date: date ? date.date : '',
+  //       visitors: linkmanIds.join(","),
+  //       remark: remark,
+  //       product_num: app.globalData.product.isGroup == 1 ? 1 : productNum
+  //     }],
+  //     originate_order_id: this.data.kjId,
+  //     gp_id: app.globalData.gp_id,
+  //     team_id: app.globalData.team_id,
+  //     linkmanList:this.data.linkmanList
+  //   }
+  //   if (app.globalData.from) {
+  //     data.system_name = app.globalData.from;
+  //   }
+  //   if (app.globalData.retailId) {
+  //     data.commission_code = app.globalData.retailId;
+  //     app.globalData.retailId = null;
+  //   }
+  //   if (app.globalData.category_id) {
+  //     data.category_id = app.globalData.category_id;
+  //   }
+  //   if (this.data.prizeId) {
+  //     data.lottery_id = this.data.prizeId
+  //   }
+  //   let service = 'order/create', postData = {
+  //     data: JSON.stringify(data)
+  //   }
+  //   if (app.globalData.product.isGroup == 1) {
+  //     service = "team_order/appoint"
+  //     postData.member_num = this.data.productNum
+  //     postData.team_name = this.data.groupName
+  //     postData.type = 1;
+  //   }
+	// if(app.globalData.list){
+	// 	app.globalData.list[app.globalData.index] = this.data.product
+	// 	app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+  // }
+  // // app.globalData.linkmanList = this.data.linkmanList
+  // app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+  // console.log(app.globalData);
+	// if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
+	// 	if(app.globalData.createDate){
+	// 		app.globalData.createDate.product_list.push(data.product_list[0])
+	// 	}else{
+	// 		app.globalData.createDate = data
+  //   }
+	// 	app.globalData.index = app.globalData.index + 1
+	// 	app.globalData.product = app.globalData.list[app.globalData.index]
+	// 	wx.redirectTo({
+	// 	  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
+	// 	})
+	// 	return
+	// }else{
+	// 	if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
+	// 		if(app.globalData.createDate){
+	// 			app.globalData.createDate.product_list.push(data.product_list[0])
+	// 		}
+	// 		wx.redirectTo({
+	// 		  url: '/pages/order/orderList/index?flag='+ this.data.flag
+	// 		})
+	// 	}else{
+	// 		commonApi.user_post(service, postData).then(res => {
+	// 		  if (app.globalData.kjId) {
+	// 		    this.setData({
+	// 		      kjId: null
+	// 		    });
+	// 		    app.globalData.kjId = null;
+	// 		  }
+	// 		  if (app.globalData.gp_id) {
+	// 		    this.setData({
+	// 		      gp_id: null
+	// 		    });
+	// 		    app.globalData.gp_id = null;
+	// 		  }
+	// 		  if (res.code == 1 && app.globalData.product.isGroup == 1) {
+	// 		    // 团购跳转到团购详情
+	// 		    wx.navigateTo({
+	// 		      url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order'
+	// 		    })
+	// 		  }
+	// 		})
+	// 	}
+	// }
+  },
   // 活动预约
   activityOrder: function () {
     if (this.data.linkmanList && this.data.linkmanList.length > 0) {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index d1e0bbc..7266012 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -83,7 +83,7 @@
       </view>
       <view class="bottom-btn">
         <view class="cancle" bindtap="cancel">取消</view>
-        <view class="confirm" bindtap="order">无问题，去支付</view>
+        <view class="confirm" bindtap="order">无问题，下一步</view>
       </view>
   </view>
 </view>

From 9b013dcc1c4e0fec9a95302b2384fe303fabc214 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 20 Oct 2023 16:34:52 +0800
Subject: [PATCH 101/471] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/techan/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index f1338c0..afaad8a 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -21,7 +21,7 @@
       <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
         </view>
         <view class="bottom-box">
-          <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
+          <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text style="max-width: 300rpx;" class="textOver">{{item.address}}</text></view>
           <view class="btn">
               进店看看
           </view>

From 8d16b596b5013f4df5ce2adc7a7a4bb57b9b7f92 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 23 Oct 2023 14:18:08 +0800
Subject: [PATCH 102/471] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/comment/index.wxss   | 3 ++-
 pages/order/payresult/index.wxss | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/order/comment/index.wxss b/pages/order/comment/index.wxss
index 66bfbb7..98aa9b2 100644
--- a/pages/order/comment/index.wxss
+++ b/pages/order/comment/index.wxss
@@ -189,11 +189,12 @@ page{
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: 120rpx;
+    /* height: 120rpx; */
     padding: 13rpx 14rpx;
     text-align: left;
   }
   .protitle{
+    height: 80rpx;
     font-size: 28rpx;
     font-family: PingFang SC;
     font-weight: bold;
diff --git a/pages/order/payresult/index.wxss b/pages/order/payresult/index.wxss
index 70fcc42..d9e54cb 100644
--- a/pages/order/payresult/index.wxss
+++ b/pages/order/payresult/index.wxss
@@ -74,11 +74,12 @@ page {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  height: 120rpx;
+  /* height: 120rpx; */
   padding: 13rpx 14rpx;
   text-align: left;
 }
 .protitle{
+  height: 80rpx;
   font-size: 28rpx;
   font-family: PingFang SC;
   font-weight: bold;

From c1b75f50eed26aa50ad30623c8753b23cdc215d0 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 24 Oct 2023 19:01:43 +0800
Subject: [PATCH 103/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/scene/index.js   | 1 +
 pages/order/scene/index.wxml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index f75b2eb..c8e79f7 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -49,6 +49,7 @@ Page({
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
 			isCar:options.isCar
     })
+    console.log('-------',app.globalData.product);
 
     if (!app.globalData.product) {
       util.back();
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 7266012..032d64a 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -62,7 +62,7 @@
   <view class="mask-bg" bindtap="cancel"></view>
   <view class="mask-content1">
       <view class="dialog-top">
-        <view class="scene-title">拙政园-旺季成人票</view>
+        <view class="scene-title">{{product.product.title}}-{{product.sku.sku_name}}</view>
         <view class="people-message">出行人信息</view>
         <view style="max-height:430rpx;overflow: scroll;">
           <view class="people" wx:for="{{linkmanList}}">

From 9904f1baf92c1cc033e1ad261b9a0a66cb81554f Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 1 Nov 2023 09:08:45 +0800
Subject: [PATCH 104/471] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/bike/index.js | 24 +++++++++++++++---------
 pages/pbService/index.wxml    |  8 ++++++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pages/pbService/bike/index.js b/pages/pbService/bike/index.js
index 684c960..a8de7a4 100644
--- a/pages/pbService/bike/index.js
+++ b/pages/pbService/bike/index.js
@@ -19,7 +19,8 @@ Page({
     list:[],
     types:["公共自行车","找厕所","停车场"],//都做一起了 根据type来分 默认就是自行车
     type:0,
-    typeService:['pbservice/Ztfw/publicBycicle','pbservice/Ztfw/toilets','pbservice/Ztfw/park']
+    // typeService:['pbservice/Ztfw/publicBycicle','pbservice/Ztfw/toilets','pbservice/Ztfw/park']
+    typeService:['pbservice/Ztfw/publicBycicle','pbservice/Ztfw/toilets','pbservice/Ztfw/park_new']
   },
 
   /**
@@ -66,15 +67,17 @@ Page({
       lon:this.data.longitude
     }).then(res=>{
       let list = this.data.list;
-      if(this.data.type==2){
-        res.data = res.data.parklist;
-      }
+      // if(this.data.type==2){
+      //   res.data = res.data.parklist;
+      // }
       res.data.map((item,index)=>{
         let mapItem = {};
         if(this.data.type==0){
           item.showContent = item.name + "(" + item.address + ")";
-          mapItem.latitude = Number(item.gaodelat);
-          mapItem.longitude = Number(item.gaodelng);
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          // mapItem.latitude = Number(item.gaodelat);
+          // mapItem.longitude = Number(item.gaodelng);
         }
         else if(this.data.type==1){
           item.showContent = item.poiname;
@@ -82,9 +85,12 @@ Page({
           mapItem.longitude = Number(item.longitude);
         }
         else if(this.data.type==2){
-          item.showContent = item.parkName + "(" + item.address + ")";
-          mapItem.latitude = Number(item.gaodelat);
-          mapItem.longitude = Number(item.gaodelon);
+          // item.showContent = item.parkName + "(" + item.address + ")";
+          item.showContent = item.name;
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          // mapItem.latitude = Number(item.gaodelat);
+          // mapItem.longitude = Number(item.gaodelon);
         }
         mapItem.id = list.length+index;
         mapItem.info = item;
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 721fdc0..3878ae2 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -47,6 +47,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
       <view>文化配送</view>
     </view> -->
+     <view class="pb-item" data-title="附近图书馆" bindtap="gotoUrl" data-url="https://www.szlib.com/szlibposition">
+      <image src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
+      <view>附近图书馆</view>
+    </view>
   </view>
 </view>
 <image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
@@ -59,11 +63,11 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
       <view>实时公交</view>
     </view> -->
-    <!-- <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
+    <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=2">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
       <view>停车场</view>
-    </view> -->
+    </view>
     <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=0">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>

From 3e93f5ad333de228d90e721cd02b7f78df94cd95 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 1 Nov 2023 13:39:32 +0800
Subject: [PATCH 105/471] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BD=93=E8=82=B2?=
 =?UTF-8?q?=E5=9C=BA=E9=A6=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/index.wxml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 3878ae2..d92ec0e 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -29,11 +29,11 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>景区舒适度</view>
     </view>
-    <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath"
+    <!-- <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath"
       data-path="/pages/pbService/gym/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png" mode="widthFix"></image>
       <view>体育场馆</view>
-    </view>
+    </view> -->
     <view class="pb-item" data-event="garbage_click" data-title="垃圾分类" bindtap="garbage">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
       <view>垃圾分类</view>
@@ -63,11 +63,15 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
       <view>实时公交</view>
     </view> -->
-    <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
-      data-path="/pages/pbService/bike/index?type=2">
+    <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
       <view>停车场</view>
     </view>
+    <!-- <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
+      data-path="/pages/pbService/bike/index?type=2">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
+      <view>停车场</view>
+    </view> -->
     <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=0">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>

From b74912170239d26ae7e69109bfcf874840898710 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 6 Nov 2023 11:04:27 +0800
Subject: [PATCH 106/471] =?UTF-8?q?=E9=82=AE=E5=AF=84=E7=B1=BB=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E8=BF=90=E8=B4=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/order/postOrder/index.wxml | 4 ++--
 project.config.json              | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index e345e37..dd03f9a 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.isTest96? true : false;
+      data.isTest = data.isTest97? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 8753b18..7716a2e 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -25,8 +25,8 @@
     <view class="number-box">{{item.productNum}}</view>
     <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
   </view>
-  <view class="box-title">
-    <view style="flex:1">运费</view>
+  <view class="box-title" style="height:auto;min-height:113rpx;">
+    <view style="flex:1;white-space:nowrap;margin-right:20rpx;">运费</view>
     <text>{{item.postFee?(item.postFee==0?'包邮':(item.postFee/100)):item.sku.sku_model.post_template_name}}</text>
   </view>
   <view class="box-title" wx:if="{{flag!='mix'}}">
diff --git a/project.config.json b/project.config.json
index 165be03..97cb0a5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -45,7 +45,8 @@
     "disableUseStrict": false,
     "useCompilerPlugins": false,
     "minifyWXML": true,
-    "condition": false
+    "condition": false,
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.0",

From 7a4792e761e22edd26a56a41694dbe5f55b966dd Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 17 Nov 2023 16:17:58 +0800
Subject: [PATCH 107/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/proRec/proRec.js              | 68 +++++++++++++++----
 pages/index/index.js                          |  2 +-
 pages/info/postProductInfo/index.js           |  3 +-
 pages/order/comment/index.js                  |  4 +-
 pages/order/pay/index.js                      | 15 +++-
 pages/order/payresult/index.js                |  4 +-
 pages/user/order/activityOrderInfo/index.wxml |  2 +-
 pages/user/order/hotelOrderInfo/index.js      | 10 ++-
 pages/user/order/hotelOrderInfo/index.wxml    |  2 +-
 pages/user/order/lineOrderInfo/index.js       | 10 ++-
 pages/user/order/lineOrderInfo/index.wxml     |  4 +-
 pages/user/order/movieOrderInfo/index.js      | 10 ++-
 pages/user/order/movieOrderInfo/index.wxml    |  2 +-
 pages/user/order/museumOrderInfo/index.js     | 10 ++-
 pages/user/order/museumOrderInfo/index.wxml   |  4 +-
 pages/user/order/postOrderInfo/index.js       | 10 ++-
 pages/user/order/postOrderInfo/index.wxml     |  4 +-
 pages/user/order/sceneOrderInfo/index.js      | 11 ++-
 pages/user/order/sceneOrderInfo/index.wxml    |  4 +-
 project.private.config.json                   |  7 ++
 20 files changed, 141 insertions(+), 45 deletions(-)

diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index 1a34128..0150cb1 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -23,15 +23,62 @@ Component({
     clickid: {
       type: String,
       value: ""
+    },
+    ids:{
+      type: String,
+      value: ""
+    }
+  },
+  observers:{
+    'ids': function(newVal,oldVal){
+      console.log('newVal--------',newVal)
+      console.log('oldVal--------',oldVal)
+      if (newVal) {
+        this.getTj(newVal)
+      }
     }
   },
   lifetimes: {
     created() {
-      commonApi._post("product/get_product_by_type", {
+      this.data.tjList=[]
+      // commonApi._post("product/get_product_by_type", {
+      //   offset: 0,
+      //   limit: 6,
+      //   rand: true,
+      //   type: "venue,post,line,ticket",
+      //   product_ids:this.data.ids
+      // }).then(res => {
+      //   this.setData({
+      //     showLoading: false
+      //   })
+      //   try {
+      //     this.setData({
+      //       tjList: res.data.list
+      //     })
+      //   } catch (error) {
+      //     console.log(error);
+      //   }
+      // })
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    tjList: [],
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    getTj() {
+      this.data.tjList = []
+      commonApi._post("search/product_recommend", {
         offset: 0,
         limit: 6,
         rand: true,
-        type: "venue,post,line,ticket"
+        type: "venue,post,line,ticket",
+        product_ids:this.data.ids
       }).then(res => {
         this.setData({
           showLoading: false
@@ -43,19 +90,9 @@ Component({
         } catch (error) {
           console.log(error);
         }
+        console.log('tjList',this.data.tjList);
       })
-    }
-  },
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    tjList: [],
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
+    },
     gotoDetail: function (e) {
       let item = e.currentTarget.dataset.item;
       util.pagePoint({
@@ -74,5 +111,6 @@ Component({
         util.gotoDetail(item);
       }
     },
-  }
+  },
+  
 })
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index a6c88e5..0d6d7c9 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -122,7 +122,7 @@ Page({
     this.getVideoPrize()
   },
   goFeiyi: function () {
-    app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupon'
+    app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
     wx.navigateTo({
       url:"/pages/pbService/web/index"
     })
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 5da8ee5..45b358c 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -121,7 +121,8 @@ Page({
             offset: 0,
             limit: 6,
             rand: true,
-            type: 'post'
+            type: 'post',
+            product_ids:options.id,
         }).then(res => {
             try {
                 this.setData({
diff --git a/pages/order/comment/index.js b/pages/order/comment/index.js
index dbf3c12..2508d57 100644
--- a/pages/order/comment/index.js
+++ b/pages/order/comment/index.js
@@ -45,11 +45,13 @@ Page({
         info: res.data
       })
     })
+    console.log('options.proId',options.proId);
     commonApi._post("search/product_recommend", {
       offset: 0,
       limit: 6,
       rand: true,
-      type: 'post'
+      type: 'post',
+      product_ids:options.proId,
   }).then(res => {
       try {
           this.setData({
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 53f5e68..461a0ae 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -18,7 +18,8 @@ Page({
     activePay:false,//是否活动支付
     SUBWALLET:false,
     wxPay:false,
-	isBook:false
+    isBook:false,
+    ids:[], // 多产品id
   },
 
   /**
@@ -136,6 +137,14 @@ Page({
     })
   },
   pay:function(){
+    let arr = []
+    this.data.info.order_product_list.forEach(item => {
+      arr.push(item.product_id)
+    })
+    this.setData({
+      ids:arr
+    })
+
     if (this.data.activePay) {
       let flag = false
       if (this.data.payList.length!=0 && !this.data.info.coupon_activity.pay_type.includes('SUBWALLET')) {
@@ -185,7 +194,7 @@ Page({
           })
           setTimeout(()=>{
             wx.redirectTo({
-              url: '../payresult/index?tid='+_this.data.id
+              url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
             })
           },1000)
         },
@@ -218,7 +227,7 @@ Page({
             })
             setTimeout(()=>{
               wx.redirectTo({
-                url: '../payresult/index?tid='+this.data.id
+                url: '../payresult/index?tid='+this.data.id+'&ids='+_this.data.ids.join(',')
               })
             },1000)
           }
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index cc73a61..79d9fee 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -20,6 +20,7 @@ Page({
       tid:options.tid,
       type:options.type
     })
+    console.log('options.ids',options.ids);
     commonApi.user_post("order/query",{
       order_id:options.tid
     }).then(res=>{
@@ -32,7 +33,8 @@ Page({
       offset: 0,
       limit: 6,
       rand: true,
-      type: 'post'
+      type: 'post',
+      product_ids:options.ids,
   }).then(res => {
       try {
           this.setData({
diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml
index fe34272..9c9fb0b 100644
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@@ -50,7 +50,7 @@
     <navigator url="/pages/info/activityInfo/index?id={{info.order_product_list[0].activity_id}}" class="btn">再次购买</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
     <!-- <view class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
   </view>
diff --git a/pages/user/order/hotelOrderInfo/index.js b/pages/user/order/hotelOrderInfo/index.js
index bb2da1a..aa83dc2 100644
--- a/pages/user/order/hotelOrderInfo/index.js
+++ b/pages/user/order/hotelOrderInfo/index.js
@@ -18,7 +18,8 @@ Page({
     codeImgs:[],
     minute:"",
     second:"",
-    id:null
+    id:null,
+    ids:[]
   },
 
   /**
@@ -190,6 +191,10 @@ Page({
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
       }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
       let state = "";
       res.data.order_product_list.map(order=>{
         order.qrcode.map(item=>{
@@ -207,7 +212,8 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
       })
       this.getCodeImg()
     })
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index 4dc4ec0..e54ef76 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -40,7 +40,7 @@
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
   </view>
 </view>
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 <navigator url="/pages/info/hotelProductInfo/index?id={{item.scene_detail.id}}" class="box" wx:if='{{info}}' wx:for="{{info.order_product_list}}" style="padding-bottom:0">
   <view class="scene-box" style="align-items:center">
     <view class="scene-box-left">
diff --git a/pages/user/order/lineOrderInfo/index.js b/pages/user/order/lineOrderInfo/index.js
index d1a9ea0..646eb5a 100644
--- a/pages/user/order/lineOrderInfo/index.js
+++ b/pages/user/order/lineOrderInfo/index.js
@@ -19,7 +19,8 @@ Page({
     minute:"",
     second:"",
     id:"",
-    cardTypes:{}
+    cardTypes:{},
+    ids:[]
   },
 
   /**
@@ -201,6 +202,10 @@ Page({
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
       }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
       let state = "";
       res.data.order_product_list.map(order=>{
         order.qrcode.map(item=>{
@@ -212,7 +217,8 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
       })
       this.getCodeImg()
     })
diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml
index 47f7682..be5d0da 100644
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@@ -39,13 +39,13 @@
     <navigator url="/pages/info/roadInfo/index?id={{info.order_product_list[0].product_id}}" class="scene-btn" wx:if="{{info.state=='COMPLETED'}}">再次购买</navigator>
     <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
     <!-- <view class="scene-btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
   </view>
 </view>
 
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 
 <!--景点订单详情需要这个  -->
 <navigator url="/pages/info/roadInfo/index?id={{info.order_product_list[0].product_id}}" class="box" wx:if='{{info}}'>
diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js
index 5b87f67..165a42c 100644
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@@ -19,7 +19,8 @@ Page({
     codeImgs:[],
     id:null,
     minute:"",
-    second:""
+    second:"",
+    ids:[]
   },
 
   /**
@@ -175,6 +176,10 @@ Page({
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
       }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
       let state = ""
       res.data.order_product_list.map(order=>{
         order.qrcode.map(item=>{
@@ -186,7 +191,8 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
       })
       this.getCodeImg()
     })
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 556623e..77c75b6 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -52,7 +52,7 @@
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
   </view>
 </view>
diff --git a/pages/user/order/museumOrderInfo/index.js b/pages/user/order/museumOrderInfo/index.js
index 3293767..582c3d3 100644
--- a/pages/user/order/museumOrderInfo/index.js
+++ b/pages/user/order/museumOrderInfo/index.js
@@ -19,7 +19,8 @@ Page({
     codeImgs:[],
     id:null,
     minute:"",
-    second:""
+    second:"",
+    ids:[]
   },
 
   /**
@@ -175,6 +176,10 @@ Page({
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
       }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
       let state = "";
       res.data.order_product_list.map(order=>{
         order.qrcode.map(item=>{
@@ -201,7 +206,8 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
       })
       this.getCodeImg()
       // 获取行程规划
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 04d9025..be35fec 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -50,13 +50,13 @@
     <navigator url="/pages/info/museumInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
     <!-- <view class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</view> -->
   </view>
 </view>
 
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 <view class="box" wx:if="{{info}}">
   <view class="box-title">{{info.order_product_list[0].scene_detail.title}}</view>
   <view class="detail-item">
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index ae80367..5ad6b07 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -22,7 +22,8 @@ Page({
     id:null,
     pay_methods:app.globalData.pay_methods,
     tjList:[],
-    showLoading:true
+    showLoading:true,
+    ids:[]
   },
 
   /**
@@ -240,6 +241,10 @@ Page({
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
       }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
       let state = "";
       res.data.stateNums = {}
       res.data.order_product_list.map(order=>{
@@ -256,7 +261,8 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:res.data.order_product_list[0].product_model
+        product_model:res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
       })
       this.getCodeImg()
     })
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index e7a33ed..607af56 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -12,7 +12,7 @@
   <view class="box-title" style="margin-top:15rpx"><text style="margin-right:20rpx">{{info.order_product_list[0].consignee_info.name}}</text><text>{{info.order_product_list[0].consignee_info.tel}}</text></view>
   <view style="font-size:26rpx;color:#333;line-height:50rpx"><text style="color:#0B898E;margin-right:10rpx" class="iconfont icon-location"></text>{{info.order_product_list[0].consignee_info.address}}</view>
 </view>
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 <view class="box" wx:if="{{info}}" style="padding-bottom:0">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
     <view class="product-info-top">
@@ -52,7 +52,7 @@
     <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}">确认收货</view>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
     <navigator url="../expressInfo/index?id={{info.order_id}}" class="btn" wx:if="{{info.post_detail_list.length>0}}">查询快递</navigator>
   </view>
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 69f972d..a411574 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -28,7 +28,8 @@ Page({
     sysmText:'更多',
     sysm2:false,
     sysm2Text:'更多',
-    imgLen:[]
+    imgLen:[],
+    ids:[]
   },
 
   /**
@@ -259,6 +260,10 @@ Page({
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
       }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
       let state = ""
       res.data.order_product_list.map(order=>{
         order.qrcode.map(item=>{
@@ -270,8 +275,10 @@ Page({
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
-        product_model:"ticket"||res.data.order_product_list[0].product_model
+        product_model:"ticket"||res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
       })
+      console.log('ids',this.data.ids);
       this.getCodeImg()
       // 获取行程规划
       let that = this;
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 3e1836f..6de2321 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -24,7 +24,7 @@
   <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
 </view>
 
-<sptj></sptj>
+<sptj ids="{{ ids }}"></sptj>
 
 <!-- 景点订单详情需要这个 -->
 <view class="box" wx:if='{{product_model=="ticket"}}'>
@@ -49,7 +49,7 @@
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
     <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
   </view>
 </view>
diff --git a/project.private.config.json b/project.private.config.json
index 71b8843..acdc8dd 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -81,6 +81,13 @@
           "query": "id=82342309051435565877",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/user/order/activityOrderInfo/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

From 2b31bcda333e6bdbd424f47722c83d8296331b30 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 5 Dec 2023 16:40:47 +0800
Subject: [PATCH 108/471] =?UTF-8?q?=E9=9D=9E=E9=81=97=E8=B7=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f8c490f..cd8d20c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -52,7 +52,10 @@
     <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image>
     <view class="top-icon-text">场馆预约</view>
   </view>
-  <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
+  <!-- 非遗跳专题 -->
+  <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
+    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
+  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image>
     <view class="top-icon-text">非遗专卖</view>

From aa98e11ced1ee696f0c7dfe6ca2dd597f4695722 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 12 Dec 2023 16:23:54 +0800
Subject: [PATCH 109/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=88=86=E4=BA=ABH5=E5=A4=96=E9=93=BE?=
 =?UTF-8?q?=E4=B8=93=E9=A2=98=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/web/index.js   | 28 +++++++++++++++++++++++++++-
 pages/pbService/web/index.wxml |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 4a33728..4ee0c8b 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -7,7 +7,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    webUrl:""
+    webUrl:"",
+	shareTitle: "",
+	shareUrl: ""
   },
 
   /**
@@ -51,6 +53,13 @@ Page({
       })
     }
   },
+  handleMessage(data) {
+  	console.log(data)
+	this.setData({
+	  shareTitle:data.shareTitle,
+	  shareUrl:data.shareUrl
+	})
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -92,4 +101,21 @@ Page({
   onReachBottom: function () {
 
   },
+  
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+	return {
+	  title: this.data.shareTitle,
+	  path: this.data.shareUrl,
+	}
+  },
+  
+  onShareTimeline: function() {
+    return {
+      title: this.data.shareTitle,
+      path: this.data.shareUrl,
+    }
+  }
 })
\ No newline at end of file
diff --git a/pages/pbService/web/index.wxml b/pages/pbService/web/index.wxml
index 31b0cf7..f6c048b 100644
--- a/pages/pbService/web/index.wxml
+++ b/pages/pbService/web/index.wxml
@@ -1,4 +1,4 @@
 <!--pages/pbService/web/index.wxml-->
 <view wx:if="{{webUrl}}">
-  <web-view src="{{webUrl}}"></web-view>
+  <web-view src="{{webUrl}}" bindmessage="handleMessage"></web-view>
 </view>

From 820a8c5ce40cc05a4a6510c0859e13961995d981 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 11 Jan 2024 15:39:21 +0800
Subject: [PATCH 110/471] =?UTF-8?q?=E5=85=83=E6=97=A6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             |   2 +-
 app.json                           |   8 +-
 images/index-seld.png              | Bin 0 -> 13015 bytes
 images/my-seld.png                 | Bin 0 -> 15868 bytes
 images/tuyou-seld.png              | Bin 0 -> 23265 bytes
 pages/index/index.js               |  60 +++++++
 pages/index/index.wxml             | 212 ++++++++++++++++++------
 pages/index/index.wxss             | 256 +++++++++++++++++++++++++++--
 pages/info/activityInfo/index.wxml |   2 +-
 pages/info/hotelInfo/index.js      |  12 +-
 pages/info/hotelInfo/index.wxml    |  27 ++-
 pages/info/hotelInfo/index.wxss    |  41 ++++-
 pages/order/orderList/index.wxml   |   2 +-
 pages/order/scene/index.wxml       |   2 +-
 14 files changed, 547 insertions(+), 77 deletions(-)
 create mode 100644 images/index-seld.png
 create mode 100644 images/my-seld.png
 create mode 100644 images/tuyou-seld.png

diff --git a/app.js b/app.js
index dd03f9a..72de0a2 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.isTest97? true : false;
+      data.isTest = data.isTest98? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index a1a1761..7b89e99 100644
--- a/app.json
+++ b/app.json
@@ -213,26 +213,26 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999",
-    "selectedColor": "#0B898E",
+    "selectedColor": "#D02E25",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/homeSel.png",
+        "selectedIconPath": "/images/index-seld.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/mapSeld.png",
+        "selectedIconPath": "/images/tuyou-seld.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/userSel.png",
+        "selectedIconPath": "/images/my-seld.png",
         "text": "我的"
       }
     ]
diff --git a/images/index-seld.png b/images/index-seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..c45cad0e3ba34b72ca7266b853381d98ce3650a2
GIT binary patch
literal 13015
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
E53$pCiU0rr

literal 0
HcmV?d00001

diff --git a/images/my-seld.png b/images/my-seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a88c5c25f3508f8ef32fe13559043dd63ca6435
GIT binary patch
literal 15868
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
Yk<4zBPhKA#+yH>Al#*nXxbe^b18%4h=>Px#

literal 0
HcmV?d00001

diff --git a/images/tuyou-seld.png b/images/tuyou-seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff577b2355aae2eefc4d69b191ce08cd24f94129
GIT binary patch
literal 23265
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
O0000<MNUMnLSTZdAhjF-

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index 0d6d7c9..e9b6c89 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -40,6 +40,21 @@ Page({
     showFullAdv: true, //全屏广告开关
     time: 5, //全屏广告剩余时间
     showTime:false,
+    xpth:{}, // 元旦新增 新品特惠和sqjNew
+    djs:null, // 元旦新增 新品特惠倒计时
+    djsTime:null,
+    sqjNew:[
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-zjg.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-cs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-tc.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-ks.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-wj.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-wzs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-xc.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gyyq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gxq.png',
+    ]
   },
   onLoad: function (options) {
     //全屏广告
@@ -120,6 +135,42 @@ Page({
       date: today.getDate()
     })
     this.getVideoPrize()
+    this.getXpthList()
+  },
+  getXpthList:function () {
+    // 元旦新增 新品特惠
+    commonApi._post("product/get_product_indulgence", {
+      tag_id: 275,
+      typeId:3,
+    }).then(res => {
+      console.log('data',res.data);
+      this.setData({
+        xpth: res.data,
+        djsTime: res.data.time
+      })
+      let time = setInterval(()=>{
+        this.setData({
+          djsTime:this.data.djsTime-1
+        })
+        this.formatDate(this.data.djsTime)
+      },1000)
+      if(this.data.djsTime==0) {
+        clearInterval(time)
+      }
+    })
+  },
+  // 元旦新品特惠 倒计时 
+  formatDate: function (oTime) {
+    let h = parseInt(oTime/3600)
+    let m = parseInt((oTime%3600)/60)
+    let s = parseInt(oTime%60)
+    // h=h<10?"0"+h:h;
+    // m=m<10?"0"+m:m;
+    s=s<10?"0"+s:s;
+    this.setData({
+      djs:{h:h,m:m,s:s}
+    })
+    return
   },
   goFeiyi: function () {
     app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
@@ -405,6 +456,15 @@ Page({
       })
     }
   },
+  // 元旦  新品特惠部分
+  goBanner: function(e) {
+    console.log('新品特惠',e.currentTarget.dataset.url);
+    let url = e.currentTarget.dataset.url;
+    app.globalData.weburl = url;
+    wx.navigateTo({
+      url: "/pages/pbService/web/index"
+    })
+  },
   gotoUrl: function (e) {
 	  console.log(e)
     if (e.currentTarget.dataset.event) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index cd8d20c..b727e0f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -3,6 +3,7 @@
 <!-- <view class="old-btn">关怀模式</view> -->
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
+<!-- 后台获取的季节动图 -->
 <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
@@ -44,12 +45,16 @@
 <view class="top-icons" wx:if="{{!isTest}}">
   <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
     class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image>
+    <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/hdrl.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">活动日历</view>
   </view>
   <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
     data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image>
+       <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/cgyy.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">场馆预约</view>
   </view>
   <!-- 非遗跳专题 -->
@@ -57,42 +62,58 @@
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
   <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image>
+    <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/fyzm.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">非遗专卖</view>
   </view>
   <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
     data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image>
+       <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jcyc.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">剧场演出</view>
   </view>
   <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
     data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image>
+    <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/wctc.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">文创特产</view>
   </view>
   <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
     class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image>
+     <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jdmp.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">景点门票</view>
   </view>
   <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
     class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image>
+     <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jdzs.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">酒店住宿</view>
   </view>
   <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
     class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image>
+     <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yysz.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">夜游苏州</view>
   </view>
   <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
     class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image>
+     <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yry.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">一日游</view>
   </view>
   <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
     class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image>
+     <!-- 元旦修改 -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yxy.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">研学游</view>
   </view>
 </view>
@@ -153,14 +174,55 @@
       <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}"></view>
     </view>
   </view>
+  <!-- 元旦修改  限时特惠--新版-->
+  <view class="sale-road-boxes xpth" style="margin-bottom: 62.67rpx;">
+    <!-- 上方标题部分 -->
+    <view class="xsth-title">
+      <view class="xsth-left" style="display: flex;">
+        <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/uploads/20240103/2b45bdf26113fc61b86a5e1f7b9f1fdb.png"></image>
+        <view class="time-box">
+          <view class="xsth-time">{{djs.h}}</view>:
+          <view class="xsth-time">{{djs.m}}</view>:
+          <view class="xsth-time">{{djs.s}}</view>
+        </view>
+      </view>
+      <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+      </view>
+    </view>
+    <!-- 商品部分 -->
+    <view class="xpth-product">
+      <!-- 左边的2个产品 -->
+      <view class="xpth-left">
+        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}">
+          <image src="{{item.headimg}}" mode=""/>
+          <view class="xpth-item-content">
+            <view class="xpth-item-title">{{item.title}}</view>
+            <view class="xpth-item-bottom">
+              <view class="xpth-item-price">{{item.price/100}}</view>
+              <view class="xpth-item-buy">立即抢购</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 右边的banner -->
+      <image class="xpth-banner" bindtap="goBanner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode=""/>
+    </view>
+    <!-- 烟花 -->
+    <image class="yanhua" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yanhua.png" mode=""/>
+  </view>
+
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
   </view>
-  <scroll-view scroll-x style="height:360rpx" bindscroll="listenScroll" class="slide-box">
+  <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+  <scroll-view scroll-x style="height:200rpx" bindscroll="listenScroll" class="slide-box">
     <view class="pbservice" style="margin-bottom:30rpx">
       <view bindtap="gotoUrl" data-title="非遗鉴赏" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
-        <view>非遗鉴赏</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
+        <view>非遗鉴赏</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/fyjs.png" mode="widthFix"></image>
       </view>
       <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
         data-path="/pages/pbService/wwcx/index" class="pbservice-item">
@@ -169,8 +231,10 @@
       </view> -->
       <view bindtap="goH5"  data-title="文化场馆查询"
         data-path="Museum" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
-        <view>文化场馆查询</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
+        <view>文化场馆查询</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/whcgcx.png" mode="widthFix"></image>
       </view>
       <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
         data-path="/pages/pbService/museum/index" class="pbservice-item">
@@ -179,8 +243,10 @@
       </view> -->
       <view bindtap="goH5" data-title="数字博物馆"
         data-path="BwsInfo" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
-        <view>数字博物馆</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
+        <view>数字博物馆</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/szbwg.png" mode="widthFix"></image>
       </view>
       <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
@@ -189,13 +255,17 @@
       </view> -->
       <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-        <view>云上文博会</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+        <view>云上文博会</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yswbh.png" mode="widthFix"></image>
       </view>
       <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-        <view>投资导引图</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
+        <view>投资导引图</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/tzydt.png" mode="widthFix"></image>
       </view>
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
@@ -204,8 +274,10 @@
       </view> -->
       <view bindtap="gotoPath" data-event="institution_click" 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>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
+        <view>文旅单位</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/wldw.png" mode="widthFix"></image>
       </view>
       <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
         class="pbservice-item">
@@ -221,8 +293,10 @@
       </view> -->
 			<view bindtap="gotoPath" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
-        <view>苏影通</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
+        <view>苏影通</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/syt.png" mode="widthFix"></image>
       </view>
 
       <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
@@ -232,40 +306,65 @@
       </view> -->
       <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
         data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
-        <view>云上观展</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
+        <view>云上观展</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/ysgz.png" mode="widthFix"></image>
       </view>
       <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
-        <view>精彩回顾</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
+        <view>精彩回顾</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jchg.png" mode="widthFix"></image>
       </view>
       <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
         data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
-        <view>视觉中心</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
+        <view>视觉中心</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sjzx.png" mode="widthFix"></image>
       </view>
 			<view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sxjy.png" mode="widthFix"></image>
       </view>
 
 	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
 	    class="pbservice-item">
-	    <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-	    <view>公共文化资源库</view>
+	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+	    <view>公共文化资源库</view> -->
+      <!-- 元旦修改 -->
+      <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/ggwhzyk.png" mode="widthFix"></image>
 	  </view>
     </view>
   </scroll-view>
   <view class="scroll-line">
-    <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view>
+    <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+    <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+    <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+    <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
   </view>
   <view class="pic-list" style="margin-top:20rpx">
-    <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image>
+    <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image>
+    <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
+    </image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image>
+      <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
+    <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
     <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
@@ -275,7 +374,7 @@
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
     </image>
     <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
     <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
       mode="aspectFill"></image> -->
   </view>
@@ -285,29 +384,39 @@
         class="iconfont icon-you"></text> </navigator>
   </view>
   <view style="overflow-x:auto">
-    <view class="pbservice" style="width:100%">
+    <!-- 元旦修改 ggfw为新增类名 -->
+    <view class="pbservice ggfw-list" style="width:100%">
       <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
         data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view> -->
-            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
+        <!-- 元旦修改 ggfw为新增类名 -->
+            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/aqfw.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jqssd.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/xljc.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sslk.png" mode="widthFix"></image>
         <view>实时路况</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
@@ -330,11 +439,18 @@
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
   </view>
-  <view class="six-box">
+  <!-- <view class="six-box">
     <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
       data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
       src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
     </image>
+  </view> -->
+  <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+  <view class="six-box-new">
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
+      src="{{sqjNew[index]}}" mode="widthFix">
+    </image>
   </view>
   <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5858b74..5a6535b 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,4 +1,8 @@
 /**index.wxss**/
+/* 元旦修改 */
+page {
+  background: #FFF6E8;
+}
 .swiper,.swiper image {
   width: 690rpx;
   display: block;
@@ -275,7 +279,7 @@
   font-size: 31rpx;
   font-weight: 500;
 }
-.pic-list {
+/* .pic-list {
   display: flex;
   justify-content: space-between;
   margin: 60rpx 0;
@@ -284,23 +288,41 @@
   width: 155.33rpx;
   height: 200rpx;
   display: block;
+} */
+/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
+.pic-list {
+  width: 100%;
+  display: flex;
+  margin-right: 26rpx;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
 }
 .title-more {
   font-size: 27rpx;
-  color: #0B898E;
+  /* color: #0B898E; */
+  /* 元旦修改 */
+  color: #D02E25;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .pbservice {
-  width: calc(175rpx * 6);
+  /* width: calc(175rpx * 6); */
+  /* 元旦修改 */
+  width: calc(239.33rpx * 6);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
-  margin-bottom: 60rpx;
+  /* margin-bottom: 60rpx; */
+  /* 元旦修改 注释margin-bottom */
 }
 .pbservice-item {
-  width: 175rpx;
+  /* 元旦修改 截止到注释的width*/
+  width: 220rpx;
+  margin-bottom: 33.33rpx;
+  margin-right: 19.33rpx;
+  /* width: 175rpx; */
   text-align: center;
   font-size: 25rpx;
   color: #333;
@@ -311,9 +333,11 @@
   flex-direction: column;
 }
 .pbservice-item image {
-  width: 60rpx;
+  /* width: 60rpx;
   margin-bottom: 20rpx;
-  margin-top: 50rpx;
+  margin-top: 50rpx; */
+  /* 元旦修改 以上都是之前的*/
+  width: 220rpx;
 }
 .six-box {
   margin-top: 43rpx;
@@ -482,17 +506,34 @@
   margin: 20rpx auto;
 }
 .scroll-line {
-  height: 6rpx;
+  /* height: 6rpx;
   border-radius: 3rpx;
   background: #ccc;
   overflow: hidden;
-  margin: 30rpx auto;
+  margin: 30rpx auto; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  width: 73rpx !important;
+  height: 7rpx;
+  background: #FFDA9F;
+  border-radius: 3rpx;
+  margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  width: 300rpx;
+  /* width: 300rpx;
   height: 6rpx;
   border-radius: 3rpx;
-  background: #0B898E;
+  background: #0B898E; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  height: 7rpx;
+  background: #D02E25;
+  border-radius: 3rpx;
+}
+/* 元旦修改  新增样式 */
+.scroll-line-bg2 {
+  margin-left: 37.33rpx;
+  background: #D02E25;
+  height: 7rpx;
+  border-radius: 3rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -724,4 +765,197 @@
   text-align: center;
   line-height: 60rpx;
   z-index: 1002;
+}
+
+/* 元旦修改新增样式 */
+.xpth {
+  /* width: 697rpx; */
+  height: 462rpx;
+  background: linear-gradient(-90deg,  #FF9B6A, #D02E25);
+  border-radius: 20rpx;
+  padding: 22.67rpx 18rpx 15.33rpx;
+  position: relative;
+}
+/* 元旦修改新增样式 */
+.time-box {
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  color: #FDEBC6;
+  display: flex;
+  align-items: center;
+  height: 37px;
+  margin-left: -50rpx;
+}
+/* 元旦修改新增样式 */
+.xsth-time {
+  margin: 0 5rpx;
+  width: 50rpx;
+  height: 33rpx;
+  background: #FFF0D7;
+  border-radius: 5rpx;
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  color: #E63100;
+  text-align: center;
+  line-height: 33rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-left {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+/* 元旦修改新增样式 */
+.xsth-title {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+/* 元旦修改新增样式 */
+.xsth-more {
+  margin-top: 19.33rpx;
+  font-size: 27rpx;
+  font-family: HYZhongYuan;
+  font-weight: normal;
+  color: #FFE7C0;
+}
+/* 元旦修改新增样式 */
+.xsth-more image {
+  margin-left: 14.67rpx;
+  width: 12.67rpx;
+  height: 22.67rpx;
+  vertical-align: middle;
+}
+/* 元旦修改新增样式 */
+.yanhua {
+  height: 104rpx;
+  width: 104rpx;
+  position: absolute;
+  right: 120rpx;
+  z-index: 999;
+}
+/* 元旦修改新增样式 */
+.xpth-product {
+  position: absolute;
+  right: 18rpx;
+  bottom: 15.33rpx;
+  display: flex;
+  width: 670rpx;
+  justify-content: space-between;
+}
+/* 元旦修改新增样式 */
+.xpth-banner {
+  width: 248rpx;
+  height: 353rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item {
+  width: 413rpx;
+  height: 170rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  display: flex;
+}
+/* 元旦修改新增样式 */
+.xpth-item image {
+  width: 160rpx;
+  height: 160rpx;
+  background: #FFE7C0;
+  border-radius: 13rpx;
+  margin-right: 15.33rpx;
+  flex-shrink: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-content {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  
+}
+/* 元旦修改新增样式 */
+.xpth-item-title {
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  margin-right: 18rpx;
+  height: 80rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-right: 13.33rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price {
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #E63100;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price::before {
+  content: "￥";
+  font-size: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-buy {
+  width: 111rpx;
+  height: 36rpx;
+  background: linear-gradient(180deg, #FF9B6A, #E63100);
+  border-radius: 18rpx;
+  font-size: 21rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFE7C0;
+  text-align: center;
+  line-height: 36rpx;
+}
+/* 元旦修改新增样式 */
+.new-pic {
+  width: 335.33rpx !important;
+  height: 120.67rpx !important;
+  margin-bottom: 26.67rpx;
+}
+
+.ggfw-list {
+  justify-content: space-around !important;
+}
+.ggfw {
+  width: auto;
+  margin-bottom: 54rpx;
+}
+.ggfw image{
+  margin-bottom: 16.67rpx;
+  width: 93.33rpx !important;
+  height: 93.33rpx !important;
+}
+
+.six-box-new {
+  width: 697rpx;
+  height: 285rpx;
+  background: linear-gradient(-90deg, #FF9B6A, #D02E25);
+  border-radius: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 13.33rpx;
+  overflow: scroll;
+  margin-bottom: 53.33rpx;
+}
+
+.six-box-new image {
+  width: 192rpx;
+  height: 258rpx;
+  background: #FFE7C0;
+  border-radius: 20rpx;
+  flex-shrink: 0;
+  margin-right: 13.33rpx;
 }
\ No newline at end of file
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index e5770bc..88057ff 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -40,7 +40,7 @@
   <view class="scene-info">
     <view class="scene-title-box">
       <view class="scene-title textOver">{{info.scene_data.title}}</view>
-      <view>查看</view>
+      <view>预订</view>
       <image style="width:15rpx;margin:0;margin-left:8rpx" src="https://static.ticket.sz-trip.com/uploads/20211115/bce693953f019999dbc11ee16abf64bb.png" mode="widthFix"></image>
     </view>
     <view class="scene-address textOver2">{{info.scene_data.address}}</view>
diff --git a/pages/info/hotelInfo/index.js b/pages/info/hotelInfo/index.js
index 877d9c3..e4e62bd 100644
--- a/pages/info/hotelInfo/index.js
+++ b/pages/info/hotelInfo/index.js
@@ -13,7 +13,8 @@ Page({
     fixed:false,
     type:1,
     top:0,
-    info:null
+    info:null,
+    tel:null
   },
 
   /**
@@ -30,7 +31,8 @@ Page({
       id:options.id
     }).then(res=>{
       this.setData({
-        info:res.data
+        info:res.data,
+        tel:(res.data.tel.indexOf('/') == -1)?res.data.tel:res.data.tel.split('/')[0]
       })
       this.BroswerRecord()
     })
@@ -53,6 +55,12 @@ Page({
       }
     },500)
   },
+  call:function(e){
+    let num = e.currentTarget.dataset.num;
+    wx.makePhoneCall({
+      phoneNumber: num,
+    })
+  },
   changeMenu:function(e){
     let index = e.currentTarget.dataset.index,that = this;
     const query=wx.createSelectorQuery();  //创建节点查询器
diff --git a/pages/info/hotelInfo/index.wxml b/pages/info/hotelInfo/index.wxml
index 33838b7..5e752a9 100644
--- a/pages/info/hotelInfo/index.wxml
+++ b/pages/info/hotelInfo/index.wxml
@@ -4,18 +4,24 @@
 <view class="scroll-all-box" id="menus" wx:if="{{info}}">
   <view class="scroll-menus fixed-menus">
     <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">介绍</view>
-    <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">设施与服务</view>
-    <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">预定须知</view>
+    <!-- <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">设施与服务</view> -->
+    <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">预订须知</view>
   </view>
   <view style="height:85rpx"></view>
+  <view class="hotel-name textOver">
+    {{info.title}}
+  </view>
 	<view class="info-box" id="box1">
-		<view class="info-title">介绍</view>
+		<view class="info-title">
+      <image class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/e78f4f525e72199013ad18a0200c3352.png" mode=""/>
+      酒店介绍
+    </view>
 		<!-- <rich-text class="details"></rich-text> -->
 		<rich-text class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
 	</view>
-  <view class="info-box" id="box2">
+  <!-- <view class="info-box" id="box2">
     <view class="info-title">设施与服务</view>
-		<rich-text class="detail" nodes="{{tool.formateRichText(info.service_info)}}"></rich-text>
+		<rich-text class="detail" nodes="{{tool.formateRichText(info.service_info)}}"></rich-text> -->
     <!-- <rich-text class="details" nodes="{{filter.formateRichText(skuInfo[0].feeDescription)}}"></rich-text> -->
     <!-- <view class="details" wx:for="{{6}}">
 			在这里，酣畅淋漓的做一场偶像梦，你就是星光闪耀的明日之星！下一站天王天后，等你来！
@@ -23,9 +29,12 @@
 			表演时长：30分钟
 			表演故事线：“最Q童星奖”PK赛现场直播啦！刚从电影学院新鲜出炉的小明星们，赶快大展身手吧！
 		</view> -->
-  </view>
+  <!-- </view> -->
   <view class="info-box" id="box3">
-    <view class="info-title">预定须知</view>
+    <view class="info-title">
+      <image class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/8a5d9e1546712bf70f4b42dccb124c96.png" mode=""/>
+      预订须知
+    </view>
 		<rich-text class="detail" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
     <!-- <rich-text class="details" nodes="{{filter.formateRichText(skuInfo[0].bookingInfo)}}"></rich-text> -->
     <!-- <view class="details" wx:for="{{6}}">
@@ -35,4 +44,8 @@
 			表演故事线：“最Q童星奖”PK赛现场直播啦！刚从电影学院新鲜出炉的小明星们，赶快大展身手吧！
 		</view> -->
   </view>
+</view>
+<view class="call-phone" bindtap="call" data-num="{{tel}}">
+  <image class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/a2cb3d2b1c1b2f8f7090bc6e88e360bf.png" mode=""/>
+  拨打酒店电话：{{tel}}
 </view>
\ No newline at end of file
diff --git a/pages/info/hotelInfo/index.wxss b/pages/info/hotelInfo/index.wxss
index c1d14a2..69011dc 100644
--- a/pages/info/hotelInfo/index.wxss
+++ b/pages/info/hotelInfo/index.wxss
@@ -1,6 +1,7 @@
 /* pages/info/hotelProductInfo/index.wxss */
 page {
-  background: #f2f2f2;
+  /* background: #f2f2f2; */
+  padding-bottom: 171rpx;
 }
 .swiper {
   width: 100%;
@@ -300,6 +301,8 @@ page {
 .scroll-menu-item {
   position: relative;
   line-height: 84rpx;
+  width: 300rpx;
+  text-align: center;
 }
 .scroll-menu-item.active::after {
   content: "1";
@@ -359,3 +362,39 @@ page {
   border-radius: 39rpx;
   text-align: center;
 }
+
+.hotel-name {
+  width: 750rpx;
+  height: 121rpx;
+  background: rgba(11,137,142, .08);
+  padding-left: 26.67rpx;
+  font-size: 35rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #0B898E;
+  line-height: 121rpx;
+}
+
+.icon-img {
+  width: 32rpx;
+  height: 32rpx;
+  margin-right: 8.67rpx;
+  vertical-align: middle;
+}
+
+.call-phone {
+  width: 653rpx;
+  height: 80rpx;
+  background: #0B898E;
+  border-radius: 40rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 80rpx;
+  margin: auto;
+  position: fixed;
+  left: 50rpx;
+  bottom: 50rpx;
+}
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 9514af6..1bffe7b 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -49,7 +49,7 @@
     <view style="padding-left: 10rpx;margin: 30rpx 0 22.67rpx;">出行人信息</view>
     <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
       <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
-      <view class="text"><view class="text-left">身份证：</view>{{items.id_number}}</view>
+      <view class="text"><view class="text-left">证件号：</view>{{items.id_number}}</view>
       <view class="text"><view class="text-left">手机号：</view>{{items.tel}}</view>
     </view>
 	</view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 032d64a..0094b6e 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -71,7 +71,7 @@
               <view style="color: #333;">{{item.name}}</view>
             </view>
             <view class="flex" style="margin: 19.33rpx 0;">
-              <view>身份证：</view>
+              <view>证件号：</view>
               <view style="color: #333;">{{item.id_number}}</view>
             </view>
             <view class="flex">

From af38b54673ab42f1e9bdfe2bb9180f04ae70fe65 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 12 Jan 2024 09:54:17 +0800
Subject: [PATCH 111/471] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5ui?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=93=81=E7=89=B9?=
 =?UTF-8?q?=E6=83=A0=E6=9D=BF=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b727e0f..824434e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,7 +179,7 @@
     <!-- 上方标题部分 -->
     <view class="xsth-title">
       <view class="xsth-left" style="display: flex;">
-        <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/uploads/20240103/2b45bdf26113fc61b86a5e1f7b9f1fdb.png"></image>
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
         <view class="time-box">
           <view class="xsth-time">{{djs.h}}</view>:
           <view class="xsth-time">{{djs.m}}</view>:

From 06468f03a09cd228a2e7109ae3e0b1bbbf72ea96 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 15 Jan 2024 10:33:11 +0800
Subject: [PATCH 112/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AF=E7=82=B9?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=92=8C=E9=9A=90=E8=97=8F=E7=94=B5=E5=BD=B1?=
 =?UTF-8?q?=E6=9D=BF=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml               |  8 ++---
 pages/list/activitynew/index.wxml    |  4 +--
 pages/order/components/date/index.js |  4 +++
 pages/order/scene/index.js           | 49 +++++++++++++++++++++++++---
 pages/order/scene/index.wxml         |  4 +--
 5 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 824434e..e323560 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -291,13 +291,13 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
-			<view bindtap="gotoPath" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-        class="pbservice-item">
+			<!-- <view bindtap="gotoPath" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
+        class="pbservice-item"> -->
         <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
         <view>苏影通</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/syt.png" mode="widthFix"></image>
-      </view>
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/syt.png" mode="widthFix"></image>
+      </view> -->
 
       <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
         class="pbservice-item">
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 6c831a6..41ce496 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -31,10 +31,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==2?'color:#C155E9':''}}">展览</view>
     </view>
-    <view class="type-item" bindtap="changeType" data-type="4">
+    <!-- <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view>
+    </view> -->
     <view class="type-item" bindtap="changeType" data-type="7">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==7?'color:#F75D2A':''}}">文化惠民</view>
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 7f8b37f..919747e 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -168,6 +168,7 @@ Component({
         showMoreDateFlag: false,
         moreFlag: flag
       })
+      app.globalData.product.price = this.data.activeDate.price
       this.triggerEvent("onChangeDate", this.data.activeDate)
       this.getTimeStock()
     },
@@ -199,6 +200,9 @@ Component({
         })
         this.triggerEvent("onChangeTime", this.data.timelist[this.data.timeIndex])
       })
+      app.globalData.product.price = this.data.activeDate.price
+      console.log('price',this.data.activeDate.price);
+      console.log(app.globalData.product);
     },
     selectTime: function (e) {
       if (this.data.timelist[e.currentTarget.dataset.index].stock_number >0) {
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index c8e79f7..18096dd 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -30,7 +30,8 @@ Page({
     flag:null,
 		ticket_type:1,
     isCar:'single',
-    showMask: false
+    showMask: false,
+    price:0,
   },
 
   /**
@@ -63,12 +64,13 @@ Page({
 		this.setData({
 		  productNum: app.globalData.product.num < 1 ? 1 : app.globalData.product.num
 		})
-	}
+  }
     this.setData({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
-   console.log(this.data.product);
+    this.showAllPrice()
+  //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
@@ -78,6 +80,37 @@ Page({
   //     showMask:true
   //   })
   // },
+  showAllPrice:function () {
+    // console.log('detail',app.globalData.product);
+    // console.log('singlePrice',this.data.singlePrice);
+    // console.log('productNum',this.data.productNum);
+    if (app.globalData.product.price) {
+      this.setData({
+        singlePrice:app.globalData.product.price
+      })
+      let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      if (price >0) {
+        this.setData({
+          price:price/100
+        })
+      }else {
+        this.setData({
+          price:0
+        })
+      }
+      // console.log(this.data.singlePrice);
+    }
+    let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    if (price >0) {
+      this.setData({
+        price:price/100
+      })
+    }else {
+      this.setData({
+        price:0
+      })
+    }
+  },
   cancel: function () {
     this.setData({
       showMask:false
@@ -133,6 +166,7 @@ Page({
     })
 	this.data.product.num = this.data.productNum
     this.changePrice()
+    this.showAllPrice()
   },
   minus: function () {
     if (this.data.productNum==undefined) {
@@ -160,15 +194,19 @@ Page({
     })
 	this.data.product.num = this.data.productNum
     this.changePrice()
+    this.showAllPrice()
   },
   changeDate: function (e) {
+    // console.log('打印',e);
+    this.showAllPrice()
     if (e.detail.price != this.data.singlePrice && this.data.coupon) {
       wx.showToast({
         title: '订单价格发生变化，请重新选择优惠券',
         icon: 'none'
       })
       this.setData({
-        coupon: null
+        coupon: null,
+        singlePrice:e.detail.price
       })
       if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
         this.couponCom.setNullCoupon()
@@ -541,6 +579,9 @@ Page({
     //     }
     //   })
     // }
+    // console.log('-----',app.globalData.product.sku.price);
+    // app.globalData.product = delete(app.globalData.product.detail)
+    // this.showAllPrice()
   },
 
   /**
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 0094b6e..a6d3748 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -49,8 +49,8 @@
   <view class="fixed-bottom" wx:if="{{type!='museum' && type!='activity'}}">
     <view class="fixed-price-box" wx:if="{{kjId || prizeId}}"><text>合计：</text><text class="price">¥0</text></view>
     <!-- <view class="fixed-price-box" wx:elif="{{prizeId}}"><text>合计：</text><text class="price">¥0</text></view> -->
-    <view class="fixed-price-box" wx:else><text>合计：</text><text
-        class="price">¥{{((singlePrice * productNum - (coupon?coupon.activity.money:0))>0?(singlePrice * productNum - (coupon?coupon.activity.money:0)):0)/ 100}}</text>
+    <view class="fixed-price-box" wx:else><text>合计：</text>
+      <text class="price">¥{{price}}</text>
     </view>
     <view class="fixed-btn" bindtap="next">下一步</view>
   </view>

From 5992ee35e418030bc071846d110954bd9ab17f79 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 15 Jan 2024 10:50:16 +0800
Subject: [PATCH 113/471] =?UTF-8?q?=E6=96=B0=E5=93=81=E7=89=B9=E6=83=A0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e323560..6b3ba24 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -175,7 +175,7 @@
     </view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 62.67rpx;">
+  <view class="sale-road-boxes xpth" style="margin-bottom: 62.67rpx;" wx:if="{{isTest==false}}">
     <!-- 上方标题部分 -->
     <view class="xsth-title">
       <view class="xsth-left" style="display: flex;">

From 46305469d1b16937bb9d370f10cde40596c7a4bf Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 19 Jan 2024 14:58:27 +0800
Subject: [PATCH 114/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1-?=
 =?UTF-8?q?=E4=BA=A4=E9=80=9A=E5=87=BA=E8=A1=8C-=E6=8E=A5=E9=80=81?=
 =?UTF-8?q?=E6=9C=BA=E6=9B=B4=E6=8D=A2=E8=B7=B3=E8=BD=AC=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/pbService/index.js b/pages/pbService/index.js
index 16a7315..4d995c5 100644
--- a/pages/pbService/index.js
+++ b/pages/pbService/index.js
@@ -56,9 +56,13 @@ Page({
       util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
     }
     wx.navigateToMiniProgram({
-      appId: this.data.jsj,
-      page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
+      appId: this.data.jsj, // 之前后台的appid    wx336dcaf6a1ecf632
+      page: "subpages/product/airport/index"
     })
+    // wx.navigateToMiniProgram({
+    //   appId: this.data.jsj,
+    //   page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
+    // })
   },
   gotoUrl: function (e) {
     if (e.currentTarget.dataset.event) {

From 3e0bf63a3d18a9203704ca3017e13e11defaddeb Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 25 Jan 2024 17:13:30 +0800
Subject: [PATCH 115/471] =?UTF-8?q?=E5=9B=BE=E6=B8=B8=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                          |   4 +-
 pages/info/luggageInfo/index.js   | 112 ++++++++++
 pages/info/luggageInfo/index.json |   5 +
 pages/info/luggageInfo/index.wxml |  39 ++++
 pages/info/luggageInfo/index.wxss |  93 +++++++++
 pages/map/index.js                | 329 +++++++++++++++++++++++++-----
 pages/map/index.wxml              | 143 +++++++++++--
 pages/map/index.wxss              | 153 +++++++++++++-
 8 files changed, 812 insertions(+), 66 deletions(-)
 create mode 100644 pages/info/luggageInfo/index.js
 create mode 100644 pages/info/luggageInfo/index.json
 create mode 100644 pages/info/luggageInfo/index.wxml
 create mode 100644 pages/info/luggageInfo/index.wxss

diff --git a/app.json b/app.json
index 7b89e99..33f20b5 100644
--- a/app.json
+++ b/app.json
@@ -182,8 +182,8 @@
 	"pages/user/address/add/index",
 	"pages/user/linkman/index",
   "pages/user/userPrivacy/index",
-	"pages/user/personalInfo/index"
-  
+	"pages/user/personalInfo/index",
+  "pages/info/luggageInfo/index"
 
   ],
   "plugins": {
diff --git a/pages/info/luggageInfo/index.js b/pages/info/luggageInfo/index.js
new file mode 100644
index 0000000..9a49686
--- /dev/null
+++ b/pages/info/luggageInfo/index.js
@@ -0,0 +1,112 @@
+// pages/info/redmapInfo/index.js
+// pages/info/culturalUnitInfo/index.js
+import commonApi from "../../../utils/https/common"
+let app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    info:null,
+    currentIndex:0,
+    top:0,
+    htmls:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      id:options.id
+    })
+    commonApi._post("scene/detail",{
+      id:options.id
+    }).then(res=>{
+      this.setData({
+        info:res.data
+      })
+      this.BroswerRecord()
+    })
+  },
+  changeSlide(e){
+    this.setData({
+      currentIndex:e.detail.current
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+  BroswerRecord:function(){
+    setTimeout(()=>{
+      if(app.globalData.uuid){
+        commonApi._post('browse/browse_record',{
+          type:"scene",
+          title:this.data.info.title,
+          drive:"mini",
+          source_id:this.data.id,
+          url:"/pages/info/foodInfo/index?id="+this.data.id,
+          uuid:app.globalData.uuid
+        }).then(res=>{
+          console.log(res)
+        })
+      }
+      else {
+        this.BroswerRecord();
+      }
+    },500)
+  },
+  gotolocation: function () {
+    let info = this.data.info;
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon)
+    })
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/info/luggageInfo/index.json b/pages/info/luggageInfo/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/pages/info/luggageInfo/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/pages/info/luggageInfo/index.wxml b/pages/info/luggageInfo/index.wxml
new file mode 100644
index 0000000..e86b2e2
--- /dev/null
+++ b/pages/info/luggageInfo/index.wxml
@@ -0,0 +1,39 @@
+<!--pages/info/redmapInfo/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<!-- <title wx:if="{{info}}" title="红色地图详情"></title> -->
+<title title="寄存点位详情"></title>
+<view class="box">
+  <view class="title textOver2">
+    {{info.title}}
+  </view>
+  <view class="address">
+    <image class="address-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/3625398e2fba9768aa891f806b855716.png" mode=""/>
+    <view class="textOver address-text">{{info.address}}</view>
+    <image class="map-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/bfe241bd7606cdaec78da737166a42fc.png" mode=""/>
+    <view class="go-there" bindtap="gotolocation">到这去</view>
+  </view>
+  <view class="address" style="margin: 27rpx 0;">
+    <image class="call-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/fbd073d47279f137775ad39b5a6fe454.png" mode=""/>
+    <view class="call">电话：{{info.tel}}</view>
+  </view>
+  <view class="line"></view>
+  <view>
+    <view class="h-title">寄存时间</view>
+    <view class="btm-line"></view>
+  </view>
+  <view class="text">
+    <rich-text nodes="{{info.time_info}}"></rich-text>
+  </view>
+  <view>
+    <view class="h-title">收费情况</view>
+    <view class="btm-line"></view>
+  </view>
+  <view class="text"><rich-text nodes="{{info.content}}"></rich-text></view>
+  <view>
+    <view class="h-title2">寄存须知</view>
+    <view class="btm-line"></view>
+  </view>
+  <view class="text">
+    <rich-text nodes="{{info.book_info}}"></rich-text>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/info/luggageInfo/index.wxss b/pages/info/luggageInfo/index.wxss
new file mode 100644
index 0000000..74ee2f0
--- /dev/null
+++ b/pages/info/luggageInfo/index.wxss
@@ -0,0 +1,93 @@
+/* pages/pbService/museum/info/index.wxss */
+.box {
+  padding: 0 26.67rpx;
+}
+
+.title {
+  font-size: 35rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #000000;
+  margin: 28rpx 0 58rpx;
+}
+
+.address {
+  display: flex;
+  align-items: center;
+}
+
+.address-icon {
+  width: 29.33rpx;
+  height: 29.33rpx;
+  flex-shrink: 0;
+  margin-right: 22rpx;
+}
+
+.map-icon {
+  width: 24rpx;
+  height: 26.67rpx;
+  flex-shrink: 0;
+  margin: 0 12.67rpx 0 21.33rpx;
+}
+
+.address-text {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #999999;
+  max-width: 450rpx;
+}
+
+.go-there {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #0B898E;
+}
+
+.call-icon {
+  width: 29.33rpx;
+  height: 29.33rpx;
+  margin-right: 24rpx;
+}
+
+.call {
+  font-size: 24rpx;
+  font-family: PingFangSC;
+  font-weight: 400;
+  color: #999999;
+}
+
+.line {
+  width: 697rpx;
+  height: 1rpx;
+  background: #D8D8D8;
+  margin-bottom: 43.33rpx;
+}
+
+.h-title {
+  padding-left: 6.67rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+}
+
+.btm-line {
+  width: 173rpx;
+  height: 19rpx;
+  background: #0B898E;
+  opacity: 0.2;
+  margin-top: -15rpx;
+}
+
+.text {
+  margin: 41.33rpx 0 64.67rpx;
+}
+
+.h-title2 {
+  font-size: 36rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+}
\ No newline at end of file
diff --git a/pages/map/index.js b/pages/map/index.js
index f2de0cf..fc6d3f5 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -17,7 +17,8 @@ Page({
     areaIndex:0,
     latitude:"",
     longitude:"",
-    type:0,
+    // type:0,
+    type:1, // 改为默认选中第一个类型：景点
     keywords:"",
     list:[],
     showInfo:false,
@@ -27,7 +28,14 @@ Page({
     productList:[],
     productPage:1,
     productTotal:1,
-    timeList:{}
+    timeList:{},
+    showMore:'close',
+    scrollLeft: 0,
+  },
+  listenScroll(e) {
+    this.setData({
+      scrollLeft: e.detail.scrollLeft
+    })
   },
 
   /**
@@ -67,6 +75,17 @@ Page({
       
     })
   },
+  changeClose() {
+    this.setData({
+      showMore:'close'
+    })
+  },
+  changeShow() {
+    this.setData({
+      showMore:'open'
+    })
+    console.log(this.data.showMore);
+  },
   getIsTest(){
     if(app.globalData.configJson){
       this.setData({
@@ -97,6 +116,12 @@ Page({
         url: '/pages/info/redmapInfo/index?id='+this.data.info.info.id,
       })
     }
+    else if(this.data.info.info.type=='luggage'){
+      // 行李寄存
+      wx.navigateTo({
+        url: '/pages/info/luggageInfo/index?id='+this.data.info.info.id,
+      })
+    }
     else if(this.data.info.info.type=='restaurant' || this.data.info.info.type=='tenscenic'){
       wx.navigateTo({
         url: '/pages/info/foodInfo/index?id='+this.data.info.info.id,
@@ -112,9 +137,97 @@ Page({
     }
     
   },
+  goAddress(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.showModal({
+      title:'到这去',
+      content:item.info.showContent?item.info.showContent:item.info.title,
+      success:function(res){
+        if(res.confirm){
+          wx.openLocation({
+            latitude: item.latitude,
+            longitude: item.longitude,
+          })
+        }
+      }
+    })
+  },
   onTapMarker:function(e){
     console.log(e)
+    console.log(this.data.list,this.data.list.length);
     let info = this.data.list[e.detail.markerId];
+    let list = [];
+    this.data.list.map((item,itemIndex)=>{
+      let mapItem = item;
+      if (itemIndex == e.detail.markerId) {
+        mapItem.width = 30;
+        mapItem.height=36;
+        if (mapItem.info.type == "scenic") {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/4b340f512e8e424cb70ef766ad35cddb.png";
+        }else if (mapItem.info.type=='venue') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/ff2d05414295b5e987c3fdc7373c5f38.png";
+        }else if (mapItem.info.type=='room') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/fc2e8f86ad4977f08e7fe6284f946cb9.png";
+        }else if (mapItem.info.type=='publicBycicle') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/1c35ea03927638d3d6fef7f15f92d67d.png";
+        }else if (mapItem.info.type=='restaurant') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/4239b516f5ba99bff0b892a25a96c762.png";
+        }else if (mapItem.info.type=='relic') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/ae03ad079e3e667e84b4e49e498c77a9.png";
+        }else if (mapItem.info.type=='tenscenic') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/15f025534e644799f8c7cae6efee732f.png";
+        }else if (mapItem.info.type=='academes') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/63e375cd4227fe6a58ef4eef85c38e4c.png";
+        }else if (mapItem.info.type=='park') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/82218d810a22ea254afdf2a089cfd0a7.png";
+        }else if (mapItem.info.type=='luggage') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/d73376830530e13963ccc3211480f975.png";
+        }else if (mapItem.info.type=='tourist') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/eeb6894d312a6fd0b771623a2db6120c.png"; 
+        }else if (mapItem.info.type=='post') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/2594df53aad900e56173eb024786379c.png";
+        } else {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/27517eb0968079bbeadb3b6438d3fbf3.png";
+        }
+      }else {
+            mapItem.width = 20;
+            mapItem.height=23;
+            if (mapItem.info.type == "scenic") {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/c59dc041fcfd8b7a62ad2ac2444adcda.png";
+            }else if (mapItem.info.type=='venue') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/04aedae4dc498d45267f3636d5524af6.png";
+            }else if (mapItem.info.type=='room') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/78ff8b94929d18dc6349a3482069b756.png";
+            }else if (mapItem.info.type=='publicBycicle') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ce2b9e6eda6f8a3fea5073d5d5ad19a.png";
+            }else if (mapItem.info.type=='restaurant') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/3f5bdfd0f0c81e2263bc3999291bec8f.png";
+            }else if (mapItem.info.type=='relic') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/dfb34899466e98e1f2e02a40175a7672.png";
+            }else if (mapItem.info.type=='tenscenic') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/f77236d6a84b8d28027417aa8ef60c96.png";
+            }else if (mapItem.info.type=='academes') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/44da805692924852614afb013479e917.png";
+            }else if (mapItem.info.type=='park') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/0b95fda240aa4f5eb89667188cfa1517.png";
+            }else if (mapItem.info.type=='luggage') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ba1e554b71f451a120217c029fe1877.png";
+            }else if (mapItem.info.type=='tourist') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/24fba3a917652e1bdfe31d5785dba09f.png"; 
+            }else if (mapItem.info.type=='post') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/754a384e8aacd4a1ea41007e79910c67.png";
+            } else {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/2d61b60609564fc48e38768fbef87c0a.png";
+            }
+      }
+      if(mapItem.latitude<40){
+        list.push(mapItem)
+      }
+    })
+    this.setData({
+      list:list
+    })
+    console.log('换完图标后的list',list);
     if(info.info.type=='tenscenic'){
       // 运河十景需要先获取景点详情
       commonApi._post("scene/detail",{
@@ -219,12 +332,19 @@ Page({
         this.getProductList()
       })
       return;
+    }else if (info.info.type=='publicBycicle' || info.info.type=='park') {
+        console.log(e)
+        let index = e.detail.markerId,list = this.data.list;
+        let item = list[index];
+    } else {
+      
     }
     this.setData({
       info:info,
       showInfo:true,
       showAllMask:false
     })
+    console.log('打印',this.data.info);
   },
   changeMenu:function(e){
     let index = e.currentTarget.dataset.index;
@@ -424,56 +544,173 @@ Page({
   },
   changeRegion:function(e){
     console.log(e)
+    if(e.type!='end') return;
+    console.log(e.detail.centerLocation)
+    this.setData(e.detail.centerLocation)
     this.getList()
   },
   getList:function(){
+    // this.setData({
+    //   list:[]
+    // })
     this.mapCtx = wx.createMapContext("map");
-    let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','red_map'],that = this;
-    this.mapCtx.getRegion({
-      type: 'gcj02',
-      success: function(res) {
-        commonApi._post("act/map_travel",{
-          type:types[that.data.type],
-          title:that.data.keywords,
-          m_lon:res.southwest.longitude-0.05,
-          l_lon:res.northeast.longitude+0.05,
-          m_lat:res.southwest.latitude-0.05,
-          l_lat:res.northeast.latitude+0.05
-        }).then(res=>{
-          let list = [];
-          res.data.map((item,index)=>{
-            let mapItem = {};
-            item.lat = item.tx_lat;
-            item.lon = item.tx_lon;
-            mapItem.latitude = Number(item.lat);
-            mapItem.longitude = Number(item.lon);
-            mapItem.id = index;
-            mapItem.info = item;
-            if(item.type=='red_map'){
-              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png";
-            }
-            else {
-              mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
-            }
-            mapItem.width = 20;
-            mapItem.height=23;
-            if(mapItem.latitude<40){
-              list.push(mapItem)
-            }
-          })
-          that.setData({
-            list:list
-          })
+    // let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','red_map'],that = this;
+    let types = ['','scenic','venue','room','publicBycicle','restaurant','relic','tenscenic','academes','park','luggage','tourist','post','red_map'],that = this;
+    if (types[that.data.type] == 'publicBycicle') {
+      commonApi.user_post("pbservice/Ztfw/publicBycicle",{
+        point_type:"gaode",
+        lat:this.data.latitude,
+        lon:this.data.longitude
+      }).then(res=>{
+        let list = [];
+        res.data.map((item,index)=>{
+          let mapItem = {};
+          item.showContent = item.name + "(" + item.address + ")";
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          mapItem.id = index;
+          mapItem.info = item;
+          mapItem.info.type = 'publicBycicle';
+          mapItem.width = 20;
+          mapItem.height=23;
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ce2b9e6eda6f8a3fea5073d5d5ad19a.png";
+          if(mapItem.latitude<40){
+            list.push(mapItem)
+          }
+        })
+        this.setData({
+          list:list
+        })
+      })
+    } else if (types[that.data.type] == 'park') {
+      commonApi.user_post("pbservice/Ztfw/park_new",{
+        point_type:"gaode",
+        lat:this.data.latitude,
+        lon:this.data.longitude
+      }).then(res=>{
+        let list = [];
+        res.data.map((item,index)=>{
+          let mapItem = {};
+          item.showContent = item.name + "(" + item.address + ")";
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          mapItem.id = index;
+          mapItem.info = item;
+          mapItem.info.type = 'park';
+          mapItem.width = 20;
+          mapItem.height=23;
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/0b95fda240aa4f5eb89667188cfa1517.png";
+          if(mapItem.latitude<40){
+            list.push(mapItem)
+          }
+        })
+        this.setData({
+          list:list
         })
-        // that.mapCtx.getRegion({
-        //   success:function(r){
-        //     let location = r.longitude+","+r.latitude;
+      })
+    } else {
+      this.mapCtx.getRegion({
+        type: 'gcj02',
+        success: function(res) {
+          commonApi._post("act/map_travel",{
+            type:types[that.data.type],
+            title:that.data.keywords,
+            m_lon:res.southwest.longitude-0.05,
+            l_lon:res.northeast.longitude+0.05,
+            m_lat:res.southwest.latitude-0.05,
+            l_lat:res.northeast.latitude+0.05
+          }).then(res=>{
+            let list = [];
+            res.data.map((item,index)=>{
+              let mapItem = {};
+              item.lat = item.tx_lat;
+              item.lon = item.tx_lon;
+              mapItem.latitude = Number(item.lat);
+              mapItem.longitude = Number(item.lon);
+              mapItem.id = index;
+              mapItem.info = item;
+              if(item.type=='scenic'){
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/c59dc041fcfd8b7a62ad2ac2444adcda.png";
+              }else if (item.type=='venue') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/04aedae4dc498d45267f3636d5524af6.png";
+              }else if (item.type=='room') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/78ff8b94929d18dc6349a3482069b756.png";
+              }else if (item.type=='restaurant') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/3f5bdfd0f0c81e2263bc3999291bec8f.png";
+              }else if (item.type=='relic') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/dfb34899466e98e1f2e02a40175a7672.png";
+              }else if (item.type=='tenscenic') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/f77236d6a84b8d28027417aa8ef60c96.png";
+              }else if (item.type=='academes') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/44da805692924852614afb013479e917.png";
+              }else if (item.type=='luggage') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ba1e554b71f451a120217c029fe1877.png";
+              }else if (item.type=='tourist') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/24fba3a917652e1bdfe31d5785dba09f.png"; 
+              }else if (item.type=='post') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/754a384e8aacd4a1ea41007e79910c67.png";
+              } else {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/2d61b60609564fc48e38768fbef87c0a.png";
+              }
+              mapItem.width = 20;
+              mapItem.height=23;
+              if(mapItem.latitude<40){
+                list.push(mapItem)
+              }
+            })
+            that.setData({
+              list:list
+            })
+          })
+        }
+      })
+    }
+    console.log('list',this.data.list);
+    // this.mapCtx.getRegion({
+    //   type: 'gcj02',
+    //   success: function(res) {
+    //     commonApi._post("act/map_travel",{
+    //       type:types[that.data.type],
+    //       title:that.data.keywords,
+    //       m_lon:res.southwest.longitude-0.05,
+    //       l_lon:res.northeast.longitude+0.05,
+    //       m_lat:res.southwest.latitude-0.05,
+    //       l_lat:res.northeast.latitude+0.05
+    //     }).then(res=>{
+    //       let list = [];
+    //       res.data.map((item,index)=>{
+    //         let mapItem = {};
+    //         item.lat = item.tx_lat;
+    //         item.lon = item.tx_lon;
+    //         mapItem.latitude = Number(item.lat);
+    //         mapItem.longitude = Number(item.lon);
+    //         mapItem.id = index;
+    //         mapItem.info = item;
+    //         if(item.type=='red_map'){
+    //           mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png";
+    //         }
+    //         else {
+    //           mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+    //         }
+    //         mapItem.width = 20;
+    //         mapItem.height=23;
+    //         if(mapItem.latitude<40){
+    //           list.push(mapItem)
+    //         }
+    //       })
+    //       that.setData({
+    //         list:list
+    //       })
+    //     })
+    //     // that.mapCtx.getRegion({
+    //     //   success:function(r){
+    //     //     let location = r.longitude+","+r.latitude;
             
-        //     that.getParkList(res.northeast.longitude,res.northeast.latitude,res.southwest.longitude,res.southwest.latitude,location)
-        //   }
-        // })
-      }
-    })
+    //     //     that.getParkList(res.northeast.longitude,res.northeast.latitude,res.southwest.longitude,res.southwest.latitude,location)
+    //     //   }
+    //     // })
+    //   }
+    // })
   },
   search:function(e){
     console.log(e)
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 18b3a69..b1ffe8e 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -10,64 +10,181 @@
     <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
   </view>
 </picker>
-<view class="right-menus" style="top:{{seachHeight}}px">
+<view class="menus" wx:if="{{showMore=='close'}}">
+  <view class="open" bindtap="changeShow"></view>
+  <view class="menu-list">
+    <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
+      <image class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
+      <text class="text">景点</text>
+    </view>
+    <view class="menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
+      <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
+      <text class="text">场馆</text>
+    </view>
+    <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+      <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
+      <text class="text">酒店</text>
+    </view>
+    <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <text class="text">公共自行车</text>
+    </view>
+  </view>
+</view>
+<view class="menus2" wx:else>
+  <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/>
+  <scroll-view scroll-x style="height:280rpx" bindscroll="listenScroll" class="">
+    <view class="menus-list1" style="margin-bottom:30rpx">
+      <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
+        <image class="menu-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
+        <text class="text">景点</text>
+      </view>
+      <view class="menus-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
+      <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
+      <text class="text">场馆</text>
+    </view>
+    <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+      <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
+      <text class="text">酒店</text>
+    </view>
+    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <text class="text">公共自行车</text>
+    </view>
+    <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
+      <image class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
+      <text class="text">美食</text>
+    </view>
+    <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
+      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
+      <text class="text">文保单位</text>
+    </view>
+    <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
+      <image class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
+      <text class="text">运河十景</text>
+    </view>
+    <view class="menus-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
+      <image class="menu-item-img" src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20240123/a95f3135ee4c9550b7bb0e855e8eb13b.png':'https://static.ticket.sz-trip.com/uploads/20240123/7dc1051d06ad9a4703edc209b065e851.png'}}" mode="aspectFill"/>
+      <text class="text">江南小书场</text>
+    </view>
+    <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
+      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
+      <text class="text">停车场</text>
+    </view>
+    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
+      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
+      <text class="text">行李寄存</text>
+    </view>
+    <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
+      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
+      <text class="text">游客中心</text>
+    </view>
+    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
+      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
+      <text class="text">特产</text>
+    </view>
+    <view class="menus-item{{type==13?' active':''}}" bindtap="changeType" data-title="红色地图" data-type="13">
+      <image class="menu-item-img" src="{{type==13?'https://static.ticket.sz-trip.com/uploads/20240123/176d442b0df8b16329ac62ffd481815a.png':'https://static.ticket.sz-trip.com/uploads/20240123/789606012a481332c98a5bd7ccb07306.png'}}" mode="aspectFill"/>
+      <text class="text">红色地图</text>
+    </view>
+    </view>
+  </scroll-view>
+  <view class="progress-line">
+    <view class="line-bg" wx:if="{{scrollLeft == 0}}" style="width:20rpx;"></view>
+    <view class="line-bg2" wx:else style="width:20rpx;"></view>
+  </view>
+</view>
+<!-- <view class="right-menus" style="top:{{seachHeight}}px">
   <view class="right-menu-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
-    <!-- <text style="color:#0A9947" class="iconfont icon-location"></text> -->
     <image src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/5ec907e6ff03f558b1f6a3bf96894ccb.png'}}" mode="aspectFill"/>
     <text class="text">景点</text>
   </view>
   <view class="right-menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
     <image src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/4019480777583c7efcf18943b21b1ba3.png'}}" mode="aspectFill"/>
 
-    <!-- <text style="color:#3D77D8" class="iconfont icon-location"></text> -->
     <text class="text">场馆</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==3?' active':''}}" data-title="特产" bindtap="changeType" data-type="3">
-    <!-- <text style="color:#C02C2C" class="iconfont icon-location"></text> -->
 
     <image src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
 
     <text class="text">特产</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==4?' active':''}}" data-title="美食" bindtap="changeType" data-type="4">
-    <!-- <text style="color:#EE641B" class="iconfont icon-location"></text> -->
     <image src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/04c558efe2650ca21f4612d60cc02a32.png'}}" mode="aspectFill"/>
 
     <text class="text">美食</text>
   </view>
   <view class="right-menu-item{{type==5?' active':''}}" bindtap="changeType" data-title="文物" data-type="5">
-    <!-- <text style="color:#00B3C8" class="iconfont icon-location"></text> -->
     <image src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/be9f147b71b30acb0cd210b973787a31.png'}}" mode="aspectFill"/>
 
     <text class="text">文保单位</text>
-  </view>
+  </view> -->
   <!-- <view class="right-menu-item{{type==7?' active':''}}" bindtap="changeType" data-title="影院" data-type="7">
     <text style="color:#9342CB" class="iconfont icon-location"></text>
     <text>影院</text>
   </view> -->
-  <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
-    <!-- <text style="color:#EB3C70" class="iconfont icon-location"></text> -->
+  <!-- <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
     <image src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/848919fa7df7d7a2cac6c671ff36c28c.png'}}" mode="aspectFill"/>
 
     <text class="text">运河十景</text>
   </view>
   <view class="right-menu-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
-    <!-- <text style="color:#9d6b00" class="iconfont icon-location"></text> -->
     <image src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/825ba0d2c4879e5609ecd1f585e48df8.png'}}" mode="aspectFill"/>
 
     <text class="text">江南小书场</text>
   </view>
   <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="9">
-    <!-- <text style="color:#F60C1C" class="iconfont icon-location"></text> -->
     <image src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
     <text class="text">红色地图</text>
-  </view>
+  </view> -->
   <!-- <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="文化单位" data-type="9">
     <text style="color:rgb(160, 248, 248)" class="iconfont icon-location"></text>
     <text>文化单位</text>
   </view> -->
+<!-- </view> -->
+<!-- 公共自行车 -->
+<view class="map-item" wx:if="{{showInfo && info && info.info.type=='publicBycicle'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
+    <view class="title textOver">{{info.info.name}}</view>
+    <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="goAddress"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">到这去</view>
+  </view>
+</view>
+<!-- 停车场 -->
+<view class="map-item"  wx:if="{{showInfo && info && info.info.type=='park'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
+    <view class="title textOver2">{{info.info.name}}</view>
+    <view class="subtitle textOver2">当前停车场总停车位：{{info.info.capacityNum}}</view>
+    <view class="subtitle textOver2">{{info.info.freeNum_text}}</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="goAddress"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">到这去</view>
+  </view>
+</view>
+<!-- 游客中心 -->
+<view class="map-item" wx:if="{{showInfo && info && info.info.type=='tourist'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="width:600rpx">
+    <view class="title textOver2">{{info.info.title}}</view>
+    <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="goAddress"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">到这去</view>
+  </view>
+</view>
+<!-- 行李寄存 -->
+<view class="map-item" wx:if="{{showInfo && info && info.info.type=='luggage'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="width:600rpx">
+    <view class="title textOver2">{{info.info.title}}</view>
+    <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+    <view class="subtitle textOver3">
+      寄存时间：
+      <rich-text nodes="{{info.info.time_info}}"></rich-text>
+    </view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">查看详情</view>
+  </view>
 </view>
-<view class="map-item" wx:if="{{showInfo && info && info.info.type!='tenscenic'}}">
+<view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage')}}">
   <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
   <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index ed6e56b..1f803cf 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -9,7 +9,9 @@
 }
 .picker {
   position: fixed;
-  left: 25rpx;
+  /* left: 25rpx; */
+  left: 0;
+  top: 150rpx;
   display: flex;
   align-items: center;
   width: 202rpx;
@@ -128,7 +130,7 @@
   margin-right: 20rpx;
 }
 .map-item .info {
-  width: 260rpx;
+  width: 300rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -148,15 +150,17 @@
   width: 199rpx;
   line-height: 56rpx;
   color: #fff;
-  background: #D62828;
+  background: linear-gradient(180deg, #FDAB70, #FE7F19);
   font-size: 28rpx;
   text-align: center;
   border-radius: 28rpx;
 }
 .icon-ic_searchclosed {
   position: absolute;
-  right: -40rpx;
-  top: -40rpx;
+  right: 7rpx;
+  top: 7rpx;
+  /* right: -40rpx;
+  top: -40rpx; */
 }
 .title-header .icon-fanhui1 {
   display: none;
@@ -481,4 +485,143 @@
 .right-menu-item image{
   width:21.33rpx;
   height:25.33rpx;
+}
+
+.menus {
+  position: fixed;
+  left: 26.67rpx;
+  bottom: 26.67rpx;
+  width: 697rpx;
+  height: 200rpx;
+  background: rgba(255,255,255,0.8);
+  box-shadow: 0rpx 1rpx 16rpx 0rpx rgba(153,153,153,0.35);
+  border-radius: 20rpx;
+}
+
+.open {
+  width: 99rpx;
+  height: 3rpx;
+  background: #999;
+  border: 3rpx solid #999999;
+  margin: 0 auto;
+  margin-top: 13.3rpx;
+}
+
+.menu-list {
+  margin-top: 37.33rpx;
+  display: flex;
+  justify-content: space-around;
+}
+
+.menu-item{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.menu-item-img.active{
+  background: #0B898E;
+}
+
+.menu-item-img {
+  width: 67rpx;
+  height: 67rpx;
+  /* border: 3rpx solid rgba(11,137,142, .6); */
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20.67rpx;
+}
+
+.menu-item-img image {
+  width: 35rpx;
+  height: 37rpx;
+}
+
+.text {
+  font-size: 25rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #0B898E;
+}
+
+.menus2 {
+  width: 697rpx;
+  height: 380rpx;
+  background: rgba(255,255,255,0.8);
+  box-shadow: 0rpx 1rpx 16rpx 0rpx rgba(153,153,153,0.35);
+  border-radius: 20rpx;
+  position: fixed;
+  left: 26.67rpx;
+  bottom: 26.67rpx;
+}
+
+.shouqi {
+  width: 100rpx;
+  height: 14rpx;
+  display: block;
+  margin: 0 auto;
+  margin-top: 20rpx;
+  margin-bottom: 26rpx;
+}
+
+.menus-list1 {
+  /* margin-top: 37.33rpx; */
+  display: flex;
+  /* justify-content: space-around; */
+  flex-wrap: wrap;
+  width: calc(170rpx * 8);
+  margin: 0 20rpx;
+}
+
+.menus-item{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 150rpx;
+  margin-bottom: 30.33rpx;
+  margin-right: 20rpx;
+}
+.menus-item-img.active{
+  background: #0B898E;
+}
+.menus-item-img {
+  width: 67rpx;
+  height: 67rpx;
+  /* border: 3rpx solid rgba(11,137,142, .6); */
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20.67rpx;
+}
+
+.progress-line {
+  width: 40rpx;
+  height: 5rpx;
+  background: rgba(11,137,142, .3);
+  border-radius: 3rpx;
+  margin: 0 auto;
+  margin-top: 10rpx;
+}
+
+.line-bg {
+  width: 20rpx;
+  height: 5rpx;
+  background: #0B898E;
+  border-radius: 3rpx;
+}
+
+.line-bg2 {
+  margin-left: 20rpx;
+  background: #0B898E;
+  height: 5rpx;
+  border-radius: 3rpx;
+}
+
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
 }
\ No newline at end of file

From 4bec9751f5ebd46ba1a4f16e31b84d55eac70a04 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 29 Jan 2024 10:08:47 +0800
Subject: [PATCH 116/471] =?UTF-8?q?=E5=90=9B=E5=88=B0=E8=8B=8F=E5=B7=9E?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.miniapp.json             |  5 +++
 pages/index/index.js         |  7 +++--
 pages/pbService/web/index.js | 16 +++++-----
 project.miniapp.json         | 61 ++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 app.miniapp.json
 create mode 100644 project.miniapp.json

diff --git a/app.miniapp.json b/app.miniapp.json
new file mode 100644
index 0000000..234a021
--- /dev/null
+++ b/app.miniapp.json
@@ -0,0 +1,5 @@
+{
+	"adapteByMiniprogram": {
+		"userName": "gh_b55e177a4069"
+	}
+}
diff --git a/pages/index/index.js b/pages/index/index.js
index e9b6c89..61a4420 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -592,10 +592,10 @@ Page({
       case 3:
         if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
           // 外部h5
-          console.log(item.tdata)
+          console.log(111,item.tdata)
           app.globalData.weburl = item.tdata.url;
           wx.navigateTo({
-            url: "/pages/pbService/web/index"
+            url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata.url)
           })
         } else {
           let page = item.tdata.url.split("/");
@@ -614,8 +614,9 @@ Page({
             })
           } else {
             app.globalData.weburl = item.tdata.url;
+			console.log(2222,item.tdata.url,app.globalData.weburl)
             wx.navigateTo({
-              url: "/pages/pbService/web/index"
+              url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata.url)
             })
           }
         }
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 4ee0c8b..a2bd632 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -16,9 +16,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    if(app.globalData.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
+	console.log('options',decodeURIComponent(options.weburl))
+	options.weburl = decodeURIComponent(options.weburl)
+    if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
       userApi.user_post("user/getMyInfo").then(res=>{
-        let weburl = app.globalData.weburl
+        let weburl = options.weburl
         if(weburl.indexOf('?')!=-1){
           weburl += '&token='+res.data.token;
         }
@@ -31,10 +33,10 @@ Page({
         })
       })
     }
-    else if(app.globalData.weburl.indexOf('m.jszhwlpt.com')!=-1 || app.globalData.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
+    else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
       // 如果是去苏心游或者镇江的话
       userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
-        let weburl = app.globalData.weburl
+        let weburl = options.weburl
         if(weburl.indexOf('?')!=-1){
           weburl += '&original_sys_name=jdsz&auth_code='+res.data;
         }
@@ -49,7 +51,7 @@ Page({
     }
     else {
       this.setData({
-        webUrl:app.globalData.weburl
+        webUrl:options.weburl
       })
     }
   },
@@ -108,14 +110,14 @@ Page({
   onShareAppMessage: function () {
 	return {
 	  title: this.data.shareTitle,
-	  path: this.data.shareUrl,
+	  path: `/pages/pbService/web/index?weburl=${encodeURIComponent(this.data.webUrl)}`,
 	}
   },
   
   onShareTimeline: function() {
     return {
       title: this.data.shareTitle,
-      path: this.data.shareUrl,
+      path: `/pages/pbService/web/index?weburl=${encodeURIComponent(this.data.webUrl)}`,
     }
   }
 })
\ No newline at end of file
diff --git a/project.miniapp.json b/project.miniapp.json
new file mode 100644
index 0000000..cd49dc5
--- /dev/null
+++ b/project.miniapp.json
@@ -0,0 +1,61 @@
+{
+  "miniVersion": "v2",
+  "name": "君到苏州",
+  "version": "0.0.1",
+  "mini-android": {
+    "sdkVersion": "1.0.21",
+    "toolkitVersion": "0.10.0",
+    "useExtendedSdk": {
+      "media": false,
+      "bluetooth": false,
+      "network": false,
+      "scanner": false,
+      "xweb": false
+    },
+    "icons": {
+      "hdpi": "",
+      "xhdpi": "",
+      "xxhdpi": "",
+      "xxxhdpi": ""
+    },
+    "splashscreen": {
+      "hdpi": "",
+      "xhdpi": "",
+      "xxhdpi": ""
+    },
+    "enableVConsole": "open",
+    "privacy": {
+      "enable": true
+    }
+  },
+  "mini-ios": {
+    "sdkVersion": "1.1.4",
+    "toolkitVersion": "0.0.9",
+    "useExtendedSdk": {
+      "WeAppOpenFuns": true,
+      "WeAppNetwork": false,
+      "WeAppBluetooth": false,
+      "WeAppMedia": false,
+      "WeAppLBS": false,
+      "WeAppOthers": false
+    },
+    "enableVConsole": "open",
+    "icons": {
+      "mainIcon120": "",
+      "mainIcon180": "",
+      "spotlightIcon80": "",
+      "spotlightIcon120": "",
+      "settingsIcon58": "",
+      "settingsIcon87": "",
+      "notificationIcon40": "",
+      "notificationIcon60": "",
+      "appStore1024": ""
+    },
+    "splashScreen": {
+      "customImage": ""
+    },
+    "privacy": {
+      "enable": false
+    }
+  }
+}
\ No newline at end of file

From febc3199f7d6ce42163ab146b5414525907b250c Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 30 Jan 2024 10:28:31 +0800
Subject: [PATCH 117/471] =?UTF-8?q?=E6=98=A5=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                          |   6 +-
 images/index-selds.png            | Bin 0 -> 10836 bytes
 images/my-selds.png               | Bin 0 -> 13156 bytes
 images/tuyou-selds.png            | Bin 0 -> 19171 bytes
 pages/index/index.js              |  28 +++---
 pages/index/index.wxml            | 157 ++++++++++++++++++------------
 pages/index/index.wxss            | 114 +++++++++++++++-------
 pages/info/luggageInfo/index.wxml |   2 +-
 pages/map/index.js                |   4 +-
 pages/map/index.wxml              |   6 +-
 pages/map/index.wxss              |  10 +-
 11 files changed, 210 insertions(+), 117 deletions(-)
 create mode 100644 images/index-selds.png
 create mode 100644 images/my-selds.png
 create mode 100644 images/tuyou-selds.png

diff --git a/app.json b/app.json
index 33f20b5..6682b26 100644
--- a/app.json
+++ b/app.json
@@ -219,20 +219,20 @@
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/index-seld.png",
+        "selectedIconPath": "/images/index-selds.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/tuyou-seld.png",
+        "selectedIconPath": "/images/tuyou-selds.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/my-seld.png",
+        "selectedIconPath": "/images/my-selds.png",
         "text": "我的"
       }
     ]
diff --git a/images/index-selds.png b/images/index-selds.png
new file mode 100644
index 0000000000000000000000000000000000000000..0781bc44a4007e13bb9b9df1209e8b794d8a15f5
GIT binary patch
literal 10836
zcmbt)RZtvU(B%v+!7aE3*WfO}9RdmN&H#f$u)*Dey9IZ57zl0&?l8gK2^L`a{(axA
zt$n!nzVwx@KGk*moQ_mimBT<IK?48)7z*;znr~~}e**>SZLV$IF?w5ou9|XEfSM_?
zLjZsZpdc-&<z;l5gYIh}v-}#+D`?H3@GUg8#CB{FjYq}aKGY?gCISKp!p|(JE@teB
zGLXivg&E6SYQK$U7u&2KY+od>8L6m3iKG!hwn_NRCV}+bVB5f!<<*S+O~Fq688`mU
zED&GTPBvCvJY|-k>z>H<x?pdH_ntS(`4#K$a5kvenn&$nE+PzgBKf<N4F+5*?fhlm
zg<Ll*k=Fu22IrlL)m~CSDd7E9;3%Me9Zy|DJ^-J0H@4_rfV;!9Ym#%|3D^H@%nm=p
zgG6JB3BVSEm9jbg+zM067c^5_o^df`sxMC1>{n0@L`0@43v&=fAlHzeSD#8TV?+99
zc`lfO@T6}TgU|-}030}8%p~(Hd)>=jf>`m_6&HXhEcp0si>FwPb23S#Jm3}`N(JJ3
zeW~J!5o|(-u(fJP7eZODEo}PxLUa5tK=!{TXyqVjU}qn+@Tvk;%+j!|d_Qfb0>wTs
zOaj-PWINL|9l=Z@ndUCKj1sBJb769+t-hKx{;#8hwfV32hIP<}s0t>oG7`Ww%8A-<
z8Gcl!hOr$K)0Y~ibF?}=$=Cdr;)i;6k%i9UV8kvQ0Xe!<_%A<v`~OHyAm7{eYKCWO
zEaKpBXDEHmfs??+q+<^14AIe?nYqtrU~oABV8PCas~p{Ky`t0q0P;Ar7t;B1y0cYg
z98ziIs~{ddq;(s2JJS3e1EhhjoVkHS2_)Z*5jgt~^tm5Bx+Z$FbhBxn6wyBOIdA$<
zePMF;7pQb!FB0VW$#PUJwKD|0g$R|oT!n)o{V;>BpS8kEzhhYOfScKO{3Q5Ly%O@?
zy`TL3;=<r5s~RzYvQ|v3w4xV`Wf-+z)ZRS7avBTO<y1EoG$m`gB@TR1%xD-oQ=}%v
z4dW?uBp9&+RHEc6n9TH;--ww#n6llglEP1>wTShyMALiAbZJMNyw`D)xD8MKz%A*U
zVdBlaYyxYRACRVjdq55GT*BOleE1R8uPf$K5hyS(&7raRgzyD;ui;?7ZQNj=@pViG
zN*XBq$HequC)jT+gO-Nqo}hAar;;{g2qMNTE$sy798c&szP4ZmPkSUw?vDa`n#J~y
zgCdBh5F~bcCMCH@MGqjftp@7hI^K#Nj7FaL=Tks!PnxQHulnL#rf^5*KPZyVl-#+S
za}Ftu1e4RWt)eb1`Z@kQT5Q|T3w#V7icc-eRB>s+y{29Is@`;t0Hi2LbvoDTqgPY4
z2wQ>|2#s~DEu*lvHTZ$gj?6g(cjyNA^?r&TXI?Mq$XcrVCM7jdWzpQS$~;Ah1(USk
zu#%u|2$>>7K^5TDhkIL;sbWttwiXKC8G;NBe=#<ANaRu+wxiDe^Yy4m51}5vsAO{l
zsk-%h+vfDQzO~88SLMK&T*;2Je1&k%!e2ns9qH!yF;xZzG8~LQ>rplr%|cjH60Q~|
z=9w?2qL9_)64QwvifoT=aGQ(;k6?Y|?#yhS0U1b$^fm?a@uS3XW?JL2hQ2^U#ahE0
zE3PYnAXj5{!f<k`)2aH0*xYP+jCy2nKf8O8m>Z-)ksTjq2QX(-cTdJBDf=~o)F>(W
zGUI$RGqMLeGN3nz9ww{ro$+9UW{8E_67LLP(lSV2h6$1`)?CQ`@q0@m@1QX;E!FI6
zr+)=zYpZOnEMnZ3d^t<d)v4(o$%C+je!mL0HXk~jGJuEytF#PTm8A8Jh##?F(g8w(
zz(r4~khZM;u=LmG@I8km>??^EC>%Tm>=9>MZq`YSXv8x}Yde<xz^hr`0W7~(S$O~Q
zqz`}WLhOB)u|%#e%Dh*@;hKx6I!4C;5UF|p<iWaU%xyiMnL{z)jQ-9Bl13)r+~&av
zPh$)ZjzH8qv<N0n481pwV!gylvbN^&3^3arL%p2DmygX88FG_n4gH$6e1biK30z3H
zcXm+Pex`uJlbH}vEFo=>h|gbIt*J1O_7}F|c}e5@KaI8Fs2TRUY!)|=1+H+HanzIv
zCBT*uIFLA*lCr6G)%09P^%r2sy&absz;k?YDmmEd_;BnEw^tYAzg~b=v*6=wB#866
z>Zy4_oJ^4Msy~CHmuw1WA!hJcRz*lc_fZN!!~%AysD&cOT|x*&fLr=oWkg6F+3&#s
z4oY2Ko3vjY&>&xofpE404gyZAoW-_Jb|a@N8cNyU?_L&?@EEUUAUZ_M`9pH<210_S
zgA5+Rhz7LKSXaHp7s2pIiy_L-#w?uq03!j=6=x-nhZtbngj=*eq**O5V?L~I;XJV6
zJ8bePB`o(KGLiohChF3E0(gv2ljNivpc7B#*tL=)Gvf|zNA3@UXt$UR0aEbbkxaNv
zU1<cu6kkWwcm=<kWmK)(!BbsPQHf*foQr-PflnVFFO7LuKJpIknyrkfya#i1x%JqG
z^<G>v;Ir_;Q6M7&5(1PzmXzpy&+Myi!J|+hE$i<*J-+lrj0oFqtw^5x)4MN(xEnjA
zCf>Ut&r+Dy*qYm)k3y7P;9z<H{)LvBZqNMDNPnyg2U<+Zle>psIAb76uMWDnN4GhQ
z8W46jUcxJ__jM;u_tm%)Usg_?l#!1ZoRz+QQ?|^AFE#yBhLP&PV#2P`Z@c%*Jp|TR
zRHgU+7~r36&Y#R2ishIONPS@%hf`(5Qj^4dY*+95^6cb94d3ONFGj0Oq`~L4LgPK?
z8F1y2bHfgtkj!*=i!Q`_q+WjCiBxXFf#Q0@hqQ9!G&TX8eQ?1{1~h}iZIwTYcG=Z=
zBYw(70XMpL5vEF=2em{5gR_?q$MmNE9ad(MoVWV}2F#Ar0GnUAn%zigtu-uK5VIYo
z>PTBh;%atKmwzLTaAW`D!$uPmGGDzu|2wAMaQ^9TB+}9xt2Scjq_OPY8%G)QM-m>7
zu*aTK;j40?(Qp-V^x^Olp2w*tU@<mRtAy3M0V3W!V*WWWi|2>n@E%I;j}Z<WOwlh-
zQ{(5iA&J)-)@#u!Ian1OIy+jl;hKh{w2EAb)~wDow}bb!FRToY<WME%im7>ZW8@2*
zXx8JUX{*$;qQZ=OX_+%T69raWL$25Aw2fcLHln)2)hT#?(FFw5<hO;n)<sy3kPuc@
zOFz^v*DEo`Zozt$`1qfhNCS3rK|X5p>rMb8uZuoO0%BhwCf8(G*UsUexb5U+Q}k#|
zJTJ_IEO<1mUrS3js%pdnYPV;Jc&)LbUH$v_Q&bP$5z3dJA7*n-BAn(9o)i|4X}-w>
zkVQTrLXnJ&%Rq(nuUP{MJ`VD3RE*C5o{7<%;t;El_Z)P(Mb#1rsz@4D$)^7`VH-E~
z(S8=B{=hH1b~pb>iETt0DU)}OZk%cGZkYp6Q%M#;KiGj3R8A-$aBKI;fNwy0qI~ni
z%M47E+lVa_RiE8&FO^p~8aL?|it-w2wwch(NMsxk3D2bvLz)(nr|s`Gus+*)u9D{J
z<8u@yhH-IK!5rX4ss<EHOF$>sN+|h`fisPR_67a+yeeH!qp{gpslO}-V@cHV?rg5J
zw0mzvtZ0Fl<_a+(XAJdP0{IGnc#9HB!McZP&pve62q5(;Ixkd=eq;(MP1xEimgnW?
zAKo-iurAoW1EPE00VlKEDKit_<Ln!#_)lxv>6Of*Vmzx!^n|vIG(H2j#L&ThGPkxN
z25hitLV>335&JKspzlZrWe24a?DecKrVGdRDjQM$?(Hu9)B6#1L-gXN^mQ6s=n+pf
zsy6v5pE3at-r)4LocN><-L?~A$QLdKCWAvfc{>o-0*xa1)tF9l!x_BN@FD=IWcvr^
zw%4tNA^yiQko@ong<$;+<Va(MA#bi<3FylsK_I^$Wn1S##UlN~D72sD@k)NJ6wpJl
zSQ*TGCNvTD?;X?@;a|=eQsO)|Ym}nR;b4}re<QzKl$6M-=r+-`^{2~T)~f?$mwp^?
z)xL+4kiyrKO6)r(2vO?SJP=bmE)12g%~)s|hV;jkmm^gthPB+*@bwEdfH};XRmAIx
zQ<%hkHzZ!9n_KXY#01W>tklbX&dh~j+8xxnJhw$551<2>=lnL~EamWp)QXAIX2)>2
z=-|vkWuRarTJI0vK$XuPNcTF=pPuyN7^>?~T+6ir-A+gzbGoW(8*#F<IGsdy<9Mst
z#^0W1cB30WR^-Uc*yVOpizC7XDq?c`MlDmvH0z3ebruge{PZH#L&;K96dT|0*^2J3
zOrbT}z2!FEOhz`R{h)?PN|3>^6Z*fR2(rwNE6oQ$qc0kMpm%L>P&dT5lk~B%Dn1>n
zW=VtPI;4c+FEP<bAG=14JgMUb#Xjg+Eo<dXNU8GJ_HoFihQ2HXTLZYIGL!-f5e3Aq
z{CDK5bJ_t`EGA%v21)p<j|GH6F&m<-yMwpz(tH*t_O3(hW^!so7)j|?cFcmN%v?ov
ziFg``;Y?NMEUPCn=oeSP^yIj4N2GxCM01@Ax}cgrhH3KM{+<^H!rDCFt|wZJ>?W5g
z;j18{yJTpgQ&e6VDin+5=Ll;mdGm@pdd7_RcV=mLGN>0@R~1Dz<>O_}nKWacZH>51
zxf>)qy(8M^qNE*fVJffVF`vk|tWWG%uUNm{l`NltsfP4x6`KAXsrZagMhn8JPXoK!
z3hmHrCksXl;C{wB9v@`mQM#|w621a8IN~~7r&4)`bO#OmCR+<kHiL@^KFbM2<RTq#
zoW}9p)KBe%2-3dijZ+H}dc2pYKQkdDfVReDXz9W|6hw$ANyZ*%@!5D2z`FT@U%4A^
zmv=Dr`%DfhvFw(d*03L+OYH}1m$Vq(((>Lj$kSbFL4Aj`o^NwA+Bve?22evOdRU}B
zRg9f0W1?I^&PPky)TU%Z%44Z3{X{si*>rRpNQhq0DW1Fg6N{XLjY;q)(0X~NbY?8_
zK8?LWSm`rf@*0mp3x{}Tb933%5&<F<orOX5#&!;EU?*OHsu*-Hq1c59&M0&ru1cM!
zFUa?F?}OWmAs-ZqRYw)<`yQ7?K01%e!p=bPL4)WMXmBl+X!ER})@LWx2-)k9dcG(d
zr59^NFcs{^9I)|&+B|`u(O12%$8@1YyY@Ch21&iRCL0AoZ5}Oc6{bME8zNt%c~8$K
zX2_b^_7&(@mMx%R{~!|Rib7^VGCN&4;k&U`w3R?eeMYtGSqlPvbEg^*VH|K8m54F9
zc$Wk>K{LhG!T;Ugod!-GuW!>v?z!N7+{qmY^p+qAvsAuXeUErDOQ5plYaX%JHf=)_
z+Pq8g&CCjaW-gobFy;^IbZ!sRKjrxTx>RzHwmSnoS+^zPTa|c^T-ffZ(qC^{inMA0
zzE5pTw0;iLPM<Dp(M8I*mthio8W&{_+fPK@)AwT%aFq$?-_9d`BKMwO=b(kwGJ?Me
zZAOY#;uU7e`?BO;XgTGAnFOFpEc6rw1^bZ~jhz95;T2PsKlLGNK%L%EJ|cZ;;qG41
z@%e!dFS9ap%D8!#eHfB;zwGHTqcV4*C$ZbT<$3;wyZSKI$Vvi@KH6;+#7SXL69o&<
z{ds9i3&cfLndo%@UNS`R%(d`|u5X$!E!-)PsXew`ngzoc#dR|^RTFAnrSTt~gWQuZ
zp1Y|T(2y>+xa3aNY@dXv_jPyL+^F+#feJ0SI>d;zS&JQi2hC1TURK!gzAyaMFHPuL
zLv~jzt;BPtJh6goVlqBk6zob%zClsYH2caqHEizWuf71Q;8;r@eR@E2o<q`|#2Pi%
z@uGR_$=%is{%GS9i@@NGku085>*=h*R1^M`5(5J+Lr)PlEyIlyaon25$hLwgW}O0U
zu}Oo883p8WRIB<_c>KV`RS>!gS(6(aY~<&wVJ*QVk8p5yjY=L+{+(Ql;;coLlMOJH
z!2DDjQpcWu`eY3<(oW!x5Jjuwf*6u?;zAMmbW_-&Zc=<8JQ$PyvC{&`(UBwqioY$K
zRi)~nn4^sT^?u|t_h@9<h!Xa(eqp~FzS%JQCgA)Mp^}vM5L@pfe1f3Wjy5M3$=|rl
z>p)QcvhizC!=?Qum9>L$ytaA_l}D+HEFQ97&n!Z=!iT(5t+&$p4M6`+YZ6}Llzap>
zTzY^WrxtJ@hs}D>CDK)*6zHK5qZd83Ah6+wRu(W~KH*|Z&qdnV`<2etebzeP`?-QY
z-$&dEddT{1b4F2V@jeyi(bee)AH4|bFMv+VQ+LTt8dDkjV8wfjN3<nw^rU1Fk)uzZ
znl%~gGdEId-4>L!X^RXrCt4Y=)gnW^vySKpG^yk>nUcktvK@Q@+~*F_jmPtB_Wjxr
zUFL*i6HT#F5xlHvW&Zdo5}u{+c;!_r$_V*WJJP;2MT?|@8YMI=zmBPq^L+tba(t|n
zWfY`%+19c~ka<EA_cco;)g>NmoD0>#rP@1|$eJUTa1`#pF1hHeH6oyQbYAadN^k}6
z6HKx1ariB)r=Bi*2%LH9e!}s=`QpTVYw;M*?DcHUki`r4TPTN2XhGi@i)>tp&1Wd&
z(3-tBw*L3krqWXM4<H!}vObjcGuV{nQP*aI_L2(^Q8dLTx4si_9tG22WX)cmxtI7F
zyPS9K3a>kS5?KgN##O~L`3^Un%DCH*CDaG)A><+lJyO#&kOu|8-xINk6!YZyR5qWA
zr_tW6{j!R5DBTnjlr?By6$WSKv2x?qn`ceP${DB%s7adE6a4Xe5M#?Fg2ay8J)8>C
z**gq;A}Rg|?*HXUg!pSnx+bG_*>ytUmexR>tGP+KKTTbMEkusK#j*3*N5!KBAWYRI
zGg#FT#UIY=VOhPtLo=N!HWg&BTl8o#EU5Z4M87jI9(AOje6jtoR)5R~y`>$BC(L`q
zALRg~gAzSD4EcJeWq#9#9{&ng9OZ^*qBd^1VPnbj1uGBsfP&fp0{!&s_f9#xZQ~`5
zv(xmv)q+Bl;_oUq!(h%hw^?`O`wumA?mXDhA4+jQCP70ZtJIiwLn6~H_=M$ku{Cu(
z6mn;T+|XfOVeU@`i0Mlh3<zcEidY{8Grju~1fr|o_a>gJDe&d!oLD+?<b9kmI}wq2
zh(r8BkNM?|s4JO`#a}LO*6r!~q_M8KI>T#t;wX&l%fK{}f=zKsJ05d!Dy=G_5;{0t
zx5j@yxi`7)*Uk=qG9~YKBqg=?h#L+sJZrfpi3H<IaznUxmT)khC-si#w6DwU>MbZd
zGLx7jfFYn?BE*P#pDKiW@?UHKyG|b4w|ZKJ_Qwn~6%I>Pu{c~!=rEjm?1rR%mAEx@
zzR>YZTk1flQwThghq<Y<<C#>%-&j5ld;nrf)`EGQ-p#(Q6~i-@I?-dNrNxsHx4?-9
zg9%mgv&rb~GLBU5JmKpE&k1q7vy){y^@7IP2d}4V=B%m0cC)4WloPnQM^Vu-dBK&F
z(3#AI{Z2Ab9&5<t-@00!ZzV|k*aB=4#WSN}f5U9B>NLBY!?%IiP4OA?z593M7_hL9
zmVTg8kB)xzsk@VmIUIW7!|qT0)8if6i=@U3Evj0{l?VbWr2>p8*_`5J+>~gMFIks4
z5<GwRmz}CtldsX;loQg*;jUR4S@%J}{nbdnOOUvWPb@TwKTH&Im;Uru0}tzV)g=;z
z{pvIMce@9!&zo-h=f#QzD#!awQxA=N)yE5_x}Ij?2V6~6ETD_eIipmINh;$kXkBq}
zA}cB08Vj^_&TesnkK2l1K`5=m$0ZHECjFA-;am#nA&&mX61#??`FMFU`^29@!c(*4
z>a*+ifQ{mufX|gI*tR|$oo5M-9mWTTg<zbBOt+*b3lVFS1z=k<OX5u<+|sT5)pe30
zC#kwMq5{j>pB=kSwgNxRyt8IBQ=U40xbs2Hx00eBn|;a8_XtI1>FLb=7NLc5F5`D)
zZ6u6=Yb(&BUAp6+iKkg<HXgtT5%xZB3--=s>-=|F^nKyoQ~>Q0AeI<tWaO=^Am8iB
z+^6JlRppk%OJw4lGwlf=Q-CfS8F|ryzY!jdG2}{zB1ti$b9o;xeMf*=RX*^GDV<F$
z{?Tou{#@}>PV$nORG{>F9yK%~6$9e?%i|&qv@2Z-=;VS|3}UeRqa8x#kW^f55nMh%
z79B5j7PLp3@5>;ez3lI@56q^34esKVu!Qas&PBK}G<AyLTR9hvQj!zc5{$5MUBvlP
zY=6W?cJu0x`KmfGM#a#CvdDCx-;BwY)3}=wV+67VdIX4~<e-5Gq1Uk>lw#+Vh)8Lb
zE0D&OYu1aknd;57re*Bryd&Q!aBUPt#HybOf5SHLrw=+T!UnGg=7GVQ(O5ohGt*@l
zR{Sv}9{EBWhio+?8+?b>^b(G%OV(H|{%ieSO34~S0kuvc*Fg>`r|!w(B4ByPS||x4
za?BVvw$j?k(HCk+8}>T-(K6Plmuv^PCJ4oT;nLnK?$Vf3kg-CDgP&OCv9Rp{^2PIM
z@*IK0HD^1<ki>Ir8)@mUNSZpP&Ic%Rr$^(~#r}t*xFMI0)BgPxUSwl<&fa@Zb}<F>
z5jBeSx7&+ZT!I&1Kh9u19kukv6S9r{HMPlfWHhyf9Y1kdvRI43*u9amTNU52_1UKE
z;aBe3f)BA52V`=@K6G5Q&<q2TA<1amfh?eBCRMetQ|;uczy6iq5yZ{g$&}05JwqDU
zi0qvY0I{0Azm^FnE0r<+`Obw#KGYDLOYp}`W<!6q!OC2&@(k!T*ybF_Cj2bNR59+m
z6XQl<xrgM5WvC3X^>wheSv2NY|68#<>db)!JLy|DZv=jXW7u3AiA?wRtbo7OCjA$)
zd?MdUZRN{AL*s<qh1s+8snK}VXLt&6X};^v46UR;224TB#pZ~&GX#YF%wK%V7PrJA
zBxLRd@Bvtx18Erwr(PJ)Ze?iF$+dFWao_hW+L|O@31Xa5@42QQ*|W!!DJd;V2=L1j
z$bTT+@@AR{nE3(G|CxAD_`tMf>J6}-_47$nkdF{PH8Ku8Xjd>`u1pV{r6l<lqi#%_
zuniidE+>39K_q@QdLU9;K&0RFnw*U1_UY*pyY>Ll%<d0PEH%0>-YQg!XgP8-IS+S$
zvyaf{Zv-?s+7t3*3qMP++cX1-+*)GNlkpVCJ&WQ*K>s3jjWzsO5N7`=YReUy|1~Z0
z#Pjd^{Y&ba@7_G%tnAYY{}jA{Cxj?IgVPZ8HGvt=_N;l=U(T2Ir!Bz+p#)pjddFVz
zn*HG;`Pl&b#{+2~d(iI@RN)jf`Fq@~HaxZ9DGuw_n$B>HqDp>ru82sofzzx+a0};t
z<03j(Ut;t$BdFCIu)mQQEvqInT{s6XP?w{oa7N&M8Hd&K-8sp{Yq5&WeiETOKTTKK
z%SZ0wJ@z6%KrAKO=A4y2!D+(Q;jx@JkQSQ@8StH9<BmrJXSgaf*-6gt>Y@uHBOdaG
z%Z+pNVP&Be!gk^WRJ3;|PvjHbQwC?8<J#2IufY4@2upF1*I4cD@259JDJdVG#xF({
zcNEdnO|vtFYE<9LPriI2%|4%Wuzds`v(Q&DctK<^RXQ$-yY1nyPH?Sx5u(fH49gc_
zn#7~<0z__GmZY*O*(m6nh!!0(aR;m>@@LJ~Jw?j8O9i*z0yAr$&&Bwieuk-+bSkqS
z%lxFrYE~+w4BtXU_`6AtaN%Ghc5JgTJO7V()X;>M0cC={;3{;T+hc3$r*bAQ@>K~<
z&)3zNd*Oxn@)sQGI3(LC(+Au`eNQ;Abp-Y}*&La6vYu<e)ZFdU%k$r;qk6IQN!oTg
zd0zIEm+|g}lXH3HxLi#w?nd%5gV&3)?BWPwfa>Mv6dCDrnq5@ne{9%3C6#^8G1*Hk
zjTV{e0ooz65^-9QRDzvF**!>opMK0`LHE0SCUBn4L(Us%Tu=iq_Xc<oUxWIc%yFJA
z*e^(u-cXFC+VI2KgLq;@jw~@RmHGJouc~_cV(K&bDNk`^Sil`SsxRBBYgB7|?u`be
zd$8${$h7Yfo`SbWI@pxv>UudVlVYrg*C(yZcC8KiTm1rTv%omwE&BmwAluA;LTYF6
zSbwpWKciyJ)8;*Qx#njv>FV&zS0^z<VI03h^y=fysoUfVWbk6g1ex01(<v#+6cXp0
zo3ffvOO}7Ld}foL=|Ly8&V|cyM6XevjD+)IXUsIWO!jI}Q`q}fU3jp_N?8`}sUM;N
zZ)NjkON}nAe;T^8{<5TEb}#}iei@%o{bb*ByBKjFPthlz8jLrUbKZ<HxwbYPj5*p)
zBd|Ksp6gbvJizYyIsH`3_oB$NNb|0kKg-jK+hpBE;<hZm_!r_l2b`AW>2uE{Bj^az
zcE3U}E7O13-QL2p6dCN{!7R_j&826+bqGR#-0z%EABFw+W{0oJn&ZGF26d##nN*ov
z?%6rr-ImpRmt83je*x11$ThiYS0jU4=ugFWmE9=Bi%QYKs1Zr;Y^>;1ceB2a>oerk
zO&r*mNuJC-%AlNS(kOX4V!jBcd0}S&_>%hTkiqQhv%O;-jTeS}dKiLo5L%QtIL-kC
zwDTj`a9u+es)F^5@QrDj>Zmqku9tR?@s(!OV@pGKddOt_o8tLIlw|lVYnMP9IV^<!
z^KasO<)Sh)JPtM)!lkC$VTRx{A-f0@JgRtsy0r5M+1K?Hi2t4>1$3kSu_}<yIS5|E
zC#FaX5fM4zqcT-6fPgLpuEed_oxz-*=7(7X%__MG3zL&(RVuV@DWD@Md;tDU)3b*N
z6M~kUR<M(sFd{Wm7;)^9giC*>{PSd~FmE|9bizP&=>5052CrLc{{#8Wzce7<_|0<I
zwW1hZR&l)n$qw)Yn2pXM^L63vw6=r%iQ=~hQ9#=-G~FykA);?`_}Kr=$iR6C0{}pS
z`>z+^|Fl5{t_~HE)N<6HudtX)Av=7un8Bx@3OB2XuA*oS=cc={o&UScHvkb3`b#C}
z$fx|nM<teQV4s&d>vqo|{uEa?)OJNK3QB*0nNlV7F52FQ+Oz{1%mLp8w$N_>HT;=J
zKrK)XjS~g?&P%%{?qg_J)>(#rIw(`0+6ypX7`QOhJH`2OgxDbh@gatFXlT!t&GAcQ
zQ~Y4&jYRyshs1)7-7YdD+M}A}NkPvw{)IZNrTM-$cRVrQAUCa|>c5)|jE(#VBaDMZ
z>I|VVXMgSc&iVIurM5)6x_NvZ#h(4RyCaanPVge%`XA_P_(%KvB>8^8Gy69zJ&d=^
zTnJJ?GyFYtU%EL4Ld#h4ynx9yjrl?4W;9v9Ttzk{Hi|GUYzL>JGhChbqM|_bmWMT|
zu;$#5k!af|S)1~Xs|xh8IWxrM_bSWITZG60HQdpcF2QSq@hcp3J1uGYS-D)Msc7?G
z)TC}2LgbObTL$fa9x#A<6D}z%Tu~;mOaHRhC`n|JmN5IqNfylO<qtw1oVqQx5(z-S
zLHIU#AfIU>S=*sJCEi%lmJSEAl=P@reG)qF%IP&3Tb#O6vqPor8z0_!D=RDliN=RX
zOMgR7UJbE3T#9`Xe@6InR8hg)$uFUBJK-?-!R0;D_^8g|&QqOL%lQG&-~<4V-ZT@v
z?+ALaZpjf!81n`Y2|}gT3S~&d7FTX=B;dGLJ#PVj0aK|dg{=E;pfpG}v07!sGQom@
zbeYCn{sW~9s#Qzu)&H*%Jy~GbriJ>WWrc{dQD!y8S&Q2XRKbbo7g6Cgrp`BsTSkW5
z@@s4OkJHr2kE86vcfKu=#n+RK$lyEHj{n4XOtbw@f4))9Q@K_MdlTo`p-V{bj4fx8
z1k86cSoR2?ms;UkZ{?ExsQT%7fF(tcj@({q(`-}#CH4IMnvD$J!(<-9buX$Em;Jy^
z{jV^dHI^QCv3Wds32FN4)W+Pur(DN?ct92Fe(i^`+`3A5=*vCRN^gH(Esg5Q<y*vV
z{MC9*DjvIW+I+se<y$w*d=B6RYSz1Sp0>S@%SXI)NG8D&J;J5UhjC}3OxNq)$O6<C
z=ZzypNgS!5Fq}J$L|!;u+}S^&L{9z>lM^Zv0jO_H9m`GrZnp$fHE=rRR9`eD==QMb
zx1VSAc8Fa0ctzL#w_|`!Jwel6NbqKo2st$WF9Qai_0&Y*KuYFgRD1Pgt+k`si;@?>
zbG-yTOpRPm54R@}n)ZD<=DQ!Lrw-?heEgxxRGu|I)75dTHg-1E1;19e*+z|mP)jiO
zKsaZ5Dbjs8E;13SQzto{VK}?;Ps?L+!ifnBR<rE-Fj66Dn&*d>U&~$~#FdOPno`Af
zAd5Cr`}x9Q7nYb=9jo8*_s7Zkm@sslg+;0G+d(@?*Al(jER7E$tNaK`kzW9N(C(Wn
zHRC<)4@`%^HC|!%DzaD8yfWiRm;kz6#OxosUQ#BMZ`C#iI%WQo;!p?y`R$+Jrrlm4
ziDM<JFcPdBqF&sO{Wv4hgw9!bjsD{Q>G6i#wu@(W?+u@cF?e*OZJ(g@8$#f3KJ1nE
zBgu?6G9f)WfwU`f8VX23&Qwl#F1-!&+Mz;Md7h9YdYiJc$0&*C_Y%6DyD6fYG!%<U
z;x&l9fnO>MRqw0e{{^qPw>qdc$*u6NU5zeR|2luW#*k&;Tv&FG=?f(7tM<bur`4XC
zX9L&H@uiU^@iOx@-Mv-^)HJFROsctk=^Z$LIc_C}4>O-6H-2RL!Eh5e5%Z+Ybt4R;
zU@dp8c}5g2%2x4bdPRJ6**GBEE-6^3MxHL;Ljr``XPo@KH+m1rQtB6-*{#QEicqgo
zk}xYw8K+$q82Fb~feX%ewv8L^)27chcwDv}umx!PCV&<nDM=QLwlYURlTJs&fJ=s+
zDKOUA${}QcWOJPtwx%Ao#IexS)mE)uQ1k5_Y<KswY#8xVh`PUl6z>AcOI#Xo$bc)6
zP@OMRUDfPlHn<=g!7S{q9zc&<w^I8Z9}ntYM4!Smp1}%x`(MmKf3D%p?~5U&qkJ)=
zplhKCi^$K020DuHIa9A!P7REGLVy`l|C>MguV>}Cz_7Py7{I5};V_Vl)+_!<+6Z$9
zv^@Pvx5B@??yrpCaQ0Yf5m0I?=W<u}Y^VTHSc6LpTQQ13pH>(9BhR=HHS$$4c~DCd
zr7>W;CWXi2<IlK^h*Gq!y&C5B8OeoHq?d4TmE1l^x3Sq??Rdpd6zxJ~dk8V?lu<Bq
zE)9|GxDknjq27MBzFl-B0l!6Io|-ZwwZ9s_{9GF%r*<EhaE;0hmpMR=7`@(__7<7>
z0~B~CtsQri^M?051tsp!`i4L2jy-P$_|ch}6_qS{)xNha#SDCC@->})@{Q_vL3`-r
z#;hCVrAFsj=4`b*<$kCXZOuGlp=ZTlwztyp{AaWOMXg7P!B20k59JCMy31_0E_ysU
zFWO_9cx3pE%;fqv;+xo_N5Uv-gkM8{!38Lm4H)_qHWaYk&E0e2@O^-!`N3?XOoroO
zZEvr{7e2wk@0MU516ZM}pjNxlpoW{U^Lpg<HI(|EpZZR=Jaxj}@X4&@JmuU45xB&&
zqO8a&{MQu2JuqT!MIE^V`aWdxrei(Mu*djg*5iuzcqBbLlg4V=tt@7Xg+3`Wy)UI!
zn);7^<x6x?%vR(y9`^4(L3U1?qQD*{)`udS{q}Y?j-H%YKc5QaJ^&vFSTuhqMNObz
zLqrd?Qc_Tv3K^bE#iT9ohl6h>+DgTJ0xp5W&6+GAp7AIPtv-HJx0Ej?!;MEej{&Nj
zRmF3>7uqqwF!HXR#B3<-j%rD&L$cTS!w&@(Z*~%wOrP<rx^8l`m@(w|8cHtrrUu&2
z(ueW3Ffba61Tnn?Q;3zndU|b%ZiDOB2#au<Tu5-S|I_-=2AN;d7d-<F-cT*$rRVZo
zIIwhqm?qE5fm@$n-p(5}Cxf~m;d=X4*cr3UVKHUx-;hAZf%f}-$WJuq6%uuGPTYH~
zK|&?{#r+Wrh)!u}x+}(Jp?<;HIYd1CS<PGh{~$t##fYCvAFJ33`o8G=6FR^Lq5Ng}
z@FlC*T#LqI0QHnP8iV6nE|VXraM8T@@{TRD5|)oYndO6VNJMx6I3rpY02}wid%^zt
z^?JEt!ThIV;qN|(K#(0b@1ptN3g`bfgX>qU=iq(DPvaHHZ*8Ig1sPT88Yz>Y{{;@o
B(k=i1

literal 0
HcmV?d00001

diff --git a/images/my-selds.png b/images/my-selds.png
new file mode 100644
index 0000000000000000000000000000000000000000..debb1e80b210ad988fb73aa01c8b2d3f868b3193
GIT binary patch
literal 13156
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
KMNUMnLSTZ(4ORsJ

literal 0
HcmV?d00001

diff --git a/images/tuyou-selds.png b/images/tuyou-selds.png
new file mode 100644
index 0000000000000000000000000000000000000000..9158a5835d2bb9e933a3e5e4eaa91904316cbe75
GIT binary patch
literal 19171
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

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index 61a4420..b2c83e6 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -44,16 +44,16 @@ Page({
     djs:null, // 元旦新增 新品特惠倒计时
     djsTime:null,
     sqjNew:[
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-zjg.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-cs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-tc.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-ks.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-wj.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-wzs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-xc.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gyyq.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sqj-gxq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-zjg.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-css.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-tcs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-kss.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wjq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wzq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-xcq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gsq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gyyq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gxq.png',
     ]
   },
   onLoad: function (options) {
@@ -164,8 +164,8 @@ Page({
     let h = parseInt(oTime/3600)
     let m = parseInt((oTime%3600)/60)
     let s = parseInt(oTime%60)
-    // h=h<10?"0"+h:h;
-    // m=m<10?"0"+m:m;
+    h=h<10?"0"+h:h;
+    m=m<10?"0"+m:m;
     s=s<10?"0"+s:s;
     this.setData({
       djs:{h:h,m:m,s:s}
@@ -462,7 +462,7 @@ Page({
     let url = e.currentTarget.dataset.url;
     app.globalData.weburl = url;
     wx.navigateTo({
-      url: "/pages/pbService/web/index"
+      url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
     })
   },
   gotoUrl: function (e) {
@@ -683,7 +683,7 @@ Page({
     } else if (item.action == "web") {
       app.globalData.weburl = item.href;
       wx.navigateTo({
-        url: "/pages/pbService/web/index",
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
       })
     }
   },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 6b3ba24..b3603c0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -10,10 +10,15 @@
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
   <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/kefu.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/message.png" mode="aspectFill"></image>
+  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
     mode="aspectFill"></image>
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image>
+    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
@@ -46,14 +51,14 @@
   <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
     class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/hdrl.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/hdrl.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">活动日历</view>
   </view>
   <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
     data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/cgyy.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/cgyy.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">场馆预约</view>
   </view>
@@ -63,56 +68,56 @@
   <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/fyzm.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyzm.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">非遗专卖</view>
   </view>
   <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
     data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jcyc.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jcyc.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">剧场演出</view>
   </view>
   <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
     data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/wctc.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/wctc.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">文创特产</view>
   </view>
   <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jdmp.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jdmp.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">景点门票</view>
   </view>
   <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jdzs.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jdzs.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">酒店住宿</view>
   </view>
   <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yysz.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yysz.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">夜游苏州</view>
   </view>
   <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yry.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yry.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">一日游</view>
   </view>
   <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yxy.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yxy.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">研学游</view>
   </view>
@@ -175,20 +180,22 @@
     </view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 62.67rpx;" wx:if="{{isTest==false}}">
+  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;" wx:if="{{isTest==false}}">
     <!-- 上方标题部分 -->
     <view class="xsth-title">
       <view class="xsth-left" style="display: flex;">
         <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
-        <view class="time-box">
-          <view class="xsth-time">{{djs.h}}</view>:
-          <view class="xsth-time">{{djs.m}}</view>:
-          <view class="xsth-time">{{djs.s}}</view>
-        </view>
       </view>
-      <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+      <view class="time-box">
+      倒计时
+        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>:
+        <view class="xsth-time">{{djs.m}}</view>:
+        <view class="xsth-time">{{djs.s}}</view>
       </view>
+      <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/>
+      <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+      </view> -->
     </view>
     <!-- 商品部分 -->
     <view class="xpth-product">
@@ -197,32 +204,35 @@
         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}">
           <image src="{{item.headimg}}" mode=""/>
           <view class="xpth-item-content">
-            <view class="xpth-item-title">{{item.title}}</view>
+            <view class="xpth-item-title textOver">{{item.title}}</view>
+            <view class="xpth-tag">唇齿留香</view>
             <view class="xpth-item-bottom">
               <view class="xpth-item-price">{{item.price/100}}</view>
-              <view class="xpth-item-buy">立即抢购</view>
+              <!-- <view class="xpth-item-buy">立即抢购</view> -->
             </view>
           </view>
         </view>
       </view>
       <!-- 右边的banner -->
-      <image class="xpth-banner" bindtap="goBanner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode=""/>
+      <view class="xpth-banner">
+        <image bindtap="goBanner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode=""/>
+      </view>
     </view>
-    <!-- 烟花 -->
-    <image class="yanhua" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yanhua.png" mode=""/>
   </view>
 
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyjs-right.png" mode=""/>
   </view>
   <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-  <scroll-view scroll-x style="height:200rpx" bindscroll="listenScroll" class="slide-box">
+  <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
     <view class="pbservice" style="margin-bottom:30rpx">
-      <view bindtap="gotoUrl" data-title="非遗鉴赏" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+      <view bindtap="gotoUrl" style="margin-left:20rpx" data-title="非遗鉴赏" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
         <view>非遗鉴赏</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/fyjs.png" mode="widthFix"></image>
+        <!-- 元旦修改 第一个pbservice-item新增margin-left -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyjs.png" mode="widthFix"></image>
+        <view class="text">非遗鉴赏</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
         data-path="/pages/pbService/wwcx/index" class="pbservice-item">
@@ -234,7 +244,8 @@
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
         <view>文化场馆查询</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/whcgcx.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/whcgcx.png" mode="widthFix"></image>
+        <view class="text">文化场馆查询</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
         data-path="/pages/pbService/museum/index" class="pbservice-item">
@@ -246,7 +257,8 @@
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/szbwg.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/szbwg.png" mode="widthFix"></image>
+        <view class="text">数字博物馆</view>
       </view>
       <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
@@ -258,14 +270,16 @@
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yswbh.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yswbh.png" mode="widthFix"></image>
+        <view class="text">云上文博会</view>
       </view>
       <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/tzydt.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/tzydt.png" mode="widthFix"></image>
+        <view class="text">投资导引图</view>
       </view>
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
@@ -277,7 +291,8 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
         <view>文旅单位</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/wldw.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/wldw.png" mode="widthFix"></image>
+        <view class="text">文旅单位</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
         class="pbservice-item">
@@ -291,46 +306,51 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
-			<!-- <view bindtap="gotoPath" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-        class="pbservice-item"> -->
+			<view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
+        class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
         <view>苏影通</view> -->
         <!-- 元旦修改 -->
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/syt.png" mode="widthFix"></image>
-      </view> -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syt.png" mode="widthFix"></image>
+        <view class="text">苏影通</view>
+      </view>
 
       <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
       </view> -->
-      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+      <!-- <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item"> -->
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
         <view>云上观展</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/ysgz.png" mode="widthFix"></image>
-      </view>
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ysgz.png" mode="widthFix"></image>
+        <view>云上观展</view>
+      </view> -->
       <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
         <view>精彩回顾</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jchg.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jchg.png" mode="widthFix"></image>
+        <view class="text">精彩回顾</view>
       </view>
       <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
         data-path="/pages/pbService/appreciate/index" class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
         <view>视觉中心</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sjzx.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sjzx.png" mode="widthFix"></image>
+        <view class="text">视觉中心</view>
       </view>
 			<view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
         <view>书香借阅</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sxjy.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sxjy.png" mode="widthFix"></image>
+        <view class="text">书香借阅</view>
       </view>
 
 	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
@@ -338,7 +358,8 @@
 	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
 	    <view>公共文化资源库</view> -->
       <!-- 元旦修改 -->
-      <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/ggwhzyk.png" mode="widthFix"></image>
+      <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggwhzyk.png" mode="widthFix"></image>
+      <view class="text">公共文化资源库</view>
 	  </view>
     </view>
   </scroll-view>
@@ -350,19 +371,31 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/cxzs-right.png" mode=""/>
   </view>
   <view class="pic-list" style="margin-top:20rpx">
     <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image>
-    <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/dysz.png" mode="aspectFill"></image>
+      <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jxms.png" mode="aspectFill"></image>
+      <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yydl.png" mode="aspectFill">
+    </image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yjgl.png" mode="aspectFill"></image>
+    <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
+    <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
       data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image>
-    <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
+    <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
     </image>
     <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
       <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
     <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
@@ -378,45 +411,46 @@
     <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
       mode="aspectFill"></image> -->
   </view>
-  <view class="sale-road-boxes" style="margin-top:0;align-items:center">
+  <view class="sale-road-boxes" style="margin-top:0;align-items:center;margin: 34rpx 0 40rpx;">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
     <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">更多<text
         class="iconfont icon-you"></text> </navigator>
+    <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/>
   </view>
   <view style="overflow-x:auto">
     <!-- 元旦修改 ggfw为新增类名 -->
-    <view class="pbservice ggfw-list" style="width:100%">
+    <view class="pbservice ggfw-list" style="width:100%;">
       <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
         data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view> -->
         <!-- 元旦修改 ggfw为新增类名 -->
-            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/aqfw.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240129/e18bc1068b324593da17ed6272540ed9.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw">
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jqssd.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jqssd.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw">
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/xljc.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xljc.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/sslk.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sslk.png" mode="widthFix"></image>
         <view>实时路况</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
@@ -438,6 +472,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-right.png" mode=""/>
   </view>
   <!-- <view class="six-box">
     <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
@@ -454,6 +489,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/csjwlpt-right.png" mode=""/>
   </view>
   <view class="other-plats" wx:if="{{otherPlat}}">
     <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}">
@@ -463,6 +499,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/rmtj-right.png" mode=""/>
   </view>
   <view class="hot-list" wx:if="{{isTest==false}}">
     <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5a6535b..eaa56d8 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,7 +1,8 @@
 /**index.wxss**/
 /* 元旦修改 */
 page {
-  background: #FFF6E8;
+  background: #8F1D22;
+  /* background: #FFF6E8; */
 }
 .swiper,.swiper image {
   width: 690rpx;
@@ -23,20 +24,27 @@ page {
 }
 .top-box image {
   flex-shrink: 0;
-  width: 63rpx;
-  height: 63rpx;
+  width: 40rpx;
+  height: 40rpx;
+  /* 样式改版 */
+  /* width: 63rpx;
+  height: 63rpx; */
   display: block;
   margin-left: 18rpx;
 }
 .search-box {
   flex: 1;
   width: 100%;
-  height: 64rpx;
-  background: rgba(255, 255, 255, 0.6);
-  border-radius: 32rpx;
+  /* height: 64rpx; */
+  /* background: rgba(255, 255, 255, 0.6); */
+  /* border-radius: 32rpx; */
+  /* color: #666; */
+  height: 70.67rpx;
+  color: #F9F1DB;
+  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/searchBg.png");
+  background-size: 100% 100%;
   display: flex;
   align-items: center;
-  color: #666;
   font-size: 25rpx;
 }
 .search-box .iconfont {
@@ -97,6 +105,7 @@ page {
   display: flex;
   justify-content: space-between;
   margin-top: 40rpx;
+  position: relative;
 }
 .sale-box {
   flex-shrink: 0;
@@ -302,7 +311,8 @@ page {
   font-size: 27rpx;
   /* color: #0B898E; */
   /* 元旦修改 */
-  color: #D02E25;
+  color: #FFEEDB;
+  z-index: 9;
 }
 .title-more .iconfont {
   font-size: 22rpx;
@@ -310,7 +320,7 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(239.33rpx * 6);
+  width: calc(190rpx * 6);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
@@ -319,25 +329,31 @@ page {
 }
 .pbservice-item {
   /* 元旦修改 截止到注释的width*/
-  width: 220rpx;
+  width: 120rpx;
   margin-bottom: 33.33rpx;
-  margin-right: 19.33rpx;
+  margin-right: 62.33rpx;
   /* width: 175rpx; */
   text-align: center;
   font-size: 25rpx;
-  color: #333;
+  /* color: #333; */
+  /* 春节调整颜色改版 */
+  color: #FFEEDB;
   line-height: 24rpx;
   display: flex;
   align-items: center;
   justify-content: center;
   flex-direction: column;
 }
+.text {
+  width: 200rpx;
+}
 .pbservice-item image {
   /* width: 60rpx;
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 220rpx;
+  width: 93.33rpx;
+  margin-bottom: 16.67rpx;
 }
 .six-box {
   margin-top: 43rpx;
@@ -649,6 +665,8 @@ page {
 .other-plat {
   margin-right: 79rpx;
   margin-top: 20rpx;
+  /* 春节新增样式 */
+  color: #FFEEDB;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -771,7 +789,7 @@ page {
 .xpth {
   /* width: 697rpx; */
   height: 462rpx;
-  background: linear-gradient(-90deg,  #FF9B6A, #D02E25);
+  /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
   border-radius: 20rpx;
   padding: 22.67rpx 18rpx 15.33rpx;
   position: relative;
@@ -792,7 +810,7 @@ page {
   margin: 0 5rpx;
   width: 50rpx;
   height: 33rpx;
-  background: #FFF0D7;
+  background: #F9F1DB;
   border-radius: 5rpx;
   font-size: 25rpx;
   font-family: DIN;
@@ -839,34 +857,43 @@ page {
 /* 元旦修改新增样式 */
 .xpth-product {
   position: absolute;
-  right: 18rpx;
+  left: 0;
   bottom: 15.33rpx;
   display: flex;
-  width: 670rpx;
+  width: 710rpx;
   justify-content: space-between;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
-  width: 248rpx;
-  height: 353rpx;
-  background: #FFFFFF;
+  width: 270rpx;
+  height: 333rpx;
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
+  background-size: 100% 100%;
+  border-radius: 20rpx;
+}
+.xpth-banner image {
+  width: 270rpx;
+  height: 333rpx;
   border-radius: 20rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-item {
   width: 413rpx;
   height: 170rpx;
-  background: #FFFFFF;
+  /* background: #FFFFFF; */
+  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%;
   border-radius: 20rpx;
   display: flex;
+  /* padding: 5rpx; */
 }
 /* 元旦修改新增样式 */
 .xpth-item image {
   width: 160rpx;
-  height: 160rpx;
+  height: 170rpx;
   background: #FFE7C0;
-  border-radius: 13rpx;
-  margin-right: 15.33rpx;
+  border-radius: 15rpx 0 0 15rpx;
+  /* margin-right: 15.33rpx; */
   flex-shrink: 0;
 }
 /* 元旦修改新增样式 */
@@ -875,16 +902,25 @@ page {
   display: flex;
   flex-direction: column;
   justify-content: space-around;
-  
+  background: #FBECDE;
+  padding-left: 15.33rpx;
+  border-radius: 0 15rpx 15rpx 0;
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
+  width: 230rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
   color: #333333;
   margin-right: 18rpx;
-  height: 80rpx;
+  /* height: 80rpx; */
+}
+.xpth-tag {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #E5A54A;
 }
 /* 元旦修改新增样式 */
 .xpth-item-bottom {
@@ -898,7 +934,7 @@ page {
   font-size: 32rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #E63100;
+  color: #D62828;
 }
 /* 元旦修改新增样式 */
 .xpth-item-price::before {
@@ -920,8 +956,8 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 335.33rpx !important;
-  height: 120.67rpx !important;
+  width: 153.33rpx !important;
+  height: 253.33rpx !important;
   margin-bottom: 26.67rpx;
 }
 
@@ -941,7 +977,7 @@ page {
 .six-box-new {
   width: 697rpx;
   height: 285rpx;
-  background: linear-gradient(-90deg, #FF9B6A, #D02E25);
+  /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
   border-radius: 20rpx;
   display: flex;
   justify-content: space-between;
@@ -952,10 +988,22 @@ page {
 }
 
 .six-box-new image {
-  width: 192rpx;
-  height: 258rpx;
-  background: #FFE7C0;
+  width: 440rpx;
+  height: 213.33rpx !important;
+  /* background: #FFE7C0; */
   border-radius: 20rpx;
   flex-shrink: 0;
   margin-right: 13.33rpx;
+}
+/* 春节金刚区字体颜色样式更换 */
+.top-icon-text {
+  color: #FFEEDB;
+}
+
+.rmtj-right {
+  width: 256.67rpx;
+  height: 146.67rpx;
+  position: absolute;
+  right: -20rpx;
+  top: -20rpx;
 }
\ No newline at end of file
diff --git a/pages/info/luggageInfo/index.wxml b/pages/info/luggageInfo/index.wxml
index e86b2e2..67755ec 100644
--- a/pages/info/luggageInfo/index.wxml
+++ b/pages/info/luggageInfo/index.wxml
@@ -30,7 +30,7 @@
   </view>
   <view class="text"><rich-text nodes="{{info.content}}"></rich-text></view>
   <view>
-    <view class="h-title2">寄存须知</view>
+    <view class="h-title">寄存须知</view>
     <view class="btm-line"></view>
   </view>
   <view class="text">
diff --git a/pages/map/index.js b/pages/map/index.js
index fc6d3f5..7bf0522 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -565,7 +565,7 @@ Page({
         let list = [];
         res.data.map((item,index)=>{
           let mapItem = {};
-          item.showContent = item.name + "(" + item.address + ")";
+          item.showContent = item.name;
           mapItem.latitude = Number(item.lat);
           mapItem.longitude = Number(item.lng);
           mapItem.id = index;
@@ -591,7 +591,7 @@ Page({
         let list = [];
         res.data.map((item,index)=>{
           let mapItem = {};
-          item.showContent = item.name + "(" + item.address + ")";
+          item.showContent = item.name;
           mapItem.latitude = Number(item.lat);
           mapItem.longitude = Number(item.lng);
           mapItem.id = index;
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index b1ffe8e..849530a 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -11,7 +11,8 @@
   </view>
 </picker>
 <view class="menus" wx:if="{{showMore=='close'}}">
-  <view class="open" bindtap="changeShow"></view>
+  <!-- <view class="open" bindtap="changeShow"></view> -->
+  <image bindtap="changeShow" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240129/e06f57483a5dfb145a30ab13226d2e93.png" mode=""/>
   <view class="menu-list">
     <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
       <image class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
@@ -32,7 +33,8 @@
   </view>
 </view>
 <view class="menus2" wx:else>
-  <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/>
+  <!-- <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/> -->
+  <image bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240129/4450fe629f3c33cb6c8407e8f6ebb021.png" mode=""/>
   <scroll-view scroll-x style="height:280rpx" bindscroll="listenScroll" class="">
     <view class="menus-list1" style="margin-bottom:30rpx">
       <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 1f803cf..2ede90a 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -11,7 +11,7 @@
   position: fixed;
   /* left: 25rpx; */
   left: 0;
-  top: 150rpx;
+  top: 160rpx;
   display: flex;
   align-items: center;
   width: 202rpx;
@@ -505,10 +505,11 @@
   border: 3rpx solid #999999;
   margin: 0 auto;
   margin-top: 13.3rpx;
+  margin-bottom: 37.33rpx;
 }
 
 .menu-list {
-  margin-top: 37.33rpx;
+  /* margin-top: 37.33rpx; */
   display: flex;
   justify-content: space-around;
 }
@@ -624,4 +625,9 @@
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 3;
   overflow: hidden;
+}
+
+.img-icon {
+  width: 686.67rpx;
+  height: 40rpx;
 }
\ No newline at end of file

From 22fd7a703f63da058b3ad6daf7257f23f858e6f3 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 31 Jan 2024 15:07:53 +0800
Subject: [PATCH 118/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                        |  9 ++-
 pages/index/index.wxml                      | 15 +++--
 pages/index/index.wxss                      | 33 +++++++---
 pages/list/movieticket/list/info/index.js   | 17 ++++-
 pages/list/movieticket/list/info/index.wxml |  7 +-
 pages/order/components/coupon/index.js      |  1 +
 pages/order/movie/index.js                  |  1 +
 pages/pbService/web/index.js                | 71 +++++++++++----------
 8 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index b2c83e6..faf5383 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -475,7 +475,8 @@ Page({
     let url = e.currentTarget.dataset.url;
     app.globalData.weburl = url;
     wx.navigateTo({
-      url: "/pages/pbService/web/index"
+      // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+      url: '/pages/pbService/web/index?weburl='+encodeURIComponent(url),
     })
   },
   gotoMini: function (e) {
@@ -657,9 +658,11 @@ Page({
   //博物馆跳转  直接跳君到苏州H5
   goH5:function(e){
     console.log(e.currentTarget.dataset.path);
-    app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+    let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+    // app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
     wx.navigateTo({
-      url: "/pages/pbService/web/index"
+      // url: "/pages/pbService/web/index"
+      url: '/pages/pbService/web/index?weburl='+encodeURIComponent(weburl),
     })
   },
   bannerClick2: function (e) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b3603c0..2be8bd7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -171,7 +171,8 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:77rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        <!-- 原 圆角77rpx，现改为20rpx -->
+          <image style="border-radius:20rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -186,7 +187,7 @@
       <view class="xsth-left" style="display: flex;">
         <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
       </view>
-      <view class="time-box">
+      <view class="time-box" style="z-index: 9;">
       倒计时
         <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>:
         <view class="xsth-time">{{djs.m}}</view>:
@@ -311,7 +312,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
         <view>苏影通</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syt.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syts.png" mode="widthFix"></image>
         <view class="text">苏影通</view>
       </view>
 
@@ -320,14 +321,14 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
       </view> -->
-      <!-- <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item"> -->
+      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
         <view>云上观展</view> -->
         <!-- 元旦修改 -->
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ysgz.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syt.png" mode="widthFix"></image>
         <view>云上观展</view>
-      </view> -->
+      </view>
       <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index eaa56d8..d5d9085 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -2,6 +2,9 @@
 /* 元旦修改 */
 page {
   background: #8F1D22;
+  padding-bottom: 36.67rpx;
+  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/indexBg.png");
+  background-size: 100% 100%;
   /* background: #FFF6E8; */
 }
 .swiper,.swiper image {
@@ -54,7 +57,8 @@ page {
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
-  color: #333;
+  /* color: #333; */
+  color: #FFF0DB;
 }
 .top-box .weather-num {
   font-size: 29rpx;
@@ -190,7 +194,8 @@ page {
   margin: 50rpx 0;
   width: 100%;
   height: 154rpx;
-  border-radius: 77rpx;
+  border-radius: 20rpx;
+  /* border-radius: 77rpx; */
   overflow: hidden;
   margin-bottom: 63rpx;
   position: relative;
@@ -376,7 +381,8 @@ page {
   width: 337rpx;
 }
 .hot-item {
-  background: white;
+  /* background: white; */
+  background: #F9F1DB;
   box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
   border-radius: 15rpx;
   margin-bottom: 35rpx;
@@ -513,13 +519,22 @@ page {
 }
 .more-btn-text {
   text-align: center;
-  color: #0b898e;
+  /* color: #0b898e;
   font-size: 27rpx;
   width: 200rpx;
   line-height: 65rpx;
   border: 1px solid #0b898e;
-  border-radius: 33rpx;
+  border-radius: 33rpx; */
   margin: 20rpx auto;
+  width: 200rpx;
+  height: 67rpx;
+  line-height: 67rpx;
+  border: 1px solid #FFEEDB;
+  border-radius: 7rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFEEDB;
 }
 .scroll-line {
   /* height: 6rpx;
@@ -791,7 +806,7 @@ page {
   height: 462rpx;
   /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
   border-radius: 20rpx;
-  padding: 22.67rpx 18rpx 15.33rpx;
+  padding: 22.67rpx 18rpx 15.33rpx 0;
   position: relative;
 }
 /* 元旦修改新增样式 */
@@ -804,6 +819,7 @@ page {
   align-items: center;
   height: 37px;
   margin-left: -50rpx;
+  z-index: 9;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
@@ -879,18 +895,19 @@ page {
 /* 元旦修改新增样式 */
 .xpth-item {
   width: 413rpx;
-  height: 170rpx;
+  height: 160rpx;
   /* background: #FFFFFF; */
   background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
   background-size: 100% 100%;
   border-radius: 20rpx;
   display: flex;
+  margin-bottom: 10rpx;
   /* padding: 5rpx; */
 }
 /* 元旦修改新增样式 */
 .xpth-item image {
   width: 160rpx;
-  height: 170rpx;
+  height: 160rpx;
   background: #FFE7C0;
   border-radius: 15rpx 0 0 15rpx;
   /* margin-right: 15.33rpx; */
diff --git a/pages/list/movieticket/list/info/index.js b/pages/list/movieticket/list/info/index.js
index 829bd7f..e49d467 100644
--- a/pages/list/movieticket/list/info/index.js
+++ b/pages/list/movieticket/list/info/index.js
@@ -1,5 +1,6 @@
 // pages/list/movieticket/list/info/index.js
 import commonApi from "../../../../../utils/https/common"
+import userApi from "../../../../../utils/https/user"
 let app = getApp()
 Page({
 
@@ -8,13 +9,20 @@ Page({
    */
   data: {
     info:null,
-    showFlag:false
+    showFlag:false,
+    token:''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    userApi.user_post("user/getMyInfo").then(res=>{
+      this.setData({
+        token:res.data.token
+      })
+      console.log(this.data.token);
+    })
     commonApi._post("Cinema/getMovieDetail",{
       show_id:options.id
     }).then(res=>{
@@ -28,6 +36,13 @@ Page({
       console.log(showFlag)
     })
   },
+  gotoWeb:function(e){
+    let item = e.currentTarget.dataset.item;
+    // app.globalData.weburl = 'https://m.cloud.sz-trip.com/MovieDetail?id='+item.third_id
+    wx.navigateTo({
+      url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://test.m.cloud.sz-trip.com/MovieDetail?id='+item.third_id+'&token='+this.data.token),
+    })
+  },
   BroswerRecord:function(){
     setTimeout(()=>{
       if(app.globalData.uuid){
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 651fcac..dc708c0 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -24,6 +24,9 @@
   <!-- <view class="line"></view> -->
 </view>
 <view style="height:104rpx" wx:if="{{showFlag}}"></view>
-<navigator  url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
+<!-- <navigator  url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
   <view class="order-btn">立即购票</view>
-</navigator>
\ No newline at end of file
+</navigator> -->
+<view catchtap="gotoWeb" class="fixed-bottom" data-item="{{info}}">
+  <view class="order-btn">立即购票</view>
+</view>
\ No newline at end of file
diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 0fbb534..9f79e8f 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -62,6 +62,7 @@ Component({
             console.log("我用的原来的数据");
           }else{
             console.log("我用的新的数据");
+            console.log('123123132',res.data);
             if ( Object.keys(res.data).length!=0) {
               app.globalData.couponInfo = res.data
               this.setData({
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index dd5b2bd..8235937 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -26,6 +26,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
 	onLoad: function (options) {
+    console.log(JSON.parse(options));
     app.globalData.couponInfo = null
     this.setData({
       coupon:app.globalData.couponInfo
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index a2bd632..33f5e7c 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -16,47 +16,48 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-	console.log('options',decodeURIComponent(options.weburl))
+  console.log('options',decodeURIComponent(options.weburl))
 	options.weburl = decodeURIComponent(options.weburl)
-    if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
-      userApi.user_post("user/getMyInfo").then(res=>{
-        let weburl = options.weburl
-        if(weburl.indexOf('?')!=-1){
-          weburl += '&token='+res.data.token;
-        }
-        else {
-          weburl += '?token='+res.data.token
-        }
-        this.setData({
-          info:res.data,
-          webUrl:weburl
-        })
-      })
-    }
-    else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
-      // 如果是去苏心游或者镇江的话
-      userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
-        let weburl = options.weburl
-        if(weburl.indexOf('?')!=-1){
-          weburl += '&original_sys_name=jdsz&auth_code='+res.data;
-        }
-        else {
-          weburl += '?original_sys_name=jdsz&auth_code='+res.data
-        }
-        this.setData({
-          info:res.data,
-          webUrl:weburl
-        })
-      })
-    }
-    else {
+  // if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
+  //   userApi.user_post("user/getMyInfo").then(res=>{
+  //     let weburl = options.weburl
+  //     if(weburl.indexOf('?')!=-1){
+  //         weburl += '&token='+res.data.token;
+  //       }
+  //       else {
+  //         weburl += '?token='+res.data.token
+  //       }
+  //       this.setData({
+  //         info:res.data,
+  //         webUrl:weburl
+  //       })
+  //     })
+  //   }
+  //   else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
+  //     // 如果是去苏心游或者镇江的话
+  //     userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
+  //       let weburl = options.weburl
+  //       if(weburl.indexOf('?')!=-1){
+  //         weburl += '&original_sys_name=jdsz&auth_code='+res.data;
+  //       }
+  //       else {
+  //         weburl += '?original_sys_name=jdsz&auth_code='+res.data
+  //       }
+  //       this.setData({
+  //         info:res.data,
+  //         webUrl:weburl
+  //       })
+  //     })
+  //   }
+  //   else {
       this.setData({
         webUrl:options.weburl
       })
-    }
+      console.log('打印',this.data.webUrl);
+  //   }
   },
   handleMessage(data) {
-  	console.log(data)
+    console.log(data)
 	this.setData({
 	  shareTitle:data.shareTitle,
 	  shareUrl:data.shareUrl

From 8ae742c928f3fff34864c577b5bfc87cd7f447c3 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 1 Feb 2024 15:50:27 +0800
Subject: [PATCH 119/471] =?UTF-8?q?=E8=8B=8F=E5=BD=B1=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.wxml           |  4 ++--
 pages/list/movieticket/list/info/index.js   |  7 -------
 pages/list/movieticket/list/info/index.wxml |  7 ++-----
 pages/list/movieticket/list/ticket/index.js | 21 ++++++++++++---------
 pages/order/movie/index.js                  | 12 +++++-------
 pages/pbService/web/index.js                | 12 +++++-------
 6 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 41ce496..6c831a6 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -31,10 +31,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==2?'color:#C155E9':''}}">展览</view>
     </view>
-    <!-- <view class="type-item" bindtap="changeType" data-type="4">
+    <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view> -->
+    </view>
     <view class="type-item" bindtap="changeType" data-type="7">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==7?'color:#F75D2A':''}}">文化惠民</view>
diff --git a/pages/list/movieticket/list/info/index.js b/pages/list/movieticket/list/info/index.js
index e49d467..9c359bd 100644
--- a/pages/list/movieticket/list/info/index.js
+++ b/pages/list/movieticket/list/info/index.js
@@ -36,13 +36,6 @@ Page({
       console.log(showFlag)
     })
   },
-  gotoWeb:function(e){
-    let item = e.currentTarget.dataset.item;
-    // app.globalData.weburl = 'https://m.cloud.sz-trip.com/MovieDetail?id='+item.third_id
-    wx.navigateTo({
-      url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://test.m.cloud.sz-trip.com/MovieDetail?id='+item.third_id+'&token='+this.data.token),
-    })
-  },
   BroswerRecord:function(){
     setTimeout(()=>{
       if(app.globalData.uuid){
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index dc708c0..651fcac 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -24,9 +24,6 @@
   <!-- <view class="line"></view> -->
 </view>
 <view style="height:104rpx" wx:if="{{showFlag}}"></view>
-<!-- <navigator  url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
+<navigator  url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
   <view class="order-btn">立即购票</view>
-</navigator> -->
-<view catchtap="gotoWeb" class="fixed-bottom" data-item="{{info}}">
-  <view class="order-btn">立即购票</view>
-</view>
\ No newline at end of file
+</navigator>
\ No newline at end of file
diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js
index 7fdd246..e61f784 100644
--- a/pages/list/movieticket/list/ticket/index.js
+++ b/pages/list/movieticket/list/ticket/index.js
@@ -177,13 +177,13 @@ Page({
                 let index = e.currentTarget.dataset.index
                 console.log(index);
                 console.log(info.schedules);
-                const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({
-                    ...item,
-                    price: item.areaPrice,
-                    areaId: item.seatAreaId
-                }));
+                // const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({
+                //     ...item,
+                //     price: item.areaPrice,
+                //     areaId: item.seatAreaId
+                // }));
                 let planData = {
-                    areaInfo,
+                    // areaInfo,
                     fee: info.schedules[index].service_fee,
                     movieName: this.data.title,
                     planId: info.schedules[index].schedule_id,
@@ -215,9 +215,12 @@ Page({
                         }
                     }
                     console.log(planData);
-                    wx.navigateTo({
-                        url: "/pages/list/movieticket/list/web/index?planData=" + JSON.stringify(planData),
-                    })
+                    // wx.navigateTo({
+                    //     url: "/pages/list/movieticket/list/web/index?planData=" + JSON.stringify(planData),
+                    // })
+					wx.navigateTo({
+					  url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://film.jstqsdy.com/?appkey=TQS65aa175129fd2&jump=&type=WECHATXCX&featureAppNo=' + info.schedules[index].schedule_id),
+					})
                 })
             }})
     },
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index 8235937..5162893 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -26,7 +26,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
 	onLoad: function (options) {
-    console.log(JSON.parse(options));
     app.globalData.couponInfo = null
     this.setData({
       coupon:app.globalData.couponInfo
@@ -36,12 +35,11 @@ Page({
     })
     let product = app.globalData.product,price=0,num=0,sPrice=0;
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
-    product.info.selectSeatInfo.seatPriceInfo.map(item=>{
-			price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
+    product.info.selectSeatInfo.price.map(item=>{
+			price =price +Math.ceil(Number(item)*1.006 * 100) / 100
 			num = num + 1
-			sPrice = Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
+			sPrice = Math.ceil(Number(item)*1.006 * 100) / 100
 		})
-		console.log(price*100);
 		
     this.setData({
       product:product,
@@ -49,7 +47,6 @@ Page({
 			num:num,
 			sPrice:sPrice
 		})
-		console.log(this.data.price);
     userApi.user_post("user/getMyInfo").then(res=>{
       this.setData({
         tel:res.data.mobile
@@ -105,7 +102,8 @@ Page({
       "seats_list": product.info.selectSeatInfo.seatInfo.join(","),//座位中文名称,多个座位逗号分隔,必填
       // "key": this.data.key,//锁座返回的key,必填
       "schedules_id": product.info.schedule_id,//淘票票场次id,必填
-      "seats_ids": product.info.selectSeatInfo.seatPriceInfo
+      "seats_ids": product.info.selectSeatInfo.seatPriceInfo,
+	  "seatnames": product.info.selectSeatInfo.seatInfo.join("|")
     }];
     let data = {
       product_list:product_list,
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 33f5e7c..606ae97 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -16,7 +16,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-  console.log('options',decodeURIComponent(options.weburl))
 	options.weburl = decodeURIComponent(options.weburl)
   // if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
   //   userApi.user_post("user/getMyInfo").then(res=>{
@@ -53,15 +52,14 @@ Page({
       this.setData({
         webUrl:options.weburl
       })
-      console.log('打印',this.data.webUrl);
   //   }
   },
   handleMessage(data) {
-    console.log(data)
-	this.setData({
-	  shareTitle:data.shareTitle,
-	  shareUrl:data.shareUrl
-	})
+	// this.setData({
+	//   shareTitle:data.shareTitle,
+	//   shareUrl:data.shareUrl
+	// })
+	console.log('打印22222',data);
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

From ffc35a9cbebc362c16eeaa2b1ece53cf9d18e5ee Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 1 Feb 2024 15:53:49 +0800
Subject: [PATCH 120/471] =?UTF-8?q?=E6=96=B0=E5=93=81=E7=89=B9=E6=83=A0?=
 =?UTF-8?q?=E7=9B=B4=E8=A7=92=EF=BC=8C=E5=8D=81=E5=85=A8=E8=A1=97=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 10 +++++-----
 pages/index/index.wxml |  4 +++-
 pages/index/index.wxss | 17 ++++++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index faf5383..e050dde 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -48,12 +48,12 @@ Page({
       'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-css.png',
       'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-tcs.png',
       'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-kss.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wjq.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wzq.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-xcq.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gsq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wjqs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wzqs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-xcqs.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gsqs.png',
       'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gyyq.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gxq.png',
+      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gxqs.png',
     ]
   },
   onLoad: function (options) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 2be8bd7..67fd0db 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -202,7 +202,8 @@
     <view class="xpth-product">
       <!-- 左边的2个产品 -->
       <view class="xpth-left">
-        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}">
+        <view wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" style="padding: 4rpx;background: #3F7572;clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%);margin-bottom: 10rpx;">
+          <view class="xpth-item" >
           <image src="{{item.headimg}}" mode=""/>
           <view class="xpth-item-content">
             <view class="xpth-item-title textOver">{{item.title}}</view>
@@ -213,6 +214,7 @@
             </view>
           </view>
         </view>
+        </view>
       </view>
       <!-- 右边的banner -->
       <view class="xpth-banner">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d5d9085..5a3fdbb 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -881,16 +881,22 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
-  width: 270rpx;
-  height: 333rpx;
+  /* width: 270rpx; */
+  /* height: 333rpx; */
+  height: 340rpx;
   /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
   background-size: 100% 100%;
   border-radius: 20rpx;
+  padding: 4rpx;
+  background: #3F7572;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%);
 }
 .xpth-banner image {
   width: 270rpx;
-  height: 333rpx;
-  border-radius: 20rpx;
+  /* height: 333rpx; */
+  height: 340rpx;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%);
+  /* border-radius: 20rpx; */
 }
 /* 元旦修改新增样式 */
 .xpth-item {
@@ -901,7 +907,8 @@ page {
   background-size: 100% 100%;
   border-radius: 20rpx;
   display: flex;
-  margin-bottom: 10rpx;
+  /* margin-bottom: 10rpx; */
+  clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%);
   /* padding: 5rpx; */
 }
 /* 元旦修改新增样式 */

From 5eae0094f0947c7688fea7e63f047b3c6f150999 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 1 Feb 2024 17:43:48 +0800
Subject: [PATCH 121/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/movieticket/list/cinema/index.js |  9 ++++++---
 pages/order/movie/index.js                  | 16 +++++++++++++---
 pages/order/movie/index.wxml                |  9 +++++----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js
index e00b4b3..9625128 100644
--- a/pages/list/movieticket/list/cinema/index.js
+++ b/pages/list/movieticket/list/cinema/index.js
@@ -101,9 +101,9 @@ Page({
   },
   selectMovieSeat(e){
     let info = e.currentTarget.dataset.info
-    const areaInfo = JSON.parse(info.schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
+    // const areaInfo = JSON.parse(info.schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
     let planData = {
-      areaInfo,
+      // areaInfo,
       fee:info.service_fee,
       movieName: this.data.movie[this.data.currentNum].title,
       planId : info.schedule_id,
@@ -137,8 +137,11 @@ Page({
 					start_end_time:info.show_time
         }
       }
+      // wx.navigateTo({
+      //   url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
+      // })
       wx.navigateTo({
-        url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
+        url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://film.jstqsdy.com/?appkey=TQS65aa175129fd2&jump=&type=WECHATXCX&featureAppNo=' + info.schedule_id),
       })
     })
   },
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index 5162893..c4fb082 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -19,7 +19,8 @@ Page({
 		sPrice:0,
     hideMx:false,
     showModel:false,
-    agree:false
+    agree:false,
+    sPriceList:[]
   },
 
   /**
@@ -39,14 +40,23 @@ Page({
 			price =price +Math.ceil(Number(item)*1.006 * 100) / 100
 			num = num + 1
 			sPrice = Math.ceil(Number(item)*1.006 * 100) / 100
-		})
+    })
+    console.log(product.info.selectSeatInfo.price);
+    let priceList = []
+    product.info.selectSeatInfo.price.forEach(item => {
+      item = Math.ceil(Number(item)*1.006 * 100) / 100
+      priceList.push(item)
+    })
+    console.log('-----',priceList);
 		
     this.setData({
+      sPriceList:priceList,
       product:product,
 			price:(price*100).toFixed(2),
 			num:num,
 			sPrice:sPrice
-		})
+    })
+    console.log('222',this.data.sPriceList);
     userApi.user_post("user/getMyInfo").then(res=>{
       this.setData({
         tel:res.data.mobile
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 3565da2..e3f6796 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -33,7 +33,7 @@
 </view>
 <coupon bind:getNewCoupon='getNewCoupon' money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
 <view class="fix-info {{!hideMx?'hide':''}}">
-  <view class="info-item">
+  <view class="info-item" style="margin-bottom: 20rpx;">
     <view>
       费用明细
     </view>
@@ -41,15 +41,16 @@
       ￥{{price/100}}
     </view>
   </view>
-  <view class="info-item">
+  <view wx:for="{{sPriceList}}" style="font-size: 31rpx;font-family: PingFang SC;font-weight: 500;color: #999999;display: flex;align-items: center;justify-content: space-between;margin-bottom: 20rpx;">
     <view>
       票价
     </view>
     <view>
-      ￥{{sPrice}} x {{num}}
+      ￥{{item}}
+      <!-- ￥{{sPrice}} x {{num}} -->
     </view>
   </view>
-  <view class="info-item">
+  <view class="info-item" style="margin-bottom: 20rpx;">
     <view>
       优惠券
     </view>

From d813a03843ecc43c89f8a3b492864da89a569543 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 1 Feb 2024 17:46:43 +0800
Subject: [PATCH 122/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 72de0a2..1502125 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.isTest98? true : false;
+      data.isTest = data.isTest99? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 4a624635beb735f234444ee0d73456eed2a9e696 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 2 Feb 2024 10:58:00 +0800
Subject: [PATCH 123/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E5=88=9A?=
 =?UTF-8?q?=E5=8C=BA=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml       | 10 +++++-----
 pages/order/movie/index.js   | 12 +++++++++++-
 pages/order/movie/index.wxml |  7 +++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 67fd0db..ce22204 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -58,7 +58,7 @@
   <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
     data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/cgyy.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/cgyys.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">场馆预约</view>
   </view>
@@ -68,14 +68,14 @@
   <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyzm.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyzms.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">非遗专卖</view>
   </view>
   <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
     data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jcyc.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jcycs.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">剧场演出</view>
   </view>
@@ -103,14 +103,14 @@
   <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yysz.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yyszs.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">夜游苏州</view>
   </view>
   <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yry.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yrys.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">一日游</view>
   </view>
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index c4fb082..4f8b77c 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -41,7 +41,7 @@ Page({
 			num = num + 1
 			sPrice = Math.ceil(Number(item)*1.006 * 100) / 100
     })
-    console.log(product.info.selectSeatInfo.price);
+    console.log('price',product.info.selectSeatInfo.price);
     let priceList = []
     product.info.selectSeatInfo.price.forEach(item => {
       item = Math.ceil(Number(item)*1.006 * 100) / 100
@@ -62,6 +62,16 @@ Page({
         tel:res.data.mobile
       })
     })
+    console.log('***',product.info.selectSeatInfo);
+    commonApi.user_post("Cinema/getSeatPrice",{
+      schedules_id:product.info.schedule_id,
+      seats_ids:product.info.selectSeatInfo.seatPriceInfo
+    }).then(res=>{
+      console.log('res',res);
+      this.setData({
+        price:res.data.money
+      })
+    })
   },
   changeTel:function(e){
     this.setData({
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index e3f6796..4733428 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -32,7 +32,7 @@
   <input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
 </view>
 <coupon bind:getNewCoupon='getNewCoupon' money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
-<view class="fix-info {{!hideMx?'hide':''}}">
+<!-- <view class="fix-info {{!hideMx?'hide':''}}">
   <view class="info-item" style="margin-bottom: 20rpx;">
     <view>
       费用明细
@@ -47,7 +47,6 @@
     </view>
     <view>
       ￥{{item}}
-      <!-- ￥{{sPrice}} x {{num}} -->
     </view>
   </view>
   <view class="info-item" style="margin-bottom: 20rpx;">
@@ -65,14 +64,14 @@
       订单总额:<text style="color: #D62828; font-weight: bold;">¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</text>
     </view>
   </view>
-</view>
+</view> -->
 <view class="fixed-bottom">
   <view class="money-box">
     <view class="price" wx:if="{{prizeId}}">¥0</view>
     <view class="price" wx:else>¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</view>
     <view>总计优惠{{coupon?coupon.activity.money/100:0}}元</view>
   </view>
-  <view class="tip" bindtap="mingxi">明细</view>
+  <!-- <view class="tip" bindtap="mingxi">明细</view> -->
   <view class="btn" bindtap="closeModel">立即付款</view>
 </view>
 <view class="mask" wx:if="{{showModel}}">

From b7c8d75bbee20f3d857b7869c9e3202d5e13ee1c Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 1 Mar 2024 11:06:28 +0800
Subject: [PATCH 124/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A6=96=E9=A1=B5ui=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                              |   2 +-
 images/index-selds.png                | Bin 10836 -> 13086 bytes
 images/my-selds.png                   | Bin 13156 -> 13301 bytes
 images/tuyou-selds.png                | Bin 19171 -> 19434 bytes
 pages/index/index.js                  |  20 +++---
 pages/index/index.wxml                |  92 +++++++++++++-------------
 pages/index/index.wxss                |  59 +++++++++--------
 pages/order/components/date/index.js  |   7 +-
 pages/order/scene/index.js            |  34 ++++++++--
 pages/pbService/appreciate/index.wxml |   2 +-
 pages/pbService/appreciate/index.wxss |   2 +-
 11 files changed, 122 insertions(+), 96 deletions(-)

diff --git a/app.json b/app.json
index 6682b26..75d9431 100644
--- a/app.json
+++ b/app.json
@@ -213,7 +213,7 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999",
-    "selectedColor": "#D02E25",
+    "selectedColor": "#72674E",
     "borderStyle": "white",
     "list": [
       {
diff --git a/images/index-selds.png b/images/index-selds.png
index 0781bc44a4007e13bb9b9df1209e8b794d8a15f5..496bc7e345d90815405bb42f3d1cfd647fee6909 100644
GIT binary patch
literal 13086
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%0Dh2t)~OAVFiSK(sU
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
KiAphpfd2z5Q^+v@

literal 10836
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
B(k=i1

diff --git a/images/my-selds.png b/images/my-selds.png
index debb1e80b210ad988fb73aa01c8b2d3f868b3193..5b4f4c9aa30264d985bd0a98ff76ca552f9ab67a 100644
GIT binary patch
literal 13301
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

literal 13156
zcmV-qGn>qbP)<h;3K|Lk000e1NJLTq006K6006KE1^@s6ueao000001b5ch_0Itp)
z=>PyA07*naRCr$PeF=PAW!3)ky!XzMbT3`90R;-QX<C*d`zj~`LPb7`&^ECkA|jx&
zseq#LiJ&0shse?;Elb%15oJ*pS;RjGU6Qg>AW1i9p|nY6x$pVs+?grUX-d;}Cdo|a
zYJP3Wz3+YRd7pdkdCz&yIYjX&N+6FVz&xINaq2}0pa|e12=ZD2MF8jZ@)ajv1aJ`p
zc`bn=fb)9!ijyw_xQKzgmOv4}dA)qa$rk}!#6Vt4pa|f+UcTbwivZpP4BS#NzBFjP
zVGiR%j4=bOwFAURKLeHuBxFDb!hk;{C1xQW!3ZF0X!#k8Sw$<K0P&Ajvvm0xEw8k0
z!tINvb|QfyfWH71bE>O@SdL&@(1z$re?;9~0PYH6ClFOeP%gx90NX&&*8om{#vd^z
z78ZzuSPftW1xtl!0i=n-cL2O$z1Umga#cyxM6evuiD--#QMzdoC<1r`^121%1L3mx
z9**($0c2kQy8-MkKnQ?pS^aU7KMs+IYBCwz6o@~v`2U9o1#{vj=HnZPkoXjWxd8u7
zYhN0*B>dW5ctw9-Jh~`>B7oBbbs1oGsN8L&W4$pJGRDA+79%@Tuv3s`u<BOp|0Lik
zNpz-xbse#%gsY&|zcYz)10pq6MC`{xyhF>k1bE#*8tAwS-fDX7oy!upD;{4Ufg*qb
z+%kTAz+JsM9BOq(**K3NaRR{IgQTP2^dte=TpSAKg!(2TR&8eaFUbe2BTvRkV{gR!
z_H94om7-SOknFd50ISyBxw3kkz^N0FLjhC*7(gJX!b!n4H}Fl`9lq(2xR(HG2Y(8%
zNr<Oi%Jesz7Az=g<IW+xRRg%bV%)BTJwS*<AUM<^w{t<nA+VA%4AvK%Zw~1Hk|sgw
z-w7KyaeNN^q`9%y<oM!o4T;noJdyVSc^Z&s0Plq<EpNP$i?2XFkGWL>_$eIfwv;ce
zv~;FIaAL@qY7c_A8ns=pxAZImaSM1%Y|s*>@meM750bz&d~;WS)KYK+a5F*P*)8=P
zmuf2$?bd5B#2gPYeY=)nEr;Q0-3%6wG=;HM38TJz%-3je4g|Xi%y4yosb1U=d=*R%
z2`8yvBVrY*?|`z1WD5k#gz_nbZ6MaDFs-`PC}9c*2w2u(YL`P~1c)6&NmrY`G+q}p
zz50^@Sqkzs3a*>nvf%NpYQegoRJICv%o;qhzl1}_0Gue4qXIDM66;j+`f4)?+NjvL
z0E+;;2jByMEh5rF$Z|1Q=~(Ym4{ob<5iJ#`Ju1Suu^|&j(9s}=;Xtw8K!QVstPqIW
z+1pXD1BekJ8t03^teQA6PuouNQ7dw<X^%WQdBxkSwu*%-0vMQ6HD+)-?7kG|G8g=k
zYQA(^HC;x@4V9V%?F8CI<SkO3wbpsswerd-%N8u%65vc5T3u$0*~>UMgdzun94SB;
zK$w8(>`Ra`JM>EshkdETV7bf$%uAC#n7?vM=92H%ZWT7LM%1D!%|r`aOkzg^20L?$
zB@9*~NP{-<J~Dzwt-)U%;XK4;Wt?X9yG!S_ZK+2<Js&#`A6Mdv?HhM6*bw6^<roT&
zE}^qc)Q{qIZqn%dEF>x-?|`_xtvr11*6e00cmU5FKCX}B+HZ=W)&-AH?WSIa%tJrZ
z>Uprh$E5rRme1433w<N;mnVGm#%H<IRBGDTlF(iN_NSNw0Qr&uwowzNvyG*1Qi$#z
z<#8C)ud$&AwpLz6K?7LHH(|8x>5x~uFncQ)zQE6*ziKA&0*!Z5;KPN_PfU0iy6u<)
zIFYKFgCKI22=^mUv7wE2%1aR!c~OA#L#E%W6PsRa>$b`Ek{cB?fa}Z09Yoqo1lZ3d
z`(<h~)nhJ6Un`3|55c`5h8|o}`svbh-hMmM6Kiz+$dRFK*7Pg$5dS79CkAQuQ*|2`
zQLBBO^-@h77g<H%MF;rR$t??B=!rS^<UI=(z#60gyr~4wAyATxa;+n4b!SDyt`^|m
z6uHMz9<OU@{GcZnBz5oG%13V>f_o%rCj#6zMAOH2-=!TXN3#W5NnGc_nO@gC_s!lg
z|L&SYK>}FqUb^0oDLBc%j8X8WZ`#sB#DM(M!dy>}Pu4D-=lgJb%Q0tYb>B$9IRcb(
zDL6D4Kv~BO(oLNnma+iAU9A$jc5AYS3l6|@s;WvNcHkZY{N5$^%M1x8%mzdCy9(q1
zTFmyWd91gAH}w)Jh@%d_CWez7@*C=(&NL@{?+K|vk>}`n7c2{WHuuL(O<RRMTyOxs
zv#fed+?X>6OfI1r)RyttRl6}J5`kboC|7%}fxl1v<h4(Fi`MOI9@9qbJ}?lC9WCIG
z0o1r;DAS%Vp+T$I6%?tb;7^m6G&J_+XUf*x3J$=ts%j>S#nl9c`iVUml1c)29tC&A
zByi`cOI}@`En((zoSDPN4KoI(2<)i=!?Cdp-bQjE^>LR8<VRCl8t%&Fe0s~+1p{Dp
zLB%R}A8Qdmor3QxTP)M=^$B6bCnBhq&q{w)_t}3w?kx+^m3iD*F@A`L_Fo7&nSz1q
z+Vb$Z8VS<~H;{7sJIxLAw>0R|m3j5#IRyh?WtcTresrz~COhQrs-V&V97wpFM8LZ(
za7SIs{3m--@SA(@`ih#bbnr1w1@J9>rgTlL8#;|~c!K{@SpW9odDj;Kyt$I@=Idq;
z7(2-J!E`{ro}@3Xok1!@>;cOuaz=3R=!Ylb-fj(2WJ?@=u%mp;H%R``fI~JAa@PO+
z5F_p1E_A|AL1<ugn}M<yj9ee48JFoV_3d6OOF;hJ1FoFfGXM2#0jej)nN>EXT8z06
zkRx5PEOSGb@NavsLgd_5mb_BPZnc5{aQ)CRBjIu)C})M~RJ3P!9>O$e7yE)Gu82os
z&zzQHZbPm?efyAI`#HhTVGit1!!-MD;CY)Y>`kuc%$c-w{=2!JQ%{Xw5CEQ8HujJX
zjQ#|W13C*C>*gj7JG~9zvkFBU`ClDlZ+6Kkx^YWC5+P>0O33F#>=kt_jnDNIz;b=x
z!T@l^m~Roh8CZ8`o}?aH5iSJmZMBOVuFbVTyL0^d^07Y#<TMbY3}{lD)-><L$E5k*
z<mP$zb?3ag^IrK5U_OOI9rZpq;O|v%>Goif>=GBqEFosrH8(ufox;uay=GR9`!cMp
zBQeP(oy=!XP)F^L-fbRw<7EY!N0-+C_IKnJ<3@t^Oczuan(qfq9ZF1(h>Z~Td?#e?
zJ>|VE%cRIPAUAdVX(Ou3+_*Uj7FPvnf=Yx>9h$kJhi7q(HRhK0n&-Y<h%U9f2C$ZY
z>QfmxQUs?u;PIKH9R+X<@+pi=ocv*7CPL1r8hezna!-Klm+lizC7^n=_XC{vPV<n*
z3Q-H^HGnl$DDtT}4T4Dq)J%r8wV0IjBA_S4LMx`Wu4V44o2udR;r!X#jU6v>nJG{^
z7$&8I6D&2+FVb_Qnbq1HyyJ`lth<)i0G>8tMA$_8{)E6u4lpX6^Q)gwPvm2gPjw^-
zUoxd-UO^TGnOR;l+8A6ef<qi~n^dxDYGDOv1bKI8fOqA@#=@(9nb!cGQ?*}7#QW?I
zLVnXgl)SUn0@g5VRO})H-cRvvn6!A|`}v?zH+7CPhmYHVM$QK1n*nnBlo^o*;AI^Q
zw)^72)#puJw5WYk$M5au=QV&e=dA>h=>(2rqU`Bf0IU5Qg-`OH7K(azPF&u&q_;1|
z=FG2t$mnte+>=2$El5+H+Q_8=xSimGvEXN?76H6D63*c@iOdT-$ACvGaXtM=rVG7n
zi0k8sKU&xPdR{Tlx+=B@Do1V8X5FJLac+oad}bKkC%Qu(3G<VQ6AO^!p4S@K2e9Kk
z9HjYjGy}jIK8}cev7-gR)qUN-KaOA2yGiR^1#ISdv$q>N$Xfelc(@>JoP9FG%0b_h
zk|#Q{mM0Wq)^c70_@<%NeftN@-%Dr?$jrP*@E^Q?(U>dH+V*^*va<Y|5~U>v8Y@2w
z(HxKoV9nHM6Z>o{LPr%!7(M+Z&T9bs`C_j5M<2)8d$nDc9q9uY_8BX@yd>uRd*bp&
z?Nw25hZ1{&!N9%%FAb9iWdgXbaj?dEFRnr8h$4V{+4B1U4w`@T;RXOK_Bj$)qOJYe
zLe;=?b{sz-8i^bv0%fM{p9$bT2>`#)iqKbz0PbY~PTIhK3)5Lo^CUNM{}%EZ$H9|@
zS_DsRV9&!5uyTHhF?)ALt&G5XYK?@yUIcJ&1h9G`1V?9fLs0-n#l9loO%5V|Ii=;z
zk9yhkvof7K%JvxQnAouf{6UD^V?8fKqD9gpVN>)%WJTcF97O%VrHI@PV1icPS<eqF
zb|Jx;juV}E@`rD<Wb@v=Wvn?>yH!R!uMR|QkY?9T{J?DjdC&{4Ij!gi?k%g9oJX>V
ziP9)fApC}d8Id^o(0~tHk5|_&ou|dA3+|XctY#<I#g7FzE<jdgM&hhMQ>pG9QrdRG
z(LGe}Etf*iYcGUyA>3%+ivTSlh0*J9ArdL(pAdM?6<qkO#S0eZQjk40_RQhqYUtW4
zA=uvm2d3zxYZq47V1c{CgS@MXT!@}pr48KIXQQoRErgSe@DM#MJuAW2$i%y1a8m7u
z3tsMJ)6dFuW>$^cht}RhVEgnhP+HBjr#l)o)~{&^)fd@lSrK{m21(R{SaygAPjhHa
zP8NM$dxIpQeGOqwnbI=v;q2YH_lz{Fs^)mHm>r}kS%=V`Ec)j`W*f@wf#&LG^R<+~
z7fCy>O$fg=Y(;gI0l)9kT(o{hh95?a0{ppaoqJAR@|rekDVW1&qPbRI+{*%FU>!nx
zs){@1H!;B<KWJIdT+GPmrAt4fV(brG;s$*iQ+!yRs^-LbB5^Bt*ceQk+`QnCUit`|
zHLd!JamPXIw?Q7~66@u}SxvE`oLSqv;E$VigFLt>uQhN=zWN!p7S|E1Fc9bStOURN
zp#HN-L~gBJ+;DjwtVx%rIICjp&jI<409B^rGqdh<Q+vxb0p^@SHJ?;ag#qBoar=tc
za{*|jnnCMVsv#mGbHp=e*Djr>1n;~*ZXH%LJnYC#A>*9TX(b|&6@)xyja*yT)cBvg
zf8Y%~K%oG*N??zL;3p+C+hsD-Ql*wODi=2L;KZhe75TiNGb%@I1M3`bsL?mGTPA=L
zwSv7x6!Tl_m`CcG<~HZ^^A_wTF7;rVo!q~ottKYsPhn&B%3RQ7ew-Gue%{btGO4-o
zwR~RC`tosm3hb{*?C+8TJFSgoy_aBcMr(7pu@K#7sr4%e4Xh7yOGQO#AKB(sA&w_x
zov^b0K9M6QtptC-_O|=;m7O+c(D(t7aQlg%xjsOYq<bFH(ui6icpx5HeR?5=kJFV;
z!2tL&9O~{|xoonvrp`4yRCnO%^?{ScpM`>FK;AmJW&WLcq=na3i>falI|)X#i1)z;
z^m~1z4t+-Tp2b9-qLt~PB@MH?yVqTJ%d~(146}XNsO?<3r-S%Odabb3ZZ)~o+8^US
z0si;h#S7lZ7vHG*yhoMS>>494705R=i8ZYTnva`gEjW)NR}l8Lw-zt_FkhZ;bAewl
z08R;DM#b0(2J$-qI~dT-?1}7G>k)5}fcF}Yf6SNCqjzsxvs2W=nFRhPNV9!<)NL(z
zDKQaw&v-m<^3uZcd2a~d1qa}1WxJ1XP5eX<KPshD-kOnWl+;oxj}J)sgCo5E<dy{=
zCIytK)HYW!WaGNEbD2?5y`7=+KNR_)0NbWL!`l0l8V9Y`wvciSt#@Cc*1^aWY{3C|
z4o-BUWsSRv!{0&hRRg%`EVYdGvM-3iJu$}aJFS=Ug=bXlR_RFm#EufNC%NRlx?t&j
z;`HD8W7YHp{_cVox-FyLDn#BxXIi1)0IUz`lYA<cp8;?Z0BxGRwq{zo5H#gH0-0xk
zo5l4Wn)3d_#o17u*&1U;)h?Be4SYk$?*+k{%+diV)4^}q2s{VjtkB~5w-x%vtsuP+
znV`{@R53)R8sK6A12Wrg>G`Sp!2sT&@Ln3{{z=WR^$H)c@9Q;I&4v>?vPyPzNH^2p
ztENN}ydOjGYZKtiLe2f#YHZ;22d%Fhvm1mz0C1d34%<+-dIfh>>>Ch1DuRciuATp#
z9*Wk@sTwml66ZKL_y&YW1<73$q#Nv3ugz<~haB;4IAuv=L$<VkzKm0lCPYg30`Q(;
zH9N*!xd!0Z00cL*OG`%UwAuG-Ag;HF|Kq*p*H?Cz8%o_|yHxBlIF7&(nxHAb?he@}
zon4oDuC!-}0(cZLx!|4U4exf>TzeC^3mU*GXbm&>-8Q<PcsSJnT8`hRTxPbQP5T_L
z5#U1#UWSn;;Mym0Z5!Xd?XDFe8~Td1_A4azN_ZMj+L_s-3#KnylKVUjVy3k&4*a{2
z!^L0p!W2A!_2E?$&nh2xBw)`5d4Nj{=nTXv3<a{1e_F+B1^6OppMhYmg?v~N!{U|8
zOFrIGu-r0!e4zCG)*)_?Wl>-|!r2YPAr$OaN>id-j?NkwrobB)@p&BtuAkgen3d<d
zs^zx|0IM+OpgOo_Xt3IGz5fN}D+B@?6H>xO<!_We1ms^GMWmmiV_phk<=c%-O_9{~
zzxX^Edc7fknL$~tuBr;PVc^d6WFHcT0X)cnRmsiR#-^md*ZV$h<G7?`nSFgC3a@B&
zSA>vmPHoEhd3~;5(Y>|b9*%>FLa9^ku!1zR^SeG|3cQ91zbhag1N@l43JZKp$Rgj=
zuvh|zAIGg-<-oMXlU4p*SVPzn7}MW+GQ=?$PGDOL?f_sL0D}Mw0WjDlsoaeXfmn%1
zYVvp@D@0_vSeY}VU-Y#?Oq1VKfNeDzI9)K)%g2s)j7)*Z!2m}E$Pz#OW<AR|aaHQm
z?fPUHKTQcSu`5K-49YSAR}ff5NV`oYMi_{(pt9on5i%IUVIZnPG=tQJ)q2Kp?P1Z0
zJ)WAYl5_M0iixy#H1~d8$Y({onRP9V1=;UoQ^A{Bo6Wf{@2|P0s;XqD^sfc{Z03Ur
zFmq$qm51!A2H4!OlZyEnf!yhZ*3=g|J+dn@Pd}%t^54{P^WywF%0>=#QBqCH0VGZY
zu)A*HHl`UrH!%`_^M$ByK*m%1p!E@$_)B_7yE6f$YkJ+t3FK7~-fO|<gN!s5YJImY
z0ZZNjSoyyrD_4|R#w#K0BO+02ZBrk2_0ml(rLSZe2WA3<2aAzWBG}#m`uU%Fg`Rxg
zzH3W_-PyI;4ouAw{Zq{e3#@|ReG;z&@=O$b_|(tIMw@kezW~f9?hb}tMNFK2M!X0O
zmV}58^F6&PZvlMwu$rBs4vsOzF+z?2WCbk#Vrl=jxi;cm6*b$&fUg2Lk&wLr4(`Up
zSJl-kK>UZo`#|&f<mP!zn}yhni)L4i-r0KQdnAwUXt}#1fRADE4+}gnv`_n^`Mep-
zO90QPsGeY8CWzXu^mq4RNwBd#HNYGjFxPJT{@@P}+r<9B>My=)Sj{jmAZ22?lcCfA
z*i)loF3k4IC00W~Yr&^H2EKnHX&xjkhP4~NbZ>?RP*R=^Cuw*nr`Hp^NXXaJTrk4<
zV&vWS7?*r!*@9)toZC_W&ng>J4RQh~-xY8~lK-K@u7vPSQ2qrmcTHJ5@4s7mub#L*
zuK;|@pdAPFDJk7YDBp$f@G#9lwO4gVua>A*BVT3XuUX)?uFJ=_l-M$J`(1Z1(ZKFP
z>;_<0_`T>j5Rm==OSPn{_?`v{X$FXT3{o}8)T5!`w$KK~j1bahfi^<c0Q?M)PsDOL
zjhYJHTnX5@weP=?^$MCZE5>|_FyC>2!__3xmqr&|Uq+o{Tx2o9`$+Skw5@q1-*N@>
z3c&T{V@?3f1t7*bKuM<COZ}yB$h#2S@4?<!*V6bwwzPs$G@GiHkFdf~6scC9E`(J8
z%LOt7WPd=y1WJ>dSR;Au5LpHABSKn0X$JTK=rwxAdA;t#(Tj+C*KO{RtqCW`sV}QJ
zU$c_|?3kHmmHI*?_n9wrynL5Qd+C2BuXt%ymZy=k;qn5&+L5!}TctMK2>`|$Agmwc
z%ygk-TY>jT-0cW%PRq2&iU8*T&YBUs_X|hk{o*jChVc@C8@8T=jH7f%>$sL`As}wV
zb7?&5N!&P$#1L<H#cgw8Tib)HKkKt-(P!Pk+nrf4<}8BW1@xu&OU|w%i_gQ;XoJWC
z2&N(K{dvkqy^9;Yp#|*q0G>9qy3BQ*!$JI*kUh0=pPCHm%aE`w6C{_I_|2`aqa**=
zQWGL8sPExHW>$?o#8^8?z{wi0@iMZtQ`1x1SOYa}VqYZeouvEcY;7WQDT3Y%VBUi9
zZb?O?7T_g>X#FoYvlmACXHWnwXnor-&;0VprSp^;xz!&6n7b-QAMU|i1+dxx!Omou
z5>&D=;(HKYNyESPb`bYk0ITn^eT6xj#7Q9b(&BZU1p?IW)l}S$j`a&Y!JmvHf1T3Q
z@b*@Z+%y5q*>T4KZLKAH8i(rZUQ3eij02MNQmClk6v6+&w%uL3^qpQ?Pp(%2__nGs
zgM%Iq?ZD>62G~;#giNA~I{uS(a65rl0sC-U$V@x^y#-5);O$%jewq@!2?W31LC~uX
zkl{=atLx5?R88Dwz2_j9VFKp<-fE8ZN&wHU9D8Dii}X^V>|(%B=4MToM>ixE5*Nse
zfSESAWxjT;-(tUMp@U!h%1K<lDv+~Wn1j>}xuGNZb(?G9onI1Tuk3c(TL7%{@Fh9B
zV(bJ9siWXn-B)yGHYB|bt10{!iCdyU=b5Pm+RQr_FO=rpwObruXin%Tgi@zI;mkrQ
zdfx<qZM%>!8rt7YZfg8nF6Of(WA+vR`&kq9<u#*7xm5Gll&hObHB6Wdev14W2%a%C
z_0iy}KNlHVn+^fZ3hA???O+j}-$9VyKS0yJGn?2C%ur=+|70LHPik(Qo7T;2({G&R
zD|!upXO`EDCgo&+rw3`uI@1XL1_Ki7NWFQCf@zZ$FL)r!^4O||Q%dO&Z{Qe1xx}HF
zkeRie^6(^uvJ~LMv7mEdZ~EHx3IN|(vC9yTZmkH<CAh7VQFT!TnEcGG5y(p<uL(u%
zGlklLzB}Kd>qm|Z4QdS?NpLcO6J5V{oO;?nXNM|CR1<rUg$B6V2E0deo#@(C8T2@S
zZy&O2zfj2irhrq!G>62jQVRVXo)pd2e-?pO5|w|6;fz5NoO5i;E1IQHJhC8xIYX=a
zMqTq2Aua(i)&&EZ+BjKXIYP?w1pm-m8s_vUfHmd4q&%`)2TA58m)yHEQb02N=>eQ4
zB7dq~T(})~vVg_S9>Q;1AZ7w#&J1(?D)%~Yg1hYRL9V6^+z?p&YEyTF!@uaEdKAF3
z%Eo-jIy{@=_xT;riBHm3!<szliTtWWf)7nx^6K)<UZq}mq4GSUSUnPPyC;qGvtk^x
zh3-I0T1zeo8T+dFaP*?C7W(r|IRwrTu#UiXncN8la57x~27tR)mbPDUP7n8A?lAys
zsr+b3^bDc=6oP>&oXiks(hvCofrljOU6C&YldilcsY*N^LI;BOU<!AKpg$<i+AO55
z4Akj4+F}b!1$>3VCmCs-yAhh?S~up5vfcKkv9*NMI$*!f$UkZi$Ho394tr+b#S7>5
zq!#WG0Bd@CAlBz3E39+D!!*jaA&!HEOpnmHbU^dG#XTvg&BoFOE>vx&Wu!W|!RH0Z
zy)+!2&3mj3y%YBnnErP2kiTEnMS}mdvN2zB4YfJqxX$<|$qn^V3T}hQos*X|G-h+|
zn=)390NAfKu8j#r4mU92%rNoij&<H8VrSGYZg^}{9x5Nsol#Z2H$8I|iG4#fA>A}(
z6TvBReN^mffcN(eIzK$Vi@~00BX%EXqS0?^jkZ$b?9pb|jfJk=mk1VhyePk%w0J>%
zPszO70qhrSw($u9{-V@4!`82$zSfj@%Nkt7n0dUm0GVYoE2~eWHFpJ#aXRyPXA2O0
zjf2(Jn@1}rPg>Hju&d#A-PAea{#=050hFw@F_IHg5W580t^AQR*S^y-@2#FFF4*k=
zo>g9Ryd^Fpu&V=xI?JkvS$T()`$6Z1-cIM+9H6P|Fz5y*!{EjMX*!F5ZO*uzU87A8
z+r%yeaX~!bKEEkJi28~##|dyM!J}L<nC@Cj^9|2~;GTgDUE33`&29s*W;4WwkKNuH
zdlskx3;3A}sn6y*Z#Xdv61zOq^2XbRWcQ{3rk`jx>P-gZ`T)sX0ys>AcJbb{bS?&>
zPt`TQ{&81dj%fpTALx|CkJY{#F3pfm>MQ#>e+K-g^~`r`m(I(2PT$7n+HC;Vu;nm2
zV5*3z4I1vF!brEQk~~yP;$?x{G^M#==Ef$UufI<N@O8P?z$pL=%_Xixp4!ynDD^|f
zj6{If0&<W;(?7Fbafvb7T&CH87Y42SM0dM6yA8m14yzd+cQJ#&5vqMNH!Qkwi-=uA
z;sQiMf1dKuE4`{;MK)iS?gnt1cyAgy7aM7RdQ$=H&ovhRDg@_*Xb$MCv3OkMGlEZ%
z_S#9!4NqlLRvR0uTL7#sBa7hSLi{EOvt#C_CAq8ptfSlfi-zt+y`@jZ#)P-Izt1NC
z>oaPCK}c{pM6;Wz4vzIrKSFC3|7=S0f}1y2E}L^*w*a`leB42x{XT$W0%X5Tn=k1$
zd)WwY4YaShXX46tKi!;%$(L*L4ZtebnU&SwHewR34?rig#jR_Ii1luU!8M_#hWEN_
z@6tU0uB<tef~y4Ro9T{G;i&x^6Wr>xIu}m;<TZVh3;M`M0MD-4eP`?W4J0oP(v+ru
zMN=LLjm`m_-Nw*uXLJ+UDyIO}0(?7Ftk?;#=LX0#GgG?PI^&cfkpKV_5=lfsRK$t@
zLU{9(mif~P8o9}b%SQm~)a%P?4u!!T2HYVt_>@#kZ2<mmT%OilIdnM%@KYm3gqtIM
zzb(WRm)u`jrs*N$B-ddzfZvN?PVM3a3yT2Gt_0Kzu_c?h^x4d+99Lz<{+@|4RYN-S
zNVHq~x(DZ!x|X@xZ!ep{#ZCp2Qvg3WV)ucoWAWP{_!@yenSS3y&tEL^;y9&l+58u?
zyL7#Gw0zaTb9Nj*AQFij36ZlybPmk)NF;I<rA0)p^u&F5>XO$M<$4uz24Lm-_Nk1G
z7s#yvuqLK8?$VBg-xn=_{4ECja!YIA=2}qM96w(H?B^}+w9`<wm0lGj>oUDbNnieF
z9gS=L0VCH<X<G1fHs#jYSUCgm?D9Rf_Yj+4h@XXMhPS5ySa0h4eXV_#z_pQB?8(zU
zdPCi4Tg8#D08TB=%<`I_k~mKr)o4M^l%0^E#L^?M)DjohHqW1)>jljjfbT3Ddx$l1
zmH<b(WdF=Kx&pXe>>XaKd*0UIc}QQ#ya#Z_m}3E)#zgkG&!kHoY8EC)@AjAR;OgH_
zU9?Esg5}H>&KZDbme))n@tcljndJs>QU*loEd``mi0f;c7hIj|x3ss7pYH&kRyJyc
z19O5g=GVbwW5#p<t0@tMon>inXdhnk>KU)R63f*Z<OIN%9eSv{(_71b>WKMOCRsgc
zCq)Q6EFyPIS={jVTs>TG9XH<rta6=EG5QE2PJO_zEIlyg`-Bq}L|?R!*=-0<%cV~^
z>i|wAY7#g*U|5^!`%OmOR*T5bJ@Fo#y5#ko?^JsmkP898^%diG1?(MwUwCnC#Y+X0
z{#am{0FQ**LO-6k@|B!LR<jS_it(j=Z2O5qe%m!XG}HH+N=FgODYeZF|Lkqx>W=vo
z1c0|6U5>c9NCXoCG$YpI3MU#uz7P-E6Q(X|T#_rfW*xu}4cWEds$lS9LNq01=k%u4
ziD-=`9LlT4xTj2NdhM-TJy>rZw-5lVKH>KE_M-^?Kv`<)QcK^dl^RDIroRJgCQeyA
zPdkg|WFwb#0BiL_cyg;v1~1ZQowR?O0jTfyS6h?sw~)LL`Yc*ot>5D4P9E*$C2&qq
zH);A>CwR!VNvyq;ad|9P8Rc0Aur>`eFb@Q1#%BgElGP4h6~RoGv00nSP3_HEbyMb6
z2pU+Q_bI?_uBf@j0ng4X)2gOoOzcMjOb2Dwl;#F43YhgHs{o#Z6P@VrH@;*Y@2)<^
z9g&`}sW(cNMSTpkzq4`o--Vd0*_9P46aee9)>n+ZNFWz>1f&M02Q`vk+tmb~CV1VX
zmibS1MK+syPF4ZzH)IL&t0MeO2~A~Y^sPkgBF~!@kJ}60U*5Q^C$d;KRY18ozn}nI
zUOfrq_W<tWfPoZGI9UuZM&RuZx5Q;rnitH;g)FlQ;2D*pcA+&VkmiRWnqiq_kAN0Z
zhFn|QJpV_zc$j<{b8`WlzF1w|5oME&)|q@~R*v~H1+@T9a%sXTZ$xUYmQbJnk8+i%
zkyQXsFCRPJrPNwra*!OHa&RZPqRItn2XV!e=J~(Q7qI1Go?8mwu7X$Ro^t^Eb)7L0
zzy(2?KIsIXMC}M70`KQjnj3Pm=2-=BeO1k&v^Y}$jghbAKO|_A;(=HMvDZ#%X}mEP
zz{r;|Hx<BZ6@X$vG<k&%A$~{DjUBlLu%9m%$Jb$aLx`q-`d3%iJ&|o=uXljoJ1q-Z
zvYl#_T>w{%I}WfHc2x4-GrbjTGV>w|$bSgjJh`Re&W#Dakbl1^08VXw)g?uuUW6?o
z7;7k}xumnPl2o|{u&$FfQ>4g)VVFVb`<?``2U=CXp0qcv&H*nX%K#puEdqWCVuTR}
zQl7!&j<g+=zY6UgwM`2jEo6Xh?Af{sU?n~!n%r<1AP>XHm90(T_e;xT`-0vt0DP&l
zS`F#<?+yS@-)^@tChq+$NN$_Xi%6AYjfy-%$gT0<n#Z%<&m_wL9y_(8;q`9;3^9O7
zG0>8!L#^unwUk-kZfSUaV~bqKzwZiwQ=}LVhyn6D3ui`2^DggbtzWGv+-6%x8N@F$
z;BhMFq?xgv*tWE=Nmte(v3YmuN$#0m%~I#2)XKQXbB4CQzm&|%cKNC70=Tk9?cYC8
z5K0$l62NN&yh-5QUDwj6p~bECxMj!j1NyW_CwFwYzp=9xS8L4%*u^5O55U}ga?9Lx
zWTvF4zUA>RTX?5{m=xH6IgzN1=Di7+iz3E8`<<qS71<X2U1g(2#Etuhj@ZT_4mc>~
zO7mYr-T#Qpr;$1Bk@$7lPF%<;fM=GE`JrpfAC%vm9#~8<&@_3IR_^V|da~JGyv-TU
zXY5r*CsE|q0O@9acGYaK;PQ^<<`2h>cjeTkh1xo|Q|E(b3e(6XqUHol|IA{E>U(eZ
zy!nRC_gz!^%EYD@HFG$thbDUh_7V{s<C0bBt~C11VeBFb9&BxI`{fx~uKAHw0MDwd
zIWGkBdtH!pK_&tG8IAo-5WH_<v6nGsRaPG^Vzks&rJ_mEnQ1ma%*;^Bu5W))ivTqz
zBHo(OY7;x)aax)^{p;t;-rA=_5}25)x@B{QR+qI0oO1~|!6kRj1h9o@``<_6LHGPk
zsgBu|w=AmwuCJ&$KTPwx4FT9teqlWC!IQT_4shmT%q}0jy>*<au$bD%INRx>tG(DN
z-eL;tJ(#=eGR%ezEvRbr((>5hH1-q-P7cwys`>P2v+<Y2aC&%vy<=iyW3(%v*wl08
zl<hGzYNAsGR8wYLCc#~R&nWU31LnKgt{2gr0A3{qmx{H2u4`%hU{i%uXy?zVt`0^%
zad!aZ2Y?(YKq&!LpqkP9o5@WL?{u{oby9=#&dM=|3UDceBLO-V@{s{<3mWHv6PxC?
zY|40>B5!S78xeCNAg2XkzLZ(Dr(;h3b6Lhu*_86GU714>z+I72j?U4V$?=L^21RVJ
z#u(YhHPR$-<^`KZHFmYLQ2NxgaCSKCj26qi6u?4xwzaiwQMT>QOmX;LmAH2dtehF7
zIY3#6>2;s=YhWSIIfx#gZ3bdi0X#El183I$P1(SJ{4WgdpHj4e*TKLo6&0l+XK=ZR
zn$N=9#6Q`RPyM4KM}|Ia4G(i*+1S$9)E$JWS%XLRM<{%_0Oy2^IW&{p?rK*f$iE##
zkL}d}t}m}S*U&G9yiN(JBsX+5gxAI_=1g5We}0aXT5;GOkbrjjj5y{H82%_k9-ax{
zpk^ssc{wJ5qfgCppTF#C;PRU9fxKGd^qGF(s7R~YW7gO^YnvKh>H#?yZ<!+r_y7*M
z2a2`lg=voHEWN1B+6L?K%e71AEz9OKvJK!V9sG^U)iq=in+SidsZcV3zih3k^x0gr
z-Zs`vL#z7^ba{X!&kNCfWjz4XL7TM;tmWao8o;wFswY^Op8&GE0~1d9f_*X%B}TzK
zOM7E&b7Rg+4)wN0F68+n8ny=x5s@E-=zKX7z=?3Syc)9Zk=gb|XH^5wE+2carJM=i
z=yW>e=X_v91iYfQW&W=Uc|o_fXHzdkFybAfYoF<bNPU4l!HWjL<4$RL<)duMC#wLS
z`8m1ytPsu6%#4hrH)5I-$4}o}wqSX8?2xl5tm0UmOF#n|5hr%Kh@29n8PiE1BMR_|
zkg>HBv&_ZFDu8`*vxmb#UK6I-uCt1i?P8y!#SPJT>~Gm7b`$~DGZN5Dbb!Alc!UcM
zO(*jxz^ot<N)Gk%P_l|osdWbK{b87zbO7t`lEn6vB6uo5{P5(K1t0c|$cuN)rUa&M
zS3SnW`G5oNlHe~Vjuaa$F1CTfd!zB#HQ82LS=GQgX+NxJ&5eK@Wq^U150s3`d;sCk
z`nEZLJ$@@_>XJ>c^tQ3Ir!rxVg_u8tXa=T-kyC{Bn8*|KaC<QD$-@(ynzG7<%Q}E>
z(b{Mdog|c6mppI-eKE8S#zUaY47D`;HQRYoy={>Tc|J4B#vWyid>g=o&T9oj*>Ja7
zk?Xc!GVG1R@N_(z^2j=XHNGFM99Isp7X-+2;u+lFv;c=zUcJ+LxT<8?f`%f9v$?F@
zGuE^bBf@U9uVx#cO(3XNLpo_Wl@etk7uB{jT$PJiWgWn&NzSSqQzwF-b+lF3DYG%2
zo|ELME+Oy)jF}N+pBHjLw$6pniemzIl<hGzU}ALurUc1x(X=Y<{(dJ>oiYlMxuE^c
zl$M2m&V}4^2jJmj$BH9U0MrG@VV!kk*HTkaE1spypv41@iN55vyt%TdjdQWo*%|XG
z9O^C^vUr#c1P&J?mx^%bMAiLuk5n05P;QEgxp!*I{MWNHgLOyA8G!XRca)8(4jA5U
zz<o0t<E3_~$xn{*MdwraNX&`PoZ7T-t1P>kiv`a1n0Ht1woBaFGlljffI|tmo#i?u
z3pu{#7}lNAv|wJg=aCvOrvO%J-$!jFCsX9KFwKFPnHnh&Cp*=vasN)oX5dvJUUn@1
zpG4YTo4n%fRk?cj;<#OtfEI0Rt9Wx9VfQDnA0Y=i;P$E7&uMNmAxLGPwOg-I+s^in
z#cr68!wytA1+a?eFBRiUS4reMmbfs{@P%gGO0o$d>SsuMD+EBaX<b?1aX_9Ru`niF
z;V|CHc(6UZbY6SW#ONCEHuo&Q$KT*jOKhMt9CSG_F5U<${2D1=3($;K&}8<AORZtj
zZQ2fz|FbdgmfDYAf1B%D7@Iq_^{&e~fc1`dRn%<j3BM+kpNDCxG{n52`d$eyg<r)z
zDq7S9XaX?L0baJi+;*CUr#H{j|5iM5Ac4!OtApEq;_eV&e4G)pk7hdyFp6Nmj)a7O
zPcGa*inQ)&+QqgK@(>LFl-G?8Gi9scMi*wH5GOj|-unAYA93oMlmlENclxGlZWq92
z0hWN!Dm5R$@?#2Cz{n>cSBb~f5U-s^V%Brwp@7rw-@`*d|3ePey4Mcr7>SE<JQ&Zj
zR-z^<F>Ul~V+@!WgE0re0G+U9ywnK$3Neu6AV7wQa43LbB!+ivW441xMTkyV6;5WR
z&FAYy_-2FHPavB6=KV1qwJ&8m>eiXSyF~-1ZtO>G#Q7G;?;3D>5gDL`FFM=cr5ovb
zj?wDL`X>?@f)TOpOlW6~vo8m@l2%rW&)h?lK&zfCA|Z$t!%L>=_FC9wabiRaf~b&j
z18EbXHXDScga|1COjscO2pM1mgG9k9tboC`L6~4N<nPz^*pQM*?O&3SRsH8ms@W&F
zXY%3&4`%UczHq2+1+dOUo4~9IvBnek909%>rWvenc4k42%vonnQ~=Q|UO!Iq`A;fx
zof*OIE_wE*`=qS2^`rTTmsx`j#w7mK7u^5wB`FO4b8M`Pt11-Lyb-ZW#quUN_TkCR
z4fAtp^KJ|m-Le2Lj~^d+eR2EV0&}214m8020djDnii@ZNe51niSHS;YM>)X^^_l>C
zI^;LD6y5UJ-FTDFpS_b8KMBr+Onh{!Ht_$xak;B@Ru`GBQ%uyf!%Gx-(t?kL7mt2(
zbF!(oL@?d1fzv0eO#Wafa4>*xL9izPwZHmmU1sCMG9l2d4Srj)pxM4Q1rSvgNr0<4
zqWg;$5dV+l-Gjqz|2+Ebw|z6EyN@0Pu$F9}K4L@&7#KD&Z!`pl7}z6(93O@m=-URq
zHeNT&xx0n5wcam9hg4M(fNn1QZ{u8$k6Or+o)=uO!;%3j55v>CE$I<G)1v@R2Zn|y
zTdF?U!FsWsNbU?^XCZc^$OwQ{E;&GZY$O1^?k6wx2~271trc+T&;3Pi%G7z8CRpm<
zY7DCd)@H48v9zMk2L#_1%3B@fqu#QP*H~&-y_;=n<mRkfuK{r8<nP*ckBYb#)e19v
zbkK~e1)`uHL{NQ^fn*3%!<eqm9q~6IRKJ7DUzJ9>O4yn#k<_+e?H=Lt-P~Fm*O!NG
zwvuI^RD&v5<Ak;_Kopb+gxbe?A%yc`<1bEGy09Tv<*7CYyqP<l%^f2r*C{Qtsj4bC
ztTi0)O5A{hV2QQ1%o@9+3$v|2Dn!h10~soU!5{_z>;vCT#1KS+NwY2LZ<HZc61Xnd
zL#<TZ&k9&VphQFTpI3SJH(lzoiI8j;kyuA#mNgws**_NGV}Q#DX#wPY8vCB-Iq!LK
zyRuKelD76Wv3T3kK=cf}qSy4QBkvYeeaT|nf%I&D5vQMV&{yKN6l7SvIuHg(>#Fb9
z=!!x-p@|EvubK<}pa?x-0OEVNf)*xectJ>sL!7AoX{~rh$$*en&{<<WtPUIdsS#O;
z7*<SN-ncp+WR-US&Ih3u=h%G`C<3_qWL>;d4kS<na1Ml89J2c)Py}%I$+~!_97v!D
z;2a3GIAr%ppa|gZlXdY<IgmgRz&Q|VamenIKoP**C+p&!av*^sfO8<!;*i}Zfg*sr
zPu9gd<v;>O0Ovrc#UZ;-0!09KpR9{_%7Fxm0M3C>i$ivw1pYscZNC|OqUW~&0000<
KMNUMnLSTZ(4ORsJ

diff --git a/images/tuyou-selds.png b/images/tuyou-selds.png
index 9158a5835d2bb9e933a3e5e4eaa91904316cbe75..4b4bddc0ccffd3d5d93655dc00ef6119d9a38ef3 100644
GIT binary patch
literal 19434
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
BnCk!l

literal 19171
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

diff --git a/pages/index/index.js b/pages/index/index.js
index e050dde..677da7b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -44,16 +44,16 @@ Page({
     djs:null, // 元旦新增 新品特惠倒计时
     djsTime:null,
     sqjNew:[
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-zjg.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-css.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-tcs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-kss.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wjqs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-wzqs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-xcqs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gsqs.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gyyq.png',
-      'https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-gxqs.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/6b66d72217daf237b872e5d9a2940145.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/dd505af3726fece9f68797dd3b1fadde.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/e9b1bba16e57eb1058559f2e3cb900c3.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/264e088f95b6670fca4fc81f3bc80688.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/5cd8254c6e19b586dad65e8d56683e4c.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/6ebcfcd73f85014dc8642b8daac1e1b0.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/8df6e95a348a64474ff3ed55299924b9.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/c7de980e14c66a39215e7bf5f66ba218.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/24010b7a7a88b91c0ea75cf3f073702e.png',
+      'https://static.ticket.sz-trip.com/uploads/20240228/59e199b98bfb9fbe4fd996503d5f5698.png',
     ]
   },
   onLoad: function (options) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ce22204..c7c159d 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -10,10 +10,10 @@
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
   <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/kefu.png"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240228/689361afd100817d1670335d95e9cb00.png"
     mode="aspectFill"></image>
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/message.png" mode="aspectFill"></image>
+    src="https://static.ticket.sz-trip.com/uploads/20240228/5c5a9073f90f695f56560e51c1d7b26a.png" mode="aspectFill"></image>
   <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
     mode="aspectFill"></image>
@@ -51,14 +51,14 @@
   <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
     class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/hdrl.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/c95f7fcc652cdbd03290530fd842abd7.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">活动日历</view>
   </view>
   <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
     data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/cgyys.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/b09f9cee20a7f4df6aafc4eec739d959.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">场馆预约</view>
   </view>
@@ -68,56 +68,56 @@
   <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyzms.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/b5614719b2a439913c7a1d265624b294.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">非遗专卖</view>
   </view>
   <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
     data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jcycs.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/f35952c7189bf21bd25c5a9e0a65b215.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">剧场演出</view>
   </view>
   <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
     data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/wctc.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/bfe5f12189f1306bebb7be5a37cbea75.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">文创特产</view>
   </view>
   <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jdmp.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/c73151735eb762996e7d05237743e87f.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">景点门票</view>
   </view>
   <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jdzs.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/712b4334114a909946af5f04131109f0.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">酒店住宿</view>
   </view>
   <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yyszs.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/a85e941945a2f380f1e0a4a8ae7a00dd.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">夜游苏州</view>
   </view>
   <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yrys.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/9afe8b7ab4763cfb82c55c34a737e7d2.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">一日游</view>
   </view>
   <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
     class="top-icon-item">
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yxy.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/uploads/20240228/4191bbe5ac87821164818fab546d0908.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">研学游</view>
   </view>
@@ -171,8 +171,8 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <!-- 原 圆角77rpx，现改为20rpx -->
-          <image style="border-radius:20rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        <!-- 原 圆角77rpx，现改为13rpx -->
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -189,11 +189,11 @@
       </view>
       <view class="time-box" style="z-index: 9;">
       倒计时
-        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>:
-        <view class="xsth-time">{{djs.m}}</view>:
+        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}:</view>
+        <view class="xsth-time">{{djs.m}}:</view>
         <view class="xsth-time">{{djs.s}}</view>
       </view>
-      <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/>
+      <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
       <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
         更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
       </view> -->
@@ -202,12 +202,12 @@
     <view class="xpth-product">
       <!-- 左边的2个产品 -->
       <view class="xpth-left">
-        <view wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" style="padding: 4rpx;background: #3F7572;clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%);margin-bottom: 10rpx;">
+        <view wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" style="padding: 4rpx;background: #72674e;clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%);margin-bottom: 10rpx;">
           <view class="xpth-item" >
           <image src="{{item.headimg}}" mode=""/>
           <view class="xpth-item-content">
-            <view class="xpth-item-title textOver">{{item.title}}</view>
-            <view class="xpth-tag">唇齿留香</view>
+            <view class="xpth-item-title textOver2">{{item.title}}</view>
+            <!-- <view class="xpth-tag">唇齿留香</view> -->
             <view class="xpth-item-bottom">
               <view class="xpth-item-price">{{item.price/100}}</view>
               <!-- <view class="xpth-item-buy">立即抢购</view> -->
@@ -225,7 +225,7 @@
 
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyjs-right.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/20d7571beb1388c88d21e92e942775d8.png" mode=""/>
   </view>
   <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
   <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
@@ -234,7 +234,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
         <view>非遗鉴赏</view> -->
         <!-- 元旦修改 第一个pbservice-item新增margin-left -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/fyjs.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/e975683fe59dcd25bbbc6790fc7d0979.png" mode="widthFix"></image>
         <view class="text">非遗鉴赏</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
@@ -247,7 +247,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
         <view>文化场馆查询</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/whcgcx.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/7b891ca4466caeb1a1e57fa9e8f90d33.png" mode="widthFix"></image>
         <view class="text">文化场馆查询</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
@@ -260,7 +260,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/szbwg.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/5969e3a1d76f1110c6308017a60db97c.png" mode="widthFix"></image>
         <view class="text">数字博物馆</view>
       </view>
       <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
@@ -273,7 +273,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yswbh.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/2a438fc454c328b907d5648c3300ba20.png" mode="widthFix"></image>
         <view class="text">云上文博会</view>
       </view>
       <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
@@ -281,7 +281,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/tzydt.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/f674d3d20eb2cc00ace8e9fc5c132c4a.png" mode="widthFix"></image>
         <view class="text">投资导引图</view>
       </view>
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
@@ -294,7 +294,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
         <view>文旅单位</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/wldw.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/85017f4a5732416391618582107429e5.png" mode="widthFix"></image>
         <view class="text">文旅单位</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
@@ -314,7 +314,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
         <view>苏影通</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syts.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/4e60d8de231e1c9a93446a9493e09470.png" mode="widthFix"></image>
         <view class="text">苏影通</view>
       </view>
 
@@ -328,7 +328,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
         <view>云上观展</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syt.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/51a356aa37b192792d04f0fb7c1d6b3b.png" mode="widthFix"></image>
         <view>云上观展</view>
       </view>
       <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
@@ -336,7 +336,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
         <view>精彩回顾</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jchg.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/86f6ca0f39c0b5e6e262f97047bdb871.png" mode="widthFix"></image>
         <view class="text">精彩回顾</view>
       </view>
       <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
@@ -344,7 +344,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
         <view>视觉中心</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sjzx.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
         <view class="text">视觉中心</view>
       </view>
 			<view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
@@ -352,7 +352,7 @@
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
         <view>书香借阅</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sxjy.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
         <view class="text">书香借阅</view>
       </view>
 
@@ -361,7 +361,7 @@
 	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
 	    <view>公共文化资源库</view> -->
       <!-- 元旦修改 -->
-      <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggwhzyk.png" mode="widthFix"></image>
+      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
       <view class="text">公共文化资源库</view>
 	  </view>
     </view>
@@ -374,20 +374,20 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/cxzs-right.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/26e37b2730cade399160dfa6a3d561cf.png" mode=""/>
   </view>
   <view class="pic-list" style="margin-top:20rpx">
     <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/dysz.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/uploads/20240228/54a08fbb38bca354e0b4ba22799ccdb6.png" mode="aspectFill"></image>
       <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
       data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jxms.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/uploads/20240228/920c31f6a34998d7d266caa2c944114e.png" mode="aspectFill"></image>
       <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yydl.png" mode="aspectFill">
+      src="https://static.ticket.sz-trip.com/uploads/20240228/d3513a8d5ab72627d69076942c306989.png" mode="aspectFill">
     </image>
     <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/yjgl.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/uploads/20240228/261182d448deb8502da596b679ea933d.png" mode="aspectFill"></image>
     <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
@@ -418,7 +418,7 @@
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
     <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">更多<text
         class="iconfont icon-you"></text> </navigator>
-    <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/>
+    <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
   </view>
   <view style="overflow-x:auto">
     <!-- 元旦修改 ggfw为新增类名 -->
@@ -432,28 +432,28 @@
             <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240129/e18bc1068b324593da17ed6272540ed9.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/a96691fb6cb3b6e3f239486c5a0826b6.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/jqssd.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/75fe37e3f5a05a422b9a6ae460565ce1.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xljc.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/29113cf86ffcc35ae30f1c36dec1fc53.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sslk.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/0546d19c09812ef7fc07e56971d2a899.png" mode="widthFix"></image>
         <view>实时路况</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
@@ -475,7 +475,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/sqj-right.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/4cbea6a0a55120e8c5a5c744d2ae4594.png" mode=""/>
   </view>
   <!-- <view class="six-box">
     <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
@@ -492,7 +492,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/csjwlpt-right.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/3dc7bc262a60fbce4f47a4459dd36b2c.png" mode=""/>
   </view>
   <view class="other-plats" wx:if="{{otherPlat}}">
     <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}">
@@ -502,7 +502,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/rmtj-right.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/c7dfb2e92637bbbd506c6d44fe2d5e25.png" mode=""/>
   </view>
   <view class="hot-list" wx:if="{{isTest==false}}">
     <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5a3fdbb..92da428 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,9 +1,9 @@
 /**index.wxss**/
 /* 元旦修改 */
 page {
-  background: #8F1D22;
+  background: #f5f2ed;
   padding-bottom: 36.67rpx;
-  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/indexBg.png");
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/indexBg.png"); */
   background-size: 100% 100%;
   /* background: #FFF6E8; */
 }
@@ -43,8 +43,8 @@ page {
   /* border-radius: 32rpx; */
   /* color: #666; */
   height: 70.67rpx;
-  color: #F9F1DB;
-  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/searchBg.png");
+  color: #72674E;
+  background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
   background-size: 100% 100%;
   display: flex;
   align-items: center;
@@ -54,11 +54,12 @@ page {
   font-size: 30rpx;
   margin-left: 20rpx;
   margin-right: 10rpx;
+  color: #72674E;
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
   /* color: #333; */
-  color: #FFF0DB;
+  color: #72674E;
 }
 .top-box .weather-num {
   font-size: 29rpx;
@@ -316,7 +317,7 @@ page {
   font-size: 27rpx;
   /* color: #0B898E; */
   /* 元旦修改 */
-  color: #FFEEDB;
+  color: #54504D;
   z-index: 9;
 }
 .title-more .iconfont {
@@ -342,7 +343,7 @@ page {
   font-size: 25rpx;
   /* color: #333; */
   /* 春节调整颜色改版 */
-  color: #FFEEDB;
+  color: #54504D;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -381,8 +382,7 @@ page {
   width: 337rpx;
 }
 .hot-item {
-  /* background: white; */
-  background: #F9F1DB;
+  background: white;
   box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
   border-radius: 15rpx;
   margin-bottom: 35rpx;
@@ -529,12 +529,12 @@ page {
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #FFEEDB;
+  border: 1px solid #72674E;
   border-radius: 7rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #FFEEDB;
+  color: #72674E;
 }
 .scroll-line {
   /* height: 6rpx;
@@ -545,7 +545,7 @@ page {
   /* 元旦修改 以上为注释部分 下面为新内容*/
   width: 73rpx !important;
   height: 7rpx;
-  background: #FFDA9F;
+  background: #DDCEAC;
   border-radius: 3rpx;
   margin: 33.33rpx auto;
 }
@@ -556,13 +556,13 @@ page {
   background: #0B898E; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
   height: 7rpx;
-  background: #D02E25;
+  background: #72674E;
   border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 37.33rpx;
-  background: #D02E25;
+  background: #72674E;
   height: 7rpx;
   border-radius: 3rpx;
 }
@@ -681,7 +681,7 @@ page {
   margin-right: 79rpx;
   margin-top: 20rpx;
   /* 春节新增样式 */
-  color: #FFEEDB;
+  color: #54504D;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -814,7 +814,7 @@ page {
   font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #FDEBC6;
+  color: #54504D;
   display: flex;
   align-items: center;
   height: 37px;
@@ -823,15 +823,15 @@ page {
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  margin: 0 5rpx;
-  width: 50rpx;
+  /* margin: 0 5rpx; */
+  /* width: 50rpx; */
   height: 33rpx;
-  background: #F9F1DB;
+  /* background: #F9F1DB; */
   border-radius: 5rpx;
   font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #E63100;
+  color: #D62828;
   text-align: center;
   line-height: 33rpx;
 }
@@ -888,7 +888,7 @@ page {
   background-size: 100% 100%;
   border-radius: 20rpx;
   padding: 4rpx;
-  background: #3F7572;
+  background: #72674e;
   clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%);
 }
 .xpth-banner image {
@@ -980,8 +980,8 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 153.33rpx !important;
-  height: 253.33rpx !important;
+  width: 158.67rpx !important;
+  height: 218.67rpx !important;
   margin-bottom: 26.67rpx;
 }
 
@@ -1009,6 +1009,8 @@ page {
   padding-left: 13.33rpx;
   overflow: scroll;
   margin-bottom: 53.33rpx;
+  z-index: 9;
+  position: relative;
 }
 
 .six-box-new image {
@@ -1021,13 +1023,14 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #FFEEDB;
+  color: #54504D;
 }
 
 .rmtj-right {
-  width: 256.67rpx;
-  height: 146.67rpx;
+  width: 313.33rpx;
+  height: 154rpx;
   position: absolute;
-  right: -20rpx;
-  top: -20rpx;
+  right: -22rpx;
+  z-index: 2;
+  /* top: -20rpx; */
 }
\ No newline at end of file
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 919747e..a13c832 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -35,7 +35,8 @@ Component({
     timeIndex: 0,
     isSzMuseum: false,
     kjIdCom: null,
-    gpIdCom: null
+    gpIdCom: null,
+    date_price:0
   },
   lifetimes: {
     attached: function () {
@@ -149,7 +150,8 @@ Component({
       if (date.price == null) return;
       this.setData({
         activeDate: date,
-        moreFlag: true
+        moreFlag: true,
+        date_price:date.price
       })
       this.triggerEvent("onChangeDate", this.data.activeDate)
       this.getTimeStock()
@@ -163,6 +165,7 @@ Component({
         }
       })
       e.detail.short_date = e.detail.date.substr(5, 5);
+      e.detail.date_price = this.data.activeDate.price;
       this.setData({
         activeDate: e.detail,
         showMoreDateFlag: false,
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 18096dd..6990497 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -165,8 +165,9 @@ Page({
       productNum: this.data.productNum + 1
     })
 	this.data.product.num = this.data.productNum
-    this.changePrice()
-    this.showAllPrice()
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
   },
   minus: function () {
     if (this.data.productNum==undefined) {
@@ -193,12 +194,31 @@ Page({
       coupon: null
     })
 	this.data.product.num = this.data.productNum
-    this.changePrice()
-    this.showAllPrice()
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  totalPrice(price) {
+    let allPrice
+    allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      if (allPrice >0) {
+        this.setData({
+          price:allPrice/100,
+          singlePrice:price
+        })
+      }else {
+        this.setData({
+          price:0,
+          singlePrice:price
+        })
+      }
+      console.log('singlePrice',this.data.singlePrice);
   },
   changeDate: function (e) {
-    // console.log('打印',e);
-    this.showAllPrice()
+    console.log('打印',e);
+    // debugger
+    // this.showAllPrice()
+    this.totalPrice(e.detail.price)
     if (e.detail.price != this.data.singlePrice && this.data.coupon) {
       wx.showToast({
         title: '订单价格发生变化，请重新选择优惠券',
@@ -217,7 +237,7 @@ Page({
       date: e.detail,
       singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price
     })
-    this.changePrice()
+    // this.changePrice()
   },
   changeTime: function (e) {
     this.setData({
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index 7cecc02..6f45fad 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -3,7 +3,7 @@
 <view class="top-menus">
   <view class="appreciate-types">
     <view class="appreciate-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">图片鉴赏</view>
-    <view wx:if="{{isTest===false}}" class="appreciate-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">视频鉴赏</view>
+    <!-- <view wx:if="{{isTest===false}}" class="appreciate-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">视频鉴赏</view> -->
   </view>
   <view class="tags">
     <view bindtap="search" data-id="{{item.CatalogId}}" class="tag{{videoTagId==item.CatalogId?' active':''}}" wx:if="{{type==1}}" wx:for="{{videoTags}}">{{item.CatalogName}}</view>
diff --git a/pages/pbService/appreciate/index.wxss b/pages/pbService/appreciate/index.wxss
index 9f1edb1..095da0f 100644
--- a/pages/pbService/appreciate/index.wxss
+++ b/pages/pbService/appreciate/index.wxss
@@ -30,7 +30,7 @@ page {
   color: #fff;
 }
 .appreciate-type:nth-child(1){
-  margin-right: 80rpx;
+  /* margin-right: 80rpx; */
 }
 .tags {
    display: flex;

From 524e0c7ea42376ef25f3c512cb3bfbf0f368e27d Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 1 Mar 2024 15:15:57 +0800
Subject: [PATCH 125/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 4 ++--
 pages/index/index.wxss | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 1502125..072f326 100644
--- a/app.js
+++ b/app.js
@@ -21,11 +21,11 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest99? true : false;
+      data.isTest = data.isTest100? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
-      commonApi._post("adv/get_home_ui", {}).then(res => {
+      commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
         let obj = {}
         res.data.content.forEach(item => {
           obj[item.id] = item.image
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 92da428..06c0e4f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -5,7 +5,8 @@ page {
   padding-bottom: 36.67rpx;
   /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/indexBg.png"); */
   background-size: 100% 100%;
-  /* background: #FFF6E8; */
+  background: url("https://static.ticket.sz-trip.com/uploads/20240227/0c1fbee84d17f1089aabb3ee81ddbfec.png");
+  background-repeat: round;
 }
 .swiper,.swiper image {
   width: 690rpx;

From 9958e8a9ea914de1366f4d5b7d9059079cf7b5cb Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 1 Mar 2024 16:31:53 +0800
Subject: [PATCH 126/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c7c159d..c5ccbf0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -20,7 +20,7 @@
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
     src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
 </view>
-<view class="top-box" style="padding:0;margin-bottom:18rpx">
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
     <view class="iconfont icon-sousuo"></view>
     <view class="textOver">搜索想要的旅游产品或服务</view>
@@ -181,7 +181,7 @@
     </view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;" wx:if="{{isTest==false}}">
+  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;" wx:if="{{!isTest}}">
     <!-- 上方标题部分 -->
     <view class="xsth-title">
       <view class="xsth-left" style="display: flex;">
@@ -376,7 +376,7 @@
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
     <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/26e37b2730cade399160dfa6a3d561cf.png" mode=""/>
   </view>
-  <view class="pic-list" style="margin-top:20rpx">
+  <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
     <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/uploads/20240228/54a08fbb38bca354e0b4ba22799ccdb6.png" mode="aspectFill"></image>
@@ -484,7 +484,7 @@
     </image>
   </view> -->
   <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
-  <view class="six-box-new">
+  <view class="six-box-new" wx:if="{{!isTest}}">
     <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
       data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
       src="{{sqjNew[index]}}" mode="widthFix">

From 3408522946da66ab7325ae975f938fb69d559321 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 7 Mar 2024 14:28:48 +0800
Subject: [PATCH 127/471] =?UTF-8?q?=E5=8D=81=E5=85=A8=E8=A1=97=E7=AD=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js              |  8 ++++++-
 pages/index/index.wxml            | 33 +++++++++++++--------------
 pages/index/index.wxss            |  2 +-
 pages/list/movieticket/index.js   | 21 ++++++++++++++++-
 pages/list/movieticket/index.wxml |  7 ++++++
 pages/list/movieticket/index.wxss | 38 +++++++++++++++++++++++++++++++
 pages/list/six/index.wxml         |  4 ++--
 pages/order/scene/index.wxml      |  2 +-
 8 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 677da7b..c6f3103 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -436,6 +436,12 @@ Page({
         path: 'pages/home/home'
       })
       return;
+    }else if (e.currentTarget.dataset.event == 'changshu_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx4df5fd9a6a5ea123',
+        path: 'pages/index'
+      })
+      return;
     }else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
       wx.navigateToMiniProgram({
         appId: 'wxd323e63a10aa6865',
@@ -829,7 +835,7 @@ Page({
     if (item.type == 'h5') {
       app.globalData.weburl = item.url
       wx.navigateTo({
-        url: "/pages/pbService/web/index"
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
       })
     } else if (item.type == 'mini') {
       wx.navigateToMiniProgram({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c5ccbf0..817be63 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -309,6 +309,22 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
+      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
+        <view class="text">书香借阅</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
+	    class="pbservice-item">
+	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+	    <view>公共文化资源库</view> -->
+      <!-- 元旦修改 -->
+      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
+      <view class="text">公共文化资源库</view>
+	  </view>
 			<view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
@@ -347,23 +363,6 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
         <view class="text">视觉中心</view>
       </view>
-			<view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
-        <view class="text">书香借阅</view>
-      </view>
-
-	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
-	    class="pbservice-item">
-	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-	    <view>公共文化资源库</view> -->
-      <!-- 元旦修改 -->
-      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
-      <view class="text">公共文化资源库</view>
-	  </view>
     </view>
   </scroll-view>
   <view class="scroll-line">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 06c0e4f..c058797 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -327,7 +327,7 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 6);
+  width: calc(190rpx * 8);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js
index 021a01c..7bb8b85 100644
--- a/pages/list/movieticket/index.js
+++ b/pages/list/movieticket/index.js
@@ -14,7 +14,8 @@ Page({
     lon:null,
     page:1,
     isMore:true,
-    list:[]
+    list:[],
+    keyword:"",
   },
 
   /**
@@ -93,6 +94,24 @@ Page({
   //     url: 'info/ticket/index?id='+item.third_id+"&title="+item.title
   //   })
   // },
+  inputKeyword:function(e){
+    this.setData({
+      keyword:e.detail.value
+    })
+  },
+  search:function(){
+    if(!this.data.keyword) {
+      wx.showToast({
+        title: '请输入关键字',
+        icon:'none'
+      })
+      return;
+    }
+    this.getList()
+    // wx.navigateTo({
+    //   url: 'list/index?keyword='+this.data.keyword,
+    // })
+  },
   gotoDetail1:function(e){
     let item = e.currentTarget.dataset.item;
     wx.navigateTo({
diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index 0ae5aa5..5345a58 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -1,4 +1,11 @@
 <title title="电影购票"></title>
+<!-- <view class="my-top-search">
+  <view class="my-search-box">
+    <view class="iconfont icon-sousuo"></view>
+    <input bindinput="inputKeyword" type="text" placeholder="搜索"></input>
+    <view class="my-search-btn" bindtap="search">搜索</view>
+  </view>
+</view> -->
 <view class="movie-types">
   <view class="movie-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">热映</view>
   <view class="movie-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">影院</view>
diff --git a/pages/list/movieticket/index.wxss b/pages/list/movieticket/index.wxss
index ab30723..cd124ce 100644
--- a/pages/list/movieticket/index.wxss
+++ b/pages/list/movieticket/index.wxss
@@ -181,4 +181,42 @@ page {
 }
 .cinemalist .cinema:last-child {
   border-bottom: none;
+}
+.my-top-search {
+  /* position: fixed; */
+  left: 0;
+  right: 0;
+  background: #f0f0f0;
+  padding: 16rpx 0;
+  z-index: 1;
+}
+.my-search-box {
+  height: 56rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 20rpx;
+  background: #fff;
+  border-radius: 30rpx;
+  margin: 0 auto;
+  width: 560rpx;
+}
+.my-search-box .iconfont {
+  color: #999999;
+  flex-shrink: 0;
+}
+.my-search-box input {
+  display: block;
+  flex: 1;
+  margin: 0 20rpx;
+  font-size: 26rpx;
+}
+.my-search-btn {
+  flex-shrink: 0;
+  width: 110rpx;
+  text-align: center;
+  font-size: 26rpx;
+  color: #0B898E;
+  border-left: 1rpx solid #ccc;
+  line-height: 40rpx;
 }
\ No newline at end of file
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index c571922..8968e3a 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/list/six/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
-<title title="十全街"></title>
+<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"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>
@@ -47,7 +47,7 @@
     <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon6.png" mode="widthFix"></image>
     <view>停车场</view>
   </navigator>
-  <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
+  <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon" wx:if="{{areaIndex != 0 && areaIndex != 1 && areaIndex != 2 && areaIndex != 3}}">
     <image class="red-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon7.png" mode="widthFix"></image>
     <view>公共自行车</view>
   </navigator>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index a6d3748..fecee13 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -5,7 +5,7 @@
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
-  <date  wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date  wx:if="{{isLogin}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">

From a9b021a39bf0876eecc57dfa4e60795026ce5e03 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 7 Mar 2024 14:32:53 +0800
Subject: [PATCH 128/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 072f326..fe0fc13 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.isTest100? true : false;
+      data.isTest = data.isTest101? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 00bcff5bf0793c568e14e7b16639e87891c1eccd Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 12 Mar 2024 14:57:51 +0800
Subject: [PATCH 129/471] =?UTF-8?q?=E8=8B=8F=E5=BD=B1=E9=80=9A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E6=9C=9F=E7=A5=A8=E5=88=A4=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            |  2 +-
 pages/list/activitynew/index.js   |  8 +++++---
 pages/list/activitynew/index.wxml |  6 +++---
 pages/list/movieticket/index.js   | 17 ++++++++++++-----
 pages/list/movieticket/index.wxml |  8 ++++----
 pages/list/movieticket/index.wxss |  3 ++-
 pages/order/scene/index.wxml      |  2 +-
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app.js b/app.js
index fe0fc13..f80aaa2 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.isTest101? true : false;
+      data.isTest = data.isTest102? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index e537870..0fe9198 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -254,7 +254,8 @@ Page({
     };
     let data = {
       page: this.data.pageNo,
-      pageSize: 10
+      pageSize: 10,
+      title:this.data.realKeywords
     };
     if (this.data.movieType == 2) {
       data.lat = this.data.lat;
@@ -355,7 +356,8 @@ setCity(e){
       list: [],
       pageNo: 1,
       total: 1,
-      moreFlag: true
+      moreFlag: true,
+      realKeywords:''
     })
     this.getList()
   },
@@ -388,7 +390,7 @@ setCity(e){
       total: 1,
       moreFlag: true,
       date:null,
-      isYL: true,
+      isYL: this.data.type == 4 ? false: true,
       selectDay: null
 
     })
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 6c831a6..19edc3b 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -1,13 +1,13 @@
 <!--pages/activity/index.wxml-->
 <title-header title="活动日历"></title-header>
 <view class="top-fixed-box">
-  <view class="acitivity-search-box" hidden="{{type==4}}">
-    <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea">
+  <view class="acitivity-search-box" >
+    <!-- <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea">
       <view class="picker">
         <view class="areatext">{{areas[area].area_name}}</view>
         <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
-    </picker>
+    </picker> -->
     <view class="my-search-box">
       <view class="iconfont icon-sousuo"></view>
       <input bindinput="changeKeywords" value="{{realKeywords}}" type="text" placeholder="请输入搜索关键字" />
diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js
index 7bb8b85..bb2a09f 100644
--- a/pages/list/movieticket/index.js
+++ b/pages/list/movieticket/index.js
@@ -101,12 +101,17 @@ Page({
   },
   search:function(){
     if(!this.data.keyword) {
-      wx.showToast({
-        title: '请输入关键字',
-        icon:'none'
-      })
-      return;
+      // wx.showToast({
+      //   title: '请输入关键字',
+      //   icon:'none'
+      // })
+      // return;
     }
+    this.setData({
+      page:1,
+      list:[],
+      isMore:true
+    })
     this.getList()
     // wx.navigateTo({
     //   url: 'list/index?keyword='+this.data.keyword,
@@ -126,6 +131,7 @@ Page({
   },
   changeType:function(e){
     this.setData({
+      keyword:'',
       type:e.currentTarget.dataset.type,
       list:[],
       page:1,
@@ -151,6 +157,7 @@ Page({
     }
     data.page = this.data.page;
     data.pageSize = 10;
+    data.title = this.data.keyword
     commonApi._post(service,data).then(res=>{
       console.log(res)
       res.data.map(item=>{
diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index 5345a58..5cbbc5d 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -1,11 +1,11 @@
 <title title="电影购票"></title>
-<!-- <view class="my-top-search">
+<view class="my-top-search">
   <view class="my-search-box">
     <view class="iconfont icon-sousuo"></view>
-    <input bindinput="inputKeyword" type="text" placeholder="搜索"></input>
+    <input bindinput="inputKeyword" type="text" placeholder="搜索" value='{{keyword}}'></input>
     <view class="my-search-btn" bindtap="search">搜索</view>
   </view>
-</view> -->
+</view>
 <view class="movie-types">
   <view class="movie-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">热映</view>
   <view class="movie-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">影院</view>
@@ -13,7 +13,7 @@
 </view>
 <view style="height:87rpx"></view>
 <!-- 热映 -->
-<view wx:if="{{type==1}}">
+<view wx:if="{{type==1}}"  style="margin-top: 110rpx;">
   <navigator url="list/info/index?id={{item.third_id}}" class="item" wx:for="{{list}}">
     <image src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="info">
diff --git a/pages/list/movieticket/index.wxss b/pages/list/movieticket/index.wxss
index cd124ce..09307b4 100644
--- a/pages/list/movieticket/index.wxss
+++ b/pages/list/movieticket/index.wxss
@@ -10,6 +10,7 @@ page {
   position: fixed;
   left: 0;
   right: 0;
+  top: 250rpx;
   border-bottom: 1rpx solid #ccc;
   font-size: 29rpx;
   color: #333;
@@ -183,7 +184,7 @@ page {
   border-bottom: none;
 }
 .my-top-search {
-  /* position: fixed; */
+  position: fixed;
   left: 0;
   right: 0;
   background: #f0f0f0;
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index fecee13..ae82641 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -5,7 +5,7 @@
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
-  <date  wx:if="{{isLogin}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">

From a13c1d7f1e8d9edc7e4e32587f2b69391f9dd6f6 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 14 Mar 2024 09:44:55 +0800
Subject: [PATCH 130/471] =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E5=9B=9E=E9=A1=BE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            | 2 +-
 pages/pbService/activity/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index f80aaa2..d17a2b5 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.isTest102? true : false;
+      data.isTest = data.isTest103? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/pbService/activity/index.js b/pages/pbService/activity/index.js
index f5ef5fb..ff44eab 100644
--- a/pages/pbService/activity/index.js
+++ b/pages/pbService/activity/index.js
@@ -62,7 +62,7 @@ Page({
     else {
       app.globalData.weburl = item.h5_url
       wx.navigateTo({
-        url: '/pages/pbService/web/index'
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.h5_url)
       })
     }
   },

From 3e7265ad0fa9de546934f671feea31f8f6dc175c Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 25 Mar 2024 16:22:39 +0800
Subject: [PATCH 131/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9=E3=80=81=E6=99=AF=E7=82=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=AF=E5=90=A6=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 pages/list/museum/index.js                 | 22 +++++++++++--------
 pages/list/museum/index.wxml               |  2 +-
 pages/user/order/sceneOrderInfo/index.js   |  9 +++++++-
 pages/user/order/sceneOrderInfo/index.wxml |  8 ++++++-
 pages/user/order/sceneOrderInfo/index.wxss | 25 ++++++++++++++++++++++
 6 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index d17a2b5..b1cb39c 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.isTest103? true : false;
+      data.isTest = data.isTest104? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index a559a86..1de8b0c 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -36,16 +36,20 @@ Page({
     util.gotoDetail(item,1);
   },
   gotoDetailOther: function(e) {
-    if (e.currentTarget.dataset.id==44703) {
-      wx.navigateToMiniProgram({
-          appId: 'wxfef80ee1ab7e58a2',
-          path: 'pages/inners/main'
-        })
-        return;
-  }
-    wx.navigateTo({
-      url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+    wx.navigateToMiniProgram({
+      appId: 'wxfef80ee1ab7e58a2',
+      path: 'pages/index/index'
     })
+  //   if (e.currentTarget.dataset.id==44703) {
+  //     wx.navigateToMiniProgram({
+  //         appId: 'wxfef80ee1ab7e58a2',
+  //         path: 'pages/inners/main'
+  //       })
+  //       return;
+  // }
+  //   wx.navigateTo({
+  //     url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+  //   })
   },
   search:function(e){
     this.setData(e.detail);
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 22a5544..9ce66e8 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -14,7 +14,7 @@
     </view>
     <view class="info textOver" wx:else style="height:320rpx;">
       <view class="title textOver">{{item.title}}</view>
-      <view class="com-flex border">
+      <view class="com-flex border" catchtap="gotoDetailOther">
         <text>博物馆本馆</text>
         <view class="btn-yy">预约</view>
       </view>
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index a411574..66dd20f 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -53,6 +53,9 @@ Page({
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0,arr = [];
     this.data.info.order_product_list.forEach(qrcode=>{
       qrcode.qrcode.map((item,index)=>{
+        console.log(qrcode.is_force_display_code);
+        item.is_force_display_code = qrcode.is_force_display_code
+        console.log(item.is_force_display_code);
         arr.push(index)
         this.setData({
           imgLen:arr
@@ -69,6 +72,7 @@ Page({
           })
         }
         else {
+          console.log(item);
           new QRCode('damocode'+codeId,{
             text: item.use_code,
             width: 300 * radio,
@@ -77,16 +81,19 @@ Page({
             correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
             callback: (res) => {
               console.log(res);
-              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText});
+              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code});
               that.setData({
                 codeImgs:codeImgs
               })
             }
           })
+          console.log(this.data.codeImgs);
           codeId = codeId + 1
         }
       }) 
     })
+    console.log(this.data.imgLen);
+    console.log(this.data.codeImgs);
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 6de2321..604c2f7 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -16,8 +16,14 @@
 </view> -->
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
-  <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}">
+  <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
     <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
+    <!-- 代表核销后是否继续展示二维码（0否1是） -->
+    <view class="text-shadow" wx:if="{{item.is_force_display_code == 0}}">
+      <view class="text-shadow-state">
+        {{item.state}}
+      </view>
+    </view>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}</view>
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 6ba4e9b..258adb3 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -313,4 +313,29 @@ page {
 }
 .btn{
   float: right;
+}
+.text-shadow {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  text-align: center;
+  background: rgba(0, 0, 0, .3);
+  width: 300rpx;
+  height: 300rpx;
+  /*border-radius: .3rem;*/
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10;
+}
+.text-shadow-state {
+  width: 200rpx;
+  height: 200rpx;
+  line-height: 200rpx;
+  background: #FFFFFF;
+  border-radius: 50%;
+  color: #0B898E;
 }
\ No newline at end of file

From 1b78b00bab64dca3649723447340dcc4e1e75278 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 26 Mar 2024 13:52:14 +0800
Subject: [PATCH 132/471] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     | 2 +-
 pages/user/order/sceneOrderInfo/index.js   | 2 +-
 pages/user/order/sceneOrderInfo/index.wxml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index b1cb39c..7e06a32 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.isTest104? true : false;
+      data.isTest = data.isTest105? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 66dd20f..a1a6e93 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -81,7 +81,7 @@ Page({
             correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
             callback: (res) => {
               console.log(res);
-              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code});
+              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
               that.setData({
                 codeImgs:codeImgs
               })
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 604c2f7..4bccaf9 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -19,7 +19,7 @@
   <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
     <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
     <!-- 代表核销后是否继续展示二维码（0否1是） -->
-    <view class="text-shadow" wx:if="{{item.is_force_display_code == 0}}">
+    <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
       <view class="text-shadow-state">
         {{item.state}}
       </view>

From b1ebca33b11007231763d9f13f825306d5fd189e Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 27 Mar 2024 10:15:26 +0800
Subject: [PATCH 133/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index a1a6e93..e16cd84 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -61,7 +61,7 @@ Page({
           imgLen:arr
         })
         if(item.use_url&&item.use_code){
-          codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText});
+          codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
           // if(codeImgs.length==qrcode.qrcode.length){
           //   that.setData({
           //     codeImgs:codeImgs

From 430c253ffa19bc5beba1ea8476cb75efbeb925c4 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 27 Mar 2024 10:16:48 +0800
Subject: [PATCH 134/471] =?UTF-8?q?=E6=8F=90=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 7e06a32..f3c5d9f 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.isTest105? true : false;
+      data.isTest = data.isTest106? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From a7b3affebf5ecfb15e129eff829d3af62b5e08fb Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 28 Mar 2024 16:09:59 +0800
Subject: [PATCH 135/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=88=B0=E6=9C=AC=E5=B9=B3=E5=8F=B0=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |   2 +-
 miniprogram_npm/chinese-workday/index.js      | 326 ++++++
 miniprogram_npm/chinese-workday/index.js.map  |   1 +
 miniprogram_npm/dayjs/index.js                |  13 +
 miniprogram_npm/dayjs/index.js.map            |   1 +
 node_modules/chinese-workday/.editorconfig    |  16 +
 node_modules/chinese-workday/.travis.yml      |   5 +
 node_modules/chinese-workday/LICENSE          |  21 +
 node_modules/chinese-workday/README.md        |  37 +
 node_modules/chinese-workday/index.d.ts       |   5 +
 node_modules/chinese-workday/index.js         | 313 ++++++
 node_modules/chinese-workday/package.json     |  62 ++
 node_modules/chinese-workday/test.js          |  37 +
 node_modules/dayjs/.editorconfig              |   7 +
 node_modules/dayjs/CHANGELOG.md               | 919 ++++++++++++++++
 node_modules/dayjs/LICENSE                    |  21 +
 node_modules/dayjs/README.md                  | 149 +++
 node_modules/dayjs/dayjs.min.js               |   1 +
 node_modules/dayjs/esm/constant.js            |  25 +
 node_modules/dayjs/esm/index.d.ts             | 429 ++++++++
 node_modules/dayjs/esm/index.js               | 541 ++++++++++
 node_modules/dayjs/esm/locale/af.js           |  39 +
 node_modules/dayjs/esm/locale/am.js           |  40 +
 node_modules/dayjs/esm/locale/ar-dz.js        |  41 +
 node_modules/dayjs/esm/locale/ar-iq.js        |  42 +
 node_modules/dayjs/esm/locale/ar-kw.js        |  41 +
 node_modules/dayjs/esm/locale/ar-ly.js        |  27 +
 node_modules/dayjs/esm/locale/ar-ma.js        |  42 +
 node_modules/dayjs/esm/locale/ar-sa.js        |  41 +
 node_modules/dayjs/esm/locale/ar-tn.js        |  42 +
 node_modules/dayjs/esm/locale/ar.js           |  77 ++
 node_modules/dayjs/esm/locale/az.js           |  39 +
 node_modules/dayjs/esm/locale/be.js           |  24 +
 node_modules/dayjs/esm/locale/bg.js           |  55 +
 node_modules/dayjs/esm/locale/bi.js           |  39 +
 node_modules/dayjs/esm/locale/bm.js           |  39 +
 node_modules/dayjs/esm/locale/bn-bd.js        |  81 ++
 node_modules/dayjs/esm/locale/bn.js           |  72 ++
 node_modules/dayjs/esm/locale/bo.js           |  38 +
 node_modules/dayjs/esm/locale/br.js           |  93 ++
 node_modules/dayjs/esm/locale/bs.js           |  24 +
 node_modules/dayjs/esm/locale/ca.js           |  44 +
 node_modules/dayjs/esm/locale/cs.js           | 120 +++
 node_modules/dayjs/esm/locale/cv.js           |  24 +
 node_modules/dayjs/esm/locale/cy.js           |  39 +
 node_modules/dayjs/esm/locale/da.js           |  39 +
 node_modules/dayjs/esm/locale/de-at.js        |  63 ++
 node_modules/dayjs/esm/locale/de-ch.js        |  63 ++
 node_modules/dayjs/esm/locale/de.js           |  64 ++
 node_modules/dayjs/esm/locale/dv.js           |  39 +
 node_modules/dayjs/esm/locale/el.js           |  39 +
 node_modules/dayjs/esm/locale/en-au.js        |  39 +
 node_modules/dayjs/esm/locale/en-ca.js        |  38 +
 node_modules/dayjs/esm/locale/en-gb.js        |  42 +
 node_modules/dayjs/esm/locale/en-ie.js        |  39 +
 node_modules/dayjs/esm/locale/en-il.js        |  38 +
 node_modules/dayjs/esm/locale/en-in.js        |  42 +
 node_modules/dayjs/esm/locale/en-nz.js        |  41 +
 node_modules/dayjs/esm/locale/en-sg.js        |  39 +
 node_modules/dayjs/esm/locale/en-tt.js        |  42 +
 node_modules/dayjs/esm/locale/en.js           |  12 +
 node_modules/dayjs/esm/locale/eo.js           |  39 +
 node_modules/dayjs/esm/locale/es-do.js        |  39 +
 node_modules/dayjs/esm/locale/es-mx.js        |  38 +
 node_modules/dayjs/esm/locale/es-pr.js        |  39 +
 node_modules/dayjs/esm/locale/es-us.js        |  38 +
 node_modules/dayjs/esm/locale/es.js           |  39 +
 node_modules/dayjs/esm/locale/et.js           |  65 ++
 node_modules/dayjs/esm/locale/eu.js           |  43 +
 node_modules/dayjs/esm/locale/fa.js           |  39 +
 node_modules/dayjs/esm/locale/fi.js           |  88 ++
 node_modules/dayjs/esm/locale/fo.js           |  39 +
 node_modules/dayjs/esm/locale/fr-ca.js        |  38 +
 node_modules/dayjs/esm/locale/fr-ch.js        |  39 +
 node_modules/dayjs/esm/locale/fr.js           |  41 +
 node_modules/dayjs/esm/locale/fy.js           |  39 +
 node_modules/dayjs/esm/locale/ga.js           |  39 +
 node_modules/dayjs/esm/locale/gd.js           |  39 +
 node_modules/dayjs/esm/locale/gl.js           |  39 +
 node_modules/dayjs/esm/locale/gom-latn.js     |  25 +
 node_modules/dayjs/esm/locale/gu.js           |  38 +
 node_modules/dayjs/esm/locale/he.js           |  78 ++
 node_modules/dayjs/esm/locale/hi.js           |  38 +
 node_modules/dayjs/esm/locale/hr.js           |  53 +
 node_modules/dayjs/esm/locale/ht.js           |  38 +
 node_modules/dayjs/esm/locale/hu.js           |  61 ++
 node_modules/dayjs/esm/locale/hy-am.js        |  39 +
 node_modules/dayjs/esm/locale/id.js           |  39 +
 node_modules/dayjs/esm/locale/index.d.ts      |  11 +
 node_modules/dayjs/esm/locale/is.js           |  68 ++
 node_modules/dayjs/esm/locale/it-ch.js        |  39 +
 node_modules/dayjs/esm/locale/it.js           |  39 +
 node_modules/dayjs/esm/locale/ja.js           |  45 +
 node_modules/dayjs/esm/locale/jv.js           |  39 +
 node_modules/dayjs/esm/locale/ka.js           |  39 +
 node_modules/dayjs/esm/locale/kk.js           |  39 +
 node_modules/dayjs/esm/locale/km.js           |  39 +
 node_modules/dayjs/esm/locale/kn.js           |  38 +
 node_modules/dayjs/esm/locale/ko.js           |  45 +
 node_modules/dayjs/esm/locale/ku.js           |  77 ++
 node_modules/dayjs/esm/locale/ky.js           |  39 +
 node_modules/dayjs/esm/locale/lb.js           |  24 +
 node_modules/dayjs/esm/locale/lo.js           |  38 +
 node_modules/dayjs/esm/locale/lt.js           |  70 ++
 node_modules/dayjs/esm/locale/lv.js           |  39 +
 node_modules/dayjs/esm/locale/me.js           |  24 +
 node_modules/dayjs/esm/locale/mi.js           |  39 +
 node_modules/dayjs/esm/locale/mk.js           |  39 +
 node_modules/dayjs/esm/locale/ml.js           |  38 +
 node_modules/dayjs/esm/locale/mn.js           |  38 +
 node_modules/dayjs/esm/locale/mr.js           |  23 +
 node_modules/dayjs/esm/locale/ms-my.js        |  39 +
 node_modules/dayjs/esm/locale/ms.js           |  39 +
 node_modules/dayjs/esm/locale/mt.js           |  39 +
 node_modules/dayjs/esm/locale/my.js           |  39 +
 node_modules/dayjs/esm/locale/nb.js           |  40 +
 node_modules/dayjs/esm/locale/ne.js           |  40 +
 node_modules/dayjs/esm/locale/nl-be.js        |  39 +
 node_modules/dayjs/esm/locale/nl.js           |  40 +
 node_modules/dayjs/esm/locale/nn.js           |  39 +
 node_modules/dayjs/esm/locale/oc-lnc.js       |  39 +
 node_modules/dayjs/esm/locale/pa-in.js        |  38 +
 node_modules/dayjs/esm/locale/pl.js           |  87 ++
 node_modules/dayjs/esm/locale/pt-br.js        |  38 +
 node_modules/dayjs/esm/locale/pt.js           |  40 +
 node_modules/dayjs/esm/locale/rn.js           |  39 +
 node_modules/dayjs/esm/locale/ro.js           |  39 +
 node_modules/dayjs/esm/locale/ru.js           |  99 ++
 node_modules/dayjs/esm/locale/rw.js           |  35 +
 node_modules/dayjs/esm/locale/sd.js           |  39 +
 node_modules/dayjs/esm/locale/se.js           |  39 +
 node_modules/dayjs/esm/locale/si.js           |  38 +
 node_modules/dayjs/esm/locale/sk.js           | 121 +++
 node_modules/dayjs/esm/locale/sl.js           | 141 +++
 node_modules/dayjs/esm/locale/sq.js           |  39 +
 node_modules/dayjs/esm/locale/sr-cyrl.js      |  74 ++
 node_modules/dayjs/esm/locale/sr.js           |  74 ++
 node_modules/dayjs/esm/locale/ss.js           |  39 +
 node_modules/dayjs/esm/locale/sv-fi.js        |  46 +
 node_modules/dayjs/esm/locale/sv.js           |  44 +
 node_modules/dayjs/esm/locale/sw.js           |  39 +
 node_modules/dayjs/esm/locale/ta.js           |  38 +
 node_modules/dayjs/esm/locale/te.js           |  38 +
 node_modules/dayjs/esm/locale/tet.js          |  39 +
 node_modules/dayjs/esm/locale/tg.js           |  39 +
 node_modules/dayjs/esm/locale/th.js           |  38 +
 node_modules/dayjs/esm/locale/tk.js           |  39 +
 node_modules/dayjs/esm/locale/tl-ph.js        |  39 +
 node_modules/dayjs/esm/locale/tlh.js          |  24 +
 node_modules/dayjs/esm/locale/tr.js           |  39 +
 node_modules/dayjs/esm/locale/types.d.ts      |  33 +
 node_modules/dayjs/esm/locale/tzl.js          |  24 +
 node_modules/dayjs/esm/locale/tzm-latn.js     |  39 +
 node_modules/dayjs/esm/locale/tzm.js          |  39 +
 node_modules/dayjs/esm/locale/ug-cn.js        |  39 +
 node_modules/dayjs/esm/locale/uk.js           |  77 ++
 node_modules/dayjs/esm/locale/ur.js           |  39 +
 node_modules/dayjs/esm/locale/uz-latn.js      |  39 +
 node_modules/dayjs/esm/locale/uz.js           |  39 +
 node_modules/dayjs/esm/locale/vi.js           |  43 +
 node_modules/dayjs/esm/locale/x-pseudo.js     |  39 +
 node_modules/dayjs/esm/locale/yo.js           |  39 +
 node_modules/dayjs/esm/locale/zh-cn.js        |  67 ++
 node_modules/dayjs/esm/locale/zh-hk.js        |  44 +
 node_modules/dayjs/esm/locale/zh-tw.js        |  65 ++
 node_modules/dayjs/esm/locale/zh.js           |  67 ++
 .../esm/plugin/advancedFormat/index.d.ts      |   4 +
 .../dayjs/esm/plugin/advancedFormat/index.js  |  66 ++
 .../dayjs/esm/plugin/arraySupport/index.d.ts  |  10 +
 .../dayjs/esm/plugin/arraySupport/index.js    |  33 +
 .../dayjs/esm/plugin/badMutable/index.d.ts    |   4 +
 .../dayjs/esm/plugin/badMutable/index.js      |  61 ++
 .../dayjs/esm/plugin/bigIntSupport/index.d.ts |  11 +
 .../dayjs/esm/plugin/bigIntSupport/index.js   |  32 +
 .../dayjs/esm/plugin/buddhistEra/index.d.ts   |   4 +
 .../dayjs/esm/plugin/buddhistEra/index.js     |  21 +
 .../dayjs/esm/plugin/calendar/index.d.ts      |  10 +
 .../dayjs/esm/plugin/calendar/index.js        |  32 +
 .../esm/plugin/customParseFormat/index.d.ts   |   8 +
 .../esm/plugin/customParseFormat/index.js     | 320 ++++++
 .../dayjs/esm/plugin/dayOfYear/index.d.ts     |  11 +
 .../dayjs/esm/plugin/dayOfYear/index.js       |   9 +
 .../dayjs/esm/plugin/devHelper/index.d.ts     |   4 +
 .../dayjs/esm/plugin/devHelper/index.js       |  38 +
 .../dayjs/esm/plugin/duration/index.d.ts      |  88 ++
 .../dayjs/esm/plugin/duration/index.js        | 356 +++++++
 .../dayjs/esm/plugin/isBetween/index.d.ts     |  10 +
 .../dayjs/esm/plugin/isBetween/index.js       |  10 +
 .../dayjs/esm/plugin/isLeapYear/index.d.ts    |  10 +
 .../dayjs/esm/plugin/isLeapYear/index.js      |   7 +
 .../dayjs/esm/plugin/isMoment/index.d.ts      |  10 +
 .../dayjs/esm/plugin/isMoment/index.js        |   5 +
 .../dayjs/esm/plugin/isSameOrAfter/index.d.ts |  10 +
 .../dayjs/esm/plugin/isSameOrAfter/index.js   |   5 +
 .../esm/plugin/isSameOrBefore/index.d.ts      |  10 +
 .../dayjs/esm/plugin/isSameOrBefore/index.js  |   5 +
 .../dayjs/esm/plugin/isToday/index.d.ts       |  10 +
 .../dayjs/esm/plugin/isToday/index.js         |   9 +
 .../dayjs/esm/plugin/isTomorrow/index.d.ts    |  10 +
 .../dayjs/esm/plugin/isTomorrow/index.js      |   9 +
 .../dayjs/esm/plugin/isYesterday/index.d.ts   |  10 +
 .../dayjs/esm/plugin/isYesterday/index.js     |   9 +
 .../dayjs/esm/plugin/isoWeek/index.d.ts       |  27 +
 .../dayjs/esm/plugin/isoWeek/index.js         |  57 +
 .../esm/plugin/isoWeeksInYear/index.d.ts      |  10 +
 .../dayjs/esm/plugin/isoWeeksInYear/index.js  |  15 +
 .../dayjs/esm/plugin/localeData/index.d.ts    |  44 +
 .../dayjs/esm/plugin/localeData/index.js      | 114 ++
 .../esm/plugin/localizedFormat/index.d.ts     |   4 +
 .../dayjs/esm/plugin/localizedFormat/index.js |  20 +
 .../dayjs/esm/plugin/localizedFormat/utils.js |  20 +
 .../dayjs/esm/plugin/minMax/index.d.ts        |  11 +
 node_modules/dayjs/esm/plugin/minMax/index.js |  39 +
 .../dayjs/esm/plugin/objectSupport/index.d.ts |  48 +
 .../dayjs/esm/plugin/objectSupport/index.js   |  97 ++
 .../dayjs/esm/plugin/pluralGetSet/index.d.ts  |  44 +
 .../dayjs/esm/plugin/pluralGetSet/index.js    |   7 +
 .../esm/plugin/preParsePostFormat/index.d.ts  |   4 +
 .../esm/plugin/preParsePostFormat/index.js    |  40 +
 .../dayjs/esm/plugin/quarterOfYear/index.d.ts |  26 +
 .../dayjs/esm/plugin/quarterOfYear/index.js   |  41 +
 .../dayjs/esm/plugin/relativeTime/index.d.ts  |  24 +
 .../dayjs/esm/plugin/relativeTime/index.js    | 130 +++
 .../dayjs/esm/plugin/timezone/index.d.ts      |  20 +
 .../dayjs/esm/plugin/timezone/index.js        | 189 ++++
 .../dayjs/esm/plugin/toArray/index.d.ts       |  10 +
 .../dayjs/esm/plugin/toArray/index.js         |   7 +
 .../dayjs/esm/plugin/toObject/index.d.ts      |  20 +
 .../dayjs/esm/plugin/toObject/index.js        |  15 +
 .../dayjs/esm/plugin/updateLocale/index.d.ts  |   8 +
 .../dayjs/esm/plugin/updateLocale/index.js    |  12 +
 node_modules/dayjs/esm/plugin/utc/index.d.ts  |  19 +
 node_modules/dayjs/esm/plugin/utc/index.js    | 188 ++++
 .../dayjs/esm/plugin/weekOfYear/index.d.ts    |  12 +
 .../dayjs/esm/plugin/weekOfYear/index.js      |  44 +
 .../dayjs/esm/plugin/weekYear/index.d.ts      |  10 +
 .../dayjs/esm/plugin/weekYear/index.js        |  19 +
 .../dayjs/esm/plugin/weekday/index.d.ts       |  12 +
 .../dayjs/esm/plugin/weekday/index.js         |  15 +
 node_modules/dayjs/esm/utils.js               |  58 ++
 node_modules/dayjs/index.d.ts                 | 429 ++++++++
 node_modules/dayjs/locale.json                |   1 +
 node_modules/dayjs/locale/af.js               |   1 +
 node_modules/dayjs/locale/am.js               |   1 +
 node_modules/dayjs/locale/ar-dz.js            |   1 +
 node_modules/dayjs/locale/ar-iq.js            |   1 +
 node_modules/dayjs/locale/ar-kw.js            |   1 +
 node_modules/dayjs/locale/ar-ly.js            |   1 +
 node_modules/dayjs/locale/ar-ma.js            |   1 +
 node_modules/dayjs/locale/ar-sa.js            |   1 +
 node_modules/dayjs/locale/ar-tn.js            |   1 +
 node_modules/dayjs/locale/ar.js               |   1 +
 node_modules/dayjs/locale/az.js               |   1 +
 node_modules/dayjs/locale/be.js               |   1 +
 node_modules/dayjs/locale/bg.js               |   1 +
 node_modules/dayjs/locale/bi.js               |   1 +
 node_modules/dayjs/locale/bm.js               |   1 +
 node_modules/dayjs/locale/bn-bd.js            |   1 +
 node_modules/dayjs/locale/bn.js               |   1 +
 node_modules/dayjs/locale/bo.js               |   1 +
 node_modules/dayjs/locale/br.js               |   1 +
 node_modules/dayjs/locale/bs.js               |   1 +
 node_modules/dayjs/locale/ca.js               |   1 +
 node_modules/dayjs/locale/cs.js               |   1 +
 node_modules/dayjs/locale/cv.js               |   1 +
 node_modules/dayjs/locale/cy.js               |   1 +
 node_modules/dayjs/locale/da.js               |   1 +
 node_modules/dayjs/locale/de-at.js            |   1 +
 node_modules/dayjs/locale/de-ch.js            |   1 +
 node_modules/dayjs/locale/de.js               |   1 +
 node_modules/dayjs/locale/dv.js               |   1 +
 node_modules/dayjs/locale/el.js               |   1 +
 node_modules/dayjs/locale/en-au.js            |   1 +
 node_modules/dayjs/locale/en-ca.js            |   1 +
 node_modules/dayjs/locale/en-gb.js            |   1 +
 node_modules/dayjs/locale/en-ie.js            |   1 +
 node_modules/dayjs/locale/en-il.js            |   1 +
 node_modules/dayjs/locale/en-in.js            |   1 +
 node_modules/dayjs/locale/en-nz.js            |   1 +
 node_modules/dayjs/locale/en-sg.js            |   1 +
 node_modules/dayjs/locale/en-tt.js            |   1 +
 node_modules/dayjs/locale/en.js               |   1 +
 node_modules/dayjs/locale/eo.js               |   1 +
 node_modules/dayjs/locale/es-do.js            |   1 +
 node_modules/dayjs/locale/es-mx.js            |   1 +
 node_modules/dayjs/locale/es-pr.js            |   1 +
 node_modules/dayjs/locale/es-us.js            |   1 +
 node_modules/dayjs/locale/es.js               |   1 +
 node_modules/dayjs/locale/et.js               |   1 +
 node_modules/dayjs/locale/eu.js               |   1 +
 node_modules/dayjs/locale/fa.js               |   1 +
 node_modules/dayjs/locale/fi.js               |   1 +
 node_modules/dayjs/locale/fo.js               |   1 +
 node_modules/dayjs/locale/fr-ca.js            |   1 +
 node_modules/dayjs/locale/fr-ch.js            |   1 +
 node_modules/dayjs/locale/fr.js               |   1 +
 node_modules/dayjs/locale/fy.js               |   1 +
 node_modules/dayjs/locale/ga.js               |   1 +
 node_modules/dayjs/locale/gd.js               |   1 +
 node_modules/dayjs/locale/gl.js               |   1 +
 node_modules/dayjs/locale/gom-latn.js         |   1 +
 node_modules/dayjs/locale/gu.js               |   1 +
 node_modules/dayjs/locale/he.js               |   1 +
 node_modules/dayjs/locale/hi.js               |   1 +
 node_modules/dayjs/locale/hr.js               |   1 +
 node_modules/dayjs/locale/ht.js               |   1 +
 node_modules/dayjs/locale/hu.js               |   1 +
 node_modules/dayjs/locale/hy-am.js            |   1 +
 node_modules/dayjs/locale/id.js               |   1 +
 node_modules/dayjs/locale/index.d.ts          |  11 +
 node_modules/dayjs/locale/is.js               |   1 +
 node_modules/dayjs/locale/it-ch.js            |   1 +
 node_modules/dayjs/locale/it.js               |   1 +
 node_modules/dayjs/locale/ja.js               |   1 +
 node_modules/dayjs/locale/jv.js               |   1 +
 node_modules/dayjs/locale/ka.js               |   1 +
 node_modules/dayjs/locale/kk.js               |   1 +
 node_modules/dayjs/locale/km.js               |   1 +
 node_modules/dayjs/locale/kn.js               |   1 +
 node_modules/dayjs/locale/ko.js               |   1 +
 node_modules/dayjs/locale/ku.js               |   1 +
 node_modules/dayjs/locale/ky.js               |   1 +
 node_modules/dayjs/locale/lb.js               |   1 +
 node_modules/dayjs/locale/lo.js               |   1 +
 node_modules/dayjs/locale/lt.js               |   1 +
 node_modules/dayjs/locale/lv.js               |   1 +
 node_modules/dayjs/locale/me.js               |   1 +
 node_modules/dayjs/locale/mi.js               |   1 +
 node_modules/dayjs/locale/mk.js               |   1 +
 node_modules/dayjs/locale/ml.js               |   1 +
 node_modules/dayjs/locale/mn.js               |   1 +
 node_modules/dayjs/locale/mr.js               |   1 +
 node_modules/dayjs/locale/ms-my.js            |   1 +
 node_modules/dayjs/locale/ms.js               |   1 +
 node_modules/dayjs/locale/mt.js               |   1 +
 node_modules/dayjs/locale/my.js               |   1 +
 node_modules/dayjs/locale/nb.js               |   1 +
 node_modules/dayjs/locale/ne.js               |   1 +
 node_modules/dayjs/locale/nl-be.js            |   1 +
 node_modules/dayjs/locale/nl.js               |   1 +
 node_modules/dayjs/locale/nn.js               |   1 +
 node_modules/dayjs/locale/oc-lnc.js           |   1 +
 node_modules/dayjs/locale/pa-in.js            |   1 +
 node_modules/dayjs/locale/pl.js               |   1 +
 node_modules/dayjs/locale/pt-br.js            |   1 +
 node_modules/dayjs/locale/pt.js               |   1 +
 node_modules/dayjs/locale/rn.js               |   1 +
 node_modules/dayjs/locale/ro.js               |   1 +
 node_modules/dayjs/locale/ru.js               |   1 +
 node_modules/dayjs/locale/rw.js               |   1 +
 node_modules/dayjs/locale/sd.js               |   1 +
 node_modules/dayjs/locale/se.js               |   1 +
 node_modules/dayjs/locale/si.js               |   1 +
 node_modules/dayjs/locale/sk.js               |   1 +
 node_modules/dayjs/locale/sl.js               |   1 +
 node_modules/dayjs/locale/sq.js               |   1 +
 node_modules/dayjs/locale/sr-cyrl.js          |   1 +
 node_modules/dayjs/locale/sr.js               |   1 +
 node_modules/dayjs/locale/ss.js               |   1 +
 node_modules/dayjs/locale/sv-fi.js            |   1 +
 node_modules/dayjs/locale/sv.js               |   1 +
 node_modules/dayjs/locale/sw.js               |   1 +
 node_modules/dayjs/locale/ta.js               |   1 +
 node_modules/dayjs/locale/te.js               |   1 +
 node_modules/dayjs/locale/tet.js              |   1 +
 node_modules/dayjs/locale/tg.js               |   1 +
 node_modules/dayjs/locale/th.js               |   1 +
 node_modules/dayjs/locale/tk.js               |   1 +
 node_modules/dayjs/locale/tl-ph.js            |   1 +
 node_modules/dayjs/locale/tlh.js              |   1 +
 node_modules/dayjs/locale/tr.js               |   1 +
 node_modules/dayjs/locale/types.d.ts          |  33 +
 node_modules/dayjs/locale/tzl.js              |   1 +
 node_modules/dayjs/locale/tzm-latn.js         |   1 +
 node_modules/dayjs/locale/tzm.js              |   1 +
 node_modules/dayjs/locale/ug-cn.js            |   1 +
 node_modules/dayjs/locale/uk.js               |   1 +
 node_modules/dayjs/locale/ur.js               |   1 +
 node_modules/dayjs/locale/uz-latn.js          |   1 +
 node_modules/dayjs/locale/uz.js               |   1 +
 node_modules/dayjs/locale/vi.js               |   1 +
 node_modules/dayjs/locale/x-pseudo.js         |   1 +
 node_modules/dayjs/locale/yo.js               |   1 +
 node_modules/dayjs/locale/zh-cn.js            |   1 +
 node_modules/dayjs/locale/zh-hk.js            |   1 +
 node_modules/dayjs/locale/zh-tw.js            |   1 +
 node_modules/dayjs/locale/zh.js               |   1 +
 node_modules/dayjs/package.json               | 115 ++
 node_modules/dayjs/plugin/advancedFormat.d.ts |   4 +
 node_modules/dayjs/plugin/advancedFormat.js   |   1 +
 node_modules/dayjs/plugin/arraySupport.d.ts   |  10 +
 node_modules/dayjs/plugin/arraySupport.js     |   1 +
 node_modules/dayjs/plugin/badMutable.d.ts     |   4 +
 node_modules/dayjs/plugin/badMutable.js       |   1 +
 node_modules/dayjs/plugin/bigIntSupport.d.ts  |  11 +
 node_modules/dayjs/plugin/bigIntSupport.js    |   1 +
 node_modules/dayjs/plugin/buddhistEra.d.ts    |   4 +
 node_modules/dayjs/plugin/buddhistEra.js      |   1 +
 node_modules/dayjs/plugin/calendar.d.ts       |  10 +
 node_modules/dayjs/plugin/calendar.js         |   1 +
 .../dayjs/plugin/customParseFormat.d.ts       |   8 +
 .../dayjs/plugin/customParseFormat.js         |   1 +
 node_modules/dayjs/plugin/dayOfYear.d.ts      |  11 +
 node_modules/dayjs/plugin/dayOfYear.js        |   1 +
 node_modules/dayjs/plugin/devHelper.d.ts      |   4 +
 node_modules/dayjs/plugin/devHelper.js        |   1 +
 node_modules/dayjs/plugin/duration.d.ts       |  88 ++
 node_modules/dayjs/plugin/duration.js         |   1 +
 node_modules/dayjs/plugin/isBetween.d.ts      |  10 +
 node_modules/dayjs/plugin/isBetween.js        |   1 +
 node_modules/dayjs/plugin/isLeapYear.d.ts     |  10 +
 node_modules/dayjs/plugin/isLeapYear.js       |   1 +
 node_modules/dayjs/plugin/isMoment.d.ts       |  10 +
 node_modules/dayjs/plugin/isMoment.js         |   1 +
 node_modules/dayjs/plugin/isSameOrAfter.d.ts  |  10 +
 node_modules/dayjs/plugin/isSameOrAfter.js    |   1 +
 node_modules/dayjs/plugin/isSameOrBefore.d.ts |  10 +
 node_modules/dayjs/plugin/isSameOrBefore.js   |   1 +
 node_modules/dayjs/plugin/isToday.d.ts        |  10 +
 node_modules/dayjs/plugin/isToday.js          |   1 +
 node_modules/dayjs/plugin/isTomorrow.d.ts     |  10 +
 node_modules/dayjs/plugin/isTomorrow.js       |   1 +
 node_modules/dayjs/plugin/isYesterday.d.ts    |  10 +
 node_modules/dayjs/plugin/isYesterday.js      |   1 +
 node_modules/dayjs/plugin/isoWeek.d.ts        |  27 +
 node_modules/dayjs/plugin/isoWeek.js          |   1 +
 node_modules/dayjs/plugin/isoWeeksInYear.d.ts |  10 +
 node_modules/dayjs/plugin/isoWeeksInYear.js   |   1 +
 node_modules/dayjs/plugin/localeData.d.ts     |  44 +
 node_modules/dayjs/plugin/localeData.js       |   1 +
 .../dayjs/plugin/localizedFormat.d.ts         |   4 +
 node_modules/dayjs/plugin/localizedFormat.js  |   1 +
 node_modules/dayjs/plugin/minMax.d.ts         |  11 +
 node_modules/dayjs/plugin/minMax.js           |   1 +
 node_modules/dayjs/plugin/objectSupport.d.ts  |  48 +
 node_modules/dayjs/plugin/objectSupport.js    |   1 +
 node_modules/dayjs/plugin/pluralGetSet.d.ts   |  44 +
 node_modules/dayjs/plugin/pluralGetSet.js     |   1 +
 .../dayjs/plugin/preParsePostFormat.d.ts      |   4 +
 .../dayjs/plugin/preParsePostFormat.js        |   1 +
 node_modules/dayjs/plugin/quarterOfYear.d.ts  |  26 +
 node_modules/dayjs/plugin/quarterOfYear.js    |   1 +
 node_modules/dayjs/plugin/relativeTime.d.ts   |  24 +
 node_modules/dayjs/plugin/relativeTime.js     |   1 +
 node_modules/dayjs/plugin/timezone.d.ts       |  20 +
 node_modules/dayjs/plugin/timezone.js         |   1 +
 node_modules/dayjs/plugin/toArray.d.ts        |  10 +
 node_modules/dayjs/plugin/toArray.js          |   1 +
 node_modules/dayjs/plugin/toObject.d.ts       |  20 +
 node_modules/dayjs/plugin/toObject.js         |   1 +
 node_modules/dayjs/plugin/updateLocale.d.ts   |   8 +
 node_modules/dayjs/plugin/updateLocale.js     |   1 +
 node_modules/dayjs/plugin/utc.d.ts            |  19 +
 node_modules/dayjs/plugin/utc.js              |   1 +
 node_modules/dayjs/plugin/weekOfYear.d.ts     |  12 +
 node_modules/dayjs/plugin/weekOfYear.js       |   1 +
 node_modules/dayjs/plugin/weekYear.d.ts       |  10 +
 node_modules/dayjs/plugin/weekYear.js         |   1 +
 node_modules/dayjs/plugin/weekday.d.ts        |  12 +
 node_modules/dayjs/plugin/weekday.js          |   1 +
 package-lock.json                             |  16 +
 package.json                                  |   6 +
 pages/component/newCalendar/index.js          | 378 +++++++
 pages/component/newCalendar/index.json        |   4 +
 pages/component/newCalendar/index.wxml        |  61 ++
 pages/component/newCalendar/index.wxss        | 168 +++
 pages/component/newCalendar/xx_calendar.js    | 986 ++++++++++++++++++
 pages/list/activitynew/index.js               |   5 +-
 pages/list/activitynew/index.json             |   3 +-
 pages/list/museum/index.js                    |  25 +-
 pages/list/museum/index.wxml                  |   2 +-
 project.config.json                           |   7 +-
 472 files changed, 15237 insertions(+), 17 deletions(-)
 create mode 100644 miniprogram_npm/chinese-workday/index.js
 create mode 100644 miniprogram_npm/chinese-workday/index.js.map
 create mode 100644 miniprogram_npm/dayjs/index.js
 create mode 100644 miniprogram_npm/dayjs/index.js.map
 create mode 100644 node_modules/chinese-workday/.editorconfig
 create mode 100644 node_modules/chinese-workday/.travis.yml
 create mode 100644 node_modules/chinese-workday/LICENSE
 create mode 100644 node_modules/chinese-workday/README.md
 create mode 100644 node_modules/chinese-workday/index.d.ts
 create mode 100644 node_modules/chinese-workday/index.js
 create mode 100644 node_modules/chinese-workday/package.json
 create mode 100644 node_modules/chinese-workday/test.js
 create mode 100644 node_modules/dayjs/.editorconfig
 create mode 100644 node_modules/dayjs/CHANGELOG.md
 create mode 100644 node_modules/dayjs/LICENSE
 create mode 100644 node_modules/dayjs/README.md
 create mode 100644 node_modules/dayjs/dayjs.min.js
 create mode 100644 node_modules/dayjs/esm/constant.js
 create mode 100644 node_modules/dayjs/esm/index.d.ts
 create mode 100644 node_modules/dayjs/esm/index.js
 create mode 100644 node_modules/dayjs/esm/locale/af.js
 create mode 100644 node_modules/dayjs/esm/locale/am.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-dz.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-iq.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-kw.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-ly.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-ma.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-sa.js
 create mode 100644 node_modules/dayjs/esm/locale/ar-tn.js
 create mode 100644 node_modules/dayjs/esm/locale/ar.js
 create mode 100644 node_modules/dayjs/esm/locale/az.js
 create mode 100644 node_modules/dayjs/esm/locale/be.js
 create mode 100644 node_modules/dayjs/esm/locale/bg.js
 create mode 100644 node_modules/dayjs/esm/locale/bi.js
 create mode 100644 node_modules/dayjs/esm/locale/bm.js
 create mode 100644 node_modules/dayjs/esm/locale/bn-bd.js
 create mode 100644 node_modules/dayjs/esm/locale/bn.js
 create mode 100644 node_modules/dayjs/esm/locale/bo.js
 create mode 100644 node_modules/dayjs/esm/locale/br.js
 create mode 100644 node_modules/dayjs/esm/locale/bs.js
 create mode 100644 node_modules/dayjs/esm/locale/ca.js
 create mode 100644 node_modules/dayjs/esm/locale/cs.js
 create mode 100644 node_modules/dayjs/esm/locale/cv.js
 create mode 100644 node_modules/dayjs/esm/locale/cy.js
 create mode 100644 node_modules/dayjs/esm/locale/da.js
 create mode 100644 node_modules/dayjs/esm/locale/de-at.js
 create mode 100644 node_modules/dayjs/esm/locale/de-ch.js
 create mode 100644 node_modules/dayjs/esm/locale/de.js
 create mode 100644 node_modules/dayjs/esm/locale/dv.js
 create mode 100644 node_modules/dayjs/esm/locale/el.js
 create mode 100644 node_modules/dayjs/esm/locale/en-au.js
 create mode 100644 node_modules/dayjs/esm/locale/en-ca.js
 create mode 100644 node_modules/dayjs/esm/locale/en-gb.js
 create mode 100644 node_modules/dayjs/esm/locale/en-ie.js
 create mode 100644 node_modules/dayjs/esm/locale/en-il.js
 create mode 100644 node_modules/dayjs/esm/locale/en-in.js
 create mode 100644 node_modules/dayjs/esm/locale/en-nz.js
 create mode 100644 node_modules/dayjs/esm/locale/en-sg.js
 create mode 100644 node_modules/dayjs/esm/locale/en-tt.js
 create mode 100644 node_modules/dayjs/esm/locale/en.js
 create mode 100644 node_modules/dayjs/esm/locale/eo.js
 create mode 100644 node_modules/dayjs/esm/locale/es-do.js
 create mode 100644 node_modules/dayjs/esm/locale/es-mx.js
 create mode 100644 node_modules/dayjs/esm/locale/es-pr.js
 create mode 100644 node_modules/dayjs/esm/locale/es-us.js
 create mode 100644 node_modules/dayjs/esm/locale/es.js
 create mode 100644 node_modules/dayjs/esm/locale/et.js
 create mode 100644 node_modules/dayjs/esm/locale/eu.js
 create mode 100644 node_modules/dayjs/esm/locale/fa.js
 create mode 100644 node_modules/dayjs/esm/locale/fi.js
 create mode 100644 node_modules/dayjs/esm/locale/fo.js
 create mode 100644 node_modules/dayjs/esm/locale/fr-ca.js
 create mode 100644 node_modules/dayjs/esm/locale/fr-ch.js
 create mode 100644 node_modules/dayjs/esm/locale/fr.js
 create mode 100644 node_modules/dayjs/esm/locale/fy.js
 create mode 100644 node_modules/dayjs/esm/locale/ga.js
 create mode 100644 node_modules/dayjs/esm/locale/gd.js
 create mode 100644 node_modules/dayjs/esm/locale/gl.js
 create mode 100644 node_modules/dayjs/esm/locale/gom-latn.js
 create mode 100644 node_modules/dayjs/esm/locale/gu.js
 create mode 100644 node_modules/dayjs/esm/locale/he.js
 create mode 100644 node_modules/dayjs/esm/locale/hi.js
 create mode 100644 node_modules/dayjs/esm/locale/hr.js
 create mode 100644 node_modules/dayjs/esm/locale/ht.js
 create mode 100644 node_modules/dayjs/esm/locale/hu.js
 create mode 100644 node_modules/dayjs/esm/locale/hy-am.js
 create mode 100644 node_modules/dayjs/esm/locale/id.js
 create mode 100644 node_modules/dayjs/esm/locale/index.d.ts
 create mode 100644 node_modules/dayjs/esm/locale/is.js
 create mode 100644 node_modules/dayjs/esm/locale/it-ch.js
 create mode 100644 node_modules/dayjs/esm/locale/it.js
 create mode 100644 node_modules/dayjs/esm/locale/ja.js
 create mode 100644 node_modules/dayjs/esm/locale/jv.js
 create mode 100644 node_modules/dayjs/esm/locale/ka.js
 create mode 100644 node_modules/dayjs/esm/locale/kk.js
 create mode 100644 node_modules/dayjs/esm/locale/km.js
 create mode 100644 node_modules/dayjs/esm/locale/kn.js
 create mode 100644 node_modules/dayjs/esm/locale/ko.js
 create mode 100644 node_modules/dayjs/esm/locale/ku.js
 create mode 100644 node_modules/dayjs/esm/locale/ky.js
 create mode 100644 node_modules/dayjs/esm/locale/lb.js
 create mode 100644 node_modules/dayjs/esm/locale/lo.js
 create mode 100644 node_modules/dayjs/esm/locale/lt.js
 create mode 100644 node_modules/dayjs/esm/locale/lv.js
 create mode 100644 node_modules/dayjs/esm/locale/me.js
 create mode 100644 node_modules/dayjs/esm/locale/mi.js
 create mode 100644 node_modules/dayjs/esm/locale/mk.js
 create mode 100644 node_modules/dayjs/esm/locale/ml.js
 create mode 100644 node_modules/dayjs/esm/locale/mn.js
 create mode 100644 node_modules/dayjs/esm/locale/mr.js
 create mode 100644 node_modules/dayjs/esm/locale/ms-my.js
 create mode 100644 node_modules/dayjs/esm/locale/ms.js
 create mode 100644 node_modules/dayjs/esm/locale/mt.js
 create mode 100644 node_modules/dayjs/esm/locale/my.js
 create mode 100644 node_modules/dayjs/esm/locale/nb.js
 create mode 100644 node_modules/dayjs/esm/locale/ne.js
 create mode 100644 node_modules/dayjs/esm/locale/nl-be.js
 create mode 100644 node_modules/dayjs/esm/locale/nl.js
 create mode 100644 node_modules/dayjs/esm/locale/nn.js
 create mode 100644 node_modules/dayjs/esm/locale/oc-lnc.js
 create mode 100644 node_modules/dayjs/esm/locale/pa-in.js
 create mode 100644 node_modules/dayjs/esm/locale/pl.js
 create mode 100644 node_modules/dayjs/esm/locale/pt-br.js
 create mode 100644 node_modules/dayjs/esm/locale/pt.js
 create mode 100644 node_modules/dayjs/esm/locale/rn.js
 create mode 100644 node_modules/dayjs/esm/locale/ro.js
 create mode 100644 node_modules/dayjs/esm/locale/ru.js
 create mode 100644 node_modules/dayjs/esm/locale/rw.js
 create mode 100644 node_modules/dayjs/esm/locale/sd.js
 create mode 100644 node_modules/dayjs/esm/locale/se.js
 create mode 100644 node_modules/dayjs/esm/locale/si.js
 create mode 100644 node_modules/dayjs/esm/locale/sk.js
 create mode 100644 node_modules/dayjs/esm/locale/sl.js
 create mode 100644 node_modules/dayjs/esm/locale/sq.js
 create mode 100644 node_modules/dayjs/esm/locale/sr-cyrl.js
 create mode 100644 node_modules/dayjs/esm/locale/sr.js
 create mode 100644 node_modules/dayjs/esm/locale/ss.js
 create mode 100644 node_modules/dayjs/esm/locale/sv-fi.js
 create mode 100644 node_modules/dayjs/esm/locale/sv.js
 create mode 100644 node_modules/dayjs/esm/locale/sw.js
 create mode 100644 node_modules/dayjs/esm/locale/ta.js
 create mode 100644 node_modules/dayjs/esm/locale/te.js
 create mode 100644 node_modules/dayjs/esm/locale/tet.js
 create mode 100644 node_modules/dayjs/esm/locale/tg.js
 create mode 100644 node_modules/dayjs/esm/locale/th.js
 create mode 100644 node_modules/dayjs/esm/locale/tk.js
 create mode 100644 node_modules/dayjs/esm/locale/tl-ph.js
 create mode 100644 node_modules/dayjs/esm/locale/tlh.js
 create mode 100644 node_modules/dayjs/esm/locale/tr.js
 create mode 100644 node_modules/dayjs/esm/locale/types.d.ts
 create mode 100644 node_modules/dayjs/esm/locale/tzl.js
 create mode 100644 node_modules/dayjs/esm/locale/tzm-latn.js
 create mode 100644 node_modules/dayjs/esm/locale/tzm.js
 create mode 100644 node_modules/dayjs/esm/locale/ug-cn.js
 create mode 100644 node_modules/dayjs/esm/locale/uk.js
 create mode 100644 node_modules/dayjs/esm/locale/ur.js
 create mode 100644 node_modules/dayjs/esm/locale/uz-latn.js
 create mode 100644 node_modules/dayjs/esm/locale/uz.js
 create mode 100644 node_modules/dayjs/esm/locale/vi.js
 create mode 100644 node_modules/dayjs/esm/locale/x-pseudo.js
 create mode 100644 node_modules/dayjs/esm/locale/yo.js
 create mode 100644 node_modules/dayjs/esm/locale/zh-cn.js
 create mode 100644 node_modules/dayjs/esm/locale/zh-hk.js
 create mode 100644 node_modules/dayjs/esm/locale/zh-tw.js
 create mode 100644 node_modules/dayjs/esm/locale/zh.js
 create mode 100644 node_modules/dayjs/esm/plugin/advancedFormat/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/advancedFormat/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/arraySupport/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/arraySupport/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/badMutable/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/badMutable/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/bigIntSupport/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/bigIntSupport/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/buddhistEra/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/buddhistEra/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/calendar/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/calendar/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/customParseFormat/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/customParseFormat/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/dayOfYear/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/dayOfYear/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/devHelper/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/devHelper/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/duration/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/duration/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isBetween/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isBetween/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isLeapYear/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isLeapYear/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isMoment/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isMoment/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isSameOrAfter/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isSameOrAfter/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isSameOrBefore/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isSameOrBefore/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isToday/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isToday/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isTomorrow/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isTomorrow/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isYesterday/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isYesterday/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isoWeek/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isoWeek/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/isoWeeksInYear/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/isoWeeksInYear/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/localeData/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/localeData/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/localizedFormat/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/localizedFormat/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/localizedFormat/utils.js
 create mode 100644 node_modules/dayjs/esm/plugin/minMax/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/minMax/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/objectSupport/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/objectSupport/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/pluralGetSet/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/pluralGetSet/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/preParsePostFormat/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/preParsePostFormat/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/quarterOfYear/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/quarterOfYear/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/relativeTime/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/relativeTime/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/timezone/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/timezone/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/toArray/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/toArray/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/toObject/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/toObject/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/updateLocale/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/updateLocale/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/utc/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/utc/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/weekOfYear/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/weekOfYear/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/weekYear/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/weekYear/index.js
 create mode 100644 node_modules/dayjs/esm/plugin/weekday/index.d.ts
 create mode 100644 node_modules/dayjs/esm/plugin/weekday/index.js
 create mode 100644 node_modules/dayjs/esm/utils.js
 create mode 100644 node_modules/dayjs/index.d.ts
 create mode 100644 node_modules/dayjs/locale.json
 create mode 100644 node_modules/dayjs/locale/af.js
 create mode 100644 node_modules/dayjs/locale/am.js
 create mode 100644 node_modules/dayjs/locale/ar-dz.js
 create mode 100644 node_modules/dayjs/locale/ar-iq.js
 create mode 100644 node_modules/dayjs/locale/ar-kw.js
 create mode 100644 node_modules/dayjs/locale/ar-ly.js
 create mode 100644 node_modules/dayjs/locale/ar-ma.js
 create mode 100644 node_modules/dayjs/locale/ar-sa.js
 create mode 100644 node_modules/dayjs/locale/ar-tn.js
 create mode 100644 node_modules/dayjs/locale/ar.js
 create mode 100644 node_modules/dayjs/locale/az.js
 create mode 100644 node_modules/dayjs/locale/be.js
 create mode 100644 node_modules/dayjs/locale/bg.js
 create mode 100644 node_modules/dayjs/locale/bi.js
 create mode 100644 node_modules/dayjs/locale/bm.js
 create mode 100644 node_modules/dayjs/locale/bn-bd.js
 create mode 100644 node_modules/dayjs/locale/bn.js
 create mode 100644 node_modules/dayjs/locale/bo.js
 create mode 100644 node_modules/dayjs/locale/br.js
 create mode 100644 node_modules/dayjs/locale/bs.js
 create mode 100644 node_modules/dayjs/locale/ca.js
 create mode 100644 node_modules/dayjs/locale/cs.js
 create mode 100644 node_modules/dayjs/locale/cv.js
 create mode 100644 node_modules/dayjs/locale/cy.js
 create mode 100644 node_modules/dayjs/locale/da.js
 create mode 100644 node_modules/dayjs/locale/de-at.js
 create mode 100644 node_modules/dayjs/locale/de-ch.js
 create mode 100644 node_modules/dayjs/locale/de.js
 create mode 100644 node_modules/dayjs/locale/dv.js
 create mode 100644 node_modules/dayjs/locale/el.js
 create mode 100644 node_modules/dayjs/locale/en-au.js
 create mode 100644 node_modules/dayjs/locale/en-ca.js
 create mode 100644 node_modules/dayjs/locale/en-gb.js
 create mode 100644 node_modules/dayjs/locale/en-ie.js
 create mode 100644 node_modules/dayjs/locale/en-il.js
 create mode 100644 node_modules/dayjs/locale/en-in.js
 create mode 100644 node_modules/dayjs/locale/en-nz.js
 create mode 100644 node_modules/dayjs/locale/en-sg.js
 create mode 100644 node_modules/dayjs/locale/en-tt.js
 create mode 100644 node_modules/dayjs/locale/en.js
 create mode 100644 node_modules/dayjs/locale/eo.js
 create mode 100644 node_modules/dayjs/locale/es-do.js
 create mode 100644 node_modules/dayjs/locale/es-mx.js
 create mode 100644 node_modules/dayjs/locale/es-pr.js
 create mode 100644 node_modules/dayjs/locale/es-us.js
 create mode 100644 node_modules/dayjs/locale/es.js
 create mode 100644 node_modules/dayjs/locale/et.js
 create mode 100644 node_modules/dayjs/locale/eu.js
 create mode 100644 node_modules/dayjs/locale/fa.js
 create mode 100644 node_modules/dayjs/locale/fi.js
 create mode 100644 node_modules/dayjs/locale/fo.js
 create mode 100644 node_modules/dayjs/locale/fr-ca.js
 create mode 100644 node_modules/dayjs/locale/fr-ch.js
 create mode 100644 node_modules/dayjs/locale/fr.js
 create mode 100644 node_modules/dayjs/locale/fy.js
 create mode 100644 node_modules/dayjs/locale/ga.js
 create mode 100644 node_modules/dayjs/locale/gd.js
 create mode 100644 node_modules/dayjs/locale/gl.js
 create mode 100644 node_modules/dayjs/locale/gom-latn.js
 create mode 100644 node_modules/dayjs/locale/gu.js
 create mode 100644 node_modules/dayjs/locale/he.js
 create mode 100644 node_modules/dayjs/locale/hi.js
 create mode 100644 node_modules/dayjs/locale/hr.js
 create mode 100644 node_modules/dayjs/locale/ht.js
 create mode 100644 node_modules/dayjs/locale/hu.js
 create mode 100644 node_modules/dayjs/locale/hy-am.js
 create mode 100644 node_modules/dayjs/locale/id.js
 create mode 100644 node_modules/dayjs/locale/index.d.ts
 create mode 100644 node_modules/dayjs/locale/is.js
 create mode 100644 node_modules/dayjs/locale/it-ch.js
 create mode 100644 node_modules/dayjs/locale/it.js
 create mode 100644 node_modules/dayjs/locale/ja.js
 create mode 100644 node_modules/dayjs/locale/jv.js
 create mode 100644 node_modules/dayjs/locale/ka.js
 create mode 100644 node_modules/dayjs/locale/kk.js
 create mode 100644 node_modules/dayjs/locale/km.js
 create mode 100644 node_modules/dayjs/locale/kn.js
 create mode 100644 node_modules/dayjs/locale/ko.js
 create mode 100644 node_modules/dayjs/locale/ku.js
 create mode 100644 node_modules/dayjs/locale/ky.js
 create mode 100644 node_modules/dayjs/locale/lb.js
 create mode 100644 node_modules/dayjs/locale/lo.js
 create mode 100644 node_modules/dayjs/locale/lt.js
 create mode 100644 node_modules/dayjs/locale/lv.js
 create mode 100644 node_modules/dayjs/locale/me.js
 create mode 100644 node_modules/dayjs/locale/mi.js
 create mode 100644 node_modules/dayjs/locale/mk.js
 create mode 100644 node_modules/dayjs/locale/ml.js
 create mode 100644 node_modules/dayjs/locale/mn.js
 create mode 100644 node_modules/dayjs/locale/mr.js
 create mode 100644 node_modules/dayjs/locale/ms-my.js
 create mode 100644 node_modules/dayjs/locale/ms.js
 create mode 100644 node_modules/dayjs/locale/mt.js
 create mode 100644 node_modules/dayjs/locale/my.js
 create mode 100644 node_modules/dayjs/locale/nb.js
 create mode 100644 node_modules/dayjs/locale/ne.js
 create mode 100644 node_modules/dayjs/locale/nl-be.js
 create mode 100644 node_modules/dayjs/locale/nl.js
 create mode 100644 node_modules/dayjs/locale/nn.js
 create mode 100644 node_modules/dayjs/locale/oc-lnc.js
 create mode 100644 node_modules/dayjs/locale/pa-in.js
 create mode 100644 node_modules/dayjs/locale/pl.js
 create mode 100644 node_modules/dayjs/locale/pt-br.js
 create mode 100644 node_modules/dayjs/locale/pt.js
 create mode 100644 node_modules/dayjs/locale/rn.js
 create mode 100644 node_modules/dayjs/locale/ro.js
 create mode 100644 node_modules/dayjs/locale/ru.js
 create mode 100644 node_modules/dayjs/locale/rw.js
 create mode 100644 node_modules/dayjs/locale/sd.js
 create mode 100644 node_modules/dayjs/locale/se.js
 create mode 100644 node_modules/dayjs/locale/si.js
 create mode 100644 node_modules/dayjs/locale/sk.js
 create mode 100644 node_modules/dayjs/locale/sl.js
 create mode 100644 node_modules/dayjs/locale/sq.js
 create mode 100644 node_modules/dayjs/locale/sr-cyrl.js
 create mode 100644 node_modules/dayjs/locale/sr.js
 create mode 100644 node_modules/dayjs/locale/ss.js
 create mode 100644 node_modules/dayjs/locale/sv-fi.js
 create mode 100644 node_modules/dayjs/locale/sv.js
 create mode 100644 node_modules/dayjs/locale/sw.js
 create mode 100644 node_modules/dayjs/locale/ta.js
 create mode 100644 node_modules/dayjs/locale/te.js
 create mode 100644 node_modules/dayjs/locale/tet.js
 create mode 100644 node_modules/dayjs/locale/tg.js
 create mode 100644 node_modules/dayjs/locale/th.js
 create mode 100644 node_modules/dayjs/locale/tk.js
 create mode 100644 node_modules/dayjs/locale/tl-ph.js
 create mode 100644 node_modules/dayjs/locale/tlh.js
 create mode 100644 node_modules/dayjs/locale/tr.js
 create mode 100644 node_modules/dayjs/locale/types.d.ts
 create mode 100644 node_modules/dayjs/locale/tzl.js
 create mode 100644 node_modules/dayjs/locale/tzm-latn.js
 create mode 100644 node_modules/dayjs/locale/tzm.js
 create mode 100644 node_modules/dayjs/locale/ug-cn.js
 create mode 100644 node_modules/dayjs/locale/uk.js
 create mode 100644 node_modules/dayjs/locale/ur.js
 create mode 100644 node_modules/dayjs/locale/uz-latn.js
 create mode 100644 node_modules/dayjs/locale/uz.js
 create mode 100644 node_modules/dayjs/locale/vi.js
 create mode 100644 node_modules/dayjs/locale/x-pseudo.js
 create mode 100644 node_modules/dayjs/locale/yo.js
 create mode 100644 node_modules/dayjs/locale/zh-cn.js
 create mode 100644 node_modules/dayjs/locale/zh-hk.js
 create mode 100644 node_modules/dayjs/locale/zh-tw.js
 create mode 100644 node_modules/dayjs/locale/zh.js
 create mode 100644 node_modules/dayjs/package.json
 create mode 100644 node_modules/dayjs/plugin/advancedFormat.d.ts
 create mode 100644 node_modules/dayjs/plugin/advancedFormat.js
 create mode 100644 node_modules/dayjs/plugin/arraySupport.d.ts
 create mode 100644 node_modules/dayjs/plugin/arraySupport.js
 create mode 100644 node_modules/dayjs/plugin/badMutable.d.ts
 create mode 100644 node_modules/dayjs/plugin/badMutable.js
 create mode 100644 node_modules/dayjs/plugin/bigIntSupport.d.ts
 create mode 100644 node_modules/dayjs/plugin/bigIntSupport.js
 create mode 100644 node_modules/dayjs/plugin/buddhistEra.d.ts
 create mode 100644 node_modules/dayjs/plugin/buddhistEra.js
 create mode 100644 node_modules/dayjs/plugin/calendar.d.ts
 create mode 100644 node_modules/dayjs/plugin/calendar.js
 create mode 100644 node_modules/dayjs/plugin/customParseFormat.d.ts
 create mode 100644 node_modules/dayjs/plugin/customParseFormat.js
 create mode 100644 node_modules/dayjs/plugin/dayOfYear.d.ts
 create mode 100644 node_modules/dayjs/plugin/dayOfYear.js
 create mode 100644 node_modules/dayjs/plugin/devHelper.d.ts
 create mode 100644 node_modules/dayjs/plugin/devHelper.js
 create mode 100644 node_modules/dayjs/plugin/duration.d.ts
 create mode 100644 node_modules/dayjs/plugin/duration.js
 create mode 100644 node_modules/dayjs/plugin/isBetween.d.ts
 create mode 100644 node_modules/dayjs/plugin/isBetween.js
 create mode 100644 node_modules/dayjs/plugin/isLeapYear.d.ts
 create mode 100644 node_modules/dayjs/plugin/isLeapYear.js
 create mode 100644 node_modules/dayjs/plugin/isMoment.d.ts
 create mode 100644 node_modules/dayjs/plugin/isMoment.js
 create mode 100644 node_modules/dayjs/plugin/isSameOrAfter.d.ts
 create mode 100644 node_modules/dayjs/plugin/isSameOrAfter.js
 create mode 100644 node_modules/dayjs/plugin/isSameOrBefore.d.ts
 create mode 100644 node_modules/dayjs/plugin/isSameOrBefore.js
 create mode 100644 node_modules/dayjs/plugin/isToday.d.ts
 create mode 100644 node_modules/dayjs/plugin/isToday.js
 create mode 100644 node_modules/dayjs/plugin/isTomorrow.d.ts
 create mode 100644 node_modules/dayjs/plugin/isTomorrow.js
 create mode 100644 node_modules/dayjs/plugin/isYesterday.d.ts
 create mode 100644 node_modules/dayjs/plugin/isYesterday.js
 create mode 100644 node_modules/dayjs/plugin/isoWeek.d.ts
 create mode 100644 node_modules/dayjs/plugin/isoWeek.js
 create mode 100644 node_modules/dayjs/plugin/isoWeeksInYear.d.ts
 create mode 100644 node_modules/dayjs/plugin/isoWeeksInYear.js
 create mode 100644 node_modules/dayjs/plugin/localeData.d.ts
 create mode 100644 node_modules/dayjs/plugin/localeData.js
 create mode 100644 node_modules/dayjs/plugin/localizedFormat.d.ts
 create mode 100644 node_modules/dayjs/plugin/localizedFormat.js
 create mode 100644 node_modules/dayjs/plugin/minMax.d.ts
 create mode 100644 node_modules/dayjs/plugin/minMax.js
 create mode 100644 node_modules/dayjs/plugin/objectSupport.d.ts
 create mode 100644 node_modules/dayjs/plugin/objectSupport.js
 create mode 100644 node_modules/dayjs/plugin/pluralGetSet.d.ts
 create mode 100644 node_modules/dayjs/plugin/pluralGetSet.js
 create mode 100644 node_modules/dayjs/plugin/preParsePostFormat.d.ts
 create mode 100644 node_modules/dayjs/plugin/preParsePostFormat.js
 create mode 100644 node_modules/dayjs/plugin/quarterOfYear.d.ts
 create mode 100644 node_modules/dayjs/plugin/quarterOfYear.js
 create mode 100644 node_modules/dayjs/plugin/relativeTime.d.ts
 create mode 100644 node_modules/dayjs/plugin/relativeTime.js
 create mode 100644 node_modules/dayjs/plugin/timezone.d.ts
 create mode 100644 node_modules/dayjs/plugin/timezone.js
 create mode 100644 node_modules/dayjs/plugin/toArray.d.ts
 create mode 100644 node_modules/dayjs/plugin/toArray.js
 create mode 100644 node_modules/dayjs/plugin/toObject.d.ts
 create mode 100644 node_modules/dayjs/plugin/toObject.js
 create mode 100644 node_modules/dayjs/plugin/updateLocale.d.ts
 create mode 100644 node_modules/dayjs/plugin/updateLocale.js
 create mode 100644 node_modules/dayjs/plugin/utc.d.ts
 create mode 100644 node_modules/dayjs/plugin/utc.js
 create mode 100644 node_modules/dayjs/plugin/weekOfYear.d.ts
 create mode 100644 node_modules/dayjs/plugin/weekOfYear.js
 create mode 100644 node_modules/dayjs/plugin/weekYear.d.ts
 create mode 100644 node_modules/dayjs/plugin/weekYear.js
 create mode 100644 node_modules/dayjs/plugin/weekday.d.ts
 create mode 100644 node_modules/dayjs/plugin/weekday.js
 create mode 100644 package-lock.json
 create mode 100644 package.json
 create mode 100644 pages/component/newCalendar/index.js
 create mode 100644 pages/component/newCalendar/index.json
 create mode 100644 pages/component/newCalendar/index.wxml
 create mode 100644 pages/component/newCalendar/index.wxss
 create mode 100644 pages/component/newCalendar/xx_calendar.js

diff --git a/app.js b/app.js
index f3c5d9f..5e58be0 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.isTest106? true : false;
+      data.isTest = data.isTest107? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/miniprogram_npm/chinese-workday/index.js b/miniprogram_npm/chinese-workday/index.js
new file mode 100644
index 0000000..4ed1a51
--- /dev/null
+++ b/miniprogram_npm/chinese-workday/index.js
@@ -0,0 +1,326 @@
+module.exports = (function() {
+var __MODS__ = {};
+var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexports: {} }; __MODS__[modId] = { status: 0, func: func, req: req, m: m }; };
+var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
+var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
+var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
+__DEFINE__(1711522529462, function(require, module, exports) {
+// from
+// - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm
+// - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm
+// - 2019调整 https://www.gov.cn/zhengce/content/2019-03/22/content_5375877.htm
+// - 2020 https://www.gov.cn/zhengce/content/2019-11/21/content_5454164.htm
+// - 2021 https://www.gov.cn/zhengce/content/2020-11/25/content_5564127.htm
+// - 2022 https://www.gov.cn/zhengce/content/2021-10/25/content_5644835.htm
+// - 2023 https://www.gov.cn/zhengce/zhengceku/2022-12/08/content_5730844.htm
+// - 2024 https://www.gov.cn/zhengce/zhengceku/202310/content_6911528.htm
+
+
+module.exports = {
+  isWorkday: isWorkday,
+  isHoliday: isHoliday,
+  getFestival: getFestival,
+  isAddtionalWorkday: isAddtionalWorkday,
+};
+
+var HOLIDAYS = {
+  "2018-02-15": "春节",
+  "2018-02-16": "春节",
+  "2018-02-17": "春节",
+  "2018-02-18": "春节",
+  "2018-02-19": "春节",
+  "2018-02-20": "春节",
+  "2018-02-21": "春节",
+  "2018-04-05": "清明节",
+  "2018-04-06": "清明节",
+  "2018-04-07": "清明节",
+  "2018-04-29": "劳动节",
+  "2018-04-30": "劳动节",
+  "2018-05-01": "劳动节",
+  "2018-06-18": "端午节",
+  "2018-09-24": "中秋节",
+  "2018-10-01": "国庆节",
+  "2018-10-02": "国庆节",
+  "2018-10-03": "国庆节",
+  "2018-10-04": "国庆节",
+  "2018-10-05": "国庆节",
+  "2018-10-06": "国庆节",
+  "2018-10-07": "国庆节",
+  "2018-12-30": "元旦",
+  "2018-12-31": "元旦",
+  "2019-01-01": "元旦",
+  "2019-02-04": "春节",
+  "2019-02-05": "春节",
+  "2019-02-06": "春节",
+  "2019-02-07": "春节",
+  "2019-02-08": "春节",
+  "2019-02-09": "春节",
+  "2019-02-10": "春节",
+  "2019-04-05": "清明节",
+  "2019-04-06": "清明节",
+  "2019-04-07": "清明节",
+  "2019-05-01": "劳动节",
+  "2019-05-02": "劳动节",
+  "2019-05-03": "劳动节",
+  "2019-05-04": "劳动节",
+  "2019-06-07": "端午节",
+  "2019-06-08": "端午节",
+  "2019-06-09": "端午节",
+  "2019-09-13": "中秋节",
+  "2019-09-14": "中秋节",
+  "2019-09-15": "中秋节",
+  "2019-10-01": "国庆节",
+  "2019-10-02": "国庆节",
+  "2019-10-03": "国庆节",
+  "2019-10-04": "国庆节",
+  "2019-10-05": "国庆节",
+  "2019-10-06": "国庆节",
+  "2019-10-07": "国庆节",
+  "2020-01-01": "元旦",
+  "2020-01-24": "春节",
+  "2020-01-25": "春节",
+  "2020-01-26": "春节",
+  "2020-01-27": "春节",
+  "2020-01-28": "春节",
+  "2020-01-29": "春节",
+  "2020-01-30": "春节",
+  "2020-04-04": "清明节",
+  "2020-04-05": "清明节",
+  "2020-04-06": "清明节",
+  "2020-05-01": "劳动节",
+  "2020-05-02": "劳动节",
+  "2020-05-03": "劳动节",
+  "2020-05-04": "劳动节",
+  "2020-05-05": "劳动节",
+  "2020-06-25": "端午节",
+  "2020-06-26": "端午节",
+  "2020-06-27": "端午节",
+  "2020-10-01": "国庆节",
+  "2020-10-02": "国庆节",
+  "2020-10-03": "国庆节",
+  "2020-10-04": "国庆节",
+  "2020-10-05": "国庆节",
+  "2020-10-06": "国庆节",
+  "2020-10-07": "国庆节",
+  "2020-10-08": "国庆节",
+  "2021-01-01": "元旦",
+  "2021-02-11": "春节",
+  "2021-02-12": "春节",
+  "2021-02-13": "春节",
+  "2021-02-14": "春节",
+  "2021-02-15": "春节",
+  "2021-02-16": "春节",
+  "2021-02-17": "春节",
+  "2021-04-03": "清明节",
+  "2021-04-04": "清明节",
+  "2021-04-05": "清明节",
+  "2021-05-01": "劳动节",
+  "2021-05-02": "劳动节",
+  "2021-05-03": "劳动节",
+  "2021-05-04": "劳动节",
+  "2021-05-05": "劳动节",
+  "2021-06-12": "端午节",
+  "2021-06-13": "端午节",
+  "2021-06-14": "端午节",
+  "2021-09-19": "中秋节",
+  "2021-09-20": "中秋节",
+  "2021-09-21": "中秋节",
+  "2021-10-01": "国庆节",
+  "2021-10-02": "国庆节",
+  "2021-10-03": "国庆节",
+  "2021-10-04": "国庆节",
+  "2021-10-05": "国庆节",
+  "2021-10-06": "国庆节",
+  "2021-10-07": "国庆节",
+  "2022-01-01": "元旦",
+  "2022-01-02": "元旦",
+  "2022-01-03": "元旦",
+  "2022-01-31": "春节",
+  "2022-02-01": "春节",
+  "2022-02-02": "春节",
+  "2022-02-03": "春节",
+  "2022-02-04": "春节",
+  "2022-02-05": "春节",
+  "2022-02-06": "春节",
+  "2022-04-03": "清明节",
+  "2022-04-04": "清明节",
+  "2022-04-05": "清明节",
+  "2022-04-30": "劳动节",
+  "2022-05-01": "劳动节",
+  "2022-05-02": "劳动节",
+  "2022-05-03": "劳动节",
+  "2022-05-04": "劳动节",
+  "2022-06-03": "端午节",
+  "2022-06-04": "端午节",
+  "2022-06-05": "端午节",
+  "2022-09-10": "中秋节",
+  "2022-09-11": "中秋节",
+  "2022-09-12": "中秋节",
+  "2022-10-01": "国庆节",
+  "2022-10-02": "国庆节",
+  "2022-10-03": "国庆节",
+  "2022-10-04": "国庆节",
+  "2022-10-05": "国庆节",
+  "2022-10-06": "国庆节",
+  "2022-10-07": "国庆节",
+  "2022-12-31": "元旦",
+  "2023-01-01": "元旦",
+  "2023-01-02": "元旦",
+  "2023-01-21": "春节",
+  "2023-01-22": "春节",
+  "2023-01-23": "春节",
+  "2023-01-24": "春节",
+  "2023-01-25": "春节",
+  "2023-01-26": "春节",
+  "2023-01-27": "春节",
+  "2023-04-05": "清明节",
+  "2023-04-29": "劳动节",
+  "2023-04-30": "劳动节",
+  "2023-05-01": "劳动节",
+  "2023-05-02": "劳动节",
+  "2023-05-03": "劳动节",
+  "2023-06-22": "端午节",
+  "2023-06-23": "端午节",
+  "2023-06-24": "端午节",
+  "2023-09-29": "中秋节",
+  "2023-09-30": "中秋节",
+  "2023-10-01": "国庆节",
+  "2023-10-02": "国庆节",
+  "2023-10-03": "国庆节",
+  "2023-10-04": "国庆节",
+  "2023-10-05": "国庆节",
+  "2023-10-06": "国庆节",
+  "2024-01-01": "元旦",
+  "2024-02-10": "春节",
+  "2024-02-11": "春节",
+  "2024-02-12": "春节",
+  "2024-02-13": "春节",
+  "2024-02-14": "春节",
+  "2024-02-15": "春节",
+  "2024-02-16": "春节",
+  "2024-02-17": "春节",
+  "2024-04-04": "清明节",
+  "2024-04-05": "清明节",
+  "2024-04-06": "清明节",
+  "2024-05-01": "劳动节",
+  "2024-05-02": "劳动节",
+  "2024-05-03": "劳动节",
+  "2024-05-04": "劳动节",
+  "2024-05-05": "劳动节",
+  "2024-06-10": "端午节",
+  "2024-09-15": "中秋节",
+  "2024-09-16": "中秋节",
+  "2024-09-17": "中秋节",
+  "2024-10-01": "国庆节",
+  "2024-10-02": "国庆节",
+  "2024-10-03": "国庆节",
+  "2024-10-04": "国庆节",
+  "2024-10-05": "国庆节",
+  "2024-10-06": "国庆节",
+  "2024-10-07": "国庆节",
+};
+
+var WEEKENDS_WORKDAY = {
+  "2018-02-11": "补春节",
+  "2018-02-24": "补春节",
+  "2018-04-08": "补清明节",
+  "2018-04-28": "补劳动节",
+  "2018-09-29": "补国庆节",
+  "2018-09-30": "补国庆节",
+  "2018-12-29": "补元旦",
+  "2019-02-02": "补春节",
+  "2019-02-03": "补春节",
+  "2019-04-28": "补劳动节",
+  "2019-05-05": "补劳动节",
+  "2019-09-29": "补国庆节",
+  "2019-10-12": "补国庆节",
+  "2020-01-19": "补春节",
+  "2020-02-01": "补春节",
+  "2020-04-26": "补劳动节",
+  "2020-05-09": "补劳动节",
+  "2020-06-28": "补端午节",
+  "2020-09-27": "补国庆节",
+  "2020-10-10": "补国庆节",
+  "2021-02-07": "补春节",
+  "2021-02-20": "补春节",  
+  "2021-04-25": "补劳动节", 
+  "2021-05-08": "补劳动节", 
+  "2021-09-18": "补中秋节", 
+  "2021-09-26": "补国庆节", 
+  "2021-10-09": "补国庆节", 
+  "2022-01-29": "补春节",
+  "2022-01-30": "补春节",
+  "2022-04-02": "补清明节",
+  "2022-04-24": "补劳动节", 
+  "2022-05-07": "补劳动节", 
+  "2022-10-08": "补国庆节", 
+  "2022-10-09": "补国庆节", 
+  "2023-01-28": "补春节",
+  "2023-01-29": "补春节",
+  "2023-04-23": "补劳动节", 
+  "2023-05-06": "补劳动节", 
+  "2023-06-25": "补端午节", 
+  "2023-10-07": "补国庆节", 
+  "2023-10-08": "补国庆节", 
+  "2024-02-04": "补春节",
+  "2024-02-18": "补春节",
+  "2024-04-07": "补清明节", 
+  "2024-04-28": "补劳动节", 
+  "2024-05-11": "补劳动节", 
+  "2024-09-14": "补中秋节", 
+  "2024-09-29": "补国庆节", 
+  "2024-10-12": "补国庆节", 
+};
+
+function isWorkday(day) {
+  var fd = formatDate(day);
+  if (WEEKENDS_WORKDAY[fd.date]) {
+    return true;
+  } else if (HOLIDAYS[fd.date]) {
+    return false;
+  }
+  return !fd.weekends;
+}
+
+function isHoliday(day) {
+  return !isWorkday(day);
+}
+
+function isAddtionalWorkday(day) {
+  var fd = formatDate(day);
+  return !!WEEKENDS_WORKDAY[fd.date];
+}
+
+function getFestival(day) {
+  var fd = formatDate(day);
+  if (WEEKENDS_WORKDAY[fd.date]) {
+    return WEEKENDS_WORKDAY[fd.date];
+  } else if (HOLIDAYS[fd.date]) {
+    return HOLIDAYS[fd.date]
+  }
+  return fd.weekends ? '周末' : '工作日';
+}
+
+function formatDate(day) {
+  var d = new Date(day),
+    month = "" + (d.getMonth() + 1),
+    day = "" + d.getDate(),
+    year = d.getFullYear();
+  if (month.length < 2) {
+    month = "0" + month
+  };
+  if (day.length < 2) {
+    day = "0" + day
+  };
+
+  return {
+    date: [year, month, day].join("-"),
+    weekends: [0, 6].indexOf(d.getDay()) > -1
+  };
+}
+
+}, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
+return __REQUIRE__(1711522529462);
+})()
+//miniprogram-npm-outsideDeps=[]
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/chinese-workday/index.js.map b/miniprogram_npm/chinese-workday/index.js.map
new file mode 100644
index 0000000..7c2f519
--- /dev/null
+++ b/miniprogram_npm/chinese-workday/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["index.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["// from\n// - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm\n// - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm\n// - 2019调整 https://www.gov.cn/zhengce/content/2019-03/22/content_5375877.htm\n// - 2020 https://www.gov.cn/zhengce/content/2019-11/21/content_5454164.htm\n// - 2021 https://www.gov.cn/zhengce/content/2020-11/25/content_5564127.htm\n// - 2022 https://www.gov.cn/zhengce/content/2021-10/25/content_5644835.htm\n// - 2023 https://www.gov.cn/zhengce/zhengceku/2022-12/08/content_5730844.htm\n// - 2024 https://www.gov.cn/zhengce/zhengceku/202310/content_6911528.htm\n\n\nmodule.exports = {\n  isWorkday: isWorkday,\n  isHoliday: isHoliday,\n  getFestival: getFestival,\n  isAddtionalWorkday: isAddtionalWorkday,\n};\n\nvar HOLIDAYS = {\n  \"2018-02-15\": \"春节\",\n  \"2018-02-16\": \"春节\",\n  \"2018-02-17\": \"春节\",\n  \"2018-02-18\": \"春节\",\n  \"2018-02-19\": \"春节\",\n  \"2018-02-20\": \"春节\",\n  \"2018-02-21\": \"春节\",\n  \"2018-04-05\": \"清明节\",\n  \"2018-04-06\": \"清明节\",\n  \"2018-04-07\": \"清明节\",\n  \"2018-04-29\": \"劳动节\",\n  \"2018-04-30\": \"劳动节\",\n  \"2018-05-01\": \"劳动节\",\n  \"2018-06-18\": \"端午节\",\n  \"2018-09-24\": \"中秋节\",\n  \"2018-10-01\": \"国庆节\",\n  \"2018-10-02\": \"国庆节\",\n  \"2018-10-03\": \"国庆节\",\n  \"2018-10-04\": \"国庆节\",\n  \"2018-10-05\": \"国庆节\",\n  \"2018-10-06\": \"国庆节\",\n  \"2018-10-07\": \"国庆节\",\n  \"2018-12-30\": \"元旦\",\n  \"2018-12-31\": \"元旦\",\n  \"2019-01-01\": \"元旦\",\n  \"2019-02-04\": \"春节\",\n  \"2019-02-05\": \"春节\",\n  \"2019-02-06\": \"春节\",\n  \"2019-02-07\": \"春节\",\n  \"2019-02-08\": \"春节\",\n  \"2019-02-09\": \"春节\",\n  \"2019-02-10\": \"春节\",\n  \"2019-04-05\": \"清明节\",\n  \"2019-04-06\": \"清明节\",\n  \"2019-04-07\": \"清明节\",\n  \"2019-05-01\": \"劳动节\",\n  \"2019-05-02\": \"劳动节\",\n  \"2019-05-03\": \"劳动节\",\n  \"2019-05-04\": \"劳动节\",\n  \"2019-06-07\": \"端午节\",\n  \"2019-06-08\": \"端午节\",\n  \"2019-06-09\": \"端午节\",\n  \"2019-09-13\": \"中秋节\",\n  \"2019-09-14\": \"中秋节\",\n  \"2019-09-15\": \"中秋节\",\n  \"2019-10-01\": \"国庆节\",\n  \"2019-10-02\": \"国庆节\",\n  \"2019-10-03\": \"国庆节\",\n  \"2019-10-04\": \"国庆节\",\n  \"2019-10-05\": \"国庆节\",\n  \"2019-10-06\": \"国庆节\",\n  \"2019-10-07\": \"国庆节\",\n  \"2020-01-01\": \"元旦\",\n  \"2020-01-24\": \"春节\",\n  \"2020-01-25\": \"春节\",\n  \"2020-01-26\": \"春节\",\n  \"2020-01-27\": \"春节\",\n  \"2020-01-28\": \"春节\",\n  \"2020-01-29\": \"春节\",\n  \"2020-01-30\": \"春节\",\n  \"2020-04-04\": \"清明节\",\n  \"2020-04-05\": \"清明节\",\n  \"2020-04-06\": \"清明节\",\n  \"2020-05-01\": \"劳动节\",\n  \"2020-05-02\": \"劳动节\",\n  \"2020-05-03\": \"劳动节\",\n  \"2020-05-04\": \"劳动节\",\n  \"2020-05-05\": \"劳动节\",\n  \"2020-06-25\": \"端午节\",\n  \"2020-06-26\": \"端午节\",\n  \"2020-06-27\": \"端午节\",\n  \"2020-10-01\": \"国庆节\",\n  \"2020-10-02\": \"国庆节\",\n  \"2020-10-03\": \"国庆节\",\n  \"2020-10-04\": \"国庆节\",\n  \"2020-10-05\": \"国庆节\",\n  \"2020-10-06\": \"国庆节\",\n  \"2020-10-07\": \"国庆节\",\n  \"2020-10-08\": \"国庆节\",\n  \"2021-01-01\": \"元旦\",\n  \"2021-02-11\": \"春节\",\n  \"2021-02-12\": \"春节\",\n  \"2021-02-13\": \"春节\",\n  \"2021-02-14\": \"春节\",\n  \"2021-02-15\": \"春节\",\n  \"2021-02-16\": \"春节\",\n  \"2021-02-17\": \"春节\",\n  \"2021-04-03\": \"清明节\",\n  \"2021-04-04\": \"清明节\",\n  \"2021-04-05\": \"清明节\",\n  \"2021-05-01\": \"劳动节\",\n  \"2021-05-02\": \"劳动节\",\n  \"2021-05-03\": \"劳动节\",\n  \"2021-05-04\": \"劳动节\",\n  \"2021-05-05\": \"劳动节\",\n  \"2021-06-12\": \"端午节\",\n  \"2021-06-13\": \"端午节\",\n  \"2021-06-14\": \"端午节\",\n  \"2021-09-19\": \"中秋节\",\n  \"2021-09-20\": \"中秋节\",\n  \"2021-09-21\": \"中秋节\",\n  \"2021-10-01\": \"国庆节\",\n  \"2021-10-02\": \"国庆节\",\n  \"2021-10-03\": \"国庆节\",\n  \"2021-10-04\": \"国庆节\",\n  \"2021-10-05\": \"国庆节\",\n  \"2021-10-06\": \"国庆节\",\n  \"2021-10-07\": \"国庆节\",\n  \"2022-01-01\": \"元旦\",\n  \"2022-01-02\": \"元旦\",\n  \"2022-01-03\": \"元旦\",\n  \"2022-01-31\": \"春节\",\n  \"2022-02-01\": \"春节\",\n  \"2022-02-02\": \"春节\",\n  \"2022-02-03\": \"春节\",\n  \"2022-02-04\": \"春节\",\n  \"2022-02-05\": \"春节\",\n  \"2022-02-06\": \"春节\",\n  \"2022-04-03\": \"清明节\",\n  \"2022-04-04\": \"清明节\",\n  \"2022-04-05\": \"清明节\",\n  \"2022-04-30\": \"劳动节\",\n  \"2022-05-01\": \"劳动节\",\n  \"2022-05-02\": \"劳动节\",\n  \"2022-05-03\": \"劳动节\",\n  \"2022-05-04\": \"劳动节\",\n  \"2022-06-03\": \"端午节\",\n  \"2022-06-04\": \"端午节\",\n  \"2022-06-05\": \"端午节\",\n  \"2022-09-10\": \"中秋节\",\n  \"2022-09-11\": \"中秋节\",\n  \"2022-09-12\": \"中秋节\",\n  \"2022-10-01\": \"国庆节\",\n  \"2022-10-02\": \"国庆节\",\n  \"2022-10-03\": \"国庆节\",\n  \"2022-10-04\": \"国庆节\",\n  \"2022-10-05\": \"国庆节\",\n  \"2022-10-06\": \"国庆节\",\n  \"2022-10-07\": \"国庆节\",\n  \"2022-12-31\": \"元旦\",\n  \"2023-01-01\": \"元旦\",\n  \"2023-01-02\": \"元旦\",\n  \"2023-01-21\": \"春节\",\n  \"2023-01-22\": \"春节\",\n  \"2023-01-23\": \"春节\",\n  \"2023-01-24\": \"春节\",\n  \"2023-01-25\": \"春节\",\n  \"2023-01-26\": \"春节\",\n  \"2023-01-27\": \"春节\",\n  \"2023-04-05\": \"清明节\",\n  \"2023-04-29\": \"劳动节\",\n  \"2023-04-30\": \"劳动节\",\n  \"2023-05-01\": \"劳动节\",\n  \"2023-05-02\": \"劳动节\",\n  \"2023-05-03\": \"劳动节\",\n  \"2023-06-22\": \"端午节\",\n  \"2023-06-23\": \"端午节\",\n  \"2023-06-24\": \"端午节\",\n  \"2023-09-29\": \"中秋节\",\n  \"2023-09-30\": \"中秋节\",\n  \"2023-10-01\": \"国庆节\",\n  \"2023-10-02\": \"国庆节\",\n  \"2023-10-03\": \"国庆节\",\n  \"2023-10-04\": \"国庆节\",\n  \"2023-10-05\": \"国庆节\",\n  \"2023-10-06\": \"国庆节\",\n  \"2024-01-01\": \"元旦\",\n  \"2024-02-10\": \"春节\",\n  \"2024-02-11\": \"春节\",\n  \"2024-02-12\": \"春节\",\n  \"2024-02-13\": \"春节\",\n  \"2024-02-14\": \"春节\",\n  \"2024-02-15\": \"春节\",\n  \"2024-02-16\": \"春节\",\n  \"2024-02-17\": \"春节\",\n  \"2024-04-04\": \"清明节\",\n  \"2024-04-05\": \"清明节\",\n  \"2024-04-06\": \"清明节\",\n  \"2024-05-01\": \"劳动节\",\n  \"2024-05-02\": \"劳动节\",\n  \"2024-05-03\": \"劳动节\",\n  \"2024-05-04\": \"劳动节\",\n  \"2024-05-05\": \"劳动节\",\n  \"2024-06-10\": \"端午节\",\n  \"2024-09-15\": \"中秋节\",\n  \"2024-09-16\": \"中秋节\",\n  \"2024-09-17\": \"中秋节\",\n  \"2024-10-01\": \"国庆节\",\n  \"2024-10-02\": \"国庆节\",\n  \"2024-10-03\": \"国庆节\",\n  \"2024-10-04\": \"国庆节\",\n  \"2024-10-05\": \"国庆节\",\n  \"2024-10-06\": \"国庆节\",\n  \"2024-10-07\": \"国庆节\",\n};\n\nvar WEEKENDS_WORKDAY = {\n  \"2018-02-11\": \"补春节\",\n  \"2018-02-24\": \"补春节\",\n  \"2018-04-08\": \"补清明节\",\n  \"2018-04-28\": \"补劳动节\",\n  \"2018-09-29\": \"补国庆节\",\n  \"2018-09-30\": \"补国庆节\",\n  \"2018-12-29\": \"补元旦\",\n  \"2019-02-02\": \"补春节\",\n  \"2019-02-03\": \"补春节\",\n  \"2019-04-28\": \"补劳动节\",\n  \"2019-05-05\": \"补劳动节\",\n  \"2019-09-29\": \"补国庆节\",\n  \"2019-10-12\": \"补国庆节\",\n  \"2020-01-19\": \"补春节\",\n  \"2020-02-01\": \"补春节\",\n  \"2020-04-26\": \"补劳动节\",\n  \"2020-05-09\": \"补劳动节\",\n  \"2020-06-28\": \"补端午节\",\n  \"2020-09-27\": \"补国庆节\",\n  \"2020-10-10\": \"补国庆节\",\n  \"2021-02-07\": \"补春节\",\n  \"2021-02-20\": \"补春节\",  \n  \"2021-04-25\": \"补劳动节\", \n  \"2021-05-08\": \"补劳动节\", \n  \"2021-09-18\": \"补中秋节\", \n  \"2021-09-26\": \"补国庆节\", \n  \"2021-10-09\": \"补国庆节\", \n  \"2022-01-29\": \"补春节\",\n  \"2022-01-30\": \"补春节\",\n  \"2022-04-02\": \"补清明节\",\n  \"2022-04-24\": \"补劳动节\", \n  \"2022-05-07\": \"补劳动节\", \n  \"2022-10-08\": \"补国庆节\", \n  \"2022-10-09\": \"补国庆节\", \n  \"2023-01-28\": \"补春节\",\n  \"2023-01-29\": \"补春节\",\n  \"2023-04-23\": \"补劳动节\", \n  \"2023-05-06\": \"补劳动节\", \n  \"2023-06-25\": \"补端午节\", \n  \"2023-10-07\": \"补国庆节\", \n  \"2023-10-08\": \"补国庆节\", \n  \"2024-02-04\": \"补春节\",\n  \"2024-02-18\": \"补春节\",\n  \"2024-04-07\": \"补清明节\", \n  \"2024-04-28\": \"补劳动节\", \n  \"2024-05-11\": \"补劳动节\", \n  \"2024-09-14\": \"补中秋节\", \n  \"2024-09-29\": \"补国庆节\", \n  \"2024-10-12\": \"补国庆节\", \n};\n\nfunction isWorkday(day) {\n  var fd = formatDate(day);\n  if (WEEKENDS_WORKDAY[fd.date]) {\n    return true;\n  } else if (HOLIDAYS[fd.date]) {\n    return false;\n  }\n  return !fd.weekends;\n}\n\nfunction isHoliday(day) {\n  return !isWorkday(day);\n}\n\nfunction isAddtionalWorkday(day) {\n  var fd = formatDate(day);\n  return !!WEEKENDS_WORKDAY[fd.date];\n}\n\nfunction getFestival(day) {\n  var fd = formatDate(day);\n  if (WEEKENDS_WORKDAY[fd.date]) {\n    return WEEKENDS_WORKDAY[fd.date];\n  } else if (HOLIDAYS[fd.date]) {\n    return HOLIDAYS[fd.date]\n  }\n  return fd.weekends ? '周末' : '工作日';\n}\n\nfunction formatDate(day) {\n  var d = new Date(day),\n    month = \"\" + (d.getMonth() + 1),\n    day = \"\" + d.getDate(),\n    year = d.getFullYear();\n  if (month.length < 2) {\n    month = \"0\" + month\n  };\n  if (day.length < 2) {\n    day = \"0\" + day\n  };\n\n  return {\n    date: [year, month, day].join(\"-\"),\n    weekends: [0, 6].indexOf(d.getDay()) > -1\n  };\n}\n"]}
\ No newline at end of file
diff --git a/miniprogram_npm/dayjs/index.js b/miniprogram_npm/dayjs/index.js
new file mode 100644
index 0000000..6b4d9f9
--- /dev/null
+++ b/miniprogram_npm/dayjs/index.js
@@ -0,0 +1,13 @@
+module.exports = (function() {
+var __MODS__ = {};
+var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexports: {} }; __MODS__[modId] = { status: 0, func: func, req: req, m: m }; };
+var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
+var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
+var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
+__DEFINE__(1711522529463, function(require, module, exports) {
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
+}, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
+return __REQUIRE__(1711522529463);
+})()
+//miniprogram-npm-outsideDeps=[]
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/dayjs/index.js.map b/miniprogram_npm/dayjs/index.js.map
new file mode 100644
index 0000000..39f5702
--- /dev/null
+++ b/miniprogram_npm/dayjs/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["dayjs.min.js"],"names":[],"mappings":";;;;;;;AAAA","file":"index.js","sourcesContent":["!function(t,e){\"object\"==typeof exports&&\"undefined\"!=typeof module?module.exports=e():\"function\"==typeof define&&define.amd?define(e):(t=\"undefined\"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){var t=1e3,e=6e4,n=36e5,r=\"millisecond\",i=\"second\",s=\"minute\",u=\"hour\",a=\"day\",o=\"week\",c=\"month\",f=\"quarter\",h=\"year\",d=\"date\",l=\"Invalid Date\",$=/^(\\d{4})[-/]?(\\d{1,2})?[-/]?(\\d{0,2})[Tt\\s]*(\\d{1,2})?:?(\\d{1,2})?:?(\\d{1,2})?[.:]?(\\d+)?$/,y=/\\[([^\\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:\"en\",weekdays:\"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday\".split(\"_\"),months:\"January_February_March_April_May_June_July_August_September_October_November_December\".split(\"_\"),ordinal:function(t){var e=[\"th\",\"st\",\"nd\",\"rd\"],n=t%100;return\"[\"+t+(e[(n-20)%10]||e[n]||e[0])+\"]\"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:\"\"+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?\"+\":\"-\")+m(r,2,\"0\")+\":\"+m(i,2,\"0\")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||\"\").toLowerCase().replace(/s$/,\"\")},u:function(t){return void 0===t}},g=\"en\",D={};D[g]=M;var p=\"$isDayjsObject\",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if(\"string\"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split(\"-\");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n=\"object\"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if(\"string\"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||\"0\").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate(\"s\"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v=\"set\"+(this.$u?\"UTC\":\"\");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+\"Hours\",0);case u:return $(v+\"Minutes\",1);case s:return $(v+\"Seconds\",2);case i:return $(v+\"Milliseconds\",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f=\"set\"+(this.$u?\"UTC\":\"\"),l=(n={},n[a]=f+\"Date\",n[d]=f+\"Date\",n[c]=f+\"Month\",n[h]=f+\"FullYear\",n[u]=f+\"Hours\",n[s]=f+\"Minutes\",n[i]=f+\"Seconds\",n[r]=f+\"Milliseconds\",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||\"YYYY-MM-DDTHH:mm:ssZ\",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,\"0\")},$=f||function(t,e,n){var r=t<12?\"AM\":\"PM\";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case\"YY\":return String(e.$y).slice(-2);case\"YYYY\":return b.s(e.$y,4,\"0\");case\"M\":return a+1;case\"MM\":return b.s(a+1,2,\"0\");case\"MMM\":return h(n.monthsShort,a,c,3);case\"MMMM\":return h(c,a);case\"D\":return e.$D;case\"DD\":return b.s(e.$D,2,\"0\");case\"d\":return String(e.$W);case\"dd\":return h(n.weekdaysMin,e.$W,o,2);case\"ddd\":return h(n.weekdaysShort,e.$W,o,3);case\"dddd\":return o[e.$W];case\"H\":return String(s);case\"HH\":return b.s(s,2,\"0\");case\"h\":return d(1);case\"hh\":return d(2);case\"a\":return $(s,u,!0);case\"A\":return $(s,u,!1);case\"m\":return String(u);case\"mm\":return b.s(u,2,\"0\");case\"s\":return String(e.$s);case\"ss\":return b.s(e.$s,2,\"0\");case\"SSS\":return b.s(e.$ms,3,\"0\");case\"Z\":return i}return null}(t)||i.replace(\":\",\"\")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[[\"$ms\",r],[\"$s\",i],[\"$m\",s],[\"$H\",u],[\"$W\",a],[\"$M\",c],[\"$y\",h],[\"$D\",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));"]}
\ No newline at end of file
diff --git a/node_modules/chinese-workday/.editorconfig b/node_modules/chinese-workday/.editorconfig
new file mode 100644
index 0000000..16a029a
--- /dev/null
+++ b/node_modules/chinese-workday/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Tab indentation
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/node_modules/chinese-workday/.travis.yml b/node_modules/chinese-workday/.travis.yml
new file mode 100644
index 0000000..a031fe7
--- /dev/null
+++ b/node_modules/chinese-workday/.travis.yml
@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+ - "10"
+ - "8"
+ - "6"
\ No newline at end of file
diff --git a/node_modules/chinese-workday/LICENSE b/node_modules/chinese-workday/LICENSE
new file mode 100644
index 0000000..71b9bba
--- /dev/null
+++ b/node_modules/chinese-workday/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 yize.shc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/node_modules/chinese-workday/README.md b/node_modules/chinese-workday/README.md
new file mode 100644
index 0000000..98d7eee
--- /dev/null
+++ b/node_modules/chinese-workday/README.md
@@ -0,0 +1,37 @@
+## chinese-workday
+
+今天要上班吗？
+
+
+[![Build Status][travis-image]][travis-url]
+
+## Install
+
+```bash
+$ npm install chinese-workday
+```
+
+## Usage
+
+```js
+// const { isWorkday, isHoliday, getFestival } = require('chinese-workday');
+const ww = require('chinese-workday');
+const isWorkday = ww.isWorkday;
+const isHoliday = ww.isHoliday;
+const getFestival = ww.getFestival;
+const isAddtionalWorkday = ww.isAddtionalWorkday;
+
+isWorkday('2022-10-01')
+// => false
+isHoliday('2022-10-01')
+// => true
+isAddtionalWorkday('2022-01-29')
+// => true
+getFestival('2022-10-01')
+// => 国庆节
+```
+
+[travis-image]: https://travis-ci.org/yize/chinese-workday.svg?branch=master
+[travis-url]: https://travis-ci.org/yize/chinese-workday
+
+**Note**: Since 2018
diff --git a/node_modules/chinese-workday/index.d.ts b/node_modules/chinese-workday/index.d.ts
new file mode 100644
index 0000000..b252d4d
--- /dev/null
+++ b/node_modules/chinese-workday/index.d.ts
@@ -0,0 +1,5 @@
+export interface ChineseWorkday{
+  isWorkday(day: string | Date): boolean;
+  isHoliday(day: string | Date): boolean;
+  getFestival(day: string | Date): string;
+}
diff --git a/node_modules/chinese-workday/index.js b/node_modules/chinese-workday/index.js
new file mode 100644
index 0000000..191851b
--- /dev/null
+++ b/node_modules/chinese-workday/index.js
@@ -0,0 +1,313 @@
+// from
+// - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm
+// - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm
+// - 2019调整 https://www.gov.cn/zhengce/content/2019-03/22/content_5375877.htm
+// - 2020 https://www.gov.cn/zhengce/content/2019-11/21/content_5454164.htm
+// - 2021 https://www.gov.cn/zhengce/content/2020-11/25/content_5564127.htm
+// - 2022 https://www.gov.cn/zhengce/content/2021-10/25/content_5644835.htm
+// - 2023 https://www.gov.cn/zhengce/zhengceku/2022-12/08/content_5730844.htm
+// - 2024 https://www.gov.cn/zhengce/zhengceku/202310/content_6911528.htm
+"use strict";
+
+module.exports = {
+  isWorkday: isWorkday,
+  isHoliday: isHoliday,
+  getFestival: getFestival,
+  isAddtionalWorkday: isAddtionalWorkday,
+};
+
+var HOLIDAYS = {
+  "2018-02-15": "春节",
+  "2018-02-16": "春节",
+  "2018-02-17": "春节",
+  "2018-02-18": "春节",
+  "2018-02-19": "春节",
+  "2018-02-20": "春节",
+  "2018-02-21": "春节",
+  "2018-04-05": "清明节",
+  "2018-04-06": "清明节",
+  "2018-04-07": "清明节",
+  "2018-04-29": "劳动节",
+  "2018-04-30": "劳动节",
+  "2018-05-01": "劳动节",
+  "2018-06-18": "端午节",
+  "2018-09-24": "中秋节",
+  "2018-10-01": "国庆节",
+  "2018-10-02": "国庆节",
+  "2018-10-03": "国庆节",
+  "2018-10-04": "国庆节",
+  "2018-10-05": "国庆节",
+  "2018-10-06": "国庆节",
+  "2018-10-07": "国庆节",
+  "2018-12-30": "元旦",
+  "2018-12-31": "元旦",
+  "2019-01-01": "元旦",
+  "2019-02-04": "春节",
+  "2019-02-05": "春节",
+  "2019-02-06": "春节",
+  "2019-02-07": "春节",
+  "2019-02-08": "春节",
+  "2019-02-09": "春节",
+  "2019-02-10": "春节",
+  "2019-04-05": "清明节",
+  "2019-04-06": "清明节",
+  "2019-04-07": "清明节",
+  "2019-05-01": "劳动节",
+  "2019-05-02": "劳动节",
+  "2019-05-03": "劳动节",
+  "2019-05-04": "劳动节",
+  "2019-06-07": "端午节",
+  "2019-06-08": "端午节",
+  "2019-06-09": "端午节",
+  "2019-09-13": "中秋节",
+  "2019-09-14": "中秋节",
+  "2019-09-15": "中秋节",
+  "2019-10-01": "国庆节",
+  "2019-10-02": "国庆节",
+  "2019-10-03": "国庆节",
+  "2019-10-04": "国庆节",
+  "2019-10-05": "国庆节",
+  "2019-10-06": "国庆节",
+  "2019-10-07": "国庆节",
+  "2020-01-01": "元旦",
+  "2020-01-24": "春节",
+  "2020-01-25": "春节",
+  "2020-01-26": "春节",
+  "2020-01-27": "春节",
+  "2020-01-28": "春节",
+  "2020-01-29": "春节",
+  "2020-01-30": "春节",
+  "2020-04-04": "清明节",
+  "2020-04-05": "清明节",
+  "2020-04-06": "清明节",
+  "2020-05-01": "劳动节",
+  "2020-05-02": "劳动节",
+  "2020-05-03": "劳动节",
+  "2020-05-04": "劳动节",
+  "2020-05-05": "劳动节",
+  "2020-06-25": "端午节",
+  "2020-06-26": "端午节",
+  "2020-06-27": "端午节",
+  "2020-10-01": "国庆节",
+  "2020-10-02": "国庆节",
+  "2020-10-03": "国庆节",
+  "2020-10-04": "国庆节",
+  "2020-10-05": "国庆节",
+  "2020-10-06": "国庆节",
+  "2020-10-07": "国庆节",
+  "2020-10-08": "国庆节",
+  "2021-01-01": "元旦",
+  "2021-02-11": "春节",
+  "2021-02-12": "春节",
+  "2021-02-13": "春节",
+  "2021-02-14": "春节",
+  "2021-02-15": "春节",
+  "2021-02-16": "春节",
+  "2021-02-17": "春节",
+  "2021-04-03": "清明节",
+  "2021-04-04": "清明节",
+  "2021-04-05": "清明节",
+  "2021-05-01": "劳动节",
+  "2021-05-02": "劳动节",
+  "2021-05-03": "劳动节",
+  "2021-05-04": "劳动节",
+  "2021-05-05": "劳动节",
+  "2021-06-12": "端午节",
+  "2021-06-13": "端午节",
+  "2021-06-14": "端午节",
+  "2021-09-19": "中秋节",
+  "2021-09-20": "中秋节",
+  "2021-09-21": "中秋节",
+  "2021-10-01": "国庆节",
+  "2021-10-02": "国庆节",
+  "2021-10-03": "国庆节",
+  "2021-10-04": "国庆节",
+  "2021-10-05": "国庆节",
+  "2021-10-06": "国庆节",
+  "2021-10-07": "国庆节",
+  "2022-01-01": "元旦",
+  "2022-01-02": "元旦",
+  "2022-01-03": "元旦",
+  "2022-01-31": "春节",
+  "2022-02-01": "春节",
+  "2022-02-02": "春节",
+  "2022-02-03": "春节",
+  "2022-02-04": "春节",
+  "2022-02-05": "春节",
+  "2022-02-06": "春节",
+  "2022-04-03": "清明节",
+  "2022-04-04": "清明节",
+  "2022-04-05": "清明节",
+  "2022-04-30": "劳动节",
+  "2022-05-01": "劳动节",
+  "2022-05-02": "劳动节",
+  "2022-05-03": "劳动节",
+  "2022-05-04": "劳动节",
+  "2022-06-03": "端午节",
+  "2022-06-04": "端午节",
+  "2022-06-05": "端午节",
+  "2022-09-10": "中秋节",
+  "2022-09-11": "中秋节",
+  "2022-09-12": "中秋节",
+  "2022-10-01": "国庆节",
+  "2022-10-02": "国庆节",
+  "2022-10-03": "国庆节",
+  "2022-10-04": "国庆节",
+  "2022-10-05": "国庆节",
+  "2022-10-06": "国庆节",
+  "2022-10-07": "国庆节",
+  "2022-12-31": "元旦",
+  "2023-01-01": "元旦",
+  "2023-01-02": "元旦",
+  "2023-01-21": "春节",
+  "2023-01-22": "春节",
+  "2023-01-23": "春节",
+  "2023-01-24": "春节",
+  "2023-01-25": "春节",
+  "2023-01-26": "春节",
+  "2023-01-27": "春节",
+  "2023-04-05": "清明节",
+  "2023-04-29": "劳动节",
+  "2023-04-30": "劳动节",
+  "2023-05-01": "劳动节",
+  "2023-05-02": "劳动节",
+  "2023-05-03": "劳动节",
+  "2023-06-22": "端午节",
+  "2023-06-23": "端午节",
+  "2023-06-24": "端午节",
+  "2023-09-29": "中秋节",
+  "2023-09-30": "中秋节",
+  "2023-10-01": "国庆节",
+  "2023-10-02": "国庆节",
+  "2023-10-03": "国庆节",
+  "2023-10-04": "国庆节",
+  "2023-10-05": "国庆节",
+  "2023-10-06": "国庆节",
+  "2024-01-01": "元旦",
+  "2024-02-10": "春节",
+  "2024-02-11": "春节",
+  "2024-02-12": "春节",
+  "2024-02-13": "春节",
+  "2024-02-14": "春节",
+  "2024-02-15": "春节",
+  "2024-02-16": "春节",
+  "2024-02-17": "春节",
+  "2024-04-04": "清明节",
+  "2024-04-05": "清明节",
+  "2024-04-06": "清明节",
+  "2024-05-01": "劳动节",
+  "2024-05-02": "劳动节",
+  "2024-05-03": "劳动节",
+  "2024-05-04": "劳动节",
+  "2024-05-05": "劳动节",
+  "2024-06-10": "端午节",
+  "2024-09-15": "中秋节",
+  "2024-09-16": "中秋节",
+  "2024-09-17": "中秋节",
+  "2024-10-01": "国庆节",
+  "2024-10-02": "国庆节",
+  "2024-10-03": "国庆节",
+  "2024-10-04": "国庆节",
+  "2024-10-05": "国庆节",
+  "2024-10-06": "国庆节",
+  "2024-10-07": "国庆节",
+};
+
+var WEEKENDS_WORKDAY = {
+  "2018-02-11": "补春节",
+  "2018-02-24": "补春节",
+  "2018-04-08": "补清明节",
+  "2018-04-28": "补劳动节",
+  "2018-09-29": "补国庆节",
+  "2018-09-30": "补国庆节",
+  "2018-12-29": "补元旦",
+  "2019-02-02": "补春节",
+  "2019-02-03": "补春节",
+  "2019-04-28": "补劳动节",
+  "2019-05-05": "补劳动节",
+  "2019-09-29": "补国庆节",
+  "2019-10-12": "补国庆节",
+  "2020-01-19": "补春节",
+  "2020-02-01": "补春节",
+  "2020-04-26": "补劳动节",
+  "2020-05-09": "补劳动节",
+  "2020-06-28": "补端午节",
+  "2020-09-27": "补国庆节",
+  "2020-10-10": "补国庆节",
+  "2021-02-07": "补春节",
+  "2021-02-20": "补春节",  
+  "2021-04-25": "补劳动节", 
+  "2021-05-08": "补劳动节", 
+  "2021-09-18": "补中秋节", 
+  "2021-09-26": "补国庆节", 
+  "2021-10-09": "补国庆节", 
+  "2022-01-29": "补春节",
+  "2022-01-30": "补春节",
+  "2022-04-02": "补清明节",
+  "2022-04-24": "补劳动节", 
+  "2022-05-07": "补劳动节", 
+  "2022-10-08": "补国庆节", 
+  "2022-10-09": "补国庆节", 
+  "2023-01-28": "补春节",
+  "2023-01-29": "补春节",
+  "2023-04-23": "补劳动节", 
+  "2023-05-06": "补劳动节", 
+  "2023-06-25": "补端午节", 
+  "2023-10-07": "补国庆节", 
+  "2023-10-08": "补国庆节", 
+  "2024-02-04": "补春节",
+  "2024-02-18": "补春节",
+  "2024-04-07": "补清明节", 
+  "2024-04-28": "补劳动节", 
+  "2024-05-11": "补劳动节", 
+  "2024-09-14": "补中秋节", 
+  "2024-09-29": "补国庆节", 
+  "2024-10-12": "补国庆节", 
+};
+
+function isWorkday(day) {
+  var fd = formatDate(day);
+  if (WEEKENDS_WORKDAY[fd.date]) {
+    return true;
+  } else if (HOLIDAYS[fd.date]) {
+    return false;
+  }
+  return !fd.weekends;
+}
+
+function isHoliday(day) {
+  return !isWorkday(day);
+}
+
+function isAddtionalWorkday(day) {
+  var fd = formatDate(day);
+  return !!WEEKENDS_WORKDAY[fd.date];
+}
+
+function getFestival(day) {
+  var fd = formatDate(day);
+  if (WEEKENDS_WORKDAY[fd.date]) {
+    return WEEKENDS_WORKDAY[fd.date];
+  } else if (HOLIDAYS[fd.date]) {
+    return HOLIDAYS[fd.date]
+  }
+  return fd.weekends ? '周末' : '工作日';
+}
+
+function formatDate(day) {
+  var d = new Date(day),
+    month = "" + (d.getMonth() + 1),
+    day = "" + d.getDate(),
+    year = d.getFullYear();
+  if (month.length < 2) {
+    month = "0" + month
+  };
+  if (day.length < 2) {
+    day = "0" + day
+  };
+
+  return {
+    date: [year, month, day].join("-"),
+    weekends: [0, 6].indexOf(d.getDay()) > -1
+  };
+}
diff --git a/node_modules/chinese-workday/package.json b/node_modules/chinese-workday/package.json
new file mode 100644
index 0000000..f3fc91c
--- /dev/null
+++ b/node_modules/chinese-workday/package.json
@@ -0,0 +1,62 @@
+{
+  "_from": "chinese-workday",
+  "_id": "chinese-workday@1.10.0",
+  "_inBundle": false,
+  "_integrity": "sha512-wHar+6Qd/lPDHYHdnCrb1ZJvj8Kjyy3lPrjQEqtlWqw9TRlRLTWnPUi/esB5OJFbEedYGJEP5o5zrrp4wLBCVA==",
+  "_location": "/chinese-workday",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "chinese-workday",
+    "name": "chinese-workday",
+    "escapedName": "chinese-workday",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/chinese-workday/-/chinese-workday-1.10.0.tgz",
+  "_shasum": "a20d0c75681a3e856d2fd81ca0904386614c6fb0",
+  "_spec": "chinese-workday",
+  "_where": "C:\\Users\\Administrator\\Desktop\\jundaosuzhou_wechatxcx",
+  "author": {
+    "name": "yize.shc@gmail.com"
+  },
+  "bugs": {
+    "url": "https://github.com/yize/chinese-workday/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "中国工作日",
+  "devDependencies": {
+    "jest": "^23.6.0"
+  },
+  "homepage": "https://github.com/yize/chinese-workday#readme",
+  "keywords": [
+    "workday",
+    "chinese-workday",
+    "工作日",
+    "非节假日",
+    "节假日",
+    "2019",
+    "2020",
+    "2021",
+    "2022",
+    "2023"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "name": "chinese-workday",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yize/chinese-workday.git"
+  },
+  "scripts": {
+    "test": "jest"
+  },
+  "version": "1.10.0"
+}
diff --git a/node_modules/chinese-workday/test.js b/node_modules/chinese-workday/test.js
new file mode 100644
index 0000000..a0bef28
--- /dev/null
+++ b/node_modules/chinese-workday/test.js
@@ -0,0 +1,37 @@
+var ww = require('./index');
+// const { isWorkday, isHoliday, getFestival, isAddtionalWorkday } = require('./index');
+var isWorkday = ww.isWorkday;
+var isHoliday = ww.isHoliday;
+var getFestival = ww.getFestival;
+var isAddtionalWorkday = ww.isAddtionalWorkday;
+
+test('isWorkday', function () {
+  expect(isWorkday('2018-10-07')).toBe(false);
+  expect(isWorkday('2018-10-08')).toBe(true);
+  expect(isWorkday('2018-10-21')).toBe(false);
+});
+
+test('isHoliday', function () {
+  expect(isHoliday('2018-10-07')).toBe(true);
+  expect(isHoliday('2018-10-08')).toBe(false);
+  expect(isHoliday('2018-10-21')).toBe(true);
+});
+
+test('isAddtionalWorkday', function () {
+  expect(isAddtionalWorkday('2019-02-02')).toBe(true);
+  expect(isAddtionalWorkday('2019-02-01')).toBe(false);
+});
+
+test('getFestival', function () {
+  expect(getFestival('2018-02-11')).toBe('补春节');
+  expect(getFestival('2018-10-07')).toBe('国庆节');
+  expect(getFestival('2018-10-08')).toBe('工作日');
+  expect(getFestival('2018-10-21')).toBe('周末');
+});
+
+test('dateformat', function () {
+  expect(isWorkday('2018/10/08')).toBe(true);
+  expect(isWorkday(1538981142948)).toBe(true);
+  expect(isWorkday('2018-10-07')).toBe(false);
+  expect(isWorkday()).toBe(true);
+})
\ No newline at end of file
diff --git a/node_modules/dayjs/.editorconfig b/node_modules/dayjs/.editorconfig
new file mode 100644
index 0000000..d4d73cf
--- /dev/null
+++ b/node_modules/dayjs/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_size = 2
diff --git a/node_modules/dayjs/CHANGELOG.md b/node_modules/dayjs/CHANGELOG.md
new file mode 100644
index 0000000..1447804
--- /dev/null
+++ b/node_modules/dayjs/CHANGELOG.md
@@ -0,0 +1,919 @@
+## [1.11.10](https://github.com/iamkun/dayjs/compare/v1.11.9...v1.11.10) (2023-09-19)
+
+
+### Bug Fixes
+
+* Add Korean Day of Month with ordinal ([#2395](https://github.com/iamkun/dayjs/issues/2395)) ([dd55ee2](https://github.com/iamkun/dayjs/commit/dd55ee2aadd1009242235e47d558bbf028827896))
+* change back fa locale to the Gregorian calendar equivalent ([#2411](https://github.com/iamkun/dayjs/issues/2411)) ([95e9458](https://github.com/iamkun/dayjs/commit/95e9458b221fe35e59ee4a160a5db247313a68fb))
+* duration plugin - MILLISECONDS_A_MONTH const calculation ([#2362](https://github.com/iamkun/dayjs/issues/2362)) ([f0a0b54](https://github.com/iamkun/dayjs/commit/f0a0b546b074b3b511c2319a1ce83d412894b91f))
+* duration plugin getter get result  0 instead of undefined ([#2369](https://github.com/iamkun/dayjs/issues/2369)) ([061aa7e](https://github.com/iamkun/dayjs/commit/061aa7ed6c31696974665fc9b11a74d30841ebed))
+* fix isDayjs check logic ([#2383](https://github.com/iamkun/dayjs/issues/2383)) ([5f3f878](https://github.com/iamkun/dayjs/commit/5f3f8786c796cd432fe6bcb6966a810daea89203))
+* fix timezone plugin to get correct locale setting ([#2420](https://github.com/iamkun/dayjs/issues/2420)) ([4f45012](https://github.com/iamkun/dayjs/commit/4f4501256fa1bc72128aae1d841bbd782df86aed))
+* **locale:** add meridiem in `ar` locale ([#2418](https://github.com/iamkun/dayjs/issues/2418)) ([361be5c](https://github.com/iamkun/dayjs/commit/361be5c7c628614ee833d710acbe154a598b904d))
+* round durations to millisecond precision for ISO string ([#2367](https://github.com/iamkun/dayjs/issues/2367)) ([890a17a](https://github.com/iamkun/dayjs/commit/890a17a8d8ddd43c7c8b806e3afc7b27f3288d27))
+* sub-second precisions need to be rounded at the seconds field to avoid adding floats ([#2377](https://github.com/iamkun/dayjs/issues/2377)) ([a9d7d03](https://github.com/iamkun/dayjs/commit/a9d7d0398d22ebd4bfc3812ca0134a97606d54d9))
+* update $x logic to avoid plugin error ([#2429](https://github.com/iamkun/dayjs/issues/2429)) ([2254635](https://github.com/iamkun/dayjs/commit/22546357f30924fcff3b3ffa14fd04be21f97a5e))
+* Update Slovenian locale for relative time ([#2396](https://github.com/iamkun/dayjs/issues/2396)) ([5470a15](https://github.com/iamkun/dayjs/commit/5470a15e437fac803797363063b24f3ba3bd5299))
+* update uzbek language translation ([#2327](https://github.com/iamkun/dayjs/issues/2327)) ([0a91056](https://github.com/iamkun/dayjs/commit/0a910564d76dc7c128da8e0d85d8e11ebdb5660b))
+
+## [1.11.9](https://github.com/iamkun/dayjs/compare/v1.11.8...v1.11.9) (2023-07-01)
+
+
+### Bug Fixes
+
+* Add null to min and max plugin return type ([#2355](https://github.com/iamkun/dayjs/issues/2355)) ([62d9042](https://github.com/iamkun/dayjs/commit/62d9042eb84b78d78324694ccbeaad1679d37e68))
+* check if null passed to objectSupport parser ([#2175](https://github.com/iamkun/dayjs/issues/2175)) ([013968f](https://github.com/iamkun/dayjs/commit/013968f609c32e2269df69b4dd1feb2e8e1e035a))
+* dayjs.diff improve performance ([#2244](https://github.com/iamkun/dayjs/issues/2244)) ([33c80e1](https://github.com/iamkun/dayjs/commit/33c80e14cf14f70ceb4f54639e266cd70a3c3996))
+* dayjs(null) throws error, not return dayjs object as invalid date ([#2334](https://github.com/iamkun/dayjs/issues/2334)) ([c79e2f5](https://github.com/iamkun/dayjs/commit/c79e2f5d03eef5660b1f13385b69c0c9668d2f98))
+* objectSupport plugin causes an error when null is passed to dayjs function (closes [#2277](https://github.com/iamkun/dayjs/issues/2277)) ([#2342](https://github.com/iamkun/dayjs/issues/2342)) ([89bf31c](https://github.com/iamkun/dayjs/commit/89bf31ce0a36dcfc892029dc019d85d3654cf5fb))
+* Optimize format method ([#2313](https://github.com/iamkun/dayjs/issues/2313)) ([1fe1b1d](https://github.com/iamkun/dayjs/commit/1fe1b1d9a214d3b8c9f267b432801424a493f1c4))
+* update Duration plugin add/subtract take into account days in month ([#2337](https://github.com/iamkun/dayjs/issues/2337)) ([3b1060f](https://github.com/iamkun/dayjs/commit/3b1060f92183ab3a3c49289c2d87fbdd34c1eacc))
+* update MinMax plugin 1. ignore the 'null' in args 2. return the only one arg ([#2330](https://github.com/iamkun/dayjs/issues/2330)) ([3c2c6ee](https://github.com/iamkun/dayjs/commit/3c2c6ee4db00bbb43a7a3bb0b56bc0d0f03daddc))
+
+## [1.11.8](https://github.com/iamkun/dayjs/compare/v1.11.7...v1.11.8) (2023-06-02)
+
+
+### Bug Fixes
+
+* .format add padding to 'YYYY' ([#2231](https://github.com/iamkun/dayjs/issues/2231)) ([00c223b](https://github.com/iamkun/dayjs/commit/00c223b7e92970d07557133994fcb225a6d4c960))
+* Added .valueOf method to Duration class ([#2226](https://github.com/iamkun/dayjs/issues/2226)) ([9b4fcfd](https://github.com/iamkun/dayjs/commit/9b4fcfde35b39693894be1821b6c7222fac98657))
+* timezone type mark `date` parameter as optional ([#2222](https://github.com/iamkun/dayjs/issues/2222)) ([b87aa0e](https://github.com/iamkun/dayjs/commit/b87aa0ed9a748c478a66ef48230cd1d6350d7b8a))
+* type file first parameter date is optional in isSame(), isBefore(), isAfter() ([#2272](https://github.com/iamkun/dayjs/issues/2272)) ([4d56f3e](https://github.com/iamkun/dayjs/commit/4d56f3eb2b3770879d60f824590bf1b32f237d47))
+
+## [1.11.7](https://github.com/iamkun/dayjs/compare/v1.11.6...v1.11.7) (2022-12-06)
+
+
+### Bug Fixes
+
+* Add locale (zh-tw) meridiem ([#2149](https://github.com/iamkun/dayjs/issues/2149)) ([1e9ba76](https://github.com/iamkun/dayjs/commit/1e9ba761ff4e3f2759106dfe1aa9054d5826451c))
+* update fa locale ([#2151](https://github.com/iamkun/dayjs/issues/2151)) ([1c26732](https://github.com/iamkun/dayjs/commit/1c267321a1a01b4947e1482bac67d67ebc7c3dfa))
+
+## [1.11.6](https://github.com/iamkun/dayjs/compare/v1.11.5...v1.11.6) (2022-10-21)
+
+
+### Bug Fixes
+
+* add BigIntSupport plugin ([#2087](https://github.com/iamkun/dayjs/issues/2087)) ([f6dce48](https://github.com/iamkun/dayjs/commit/f6dce48a9e39677718b087867d9fd901d5078155))
+* Fix objectSupport collides with Duration plugin - issue [#2027](https://github.com/iamkun/dayjs/issues/2027) ([#2038](https://github.com/iamkun/dayjs/issues/2038)) ([c9370ea](https://github.com/iamkun/dayjs/commit/c9370ea96bf420439ee7eaa4146e8ed643160312))
+
+## [1.11.5](https://github.com/iamkun/dayjs/compare/v1.11.4...v1.11.5) (2022-08-12)
+
+
+### Bug Fixes
+
+* ordinal for nl not working ([#2011](https://github.com/iamkun/dayjs/issues/2011)) ([c93c85e](https://github.com/iamkun/dayjs/commit/c93c85eaa11564a1aae2d823480a417812c01bf4))
+* wrong ordinal for french locale ([#2010](https://github.com/iamkun/dayjs/issues/2010)) ([dd192a7](https://github.com/iamkun/dayjs/commit/dd192a72fc5d26ce56481e89b0c1ccf5f939be0c))
+
+## [1.11.4](https://github.com/iamkun/dayjs/compare/v1.11.3...v1.11.4) (2022-07-19)
+
+
+### Bug Fixes
+
+* correct past property in ku (kurdish) locale ([#1916](https://github.com/iamkun/dayjs/issues/1916)) ([74e82b9](https://github.com/iamkun/dayjs/commit/74e82b9da5ec8b90361fc27ac7c8b63faf354502))
+* fix French [fr] local ordinal ([#1932](https://github.com/iamkun/dayjs/issues/1932)) ([8f09834](https://github.com/iamkun/dayjs/commit/8f09834a88b8e7f8353c6e7473d4711596890a8c))
+* fix objectSupport plugin ConfigTypeMap type ([#1441](https://github.com/iamkun/dayjs/issues/1441)) ([#1990](https://github.com/iamkun/dayjs/issues/1990)) ([fd51fe4](https://github.com/iamkun/dayjs/commit/fd51fe4f7fa799d8c598343e71fa59299ec4cf93))
+* fix type error to add ordianl property in InstanceLocaleDataReturn and GlobalLocaleDataReturn types ([#1931](https://github.com/iamkun/dayjs/issues/1931)) ([526f0ae](https://github.com/iamkun/dayjs/commit/526f0ae549ffbeeb9ef1099ca23964791fc59743))
+* update locale ar-* meridiem function ([#1954](https://github.com/iamkun/dayjs/issues/1954)) ([3d31611](https://github.com/iamkun/dayjs/commit/3d316117f04362d31f4e8bd349620b8414ce5d0c))
+* zh-tw / zh-hk locale ordinal error ([#1976](https://github.com/iamkun/dayjs/issues/1976)) ([0a1bd08](https://github.com/iamkun/dayjs/commit/0a1bd08e736be7d4e378aaca280caa6543f8066d))
+
+## [1.11.3](https://github.com/iamkun/dayjs/compare/v1.11.2...v1.11.3) (2022-06-06)
+
+
+### Bug Fixes
+
+*  customParseFormat plugin to parse comma as a separator character ([#1913](https://github.com/iamkun/dayjs/issues/1913)) ([41b1405](https://github.com/iamkun/dayjs/commit/41b1405971e099431211ae6c2a100cd797da4427))
+* update Dutch [nl] locale ordinal ([#1908](https://github.com/iamkun/dayjs/issues/1908)) ([5da98f8](https://github.com/iamkun/dayjs/commit/5da98f8085d2d2847d79e38c795082703a14f24b))
+
+## [1.11.2](https://github.com/iamkun/dayjs/compare/v1.11.1...v1.11.2) (2022-05-06)
+
+
+### Bug Fixes
+
+* add OpUnitType (week) to quarterOfYear startOf/endOf types ([#1865](https://github.com/iamkun/dayjs/issues/1865)) ([400bc3e](https://github.com/iamkun/dayjs/commit/400bc3e8915e0c58e7abbfd3a1235364b1abaf3e))
+* Fix type issue with ManipulateType ([#1864](https://github.com/iamkun/dayjs/issues/1864)) ([d033dfc](https://github.com/iamkun/dayjs/commit/d033dfcfc1d2ced39b2733898e8d85ad5984c9e9))
+* fix UTC plugin .valueOf not taking DST into account  ([#1448](https://github.com/iamkun/dayjs/issues/1448)) ([27d1c50](https://github.com/iamkun/dayjs/commit/27d1c506100ae6624f258c21cc06b24768ced733))
+
+## [1.11.1](https://github.com/iamkun/dayjs/compare/v1.11.0...v1.11.1) (2022-04-15)
+
+
+### Bug Fixes
+
+* add Bengali (Bangladesh) [bn-bd] locale ([#1806](https://github.com/iamkun/dayjs/issues/1806)) ([840ed76](https://github.com/iamkun/dayjs/commit/840ed76eedc085afefc4dedd05f31d44196b63b0))
+* refactor replace deprecated String.prototype.substr() ([#1836](https://github.com/iamkun/dayjs/issues/1836)) ([627fa39](https://github.com/iamkun/dayjs/commit/627fa393e4daf83c92431162dbe18534b23fcbae))
+* Update German [de] locale, adds the abbreviations for month including a . in the end, as in September -> Sept. ([#1831](https://github.com/iamkun/dayjs/issues/1831)) ([4e2802c](https://github.com/iamkun/dayjs/commit/4e2802cc3bec2941ffb737a15fb531c90951eafe))
+* update Italian (Switzerland) [it-ch] locale relativeTime ([#1829](https://github.com/iamkun/dayjs/issues/1829)) ([8e6d11d](https://github.com/iamkun/dayjs/commit/8e6d11d053393d97bee1ba411adb2d82de1a58c4))
+* update Kurdish [ku] locale strings and formatted output contains non-standard kurdish characters ([#1848](https://github.com/iamkun/dayjs/issues/1848)) ([a597d0b](https://github.com/iamkun/dayjs/commit/a597d0b1b8dd28e626f8c59d326622088f7b51e7))
+* update locale bo [Tibetan]: corrected the orders in formats ([#1823](https://github.com/iamkun/dayjs/issues/1823)) ([e790516](https://github.com/iamkun/dayjs/commit/e79051617af6787358f6c9b5443d987b8b53a9e1))
+
+# [1.11.0](https://github.com/iamkun/dayjs/compare/v1.10.8...v1.11.0) (2022-03-14)
+
+
+### Bug Fixes
+
+* Add Kirundi (rn) locale ([#1793](https://github.com/iamkun/dayjs/issues/1793)) ([74e5247](https://github.com/iamkun/dayjs/commit/74e5247227a779fffde39bdfcd1ee19911496709))
+* add missing date shorthand D type definition ([#1752](https://github.com/iamkun/dayjs/issues/1752)) ([b045baf](https://github.com/iamkun/dayjs/commit/b045baf1646a81f7e4f446f355d02d5fb0ef4aa7))
+* Add relative time to Galician (gl) and fix ordinals ([#1800](https://github.com/iamkun/dayjs/issues/1800)) ([dcbf170](https://github.com/iamkun/dayjs/commit/dcbf1708400624addfbddbc71e0f6a9ac15fa961))
+* update German locales (de-at, de-ch) ([#1775](https://github.com/iamkun/dayjs/issues/1775)) ([f9055a7](https://github.com/iamkun/dayjs/commit/f9055a77bf3d84c575e5fcf99e21611138ba64d7))
+* update Icelandic [is] locale relativeTime config ([#1796](https://github.com/iamkun/dayjs/issues/1796)) ([76f9e17](https://github.com/iamkun/dayjs/commit/76f9e1756de7e99c01e471dab30ea074b9ec9629))
+* Update index.d.ts note ([#1716](https://github.com/iamkun/dayjs/issues/1716)) ([5a108ff](https://github.com/iamkun/dayjs/commit/5a108ff3159c53fd270ea7638f33c35c934d6457))
+* Update locale German [de] monthsShort ([#1746](https://github.com/iamkun/dayjs/issues/1746)) ([4a7b7d0](https://github.com/iamkun/dayjs/commit/4a7b7d07c885bb9338514c234dbb708e24e9863e))
+* update meridiem function to Kurdish (ku) locale ([#1725](https://github.com/iamkun/dayjs/issues/1725)) ([efd3904](https://github.com/iamkun/dayjs/commit/efd3904ff8cbf0a4fc064911dda76fc86b669f7b))
+* update updateLocal plugin typescript types ([#1692](https://github.com/iamkun/dayjs/issues/1692)) ([c7a3f73](https://github.com/iamkun/dayjs/commit/c7a3f73064dbb63b4d365b2ad4c792f075f4d8d8))
+
+
+### Features
+
+* Fallback to language only locale + support uppercase locales ([#1524](https://github.com/iamkun/dayjs/issues/1524)) ([9138dc2](https://github.com/iamkun/dayjs/commit/9138dc28206875372da4fb74c64716437cd11b95))
+
+## [1.10.8](https://github.com/iamkun/dayjs/compare/v1.10.7...v1.10.8) (2022-02-28)
+
+
+### Bug Fixes
+
+* set locale pt, pt-br correct weekdays and months ([#1697](https://github.com/iamkun/dayjs/issues/1697)) ([e019301](https://github.com/iamkun/dayjs/commit/e01930171c8235f58a114236f146086428f99569))
+
+## [1.10.7](https://github.com/iamkun/dayjs/compare/v1.10.6...v1.10.7) (2021-09-10)
+
+
+### Bug Fixes
+
+* Add  Spanish (Mexico) [es-mx] locale ([#1614](https://github.com/iamkun/dayjs/issues/1614)) ([3393f2a](https://github.com/iamkun/dayjs/commit/3393f2ad55346d55902683a2e31c6f253d96c8c2))
+* Add Arabic (Iraq) [ar-iq] locale ([#1627](https://github.com/iamkun/dayjs/issues/1627)) ([b5a1391](https://github.com/iamkun/dayjs/commit/b5a1391011b247d08863d291542db5937b23b427))
+* add format object type to type file ([#1572](https://github.com/iamkun/dayjs/issues/1572)) ([5a79cc6](https://github.com/iamkun/dayjs/commit/5a79cc6408e825d9e123629eb44fc19c996d7751))
+* duration plugin when parsing duration from ISO string, set missing components to 0 instead of NaN ([#1611](https://github.com/iamkun/dayjs/issues/1611)) ([252585b](https://github.com/iamkun/dayjs/commit/252585b4b2bd59508150e21bb994908a9d78f9b0))
+* narrow type for `add` and `subtract` ([#1576](https://github.com/iamkun/dayjs/issues/1576)) ([1686962](https://github.com/iamkun/dayjs/commit/16869621b1a42563064dbf87f80c1ebfd74c1188))
+* update customParseFormat plugin strict x X parsing ([#1571](https://github.com/iamkun/dayjs/issues/1571)) ([08adda5](https://github.com/iamkun/dayjs/commit/08adda54edbcca38601f57841921d0f87f84e49e))
+* update Lithuanian [lt] locale spelling for single month ([#1609](https://github.com/iamkun/dayjs/issues/1609)) ([255dc54](https://github.com/iamkun/dayjs/commit/255dc54d9295de135a9037ce6ca13cae4bfd2cfb))
+* Update Norwegian Bokmål [nb] local yearStart 4 ([#1608](https://github.com/iamkun/dayjs/issues/1608)) ([7a8467c](https://github.com/iamkun/dayjs/commit/7a8467c0b7d59821f7e19d4a6973bcda8e4c19b1))
+* update plugin advancedFormat `isValid` validation ([#1566](https://github.com/iamkun/dayjs/issues/1566)) ([755fc8b](https://github.com/iamkun/dayjs/commit/755fc8bb1c532eb991459f180eee81367d12016c))
+* update Sinhalese [si] locale month name ([#1475](https://github.com/iamkun/dayjs/issues/1475)) ([63de2a8](https://github.com/iamkun/dayjs/commit/63de2a8b7dcd7e68c132c85d88572d4c9d296907))
+* update utcOffset plugin type file ([#1604](https://github.com/iamkun/dayjs/issues/1604)) ([f68e4b1](https://github.com/iamkun/dayjs/commit/f68e4b1a29fc33542f74cde10ec6d9fb045ca37e))
+
+## [1.10.6](https://github.com/iamkun/dayjs/compare/v1.10.5...v1.10.6) (2021-07-06)
+
+
+### Bug Fixes
+
+* add invalid date string override ([#1465](https://github.com/iamkun/dayjs/issues/1465)) ([#1470](https://github.com/iamkun/dayjs/issues/1470)) ([06f88f4](https://github.com/iamkun/dayjs/commit/06f88f425828b1ce96b737332d25145a95a4ee9d))
+* add sv-fi Finland Swedish locale ([#1522](https://github.com/iamkun/dayjs/issues/1522)) ([8e32164](https://github.com/iamkun/dayjs/commit/8e32164855cff724642e24c37a631eb4c4d760c8))
+* customParseFormat support parsing X x timestamp ([#1567](https://github.com/iamkun/dayjs/issues/1567)) ([eb087f5](https://github.com/iamkun/dayjs/commit/eb087f52861313b8dd8a5c1b77858665ec72859e))
+* dayjs ConfigTypeMap add null & undefined ([#1560](https://github.com/iamkun/dayjs/issues/1560)) ([b5e40e6](https://github.com/iamkun/dayjs/commit/b5e40e6f16abeaea6a0facfa466d20aefaa8a444))
+* Fix DayOfYear plugin when using BadMutable plugin ([#1511](https://github.com/iamkun/dayjs/issues/1511)) ([0b0c6a3](https://github.com/iamkun/dayjs/commit/0b0c6a31ec9c0aff991b0e8dd6eed116201274cc))
+* Implement ordinal in Bulgarian translation (fixes [#1501](https://github.com/iamkun/dayjs/issues/1501)) ([#1502](https://github.com/iamkun/dayjs/issues/1502)) ([b728da5](https://github.com/iamkun/dayjs/commit/b728da5ed9ed08210004ed20ce5fcd52a92de7da))
+* more strict delimiter in REGEX_PARSE ([#1555](https://github.com/iamkun/dayjs/issues/1555)) ([bfdab5c](https://github.com/iamkun/dayjs/commit/bfdab5c0d45a5736b68e8e1b1354fc021e05f607))
+* parameter type ([#1549](https://github.com/iamkun/dayjs/issues/1549)) ([f369844](https://github.com/iamkun/dayjs/commit/f369844dd69d253c4c7cbf68150939db3db233be))
+* update customParseFormat plugin to custom two-digit year parse function ([#1421](https://github.com/iamkun/dayjs/issues/1421)) ([bb5df55](https://github.com/iamkun/dayjs/commit/bb5df55cd3975dc7638b8f4e762afa470b6620f7))
+* update names of weekdays and months in Bulgarian [bg] to lowercase ([#1438](https://github.com/iamkun/dayjs/issues/1438)) ([b246210](https://github.com/iamkun/dayjs/commit/b24621091fec9cf6704de21e4b323f6f0c4abbf1))
+* update type file `.diff` ([#1505](https://github.com/iamkun/dayjs/issues/1505)) ([6508494](https://github.com/iamkun/dayjs/commit/6508494a4e62977b4397baaeef293d1bcf3c7235))
+* update UTC plugin type file for strict parsing ([#1443](https://github.com/iamkun/dayjs/issues/1443)) ([b4f28df](https://github.com/iamkun/dayjs/commit/b4f28df219fe63202dffdbeeaec5677c4d2c9111))
+
+## [1.10.5](https://github.com/iamkun/dayjs/compare/v1.10.4...v1.10.5) (2021-05-26)
+
+
+### Bug Fixes
+
+* add meridiem in ar locales ([#1375](https://github.com/iamkun/dayjs/issues/1375)) ([319f616](https://github.com/iamkun/dayjs/commit/319f616e572a03b984013d04d1b3a18ffd5b1190))
+* Added Zulu support to customParseFormat ([#1359](https://github.com/iamkun/dayjs/issues/1359)) ([1138a3f](https://github.com/iamkun/dayjs/commit/1138a3f0a76592c6d72fb86c4399e133fa41e2ec))
+* fix Bengali [bn] locale monthsShort error ([a0e6c0c](https://github.com/iamkun/dayjs/commit/a0e6c0cf3e1828020dfa11432c6716990f6ed5e0))
+* fix missing types for ArraySupport plugin ([#1401](https://github.com/iamkun/dayjs/issues/1401)) ([b1abdc4](https://github.com/iamkun/dayjs/commit/b1abdc40ee6c9d18ff46c311a114e0755677ea6f))
+* fix Ukrainian [uk] locale ([#1463](https://github.com/iamkun/dayjs/issues/1463)) ([0fdac93](https://github.com/iamkun/dayjs/commit/0fdac93ff2531542301b76952be9b084b2e2dfa0))
+* hotfix for `Duration` types ([#1357](https://github.com/iamkun/dayjs/issues/1357)) ([855b7b3](https://github.com/iamkun/dayjs/commit/855b7b3d049a3903794f91db3419f167c00dabd2)), closes [#1354](https://github.com/iamkun/dayjs/issues/1354)
+* timezone plugin DST error ([#1352](https://github.com/iamkun/dayjs/issues/1352)) ([71bed15](https://github.com/iamkun/dayjs/commit/71bed155edf32bff24379930ac684fc783538d8f))
+* Update duration plugin change string to number ([#1394](https://github.com/iamkun/dayjs/issues/1394)) ([e1546d1](https://github.com/iamkun/dayjs/commit/e1546d1a0cdb97ae92cf11efe61d94707af6a3a3))
+* update Duration plugin to support no-argument ([#1400](https://github.com/iamkun/dayjs/issues/1400)) ([8d9a5ae](https://github.com/iamkun/dayjs/commit/8d9a5ae0749e1b4e76babd4deeaa3b1d9776c29b))
+* Update Finnish [fi] locale to set yearStart  ([#1378](https://github.com/iamkun/dayjs/issues/1378)) ([f3370bd](https://github.com/iamkun/dayjs/commit/f3370bda4e435118f714c8a7daf5c88cfc4b69ba))
+* update Russian [ru] locale meridiem and unit tests ([#1403](https://github.com/iamkun/dayjs/issues/1403)) ([f10f39d](https://github.com/iamkun/dayjs/commit/f10f39de7db70244a3c35e4a421090a12972457b))
+* update Russian [ru] locale yearStart config  ([#1372](https://github.com/iamkun/dayjs/issues/1372)) ([5052515](https://github.com/iamkun/dayjs/commit/5052515fe35b2444201ef8ef87220b1876a94d0a))
+* update Slovenian [sl] locale to set correct ordinal  ([#1386](https://github.com/iamkun/dayjs/issues/1386)) ([cb4f746](https://github.com/iamkun/dayjs/commit/cb4f74633b3020d6dbf19548c8cb13613dafca18))
+* update Spanish [es] locale to change month names to lowercase ([#1414](https://github.com/iamkun/dayjs/issues/1414)) ([9c20e77](https://github.com/iamkun/dayjs/commit/9c20e77caf7b1b5eccf418175203b198d4e29535))
+* update Swedish [sv] locale to set correct yearStart ([#1385](https://github.com/iamkun/dayjs/issues/1385)) ([66c5935](https://github.com/iamkun/dayjs/commit/66c59354964ef456bcd5f6152819618f44978082))
+* update UTC plugin to support string argument like +HH:mm ([#1395](https://github.com/iamkun/dayjs/issues/1395)) ([656127c](https://github.com/iamkun/dayjs/commit/656127cc44eda50923a1ac755602863fc32b9e69))
+
+## [1.10.4](https://github.com/iamkun/dayjs/compare/v1.10.3...v1.10.4) (2021-01-22)
+
+
+### Bug Fixes
+
+* Correct handling negative duration ([#1317](https://github.com/iamkun/dayjs/issues/1317)) ([3f5c085](https://github.com/iamkun/dayjs/commit/3f5c085608182472f20b84766b10949945663e44))
+* Improve `Duration` types ([#1338](https://github.com/iamkun/dayjs/issues/1338)) ([4aca4b1](https://github.com/iamkun/dayjs/commit/4aca4b1b584a15de1146d929f95c944594032f20))
+* parse a string for MMM month format with underscore delimiter ([#1349](https://github.com/iamkun/dayjs/issues/1349)) ([82ef9a3](https://github.com/iamkun/dayjs/commit/82ef9a304f06287ac0a14c4da9a7fe6152b5fec9))
+* Update Bengali [bn] locale ([#1329](https://github.com/iamkun/dayjs/issues/1329)) ([02d96ec](https://github.com/iamkun/dayjs/commit/02d96ec7189f62d6ef8987135919cbb5ceff20a6))
+* update locale Portuguese [pt] yearStart ([#1345](https://github.com/iamkun/dayjs/issues/1345)) ([5c785d5](https://github.com/iamkun/dayjs/commit/5c785d528cc08811638d7cbfc7fc158d67b32d75))
+* update Polish [pl] locale yearStart ([#1348](https://github.com/iamkun/dayjs/issues/1348)) ([e93e6b8](https://github.com/iamkun/dayjs/commit/e93e6b8ffa61036b26382f1763e3864d4a7d5df5))
+* Update Slovenian [sl] relativeTime locale ([#1333](https://github.com/iamkun/dayjs/issues/1333)) ([fe5f1d0](https://github.com/iamkun/dayjs/commit/fe5f1d0afbe57b70339e268047e6c3028ca3d59b))
+
+## [1.10.3](https://github.com/iamkun/dayjs/compare/v1.10.2...v1.10.3) (2021-01-09)
+
+
+### Bug Fixes
+
+* fix customParseFormat plugin strict mode parse meridiem bug ([#1321](https://github.com/iamkun/dayjs/issues/1321)) ([e49eeef](https://github.com/iamkun/dayjs/commit/e49eeefbe8acb36419d36ca2e7ed8bc152f73ac1))
+* fix weekYear plugin missing locale bug ([#1319](https://github.com/iamkun/dayjs/issues/1319)) ([344bdc0](https://github.com/iamkun/dayjs/commit/344bdc0eed6843edb05723dc7853a41833d88f08)), closes [#1304](https://github.com/iamkun/dayjs/issues/1304)
+* update advancedFormat plugin to add format options for iso week and weekyear ([#1309](https://github.com/iamkun/dayjs/issues/1309)) ([2c54c64](https://github.com/iamkun/dayjs/commit/2c54c6441871a175ac9b95e41e4cd075dbac10cb))
+* update devHelper to add dev warning setting locale before loading ([c5cc893](https://github.com/iamkun/dayjs/commit/c5cc89355e1e206ca72433c19c40cb528690b04f))
+* update German [de] locale yearStart ([1858df8](https://github.com/iamkun/dayjs/commit/1858df8008de56570680723df89b36a8cbc970ef)), closes [#1264](https://github.com/iamkun/dayjs/issues/1264)
+
+## [1.10.2](https://github.com/iamkun/dayjs/compare/v1.10.1...v1.10.2) (2021-01-05)
+
+
+### Bug Fixes
+
+* fix parse regex bug ([#1307](https://github.com/iamkun/dayjs/issues/1307)) ([db2b6a5](https://github.com/iamkun/dayjs/commit/db2b6a5ea8e70f9fda645d113ca33495aa96b616)), closes [#1305](https://github.com/iamkun/dayjs/issues/1305)
+* remove module entry in package.json to revert 1.10.1 change ([#1314](https://github.com/iamkun/dayjs/issues/1314)) ([824dcb8](https://github.com/iamkun/dayjs/commit/824dcb8dfcccf14f64b6a2741a00fcdfe53dcd98))
+* update devHelper add warning "passing Year as a Number will be parsed as a Unix timestamp" ([#1315](https://github.com/iamkun/dayjs/issues/1315)) ([b0dda31](https://github.com/iamkun/dayjs/commit/b0dda3139e25441ab4e7c1f4f192dee0ecce6ef8))
+
+## [1.10.1](https://github.com/iamkun/dayjs/compare/v1.10.0...v1.10.1) (2021-01-03)
+
+
+### Bug Fixes
+
+* fix typescript type error UnitTypeLongPlural ([#1302](https://github.com/iamkun/dayjs/issues/1302)) ([bfaabe4](https://github.com/iamkun/dayjs/commit/bfaabe4f398c11564eca6cda7c8aded22e1b231a)), closes [#1300](https://github.com/iamkun/dayjs/issues/1300)
+
+# [1.10.0](https://github.com/iamkun/dayjs/compare/v1.9.8...v1.10.0) (2021-01-03)
+
+
+### Bug Fixes
+
+* add ordinal to localeData plugin ([#1266](https://github.com/iamkun/dayjs/issues/1266)) ([fd229fa](https://github.com/iamkun/dayjs/commit/fd229fa5bd26bcba810e2535eb937ea8d99106c2))
+* add preParsePostFormat plugin & update Arabic [ar] locale ([#1255](https://github.com/iamkun/dayjs/issues/1255)) ([f2e4790](https://github.com/iamkun/dayjs/commit/f2e479006a9a49bc0917f8620101d40ac645f7f2))
+* add type support for plural forms of units ([#1289](https://github.com/iamkun/dayjs/issues/1289)) ([de49bb1](https://github.com/iamkun/dayjs/commit/de49bb100badfb92b9a5933cc568841f340a923f))
+* escape last period to match only milliseconds ([#1239](https://github.com/iamkun/dayjs/issues/1239)) ([#1295](https://github.com/iamkun/dayjs/issues/1295)) ([64037e6](https://github.com/iamkun/dayjs/commit/64037e6a8cf303dcfd2b954f309bd9691f87fffc))
+
+
+### Features
+
+* add ES6 Module Support, package.json module point to "esm/index.js" ([#1298](https://github.com/iamkun/dayjs/issues/1298)) ([f63375d](https://github.com/iamkun/dayjs/commit/f63375dea89becbd3bb2bb8ea7289c58c752bfed)), closes [#598](https://github.com/iamkun/dayjs/issues/598) [#313](https://github.com/iamkun/dayjs/issues/313)
+
+## [1.9.8](https://github.com/iamkun/dayjs/compare/v1.9.7...v1.9.8) (2020-12-27)
+
+
+### Bug Fixes
+
+* fix Ukrainian [uk] locale typo ([1605cc0](https://github.com/iamkun/dayjs/commit/1605cc0f6fe0e9c46a92d529bc9cd6e130432337))
+* update Hebrew [he] locale for double units ([#1287](https://github.com/iamkun/dayjs/issues/1287)) ([1c4b0da](https://github.com/iamkun/dayjs/commit/1c4b0da1468522e59dc9ee646d10dd2b31477d99))
+* update zh locale meridiem "noon" ([0e7ff3d](https://github.com/iamkun/dayjs/commit/0e7ff3dd29ca3aed85cb76dfcb8298d326e26542))
+* update zh-cn locale definition of noon  ([#1278](https://github.com/iamkun/dayjs/issues/1278)) ([d5930b9](https://github.com/iamkun/dayjs/commit/d5930b96ff884f4176ca3fcb1bc95e8f1ec75c71))
+
+## [1.9.7](https://github.com/iamkun/dayjs/compare/v1.9.6...v1.9.7) (2020-12-05)
+
+
+### Bug Fixes
+
+* add duration.format to format a Duration ([#1202](https://github.com/iamkun/dayjs/issues/1202)) ([9a859a1](https://github.com/iamkun/dayjs/commit/9a859a147ba223a1eeff0f2bb6f33d97e0ccc6c7))
+* Add function handling for relativeTime.future and relativeTime.past ([#1197](https://github.com/iamkun/dayjs/issues/1197)) ([ef1979c](https://github.com/iamkun/dayjs/commit/ef1979ce85c61fe2d759ef3c37cb6aaf2358094f))
+* avoid install installed plugin ([#1214](https://github.com/iamkun/dayjs/issues/1214)) ([a92eb6c](https://github.com/iamkun/dayjs/commit/a92eb6c4dc1437ec920e69484d52984f5921a8ea))
+* avoid memory leak after installing a plugin too many times ([b8d2e32](https://github.com/iamkun/dayjs/commit/b8d2e32a9eb59661a7ed6200daa070687becaebd))
+* fix diff bug when UTC plugin enabled ([#1201](https://github.com/iamkun/dayjs/issues/1201)) ([9544ed2](https://github.com/iamkun/dayjs/commit/9544ed2a6c466b8308d26b33a388a6737435a1f4)), closes [#1200](https://github.com/iamkun/dayjs/issues/1200)
+* fix startOf/endOf bug in timezone plugin ([#1229](https://github.com/iamkun/dayjs/issues/1229)) ([eb5fbc4](https://github.com/iamkun/dayjs/commit/eb5fbc4c7d1b62a8615d2f263b404a9515d8e15c))
+* fix utc plugin diff edge case ([#1187](https://github.com/iamkun/dayjs/issues/1187)) ([971b3d4](https://github.com/iamkun/dayjs/commit/971b3d40b4c9403165138f1034e2223cd97c3abf))
+* update customParseFormat plugin to parse 2-digit offset ([#1209](https://github.com/iamkun/dayjs/issues/1209)) ([b56936a](https://github.com/iamkun/dayjs/commit/b56936ab77b8f6289a1b77d49307b495c4bf9f91)), closes [#1205](https://github.com/iamkun/dayjs/issues/1205)
+* Update timezone plugin type definition ([#1221](https://github.com/iamkun/dayjs/issues/1221)) ([34cfb92](https://github.com/iamkun/dayjs/commit/34cfb920b9653ad44d4b31fe49e533692a3ce01b))
+
+## [1.9.6](https://github.com/iamkun/dayjs/compare/v1.9.5...v1.9.6) (2020-11-10)
+
+
+### Bug Fixes
+
+* fix customParseFormat plugin parsing date bug ([#1198](https://github.com/iamkun/dayjs/issues/1198)) ([50f05ad](https://github.com/iamkun/dayjs/commit/50f05ad3addf27827c5657ae7519514e40d9faec)), closes [#1194](https://github.com/iamkun/dayjs/issues/1194)
+* Update lv (Latvian) locale relative time ([#1192](https://github.com/iamkun/dayjs/issues/1192)) ([6d6c684](https://github.com/iamkun/dayjs/commit/6d6c6841b13ba4f7e69de92caf132a3592c5253a))
+
+## [1.9.5](https://github.com/iamkun/dayjs/compare/v1.9.4...v1.9.5) (2020-11-05)
+
+
+### Bug Fixes
+
+* customParseFormat plugin supports parsing localizedFormats  ([#1110](https://github.com/iamkun/dayjs/issues/1110)) ([402b603](https://github.com/iamkun/dayjs/commit/402b603aa3ee4199786950bc88b3fdc6b527aa35))
+* fix customParseFormat plugin parse meridiem bug ([#1169](https://github.com/iamkun/dayjs/issues/1169)) ([9e8f8d9](https://github.com/iamkun/dayjs/commit/9e8f8d96c69d557f4d267f42567c25ae9e7ab227)), closes [#1168](https://github.com/iamkun/dayjs/issues/1168)
+* fix devHelper error in umd bundle in browser ([#1165](https://github.com/iamkun/dayjs/issues/1165)) ([d11b5ee](https://github.com/iamkun/dayjs/commit/d11b5ee7dc11af671355f65ccda00f6ba42cc725))
+* fix utc plugin diff bug in DST ([#1171](https://github.com/iamkun/dayjs/issues/1171)) ([f8da3fe](https://github.com/iamkun/dayjs/commit/f8da3fe7e50c84c0502bf5be0b364910922dbd79)), closes [#1097](https://github.com/iamkun/dayjs/issues/1097) [#1021](https://github.com/iamkun/dayjs/issues/1021)
+* isoWeek plugin type ([#1177](https://github.com/iamkun/dayjs/issues/1177)) ([c3d0436](https://github.com/iamkun/dayjs/commit/c3d0436b06f74989e3a2c751a5d170f8072c4aad))
+* update localeData plugin to support meridiem ([#1174](https://github.com/iamkun/dayjs/issues/1174)) ([fdb09e4](https://github.com/iamkun/dayjs/commit/fdb09e4074cc7e8f6196846f18d3566c1f9e8fcd)), closes [#1172](https://github.com/iamkun/dayjs/issues/1172)
+* update timezone plugin parse Date instance / timestamp logic & remove useless test ([#1183](https://github.com/iamkun/dayjs/issues/1183)) ([a7f858b](https://github.com/iamkun/dayjs/commit/a7f858bb70ad81f718ba35c479e84b54eace48b2))
+
+## [1.9.4](https://github.com/iamkun/dayjs/compare/v1.9.3...v1.9.4) (2020-10-23)
+
+
+### Bug Fixes
+
+* Add descriptions to types ([#1148](https://github.com/iamkun/dayjs/issues/1148)) ([9a407a1](https://github.com/iamkun/dayjs/commit/9a407a140b089345a387d1aceab4d0d1635229c7))
+* add devHelper plugin ([#1163](https://github.com/iamkun/dayjs/issues/1163)) ([de49dc8](https://github.com/iamkun/dayjs/commit/de49dc80c83b85de4170571b64412bd60ada221b))
+* Fix Hungarian (hu) locale ([#1112](https://github.com/iamkun/dayjs/issues/1112)) ([ab13754](https://github.com/iamkun/dayjs/commit/ab13754f43c5033dacaa0eb2042dc4ab1a7a2754))
+* fix minMax plugin parsing empty array bug ([#1062](https://github.com/iamkun/dayjs/issues/1062)) ([368108b](https://github.com/iamkun/dayjs/commit/368108bc6d5cb1542f711b8eba722bd4dfaab0cd))
+* update adding/subtracting Duration from Dayjs object ([#1156](https://github.com/iamkun/dayjs/issues/1156)) ([f861aca](https://github.com/iamkun/dayjs/commit/f861acac3e83e28d3a4a96312c71119fd6b544fc))
+* update en-NZ locale to use proper ordinal formatting function ([#1143](https://github.com/iamkun/dayjs/issues/1143)) ([fcdbc58](https://github.com/iamkun/dayjs/commit/fcdbc5880710456a29b2bacf250542230bf48b99))
+* update localeData plugin type ([#1116](https://github.com/iamkun/dayjs/issues/1116)) ([ee5a4ec](https://github.com/iamkun/dayjs/commit/ee5a4ec41edddfb57d103c35182dc635c9264a10))
+* update timezone plugin to support custom parse format ([#1160](https://github.com/iamkun/dayjs/issues/1160)) ([48cbf31](https://github.com/iamkun/dayjs/commit/48cbf3118ba5427de428777c2e025896db654f2e)), closes [#1159](https://github.com/iamkun/dayjs/issues/1159)
+* update timezone plugin to support keepLocalTime ([#1161](https://github.com/iamkun/dayjs/issues/1161)) ([1d429e5](https://github.com/iamkun/dayjs/commit/1d429e5fe4467ebddcf81b43cf6f36e5e3be944c)), closes [#1149](https://github.com/iamkun/dayjs/issues/1149)
+
+## [1.9.3](https://github.com/iamkun/dayjs/compare/v1.9.2...v1.9.3) (2020-10-13)
+
+
+### Bug Fixes
+
+* fix localizedFormat export error ([#1133](https://github.com/iamkun/dayjs/issues/1133)) ([deecd6a](https://github.com/iamkun/dayjs/commit/deecd6ab8a2f4173ee7046f6b568b41fd2677531)), closes [#1132](https://github.com/iamkun/dayjs/issues/1132)
+
+## [1.9.2](https://github.com/iamkun/dayjs/compare/v1.9.1...v1.9.2) (2020-10-13)
+
+
+### Bug Fixes
+
+* add arraySupport plugin ([#1129](https://github.com/iamkun/dayjs/issues/1129)) ([be505c2](https://github.com/iamkun/dayjs/commit/be505c2c540261027342cecc55d8919a3d18d893))
+* export type of duration plugin ([#1094](https://github.com/iamkun/dayjs/issues/1094)) ([2c92e71](https://github.com/iamkun/dayjs/commit/2c92e71bf55d09601120cdf433da7a19cc8abff6))
+* Fix LocaleData plugin longDateFormat lowercase error ([#1101](https://github.com/iamkun/dayjs/issues/1101)) ([7937ccd](https://github.com/iamkun/dayjs/commit/7937ccdeac47d094a60e65ebb62a6020b81c46f4))
+* Fix objectSupport plugin bug in UTC ([#1107](https://github.com/iamkun/dayjs/issues/1107)) ([fe90bb6](https://github.com/iamkun/dayjs/commit/fe90bb6944f2ff1969ca975954d303b449dfa95b)), closes [#1105](https://github.com/iamkun/dayjs/issues/1105)
+* fix Serbian locale grammar (sr, sr-cyrl) ([#1108](https://github.com/iamkun/dayjs/issues/1108)) ([cc87eff](https://github.com/iamkun/dayjs/commit/cc87eff8b75b0d86ce0956516319d402bccae6c0))
+* Fix typo for "monday" in arabic ([#1067](https://github.com/iamkun/dayjs/issues/1067)) ([2e1e426](https://github.com/iamkun/dayjs/commit/2e1e42650124f30282dc4d710798d576b928f1c7))
+* support dayjs.add(Duration), dayjs.subtract(Duration) ([#1099](https://github.com/iamkun/dayjs/issues/1099)) ([b1a0294](https://github.com/iamkun/dayjs/commit/b1a02942c5238203aaa04ce9a074c73742324ab7))
+* update Breton [br] locale relativeTime config ([#1103](https://github.com/iamkun/dayjs/issues/1103)) ([b038bfd](https://github.com/iamkun/dayjs/commit/b038bfdb128889d677c95534d2be29cc30c9e72f))
+* update Catalan [ca] locale ordinal ([73da380](https://github.com/iamkun/dayjs/commit/73da38024c8b550bdcfbe3ff7e578e742c7aecf2))
+* update German [de] locale relativeTime config ([#1109](https://github.com/iamkun/dayjs/issues/1109)) ([f6e771b](https://github.com/iamkun/dayjs/commit/f6e771b70f93d19ebb12e6b794aa4628a1796248))
+* update localeData plugin to add longDateFormat to global localeData ([#1106](https://github.com/iamkun/dayjs/issues/1106)) ([16937d1](https://github.com/iamkun/dayjs/commit/16937d16e053b8c1d4a607622fa2fdbfd9809832))
+* Update objectSupport plugin to return current date time while parsing empty object ([f56783e](https://github.com/iamkun/dayjs/commit/f56783e14d8cf50916b015e7188b23bb6fbca839))
+
+## [1.9.1](https://github.com/iamkun/dayjs/compare/v1.9.0...v1.9.1) (2020-09-28)
+
+
+### Bug Fixes
+
+* Fix objectSupport plugin to get the correct result (zero-based month) ([#1089](https://github.com/iamkun/dayjs/issues/1089)) ([f95ac15](https://github.com/iamkun/dayjs/commit/f95ac15a4577ae5a3d1ce353872a2cd9fc454bc2))
+
+# [1.9.0](https://github.com/iamkun/dayjs/compare/v1.8.36...v1.9.0) (2020-09-28)
+
+
+### Bug Fixes
+
+* Add `setDefault` typing to timezone.d.ts ([#1057](https://github.com/iamkun/dayjs/issues/1057)) ([c0f0886](https://github.com/iamkun/dayjs/commit/c0f088620f17260e6e3ebce7697d561b5623f5f3))
+* fix DST bug in utc plugin ([#1053](https://github.com/iamkun/dayjs/issues/1053)) ([3d73543](https://github.com/iamkun/dayjs/commit/3d7354361f042ced1176d91f9ae9edffe6173425))
+* Fix optional type for timezone plugin ([#1081](https://github.com/iamkun/dayjs/issues/1081)) ([a6ebcf2](https://github.com/iamkun/dayjs/commit/a6ebcf283a83273562dce5663155e3b3a12ea9a5)), closes [#1079](https://github.com/iamkun/dayjs/issues/1079)
+* Fix timezone plugin conversion bug ([#1073](https://github.com/iamkun/dayjs/issues/1073)) ([16816a3](https://github.com/iamkun/dayjs/commit/16816a31ff43220aca9d1d179df6b729182abb55))
+* update duration plugin type file ([#1065](https://github.com/iamkun/dayjs/issues/1065)) ([94af9af](https://github.com/iamkun/dayjs/commit/94af9af27c5bc182cbb24f1845e561dd1d82d776))
+* update timezone plugin to support getting offset name e.g. EST ([#1069](https://github.com/iamkun/dayjs/issues/1069)) ([cbb755e](https://github.com/iamkun/dayjs/commit/cbb755e5c68d49c5678291f3ce832b32831a056e))
+* update utc plugin to support keepLocalTime `.utc(true)` ([#1080](https://github.com/iamkun/dayjs/issues/1080)) ([5ce4e0d](https://github.com/iamkun/dayjs/commit/5ce4e0d2f552f3645262537ff7afdc946f5a7e72))
+
+
+### Features
+
+* Correct casing for en-sg locale name ([#1048](https://github.com/iamkun/dayjs/issues/1048)) ([2edaddc](https://github.com/iamkun/dayjs/commit/2edaddc22a7eb914f915531f389766217acd7034))
+
+## [1.8.36](https://github.com/iamkun/dayjs/compare/v1.8.35...v1.8.36) (2020-09-17)
+
+
+### Bug Fixes
+
+* Add Amharic (am) locale ([#1046](https://github.com/iamkun/dayjs/issues/1046)) ([cdc49a1](https://github.com/iamkun/dayjs/commit/cdc49a1911c74b7ea96ed222f42796d53715cfed))
+* Export Duration type in duration plugin ([#1043](https://github.com/iamkun/dayjs/issues/1043)) ([0f20c3a](https://github.com/iamkun/dayjs/commit/0f20c3ac75d9ac1026a15a7bb343d3a150d9b30f))
+* Fix duration plugin parsing milliseconds bug ([#1042](https://github.com/iamkun/dayjs/issues/1042)) ([fe2301b](https://github.com/iamkun/dayjs/commit/fe2301b22318886aaa89ed1620e0a118e98c2b8a))
+* Timezone plugin set default timezone ([#1033](https://github.com/iamkun/dayjs/issues/1033)) ([0c2050a](https://github.com/iamkun/dayjs/commit/0c2050a152da708b01edd6150a5013f642b14576))
+* Timezone plugin should have the same behavior in latest ICU version ([#1032](https://github.com/iamkun/dayjs/issues/1032)) ([de31592](https://github.com/iamkun/dayjs/commit/de315921575cc50c38464b27d0338e30a54d8e2a))
+* Update Finnish (fi) locale ([#963](https://github.com/iamkun/dayjs/issues/963)) ([cf8b6a0](https://github.com/iamkun/dayjs/commit/cf8b6a096f24b54cbdb95675ac386d8ac85ea616))
+* Update Polish (pl) , Hungarian (hr) and Lithuanian (lt) localization ([#1045](https://github.com/iamkun/dayjs/issues/1045)) ([638fd39](https://github.com/iamkun/dayjs/commit/638fd394fc24f4188390faf387da6b156e7c6320))
+
+## [1.8.35](https://github.com/iamkun/dayjs/compare/v1.8.34...v1.8.35) (2020-09-02)
+
+
+### Bug Fixes
+
+* Fix BadMutable plugin bug in .diff ([#1023](https://github.com/iamkun/dayjs/issues/1023)) ([40ab6d9](https://github.com/iamkun/dayjs/commit/40ab6d9a53e8047cfca63c611c25dd045372d021))
+* fix LocaleData plugin to support instance.weekdays() API ([#1019](https://github.com/iamkun/dayjs/issues/1019)) ([a09d259](https://github.com/iamkun/dayjs/commit/a09d259a407b81d1cb6bb5623fad551c775d8674)), closes [#1017](https://github.com/iamkun/dayjs/issues/1017)
+* Update Dutch (nl) locale to set correct yearStart ([1533a2c](https://github.com/iamkun/dayjs/commit/1533a2cc1475270032da2d87b19fc3d62327e6e3))
+
+## [1.8.34](https://github.com/iamkun/dayjs/compare/v1.8.33...v1.8.34) (2020-08-20)
+
+
+### Bug Fixes
+
+* Fix Timezone plugin to preserve milliseconds while changing timezone ([#1003](https://github.com/iamkun/dayjs/issues/1003)) ([5f446ed](https://github.com/iamkun/dayjs/commit/5f446eda770fa97e895c81a8195b3ba5d082cef0)), closes [#1002](https://github.com/iamkun/dayjs/issues/1002)
+* support parsing unlimited decimals of millisecond ([#1010](https://github.com/iamkun/dayjs/issues/1010)) ([d1bdd36](https://github.com/iamkun/dayjs/commit/d1bdd36a56e3d1786523a180e3fc18068f609135)), closes [#544](https://github.com/iamkun/dayjs/issues/544)
+* update Duration plugin to support global locale ([#1008](https://github.com/iamkun/dayjs/issues/1008)) ([1c49c83](https://github.com/iamkun/dayjs/commit/1c49c83e79811eede13db6372b5d65db598aee77)), closes [#1007](https://github.com/iamkun/dayjs/issues/1007)
+
+## [1.8.33](https://github.com/iamkun/dayjs/compare/v1.8.32...v1.8.33) (2020-08-10)
+
+
+### Bug Fixes
+
+* Add PluralGetSet plugin for plural getters/setters ([#996](https://github.com/iamkun/dayjs/issues/996)) ([f76e3ce](https://github.com/iamkun/dayjs/commit/f76e3ce2fbe5d3e9ed9121086baf55eb0cc4d355))
+* Add typescript type defs in esm build ([#985](https://github.com/iamkun/dayjs/issues/985)) ([50e3b3c](https://github.com/iamkun/dayjs/commit/50e3b3c6719cb0b4ec6eff394dacd63d5db8f253))
+* Fix isoWeek Plugin cal bug in UTC mode ([#993](https://github.com/iamkun/dayjs/issues/993)) ([f2e5f32](https://github.com/iamkun/dayjs/commit/f2e5f327aaf12b4572296ec6e107ecc05fcf76e7))
+* Fix Timezone plugin parsing js date, Day.js object, timestamp bug && update type file ([#994](https://github.com/iamkun/dayjs/issues/994)) ([22f3d49](https://github.com/iamkun/dayjs/commit/22f3d49405da98db6da56d1673eebcd01b57554b)), closes [#992](https://github.com/iamkun/dayjs/issues/992) [#989](https://github.com/iamkun/dayjs/issues/989)
+* Fix Timezone plugin UTCOffset rounding bug ([#987](https://github.com/iamkun/dayjs/issues/987)) ([b07182b](https://github.com/iamkun/dayjs/commit/b07182bbdf5aef7f6bf1e88fcd38432e2b8ee465)), closes [#986](https://github.com/iamkun/dayjs/issues/986)
+* Fix UTC plugin bug while comparing an utc instance to a local one ([#995](https://github.com/iamkun/dayjs/issues/995)) ([747c0fb](https://github.com/iamkun/dayjs/commit/747c0fb4eba6353755b5dad3417fd8d5a408c378))
+* Update pt-br locale weekStart 0 ([#984](https://github.com/iamkun/dayjs/issues/984)) ([0f881c1](https://github.com/iamkun/dayjs/commit/0f881c18efb02b9d0ba7f76cba92bb504226fa95))
+
+## [1.8.32](https://github.com/iamkun/dayjs/compare/v1.8.31...v1.8.32) (2020-08-04)
+
+
+### Bug Fixes
+
+* Add Experimental Timezone Plugin ([#974](https://github.com/iamkun/dayjs/issues/974)) ([e69caba](https://github.com/iamkun/dayjs/commit/e69caba1b0957241a855aa0ae38db899fa2c3795))
+* fix parse date string error e.g. '2020/9/30' ([#980](https://github.com/iamkun/dayjs/issues/980)) ([231790d](https://github.com/iamkun/dayjs/commit/231790da62af0494732960c2c50d86ae9bf63ec6)), closes [#979](https://github.com/iamkun/dayjs/issues/979)
+* update monthDiff function to get more accurate results ([19e8a7f](https://github.com/iamkun/dayjs/commit/19e8a7f2f7582b717f49d446822e39603694433c))
+* Update UTC plugin to support keepLocalTime ([#973](https://github.com/iamkun/dayjs/issues/973)) ([9f488e5](https://github.com/iamkun/dayjs/commit/9f488e5aca92f0b4c2951459436829d79f86d8d7))
+
+## [1.8.31](https://github.com/iamkun/dayjs/compare/v1.8.30...v1.8.31) (2020-07-29)
+
+
+### Bug Fixes
+
+* Rollback LocalePresetType to string ([#968](https://github.com/iamkun/dayjs/issues/968)) ([b342bd3](https://github.com/iamkun/dayjs/commit/b342bd3d84987d6c7587a0c4590d614fb0e670d7))
+* Update Regex to parse 'YYYY' correctly ([#969](https://github.com/iamkun/dayjs/issues/969)) ([70c1239](https://github.com/iamkun/dayjs/commit/70c123990dcc6bd479fa2b5d7f9985127872a826))
+
+## [1.8.30](https://github.com/iamkun/dayjs/compare/v1.8.29...v1.8.30) (2020-07-22)
+
+
+### Bug Fixes
+
+* Add Haitian Creole (ht) and Spanish Puerto Rico (es-pr) locale configs ([#958](https://github.com/iamkun/dayjs/issues/958)) ([b2642e2](https://github.com/iamkun/dayjs/commit/b2642e2d1f87734a34808c66e5176cb18bc0414d))
+* Fix UTC plugin wrong hour bug while adding month or year  ([#957](https://github.com/iamkun/dayjs/issues/957)) ([28ae070](https://github.com/iamkun/dayjs/commit/28ae070024ff26685c88ce4cc8747307e86923c9))
+* Update French (fr) locale to set correct yearStart ([14ab808](https://github.com/iamkun/dayjs/commit/14ab808a7b7e226f2eb2cbe894916a18ed5d967d)), closes [#956](https://github.com/iamkun/dayjs/issues/956)
+
+## [1.8.29](https://github.com/iamkun/dayjs/compare/v1.8.28...v1.8.29) (2020-07-02)
+
+
+### Bug Fixes
+
+* Duration plugin supports parse ISO string with week (W) ([#950](https://github.com/iamkun/dayjs/issues/950)) ([f0fc12a](https://github.com/iamkun/dayjs/commit/f0fc12adadcab53fb0577ad8f5e2f1cf784fd8f5))
+* LocaleData plugin supports locale order ([#938](https://github.com/iamkun/dayjs/issues/938)) ([62f429d](https://github.com/iamkun/dayjs/commit/62f429db73a0a069b1267231dea172b85f4b90e3)), closes [#936](https://github.com/iamkun/dayjs/issues/936)
+* Update type definition to support array format ([#945](https://github.com/iamkun/dayjs/issues/945)) ([81d4740](https://github.com/iamkun/dayjs/commit/81d4740511d47e34f891b21afeb0449ef8a28688)), closes [#944](https://github.com/iamkun/dayjs/issues/944)
+* Update type definition to support strict mode ([#951](https://github.com/iamkun/dayjs/issues/951)) ([8d54f3f](https://github.com/iamkun/dayjs/commit/8d54f3f7d4d161e72c767fa09699e70a2b3d681c))
+
+## [1.8.28](https://github.com/iamkun/dayjs/compare/v1.8.27...v1.8.28) (2020-05-28)
+
+
+### Bug Fixes
+
+* Fix CustomParseFormat plugin month index error ([#918](https://github.com/iamkun/dayjs/issues/918)) ([fa2ec7f](https://github.com/iamkun/dayjs/commit/fa2ec7fcb980dcd2c7498dafe2f9ca2e52d735cf)), closes [#915](https://github.com/iamkun/dayjs/issues/915)
+* Update Ukrainian (uk) locale monthFormat and monthStandalone ([#899](https://github.com/iamkun/dayjs/issues/899)) ([a08756e](https://github.com/iamkun/dayjs/commit/a08756e80bd1d7126fca28c5ad9e382613fc86c4))
+
+## [1.8.27](https://github.com/iamkun/dayjs/compare/v1.8.26...v1.8.27) (2020-05-14)
+
+
+### Bug Fixes
+
+* Add Kinyarwanda (rw) locale ([#903](https://github.com/iamkun/dayjs/issues/903)) ([f355235](https://github.com/iamkun/dayjs/commit/f355235a836540d77880959fb1b614c87e9f7b3e))
+* Add plugin objectSupport ([#887](https://github.com/iamkun/dayjs/issues/887)) ([52dfb13](https://github.com/iamkun/dayjs/commit/52dfb13a6b84f0a753cc5761192b92416f440961))
+* Add Turkmen (tk) locale ([#893](https://github.com/iamkun/dayjs/issues/893)) ([a9ca8dc](https://github.com/iamkun/dayjs/commit/a9ca8dcbbd0964c5b9abb4e8a2d620c983cf091a))
+* Fix CustomParseFormat plugin set locale error ([#896](https://github.com/iamkun/dayjs/issues/896)) ([8035c8a](https://github.com/iamkun/dayjs/commit/8035c8a760549b631252252718db3cdc4ab2f68f))
+* Fix locale month function bug ([#908](https://github.com/iamkun/dayjs/issues/908)) ([bf347c3](https://github.com/iamkun/dayjs/commit/bf347c36e401f50727fb5afcc537497b54b90d6b))
+* Update CustomParseFormat plugin to support Array formats ([#906](https://github.com/iamkun/dayjs/issues/906)) ([97856c6](https://github.com/iamkun/dayjs/commit/97856c603ef5fbbeb1cf8a42387479e56a77dbe8))
+
+## [1.8.26](https://github.com/iamkun/dayjs/compare/v1.8.25...v1.8.26) (2020-04-30)
+
+
+### Bug Fixes
+
+* Fix Duration plugin `.toISOString` format bug ([#889](https://github.com/iamkun/dayjs/issues/889)) ([058d624](https://github.com/iamkun/dayjs/commit/058d624808fd2be024ae846bcb2e03885f39b556)), closes [#888](https://github.com/iamkun/dayjs/issues/888)
+* Fix WeekOfYear plugin bug while using BadMutable plugin ([#884](https://github.com/iamkun/dayjs/issues/884)) ([2977438](https://github.com/iamkun/dayjs/commit/2977438458542573a4500e21f7ba5d1f8442960e))
+* Update CustomParseFormat plugin strict mode ([#882](https://github.com/iamkun/dayjs/issues/882)) ([db642ac](https://github.com/iamkun/dayjs/commit/db642ac73e52e00d8c41546b2935c9e691cf66e0))
+* Update RelativeTime plugin default config ([#883](https://github.com/iamkun/dayjs/issues/883)) ([0606f42](https://github.com/iamkun/dayjs/commit/0606f425aef8ccbfc3da3e43cba368130603b0cc))
+
+## [1.8.25](https://github.com/iamkun/dayjs/compare/v1.8.24...v1.8.25) (2020-04-21)
+
+
+### Bug Fixes
+
+* Fix CustomParseFormat plugin of parsing only YYYY / YYYY-MM bug ([#873](https://github.com/iamkun/dayjs/issues/873)) ([3cea04d](https://github.com/iamkun/dayjs/commit/3cea04d33d54d44bbdd3d026b5c7f67ebf176116)), closes [#849](https://github.com/iamkun/dayjs/issues/849)
+* Fix Duration plugin get seconds ([#867](https://github.com/iamkun/dayjs/issues/867)) ([62b092d](https://github.com/iamkun/dayjs/commit/62b092d9f9a3db5506ef01f798bdf211f163f53f))
+* Fix type definition of locale ([9790b85](https://github.com/iamkun/dayjs/commit/9790b853e6113243a7f4a81dd12c6509e406a102))
+* Fix UTC plugin startOf, endOf bug ([#872](https://github.com/iamkun/dayjs/issues/872)) ([4141084](https://github.com/iamkun/dayjs/commit/4141084ba96d35cadcda3f1e661bf1d0f6c8e4de)), closes [#809](https://github.com/iamkun/dayjs/issues/809) [#808](https://github.com/iamkun/dayjs/issues/808)
+
+## [1.8.24](https://github.com/iamkun/dayjs/compare/v1.8.23...v1.8.24) (2020-04-10)
+
+
+### Bug Fixes
+
+* Add config option to RelativeTime plugin ([#851](https://github.com/iamkun/dayjs/issues/851)) ([bd24034](https://github.com/iamkun/dayjs/commit/bd24034b95bfc656024b75ef3f3c986708845fed))
+* add Duration plugin ([#858](https://github.com/iamkun/dayjs/issues/858)) ([d568273](https://github.com/iamkun/dayjs/commit/d568273223199ca0497f238e2cc3a8d3dcf32d0f))
+* Add en-in, en-tt locales ([#855](https://github.com/iamkun/dayjs/issues/855)) ([c39fb96](https://github.com/iamkun/dayjs/commit/c39fb96e2a9102c14b004c14a6c073af9d266f2f))
+* add isToday, isTomorrow, isYesterday plugins ([#857](https://github.com/iamkun/dayjs/issues/857)) ([fc08ab6](https://github.com/iamkun/dayjs/commit/fc08ab68f8a28269802deeab9d6b0473b92cdc51))
+* Add option callback to Calendar plugin ([#839](https://github.com/iamkun/dayjs/issues/839)) ([b25be90](https://github.com/iamkun/dayjs/commit/b25be9094325295310c8fc5e617fb058be8a5f68))
+* Fix monthsShort for locale fr ([#862](https://github.com/iamkun/dayjs/issues/862)) ([d2de9a0](https://github.com/iamkun/dayjs/commit/d2de9a0b44b830038ed0094f79bfd40726311f2a))
+* Update Breton locale (br) meridiem config ([#856](https://github.com/iamkun/dayjs/issues/856)) ([a2a6672](https://github.com/iamkun/dayjs/commit/a2a66720abb788a8f1cffbfd0929b35579f29c72))
+* Update Ukrainian (uk) locale relative time ([#842](https://github.com/iamkun/dayjs/issues/842)) ([578bc1a](https://github.com/iamkun/dayjs/commit/578bc1a23c6e737783bbac3da12c0ed5d1edcf82))
+
+## [1.8.23](https://github.com/iamkun/dayjs/compare/v1.8.22...v1.8.23) (2020-03-16)
+
+
+### Bug Fixes
+
+* Add Chinese (zh) locale ([f9b8945](https://github.com/iamkun/dayjs/commit/f9b89453166d8b53d33b1d7eefd9942022552e6e))
+* Fix IsoWeek plugin typescript definition ([#828](https://github.com/iamkun/dayjs/issues/828)) ([30aab0c](https://github.com/iamkun/dayjs/commit/30aab0c7bce85dfac0ae208a891def30f88b5cb4))
+* Update Arabic (ar) locale relative time ([#836](https://github.com/iamkun/dayjs/issues/836)) ([14044c6](https://github.com/iamkun/dayjs/commit/14044c6fda1229e3f0e5473d3f886bd79589b15f))
+* Update Slovak (sk) locale,  Czech (cs) locale ([#833](https://github.com/iamkun/dayjs/issues/833)) ([f0d451f](https://github.com/iamkun/dayjs/commit/f0d451f795e9ebf752cd854d51b25b11de2343a3))
+* Update Thai (th) locale relativeTime ([#826](https://github.com/iamkun/dayjs/issues/826)) ([63b7c03](https://github.com/iamkun/dayjs/commit/63b7c03a6dbb0507d60776e8bad6cccde3828b88)), closes [#816](https://github.com/iamkun/dayjs/issues/816)
+
+## [1.8.22](https://github.com/iamkun/dayjs/compare/v1.8.21...v1.8.22) (2020-03-08)
+
+
+### Bug Fixes
+
+* Add IsoWeek plugin ([#811](https://github.com/iamkun/dayjs/issues/811)) ([28a2207](https://github.com/iamkun/dayjs/commit/28a2207ef9849afbac15dd29267b2e7a09cd3c16))
+* Fix unsupported locale fallback to previous one ([#819](https://github.com/iamkun/dayjs/issues/819)) ([4868715](https://github.com/iamkun/dayjs/commit/48687152cf5bee6a4c1b8ceea4bda8b9bab9be10))
+
+## [1.8.21](https://github.com/iamkun/dayjs/compare/v1.8.20...v1.8.21) (2020-02-26)
+
+
+### Bug Fixes
+
+* Set + Get accept 'D' as the short version of 'date' ([#795](https://github.com/iamkun/dayjs/issues/795)) ([523c038](https://github.com/iamkun/dayjs/commit/523c03880fa8bbad83214494ad02cd606cdb8b30))
+* Update DayOfYear plugin type ([#799](https://github.com/iamkun/dayjs/issues/799)) ([5809652](https://github.com/iamkun/dayjs/commit/5809652e40245b7759827d9bf317abdcfa75a330))
+* Update fi (Finnish) locale relativeTime ([#797](https://github.com/iamkun/dayjs/issues/797)) ([4a470fb](https://github.com/iamkun/dayjs/commit/4a470fbd6fef9e051727d0f26d53cc050b85935d))
+
+## [1.8.20](https://github.com/iamkun/dayjs/compare/v1.8.19...v1.8.20) (2020-02-04)
+
+
+### Bug Fixes
+
+* Add Bislama Locale (bi) ([#780](https://github.com/iamkun/dayjs/issues/780)) ([9ac6ab4](https://github.com/iamkun/dayjs/commit/9ac6ab481bc883dd4ecc02caab12c8b2fc218a42))
+* Fix weekOfYear plugin to support yearStart locale for better week number result ([#769](https://github.com/iamkun/dayjs/issues/769)) ([f00db36](https://github.com/iamkun/dayjs/commit/f00db36e70bc7beaca1abadeb30a9b1fbb3261ee))
+* Update et (Estonian) locale relativeTime ([#790](https://github.com/iamkun/dayjs/issues/790)) ([d8e0f45](https://github.com/iamkun/dayjs/commit/d8e0f45f6cd2d5e5704b9797929227454c92d1a5))
+* Update LocaleData plugin to support dayjs.localeData().weekdays() API ([287fed6](https://github.com/iamkun/dayjs/commit/287fed6db9eb4fd979b4861aca4dacbd32422533)), closes [#779](https://github.com/iamkun/dayjs/issues/779)
+* Update LocaleData plugin to support dayjs.months dayjs.weekdays API ([144c2ae](https://github.com/iamkun/dayjs/commit/144c2ae6e15fbf89e3acd7c8cb9e237c5f6e1348)), closes [#779](https://github.com/iamkun/dayjs/issues/779)
+* Update pl locale fusional config ([d372475](https://github.com/iamkun/dayjs/commit/d3724758bb27d5b17587b995ba14e7e80dcd1151))
+
+## [1.8.19](https://github.com/iamkun/dayjs/compare/v1.8.18...v1.8.19) (2020-01-06)
+
+
+### Bug Fixes
+
+* Add UpdateLocale plugin to update a locale's properties ([#766](https://github.com/iamkun/dayjs/issues/766)) ([82ce2ba](https://github.com/iamkun/dayjs/commit/82ce2ba8d7e402e40f6d005d400eb5356a0b0633))
+* Fix CustomParseFormat Plugin 'YYYY-MM' use first day of the month ([ba709ec](https://github.com/iamkun/dayjs/commit/ba709eca86a71ae648bc68bf67d9abdc229198d4)), closes [#761](https://github.com/iamkun/dayjs/issues/761)
+* Fix CustomParseFormat Plugin to set correct locale ([66ce23f](https://github.com/iamkun/dayjs/commit/66ce23f2e18c5506e8f1a7ef20d3483a4df80087))
+* Fix WeekOfYear Plugin wrong calender week number bug ([79b86db](https://github.com/iamkun/dayjs/commit/79b86dbbf3cfd3f1e2165b3d479a7061ad1b6925)), closes [#760](https://github.com/iamkun/dayjs/issues/760)
+* Update RelativeTime plugin to support function to make additional processing ([#767](https://github.com/iamkun/dayjs/issues/767)) ([4bd9250](https://github.com/iamkun/dayjs/commit/4bd9250fbe7131e2fddfb5fa1b3350e8c2262ca9))
+* Update ru, uk, cs locale to support relativeTime with plural ([3f080f7](https://github.com/iamkun/dayjs/commit/3f080f7d6bfdc4018cbb7c4d0112ff1ead4ef6b8))
+
+## [1.8.18](https://github.com/iamkun/dayjs/compare/v1.8.17...v1.8.18) (2019-12-18)
+
+
+### Bug Fixes
+
+* Add missing locale type definition ([#716](https://github.com/iamkun/dayjs/issues/716)) ([cde5d0b](https://github.com/iamkun/dayjs/commit/cde5d0b91be7b2f5f3098de4aa0b9a4f0f28ea5c))
+* Fix .locale() handel unsupported locale ([78ec173](https://github.com/iamkun/dayjs/commit/78ec173fcecc1299516ab7b44f4554d431b4b2fd))
+* Update Italian locale (it) ([#727](https://github.com/iamkun/dayjs/issues/727)) ([5b53e98](https://github.com/iamkun/dayjs/commit/5b53e98c0a3ba0eb9573a9c77caeb907439be9e7))
+* Update locale (fa) ([#733](https://github.com/iamkun/dayjs/issues/733)) ([9ad2e47](https://github.com/iamkun/dayjs/commit/9ad2e47e0569b23991bb0d5578f49c792c12df08))
+* Update locale (zh-cn) ([#706](https://github.com/iamkun/dayjs/issues/706)) ([e31e544](https://github.com/iamkun/dayjs/commit/e31e54414fb90e1f54da13a117748ba37f52645d))
+* Update locale (zh-cn) meridiem ([#735](https://github.com/iamkun/dayjs/issues/735)) ([15d1b81](https://github.com/iamkun/dayjs/commit/15d1b813e7faf5a1f9d1ea6fc673fd27ac49d8b1))
+* Update LocaleData plugin to support dayjs().longDateFormat() ([#734](https://github.com/iamkun/dayjs/issues/734)) ([aa0f210](https://github.com/iamkun/dayjs/commit/aa0f210a1e3c4f6aba61c3b96f9eb445b43a33f0)), closes [#680](https://github.com/iamkun/dayjs/issues/680)
+* Update Mongolian (mn) locale relativeTime ([#753](https://github.com/iamkun/dayjs/issues/753)) ([6d51435](https://github.com/iamkun/dayjs/commit/6d51435092c0c94d8e50256d3f0f058cdd15febe))
+* Update Swedish locale (sv) fix ordinal error ([#745](https://github.com/iamkun/dayjs/issues/745)) ([49670d5](https://github.com/iamkun/dayjs/commit/49670d5ae31e4e21636cc5a8bfe35fef0f6d9e4a)), closes [#743](https://github.com/iamkun/dayjs/issues/743)
+
+## [1.8.17](https://github.com/iamkun/dayjs/compare/v1.8.16...v1.8.17) (2019-11-06)
+
+
+### Bug Fixes
+
+* Fix set utcOffset in utc mode ([d148115](https://github.com/iamkun/dayjs/commit/d148115dad8f1a5afc0a64e9b8163dfeba4616b6))
+* Update advancedFormat plugin to support w ww wo week tokens … ([#678](https://github.com/iamkun/dayjs/issues/678)) ([26cfa63](https://github.com/iamkun/dayjs/commit/26cfa63a524b803f7966dac5464f9cbf8f63387e)), closes [#676](https://github.com/iamkun/dayjs/issues/676)
+* Update ka locale weekdays ([f8ca3d4](https://github.com/iamkun/dayjs/commit/f8ca3d4ba1d3cbe41613d3909c0627935a51a0c4))
+* Update nb locale ([#679](https://github.com/iamkun/dayjs/issues/679)) ([1063b0e](https://github.com/iamkun/dayjs/commit/1063b0e1b5c19a1354d233cc0f21438e7073233a))
+* Update Polish locale (pl)([#713](https://github.com/iamkun/dayjs/issues/713)) ([30d2f02](https://github.com/iamkun/dayjs/commit/30d2f026b47188833a4f44fee4bab52467d4a718))
+* Update Ukrainian locale (uk) ([#710](https://github.com/iamkun/dayjs/issues/710)) ([360161c](https://github.com/iamkun/dayjs/commit/360161cac75f597fdd51d9d1ff138601282a1b4b))
+* UTC plugin set utcOffset value ([#668](https://github.com/iamkun/dayjs/issues/668)) ([8877883](https://github.com/iamkun/dayjs/commit/88778838e71dd309e79cd1a8094d5bea36ca3390))
+
+## [1.8.16](https://github.com/iamkun/dayjs/compare/v1.8.15...v1.8.16) (2019-08-27)
+
+
+### Bug Fixes
+
+* Fix relativeTime Plugin .FromNow() result error in UTC mode ([a385d5c](https://github.com/iamkun/dayjs/commit/a385d5c))
+* Handle locale in WeekOfYear plugin ([#658](https://github.com/iamkun/dayjs/issues/658)) ([0e45b0a](https://github.com/iamkun/dayjs/commit/0e45b0a))
+* LocaleData plugin returns all months and weekdays data when pas no argument ([#645](https://github.com/iamkun/dayjs/issues/645)) ([95e70b4](https://github.com/iamkun/dayjs/commit/95e70b4))
+* Return null in toJSON if not valid ([#633](https://github.com/iamkun/dayjs/issues/633)) ([19affc8](https://github.com/iamkun/dayjs/commit/19affc8))
+* Update Danish (da) locale ([#626](https://github.com/iamkun/dayjs/issues/626)) ([ac2ec77](https://github.com/iamkun/dayjs/commit/ac2ec77))
+* Update Korean locale meridiem ([#642](https://github.com/iamkun/dayjs/issues/642)) ([b457146](https://github.com/iamkun/dayjs/commit/b457146))
+* update Occitan locale Catalan locale ([#630](https://github.com/iamkun/dayjs/issues/630)) ([fef135e](https://github.com/iamkun/dayjs/commit/fef135e))
+* update pt-br locale ([#628](https://github.com/iamkun/dayjs/issues/628)) ([ccf596d](https://github.com/iamkun/dayjs/commit/ccf596d))
+* Update weekdaysShort to some locale files ([#643](https://github.com/iamkun/dayjs/issues/643)) ([cc1f15f](https://github.com/iamkun/dayjs/commit/cc1f15f))
+
+## [1.8.15](https://github.com/iamkun/dayjs/compare/v1.8.14...v1.8.15) (2019-07-08)
+
+
+### Bug Fixes
+
+* Fix dayjs.locale() returns current global locale ([#602](https://github.com/iamkun/dayjs/issues/602)) ([790cd1a](https://github.com/iamkun/dayjs/commit/790cd1a))
+* Fix incorrect Thai locale translation of July ([#607](https://github.com/iamkun/dayjs/issues/607)) ([43cbfd3](https://github.com/iamkun/dayjs/commit/43cbfd3))
+* Lowercase french locale months and weekdays ([#615](https://github.com/iamkun/dayjs/issues/615)) ([e5a257c](https://github.com/iamkun/dayjs/commit/e5a257c))
+* Type - Export Ls object to query all available locales ([#623](https://github.com/iamkun/dayjs/issues/623)) ([f6bfae0](https://github.com/iamkun/dayjs/commit/f6bfae0))
+* Update  nb (Norsk Bokmål) locale ([#604](https://github.com/iamkun/dayjs/issues/604)) ([907f5c9](https://github.com/iamkun/dayjs/commit/907f5c9))
+* Update types of `.diff` API ([#617](https://github.com/iamkun/dayjs/issues/617)) ([f0f43d2](https://github.com/iamkun/dayjs/commit/f0f43d2))
+
+## [1.8.14](https://github.com/iamkun/dayjs/compare/v1.8.13...v1.8.14) (2019-05-07)
+
+
+### Bug Fixes
+
+* Fix `.format` API returns UTC offset when value is 0 bug ([b254964](https://github.com/iamkun/dayjs/commit/b254964))
+* Fix QuarterOfYear plugin bug ([#591](https://github.com/iamkun/dayjs/issues/591)) ([434f774](https://github.com/iamkun/dayjs/commit/434f774))
+* Fix UTC plugin add day DST bug ([#590](https://github.com/iamkun/dayjs/issues/590)) ([86cd839](https://github.com/iamkun/dayjs/commit/86cd839))
+
+## [1.8.13](https://github.com/iamkun/dayjs/compare/v1.8.12...v1.8.13) (2019-04-26)
+
+
+### Bug Fixes
+
+* Add missing relativeTime and formats for some locales ([#560](https://github.com/iamkun/dayjs/issues/560)) ([96b917e](https://github.com/iamkun/dayjs/commit/96b917e))
+* Add weekday (locale aware day of the week) plugin ([#569](https://github.com/iamkun/dayjs/issues/569)) ([9007cc5](https://github.com/iamkun/dayjs/commit/9007cc5)), closes [#559](https://github.com/iamkun/dayjs/issues/559)
+* Allow customizing "am" / "pm" strings with locale meridiem function ([#580](https://github.com/iamkun/dayjs/issues/580)) ([576e93e](https://github.com/iamkun/dayjs/commit/576e93e)), closes [#578](https://github.com/iamkun/dayjs/issues/578)
+* Fix `.add` day/week decimal rouding bug ([800f6c9](https://github.com/iamkun/dayjs/commit/800f6c9))
+* Fix `.diff` type definition error ([#565](https://github.com/iamkun/dayjs/issues/565)) ([c4921ae](https://github.com/iamkun/dayjs/commit/c4921ae)), closes [#561](https://github.com/iamkun/dayjs/issues/561)
+* Fix CustomParseFormat plugin bug ([#568](https://github.com/iamkun/dayjs/issues/568)) ([1f5a9db](https://github.com/iamkun/dayjs/commit/1f5a9db)), closes [#555](https://github.com/iamkun/dayjs/issues/555)
+* Fix relativeTime plugin Math.round bug ([40bea40](https://github.com/iamkun/dayjs/commit/40bea40))
+* skip square brackets in  buddhistEra, advancedFormat plugins ([#556](https://github.com/iamkun/dayjs/issues/556)) ([9279718](https://github.com/iamkun/dayjs/commit/9279718)), closes [#554](https://github.com/iamkun/dayjs/issues/554)
+* Update Indonesian locale([#574](https://github.com/iamkun/dayjs/issues/574)) ([0aa7143](https://github.com/iamkun/dayjs/commit/0aa7143))
+* Update locale month to support both array and function ([#581](https://github.com/iamkun/dayjs/issues/581)) ([b6599d3](https://github.com/iamkun/dayjs/commit/b6599d3))
+* Update LocalizedFormat plugin lowercase formats logic ([#557](https://github.com/iamkun/dayjs/issues/557)) ([d409304](https://github.com/iamkun/dayjs/commit/d409304))
+
+## [1.8.12](https://github.com/iamkun/dayjs/compare/v1.8.11...v1.8.12) (2019-04-02)
+
+
+### Bug Fixes
+
+* Add .get API ([7318797](https://github.com/iamkun/dayjs/commit/7318797))
+* Add 79 locales ([#541](https://github.com/iamkun/dayjs/issues/541)) ([f75a125](https://github.com/iamkun/dayjs/commit/f75a125))
+* Add Calendar plugin ([d1b9cf9](https://github.com/iamkun/dayjs/commit/d1b9cf9))
+* Add isoWeeksInYear plugin ([2db8631](https://github.com/iamkun/dayjs/commit/2db8631))
+* Add Occitan (oc-lnc) locale file ([#551](https://github.com/iamkun/dayjs/issues/551)) ([c30b715](https://github.com/iamkun/dayjs/commit/c30b715))
+* Add plugin minMax to sopport .max .min ([2870a23](https://github.com/iamkun/dayjs/commit/2870a23))
+* Fix set Month Year error in last day of the month ([d058f4a](https://github.com/iamkun/dayjs/commit/d058f4a))
+* Update ko locale weekdaysShort  ([#543](https://github.com/iamkun/dayjs/issues/543)) ([317fd3e](https://github.com/iamkun/dayjs/commit/317fd3e))
+* Update localizedFormat plugin to support lowercase localizable formats (l, ll, lll, llll) ([#546](https://github.com/iamkun/dayjs/issues/546)) ([f2b5ebf](https://github.com/iamkun/dayjs/commit/f2b5ebf))
+
+## [1.8.11](https://github.com/iamkun/dayjs/compare/v1.8.10...v1.8.11) (2019-03-21)
+
+
+### Bug Fixes
+
+* Add .add('quarter') .startOf('quarter') through plugin quarterOfYear ([dde39e9](https://github.com/iamkun/dayjs/commit/dde39e9)), closes [#537](https://github.com/iamkun/dayjs/issues/537) [#531](https://github.com/iamkun/dayjs/issues/531)
+* Add locale support for Azerbaijani language (az) ([#535](https://github.com/iamkun/dayjs/issues/535)) ([eeb20fa](https://github.com/iamkun/dayjs/commit/eeb20fa))
+* Correct typescript definition `add` ([22a249c](https://github.com/iamkun/dayjs/commit/22a249c)), closes [#531](https://github.com/iamkun/dayjs/issues/531)
+* Fix CustomParseFormat plugin formatting bug ([#536](https://github.com/iamkun/dayjs/issues/536)) ([8578546](https://github.com/iamkun/dayjs/commit/8578546)), closes [#533](https://github.com/iamkun/dayjs/issues/533)
+* Update pt locale ([#538](https://github.com/iamkun/dayjs/issues/538)) ([1ac9e1e](https://github.com/iamkun/dayjs/commit/1ac9e1e))
+
+## [1.8.10](https://github.com/iamkun/dayjs/compare/v1.8.9...v1.8.10) (2019-03-10)
+
+
+### Bug Fixes
+
+* **locale:** Add nepali (ne) locale ([#524](https://github.com/iamkun/dayjs/issues/524)) ([bdbec01](https://github.com/iamkun/dayjs/commit/bdbec01))
+* Add WeekYear plugin ([a892608](https://github.com/iamkun/dayjs/commit/a892608))
+* API .locale() with no argument should return current locale name string ([8d63d88](https://github.com/iamkun/dayjs/commit/8d63d88))
+* CustomParseFormat correct parse HH:mm:ss with only one digit like 0:12:10 ([600d547](https://github.com/iamkun/dayjs/commit/600d547))
+* CustomParseFormat plugin parse Do format string ([bf27fda](https://github.com/iamkun/dayjs/commit/bf27fda)), closes [#522](https://github.com/iamkun/dayjs/issues/522)
+* Expand setters like .year(2000) .hour(12) ([ac532a0](https://github.com/iamkun/dayjs/commit/ac532a0))
+* Move toObject, toArray API to separate plugin from core ([40a3431](https://github.com/iamkun/dayjs/commit/40a3431))
+
+## [1.8.9](https://github.com/iamkun/dayjs/compare/v1.8.8...v1.8.9) (2019-03-06)
+
+
+### Features
+
+* Add UTC mode with UTC plugin ([#517](https://github.com/iamkun/dayjs/issues/517)) ([caf335c](https://github.com/iamkun/dayjs/commit/caf335c))
+
+> For plugin developers: Please note, we have changed the name of some method in `Utils` in order to reduce the file size. ([#517](https://github.com/iamkun/dayjs/issues/517)) ([detail](https://github.com/iamkun/dayjs/pull/517/files#diff-2b4ca49d4bb0a774c4d4c1672d7aa781R46))
+
+### Bug Fixes
+
+* Add locale de-AT ([#515](https://github.com/iamkun/dayjs/issues/515)) ([d93f7b6](https://github.com/iamkun/dayjs/commit/d93f7b6))
+* Add locale zh-hk ([#516](https://github.com/iamkun/dayjs/issues/516)) ([5fc05a6](https://github.com/iamkun/dayjs/commit/5fc05a6))
+
+## [1.8.8](https://github.com/iamkun/dayjs/compare/v1.8.7...v1.8.8) (2019-02-25)
+
+
+### Bug Fixes
+
+* Update relativeTime plugin type definition ([de56f2c](https://github.com/iamkun/dayjs/commit/de56f2c))
+
+## [1.8.7](https://github.com/iamkun/dayjs/compare/v1.8.6...v1.8.7) (2019-02-24)
+
+
+### Bug Fixes
+
+* Add plugin type definitions ([#418](https://github.com/iamkun/dayjs/issues/418)) ([361d437](https://github.com/iamkun/dayjs/commit/361d437))
+* Add Swahili locale ([#508](https://github.com/iamkun/dayjs/issues/508)) ([b9cee84](https://github.com/iamkun/dayjs/commit/b9cee84))
+* Parse month string 'MMMM MMM (February, Feb)' in customParseFormat ([#457](https://github.com/iamkun/dayjs/issues/457)) ([f343206](https://github.com/iamkun/dayjs/commit/f343206))
+* Update declaration file .diff .isBefore .isSame .isAfter ([#496](https://github.com/iamkun/dayjs/issues/496)) ([4523275](https://github.com/iamkun/dayjs/commit/4523275))
+* Word orders corrections for locale 'fa' ([#491](https://github.com/iamkun/dayjs/issues/491)) ([56050c2](https://github.com/iamkun/dayjs/commit/56050c2))
+
+## [1.8.6](https://github.com/iamkun/dayjs/compare/v1.8.5...v1.8.6) (2019-02-14)
+
+
+### Bug Fixes
+
+* Add Bahasa Melayu (Malaysia) locale ([#485](https://github.com/iamkun/dayjs/issues/485)) ([cb208b0](https://github.com/iamkun/dayjs/commit/cb208b0))
+* Copy & export built-in en locale to /locale folder as a separate file ([a7e05e0](https://github.com/iamkun/dayjs/commit/a7e05e0))
+* Fix bug in customParseFormat plugin while month(MM) is '01' ([9884ca5](https://github.com/iamkun/dayjs/commit/9884ca5)), closes [#494](https://github.com/iamkun/dayjs/issues/494)
+* Fix startOf week bug while week start is not Sunday ([5eaf77b](https://github.com/iamkun/dayjs/commit/5eaf77b))
+* Implemented isBetween inclusivity ([#464](https://github.com/iamkun/dayjs/issues/464)) ([af2f4f1](https://github.com/iamkun/dayjs/commit/af2f4f1))
+* Update Swedish and Finnish locales ([#488](https://github.com/iamkun/dayjs/issues/488)) ([f142082](https://github.com/iamkun/dayjs/commit/f142082))
+* Fix commonJS require ES Module bug in webpack4 ([23f9f3d](https://github.com/iamkun/dayjs/commit/23f9f3d)), check [#492](https://github.com/iamkun/dayjs/issues/492)
+
+> Get access to ESM code with `import dayjs from 'dayjs/esm'`
+
+## [1.8.5](https://github.com/iamkun/dayjs/compare/v1.8.4...v1.8.5) (2019-02-07)
+
+
+### Bug Fixes
+
+* Add en-gb locale ([#478](https://github.com/iamkun/dayjs/issues/478)) ([508c3a7](https://github.com/iamkun/dayjs/commit/508c3a7))
+* **module:** transpile everything except ES6 modules in the 'module' entrypoint ([#477](https://github.com/iamkun/dayjs/issues/477)) ([#480](https://github.com/iamkun/dayjs/issues/480)) ([#482](https://github.com/iamkun/dayjs/issues/482)) ([767017d](https://github.com/iamkun/dayjs/commit/767017d))
+* update customParseFormat plugin support hh:mm ([54947cc](https://github.com/iamkun/dayjs/commit/54947cc)), closes [#484](https://github.com/iamkun/dayjs/issues/484)
+* Update module in package.json ([5c5a7a0](https://github.com/iamkun/dayjs/commit/5c5a7a0))
+
+## [1.8.4](https://github.com/iamkun/dayjs/compare/v1.8.3...v1.8.4) (2019-02-05)
+
+* Allow set start day of week in locale && Allow set week in weekOfYear plugin ([1295591](https://github.com/iamkun/dayjs/commit/1295591))
+### Bug Fixes
+* update all locale files with correct week start ([5b03412](https://github.com/iamkun/dayjs/commit/5b03412))
+* update es es-do locale adding weekStart && update weekStart test ([66e42ec](https://github.com/iamkun/dayjs/commit/66e42ec))
+* Revert default export ([b00da1b](https://github.com/iamkun/dayjs/commit/b00da1b))
+
+## [1.8.3](https://github.com/iamkun/dayjs/compare/v1.8.2...v1.8.3) (2019-02-04)
+
+
+### Bug Fixes
+
+* fix ios safari YYYY-MM-DD HH:mm parse BUG ([e02ae82](https://github.com/iamkun/dayjs/commit/e02ae82)), closes [#254](https://github.com/iamkun/dayjs/issues/254)
+
+## [1.8.2](https://github.com/iamkun/dayjs/compare/v1.8.1...v1.8.2) (2019-02-02)
+
+
+### Bug Fixes
+
+* Add missing czech language locale ([#461](https://github.com/iamkun/dayjs/issues/461)) ([7e04004](https://github.com/iamkun/dayjs/commit/7e04004))
+* Add utcOffset api method and fix calculating diff error in DST ([#453](https://github.com/iamkun/dayjs/issues/453)) ([ce2e30e](https://github.com/iamkun/dayjs/commit/ce2e30e))
+* Fix it locale error ([#458](https://github.com/iamkun/dayjs/issues/458)) ([f6d9a64](https://github.com/iamkun/dayjs/commit/f6d9a64))
+* Add DayOfYear plugin (#454)
+* Fix es locale monthsShort error
+
+## [1.8.1](https://github.com/iamkun/dayjs/compare/v1.8.0...v1.8.1) (2019-02-02)
+
+* Add LocalizedFormat plugin supplying format like LTS, LT, LLLL 
+
+* <del>update declaration File with default export (#278)</del>
+> <del>From v1.8.1, in TypeScript Project, just `import from dayjs from 'dayjs'`</del>
+* add ES2015 module support (#451)
+
+### Performance Improvements
+
+* **format:** reuse matches instead of created when replacing ([#441](https://github.com/iamkun/dayjs/issues/441)) ([10b79d8](https://github.com/iamkun/dayjs/commit/10b79d8))
+
+# [1.8.0](https://github.com/iamkun/dayjs/compare/v1.7.8...v1.8.0) (2019-01-14)
+
+
+### Features
+
+* add CustomParseFormat plugin  and QuarterOfYear plugin ([#450](https://github.com/iamkun/dayjs/issues/450)) ([8f6f63c](https://github.com/iamkun/dayjs/commit/8f6f63c))
+
+## [1.7.8](https://github.com/iamkun/dayjs/compare/v1.7.7...v1.7.8) (2018-12-13)
+
+
+### Feature
+
+* update isSame isBefore isAfter supports units ([fd65464](https://github.com/iamkun/dayjs/commit/fd65464))
+
+* add greek lithuanian locales 
+
+## [1.7.7](https://github.com/iamkun/dayjs/compare/v1.7.6...v1.7.7) (2018-09-26)
+
+
+### Bug Fixes
+
+* **DST:** fix daylight saving time DST bug && add test ([#354](https://github.com/iamkun/dayjs/issues/354)) ([6fca6d5](https://github.com/iamkun/dayjs/commit/6fca6d5))
+
+## [1.7.6](https://github.com/iamkun/dayjs/compare/v1.7.5...v1.7.6) (2018-09-25)
+
+
+### Bug Fixes
+
+* **add dayjs.unix:** add dayjs.unix to parse timestamp in seconds && locale update ([5711c5e](https://github.com/iamkun/dayjs/commit/5711c5e))
+
+## [1.7.5](https://github.com/iamkun/dayjs/compare/v1.7.4...v1.7.5) (2018-08-10)
+
+
+### Bug Fixes
+
+* add isBetween API & update ([b5fc3d1](https://github.com/iamkun/dayjs/commit/b5fc3d1))
+
+## [1.7.4](https://github.com/iamkun/dayjs/compare/v1.7.3...v1.7.4) (2018-07-11)
+
+
+### Bug Fixes
+
+* update set week logic ([60b6325](https://github.com/iamkun/dayjs/commit/60b6325)), closes [#276](https://github.com/iamkun/dayjs/issues/276)
+
+## [1.7.3](https://github.com/iamkun/dayjs/compare/v1.7.2...v1.7.3) (2018-07-10)
+
+
+### Bug Fixes
+
+* **locale-nl:** set correct weekdays and months ([6d089d7](https://github.com/iamkun/dayjs/commit/6d089d7))
+
+## [1.7.2](https://github.com/iamkun/dayjs/compare/v1.7.1...v1.7.2) (2018-07-04)
+
+
+### Bug Fixes
+
+* DEPRECATED isLeapYear, use IsLeapYear plugin instead ([e2e5116](https://github.com/iamkun/dayjs/commit/e2e5116))
+
+## [1.7.1](https://github.com/iamkun/dayjs/compare/v1.7.0...v1.7.1) (2018-07-03)
+
+
+### Bug Fixes
+
+* fix week() error near the end of the year ([fa03689](https://github.com/iamkun/dayjs/commit/fa03689))
+
+# [1.7.0](https://github.com/iamkun/dayjs/compare/v1.6.10...v1.7.0) (2018-07-02)
+
+
+### Features
+
+* Added method `.week()` to retrieve week of the year ([e1c1b1c](https://github.com/iamkun/dayjs/commit/e1c1b1c))
+* Updated Japanese locae
+
+## [1.6.10](https://github.com/iamkun/dayjs/compare/v1.6.9...v1.6.10) (2018-06-25)
+
+
+### Bug Fixes
+
+* Add relative locales to russian language ([c7e9898](https://github.com/iamkun/dayjs/commit/c7e9898)), closes [#256](https://github.com/iamkun/dayjs/issues/256)
+
+## [1.6.9](https://github.com/iamkun/dayjs/compare/v1.6.8...v1.6.9) (2018-06-14)
+
+
+### Bug Fixes
+
+* add isDayjs => boolean API ([6227c8b](https://github.com/iamkun/dayjs/commit/6227c8b))
+
+## [1.6.8](https://github.com/iamkun/dayjs/compare/v1.6.7...v1.6.8) (2018-06-14)
+
+
+### Bug Fixes
+
+* fix  Advanced format bug in zh-cn ([0c07874](https://github.com/iamkun/dayjs/commit/0c07874)), closes [#242](https://github.com/iamkun/dayjs/issues/242)
+
+## [1.6.7](https://github.com/iamkun/dayjs/compare/v1.6.6...v1.6.7) (2018-06-11)
+
+
+### Bug Fixes
+
+* fix id locale ([1ebbeb8](https://github.com/iamkun/dayjs/commit/1ebbeb8)), closes [#234](https://github.com/iamkun/dayjs/issues/234)
+
+<a name="1.6.6"></a>
+## [1.6.6](https://github.com/iamkun/dayjs/compare/v1.6.5...v1.6.6) (2018-06-06)
+
+
+### Bug Fixes
+
+*  format API update and locale file update ([5ca48f0](https://github.com/iamkun/dayjs/commit/5ca48f0)), closes [#228](https://github.com/iamkun/dayjs/issues/228)
+
+<a name="1.6.5"></a>
+## [1.6.5](https://github.com/iamkun/dayjs/compare/v1.6.4...v1.6.5) (2018-05-31)
+
+
+### Bug Fixes
+
+* bugfix, utils update and  locale file update ([ebcb6d5](https://github.com/iamkun/dayjs/commit/ebcb6d5)), closes [#214](https://github.com/iamkun/dayjs/issues/214)
+
+<a name="1.6.4"></a>
+## [1.6.4](https://github.com/iamkun/dayjs/compare/v1.6.3...v1.6.4) (2018-05-25)
+
+
+### Bug Fixes
+
+* add RelativeTime plugin and locale file update ([c1fbbca](https://github.com/iamkun/dayjs/commit/c1fbbca)), closes [#198](https://github.com/iamkun/dayjs/issues/198)
+
+<a name="1.6.3"></a>
+## [1.6.3](https://github.com/iamkun/dayjs/compare/v1.6.2...v1.6.3) (2018-05-21)
+
+
+### Bug Fixes
+
+* Changing locales locally is immutable from this release ([2cce729](https://github.com/iamkun/dayjs/commit/2cce729)), closes [#182](https://github.com/iamkun/dayjs/issues/182)
+* instance locale change should be immutable ([84597c9](https://github.com/iamkun/dayjs/commit/84597c9))
+* Add more locales
+* english ordinal fix
+
+<a name="1.6.2"></a>
+## [1.6.2](https://github.com/iamkun/dayjs/compare/v1.6.1...v1.6.2) (2018-05-18)
+
+
+### Bug Fixes
+
+* change-log update && test new npm release ([aa49cba](https://github.com/iamkun/dayjs/commit/aa49cba)), closes [#163](https://github.com/iamkun/dayjs/issues/163)
+
+<a name="1.6.1"></a>
+## [1.6.1](https://github.com/iamkun/dayjs/compare/v1.6.0...v1.6.1) (2018-05-18)
+
+
+### Bug Fixes
+
+* Add German, Brazilian Portuguese locales
+* add() & parse() bug fix & add locale de, pt-br ([bf1331e](https://github.com/iamkun/dayjs/commit/bf1331e))
+
+<a name="1.6.0"></a>
+# [1.6.0](https://github.com/iamkun/dayjs/compare/v1.5.24...v1.6.0) (2018-05-15)
+
+
+### Features
+
+* Locale && Plugin ([2342c55](https://github.com/iamkun/dayjs/commit/2342c55)), closes [#141](https://github.com/iamkun/dayjs/issues/141)
diff --git a/node_modules/dayjs/LICENSE b/node_modules/dayjs/LICENSE
new file mode 100644
index 0000000..caf9315
--- /dev/null
+++ b/node_modules/dayjs/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018-present, iamkun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/node_modules/dayjs/README.md b/node_modules/dayjs/README.md
new file mode 100644
index 0000000..3e514dc
--- /dev/null
+++ b/node_modules/dayjs/README.md
@@ -0,0 +1,149 @@
+English | [简体中文](./docs/zh-cn/README.zh-CN.md) | [日本語](./docs/ja/README-ja.md) | [Português Brasileiro](./docs/pt-br/README-pt-br.md) | [한국어](./docs/ko/README-ko.md) | [Español (España)](./docs/es-es/README-es-es.md) | [Русский](./docs/ru/README-ru.md) | [Türkçe](./docs/tr/README-tr.md) | [සිංහල](./docs/si/README-si.md) | [עברית](./docs/he/README-he.md)
+
+<p align="center"><a href="https://day.js.org/" target="_blank" rel="noopener noreferrer"><img width="550"
+                                                                             src="https://user-images.githubusercontent.com/17680888/39081119-3057bbe2-456e-11e8-862c-646133ad4b43.png"
+                                                                             alt="Day.js" /></a></p>
+<p align="center">Fast <b>2kB</b> alternative to Moment.js with the same modern API</p>
+<p align="center">
+    <a href="https://unpkg.com/dayjs/dayjs.min.js"><img
+            src="https://img.badgesize.io/https://unpkg.com/dayjs/dayjs.min.js?compression=gzip&style=flat-square"
+            alt="Gzip Size"></a>
+    <a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
+                                                       alt="NPM Version"></a>
+    <a href="https://travis-ci.com/iamkun/dayjs"><img
+            src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
+    <a href="https://codecov.io/gh/iamkun/dayjs"><img
+            src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
+    <a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img
+            src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square" alt="License"></a>
+    <br>
+    <a href="https://saucelabs.com/u/dayjs">
+        <img width="750" src="https://user-images.githubusercontent.com/17680888/40040137-8e3323a6-584b-11e8-9dba-bbe577ee8a7b.png" alt="Sauce Test Status">
+    </a>
+</p>
+
+> Day.js is a minimalist JavaScript library that parses, validates, manipulates, and displays dates and times for modern browsers with a largely Moment.js-compatible API. If you use Moment.js, you already know how to use Day.js.
+
+```js
+dayjs().startOf('month').add(1, 'day').set('year', 2018).format('YYYY-MM-DD HH:mm:ss');
+```
+
+* 🕒 Familiar Moment.js API & patterns
+* 💪 Immutable
+* 🔥 Chainable
+* 🌐 I18n support
+* 📦 2kb mini library
+* 👫 All browsers supported
+
+---
+
+## Getting Started
+
+### Documentation
+
+You can find more details, API, and other docs on [day.js.org](https://day.js.org/) website.
+
+### Installation
+
+```console
+npm install dayjs --save
+```
+
+📚[Installation Guide](https://day.js.org/docs/en/installation/installation)
+
+### API
+
+It's easy to use Day.js APIs to parse, validate, manipulate, and display dates and times.
+
+```javascript
+dayjs('2018-08-08') // parse
+
+dayjs().format('{YYYY} MM-DDTHH:mm:ss SSS [Z] A') // display
+
+dayjs().set('month', 3).month() // get & set
+
+dayjs().add(1, 'year') // manipulate
+
+dayjs().isBefore(dayjs()) // query
+```
+
+📚[API Reference](https://day.js.org/docs/en/parse/parse)
+
+### I18n
+
+Day.js has great support for internationalization.
+
+But none of them will be included in your build unless you use it.
+
+```javascript
+import 'dayjs/locale/es' // load on demand
+
+dayjs.locale('es') // use Spanish locale globally
+
+dayjs('2018-05-05').locale('zh-cn').format() // use Chinese Simplified locale in a specific instance
+```
+
+📚[Internationalization](https://day.js.org/docs/en/i18n/i18n)
+
+### Plugin
+
+A plugin is an independent module that can be added to Day.js to extend functionality or add new features.
+
+```javascript
+import advancedFormat from 'dayjs/plugin/advancedFormat' // load on demand
+
+dayjs.extend(advancedFormat) // use plugin
+
+dayjs().format('Q Do k kk X x') // more available formats
+```
+
+📚[Plugin List](https://day.js.org/docs/en/plugin/plugin)
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
+
+[[Become a sponsor via Github](https://github.com/sponsors/iamkun/)] [[Become a sponsor via OpenCollective](https://opencollective.com/dayjs#sponsor)]
+
+<a href="https://toyokumo.co.jp" target="_blank">
+  <img width="70" src="https://user-images.githubusercontent.com/17680888/197092231-2367b5eb-1e43-467e-a311-23f7cd97b086.png">
+</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://github.com/alan-eu" target="_blank">
+  <img width="70" src="https://avatars.githubusercontent.com/u/18175329?s=52&v=4">
+</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://opencollective.com/sight-and-sound-ministries" target="_blank">
+  <img width="70" src="https://user-images.githubusercontent.com/17680888/232316426-cb99b4cf-0ccb-4e73-a6ce-e16dba6aadf4.png">
+</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://www.exoflare.com/open-source/?utm_source=dayjs&utm_campaign=open_source" target="_blank">
+  <img width="70" src="https://user-images.githubusercontent.com/17680888/162761622-1407a849-0c41-4591-8aa9-f98114ec2092.png">
+</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://rxdb.info/?utm_source=day.js.org&utm_medium=banner&utm_campaign=day.js.org-sponsored" target="_blank"><img width="70" src="https://user-images.githubusercontent.com/17680888/200301812-9c9bd523-5dc4-4cab-b380-543fbcd3802c.svg"></a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://github.com/vendure-ecommerce" target="_blank"><img width="70" src="https://avatars.githubusercontent.com/u/39629390?s=52&v=4"></a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://opencollective.com/docbot" target="_blank"><img width="70" src="https://images.opencollective.com/docbot/457761e/logo.png"></a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://opencollective.com/datawrapper" target="_blank"><img width="70" src="https://images.opencollective.com/datawrapper/c13e229/logo.png"></a>
+
+## Contributors
+
+This project exists thanks to all the people who contribute.
+
+Please give us a 💖 star 💖 to support us. Thank you.
+
+And thank you to all our backers! 🙏
+
+<a href="https://opencollective.com/dayjs/backer/0/website?requireActive=false" target="_blank"><img width="35" src="https://opencollective.com/dayjs/backer/0/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/dayjs/backer/1/website?requireActive=false" target="_blank"><img width="35" src="https://opencollective.com/dayjs/backer/1/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/dayjs/backer/2/website?requireActive=false" target="_blank"><img width="35" src="https://opencollective.com/dayjs/backer/2/avatar.svg?requireActive=false"></a>
+<a href="https://opencollective.com/dayjs/backer/3/website?requireActive=false" target="_blank"><img width="35" src="https://opencollective.com/dayjs/backer/3/avatar.svg?requireActive=false"></a>
+<br />
+<a href="https://opencollective.com/dayjs#backers" target="_blank"><img src="https://opencollective.com/dayjs/contributors.svg?width=890" /></a>
+
+## License
+
+Day.js is licensed under a [MIT License](./LICENSE).
diff --git a/node_modules/dayjs/dayjs.min.js b/node_modules/dayjs/dayjs.min.js
new file mode 100644
index 0000000..61916d8
--- /dev/null
+++ b/node_modules/dayjs/dayjs.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/constant.js b/node_modules/dayjs/esm/constant.js
new file mode 100644
index 0000000..02ffe1b
--- /dev/null
+++ b/node_modules/dayjs/esm/constant.js
@@ -0,0 +1,25 @@
+export var SECONDS_A_MINUTE = 60;
+export var SECONDS_A_HOUR = SECONDS_A_MINUTE * 60;
+export var SECONDS_A_DAY = SECONDS_A_HOUR * 24;
+export var SECONDS_A_WEEK = SECONDS_A_DAY * 7;
+export var MILLISECONDS_A_SECOND = 1e3;
+export var MILLISECONDS_A_MINUTE = SECONDS_A_MINUTE * MILLISECONDS_A_SECOND;
+export var MILLISECONDS_A_HOUR = SECONDS_A_HOUR * MILLISECONDS_A_SECOND;
+export var MILLISECONDS_A_DAY = SECONDS_A_DAY * MILLISECONDS_A_SECOND;
+export var MILLISECONDS_A_WEEK = SECONDS_A_WEEK * MILLISECONDS_A_SECOND; // English locales
+
+export var MS = 'millisecond';
+export var S = 'second';
+export var MIN = 'minute';
+export var H = 'hour';
+export var D = 'day';
+export var W = 'week';
+export var M = 'month';
+export var Q = 'quarter';
+export var Y = 'year';
+export var DATE = 'date';
+export var FORMAT_DEFAULT = 'YYYY-MM-DDTHH:mm:ssZ';
+export var INVALID_DATE_STRING = 'Invalid Date'; // regex
+
+export var REGEX_PARSE = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/;
+export var REGEX_FORMAT = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/index.d.ts b/node_modules/dayjs/esm/index.d.ts
new file mode 100644
index 0000000..766bd79
--- /dev/null
+++ b/node_modules/dayjs/esm/index.d.ts
@@ -0,0 +1,429 @@
+/// <reference path="./locale/index.d.ts" />
+
+export = dayjs;
+
+declare function dayjs (date?: dayjs.ConfigType): dayjs.Dayjs
+
+declare function dayjs (date?: dayjs.ConfigType, format?: dayjs.OptionType, strict?: boolean): dayjs.Dayjs
+
+declare function dayjs (date?: dayjs.ConfigType, format?: dayjs.OptionType, locale?: string, strict?: boolean): dayjs.Dayjs
+
+declare namespace dayjs {
+  interface ConfigTypeMap {
+    default: string | number | Date | Dayjs | null | undefined
+  }
+
+  export type ConfigType = ConfigTypeMap[keyof ConfigTypeMap]
+
+  export interface FormatObject { locale?: string, format?: string, utc?: boolean }
+
+  export type OptionType = FormatObject | string | string[]
+
+  export type UnitTypeShort = 'd' | 'D' | 'M' | 'y' | 'h' | 'm' | 's' | 'ms'
+
+  export type UnitTypeLong = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' | 'date'
+
+  export type UnitTypeLongPlural = 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days' | 'months' | 'years' | 'dates'
+  
+  export type UnitType = UnitTypeLong | UnitTypeLongPlural | UnitTypeShort;
+
+  export type OpUnitType = UnitType | "week" | "weeks" | 'w';
+  export type QUnitType = UnitType | "quarter" | "quarters" | 'Q';
+  export type ManipulateType = Exclude<OpUnitType, 'date' | 'dates'>;
+  class Dayjs {
+    constructor (config?: ConfigType)
+    /**
+     * All Day.js objects are immutable. Still, `dayjs#clone` can create a clone of the current object if you need one.
+     * ```
+     * dayjs().clone()// => Dayjs
+     * dayjs(dayjs('2019-01-25')) // passing a Dayjs object to a constructor will also clone it
+     * ```
+     * Docs: https://day.js.org/docs/en/parse/dayjs-clone
+     */
+    clone(): Dayjs
+    /**
+     * This returns a `boolean` indicating whether the Day.js object contains a valid date or not.
+     * ```
+     * dayjs().isValid()// => boolean
+     * ```
+     * Docs: https://day.js.org/docs/en/parse/is-valid
+     */
+    isValid(): boolean
+    /**
+     * Get the year.
+     * ```
+     * dayjs().year()// => 2020
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/year
+     */
+    year(): number
+    /**
+     * Set the year.
+     * ```
+     * dayjs().year(2000)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/year
+     */
+    year(value: number): Dayjs
+    /**
+     * Get the month.
+     *
+     * Months are zero indexed, so January is month 0.
+     * ```
+     * dayjs().month()// => 0-11
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/month
+     */
+    month(): number
+    /**
+     * Set the month.
+     *
+     * Months are zero indexed, so January is month 0.
+     *
+     * Accepts numbers from 0 to 11. If the range is exceeded, it will bubble up to the next year.
+     * ```
+     * dayjs().month(0)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/month
+     */
+    month(value: number): Dayjs
+    /**
+     * Get the date of the month.
+     * ```
+     * dayjs().date()// => 1-31
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/date
+     */
+    date(): number
+    /**
+     * Set the date of the month.
+     *
+     * Accepts numbers from 1 to 31. If the range is exceeded, it will bubble up to the next months.
+     * ```
+     * dayjs().date(1)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/date
+     */
+    date(value: number): Dayjs
+    /**
+     * Get the day of the week.
+     *
+     * Returns numbers from 0 (Sunday) to 6 (Saturday).
+     * ```
+     * dayjs().day()// 0-6
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/day
+     */
+    day(): number
+    /**
+     * Set the day of the week.
+     *
+     * Accepts numbers from 0 (Sunday) to 6 (Saturday). If the range is exceeded, it will bubble up to next weeks.
+     * ```
+     * dayjs().day(0)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/day
+     */
+    day(value: number): Dayjs
+    /**
+     * Get the hour.
+     * ```
+     * dayjs().hour()// => 0-23
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/hour
+     */
+    hour(): number
+    /**
+     * Set the hour.
+     *
+     * Accepts numbers from 0 to 23. If the range is exceeded, it will bubble up to the next day.
+     * ```
+     * dayjs().hour(12)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/hour
+     */
+    hour(value: number): Dayjs
+    /**
+     * Get the minutes.
+     * ```
+     * dayjs().minute()// => 0-59
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/minute
+     */
+    minute(): number
+    /**
+     * Set the minutes.
+     *
+     * Accepts numbers from 0 to 59. If the range is exceeded, it will bubble up to the next hour.
+     * ```
+     * dayjs().minute(59)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/minute
+     */
+    minute(value: number): Dayjs
+    /**
+     * Get the seconds.
+     * ```
+     * dayjs().second()// => 0-59
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/second
+     */
+    second(): number
+    /**
+     * Set the seconds.
+     *
+     * Accepts numbers from 0 to 59. If the range is exceeded, it will bubble up to the next minutes.
+     * ```
+     * dayjs().second(1)// Dayjs
+     * ```
+     */
+    second(value: number): Dayjs
+    /**
+     * Get the milliseconds.
+     * ```
+     * dayjs().millisecond()// => 0-999
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/millisecond
+     */
+    millisecond(): number
+    /**
+     * Set the milliseconds.
+     *
+     * Accepts numbers from 0 to 999. If the range is exceeded, it will bubble up to the next seconds.
+     * ```
+     * dayjs().millisecond(1)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/millisecond
+     */
+    millisecond(value: number): Dayjs
+    /**
+     * Generic setter, accepting unit as first argument, and value as second, returns a new instance with the applied changes.
+     *
+     * In general:
+     * ```
+     * dayjs().set(unit, value) === dayjs()[unit](value)
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     * ```
+     * dayjs().set('date', 1)
+     * dayjs().set('month', 3) // April
+     * dayjs().set('second', 30)
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/set
+     */
+    set(unit: UnitType, value: number): Dayjs
+    /**
+     * String getter, returns the corresponding information getting from Day.js object.
+     *
+     * In general:
+     * ```
+     * dayjs().get(unit) === dayjs()[unit]()
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     * ```
+     * dayjs().get('year')
+     * dayjs().get('month') // start 0
+     * dayjs().get('date')
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/get
+     */
+    get(unit: UnitType): number
+    /**
+     * Returns a cloned Day.js object with a specified amount of time added.
+     * ```
+     * dayjs().add(7, 'day')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/add
+     */
+    add(value: number, unit?: ManipulateType): Dayjs
+    /**
+     * Returns a cloned Day.js object with a specified amount of time subtracted.
+     * ```
+     * dayjs().subtract(7, 'year')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/subtract
+     */
+    subtract(value: number, unit?: ManipulateType): Dayjs
+    /**
+     * Returns a cloned Day.js object and set it to the start of a unit of time.
+     * ```
+     * dayjs().startOf('year')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/start-of
+     */
+    startOf(unit: OpUnitType): Dayjs
+    /**
+     * Returns a cloned Day.js object and set it to the end of a unit of time.
+     * ```
+     * dayjs().endOf('month')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/end-of
+     */
+    endOf(unit: OpUnitType): Dayjs
+    /**
+     * Get the formatted date according to the string of tokens passed in.
+     *
+     * To escape characters, wrap them in square brackets (e.g. [MM]).
+     * ```
+     * dayjs().format()// => current date in ISO8601, without fraction seconds e.g. '2020-04-02T08:02:17-05:00'
+     * dayjs('2019-01-25').format('[YYYYescape] YYYY-MM-DDTHH:mm:ssZ[Z]')// 'YYYYescape 2019-01-25T00:00:00-02:00Z'
+     * dayjs('2019-01-25').format('DD/MM/YYYY') // '25/01/2019'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/format
+     */
+    format(template?: string): string
+    /**
+     * This indicates the difference between two date-time in the specified unit.
+     *
+     * To get the difference in milliseconds, use `dayjs#diff`
+     * ```
+     * const date1 = dayjs('2019-01-25')
+     * const date2 = dayjs('2018-06-05')
+     * date1.diff(date2) // 20214000000 default milliseconds
+     * date1.diff() // milliseconds to current time
+     * ```
+     *
+     * To get the difference in another unit of measurement, pass that measurement as the second argument.
+     * ```
+     * const date1 = dayjs('2019-01-25')
+     * date1.diff('2018-06-05', 'month') // 7
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/display/difference
+     */
+    diff(date?: ConfigType, unit?: QUnitType | OpUnitType, float?: boolean): number
+    /**
+     * This returns the number of **milliseconds** since the Unix Epoch of the Day.js object.
+     * ```
+     * dayjs('2019-01-25').valueOf() // 1548381600000
+     * +dayjs(1548381600000) // 1548381600000
+     * ```
+     * To get a Unix timestamp (the number of seconds since the epoch) from a Day.js object, you should use Unix Timestamp `dayjs#unix()`.
+     *
+     * Docs: https://day.js.org/docs/en/display/unix-timestamp-milliseconds
+     */
+    valueOf(): number
+    /**
+     * This returns the Unix timestamp (the number of **seconds** since the Unix Epoch) of the Day.js object.
+     * ```
+     * dayjs('2019-01-25').unix() // 1548381600
+     * ```
+     * This value is floored to the nearest second, and does not include a milliseconds component.
+     *
+     * Docs: https://day.js.org/docs/en/display/unix-timestamp
+     */
+    unix(): number
+    /**
+     * Get the number of days in the current month.
+     * ```
+     * dayjs('2019-01-25').daysInMonth() // 31
+     * ```
+     * Docs: https://day.js.org/docs/en/display/days-in-month
+     */
+    daysInMonth(): number
+    /**
+     * To get a copy of the native `Date` object parsed from the Day.js object use `dayjs#toDate`.
+     * ```
+     * dayjs('2019-01-25').toDate()// => Date
+     * ```
+     */
+    toDate(): Date
+    /**
+     * To serialize as an ISO 8601 string.
+     * ```
+     * dayjs('2019-01-25').toJSON() // '2019-01-25T02:00:00.000Z'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/as-json
+     */
+    toJSON(): string
+    /**
+     * To format as an ISO 8601 string.
+     * ```
+     * dayjs('2019-01-25').toISOString() // '2019-01-25T02:00:00.000Z'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/as-iso-string
+     */
+    toISOString(): string
+    /**
+     * Returns a string representation of the date.
+     * ```
+     * dayjs('2019-01-25').toString() // 'Fri, 25 Jan 2019 02:00:00 GMT'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/as-string
+     */
+    toString(): string
+    /**
+     * Get the UTC offset in minutes.
+     * ```
+     * dayjs().utcOffset()
+     * ```
+     * Docs: https://day.js.org/docs/en/manipulate/utc-offset
+     */
+    utcOffset(): number
+    /**
+     * This indicates whether the Day.js object is before the other supplied date-time.
+     * ```
+     * dayjs().isBefore(dayjs('2011-01-01')) // default milliseconds
+     * ```
+     * If you want to limit the granularity to a unit other than milliseconds, pass it as the second parameter.
+     * ```
+     * dayjs().isBefore('2011-01-01', 'year')// => boolean
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/query/is-before
+     */
+    isBefore(date?: ConfigType, unit?: OpUnitType): boolean
+    /**
+     * This indicates whether the Day.js object is the same as the other supplied date-time.
+     * ```
+     * dayjs().isSame(dayjs('2011-01-01')) // default milliseconds
+     * ```
+     * If you want to limit the granularity to a unit other than milliseconds, pass it as the second parameter.
+     * ```
+     * dayjs().isSame('2011-01-01', 'year')// => boolean
+     * ```
+     * Docs: https://day.js.org/docs/en/query/is-same
+     */
+    isSame(date?: ConfigType, unit?: OpUnitType): boolean
+    /**
+     * This indicates whether the Day.js object is after the other supplied date-time.
+     * ```
+     * dayjs().isAfter(dayjs('2011-01-01')) // default milliseconds
+     * ```
+     * If you want to limit the granularity to a unit other than milliseconds, pass it as the second parameter.
+     * ```
+     * dayjs().isAfter('2011-01-01', 'year')// => boolean
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/query/is-after
+     */
+    isAfter(date?: ConfigType, unit?: OpUnitType): boolean
+
+    locale(): string
+
+    locale(preset: string | ILocale, object?: Partial<ILocale>): Dayjs
+  }
+
+  export type PluginFunc<T = unknown> = (option: T, c: typeof Dayjs, d: typeof dayjs) => void
+
+  export function extend<T = unknown>(plugin: PluginFunc<T>, option?: T): Dayjs
+
+  export function locale(preset?: string | ILocale, object?: Partial<ILocale>, isLocal?: boolean): string
+
+  export function isDayjs(d: any): d is Dayjs
+
+  export function unix(t: number): Dayjs
+
+  const Ls : { [key: string] :  ILocale }
+}
diff --git a/node_modules/dayjs/esm/index.js b/node_modules/dayjs/esm/index.js
new file mode 100644
index 0000000..a82986b
--- /dev/null
+++ b/node_modules/dayjs/esm/index.js
@@ -0,0 +1,541 @@
+import * as C from './constant';
+import en from './locale/en';
+import U from './utils';
+var L = 'en'; // global locale
+
+var Ls = {}; // global loaded locale
+
+Ls[L] = en;
+var IS_DAYJS = '$isDayjsObject'; // eslint-disable-next-line no-use-before-define
+
+var isDayjs = function isDayjs(d) {
+  return d instanceof Dayjs || !!(d && d[IS_DAYJS]);
+};
+
+var parseLocale = function parseLocale(preset, object, isLocal) {
+  var l;
+  if (!preset) return L;
+
+  if (typeof preset === 'string') {
+    var presetLower = preset.toLowerCase();
+
+    if (Ls[presetLower]) {
+      l = presetLower;
+    }
+
+    if (object) {
+      Ls[presetLower] = object;
+      l = presetLower;
+    }
+
+    var presetSplit = preset.split('-');
+
+    if (!l && presetSplit.length > 1) {
+      return parseLocale(presetSplit[0]);
+    }
+  } else {
+    var name = preset.name;
+    Ls[name] = preset;
+    l = name;
+  }
+
+  if (!isLocal && l) L = l;
+  return l || !isLocal && L;
+};
+
+var dayjs = function dayjs(date, c) {
+  if (isDayjs(date)) {
+    return date.clone();
+  } // eslint-disable-next-line no-nested-ternary
+
+
+  var cfg = typeof c === 'object' ? c : {};
+  cfg.date = date;
+  cfg.args = arguments; // eslint-disable-line prefer-rest-params
+
+  return new Dayjs(cfg); // eslint-disable-line no-use-before-define
+};
+
+var wrapper = function wrapper(date, instance) {
+  return dayjs(date, {
+    locale: instance.$L,
+    utc: instance.$u,
+    x: instance.$x,
+    $offset: instance.$offset // todo: refactor; do not use this.$offset in you code
+
+  });
+};
+
+var Utils = U; // for plugin use
+
+Utils.l = parseLocale;
+Utils.i = isDayjs;
+Utils.w = wrapper;
+
+var parseDate = function parseDate(cfg) {
+  var date = cfg.date,
+      utc = cfg.utc;
+  if (date === null) return new Date(NaN); // null is invalid
+
+  if (Utils.u(date)) return new Date(); // today
+
+  if (date instanceof Date) return new Date(date);
+
+  if (typeof date === 'string' && !/Z$/i.test(date)) {
+    var d = date.match(C.REGEX_PARSE);
+
+    if (d) {
+      var m = d[2] - 1 || 0;
+      var ms = (d[7] || '0').substring(0, 3);
+
+      if (utc) {
+        return new Date(Date.UTC(d[1], m, d[3] || 1, d[4] || 0, d[5] || 0, d[6] || 0, ms));
+      }
+
+      return new Date(d[1], m, d[3] || 1, d[4] || 0, d[5] || 0, d[6] || 0, ms);
+    }
+  }
+
+  return new Date(date); // everything else
+};
+
+var Dayjs = /*#__PURE__*/function () {
+  function Dayjs(cfg) {
+    this.$L = parseLocale(cfg.locale, null, true);
+    this.parse(cfg); // for plugin
+
+    this.$x = this.$x || cfg.x || {};
+    this[IS_DAYJS] = true;
+  }
+
+  var _proto = Dayjs.prototype;
+
+  _proto.parse = function parse(cfg) {
+    this.$d = parseDate(cfg);
+    this.init();
+  };
+
+  _proto.init = function init() {
+    var $d = this.$d;
+    this.$y = $d.getFullYear();
+    this.$M = $d.getMonth();
+    this.$D = $d.getDate();
+    this.$W = $d.getDay();
+    this.$H = $d.getHours();
+    this.$m = $d.getMinutes();
+    this.$s = $d.getSeconds();
+    this.$ms = $d.getMilliseconds();
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
+  _proto.$utils = function $utils() {
+    return Utils;
+  };
+
+  _proto.isValid = function isValid() {
+    return !(this.$d.toString() === C.INVALID_DATE_STRING);
+  };
+
+  _proto.isSame = function isSame(that, units) {
+    var other = dayjs(that);
+    return this.startOf(units) <= other && other <= this.endOf(units);
+  };
+
+  _proto.isAfter = function isAfter(that, units) {
+    return dayjs(that) < this.startOf(units);
+  };
+
+  _proto.isBefore = function isBefore(that, units) {
+    return this.endOf(units) < dayjs(that);
+  };
+
+  _proto.$g = function $g(input, get, set) {
+    if (Utils.u(input)) return this[get];
+    return this.set(set, input);
+  };
+
+  _proto.unix = function unix() {
+    return Math.floor(this.valueOf() / 1000);
+  };
+
+  _proto.valueOf = function valueOf() {
+    // timezone(hour) * 60 * 60 * 1000 => ms
+    return this.$d.getTime();
+  };
+
+  _proto.startOf = function startOf(units, _startOf) {
+    var _this = this;
+
+    // startOf -> endOf
+    var isStartOf = !Utils.u(_startOf) ? _startOf : true;
+    var unit = Utils.p(units);
+
+    var instanceFactory = function instanceFactory(d, m) {
+      var ins = Utils.w(_this.$u ? Date.UTC(_this.$y, m, d) : new Date(_this.$y, m, d), _this);
+      return isStartOf ? ins : ins.endOf(C.D);
+    };
+
+    var instanceFactorySet = function instanceFactorySet(method, slice) {
+      var argumentStart = [0, 0, 0, 0];
+      var argumentEnd = [23, 59, 59, 999];
+      return Utils.w(_this.toDate()[method].apply( // eslint-disable-line prefer-spread
+      _this.toDate('s'), (isStartOf ? argumentStart : argumentEnd).slice(slice)), _this);
+    };
+
+    var $W = this.$W,
+        $M = this.$M,
+        $D = this.$D;
+    var utcPad = "set" + (this.$u ? 'UTC' : '');
+
+    switch (unit) {
+      case C.Y:
+        return isStartOf ? instanceFactory(1, 0) : instanceFactory(31, 11);
+
+      case C.M:
+        return isStartOf ? instanceFactory(1, $M) : instanceFactory(0, $M + 1);
+
+      case C.W:
+        {
+          var weekStart = this.$locale().weekStart || 0;
+          var gap = ($W < weekStart ? $W + 7 : $W) - weekStart;
+          return instanceFactory(isStartOf ? $D - gap : $D + (6 - gap), $M);
+        }
+
+      case C.D:
+      case C.DATE:
+        return instanceFactorySet(utcPad + "Hours", 0);
+
+      case C.H:
+        return instanceFactorySet(utcPad + "Minutes", 1);
+
+      case C.MIN:
+        return instanceFactorySet(utcPad + "Seconds", 2);
+
+      case C.S:
+        return instanceFactorySet(utcPad + "Milliseconds", 3);
+
+      default:
+        return this.clone();
+    }
+  };
+
+  _proto.endOf = function endOf(arg) {
+    return this.startOf(arg, false);
+  };
+
+  _proto.$set = function $set(units, _int) {
+    var _C$D$C$DATE$C$M$C$Y$C;
+
+    // private set
+    var unit = Utils.p(units);
+    var utcPad = "set" + (this.$u ? 'UTC' : '');
+    var name = (_C$D$C$DATE$C$M$C$Y$C = {}, _C$D$C$DATE$C$M$C$Y$C[C.D] = utcPad + "Date", _C$D$C$DATE$C$M$C$Y$C[C.DATE] = utcPad + "Date", _C$D$C$DATE$C$M$C$Y$C[C.M] = utcPad + "Month", _C$D$C$DATE$C$M$C$Y$C[C.Y] = utcPad + "FullYear", _C$D$C$DATE$C$M$C$Y$C[C.H] = utcPad + "Hours", _C$D$C$DATE$C$M$C$Y$C[C.MIN] = utcPad + "Minutes", _C$D$C$DATE$C$M$C$Y$C[C.S] = utcPad + "Seconds", _C$D$C$DATE$C$M$C$Y$C[C.MS] = utcPad + "Milliseconds", _C$D$C$DATE$C$M$C$Y$C)[unit];
+    var arg = unit === C.D ? this.$D + (_int - this.$W) : _int;
+
+    if (unit === C.M || unit === C.Y) {
+      // clone is for badMutable plugin
+      var date = this.clone().set(C.DATE, 1);
+      date.$d[name](arg);
+      date.init();
+      this.$d = date.set(C.DATE, Math.min(this.$D, date.daysInMonth())).$d;
+    } else if (name) this.$d[name](arg);
+
+    this.init();
+    return this;
+  };
+
+  _proto.set = function set(string, _int2) {
+    return this.clone().$set(string, _int2);
+  };
+
+  _proto.get = function get(unit) {
+    return this[Utils.p(unit)]();
+  };
+
+  _proto.add = function add(number, units) {
+    var _this2 = this,
+        _C$MIN$C$H$C$S$unit;
+
+    number = Number(number); // eslint-disable-line no-param-reassign
+
+    var unit = Utils.p(units);
+
+    var instanceFactorySet = function instanceFactorySet(n) {
+      var d = dayjs(_this2);
+      return Utils.w(d.date(d.date() + Math.round(n * number)), _this2);
+    };
+
+    if (unit === C.M) {
+      return this.set(C.M, this.$M + number);
+    }
+
+    if (unit === C.Y) {
+      return this.set(C.Y, this.$y + number);
+    }
+
+    if (unit === C.D) {
+      return instanceFactorySet(1);
+    }
+
+    if (unit === C.W) {
+      return instanceFactorySet(7);
+    }
+
+    var step = (_C$MIN$C$H$C$S$unit = {}, _C$MIN$C$H$C$S$unit[C.MIN] = C.MILLISECONDS_A_MINUTE, _C$MIN$C$H$C$S$unit[C.H] = C.MILLISECONDS_A_HOUR, _C$MIN$C$H$C$S$unit[C.S] = C.MILLISECONDS_A_SECOND, _C$MIN$C$H$C$S$unit)[unit] || 1; // ms
+
+    var nextTimeStamp = this.$d.getTime() + number * step;
+    return Utils.w(nextTimeStamp, this);
+  };
+
+  _proto.subtract = function subtract(number, string) {
+    return this.add(number * -1, string);
+  };
+
+  _proto.format = function format(formatStr) {
+    var _this3 = this;
+
+    var locale = this.$locale();
+    if (!this.isValid()) return locale.invalidDate || C.INVALID_DATE_STRING;
+    var str = formatStr || C.FORMAT_DEFAULT;
+    var zoneStr = Utils.z(this);
+    var $H = this.$H,
+        $m = this.$m,
+        $M = this.$M;
+    var weekdays = locale.weekdays,
+        months = locale.months,
+        meridiem = locale.meridiem;
+
+    var getShort = function getShort(arr, index, full, length) {
+      return arr && (arr[index] || arr(_this3, str)) || full[index].slice(0, length);
+    };
+
+    var get$H = function get$H(num) {
+      return Utils.s($H % 12 || 12, num, '0');
+    };
+
+    var meridiemFunc = meridiem || function (hour, minute, isLowercase) {
+      var m = hour < 12 ? 'AM' : 'PM';
+      return isLowercase ? m.toLowerCase() : m;
+    };
+
+    var matches = function matches(match) {
+      switch (match) {
+        case 'YY':
+          return String(_this3.$y).slice(-2);
+
+        case 'YYYY':
+          return Utils.s(_this3.$y, 4, '0');
+
+        case 'M':
+          return $M + 1;
+
+        case 'MM':
+          return Utils.s($M + 1, 2, '0');
+
+        case 'MMM':
+          return getShort(locale.monthsShort, $M, months, 3);
+
+        case 'MMMM':
+          return getShort(months, $M);
+
+        case 'D':
+          return _this3.$D;
+
+        case 'DD':
+          return Utils.s(_this3.$D, 2, '0');
+
+        case 'd':
+          return String(_this3.$W);
+
+        case 'dd':
+          return getShort(locale.weekdaysMin, _this3.$W, weekdays, 2);
+
+        case 'ddd':
+          return getShort(locale.weekdaysShort, _this3.$W, weekdays, 3);
+
+        case 'dddd':
+          return weekdays[_this3.$W];
+
+        case 'H':
+          return String($H);
+
+        case 'HH':
+          return Utils.s($H, 2, '0');
+
+        case 'h':
+          return get$H(1);
+
+        case 'hh':
+          return get$H(2);
+
+        case 'a':
+          return meridiemFunc($H, $m, true);
+
+        case 'A':
+          return meridiemFunc($H, $m, false);
+
+        case 'm':
+          return String($m);
+
+        case 'mm':
+          return Utils.s($m, 2, '0');
+
+        case 's':
+          return String(_this3.$s);
+
+        case 'ss':
+          return Utils.s(_this3.$s, 2, '0');
+
+        case 'SSS':
+          return Utils.s(_this3.$ms, 3, '0');
+
+        case 'Z':
+          return zoneStr;
+        // 'ZZ' logic below
+
+        default:
+          break;
+      }
+
+      return null;
+    };
+
+    return str.replace(C.REGEX_FORMAT, function (match, $1) {
+      return $1 || matches(match) || zoneStr.replace(':', '');
+    }); // 'ZZ'
+  };
+
+  _proto.utcOffset = function utcOffset() {
+    // Because a bug at FF24, we're rounding the timezone offset around 15 minutes
+    // https://github.com/moment/moment/pull/1871
+    return -Math.round(this.$d.getTimezoneOffset() / 15) * 15;
+  };
+
+  _proto.diff = function diff(input, units, _float) {
+    var _this4 = this;
+
+    var unit = Utils.p(units);
+    var that = dayjs(input);
+    var zoneDelta = (that.utcOffset() - this.utcOffset()) * C.MILLISECONDS_A_MINUTE;
+    var diff = this - that;
+
+    var getMonth = function getMonth() {
+      return Utils.m(_this4, that);
+    };
+
+    var result;
+
+    switch (unit) {
+      case C.Y:
+        result = getMonth() / 12;
+        break;
+
+      case C.M:
+        result = getMonth();
+        break;
+
+      case C.Q:
+        result = getMonth() / 3;
+        break;
+
+      case C.W:
+        result = (diff - zoneDelta) / C.MILLISECONDS_A_WEEK;
+        break;
+
+      case C.D:
+        result = (diff - zoneDelta) / C.MILLISECONDS_A_DAY;
+        break;
+
+      case C.H:
+        result = diff / C.MILLISECONDS_A_HOUR;
+        break;
+
+      case C.MIN:
+        result = diff / C.MILLISECONDS_A_MINUTE;
+        break;
+
+      case C.S:
+        result = diff / C.MILLISECONDS_A_SECOND;
+        break;
+
+      default:
+        result = diff; // milliseconds
+
+        break;
+    }
+
+    return _float ? result : Utils.a(result);
+  };
+
+  _proto.daysInMonth = function daysInMonth() {
+    return this.endOf(C.M).$D;
+  };
+
+  _proto.$locale = function $locale() {
+    // get locale object
+    return Ls[this.$L];
+  };
+
+  _proto.locale = function locale(preset, object) {
+    if (!preset) return this.$L;
+    var that = this.clone();
+    var nextLocaleName = parseLocale(preset, object, true);
+    if (nextLocaleName) that.$L = nextLocaleName;
+    return that;
+  };
+
+  _proto.clone = function clone() {
+    return Utils.w(this.$d, this);
+  };
+
+  _proto.toDate = function toDate() {
+    return new Date(this.valueOf());
+  };
+
+  _proto.toJSON = function toJSON() {
+    return this.isValid() ? this.toISOString() : null;
+  };
+
+  _proto.toISOString = function toISOString() {
+    // ie 8 return
+    // new Dayjs(this.valueOf() + this.$d.getTimezoneOffset() * 60000)
+    // .format('YYYY-MM-DDTHH:mm:ss.SSS[Z]')
+    return this.$d.toISOString();
+  };
+
+  _proto.toString = function toString() {
+    return this.$d.toUTCString();
+  };
+
+  return Dayjs;
+}();
+
+var proto = Dayjs.prototype;
+dayjs.prototype = proto;
+[['$ms', C.MS], ['$s', C.S], ['$m', C.MIN], ['$H', C.H], ['$W', C.D], ['$M', C.M], ['$y', C.Y], ['$D', C.DATE]].forEach(function (g) {
+  proto[g[1]] = function (input) {
+    return this.$g(input, g[0], g[1]);
+  };
+});
+
+dayjs.extend = function (plugin, option) {
+  if (!plugin.$i) {
+    // install plugin only once
+    plugin(option, Dayjs, dayjs);
+    plugin.$i = true;
+  }
+
+  return dayjs;
+};
+
+dayjs.locale = parseLocale;
+dayjs.isDayjs = isDayjs;
+
+dayjs.unix = function (timestamp) {
+  return dayjs(timestamp * 1e3);
+};
+
+dayjs.en = Ls[L];
+dayjs.Ls = Ls;
+dayjs.p = {};
+export default dayjs;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/af.js b/node_modules/dayjs/esm/locale/af.js
new file mode 100644
index 0000000..ce0c285
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/af.js
@@ -0,0 +1,39 @@
+// Afrikaans [af]
+import dayjs from '../index';
+var locale = {
+  name: 'af',
+  weekdays: 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+  months: 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+  weekdaysMin: 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'oor %s',
+    past: '%s gelede',
+    s: "'n paar sekondes",
+    m: "'n minuut",
+    mm: '%d minute',
+    h: "'n uur",
+    hh: '%d ure',
+    d: "'n dag",
+    dd: '%d dae',
+    M: "'n maand",
+    MM: '%d maande',
+    y: "'n jaar",
+    yy: '%d jaar'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/am.js b/node_modules/dayjs/esm/locale/am.js
new file mode 100644
index 0000000..cf25510
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/am.js
@@ -0,0 +1,40 @@
+// Amharic [am]
+import dayjs from '../index';
+var locale = {
+  name: 'am',
+  weekdays: 'እሑድ_ሰኞ_ማክሰኞ_ረቡዕ_ሐሙስ_አርብ_ቅዳሜ'.split('_'),
+  weekdaysShort: 'እሑድ_ሰኞ_ማክሰ_ረቡዕ_ሐሙስ_አርብ_ቅዳሜ'.split('_'),
+  weekdaysMin: 'እሑ_ሰኞ_ማክ_ረቡ_ሐሙ_አር_ቅዳ'.split('_'),
+  months: 'ጃንዋሪ_ፌብሯሪ_ማርች_ኤፕሪል_ሜይ_ጁን_ጁላይ_ኦገስት_ሴፕቴምበር_ኦክቶበር_ኖቬምበር_ዲሴምበር'.split('_'),
+  monthsShort: 'ጃንዋ_ፌብሯ_ማርች_ኤፕሪ_ሜይ_ጁን_ጁላይ_ኦገስ_ሴፕቴ_ኦክቶ_ኖቬም_ዲሴም'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  relativeTime: {
+    future: 'በ%s',
+    past: '%s በፊት',
+    s: 'ጥቂት ሰከንዶች',
+    m: 'አንድ ደቂቃ',
+    mm: '%d ደቂቃዎች',
+    h: 'አንድ ሰዓት',
+    hh: '%d ሰዓታት',
+    d: 'አንድ ቀን',
+    dd: '%d ቀናት',
+    M: 'አንድ ወር',
+    MM: '%d ወራት',
+    y: 'አንድ ዓመት',
+    yy: '%d ዓመታት'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'MMMM D ፣ YYYY',
+    LLL: 'MMMM D ፣ YYYY HH:mm',
+    LLLL: 'dddd ፣ MMMM D ፣ YYYY HH:mm'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\u129B";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-dz.js b/node_modules/dayjs/esm/locale/ar-dz.js
new file mode 100644
index 0000000..3ecc04f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-dz.js
@@ -0,0 +1,41 @@
+// Arabic (Algeria) [ar-dz]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-dz',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekdaysShort: 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekdaysMin: 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'في %s',
+    past: 'منذ %s',
+    s: 'ثوان',
+    m: 'دقيقة',
+    mm: '%d دقائق',
+    h: 'ساعة',
+    hh: '%d ساعات',
+    d: 'يوم',
+    dd: '%d أيام',
+    M: 'شهر',
+    MM: '%d أشهر',
+    y: 'سنة',
+    yy: '%d سنوات'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-iq.js b/node_modules/dayjs/esm/locale/ar-iq.js
new file mode 100644
index 0000000..dfe31bf
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-iq.js
@@ -0,0 +1,42 @@
+//  Arabic (Iraq) [ar-iq]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-iq',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'كانون الثاني_شباط_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_ تشرين الثاني_كانون الأول'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'كانون الثاني_شباط_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_ تشرين الثاني_كانون الأول'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'في %s',
+    past: 'منذ %s',
+    s: 'ثوان',
+    m: 'دقيقة',
+    mm: '%d دقائق',
+    h: 'ساعة',
+    hh: '%d ساعات',
+    d: 'يوم',
+    dd: '%d أيام',
+    M: 'شهر',
+    MM: '%d أشهر',
+    y: 'سنة',
+    yy: '%d سنوات'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-kw.js b/node_modules/dayjs/esm/locale/ar-kw.js
new file mode 100644
index 0000000..73bf90a
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-kw.js
@@ -0,0 +1,41 @@
+// Arabic (Kuwait) [ar-kw]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-kw',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+  weekdaysShort: 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'في %s',
+    past: 'منذ %s',
+    s: 'ثوان',
+    m: 'دقيقة',
+    mm: '%d دقائق',
+    h: 'ساعة',
+    hh: '%d ساعات',
+    d: 'يوم',
+    dd: '%d أيام',
+    M: 'شهر',
+    MM: '%d أشهر',
+    y: 'سنة',
+    yy: '%d سنوات'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-ly.js b/node_modules/dayjs/esm/locale/ar-ly.js
new file mode 100644
index 0000000..5caa869
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-ly.js
@@ -0,0 +1,27 @@
+// Arabic (Lybia) [ar-ly]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-ly',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekStart: 6,
+  weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'D/‏M/‏YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-ma.js b/node_modules/dayjs/esm/locale/ar-ma.js
new file mode 100644
index 0000000..ed6dfef
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-ma.js
@@ -0,0 +1,42 @@
+// Arabic (Morocco) [ar-ma]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-ma',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+  weekStart: 6,
+  weekdaysShort: 'احد_إثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'في %s',
+    past: 'منذ %s',
+    s: 'ثوان',
+    m: 'دقيقة',
+    mm: '%d دقائق',
+    h: 'ساعة',
+    hh: '%d ساعات',
+    d: 'يوم',
+    dd: '%d أيام',
+    M: 'شهر',
+    MM: '%d أشهر',
+    y: 'سنة',
+    yy: '%d سنوات'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-sa.js b/node_modules/dayjs/esm/locale/ar-sa.js
new file mode 100644
index 0000000..8eb9687
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-sa.js
@@ -0,0 +1,41 @@
+// Arabic (Saudi Arabia) [ar-sa]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-sa',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'في %s',
+    past: 'منذ %s',
+    s: 'ثوان',
+    m: 'دقيقة',
+    mm: '%d دقائق',
+    h: 'ساعة',
+    hh: '%d ساعات',
+    d: 'يوم',
+    dd: '%d أيام',
+    M: 'شهر',
+    MM: '%d أشهر',
+    y: 'سنة',
+    yy: '%d سنوات'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar-tn.js b/node_modules/dayjs/esm/locale/ar-tn.js
new file mode 100644
index 0000000..3c1f2b0
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar-tn.js
@@ -0,0 +1,42 @@
+//  Arabic (Tunisia) [ar-tn]
+import dayjs from '../index';
+var locale = {
+  name: 'ar-tn',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+  monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'في %s',
+    past: 'منذ %s',
+    s: 'ثوان',
+    m: 'دقيقة',
+    mm: '%d دقائق',
+    h: 'ساعة',
+    hh: '%d ساعات',
+    d: 'يوم',
+    dd: '%d أيام',
+    M: 'شهر',
+    MM: '%d أشهر',
+    y: 'سنة',
+    yy: '%d سنوات'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ar.js b/node_modules/dayjs/esm/locale/ar.js
new file mode 100644
index 0000000..78b99b8
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ar.js
@@ -0,0 +1,77 @@
+// Arabic [ar]
+import dayjs from '../index';
+var months = 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_');
+var symbolMap = {
+  1: '١',
+  2: '٢',
+  3: '٣',
+  4: '٤',
+  5: '٥',
+  6: '٦',
+  7: '٧',
+  8: '٨',
+  9: '٩',
+  0: '٠'
+};
+var numberMap = {
+  '١': '1',
+  '٢': '2',
+  '٣': '3',
+  '٤': '4',
+  '٥': '5',
+  '٦': '6',
+  '٧': '7',
+  '٨': '8',
+  '٩': '9',
+  '٠': '0'
+};
+var locale = {
+  name: 'ar',
+  weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+  weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+  weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+  months: months,
+  monthsShort: months,
+  weekStart: 6,
+  meridiem: function meridiem(hour) {
+    return hour > 12 ? 'م' : 'ص';
+  },
+  relativeTime: {
+    future: 'بعد %s',
+    past: 'منذ %s',
+    s: 'ثانية واحدة',
+    m: 'دقيقة واحدة',
+    mm: '%d دقائق',
+    h: 'ساعة واحدة',
+    hh: '%d ساعات',
+    d: 'يوم واحد',
+    dd: '%d أيام',
+    M: 'شهر واحد',
+    MM: '%d أشهر',
+    y: 'عام واحد',
+    yy: '%d أعوام'
+  },
+  preparse: function preparse(string) {
+    return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+      return numberMap[match];
+    }).replace(/،/g, ',');
+  },
+  postformat: function postformat(string) {
+    return string.replace(/\d/g, function (match) {
+      return symbolMap[match];
+    }).replace(/,/g, '،');
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'D/‏M/‏YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/az.js b/node_modules/dayjs/esm/locale/az.js
new file mode 100644
index 0000000..3505c8a
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/az.js
@@ -0,0 +1,39 @@
+// Azerbaijani [az]
+import dayjs from '../index';
+var locale = {
+  name: 'az',
+  weekdays: 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+  weekdaysShort: 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+  weekdaysMin: 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+  months: 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+  monthsShort: 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY г.',
+    LLL: 'D MMMM YYYY г., H:mm',
+    LLLL: 'dddd, D MMMM YYYY г., H:mm'
+  },
+  relativeTime: {
+    future: '%s sonra',
+    past: '%s əvvəl',
+    s: 'bir neçə saniyə',
+    m: 'bir dəqiqə',
+    mm: '%d dəqiqə',
+    h: 'bir saat',
+    hh: '%d saat',
+    d: 'bir gün',
+    dd: '%d gün',
+    M: 'bir ay',
+    MM: '%d ay',
+    y: 'bir il',
+    yy: '%d il'
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/be.js b/node_modules/dayjs/esm/locale/be.js
new file mode 100644
index 0000000..5642e39
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/be.js
@@ -0,0 +1,24 @@
+// Belarusian [be]
+import dayjs from '../index';
+var locale = {
+  name: 'be',
+  weekdays: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
+  months: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+  monthsShort: 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+  weekdaysMin: 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY г.',
+    LLL: 'D MMMM YYYY г., HH:mm',
+    LLLL: 'dddd, D MMMM YYYY г., HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bg.js b/node_modules/dayjs/esm/locale/bg.js
new file mode 100644
index 0000000..e60a2a3
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bg.js
@@ -0,0 +1,55 @@
+// Bulgarian [bg]
+import dayjs from '../index';
+var locale = {
+  name: 'bg',
+  weekdays: 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+  weekdaysShort: 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+  weekdaysMin: 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+  months: 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+  monthsShort: 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+  weekStart: 1,
+  ordinal: function ordinal(n) {
+    var last2Digits = n % 100;
+
+    if (last2Digits > 10 && last2Digits < 20) {
+      return n + "-\u0442\u0438";
+    }
+
+    var lastDigit = n % 10;
+
+    if (lastDigit === 1) {
+      return n + "-\u0432\u0438";
+    } else if (lastDigit === 2) {
+      return n + "-\u0440\u0438";
+    } else if (lastDigit === 7 || lastDigit === 8) {
+      return n + "-\u043C\u0438";
+    }
+
+    return n + "-\u0442\u0438";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'D.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY H:mm',
+    LLLL: 'dddd, D MMMM YYYY H:mm'
+  },
+  relativeTime: {
+    future: 'след %s',
+    past: 'преди %s',
+    s: 'няколко секунди',
+    m: 'минута',
+    mm: '%d минути',
+    h: 'час',
+    hh: '%d часа',
+    d: 'ден',
+    dd: '%d дена',
+    M: 'месец',
+    MM: '%d месеца',
+    y: 'година',
+    yy: '%d години'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bi.js b/node_modules/dayjs/esm/locale/bi.js
new file mode 100644
index 0000000..6230f25
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bi.js
@@ -0,0 +1,39 @@
+// Bislama [bi]
+import dayjs from '../index';
+var locale = {
+  name: 'bi',
+  weekdays: 'Sande_Mande_Tusde_Wenesde_Tosde_Fraede_Sarade'.split('_'),
+  months: 'Januari_Februari_Maj_Eprel_Mei_Jun_Julae_Okis_Septemba_Oktoba_Novemba_Disemba'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'San_Man_Tus_Wen_Tos_Frae_Sar'.split('_'),
+  monthsShort: 'Jan_Feb_Maj_Epr_Mai_Jun_Jul_Oki_Sep_Okt_Nov_Dis'.split('_'),
+  weekdaysMin: 'San_Ma_Tu_We_To_Fr_Sar'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'lo %s',
+    past: '%s bifo',
+    s: 'sam seken',
+    m: 'wan minit',
+    mm: '%d minit',
+    h: 'wan haoa',
+    hh: '%d haoa',
+    d: 'wan dei',
+    dd: '%d dei',
+    M: 'wan manis',
+    MM: '%d manis',
+    y: 'wan yia',
+    yy: '%d yia'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bm.js b/node_modules/dayjs/esm/locale/bm.js
new file mode 100644
index 0000000..0d61093
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bm.js
@@ -0,0 +1,39 @@
+// Bambara [bm]
+import dayjs from '../index';
+var locale = {
+  name: 'bm',
+  weekdays: 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'),
+  months: 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'),
+  monthsShort: 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'),
+  weekdaysMin: 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'MMMM [tile] D [san] YYYY',
+    LLL: 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm',
+    LLLL: 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm'
+  },
+  relativeTime: {
+    future: '%s kɔnɔ',
+    past: 'a bɛ %s bɔ',
+    s: 'sanga dama dama',
+    m: 'miniti kelen',
+    mm: 'miniti %d',
+    h: 'lɛrɛ kelen',
+    hh: 'lɛrɛ %d',
+    d: 'tile kelen',
+    dd: 'tile %d',
+    M: 'kalo kelen',
+    MM: 'kalo %d',
+    y: 'san kelen',
+    yy: 'san %d'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bn-bd.js b/node_modules/dayjs/esm/locale/bn-bd.js
new file mode 100644
index 0000000..f13b660
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bn-bd.js
@@ -0,0 +1,81 @@
+// Bengali (Bangladesh) [bn-bd]
+import dayjs from '../index';
+var symbolMap = {
+  1: '১',
+  2: '২',
+  3: '৩',
+  4: '৪',
+  5: '৫',
+  6: '৬',
+  7: '৭',
+  8: '৮',
+  9: '৯',
+  0: '০'
+};
+var numberMap = {
+  '১': '1',
+  '২': '2',
+  '৩': '3',
+  '৪': '4',
+  '৫': '5',
+  '৬': '6',
+  '৭': '7',
+  '৮': '8',
+  '৯': '9',
+  '০': '0'
+};
+var locale = {
+  name: 'bn-bd',
+  weekdays: 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
+  months: 'জানুয়ারি_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+  weekdaysShort: 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
+  monthsShort: 'জানু_ফেব্রু_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
+  weekdaysMin: 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
+  weekStart: 0,
+  preparse: function preparse(string) {
+    return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+      return numberMap[match];
+    });
+  },
+  postformat: function postformat(string) {
+    return string.replace(/\d/g, function (match) {
+      return symbolMap[match];
+    });
+  },
+  ordinal: function ordinal(n) {
+    var s = ['ই', 'লা', 'রা', 'ঠা', 'শে'];
+    var v = n % 100;
+    return "[" + n + (s[(v - 20) % 10] || s[v] || s[0]) + "]";
+  },
+  formats: {
+    LT: 'A h:mm সময়',
+    LTS: 'A h:mm:ss সময়',
+    L: 'DD/MM/YYYY খ্রিস্টাব্দ',
+    LL: 'D MMMM YYYY খ্রিস্টাব্দ',
+    LLL: 'D MMMM YYYY খ্রিস্টাব্দ, A h:mm সময়',
+    LLLL: 'dddd, D MMMM YYYY খ্রিস্টাব্দ, A h:mm সময়'
+  },
+  meridiem: function meridiem(hour) {
+    return (
+      /* eslint-disable no-nested-ternary */
+      hour < 4 ? 'রাত' : hour < 6 ? 'ভোর' : hour < 12 ? 'সকাল' : hour < 15 ? 'দুপুর' : hour < 18 ? 'বিকাল' : hour < 20 ? 'সন্ধ্যা' : 'রাত'
+    );
+  },
+  relativeTime: {
+    future: '%s পরে',
+    past: '%s আগে',
+    s: 'কয়েক সেকেন্ড',
+    m: 'এক মিনিট',
+    mm: '%d মিনিট',
+    h: 'এক ঘন্টা',
+    hh: '%d ঘন্টা',
+    d: 'এক দিন',
+    dd: '%d দিন',
+    M: 'এক মাস',
+    MM: '%d মাস',
+    y: 'এক বছর',
+    yy: '%d বছর'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bn.js b/node_modules/dayjs/esm/locale/bn.js
new file mode 100644
index 0000000..25fc170
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bn.js
@@ -0,0 +1,72 @@
+// Bengali [bn]
+import dayjs from '../index';
+var symbolMap = {
+  1: '১',
+  2: '২',
+  3: '৩',
+  4: '৪',
+  5: '৫',
+  6: '৬',
+  7: '৭',
+  8: '৮',
+  9: '৯',
+  0: '০'
+};
+var numberMap = {
+  '১': '1',
+  '২': '2',
+  '৩': '3',
+  '৪': '4',
+  '৫': '5',
+  '৬': '6',
+  '৭': '7',
+  '৮': '8',
+  '৯': '9',
+  '০': '0'
+};
+var locale = {
+  name: 'bn',
+  weekdays: 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
+  months: 'জানুয়ারি_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+  weekdaysShort: 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
+  monthsShort: 'জানু_ফেব্রু_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
+  weekdaysMin: 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
+  preparse: function preparse(string) {
+    return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+      return numberMap[match];
+    });
+  },
+  postformat: function postformat(string) {
+    return string.replace(/\d/g, function (match) {
+      return symbolMap[match];
+    });
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm সময়',
+    LTS: 'A h:mm:ss সময়',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm সময়',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm সময়'
+  },
+  relativeTime: {
+    future: '%s পরে',
+    past: '%s আগে',
+    s: 'কয়েক সেকেন্ড',
+    m: 'এক মিনিট',
+    mm: '%d মিনিট',
+    h: 'এক ঘন্টা',
+    hh: '%d ঘন্টা',
+    d: 'এক দিন',
+    dd: '%d দিন',
+    M: 'এক মাস',
+    MM: '%d মাস',
+    y: 'এক বছর',
+    yy: '%d বছর'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bo.js b/node_modules/dayjs/esm/locale/bo.js
new file mode 100644
index 0000000..fce3344
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bo.js
@@ -0,0 +1,38 @@
+// Tibetan [bo]
+import dayjs from '../index';
+var locale = {
+  name: 'bo',
+  weekdays: 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+  weekdaysShort: 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+  weekdaysMin: 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+  months: 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+  monthsShort: 'ཟླ་དང་པོ_ཟླ་གཉིས་པ_ཟླ་གསུམ་པ_ཟླ་བཞི་པ_ཟླ་ལྔ་པ_ཟླ་དྲུག་པ_ཟླ་བདུན་པ_ཟླ་བརྒྱད་པ_ཟླ་དགུ་པ_ཟླ་བཅུ་པ_ཟླ་བཅུ་གཅིག་པ_ཟླ་བཅུ་གཉིས་པ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm',
+    LTS: 'A h:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm'
+  },
+  relativeTime: {
+    future: '%s ལ་',
+    past: '%s སྔོན་ལ་',
+    s: 'ཏོག་ཙམ་',
+    m: 'སྐར་མ་གཅིག་',
+    mm: 'སྐར་མ་ %d',
+    h: 'ཆུ་ཚོད་གཅིག་',
+    hh: 'ཆུ་ཚོད་ %d',
+    d: 'ཉིན་གཅིག་',
+    dd: 'ཉིན་ %d',
+    M: 'ཟླ་བ་གཅིག་',
+    MM: 'ཟླ་བ་ %d',
+    y: 'ལོ་གཅིག་',
+    yy: 'ལོ་ %d'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/br.js b/node_modules/dayjs/esm/locale/br.js
new file mode 100644
index 0000000..d18b4fe
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/br.js
@@ -0,0 +1,93 @@
+// Breton [br]
+import dayjs from '../index';
+
+function lastNumber(number) {
+  if (number > 9) {
+    return lastNumber(number % 10);
+  }
+
+  return number;
+}
+
+function softMutation(text) {
+  var mutationTable = {
+    m: 'v',
+    b: 'v',
+    d: 'z'
+  };
+  return mutationTable[text.charAt(0)] + text.substring(1);
+}
+
+function mutation(text, number) {
+  if (number === 2) {
+    return softMutation(text);
+  }
+
+  return text;
+}
+
+function relativeTimeWithMutation(number, withoutSuffix, key) {
+  var format = {
+    mm: 'munutenn',
+    MM: 'miz',
+    dd: 'devezh'
+  };
+  return number + " " + mutation(format[key], number);
+}
+
+function specialMutationForYears(number) {
+  /* istanbul ignore next line */
+  switch (lastNumber(number)) {
+    case 1:
+    case 3:
+    case 4:
+    case 5:
+    case 9:
+      return number + " bloaz";
+
+    default:
+      return number + " vloaz";
+  }
+}
+
+var locale = {
+  name: 'br',
+  weekdays: 'Sul_Lun_Meurzh_Mercʼher_Yaou_Gwener_Sadorn'.split('_'),
+  months: 'Genver_Cʼhwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+  monthsShort: 'Gen_Cʼhwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+  weekdaysMin: 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'h[e]mm A',
+    LTS: 'h[e]mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D [a viz] MMMM YYYY',
+    LLL: 'D [a viz] MMMM YYYY h[e]mm A',
+    LLLL: 'dddd, D [a viz] MMMM YYYY h[e]mm A'
+  },
+  relativeTime: {
+    future: 'a-benn %s',
+    past: '%s ʼzo',
+    s: 'un nebeud segondennoù',
+    m: 'ur vunutenn',
+    mm: relativeTimeWithMutation,
+    h: 'un eur',
+    hh: '%d eur',
+    d: 'un devezh',
+    dd: relativeTimeWithMutation,
+    M: 'ur miz',
+    MM: relativeTimeWithMutation,
+    y: 'ur bloaz',
+    yy: specialMutationForYears
+  },
+  meridiem: function meridiem(hour) {
+    return hour < 12 ? 'a.m.' : 'g.m.';
+  } // a-raok merenn | goude merenn
+
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/bs.js b/node_modules/dayjs/esm/locale/bs.js
new file mode 100644
index 0000000..328a1fe
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/bs.js
@@ -0,0 +1,24 @@
+// Bosnian [bs]
+import dayjs from '../index';
+var locale = {
+  name: 'bs',
+  weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+  months: 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+  monthsShort: 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+  weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd, D. MMMM YYYY H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ca.js b/node_modules/dayjs/esm/locale/ca.js
new file mode 100644
index 0000000..94fc0b9
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ca.js
@@ -0,0 +1,44 @@
+// Catalan [ca]
+import dayjs from '../index';
+var locale = {
+  name: 'ca',
+  weekdays: 'Diumenge_Dilluns_Dimarts_Dimecres_Dijous_Divendres_Dissabte'.split('_'),
+  weekdaysShort: 'Dg._Dl._Dt._Dc._Dj._Dv._Ds.'.split('_'),
+  weekdaysMin: 'Dg_Dl_Dt_Dc_Dj_Dv_Ds'.split('_'),
+  months: 'Gener_Febrer_Març_Abril_Maig_Juny_Juliol_Agost_Setembre_Octubre_Novembre_Desembre'.split('_'),
+  monthsShort: 'Gen._Febr._Març_Abr._Maig_Juny_Jul._Ag._Set._Oct._Nov._Des.'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM [de] YYYY',
+    LLL: 'D MMMM [de] YYYY [a les] H:mm',
+    LLLL: 'dddd D MMMM [de] YYYY [a les] H:mm',
+    ll: 'D MMM YYYY',
+    lll: 'D MMM YYYY, H:mm',
+    llll: 'ddd D MMM YYYY, H:mm'
+  },
+  relativeTime: {
+    future: 'd\'aquí %s',
+    past: 'fa %s',
+    s: 'uns segons',
+    m: 'un minut',
+    mm: '%d minuts',
+    h: 'una hora',
+    hh: '%d hores',
+    d: 'un dia',
+    dd: '%d dies',
+    M: 'un mes',
+    MM: '%d mesos',
+    y: 'un any',
+    yy: '%d anys'
+  },
+  ordinal: function ordinal(n) {
+    var ord;
+    if (n === 1 || n === 3) ord = 'r';else if (n === 2) ord = 'n';else if (n === 4) ord = 't';else ord = 'è';
+    return "" + n + ord;
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/cs.js b/node_modules/dayjs/esm/locale/cs.js
new file mode 100644
index 0000000..165b662
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/cs.js
@@ -0,0 +1,120 @@
+// Czech [cs]
+import dayjs from '../index';
+
+function plural(n) {
+  return n > 1 && n < 5 && ~~(n / 10) !== 1; // eslint-disable-line
+}
+/* eslint-disable */
+
+
+function translate(number, withoutSuffix, key, isFuture) {
+  var result = number + " ";
+
+  switch (key) {
+    case 's':
+      // a few seconds / in a few seconds / a few seconds ago
+      return withoutSuffix || isFuture ? 'pár sekund' : 'pár sekundami';
+
+    case 'm':
+      // a minute / in a minute / a minute ago
+      return withoutSuffix ? 'minuta' : isFuture ? 'minutu' : 'minutou';
+
+    case 'mm':
+      // 9 minutes / in 9 minutes / 9 minutes ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'minuty' : 'minut');
+      }
+
+      return result + "minutami";
+
+    case 'h':
+      // an hour / in an hour / an hour ago
+      return withoutSuffix ? 'hodina' : isFuture ? 'hodinu' : 'hodinou';
+
+    case 'hh':
+      // 9 hours / in 9 hours / 9 hours ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'hodiny' : 'hodin');
+      }
+
+      return result + "hodinami";
+
+    case 'd':
+      // a day / in a day / a day ago
+      return withoutSuffix || isFuture ? 'den' : 'dnem';
+
+    case 'dd':
+      // 9 days / in 9 days / 9 days ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'dny' : 'dní');
+      }
+
+      return result + "dny";
+
+    case 'M':
+      // a month / in a month / a month ago
+      return withoutSuffix || isFuture ? 'měsíc' : 'měsícem';
+
+    case 'MM':
+      // 9 months / in 9 months / 9 months ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'měsíce' : 'měsíců');
+      }
+
+      return result + "m\u011Bs\xEDci";
+
+    case 'y':
+      // a year / in a year / a year ago
+      return withoutSuffix || isFuture ? 'rok' : 'rokem';
+
+    case 'yy':
+      // 9 years / in 9 years / 9 years ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'roky' : 'let');
+      }
+
+      return result + "lety";
+  }
+}
+/* eslint-enable */
+
+
+var locale = {
+  name: 'cs',
+  weekdays: 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+  weekdaysShort: 'ne_po_út_st_čt_pá_so'.split('_'),
+  weekdaysMin: 'ne_po_út_st_čt_pá_so'.split('_'),
+  months: 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+  monthsShort: 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd D. MMMM YYYY H:mm',
+    l: 'D. M. YYYY'
+  },
+  relativeTime: {
+    future: 'za %s',
+    past: 'před %s',
+    s: translate,
+    m: translate,
+    mm: translate,
+    h: translate,
+    hh: translate,
+    d: translate,
+    dd: translate,
+    M: translate,
+    MM: translate,
+    y: translate,
+    yy: translate
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/cv.js b/node_modules/dayjs/esm/locale/cv.js
new file mode 100644
index 0000000..7dc41f7
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/cv.js
@@ -0,0 +1,24 @@
+// Chuvash [cv]
+import dayjs from '../index';
+var locale = {
+  name: 'cv',
+  weekdays: 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+  months: 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+  monthsShort: 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+  weekdaysMin: 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD-MM-YYYY',
+    LL: 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+    LLL: 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',
+    LLLL: 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/cy.js b/node_modules/dayjs/esm/locale/cy.js
new file mode 100644
index 0000000..63e6c33
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/cy.js
@@ -0,0 +1,39 @@
+// Welsh [cy]
+import dayjs from '../index';
+var locale = {
+  name: 'cy',
+  weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+  months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+  monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+  weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'mewn %s',
+    past: '%s yn ôl',
+    s: 'ychydig eiliadau',
+    m: 'munud',
+    mm: '%d munud',
+    h: 'awr',
+    hh: '%d awr',
+    d: 'diwrnod',
+    dd: '%d diwrnod',
+    M: 'mis',
+    MM: '%d mis',
+    y: 'blwyddyn',
+    yy: '%d flynedd'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/da.js b/node_modules/dayjs/esm/locale/da.js
new file mode 100644
index 0000000..38fd134
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/da.js
@@ -0,0 +1,39 @@
+// Danish [da]
+import dayjs from '../index';
+var locale = {
+  name: 'da',
+  weekdays: 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+  weekdaysShort: 'søn._man._tirs._ons._tors._fre._lør.'.split('_'),
+  weekdaysMin: 'sø._ma._ti._on._to._fr._lø.'.split('_'),
+  months: 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+  monthsShort: 'jan._feb._mar._apr._maj_juni_juli_aug._sept._okt._nov._dec.'.split('_'),
+  weekStart: 1,
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY HH:mm',
+    LLLL: 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
+  },
+  relativeTime: {
+    future: 'om %s',
+    past: '%s siden',
+    s: 'få sekunder',
+    m: 'et minut',
+    mm: '%d minutter',
+    h: 'en time',
+    hh: '%d timer',
+    d: 'en dag',
+    dd: '%d dage',
+    M: 'en måned',
+    MM: '%d måneder',
+    y: 'et år',
+    yy: '%d år'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/de-at.js b/node_modules/dayjs/esm/locale/de-at.js
new file mode 100644
index 0000000..e109d97
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/de-at.js
@@ -0,0 +1,63 @@
+// German (Austria) [de-at]
+import dayjs from '../index';
+var texts = {
+  s: 'ein paar Sekunden',
+  m: ['eine Minute', 'einer Minute'],
+  mm: '%d Minuten',
+  h: ['eine Stunde', 'einer Stunde'],
+  hh: '%d Stunden',
+  d: ['ein Tag', 'einem Tag'],
+  dd: ['%d Tage', '%d Tagen'],
+  M: ['ein Monat', 'einem Monat'],
+  MM: ['%d Monate', '%d Monaten'],
+  y: ['ein Jahr', 'einem Jahr'],
+  yy: ['%d Jahre', '%d Jahren']
+};
+
+function relativeTimeFormatter(number, withoutSuffix, key) {
+  var l = texts[key];
+
+  if (Array.isArray(l)) {
+    l = l[withoutSuffix ? 0 : 1];
+  }
+
+  return l.replace('%d', number);
+}
+
+var locale = {
+  name: 'de-at',
+  weekdays: 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+  weekdaysShort: 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+  weekdaysMin: 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+  months: 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+  monthsShort: 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  formats: {
+    LTS: 'HH:mm:ss',
+    LT: 'HH:mm',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY HH:mm',
+    LLLL: 'dddd, D. MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: 'vor %s',
+    s: relativeTimeFormatter,
+    m: relativeTimeFormatter,
+    mm: relativeTimeFormatter,
+    h: relativeTimeFormatter,
+    hh: relativeTimeFormatter,
+    d: relativeTimeFormatter,
+    dd: relativeTimeFormatter,
+    M: relativeTimeFormatter,
+    MM: relativeTimeFormatter,
+    y: relativeTimeFormatter,
+    yy: relativeTimeFormatter
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/de-ch.js b/node_modules/dayjs/esm/locale/de-ch.js
new file mode 100644
index 0000000..1ffbbf7
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/de-ch.js
@@ -0,0 +1,63 @@
+// German (Switzerland) [de-ch]
+import dayjs from '../index';
+var texts = {
+  s: 'ein paar Sekunden',
+  m: ['eine Minute', 'einer Minute'],
+  mm: '%d Minuten',
+  h: ['eine Stunde', 'einer Stunde'],
+  hh: '%d Stunden',
+  d: ['ein Tag', 'einem Tag'],
+  dd: ['%d Tage', '%d Tagen'],
+  M: ['ein Monat', 'einem Monat'],
+  MM: ['%d Monate', '%d Monaten'],
+  y: ['ein Jahr', 'einem Jahr'],
+  yy: ['%d Jahre', '%d Jahren']
+};
+
+function relativeTimeFormatter(number, withoutSuffix, key) {
+  var l = texts[key];
+
+  if (Array.isArray(l)) {
+    l = l[withoutSuffix ? 0 : 1];
+  }
+
+  return l.replace('%d', number);
+}
+
+var locale = {
+  name: 'de-ch',
+  weekdays: 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+  weekdaysShort: 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+  weekdaysMin: 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+  months: 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+  monthsShort: 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY HH:mm',
+    LLLL: 'dddd, D. MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: 'vor %s',
+    s: relativeTimeFormatter,
+    m: relativeTimeFormatter,
+    mm: relativeTimeFormatter,
+    h: relativeTimeFormatter,
+    hh: relativeTimeFormatter,
+    d: relativeTimeFormatter,
+    dd: relativeTimeFormatter,
+    M: relativeTimeFormatter,
+    MM: relativeTimeFormatter,
+    y: relativeTimeFormatter,
+    yy: relativeTimeFormatter
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/de.js b/node_modules/dayjs/esm/locale/de.js
new file mode 100644
index 0000000..8ccd483
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/de.js
@@ -0,0 +1,64 @@
+// German [de]
+import dayjs from '../index';
+var texts = {
+  s: 'ein paar Sekunden',
+  m: ['eine Minute', 'einer Minute'],
+  mm: '%d Minuten',
+  h: ['eine Stunde', 'einer Stunde'],
+  hh: '%d Stunden',
+  d: ['ein Tag', 'einem Tag'],
+  dd: ['%d Tage', '%d Tagen'],
+  M: ['ein Monat', 'einem Monat'],
+  MM: ['%d Monate', '%d Monaten'],
+  y: ['ein Jahr', 'einem Jahr'],
+  yy: ['%d Jahre', '%d Jahren']
+};
+
+function relativeTimeFormatter(number, withoutSuffix, key) {
+  var l = texts[key];
+
+  if (Array.isArray(l)) {
+    l = l[withoutSuffix ? 0 : 1];
+  }
+
+  return l.replace('%d', number);
+}
+
+var locale = {
+  name: 'de',
+  weekdays: 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+  weekdaysShort: 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+  weekdaysMin: 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+  months: 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+  monthsShort: 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sept._Okt._Nov._Dez.'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LTS: 'HH:mm:ss',
+    LT: 'HH:mm',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY HH:mm',
+    LLLL: 'dddd, D. MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: 'vor %s',
+    s: relativeTimeFormatter,
+    m: relativeTimeFormatter,
+    mm: relativeTimeFormatter,
+    h: relativeTimeFormatter,
+    hh: relativeTimeFormatter,
+    d: relativeTimeFormatter,
+    dd: relativeTimeFormatter,
+    M: relativeTimeFormatter,
+    MM: relativeTimeFormatter,
+    y: relativeTimeFormatter,
+    yy: relativeTimeFormatter
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/dv.js b/node_modules/dayjs/esm/locale/dv.js
new file mode 100644
index 0000000..8943fdd
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/dv.js
@@ -0,0 +1,39 @@
+// Maldivian [dv]
+import dayjs from '../index';
+var locale = {
+  name: 'dv',
+  weekdays: 'އާދިއްތަ_ހޯމަ_އަންގާރަ_ބުދަ_ބުރާސްފަތި_ހުކުރު_ހޮނިހިރު'.split('_'),
+  months: 'ޖެނުއަރީ_ފެބްރުއަރީ_މާރިޗު_އޭޕްރީލު_މޭ_ޖޫން_ޖުލައި_އޯގަސްޓު_ސެޕްޓެމްބަރު_އޮކްޓޯބަރު_ނޮވެމްބަރު_ޑިސެމްބަރު'.split('_'),
+  weekStart: 7,
+  weekdaysShort: 'އާދިއްތަ_ހޯމަ_އަންގާރަ_ބުދަ_ބުރާސްފަތި_ހުކުރު_ހޮނިހިރު'.split('_'),
+  monthsShort: 'ޖެނުއަރީ_ފެބްރުއަރީ_މާރިޗު_އޭޕްރީލު_މޭ_ޖޫން_ޖުލައި_އޯގަސްޓު_ސެޕްޓެމްބަރު_އޮކްޓޯބަރު_ނޮވެމްބަރު_ޑިސެމްބަރު'.split('_'),
+  weekdaysMin: 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'D/M/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'ތެރޭގައި %s',
+    past: 'ކުރިން %s',
+    s: 'ސިކުންތުކޮޅެއް',
+    m: 'މިނިޓެއް',
+    mm: 'މިނިޓު %d',
+    h: 'ގަޑިއިރެއް',
+    hh: 'ގަޑިއިރު %d',
+    d: 'ދުވަހެއް',
+    dd: 'ދުވަސް %d',
+    M: 'މަހެއް',
+    MM: 'މަސް %d',
+    y: 'އަހަރެއް',
+    yy: 'އަހަރު %d'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/el.js b/node_modules/dayjs/esm/locale/el.js
new file mode 100644
index 0000000..2aa9917
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/el.js
@@ -0,0 +1,39 @@
+// Greek [el]
+import dayjs from '../index';
+var locale = {
+  name: 'el',
+  weekdays: 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+  weekdaysShort: 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+  weekdaysMin: 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+  months: 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+  monthsShort: 'Ιαν_Φεβ_Μαρ_Απρ_Μαι_Ιουν_Ιουλ_Αυγ_Σεπτ_Οκτ_Νοε_Δεκ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  weekStart: 1,
+  relativeTime: {
+    future: 'σε %s',
+    past: 'πριν %s',
+    s: 'μερικά δευτερόλεπτα',
+    m: 'ένα λεπτό',
+    mm: '%d λεπτά',
+    h: 'μία ώρα',
+    hh: '%d ώρες',
+    d: 'μία μέρα',
+    dd: '%d μέρες',
+    M: 'ένα μήνα',
+    MM: '%d μήνες',
+    y: 'ένα χρόνο',
+    yy: '%d χρόνια'
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-au.js b/node_modules/dayjs/esm/locale/en-au.js
new file mode 100644
index 0000000..f9dde03
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-au.js
@@ -0,0 +1,39 @@
+// English (Australia) [en-au]
+import dayjs from '../index';
+var locale = {
+  name: 'en-au',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-ca.js b/node_modules/dayjs/esm/locale/en-ca.js
new file mode 100644
index 0000000..8e416c9
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-ca.js
@@ -0,0 +1,38 @@
+// English (Canada) [en-ca]
+import dayjs from '../index';
+var locale = {
+  name: 'en-ca',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'YYYY-MM-DD',
+    LL: 'MMMM D, YYYY',
+    LLL: 'MMMM D, YYYY h:mm A',
+    LLLL: 'dddd, MMMM D, YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-gb.js b/node_modules/dayjs/esm/locale/en-gb.js
new file mode 100644
index 0000000..f979b44
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-gb.js
@@ -0,0 +1,42 @@
+// English (United Kingdom) [en-gb]
+import dayjs from '../index';
+var locale = {
+  name: 'en-gb',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  ordinal: function ordinal(n) {
+    var s = ['th', 'st', 'nd', 'rd'];
+    var v = n % 100;
+    return "[" + n + (s[(v - 20) % 10] || s[v] || s[0]) + "]";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-ie.js b/node_modules/dayjs/esm/locale/en-ie.js
new file mode 100644
index 0000000..8098d2f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-ie.js
@@ -0,0 +1,39 @@
+// English (Ireland) [en-ie]
+import dayjs from '../index';
+var locale = {
+  name: 'en-ie',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-il.js b/node_modules/dayjs/esm/locale/en-il.js
new file mode 100644
index 0000000..56c241a
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-il.js
@@ -0,0 +1,38 @@
+// English (Israel) [en-il]
+import dayjs from '../index';
+var locale = {
+  name: 'en-il',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-in.js b/node_modules/dayjs/esm/locale/en-in.js
new file mode 100644
index 0000000..7ccb206
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-in.js
@@ -0,0 +1,42 @@
+// English (India) [en-in]
+import dayjs from '../index';
+var locale = {
+  name: 'en-in',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  ordinal: function ordinal(n) {
+    var s = ['th', 'st', 'nd', 'rd'];
+    var v = n % 100;
+    return "[" + n + (s[(v - 20) % 10] || s[v] || s[0]) + "]";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-nz.js b/node_modules/dayjs/esm/locale/en-nz.js
new file mode 100644
index 0000000..08c562e
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-nz.js
@@ -0,0 +1,41 @@
+// English (New Zealand) [en-nz]
+import dayjs from '../index';
+var locale = {
+  name: 'en-nz',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    var s = ['th', 'st', 'nd', 'rd'];
+    var v = n % 100;
+    return "[" + n + (s[(v - 20) % 10] || s[v] || s[0]) + "]";
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-sg.js b/node_modules/dayjs/esm/locale/en-sg.js
new file mode 100644
index 0000000..3c5edce
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-sg.js
@@ -0,0 +1,39 @@
+// English (Singapore) [en-sg]
+import dayjs from '../index';
+var locale = {
+  name: 'en-sg',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en-tt.js b/node_modules/dayjs/esm/locale/en-tt.js
new file mode 100644
index 0000000..ef47eeb
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en-tt.js
@@ -0,0 +1,42 @@
+// English (Trinidad & Tobago) [en-tt]
+import dayjs from '../index';
+var locale = {
+  name: 'en-tt',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  weekdaysShort: 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+  weekdaysMin: 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  ordinal: function ordinal(n) {
+    var s = ['th', 'st', 'nd', 'rd'];
+    var v = n % 100;
+    return "[" + n + (s[(v - 20) % 10] || s[v] || s[0]) + "]";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/en.js b/node_modules/dayjs/esm/locale/en.js
new file mode 100644
index 0000000..8ba6107
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/en.js
@@ -0,0 +1,12 @@
+// English [en]
+// We don't need weekdaysShort, weekdaysMin, monthsShort in en.js locale
+export default {
+  name: 'en',
+  weekdays: 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+  months: 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+  ordinal: function ordinal(n) {
+    var s = ['th', 'st', 'nd', 'rd'];
+    var v = n % 100;
+    return "[" + n + (s[(v - 20) % 10] || s[v] || s[0]) + "]";
+  }
+};
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/eo.js b/node_modules/dayjs/esm/locale/eo.js
new file mode 100644
index 0000000..e62599a
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/eo.js
@@ -0,0 +1,39 @@
+// Esperanto [eo]
+import dayjs from '../index';
+var locale = {
+  name: 'eo',
+  weekdays: 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),
+  months: 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+  weekdaysMin: 'di_lu_ma_me_ĵa_ve_sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'D[-a de] MMMM, YYYY',
+    LLL: 'D[-a de] MMMM, YYYY HH:mm',
+    LLLL: 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'post %s',
+    past: 'antaŭ %s',
+    s: 'sekundoj',
+    m: 'minuto',
+    mm: '%d minutoj',
+    h: 'horo',
+    hh: '%d horoj',
+    d: 'tago',
+    dd: '%d tagoj',
+    M: 'monato',
+    MM: '%d monatoj',
+    y: 'jaro',
+    yy: '%d jaroj'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/es-do.js b/node_modules/dayjs/esm/locale/es-do.js
new file mode 100644
index 0000000..09410cf
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/es-do.js
@@ -0,0 +1,39 @@
+// Spanish (Dominican Republic) [es-do]
+import dayjs from '../index';
+var locale = {
+  name: 'es-do',
+  weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+  weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+  weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+  months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+  monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'),
+  weekStart: 1,
+  relativeTime: {
+    future: 'en %s',
+    past: 'hace %s',
+    s: 'unos segundos',
+    m: 'un minuto',
+    mm: '%d minutos',
+    h: 'una hora',
+    hh: '%d horas',
+    d: 'un día',
+    dd: '%d días',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un año',
+    yy: '%d años'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY h:mm A',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY h:mm A'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/es-mx.js b/node_modules/dayjs/esm/locale/es-mx.js
new file mode 100644
index 0000000..0207f83
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/es-mx.js
@@ -0,0 +1,38 @@
+// Spanish (Mexico) [es-mx]
+import dayjs from '../index';
+var locale = {
+  name: 'es-mx',
+  weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+  weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+  weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+  months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+  monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'),
+  relativeTime: {
+    future: 'en %s',
+    past: 'hace %s',
+    s: 'unos segundos',
+    m: 'un minuto',
+    mm: '%d minutos',
+    h: 'una hora',
+    hh: '%d horas',
+    d: 'un día',
+    dd: '%d días',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un año',
+    yy: '%d años'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY H:mm',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/es-pr.js b/node_modules/dayjs/esm/locale/es-pr.js
new file mode 100644
index 0000000..5edc359
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/es-pr.js
@@ -0,0 +1,39 @@
+// Spanish (Puerto Rico) [es-PR]
+import dayjs from '../index';
+var locale = {
+  name: 'es-pr',
+  monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'),
+  weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+  weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+  weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+  months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'MM/DD/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY h:mm A',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'en %s',
+    past: 'hace %s',
+    s: 'unos segundos',
+    m: 'un minuto',
+    mm: '%d minutos',
+    h: 'una hora',
+    hh: '%d horas',
+    d: 'un día',
+    dd: '%d días',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un año',
+    yy: '%d años'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/es-us.js b/node_modules/dayjs/esm/locale/es-us.js
new file mode 100644
index 0000000..f9b01a0
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/es-us.js
@@ -0,0 +1,38 @@
+// Spanish (United States) [es-us]
+import dayjs from '../index';
+var locale = {
+  name: 'es-us',
+  weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+  weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+  weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+  months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+  monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'),
+  relativeTime: {
+    future: 'en %s',
+    past: 'hace %s',
+    s: 'unos segundos',
+    m: 'un minuto',
+    mm: '%d minutos',
+    h: 'una hora',
+    hh: '%d horas',
+    d: 'un día',
+    dd: '%d días',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un año',
+    yy: '%d años'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'MM/DD/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY h:mm A',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY h:mm A'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/es.js b/node_modules/dayjs/esm/locale/es.js
new file mode 100644
index 0000000..84bdfbe
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/es.js
@@ -0,0 +1,39 @@
+// Spanish [es]
+import dayjs from '../index';
+var locale = {
+  name: 'es',
+  monthsShort: 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'),
+  weekdays: 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+  weekdaysShort: 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+  weekdaysMin: 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+  months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY H:mm',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY H:mm'
+  },
+  relativeTime: {
+    future: 'en %s',
+    past: 'hace %s',
+    s: 'unos segundos',
+    m: 'un minuto',
+    mm: '%d minutos',
+    h: 'una hora',
+    hh: '%d horas',
+    d: 'un día',
+    dd: '%d días',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un año',
+    yy: '%d años'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/et.js b/node_modules/dayjs/esm/locale/et.js
new file mode 100644
index 0000000..7f7c5ff
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/et.js
@@ -0,0 +1,65 @@
+// Estonian [et]
+import dayjs from '../index';
+
+function relativeTimeWithTense(number, withoutSuffix, key, isFuture) {
+  var format = {
+    s: ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+    m: ['ühe minuti', 'üks minut'],
+    mm: ['%d minuti', '%d minutit'],
+    h: ['ühe tunni', 'tund aega', 'üks tund'],
+    hh: ['%d tunni', '%d tundi'],
+    d: ['ühe päeva', 'üks päev'],
+    M: ['kuu aja', 'kuu aega', 'üks kuu'],
+    MM: ['%d kuu', '%d kuud'],
+    y: ['ühe aasta', 'aasta', 'üks aasta'],
+    yy: ['%d aasta', '%d aastat']
+  };
+
+  if (withoutSuffix) {
+    return (format[key][2] ? format[key][2] : format[key][1]).replace('%d', number);
+  }
+
+  return (isFuture ? format[key][0] : format[key][1]).replace('%d', number);
+}
+
+var locale = {
+  name: 'et',
+  // Estonian
+  weekdays: 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+  // Note weekdays are not capitalized in Estonian
+  weekdaysShort: 'P_E_T_K_N_R_L'.split('_'),
+  // There is no short form of weekdays in Estonian except this 1 letter format so it is used for both 'weekdaysShort' and 'weekdaysMin'
+  weekdaysMin: 'P_E_T_K_N_R_L'.split('_'),
+  months: 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+  // Note month names are not capitalized in Estonian
+  monthsShort: 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  relativeTime: {
+    future: '%s pärast',
+    past: '%s tagasi',
+    s: relativeTimeWithTense,
+    m: relativeTimeWithTense,
+    mm: relativeTimeWithTense,
+    h: relativeTimeWithTense,
+    hh: relativeTimeWithTense,
+    d: relativeTimeWithTense,
+    dd: '%d päeva',
+    M: relativeTimeWithTense,
+    MM: relativeTimeWithTense,
+    y: relativeTimeWithTense,
+    yy: relativeTimeWithTense
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd, D. MMMM YYYY H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/eu.js b/node_modules/dayjs/esm/locale/eu.js
new file mode 100644
index 0000000..5cb73d0
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/eu.js
@@ -0,0 +1,43 @@
+// Basque [eu]
+import dayjs from '../index';
+var locale = {
+  name: 'eu',
+  weekdays: 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+  months: 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'ig._al._ar._az._og._ol._lr.'.split('_'),
+  monthsShort: 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+  weekdaysMin: 'ig_al_ar_az_og_ol_lr'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'YYYY[ko] MMMM[ren] D[a]',
+    LLL: 'YYYY[ko] MMMM[ren] D[a] HH:mm',
+    LLLL: 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',
+    l: 'YYYY-M-D',
+    ll: 'YYYY[ko] MMM D[a]',
+    lll: 'YYYY[ko] MMM D[a] HH:mm',
+    llll: 'ddd, YYYY[ko] MMM D[a] HH:mm'
+  },
+  relativeTime: {
+    future: '%s barru',
+    past: 'duela %s',
+    s: 'segundo batzuk',
+    m: 'minutu bat',
+    mm: '%d minutu',
+    h: 'ordu bat',
+    hh: '%d ordu',
+    d: 'egun bat',
+    dd: '%d egun',
+    M: 'hilabete bat',
+    MM: '%d hilabete',
+    y: 'urte bat',
+    yy: '%d urte'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fa.js b/node_modules/dayjs/esm/locale/fa.js
new file mode 100644
index 0000000..089459e
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fa.js
@@ -0,0 +1,39 @@
+// Persian [fa]
+import dayjs from '../index';
+var locale = {
+  name: 'fa',
+  weekdays: 'یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه'.split('_'),
+  weekdaysShort: "\u06CC\u06A9\u200C\u0634\u0646\u0628\u0647_\u062F\u0648\u0634\u0646\u0628\u0647_\u0633\u0647\u200C\u0634\u0646\u0628\u0647_\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647_\u067E\u0646\u062C\u200C\u0634\u0646\u0628\u0647_\u062C\u0645\u0639\u0647_\u0634\u0646\u0628\u0647".split('_'),
+  weekdaysMin: 'ی_د_س_چ_پ_ج_ش'.split('_'),
+  weekStart: 6,
+  months: 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+  monthsShort: 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'در %s',
+    past: '%s پیش',
+    s: 'چند ثانیه',
+    m: 'یک دقیقه',
+    mm: '%d دقیقه',
+    h: 'یک ساعت',
+    hh: '%d ساعت',
+    d: 'یک روز',
+    dd: '%d روز',
+    M: 'یک ماه',
+    MM: '%d ماه',
+    y: 'یک سال',
+    yy: '%d سال'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fi.js b/node_modules/dayjs/esm/locale/fi.js
new file mode 100644
index 0000000..1ded894
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fi.js
@@ -0,0 +1,88 @@
+// Finnish [fi]
+import dayjs from '../index';
+
+function relativeTimeFormatter(number, withoutSuffix, key, isFuture) {
+  var past = {
+    s: 'muutama sekunti',
+    m: 'minuutti',
+    mm: '%d minuuttia',
+    h: 'tunti',
+    hh: '%d tuntia',
+    d: 'päivä',
+    dd: '%d päivää',
+    M: 'kuukausi',
+    MM: '%d kuukautta',
+    y: 'vuosi',
+    yy: '%d vuotta',
+    numbers: 'nolla_yksi_kaksi_kolme_neljä_viisi_kuusi_seitsemän_kahdeksan_yhdeksän'.split('_')
+  };
+  var future = {
+    s: 'muutaman sekunnin',
+    m: 'minuutin',
+    mm: '%d minuutin',
+    h: 'tunnin',
+    hh: '%d tunnin',
+    d: 'päivän',
+    dd: '%d päivän',
+    M: 'kuukauden',
+    MM: '%d kuukauden',
+    y: 'vuoden',
+    yy: '%d vuoden',
+    numbers: 'nollan_yhden_kahden_kolmen_neljän_viiden_kuuden_seitsemän_kahdeksan_yhdeksän'.split('_')
+  };
+  var words = isFuture && !withoutSuffix ? future : past;
+  var result = words[key];
+
+  if (number < 10) {
+    return result.replace('%d', words.numbers[number]);
+  }
+
+  return result.replace('%d', number);
+}
+
+var locale = {
+  name: 'fi',
+  // Finnish
+  weekdays: 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+  // Note weekdays are not capitalized in Finnish
+  weekdaysShort: 'su_ma_ti_ke_to_pe_la'.split('_'),
+  // There is no short form of weekdays in Finnish except this 2 letter format so it is used for both 'weekdaysShort' and 'weekdaysMin'
+  weekdaysMin: 'su_ma_ti_ke_to_pe_la'.split('_'),
+  months: 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+  // Note month names are not capitalized in Finnish
+  monthsShort: 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  yearStart: 4,
+  relativeTime: {
+    future: '%s päästä',
+    past: '%s sitten',
+    s: relativeTimeFormatter,
+    m: relativeTimeFormatter,
+    mm: relativeTimeFormatter,
+    h: relativeTimeFormatter,
+    hh: relativeTimeFormatter,
+    d: relativeTimeFormatter,
+    dd: relativeTimeFormatter,
+    M: relativeTimeFormatter,
+    MM: relativeTimeFormatter,
+    y: relativeTimeFormatter,
+    yy: relativeTimeFormatter
+  },
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM[ta] YYYY',
+    LLL: 'D. MMMM[ta] YYYY, [klo] HH.mm',
+    LLLL: 'dddd, D. MMMM[ta] YYYY, [klo] HH.mm',
+    l: 'D.M.YYYY',
+    ll: 'D. MMM YYYY',
+    lll: 'D. MMM YYYY, [klo] HH.mm',
+    llll: 'ddd, D. MMM YYYY, [klo] HH.mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fo.js b/node_modules/dayjs/esm/locale/fo.js
new file mode 100644
index 0000000..07c3761
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fo.js
@@ -0,0 +1,39 @@
+// Faroese [fo]
+import dayjs from '../index';
+var locale = {
+  name: 'fo',
+  weekdays: 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+  months: 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+  weekdaysMin: 'su_má_tý_mi_hó_fr_le'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D. MMMM, YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'um %s',
+    past: '%s síðani',
+    s: 'fá sekund',
+    m: 'ein minuttur',
+    mm: '%d minuttir',
+    h: 'ein tími',
+    hh: '%d tímar',
+    d: 'ein dagur',
+    dd: '%d dagar',
+    M: 'ein mánaður',
+    MM: '%d mánaðir',
+    y: 'eitt ár',
+    yy: '%d ár'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fr-ca.js b/node_modules/dayjs/esm/locale/fr-ca.js
new file mode 100644
index 0000000..688d695
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fr-ca.js
@@ -0,0 +1,38 @@
+// French (Canada) [fr-ca]
+import dayjs from '../index';
+var locale = {
+  name: 'fr-ca',
+  weekdays: 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+  months: 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+  weekdaysShort: 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+  monthsShort: 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+  weekdaysMin: 'di_lu_ma_me_je_ve_sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'dans %s',
+    past: 'il y a %s',
+    s: 'quelques secondes',
+    m: 'une minute',
+    mm: '%d minutes',
+    h: 'une heure',
+    hh: '%d heures',
+    d: 'un jour',
+    dd: '%d jours',
+    M: 'un mois',
+    MM: '%d mois',
+    y: 'un an',
+    yy: '%d ans'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fr-ch.js b/node_modules/dayjs/esm/locale/fr-ch.js
new file mode 100644
index 0000000..593dba8
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fr-ch.js
@@ -0,0 +1,39 @@
+// French (Switzerland) [fr-ch]
+import dayjs from '../index';
+var locale = {
+  name: 'fr-ch',
+  weekdays: 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+  months: 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+  monthsShort: 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+  weekdaysMin: 'di_lu_ma_me_je_ve_sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'dans %s',
+    past: 'il y a %s',
+    s: 'quelques secondes',
+    m: 'une minute',
+    mm: '%d minutes',
+    h: 'une heure',
+    hh: '%d heures',
+    d: 'un jour',
+    dd: '%d jours',
+    M: 'un mois',
+    MM: '%d mois',
+    y: 'un an',
+    yy: '%d ans'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fr.js b/node_modules/dayjs/esm/locale/fr.js
new file mode 100644
index 0000000..b31c11d
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fr.js
@@ -0,0 +1,41 @@
+// French [fr]
+import dayjs from '../index';
+var locale = {
+  name: 'fr',
+  weekdays: 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+  weekdaysShort: 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+  weekdaysMin: 'di_lu_ma_me_je_ve_sa'.split('_'),
+  months: 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+  monthsShort: 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'dans %s',
+    past: 'il y a %s',
+    s: 'quelques secondes',
+    m: 'une minute',
+    mm: '%d minutes',
+    h: 'une heure',
+    hh: '%d heures',
+    d: 'un jour',
+    dd: '%d jours',
+    M: 'un mois',
+    MM: '%d mois',
+    y: 'un an',
+    yy: '%d ans'
+  },
+  ordinal: function ordinal(n) {
+    var o = n === 1 ? 'er' : '';
+    return "" + n + o;
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/fy.js b/node_modules/dayjs/esm/locale/fy.js
new file mode 100644
index 0000000..4b9f9de
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/fy.js
@@ -0,0 +1,39 @@
+// Frisian [fy]
+import dayjs from '../index';
+var locale = {
+  name: 'fy',
+  weekdays: 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+  months: 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+  monthsShort: 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'si._mo._ti._wo._to._fr._so.'.split('_'),
+  weekdaysMin: 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD-MM-YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'oer %s',
+    past: '%s lyn',
+    s: 'in pear sekonden',
+    m: 'ien minút',
+    mm: '%d minuten',
+    h: 'ien oere',
+    hh: '%d oeren',
+    d: 'ien dei',
+    dd: '%d dagen',
+    M: 'ien moanne',
+    MM: '%d moannen',
+    y: 'ien jier',
+    yy: '%d jierren'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ga.js b/node_modules/dayjs/esm/locale/ga.js
new file mode 100644
index 0000000..8cdfa9f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ga.js
@@ -0,0 +1,39 @@
+// Irish or Irish Gaelic [ga]
+import dayjs from '../index';
+var locale = {
+  name: 'ga',
+  weekdays: 'Dé Domhnaigh_Dé Luain_Dé Máirt_Dé Céadaoin_Déardaoin_Dé hAoine_Dé Satharn'.split('_'),
+  months: 'Eanáir_Feabhra_Márta_Aibreán_Bealtaine_Méitheamh_Iúil_Lúnasa_Meán Fómhair_Deaireadh Fómhair_Samhain_Nollaig'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Dom_Lua_Mái_Céa_Déa_hAo_Sat'.split('_'),
+  monthsShort: 'Eaná_Feab_Márt_Aibr_Beal_Méit_Iúil_Lúna_Meán_Deai_Samh_Noll'.split('_'),
+  weekdaysMin: 'Do_Lu_Má_Ce_Dé_hA_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'i %s',
+    past: '%s ó shin',
+    s: 'cúpla soicind',
+    m: 'nóiméad',
+    mm: '%d nóiméad',
+    h: 'uair an chloig',
+    hh: '%d uair an chloig',
+    d: 'lá',
+    dd: '%d lá',
+    M: 'mí',
+    MM: '%d mí',
+    y: 'bliain',
+    yy: '%d bliain'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/gd.js b/node_modules/dayjs/esm/locale/gd.js
new file mode 100644
index 0000000..fcf62cd
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/gd.js
@@ -0,0 +1,39 @@
+// Scottish Gaelic [gd]
+import dayjs from '../index';
+var locale = {
+  name: 'gd',
+  weekdays: 'Didòmhnaich_Diluain_Dimàirt_Diciadain_Diardaoin_Dihaoine_Disathairne'.split('_'),
+  months: 'Am Faoilleach_An Gearran_Am Màrt_An Giblean_An Cèitean_An t-Ògmhios_An t-Iuchar_An Lùnastal_An t-Sultain_An Dàmhair_An t-Samhain_An Dùbhlachd'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Did_Dil_Dim_Dic_Dia_Dih_Dis'.split('_'),
+  monthsShort: 'Faoi_Gear_Màrt_Gibl_Cèit_Ògmh_Iuch_Lùn_Sult_Dàmh_Samh_Dùbh'.split('_'),
+  weekdaysMin: 'Dò_Lu_Mà_Ci_Ar_Ha_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'ann an %s',
+    past: 'bho chionn %s',
+    s: 'beagan diogan',
+    m: 'mionaid',
+    mm: '%d mionaidean',
+    h: 'uair',
+    hh: '%d uairean',
+    d: 'latha',
+    dd: '%d latha',
+    M: 'mìos',
+    MM: '%d mìosan',
+    y: 'bliadhna',
+    yy: '%d bliadhna'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/gl.js b/node_modules/dayjs/esm/locale/gl.js
new file mode 100644
index 0000000..23d687f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/gl.js
@@ -0,0 +1,39 @@
+// Galician [gl]
+import dayjs from '../index';
+var locale = {
+  name: 'gl',
+  weekdays: 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),
+  months: 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),
+  monthsShort: 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),
+  weekdaysMin: 'do_lu_ma_mé_xo_ve_sá'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY H:mm',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY H:mm'
+  },
+  relativeTime: {
+    future: 'en %s',
+    past: 'fai %s',
+    s: 'uns segundos',
+    m: 'un minuto',
+    mm: '%d minutos',
+    h: 'unha hora',
+    hh: '%d horas',
+    d: 'un día',
+    dd: '%d días',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un ano',
+    yy: '%d anos'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/gom-latn.js b/node_modules/dayjs/esm/locale/gom-latn.js
new file mode 100644
index 0000000..d621f5b
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/gom-latn.js
@@ -0,0 +1,25 @@
+// Konkani Latin script [gom-latn]
+import dayjs from '../index';
+var locale = {
+  name: 'gom-latn',
+  weekdays: "Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son'var".split('_'),
+  months: 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),
+  monthsShort: 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),
+  weekdaysMin: 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm [vazta]',
+    LTS: 'A h:mm:ss [vazta]',
+    L: 'DD-MM-YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY A h:mm [vazta]',
+    LLLL: 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',
+    llll: 'ddd, D MMM YYYY, A h:mm [vazta]'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/gu.js b/node_modules/dayjs/esm/locale/gu.js
new file mode 100644
index 0000000..e05f44b
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/gu.js
@@ -0,0 +1,38 @@
+// Gujarati [gu]
+import dayjs from '../index';
+var locale = {
+  name: 'gu',
+  weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'),
+  months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'),
+  weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'),
+  monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'),
+  weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm વાગ્યે',
+    LTS: 'A h:mm:ss વાગ્યે',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm વાગ્યે',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે'
+  },
+  relativeTime: {
+    future: '%s મા',
+    past: '%s પેહલા',
+    s: 'અમુક પળો',
+    m: 'એક મિનિટ',
+    mm: '%d મિનિટ',
+    h: 'એક કલાક',
+    hh: '%d કલાક',
+    d: 'એક દિવસ',
+    dd: '%d દિવસ',
+    M: 'એક મહિનો',
+    MM: '%d મહિનો',
+    y: 'એક વર્ષ',
+    yy: '%d વર્ષ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/he.js b/node_modules/dayjs/esm/locale/he.js
new file mode 100644
index 0000000..a8868ff
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/he.js
@@ -0,0 +1,78 @@
+// Hebrew [he]
+import dayjs from '../index';
+var texts = {
+  s: 'מספר שניות',
+  ss: '%d שניות',
+  m: 'דקה',
+  mm: '%d דקות',
+  h: 'שעה',
+  hh: '%d שעות',
+  hh2: 'שעתיים',
+  d: 'יום',
+  dd: '%d ימים',
+  dd2: 'יומיים',
+  M: 'חודש',
+  MM: '%d חודשים',
+  MM2: 'חודשיים',
+  y: 'שנה',
+  yy: '%d שנים',
+  yy2: 'שנתיים'
+};
+
+function relativeTimeFormatter(number, withoutSuffix, key) {
+  var text = texts[key + (number === 2 ? '2' : '')] || texts[key];
+  return text.replace('%d', number);
+}
+
+var locale = {
+  name: 'he',
+  weekdays: 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+  weekdaysShort: 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+  weekdaysMin: 'א׳_ב׳_ג׳_ד׳_ה׳_ו_ש׳'.split('_'),
+  months: 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+  monthsShort: 'ינו_פבר_מרץ_אפר_מאי_יונ_יול_אוג_ספט_אוק_נוב_דצמ'.split('_'),
+  relativeTime: {
+    future: 'בעוד %s',
+    past: 'לפני %s',
+    s: relativeTimeFormatter,
+    m: relativeTimeFormatter,
+    mm: relativeTimeFormatter,
+    h: relativeTimeFormatter,
+    hh: relativeTimeFormatter,
+    d: relativeTimeFormatter,
+    dd: relativeTimeFormatter,
+    M: relativeTimeFormatter,
+    MM: relativeTimeFormatter,
+    y: relativeTimeFormatter,
+    yy: relativeTimeFormatter
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  format: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [ב]MMMM YYYY',
+    LLL: 'D [ב]MMMM YYYY HH:mm',
+    LLLL: 'dddd, D [ב]MMMM YYYY HH:mm',
+    l: 'D/M/YYYY',
+    ll: 'D MMM YYYY',
+    lll: 'D MMM YYYY HH:mm',
+    llll: 'ddd, D MMM YYYY HH:mm'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [ב]MMMM YYYY',
+    LLL: 'D [ב]MMMM YYYY HH:mm',
+    LLLL: 'dddd, D [ב]MMMM YYYY HH:mm',
+    l: 'D/M/YYYY',
+    ll: 'D MMM YYYY',
+    lll: 'D MMM YYYY HH:mm',
+    llll: 'ddd, D MMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/hi.js b/node_modules/dayjs/esm/locale/hi.js
new file mode 100644
index 0000000..e877ed6
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/hi.js
@@ -0,0 +1,38 @@
+// Hindi [hi]
+import dayjs from '../index';
+var locale = {
+  name: 'hi',
+  weekdays: 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+  months: 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+  weekdaysShort: 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+  monthsShort: 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+  weekdaysMin: 'र_सो_मं_बु_गु_शु_श'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm बजे',
+    LTS: 'A h:mm:ss बजे',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm बजे',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm बजे'
+  },
+  relativeTime: {
+    future: '%s में',
+    past: '%s पहले',
+    s: 'कुछ ही क्षण',
+    m: 'एक मिनट',
+    mm: '%d मिनट',
+    h: 'एक घंटा',
+    hh: '%d घंटे',
+    d: 'एक दिन',
+    dd: '%d दिन',
+    M: 'एक महीने',
+    MM: '%d महीने',
+    y: 'एक वर्ष',
+    yy: '%d वर्ष'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/hr.js b/node_modules/dayjs/esm/locale/hr.js
new file mode 100644
index 0000000..a760fe3
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/hr.js
@@ -0,0 +1,53 @@
+// Croatian [hr]
+import dayjs from '../index';
+var monthFormat = 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_');
+var monthStandalone = 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_');
+var MONTHS_IN_FORMAT = /D[oD]?(\[[^[\]]*\]|\s)+MMMM?/;
+
+var months = function months(dayjsInstance, format) {
+  if (MONTHS_IN_FORMAT.test(format)) {
+    return monthFormat[dayjsInstance.month()];
+  }
+
+  return monthStandalone[dayjsInstance.month()];
+};
+
+months.s = monthStandalone;
+months.f = monthFormat;
+var locale = {
+  name: 'hr',
+  weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+  weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+  weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+  months: months,
+  monthsShort: 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd, D. MMMM YYYY H:mm'
+  },
+  relativeTime: {
+    future: 'za %s',
+    past: 'prije %s',
+    s: 'sekunda',
+    m: 'minuta',
+    mm: '%d minuta',
+    h: 'sat',
+    hh: '%d sati',
+    d: 'dan',
+    dd: '%d dana',
+    M: 'mjesec',
+    MM: '%d mjeseci',
+    y: 'godina',
+    yy: '%d godine'
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ht.js b/node_modules/dayjs/esm/locale/ht.js
new file mode 100644
index 0000000..896739e
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ht.js
@@ -0,0 +1,38 @@
+// Haitian Creole (Haiti) [ht]
+import dayjs from '../index';
+var locale = {
+  name: 'ht',
+  weekdays: 'dimanch_lendi_madi_mèkredi_jedi_vandredi_samdi'.split('_'),
+  months: 'janvye_fevriye_mas_avril_me_jen_jiyè_out_septanm_oktòb_novanm_desanm'.split('_'),
+  weekdaysShort: 'dim._len._mad._mèk._jed._van._sam.'.split('_'),
+  monthsShort: 'jan._fev._mas_avr._me_jen_jiyè._out_sept._okt._nov._des.'.split('_'),
+  weekdaysMin: 'di_le_ma_mè_je_va_sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'nan %s',
+    past: 'sa gen %s',
+    s: 'kèk segond',
+    m: 'yon minit',
+    mm: '%d minit',
+    h: 'inèdtan',
+    hh: '%d zè',
+    d: 'yon jou',
+    dd: '%d jou',
+    M: 'yon mwa',
+    MM: '%d mwa',
+    y: 'yon ane',
+    yy: '%d ane'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/hu.js b/node_modules/dayjs/esm/locale/hu.js
new file mode 100644
index 0000000..18df6e4
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/hu.js
@@ -0,0 +1,61 @@
+// Hungarian [hu]
+import dayjs from '../index';
+var locale = {
+  name: 'hu',
+  weekdays: 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+  weekdaysShort: 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+  weekdaysMin: 'v_h_k_sze_cs_p_szo'.split('_'),
+  months: 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+  monthsShort: 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  relativeTime: {
+    future: '%s múlva',
+    past: '%s',
+    s: function s(_, _s, ___, isFuture) {
+      return "n\xE9h\xE1ny m\xE1sodperc" + (isFuture || _s ? '' : 'e');
+    },
+    m: function m(_, s, ___, isFuture) {
+      return "egy perc" + (isFuture || s ? '' : 'e');
+    },
+    mm: function mm(n, s, ___, isFuture) {
+      return n + " perc" + (isFuture || s ? '' : 'e');
+    },
+    h: function h(_, s, ___, isFuture) {
+      return "egy " + (isFuture || s ? 'óra' : 'órája');
+    },
+    hh: function hh(n, s, ___, isFuture) {
+      return n + " " + (isFuture || s ? 'óra' : 'órája');
+    },
+    d: function d(_, s, ___, isFuture) {
+      return "egy " + (isFuture || s ? 'nap' : 'napja');
+    },
+    dd: function dd(n, s, ___, isFuture) {
+      return n + " " + (isFuture || s ? 'nap' : 'napja');
+    },
+    M: function M(_, s, ___, isFuture) {
+      return "egy " + (isFuture || s ? 'hónap' : 'hónapja');
+    },
+    MM: function MM(n, s, ___, isFuture) {
+      return n + " " + (isFuture || s ? 'hónap' : 'hónapja');
+    },
+    y: function y(_, s, ___, isFuture) {
+      return "egy " + (isFuture || s ? 'év' : 'éve');
+    },
+    yy: function yy(n, s, ___, isFuture) {
+      return n + " " + (isFuture || s ? 'év' : 'éve');
+    }
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'YYYY.MM.DD.',
+    LL: 'YYYY. MMMM D.',
+    LLL: 'YYYY. MMMM D. H:mm',
+    LLLL: 'YYYY. MMMM D., dddd H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/hy-am.js b/node_modules/dayjs/esm/locale/hy-am.js
new file mode 100644
index 0000000..937f2be
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/hy-am.js
@@ -0,0 +1,39 @@
+// Armenian [hy-am]
+import dayjs from '../index';
+var locale = {
+  name: 'hy-am',
+  weekdays: 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),
+  months: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+  monthsShort: 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
+  weekdaysMin: 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY թ.',
+    LLL: 'D MMMM YYYY թ., HH:mm',
+    LLLL: 'dddd, D MMMM YYYY թ., HH:mm'
+  },
+  relativeTime: {
+    future: '%s հետո',
+    past: '%s առաջ',
+    s: 'մի քանի վայրկյան',
+    m: 'րոպե',
+    mm: '%d րոպե',
+    h: 'ժամ',
+    hh: '%d ժամ',
+    d: 'օր',
+    dd: '%d օր',
+    M: 'ամիս',
+    MM: '%d ամիս',
+    y: 'տարի',
+    yy: '%d տարի'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/id.js b/node_modules/dayjs/esm/locale/id.js
new file mode 100644
index 0000000..f743a12
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/id.js
@@ -0,0 +1,39 @@
+// Indonesian [id]
+import dayjs from '../index';
+var locale = {
+  name: 'id',
+  weekdays: 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+  months: 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+  weekdaysShort: 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des'.split('_'),
+  weekdaysMin: 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY [pukul] HH.mm',
+    LLLL: 'dddd, D MMMM YYYY [pukul] HH.mm'
+  },
+  relativeTime: {
+    future: 'dalam %s',
+    past: '%s yang lalu',
+    s: 'beberapa detik',
+    m: 'semenit',
+    mm: '%d menit',
+    h: 'sejam',
+    hh: '%d jam',
+    d: 'sehari',
+    dd: '%d hari',
+    M: 'sebulan',
+    MM: '%d bulan',
+    y: 'setahun',
+    yy: '%d tahun'
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/index.d.ts b/node_modules/dayjs/esm/locale/index.d.ts
new file mode 100644
index 0000000..beb0d36
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/index.d.ts
@@ -0,0 +1,11 @@
+/// <reference path="./types.d.ts" />
+
+declare module 'dayjs/esm/locale/*' {
+  namespace locale {
+    interface Locale extends ILocale {}
+  }
+
+  const locale: locale.Locale
+
+  export = locale
+}
diff --git a/node_modules/dayjs/esm/locale/is.js b/node_modules/dayjs/esm/locale/is.js
new file mode 100644
index 0000000..22d8121
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/is.js
@@ -0,0 +1,68 @@
+// Icelandic [is]
+import dayjs from '../index';
+var texts = {
+  s: ['nokkrar sekúndur', 'nokkrar sekúndur', 'nokkrum sekúndum'],
+  m: ['mínúta', 'mínútu', 'mínútu'],
+  mm: ['mínútur', 'mínútur', 'mínútum'],
+  h: ['klukkustund', 'klukkustund', 'klukkustund'],
+  hh: ['klukkustundir', 'klukkustundir', 'klukkustundum'],
+  d: ['dagur', 'dag', 'degi'],
+  dd: ['dagar', 'daga', 'dögum'],
+  M: ['mánuður', 'mánuð', 'mánuði'],
+  MM: ['mánuðir', 'mánuði', 'mánuðum'],
+  y: ['ár', 'ár', 'ári'],
+  yy: ['ár', 'ár', 'árum']
+};
+
+function resolveTemplate(key, number, isFuture, withoutSuffix) {
+  var suffixIndex = isFuture ? 1 : 2;
+  var index = withoutSuffix ? 0 : suffixIndex;
+  var keyShouldBeSingular = key.length === 2 && number % 10 === 1;
+  var correctedKey = keyShouldBeSingular ? key[0] : key;
+  var unitText = texts[correctedKey];
+  var text = unitText[index];
+  return key.length === 1 ? text : "%d " + text;
+}
+
+function relativeTimeFormatter(number, withoutSuffix, key, isFuture) {
+  var template = resolveTemplate(key, number, isFuture, withoutSuffix);
+  return template.replace('%d', number);
+}
+
+var locale = {
+  name: 'is',
+  weekdays: 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+  months: 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+  weekdaysMin: 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY [kl.] H:mm',
+    LLLL: 'dddd, D. MMMM YYYY [kl.] H:mm'
+  },
+  relativeTime: {
+    future: 'eftir %s',
+    past: 'fyrir %s síðan',
+    s: relativeTimeFormatter,
+    m: relativeTimeFormatter,
+    mm: relativeTimeFormatter,
+    h: relativeTimeFormatter,
+    hh: relativeTimeFormatter,
+    d: relativeTimeFormatter,
+    dd: relativeTimeFormatter,
+    M: relativeTimeFormatter,
+    MM: relativeTimeFormatter,
+    y: relativeTimeFormatter,
+    yy: relativeTimeFormatter
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/it-ch.js b/node_modules/dayjs/esm/locale/it-ch.js
new file mode 100644
index 0000000..cfbb94d
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/it-ch.js
@@ -0,0 +1,39 @@
+// Italian (Switzerland) [it-ch]
+import dayjs from '../index';
+var locale = {
+  name: 'it-ch',
+  weekdays: 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
+  months: 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
+  monthsShort: 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+  weekdaysMin: 'do_lu_ma_me_gi_ve_sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'tra %s',
+    past: '%s fa',
+    s: 'alcuni secondi',
+    m: 'un minuto',
+    mm: '%d minuti',
+    h: 'un\'ora',
+    hh: '%d ore',
+    d: 'un giorno',
+    dd: '%d giorni',
+    M: 'un mese',
+    MM: '%d mesi',
+    y: 'un anno',
+    yy: '%d anni'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/it.js b/node_modules/dayjs/esm/locale/it.js
new file mode 100644
index 0000000..e8d2490
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/it.js
@@ -0,0 +1,39 @@
+// Italian [it]
+import dayjs from '../index';
+var locale = {
+  name: 'it',
+  weekdays: 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
+  weekdaysShort: 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
+  weekdaysMin: 'do_lu_ma_me_gi_ve_sa'.split('_'),
+  months: 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+  weekStart: 1,
+  monthsShort: 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'tra %s',
+    past: '%s fa',
+    s: 'qualche secondo',
+    m: 'un minuto',
+    mm: '%d minuti',
+    h: 'un\' ora',
+    hh: '%d ore',
+    d: 'un giorno',
+    dd: '%d giorni',
+    M: 'un mese',
+    MM: '%d mesi',
+    y: 'un anno',
+    yy: '%d anni'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ja.js b/node_modules/dayjs/esm/locale/ja.js
new file mode 100644
index 0000000..6568e13
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ja.js
@@ -0,0 +1,45 @@
+// Japanese [ja]
+import dayjs from '../index';
+var locale = {
+  name: 'ja',
+  weekdays: '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+  weekdaysShort: '日_月_火_水_木_金_土'.split('_'),
+  weekdaysMin: '日_月_火_水_木_金_土'.split('_'),
+  months: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + "\u65E5";
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY/MM/DD',
+    LL: 'YYYY年M月D日',
+    LLL: 'YYYY年M月D日 HH:mm',
+    LLLL: 'YYYY年M月D日 dddd HH:mm',
+    l: 'YYYY/MM/DD',
+    ll: 'YYYY年M月D日',
+    lll: 'YYYY年M月D日 HH:mm',
+    llll: 'YYYY年M月D日(ddd) HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour < 12 ? '午前' : '午後';
+  },
+  relativeTime: {
+    future: '%s後',
+    past: '%s前',
+    s: '数秒',
+    m: '1分',
+    mm: '%d分',
+    h: '1時間',
+    hh: '%d時間',
+    d: '1日',
+    dd: '%d日',
+    M: '1ヶ月',
+    MM: '%dヶ月',
+    y: '1年',
+    yy: '%d年'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/jv.js b/node_modules/dayjs/esm/locale/jv.js
new file mode 100644
index 0000000..81a3f66
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/jv.js
@@ -0,0 +1,39 @@
+// Javanese [jv]
+import dayjs from '../index';
+var locale = {
+  name: 'jv',
+  weekdays: 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+  months: 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+  monthsShort: 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+  weekdaysMin: 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY [pukul] HH.mm',
+    LLLL: 'dddd, D MMMM YYYY [pukul] HH.mm'
+  },
+  relativeTime: {
+    future: 'wonten ing %s',
+    past: '%s ingkang kepengker',
+    s: 'sawetawis detik',
+    m: 'setunggal menit',
+    mm: '%d menit',
+    h: 'setunggal jam',
+    hh: '%d jam',
+    d: 'sedinten',
+    dd: '%d dinten',
+    M: 'sewulan',
+    MM: '%d wulan',
+    y: 'setaun',
+    yy: '%d taun'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ka.js b/node_modules/dayjs/esm/locale/ka.js
new file mode 100644
index 0000000..381fffa
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ka.js
@@ -0,0 +1,39 @@
+// Georgian [ka]
+import dayjs from '../index';
+var locale = {
+  name: 'ka',
+  weekdays: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+  weekdaysShort: 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+  weekdaysMin: 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+  months: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+  monthsShort: 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  },
+  relativeTime: {
+    future: '%s შემდეგ',
+    past: '%s წინ',
+    s: 'წამი',
+    m: 'წუთი',
+    mm: '%d წუთი',
+    h: 'საათი',
+    hh: '%d საათის',
+    d: 'დღეს',
+    dd: '%d დღის განმავლობაში',
+    M: 'თვის',
+    MM: '%d თვის',
+    y: 'წელი',
+    yy: '%d წლის'
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/kk.js b/node_modules/dayjs/esm/locale/kk.js
new file mode 100644
index 0000000..f2ca045
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/kk.js
@@ -0,0 +1,39 @@
+// Kazakh [kk]
+import dayjs from '../index';
+var locale = {
+  name: 'kk',
+  weekdays: 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),
+  weekdaysShort: 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),
+  weekdaysMin: 'жк_дй_сй_ср_бй_жм_сн'.split('_'),
+  months: 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),
+  monthsShort: 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),
+  weekStart: 1,
+  relativeTime: {
+    future: '%s ішінде',
+    past: '%s бұрын',
+    s: 'бірнеше секунд',
+    m: 'бір минут',
+    mm: '%d минут',
+    h: 'бір сағат',
+    hh: '%d сағат',
+    d: 'бір күн',
+    dd: '%d күн',
+    M: 'бір ай',
+    MM: '%d ай',
+    y: 'бір жыл',
+    yy: '%d жыл'
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/km.js b/node_modules/dayjs/esm/locale/km.js
new file mode 100644
index 0000000..7fd185b
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/km.js
@@ -0,0 +1,39 @@
+// Cambodian [km]
+import dayjs from '../index';
+var locale = {
+  name: 'km',
+  weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+  months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
+  monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+  weekdaysMin: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%sទៀត',
+    past: '%sមុន',
+    s: 'ប៉ុន្មានវិនាទី',
+    m: 'មួយនាទី',
+    mm: '%d នាទី',
+    h: 'មួយម៉ោង',
+    hh: '%d ម៉ោង',
+    d: 'មួយថ្ងៃ',
+    dd: '%d ថ្ងៃ',
+    M: 'មួយខែ',
+    MM: '%d ខែ',
+    y: 'មួយឆ្នាំ',
+    yy: '%d ឆ្នាំ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/kn.js b/node_modules/dayjs/esm/locale/kn.js
new file mode 100644
index 0000000..b9ca9b9
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/kn.js
@@ -0,0 +1,38 @@
+// Kannada [kn]
+import dayjs from '../index';
+var locale = {
+  name: 'kn',
+  weekdays: 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),
+  months: 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),
+  weekdaysShort: 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),
+  monthsShort: 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ'.split('_'),
+  weekdaysMin: 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm',
+    LTS: 'A h:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm'
+  },
+  relativeTime: {
+    future: '%s ನಂತರ',
+    past: '%s ಹಿಂದೆ',
+    s: 'ಕೆಲವು ಕ್ಷಣಗಳು',
+    m: 'ಒಂದು ನಿಮಿಷ',
+    mm: '%d ನಿಮಿಷ',
+    h: 'ಒಂದು ಗಂಟೆ',
+    hh: '%d ಗಂಟೆ',
+    d: 'ಒಂದು ದಿನ',
+    dd: '%d ದಿನ',
+    M: 'ಒಂದು ತಿಂಗಳು',
+    MM: '%d ತಿಂಗಳು',
+    y: 'ಒಂದು ವರ್ಷ',
+    yy: '%d ವರ್ಷ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ko.js b/node_modules/dayjs/esm/locale/ko.js
new file mode 100644
index 0000000..cfad49d
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ko.js
@@ -0,0 +1,45 @@
+// Korean [ko]
+import dayjs from '../index';
+var locale = {
+  name: 'ko',
+  weekdays: '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+  weekdaysShort: '일_월_화_수_목_금_토'.split('_'),
+  weekdaysMin: '일_월_화_수_목_금_토'.split('_'),
+  months: '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+  monthsShort: '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + "\uC77C";
+  },
+  formats: {
+    LT: 'A h:mm',
+    LTS: 'A h:mm:ss',
+    L: 'YYYY.MM.DD.',
+    LL: 'YYYY년 MMMM D일',
+    LLL: 'YYYY년 MMMM D일 A h:mm',
+    LLLL: 'YYYY년 MMMM D일 dddd A h:mm',
+    l: 'YYYY.MM.DD.',
+    ll: 'YYYY년 MMMM D일',
+    lll: 'YYYY년 MMMM D일 A h:mm',
+    llll: 'YYYY년 MMMM D일 dddd A h:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour < 12 ? '오전' : '오후';
+  },
+  relativeTime: {
+    future: '%s 후',
+    past: '%s 전',
+    s: '몇 초',
+    m: '1분',
+    mm: '%d분',
+    h: '한 시간',
+    hh: '%d시간',
+    d: '하루',
+    dd: '%d일',
+    M: '한 달',
+    MM: '%d달',
+    y: '일 년',
+    yy: '%d년'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ku.js b/node_modules/dayjs/esm/locale/ku.js
new file mode 100644
index 0000000..e56664e
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ku.js
@@ -0,0 +1,77 @@
+// Kurdish [ku]
+import dayjs from '../index';
+export var englishToArabicNumbersMap = {
+  1: '١',
+  2: '٢',
+  3: '٣',
+  4: '٤',
+  5: '٥',
+  6: '٦',
+  7: '٧',
+  8: '٨',
+  9: '٩',
+  0: '٠'
+};
+var arabicToEnglishNumbersMap = {
+  '١': '1',
+  '٢': '2',
+  '٣': '3',
+  '٤': '4',
+  '٥': '5',
+  '٦': '6',
+  '٧': '7',
+  '٨': '8',
+  '٩': '9',
+  '٠': '0'
+};
+var months = ['کانوونی دووەم', 'شوبات', 'ئادار', 'نیسان', 'ئایار', 'حوزەیران', 'تەممووز', 'ئاب', 'ئەیلوول', 'تشرینی یەکەم', 'تشرینی دووەم', 'کانوونی یەکەم'];
+var locale = {
+  name: 'ku',
+  months: months,
+  monthsShort: months,
+  weekdays: 'یەکشەممە_دووشەممە_سێشەممە_چوارشەممە_پێنجشەممە_هەینی_شەممە'.split('_'),
+  weekdaysShort: 'یەکشەم_دووشەم_سێشەم_چوارشەم_پێنجشەم_هەینی_شەممە'.split('_'),
+  weekStart: 6,
+  weekdaysMin: 'ی_د_س_چ_پ_هـ_ش'.split('_'),
+  preparse: function preparse(string) {
+    return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+      return arabicToEnglishNumbersMap[match];
+    }).replace(/،/g, ',');
+  },
+  postformat: function postformat(string) {
+    return string.replace(/\d/g, function (match) {
+      return englishToArabicNumbersMap[match];
+    }).replace(/,/g, '،');
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  meridiem: function meridiem(hour) {
+    return hour < 12 ? 'پ.ن' : 'د.ن';
+  },
+  relativeTime: {
+    future: 'لە %s',
+    past: 'لەمەوپێش %s',
+    s: 'چەند چرکەیەک',
+    m: 'یەک خولەک',
+    mm: '%d خولەک',
+    h: 'یەک کاتژمێر',
+    hh: '%d کاتژمێر',
+    d: 'یەک ڕۆژ',
+    dd: '%d ڕۆژ',
+    M: 'یەک مانگ',
+    MM: '%d مانگ',
+    y: 'یەک ساڵ',
+    yy: '%d ساڵ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ky.js b/node_modules/dayjs/esm/locale/ky.js
new file mode 100644
index 0000000..fd04477
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ky.js
@@ -0,0 +1,39 @@
+// Kyrgyz [ky]
+import dayjs from '../index';
+var locale = {
+  name: 'ky',
+  weekdays: 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),
+  months: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),
+  monthsShort: 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+  weekdaysMin: 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%s ичинде',
+    past: '%s мурун',
+    s: 'бирнече секунд',
+    m: 'бир мүнөт',
+    mm: '%d мүнөт',
+    h: 'бир саат',
+    hh: '%d саат',
+    d: 'бир күн',
+    dd: '%d күн',
+    M: 'бир ай',
+    MM: '%d ай',
+    y: 'бир жыл',
+    yy: '%d жыл'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/lb.js b/node_modules/dayjs/esm/locale/lb.js
new file mode 100644
index 0000000..21ef4aa
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/lb.js
@@ -0,0 +1,24 @@
+// Luxembourgish [lb]
+import dayjs from '../index';
+var locale = {
+  name: 'lb',
+  weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+  months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+  monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+  weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'H:mm [Auer]',
+    LTS: 'H:mm:ss [Auer]',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm [Auer]',
+    LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/lo.js b/node_modules/dayjs/esm/locale/lo.js
new file mode 100644
index 0000000..7732ec4
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/lo.js
@@ -0,0 +1,38 @@
+// Lao [lo]
+import dayjs from '../index';
+var locale = {
+  name: 'lo',
+  weekdays: 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
+  months: 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
+  weekdaysShort: 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
+  monthsShort: 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
+  weekdaysMin: 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'ວັນdddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'ອີກ %s',
+    past: '%sຜ່ານມາ',
+    s: 'ບໍ່ເທົ່າໃດວິນາທີ',
+    m: '1 ນາທີ',
+    mm: '%d ນາທີ',
+    h: '1 ຊົ່ວໂມງ',
+    hh: '%d ຊົ່ວໂມງ',
+    d: '1 ມື້',
+    dd: '%d ມື້',
+    M: '1 ເດືອນ',
+    MM: '%d ເດືອນ',
+    y: '1 ປີ',
+    yy: '%d ປີ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/lt.js b/node_modules/dayjs/esm/locale/lt.js
new file mode 100644
index 0000000..cb46ca9
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/lt.js
@@ -0,0 +1,70 @@
+// Lithuanian [lt]
+import dayjs from '../index';
+var monthFormat = 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_');
+var monthStandalone = 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'); // eslint-disable-next-line no-useless-escape
+
+var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/;
+
+var months = function months(dayjsInstance, format) {
+  if (MONTHS_IN_FORMAT.test(format)) {
+    return monthFormat[dayjsInstance.month()];
+  }
+
+  return monthStandalone[dayjsInstance.month()];
+};
+
+months.s = monthStandalone;
+months.f = monthFormat;
+var locale = {
+  name: 'lt',
+  weekdays: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),
+  weekdaysShort: 'sek_pir_ant_tre_ket_pen_šeš'.split('_'),
+  weekdaysMin: 's_p_a_t_k_pn_š'.split('_'),
+  months: months,
+  monthsShort: 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  relativeTime: {
+    future: 'už %s',
+    past: 'prieš %s',
+    s: 'kelias sekundes',
+    m: 'minutę',
+    mm: '%d minutes',
+    h: 'valandą',
+    hh: '%d valandas',
+    d: 'dieną',
+    dd: '%d dienas',
+    M: 'mėnesį',
+    MM: '%d mėnesius',
+    y: 'metus',
+    yy: '%d metus'
+  },
+  format: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'YYYY [m.] MMMM D [d.]',
+    LLL: 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+    LLLL: 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
+    l: 'YYYY-MM-DD',
+    ll: 'YYYY [m.] MMMM D [d.]',
+    lll: 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+    llll: 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'YYYY [m.] MMMM D [d.]',
+    LLL: 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+    LLLL: 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
+    l: 'YYYY-MM-DD',
+    ll: 'YYYY [m.] MMMM D [d.]',
+    lll: 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+    llll: 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/lv.js b/node_modules/dayjs/esm/locale/lv.js
new file mode 100644
index 0000000..4b18a61
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/lv.js
@@ -0,0 +1,39 @@
+// Latvian [lv]
+import dayjs from '../index';
+var locale = {
+  name: 'lv',
+  weekdays: 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+  months: 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Sv_P_O_T_C_Pk_S'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+  weekdaysMin: 'Sv_P_O_T_C_Pk_S'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY.',
+    LL: 'YYYY. [gada] D. MMMM',
+    LLL: 'YYYY. [gada] D. MMMM, HH:mm',
+    LLLL: 'YYYY. [gada] D. MMMM, dddd, HH:mm'
+  },
+  relativeTime: {
+    future: 'pēc %s',
+    past: 'pirms %s',
+    s: 'dažām sekundēm',
+    m: 'minūtes',
+    mm: '%d minūtēm',
+    h: 'stundas',
+    hh: '%d stundām',
+    d: 'dienas',
+    dd: '%d dienām',
+    M: 'mēneša',
+    MM: '%d mēnešiem',
+    y: 'gada',
+    yy: '%d gadiem'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/me.js b/node_modules/dayjs/esm/locale/me.js
new file mode 100644
index 0000000..465c0ff
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/me.js
@@ -0,0 +1,24 @@
+// Montenegrin [me]
+import dayjs from '../index';
+var locale = {
+  name: 'me',
+  weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+  months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+  monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
+  weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd, D. MMMM YYYY H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/mi.js b/node_modules/dayjs/esm/locale/mi.js
new file mode 100644
index 0000000..3b56f0e
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/mi.js
@@ -0,0 +1,39 @@
+// Maori [mi]
+import dayjs from '../index';
+var locale = {
+  name: 'mi',
+  weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),
+  months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
+  monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),
+  weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY [i] HH:mm',
+    LLLL: 'dddd, D MMMM YYYY [i] HH:mm'
+  },
+  relativeTime: {
+    future: 'i roto i %s',
+    past: '%s i mua',
+    s: 'te hēkona ruarua',
+    m: 'he meneti',
+    mm: '%d meneti',
+    h: 'te haora',
+    hh: '%d haora',
+    d: 'he ra',
+    dd: '%d ra',
+    M: 'he marama',
+    MM: '%d marama',
+    y: 'he tau',
+    yy: '%d tau'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/mk.js b/node_modules/dayjs/esm/locale/mk.js
new file mode 100644
index 0000000..8522c26
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/mk.js
@@ -0,0 +1,39 @@
+// Macedonian [mk]
+import dayjs from '../index';
+var locale = {
+  name: 'mk',
+  weekdays: 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+  months: 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+  monthsShort: 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+  weekdaysMin: 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'D.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY H:mm',
+    LLLL: 'dddd, D MMMM YYYY H:mm'
+  },
+  relativeTime: {
+    future: 'после %s',
+    past: 'пред %s',
+    s: 'неколку секунди',
+    m: 'минута',
+    mm: '%d минути',
+    h: 'час',
+    hh: '%d часа',
+    d: 'ден',
+    dd: '%d дена',
+    M: 'месец',
+    MM: '%d месеци',
+    y: 'година',
+    yy: '%d години'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ml.js b/node_modules/dayjs/esm/locale/ml.js
new file mode 100644
index 0000000..bfcc277
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ml.js
@@ -0,0 +1,38 @@
+// Malayalam [ml]
+import dayjs from '../index';
+var locale = {
+  name: 'ml',
+  weekdays: 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+  months: 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+  weekdaysShort: 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+  monthsShort: 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+  weekdaysMin: 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm -നു',
+    LTS: 'A h:mm:ss -നു',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm -നു',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm -നു'
+  },
+  relativeTime: {
+    future: '%s കഴിഞ്ഞ്',
+    past: '%s മുൻപ്',
+    s: 'അൽപ നിമിഷങ്ങൾ',
+    m: 'ഒരു മിനിറ്റ്',
+    mm: '%d മിനിറ്റ്',
+    h: 'ഒരു മണിക്കൂർ',
+    hh: '%d മണിക്കൂർ',
+    d: 'ഒരു ദിവസം',
+    dd: '%d ദിവസം',
+    M: 'ഒരു മാസം',
+    MM: '%d മാസം',
+    y: 'ഒരു വർഷം',
+    yy: '%d വർഷം'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/mn.js b/node_modules/dayjs/esm/locale/mn.js
new file mode 100644
index 0000000..d93cae2
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/mn.js
@@ -0,0 +1,38 @@
+// Mongolian [mn]
+import dayjs from '../index';
+var locale = {
+  name: 'mn',
+  weekdays: 'Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба'.split('_'),
+  months: 'Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар'.split('_'),
+  weekdaysShort: 'Ням_Дав_Мяг_Лха_Пүр_Баа_Бям'.split('_'),
+  monthsShort: '1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар'.split('_'),
+  weekdaysMin: 'Ня_Да_Мя_Лх_Пү_Ба_Бя'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'YYYY оны MMMMын D',
+    LLL: 'YYYY оны MMMMын D HH:mm',
+    LLLL: 'dddd, YYYY оны MMMMын D HH:mm'
+  },
+  relativeTime: {
+    future: '%s',
+    past: '%s',
+    s: 'саяхан',
+    m: 'м',
+    mm: '%dм',
+    h: '1ц',
+    hh: '%dц',
+    d: '1ө',
+    dd: '%dө',
+    M: '1с',
+    MM: '%dс',
+    y: '1ж',
+    yy: '%dж'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/mr.js b/node_modules/dayjs/esm/locale/mr.js
new file mode 100644
index 0000000..9eac8a7
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/mr.js
@@ -0,0 +1,23 @@
+// Marathi [mr]
+import dayjs from '../index';
+var locale = {
+  name: 'mr',
+  weekdays: 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+  months: 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+  weekdaysShort: 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+  monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+  weekdaysMin: 'र_सो_मं_बु_गु_शु_श'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm वाजता',
+    LTS: 'A h:mm:ss वाजता',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm वाजता',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm वाजता'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ms-my.js b/node_modules/dayjs/esm/locale/ms-my.js
new file mode 100644
index 0000000..5138219
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ms-my.js
@@ -0,0 +1,39 @@
+// Malay [ms-my]
+import dayjs from '../index';
+var locale = {
+  name: 'ms-my',
+  weekdays: 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+  months: 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+  monthsShort: 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+  weekdaysMin: 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY [pukul] HH.mm',
+    LLLL: 'dddd, D MMMM YYYY [pukul] HH.mm'
+  },
+  relativeTime: {
+    future: 'dalam %s',
+    past: '%s yang lepas',
+    s: 'beberapa saat',
+    m: 'seminit',
+    mm: '%d minit',
+    h: 'sejam',
+    hh: '%d jam',
+    d: 'sehari',
+    dd: '%d hari',
+    M: 'sebulan',
+    MM: '%d bulan',
+    y: 'setahun',
+    yy: '%d tahun'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ms.js b/node_modules/dayjs/esm/locale/ms.js
new file mode 100644
index 0000000..86349f3
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ms.js
@@ -0,0 +1,39 @@
+// Malay [ms]
+import dayjs from '../index';
+var locale = {
+  name: 'ms',
+  weekdays: 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+  weekdaysShort: 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+  weekdaysMin: 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+  months: 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+  monthsShort: 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH.mm',
+    LLLL: 'dddd, D MMMM YYYY HH.mm'
+  },
+  relativeTime: {
+    future: 'dalam %s',
+    past: '%s yang lepas',
+    s: 'beberapa saat',
+    m: 'seminit',
+    mm: '%d minit',
+    h: 'sejam',
+    hh: '%d jam',
+    d: 'sehari',
+    dd: '%d hari',
+    M: 'sebulan',
+    MM: '%d bulan',
+    y: 'setahun',
+    yy: '%d tahun'
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/mt.js b/node_modules/dayjs/esm/locale/mt.js
new file mode 100644
index 0000000..9c90953
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/mt.js
@@ -0,0 +1,39 @@
+// Maltese (Malta) [mt]
+import dayjs from '../index';
+var locale = {
+  name: 'mt',
+  weekdays: 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'),
+  months: 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'),
+  monthsShort: 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'),
+  weekdaysMin: 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'f’ %s',
+    past: '%s ilu',
+    s: 'ftit sekondi',
+    m: 'minuta',
+    mm: '%d minuti',
+    h: 'siegħa',
+    hh: '%d siegħat',
+    d: 'ġurnata',
+    dd: '%d ġranet',
+    M: 'xahar',
+    MM: '%d xhur',
+    y: 'sena',
+    yy: '%d sni'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/my.js b/node_modules/dayjs/esm/locale/my.js
new file mode 100644
index 0000000..73b2633
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/my.js
@@ -0,0 +1,39 @@
+// Burmese [my]
+import dayjs from '../index';
+var locale = {
+  name: 'my',
+  weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+  months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+  monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+  weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'လာမည့် %s မှာ',
+    past: 'လွန်ခဲ့သော %s က',
+    s: 'စက္ကန်.အနည်းငယ်',
+    m: 'တစ်မိနစ်',
+    mm: '%d မိနစ်',
+    h: 'တစ်နာရီ',
+    hh: '%d နာရီ',
+    d: 'တစ်ရက်',
+    dd: '%d ရက်',
+    M: 'တစ်လ',
+    MM: '%d လ',
+    y: 'တစ်နှစ်',
+    yy: '%d နှစ်'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/nb.js b/node_modules/dayjs/esm/locale/nb.js
new file mode 100644
index 0000000..1d7b1eb
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/nb.js
@@ -0,0 +1,40 @@
+// Norwegian Bokmål [nb]
+import dayjs from '../index';
+var locale = {
+  name: 'nb',
+  weekdays: 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+  weekdaysShort: 'sø._ma._ti._on._to._fr._lø.'.split('_'),
+  weekdaysMin: 'sø_ma_ti_on_to_fr_lø'.split('_'),
+  months: 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+  monthsShort: 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY [kl.] HH:mm',
+    LLLL: 'dddd D. MMMM YYYY [kl.] HH:mm'
+  },
+  relativeTime: {
+    future: 'om %s',
+    past: '%s siden',
+    s: 'noen sekunder',
+    m: 'ett minutt',
+    mm: '%d minutter',
+    h: 'en time',
+    hh: '%d timer',
+    d: 'en dag',
+    dd: '%d dager',
+    M: 'en måned',
+    MM: '%d måneder',
+    y: 'ett år',
+    yy: '%d år'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ne.js b/node_modules/dayjs/esm/locale/ne.js
new file mode 100644
index 0000000..4f5a004
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ne.js
@@ -0,0 +1,40 @@
+// Nepalese [ne]
+import dayjs from '../index';
+var locale = {
+  name: 'ne',
+  weekdays: 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+  weekdaysShort: 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+  weekdaysMin: 'आ._सो._मं._बु._बि._शु._श.'.split('_'),
+  months: 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मे_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+  monthsShort: 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+  relativeTime: {
+    future: '%s पछि',
+    past: '%s अघि',
+    s: 'सेकेन्ड',
+    m: 'एक मिनेट',
+    mm: '%d मिनेट',
+    h: 'घन्टा',
+    hh: '%d घन्टा',
+    d: 'एक दिन',
+    dd: '%d दिन',
+    M: 'एक महिना',
+    MM: '%d महिना',
+    y: 'एक वर्ष',
+    yy: '%d वर्ष'
+  },
+  ordinal: function ordinal(n) {
+    return ("" + n).replace(/\d/g, function (i) {
+      return '०१२३४५६७८९'[i];
+    });
+  },
+  formats: {
+    LT: 'Aको h:mm बजे',
+    LTS: 'Aको h:mm:ss बजे',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, Aको h:mm बजे',
+    LLLL: 'dddd, D MMMM YYYY, Aको h:mm बजे'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/nl-be.js b/node_modules/dayjs/esm/locale/nl-be.js
new file mode 100644
index 0000000..51465b7
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/nl-be.js
@@ -0,0 +1,39 @@
+// Dutch (Belgium) [nl-be]
+import dayjs from '../index';
+var locale = {
+  name: 'nl-be',
+  weekdays: 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+  months: 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+  monthsShort: 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'zo._ma._di._wo._do._vr._za.'.split('_'),
+  weekdaysMin: 'zo_ma_di_wo_do_vr_za'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'over %s',
+    past: '%s geleden',
+    s: 'een paar seconden',
+    m: 'één minuut',
+    mm: '%d minuten',
+    h: 'één uur',
+    hh: '%d uur',
+    d: 'één dag',
+    dd: '%d dagen',
+    M: 'één maand',
+    MM: '%d maanden',
+    y: 'één jaar',
+    yy: '%d jaar'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/nl.js b/node_modules/dayjs/esm/locale/nl.js
new file mode 100644
index 0000000..ee1ac74
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/nl.js
@@ -0,0 +1,40 @@
+// Dutch [nl]
+import dayjs from '../index';
+var locale = {
+  name: 'nl',
+  weekdays: 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+  weekdaysShort: 'zo._ma._di._wo._do._vr._za.'.split('_'),
+  weekdaysMin: 'zo_ma_di_wo_do_vr_za'.split('_'),
+  months: 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+  monthsShort: 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+  ordinal: function ordinal(n) {
+    return "[" + n + (n === 1 || n === 8 || n >= 20 ? 'ste' : 'de') + "]";
+  },
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD-MM-YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'over %s',
+    past: '%s geleden',
+    s: 'een paar seconden',
+    m: 'een minuut',
+    mm: '%d minuten',
+    h: 'een uur',
+    hh: '%d uur',
+    d: 'een dag',
+    dd: '%d dagen',
+    M: 'een maand',
+    MM: '%d maanden',
+    y: 'een jaar',
+    yy: '%d jaar'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/nn.js b/node_modules/dayjs/esm/locale/nn.js
new file mode 100644
index 0000000..43767a4
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/nn.js
@@ -0,0 +1,39 @@
+// Nynorsk [nn]
+import dayjs from '../index';
+var locale = {
+  name: 'nn',
+  weekdays: 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+  weekdaysShort: 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+  weekdaysMin: 'su_må_ty_on_to_fr_la'.split('_'),
+  months: 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  relativeTime: {
+    future: 'om %s',
+    past: 'for %s sidan',
+    s: 'nokre sekund',
+    m: 'eitt minutt',
+    mm: '%d minutt',
+    h: 'ein time',
+    hh: '%d timar',
+    d: 'ein dag',
+    dd: '%d dagar',
+    M: 'ein månad',
+    MM: '%d månadar',
+    y: 'eitt år',
+    yy: '%d år'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY [kl.] H:mm',
+    LLLL: 'dddd D. MMMM YYYY [kl.] HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/oc-lnc.js b/node_modules/dayjs/esm/locale/oc-lnc.js
new file mode 100644
index 0000000..91e2f0d
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/oc-lnc.js
@@ -0,0 +1,39 @@
+// Occitan, lengadocian dialecte [oc-lnc]
+import dayjs from '../index';
+var locale = {
+  name: 'oc-lnc',
+  weekdays: 'dimenge_diluns_dimars_dimècres_dijòus_divendres_dissabte'.split('_'),
+  weekdaysShort: 'Dg_Dl_Dm_Dc_Dj_Dv_Ds'.split('_'),
+  weekdaysMin: 'dg_dl_dm_dc_dj_dv_ds'.split('_'),
+  months: 'genièr_febrièr_març_abrial_mai_junh_julhet_agost_setembre_octòbre_novembre_decembre'.split('_'),
+  monthsShort: 'gen_feb_març_abr_mai_junh_julh_ago_set_oct_nov_dec'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM [de] YYYY',
+    LLL: 'D MMMM [de] YYYY [a] H:mm',
+    LLLL: 'dddd D MMMM [de] YYYY [a] H:mm'
+  },
+  relativeTime: {
+    future: 'd\'aquí %s',
+    past: 'fa %s',
+    s: 'unas segondas',
+    m: 'una minuta',
+    mm: '%d minutas',
+    h: 'una ora',
+    hh: '%d oras',
+    d: 'un jorn',
+    dd: '%d jorns',
+    M: 'un mes',
+    MM: '%d meses',
+    y: 'un an',
+    yy: '%d ans'
+  },
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/pa-in.js b/node_modules/dayjs/esm/locale/pa-in.js
new file mode 100644
index 0000000..624a852
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/pa-in.js
@@ -0,0 +1,38 @@
+// Punjabi (India) [pa-in]
+import dayjs from '../index';
+var locale = {
+  name: 'pa-in',
+  weekdays: 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),
+  months: 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
+  weekdaysShort: 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
+  monthsShort: 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
+  weekdaysMin: 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm ਵਜੇ',
+    LTS: 'A h:mm:ss ਵਜੇ',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm ਵਜੇ',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'
+  },
+  relativeTime: {
+    future: '%s ਵਿੱਚ',
+    past: '%s ਪਿਛਲੇ',
+    s: 'ਕੁਝ ਸਕਿੰਟ',
+    m: 'ਇਕ ਮਿੰਟ',
+    mm: '%d ਮਿੰਟ',
+    h: 'ਇੱਕ ਘੰਟਾ',
+    hh: '%d ਘੰਟੇ',
+    d: 'ਇੱਕ ਦਿਨ',
+    dd: '%d ਦਿਨ',
+    M: 'ਇੱਕ ਮਹੀਨਾ',
+    MM: '%d ਮਹੀਨੇ',
+    y: 'ਇੱਕ ਸਾਲ',
+    yy: '%d ਸਾਲ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/pl.js b/node_modules/dayjs/esm/locale/pl.js
new file mode 100644
index 0000000..368b2a5
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/pl.js
@@ -0,0 +1,87 @@
+// Polish [pl]
+import dayjs from '../index';
+
+function plural(n) {
+  return n % 10 < 5 && n % 10 > 1 && ~~(n / 10) % 10 !== 1; // eslint-disable-line
+}
+/* eslint-disable */
+
+
+function translate(number, withoutSuffix, key) {
+  var result = number + " ";
+
+  switch (key) {
+    case 'm':
+      return withoutSuffix ? 'minuta' : 'minutę';
+
+    case 'mm':
+      return result + (plural(number) ? 'minuty' : 'minut');
+
+    case 'h':
+      return withoutSuffix ? 'godzina' : 'godzinę';
+
+    case 'hh':
+      return result + (plural(number) ? 'godziny' : 'godzin');
+
+    case 'MM':
+      return result + (plural(number) ? 'miesiące' : 'miesięcy');
+
+    case 'yy':
+      return result + (plural(number) ? 'lata' : 'lat');
+  }
+}
+/* eslint-enable */
+
+
+var monthFormat = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+var monthStandalone = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_');
+var MONTHS_IN_FORMAT = /D MMMM/;
+
+var months = function months(dayjsInstance, format) {
+  if (MONTHS_IN_FORMAT.test(format)) {
+    return monthFormat[dayjsInstance.month()];
+  }
+
+  return monthStandalone[dayjsInstance.month()];
+};
+
+months.s = monthStandalone;
+months.f = monthFormat;
+var locale = {
+  name: 'pl',
+  weekdays: 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+  weekdaysShort: 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
+  weekdaysMin: 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+  months: months,
+  monthsShort: 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  weekStart: 1,
+  yearStart: 4,
+  relativeTime: {
+    future: 'za %s',
+    past: '%s temu',
+    s: 'kilka sekund',
+    m: translate,
+    mm: translate,
+    h: translate,
+    hh: translate,
+    d: '1 dzień',
+    dd: '%d dni',
+    M: 'miesiąc',
+    MM: translate,
+    y: 'rok',
+    yy: translate
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/pt-br.js b/node_modules/dayjs/esm/locale/pt-br.js
new file mode 100644
index 0000000..0635cd8
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/pt-br.js
@@ -0,0 +1,38 @@
+// Portuguese (Brazil) [pt-br]
+import dayjs from '../index';
+var locale = {
+  name: 'pt-br',
+  weekdays: 'domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado'.split('_'),
+  weekdaysShort: 'dom_seg_ter_qua_qui_sex_sáb'.split('_'),
+  weekdaysMin: 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+  months: 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
+  monthsShort: 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY [às] HH:mm',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
+  },
+  relativeTime: {
+    future: 'em %s',
+    past: 'há %s',
+    s: 'poucos segundos',
+    m: 'um minuto',
+    mm: '%d minutos',
+    h: 'uma hora',
+    hh: '%d horas',
+    d: 'um dia',
+    dd: '%d dias',
+    M: 'um mês',
+    MM: '%d meses',
+    y: 'um ano',
+    yy: '%d anos'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/pt.js b/node_modules/dayjs/esm/locale/pt.js
new file mode 100644
index 0000000..cba2331
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/pt.js
@@ -0,0 +1,40 @@
+// Portuguese [pt]
+import dayjs from '../index';
+var locale = {
+  name: 'pt',
+  weekdays: 'domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado'.split('_'),
+  weekdaysShort: 'dom_seg_ter_qua_qui_sex_sab'.split('_'),
+  weekdaysMin: 'Do_2ª_3ª_4ª_5ª_6ª_Sa'.split('_'),
+  months: 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
+  monthsShort: 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + "\xBA";
+  },
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D [de] MMMM [de] YYYY',
+    LLL: 'D [de] MMMM [de] YYYY [às] HH:mm',
+    LLLL: 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
+  },
+  relativeTime: {
+    future: 'em %s',
+    past: 'há %s',
+    s: 'alguns segundos',
+    m: 'um minuto',
+    mm: '%d minutos',
+    h: 'uma hora',
+    hh: '%d horas',
+    d: 'um dia',
+    dd: '%d dias',
+    M: 'um mês',
+    MM: '%d meses',
+    y: 'um ano',
+    yy: '%d anos'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/rn.js b/node_modules/dayjs/esm/locale/rn.js
new file mode 100644
index 0000000..21b3cdb
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/rn.js
@@ -0,0 +1,39 @@
+// Kirundi [rn]
+import dayjs from '../index';
+var locale = {
+  name: 'rn',
+  weekdays: 'Ku wa Mungu_Ku wa Mbere_Ku wa Kabiri_Ku wa Gatatu_Ku wa Kane_Ku wa Gatanu_Ku wa Gatandatu'.split('_'),
+  weekdaysShort: 'Kngu_Kmbr_Kbri_Ktat_Kkan_Ktan_Kdat'.split('_'),
+  weekdaysMin: 'K7_K1_K2_K3_K4_K5_K6'.split('_'),
+  months: 'Nzero_Ruhuhuma_Ntwarante_Ndamukiza_Rusama_Ruhenshi_Mukakaro_Myandagaro_Nyakanga_Gitugutu_Munyonyo_Kigarama'.split('_'),
+  monthsShort: 'Nzer_Ruhuh_Ntwar_Ndam_Rus_Ruhen_Muk_Myand_Nyak_Git_Muny_Kig'.split('_'),
+  weekStart: 1,
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  relativeTime: {
+    future: 'mu %s',
+    past: '%s',
+    s: 'amasegonda',
+    m: 'Umunota',
+    mm: '%d iminota',
+    h: 'isaha',
+    hh: '%d amasaha',
+    d: 'Umunsi',
+    dd: '%d iminsi',
+    M: 'ukwezi',
+    MM: '%d amezi',
+    y: 'umwaka',
+    yy: '%d imyaka'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ro.js b/node_modules/dayjs/esm/locale/ro.js
new file mode 100644
index 0000000..93ef6bf
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ro.js
@@ -0,0 +1,39 @@
+// Romanian [ro]
+import dayjs from '../index';
+var locale = {
+  name: 'ro',
+  weekdays: 'Duminică_Luni_Marți_Miercuri_Joi_Vineri_Sâmbătă'.split('_'),
+  weekdaysShort: 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+  weekdaysMin: 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+  months: 'Ianuarie_Februarie_Martie_Aprilie_Mai_Iunie_Iulie_August_Septembrie_Octombrie_Noiembrie_Decembrie'.split('_'),
+  monthsShort: 'Ian._Febr._Mart._Apr._Mai_Iun._Iul._Aug._Sept._Oct._Nov._Dec.'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY H:mm',
+    LLLL: 'dddd, D MMMM YYYY H:mm'
+  },
+  relativeTime: {
+    future: 'peste %s',
+    past: 'acum %s',
+    s: 'câteva secunde',
+    m: 'un minut',
+    mm: '%d minute',
+    h: 'o oră',
+    hh: '%d ore',
+    d: 'o zi',
+    dd: '%d zile',
+    M: 'o lună',
+    MM: '%d luni',
+    y: 'un an',
+    yy: '%d ani'
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ru.js b/node_modules/dayjs/esm/locale/ru.js
new file mode 100644
index 0000000..fbb1b35
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ru.js
@@ -0,0 +1,99 @@
+// Russian [ru]
+import dayjs from '../index';
+var monthFormat = 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_');
+var monthStandalone = 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_');
+var monthShortFormat = 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_');
+var monthShortStandalone = 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_');
+var MONTHS_IN_FORMAT = /D[oD]?(\[[^[\]]*\]|\s)+MMMM?/;
+
+function plural(word, num) {
+  var forms = word.split('_');
+  return num % 10 === 1 && num % 100 !== 11 ? forms[0] : num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]; // eslint-disable-line
+}
+
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+  var format = {
+    mm: withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+    hh: 'час_часа_часов',
+    dd: 'день_дня_дней',
+    MM: 'месяц_месяца_месяцев',
+    yy: 'год_года_лет'
+  };
+
+  if (key === 'm') {
+    return withoutSuffix ? 'минута' : 'минуту';
+  }
+
+  return number + " " + plural(format[key], +number);
+}
+
+var months = function months(dayjsInstance, format) {
+  if (MONTHS_IN_FORMAT.test(format)) {
+    return monthFormat[dayjsInstance.month()];
+  }
+
+  return monthStandalone[dayjsInstance.month()];
+};
+
+months.s = monthStandalone;
+months.f = monthFormat;
+
+var monthsShort = function monthsShort(dayjsInstance, format) {
+  if (MONTHS_IN_FORMAT.test(format)) {
+    return monthShortFormat[dayjsInstance.month()];
+  }
+
+  return monthShortStandalone[dayjsInstance.month()];
+};
+
+monthsShort.s = monthShortStandalone;
+monthsShort.f = monthShortFormat;
+var locale = {
+  name: 'ru',
+  weekdays: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+  weekdaysShort: 'вск_пнд_втр_срд_чтв_птн_сбт'.split('_'),
+  weekdaysMin: 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+  months: months,
+  monthsShort: monthsShort,
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY г.',
+    LLL: 'D MMMM YYYY г., H:mm',
+    LLLL: 'dddd, D MMMM YYYY г., H:mm'
+  },
+  relativeTime: {
+    future: 'через %s',
+    past: '%s назад',
+    s: 'несколько секунд',
+    m: relativeTimeWithPlural,
+    mm: relativeTimeWithPlural,
+    h: 'час',
+    hh: relativeTimeWithPlural,
+    d: 'день',
+    dd: relativeTimeWithPlural,
+    M: 'месяц',
+    MM: relativeTimeWithPlural,
+    y: 'год',
+    yy: relativeTimeWithPlural
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  meridiem: function meridiem(hour) {
+    if (hour < 4) {
+      return 'ночи';
+    } else if (hour < 12) {
+      return 'утра';
+    } else if (hour < 17) {
+      return 'дня';
+    }
+
+    return 'вечера';
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/rw.js b/node_modules/dayjs/esm/locale/rw.js
new file mode 100644
index 0000000..1e53ac7
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/rw.js
@@ -0,0 +1,35 @@
+// Kinyarwanda (Rwanda) [rw]
+import dayjs from '../index';
+var locale = {
+  name: 'rw',
+  weekdays: 'Ku Cyumweru_Kuwa Mbere_Kuwa Kabiri_Kuwa Gatatu_Kuwa Kane_Kuwa Gatanu_Kuwa Gatandatu'.split('_'),
+  months: 'Mutarama_Gashyantare_Werurwe_Mata_Gicurasi_Kamena_Nyakanga_Kanama_Nzeri_Ukwakira_Ugushyingo_Ukuboza'.split('_'),
+  relativeTime: {
+    future: 'mu %s',
+    past: '%s',
+    s: 'amasegonda',
+    m: 'Umunota',
+    mm: '%d iminota',
+    h: 'isaha',
+    hh: '%d amasaha',
+    d: 'Umunsi',
+    dd: '%d iminsi',
+    M: 'ukwezi',
+    MM: '%d amezi',
+    y: 'umwaka',
+    yy: '%d imyaka'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sd.js b/node_modules/dayjs/esm/locale/sd.js
new file mode 100644
index 0000000..a429f8d
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sd.js
@@ -0,0 +1,39 @@
+// Sindhi [sd]
+import dayjs from '../index';
+var locale = {
+  name: 'sd',
+  weekdays: 'آچر_سومر_اڱارو_اربع_خميس_جمع_ڇنڇر'.split('_'),
+  months: 'جنوري_فيبروري_مارچ_اپريل_مئي_جون_جولاءِ_آگسٽ_سيپٽمبر_آڪٽوبر_نومبر_ڊسمبر'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'آچر_سومر_اڱارو_اربع_خميس_جمع_ڇنڇر'.split('_'),
+  monthsShort: 'جنوري_فيبروري_مارچ_اپريل_مئي_جون_جولاءِ_آگسٽ_سيپٽمبر_آڪٽوبر_نومبر_ڊسمبر'.split('_'),
+  weekdaysMin: 'آچر_سومر_اڱارو_اربع_خميس_جمع_ڇنڇر'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd، D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%s پوء',
+    past: '%s اڳ',
+    s: 'چند سيڪنڊ',
+    m: 'هڪ منٽ',
+    mm: '%d منٽ',
+    h: 'هڪ ڪلاڪ',
+    hh: '%d ڪلاڪ',
+    d: 'هڪ ڏينهن',
+    dd: '%d ڏينهن',
+    M: 'هڪ مهينو',
+    MM: '%d مهينا',
+    y: 'هڪ سال',
+    yy: '%d سال'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/se.js b/node_modules/dayjs/esm/locale/se.js
new file mode 100644
index 0000000..691099c
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/se.js
@@ -0,0 +1,39 @@
+// Northern Sami [se]
+import dayjs from '../index';
+var locale = {
+  name: 'se',
+  weekdays: 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),
+  months: 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),
+  monthsShort: 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),
+  weekdaysMin: 's_v_m_g_d_b_L'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'MMMM D. [b.] YYYY',
+    LLL: 'MMMM D. [b.] YYYY [ti.] HH:mm',
+    LLLL: 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'
+  },
+  relativeTime: {
+    future: '%s geažes',
+    past: 'maŋit %s',
+    s: 'moadde sekunddat',
+    m: 'okta minuhta',
+    mm: '%d minuhtat',
+    h: 'okta diimmu',
+    hh: '%d diimmut',
+    d: 'okta beaivi',
+    dd: '%d beaivvit',
+    M: 'okta mánnu',
+    MM: '%d mánut',
+    y: 'okta jahki',
+    yy: '%d jagit'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/si.js b/node_modules/dayjs/esm/locale/si.js
new file mode 100644
index 0000000..89b67bf
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/si.js
@@ -0,0 +1,38 @@
+// Sinhalese [si]
+import dayjs from '../index';
+var locale = {
+  name: 'si',
+  weekdays: 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+  months: 'දුරුතු_නවම්_මැදින්_බක්_වෙසක්_පොසොන්_ඇසළ_නිකිණි_බිනර_වප්_ඉල්_උඳුවප්'.split('_'),
+  weekdaysShort: 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+  monthsShort: 'දුරු_නව_මැදි_බක්_වෙස_පොසො_ඇස_නිකි_බින_වප්_ඉල්_උඳු'.split('_'),
+  weekdaysMin: 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'a h:mm',
+    LTS: 'a h:mm:ss',
+    L: 'YYYY/MM/DD',
+    LL: 'YYYY MMMM D',
+    LLL: 'YYYY MMMM D, a h:mm',
+    LLLL: 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'
+  },
+  relativeTime: {
+    future: '%sකින්',
+    past: '%sකට පෙර',
+    s: 'තත්පර කිහිපය',
+    m: 'විනාඩිය',
+    mm: 'විනාඩි %d',
+    h: 'පැය',
+    hh: 'පැය %d',
+    d: 'දිනය',
+    dd: 'දින %d',
+    M: 'මාසය',
+    MM: 'මාස %d',
+    y: 'වසර',
+    yy: 'වසර %d'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sk.js b/node_modules/dayjs/esm/locale/sk.js
new file mode 100644
index 0000000..222401f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sk.js
@@ -0,0 +1,121 @@
+// Slovak [sk]
+import dayjs from '../index';
+
+function plural(n) {
+  return n > 1 && n < 5 && ~~(n / 10) !== 1; // eslint-disable-line
+}
+/* eslint-disable */
+
+
+function translate(number, withoutSuffix, key, isFuture) {
+  var result = number + " ";
+
+  switch (key) {
+    case 's':
+      // a few seconds / in a few seconds / a few seconds ago
+      return withoutSuffix || isFuture ? 'pár sekúnd' : 'pár sekundami';
+
+    case 'm':
+      // a minute / in a minute / a minute ago
+      return withoutSuffix ? 'minúta' : isFuture ? 'minútu' : 'minútou';
+
+    case 'mm':
+      // 9 minutes / in 9 minutes / 9 minutes ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'minúty' : 'minút');
+      }
+
+      return result + "min\xFAtami";
+
+    case 'h':
+      // an hour / in an hour / an hour ago
+      return withoutSuffix ? 'hodina' : isFuture ? 'hodinu' : 'hodinou';
+
+    case 'hh':
+      // 9 hours / in 9 hours / 9 hours ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'hodiny' : 'hodín');
+      }
+
+      return result + "hodinami";
+
+    case 'd':
+      // a day / in a day / a day ago
+      return withoutSuffix || isFuture ? 'deň' : 'dňom';
+
+    case 'dd':
+      // 9 days / in 9 days / 9 days ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'dni' : 'dní');
+      }
+
+      return result + "d\u0148ami";
+
+    case 'M':
+      // a month / in a month / a month ago
+      return withoutSuffix || isFuture ? 'mesiac' : 'mesiacom';
+
+    case 'MM':
+      // 9 months / in 9 months / 9 months ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'mesiace' : 'mesiacov');
+      }
+
+      return result + "mesiacmi";
+
+    case 'y':
+      // a year / in a year / a year ago
+      return withoutSuffix || isFuture ? 'rok' : 'rokom';
+
+    case 'yy':
+      // 9 years / in 9 years / 9 years ago
+      if (withoutSuffix || isFuture) {
+        return result + (plural(number) ? 'roky' : 'rokov');
+      }
+
+      return result + "rokmi";
+  }
+}
+/* eslint-enable */
+
+
+var locale = {
+  name: 'sk',
+  weekdays: 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+  weekdaysShort: 'ne_po_ut_st_št_pi_so'.split('_'),
+  weekdaysMin: 'ne_po_ut_st_št_pi_so'.split('_'),
+  months: 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd D. MMMM YYYY H:mm',
+    l: 'D. M. YYYY'
+  },
+  relativeTime: {
+    future: 'za %s',
+    // Should be `o %s` (change when moment/moment#5408 is fixed)
+    past: 'pred %s',
+    s: translate,
+    m: translate,
+    mm: translate,
+    h: translate,
+    hh: translate,
+    d: translate,
+    dd: translate,
+    M: translate,
+    MM: translate,
+    y: translate,
+    yy: translate
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sl.js b/node_modules/dayjs/esm/locale/sl.js
new file mode 100644
index 0000000..e3c5839
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sl.js
@@ -0,0 +1,141 @@
+// Slovenian [sl]
+import dayjs from '../index';
+
+function dual(n) {
+  return n % 100 == 2; // eslint-disable-line
+}
+
+function threeFour(n) {
+  return n % 100 == 3 || n % 100 == 4; // eslint-disable-line
+}
+/* eslint-disable */
+
+
+function translate(number, withoutSuffix, key, isFuture) {
+  var result = number + " ";
+
+  switch (key) {
+    case 's':
+      // a few seconds / in a few seconds / a few seconds ago
+      return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+
+    case 'm':
+      // a minute / in a minute / a minute ago
+      return withoutSuffix ? 'ena minuta' : 'eno minuto';
+
+    case 'mm':
+      // 9 minutes / in 9 minutes / 9 minutes ago
+      if (dual(number)) {
+        return result + (withoutSuffix || isFuture ? 'minuti' : 'minutama');
+      }
+
+      if (threeFour(number)) {
+        return result + (withoutSuffix || isFuture ? 'minute' : 'minutami');
+      }
+
+      return result + (withoutSuffix || isFuture ? 'minut' : 'minutami');
+
+    case 'h':
+      // an hour / in an hour / an hour ago
+      return withoutSuffix ? 'ena ura' : isFuture ? 'eno uro' : 'eno uro';
+
+    case 'hh':
+      // 9 hours / in 9 hours / 9 hours ago
+      if (dual(number)) {
+        return result + (withoutSuffix || isFuture ? 'uri' : 'urama');
+      }
+
+      if (threeFour(number)) {
+        return result + (withoutSuffix || isFuture ? 'ure' : 'urami');
+      }
+
+      return result + (withoutSuffix || isFuture ? 'ur' : 'urami');
+
+    case 'd':
+      // a day / in a day / a day ago
+      return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+
+    case 'dd':
+      // 9 days / in 9 days / 9 days ago
+      if (dual(number)) {
+        return result + (withoutSuffix || isFuture ? 'dneva' : 'dnevoma');
+      }
+
+      return result + (withoutSuffix || isFuture ? 'dni' : 'dnevi');
+
+    case 'M':
+      // a month / in a month / a month ago
+      return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+
+    case 'MM':
+      // 9 months / in 9 months / 9 months ago
+      if (dual(number)) {
+        // 2 minutes / in 2 minutes
+        return result + (withoutSuffix || isFuture ? 'meseca' : 'mesecema');
+      }
+
+      if (threeFour(number)) {
+        return result + (withoutSuffix || isFuture ? 'mesece' : 'meseci');
+      }
+
+      return result + (withoutSuffix || isFuture ? 'mesecev' : 'meseci');
+
+    case 'y':
+      // a year / in a year / a year ago
+      return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+
+    case 'yy':
+      // 9 years / in 9 years / 9 years ago
+      if (dual(number)) {
+        // 2 minutes / in 2 minutes
+        return result + (withoutSuffix || isFuture ? 'leti' : 'letoma');
+      }
+
+      if (threeFour(number)) {
+        return result + (withoutSuffix || isFuture ? 'leta' : 'leti');
+      }
+
+      return result + (withoutSuffix || isFuture ? 'let' : 'leti');
+  }
+}
+/* eslint-enable */
+
+
+var locale = {
+  name: 'sl',
+  weekdays: 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+  months: 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+  monthsShort: 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+  weekdaysMin: 'ne_po_to_sr_če_pe_so'.split('_'),
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY H:mm',
+    LLLL: 'dddd, D. MMMM YYYY H:mm',
+    l: 'D. M. YYYY'
+  },
+  relativeTime: {
+    future: 'čez %s',
+    past: 'pred %s',
+    s: translate,
+    m: translate,
+    mm: translate,
+    h: translate,
+    hh: translate,
+    d: translate,
+    dd: translate,
+    M: translate,
+    MM: translate,
+    y: translate,
+    yy: translate
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sq.js b/node_modules/dayjs/esm/locale/sq.js
new file mode 100644
index 0000000..625b701
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sq.js
@@ -0,0 +1,39 @@
+// Albanian [sq]
+import dayjs from '../index';
+var locale = {
+  name: 'sq',
+  weekdays: 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+  months: 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+  monthsShort: 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+  weekdaysMin: 'D_H_Ma_Më_E_P_Sh'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'në %s',
+    past: '%s më parë',
+    s: 'disa sekonda',
+    m: 'një minutë',
+    mm: '%d minuta',
+    h: 'një orë',
+    hh: '%d orë',
+    d: 'një ditë',
+    dd: '%d ditë',
+    M: 'një muaj',
+    MM: '%d muaj',
+    y: 'një vit',
+    yy: '%d vite'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sr-cyrl.js b/node_modules/dayjs/esm/locale/sr-cyrl.js
new file mode 100644
index 0000000..2e40d51
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sr-cyrl.js
@@ -0,0 +1,74 @@
+// Serbian Cyrillic [sr-cyrl]
+import dayjs from '../index';
+var translator = {
+  words: {
+    m: ['један минут', 'једног минута'],
+    mm: ['%d минут', '%d минута', '%d минута'],
+    h: ['један сат', 'једног сата'],
+    hh: ['%d сат', '%d сата', '%d сати'],
+    d: ['један дан', 'једног дана'],
+    dd: ['%d дан', '%d дана', '%d дана'],
+    M: ['један месец', 'једног месеца'],
+    MM: ['%d месец', '%d месеца', '%d месеци'],
+    y: ['једну годину', 'једне године'],
+    yy: ['%d годину', '%d године', '%d година']
+  },
+  correctGrammarCase: function correctGrammarCase(number, wordKey) {
+    if (number % 10 >= 1 && number % 10 <= 4 && (number % 100 < 10 || number % 100 >= 20)) {
+      return number % 10 === 1 ? wordKey[0] : wordKey[1];
+    }
+
+    return wordKey[2];
+  },
+  relativeTimeFormatter: function relativeTimeFormatter(number, withoutSuffix, key, isFuture) {
+    var wordKey = translator.words[key];
+
+    if (key.length === 1) {
+      // Nominativ
+      if (key === 'y' && withoutSuffix) return 'једна година';
+      return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
+    }
+
+    var word = translator.correctGrammarCase(number, wordKey); // Nominativ
+
+    if (key === 'yy' && withoutSuffix && word === '%d годину') return number + " \u0433\u043E\u0434\u0438\u043D\u0430";
+    return word.replace('%d', number);
+  }
+};
+var locale = {
+  name: 'sr-cyrl',
+  weekdays: 'Недеља_Понедељак_Уторак_Среда_Четвртак_Петак_Субота'.split('_'),
+  weekdaysShort: 'Нед._Пон._Уто._Сре._Чет._Пет._Суб.'.split('_'),
+  weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),
+  months: 'Јануар_Фебруар_Март_Април_Мај_Јун_Јул_Август_Септембар_Октобар_Новембар_Децембар'.split('_'),
+  monthsShort: 'Јан._Феб._Мар._Апр._Мај_Јун_Јул_Авг._Сеп._Окт._Нов._Дец.'.split('_'),
+  weekStart: 1,
+  relativeTime: {
+    future: 'за %s',
+    past: 'пре %s',
+    s: 'неколико секунди',
+    m: translator.relativeTimeFormatter,
+    mm: translator.relativeTimeFormatter,
+    h: translator.relativeTimeFormatter,
+    hh: translator.relativeTimeFormatter,
+    d: translator.relativeTimeFormatter,
+    dd: translator.relativeTimeFormatter,
+    M: translator.relativeTimeFormatter,
+    MM: translator.relativeTimeFormatter,
+    y: translator.relativeTimeFormatter,
+    yy: translator.relativeTimeFormatter
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'D. M. YYYY.',
+    LL: 'D. MMMM YYYY.',
+    LLL: 'D. MMMM YYYY. H:mm',
+    LLLL: 'dddd, D. MMMM YYYY. H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sr.js b/node_modules/dayjs/esm/locale/sr.js
new file mode 100644
index 0000000..f5174ce
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sr.js
@@ -0,0 +1,74 @@
+// Serbian [sr]
+import dayjs from '../index';
+var translator = {
+  words: {
+    m: ['jedan minut', 'jednog minuta'],
+    mm: ['%d minut', '%d minuta', '%d minuta'],
+    h: ['jedan sat', 'jednog sata'],
+    hh: ['%d sat', '%d sata', '%d sati'],
+    d: ['jedan dan', 'jednog dana'],
+    dd: ['%d dan', '%d dana', '%d dana'],
+    M: ['jedan mesec', 'jednog meseca'],
+    MM: ['%d mesec', '%d meseca', '%d meseci'],
+    y: ['jednu godinu', 'jedne godine'],
+    yy: ['%d godinu', '%d godine', '%d godina']
+  },
+  correctGrammarCase: function correctGrammarCase(number, wordKey) {
+    if (number % 10 >= 1 && number % 10 <= 4 && (number % 100 < 10 || number % 100 >= 20)) {
+      return number % 10 === 1 ? wordKey[0] : wordKey[1];
+    }
+
+    return wordKey[2];
+  },
+  relativeTimeFormatter: function relativeTimeFormatter(number, withoutSuffix, key, isFuture) {
+    var wordKey = translator.words[key];
+
+    if (key.length === 1) {
+      // Nominativ
+      if (key === 'y' && withoutSuffix) return 'jedna godina';
+      return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
+    }
+
+    var word = translator.correctGrammarCase(number, wordKey); // Nominativ
+
+    if (key === 'yy' && withoutSuffix && word === '%d godinu') return number + " godina";
+    return word.replace('%d', number);
+  }
+};
+var locale = {
+  name: 'sr',
+  weekdays: 'Nedelja_Ponedeljak_Utorak_Sreda_Četvrtak_Petak_Subota'.split('_'),
+  weekdaysShort: 'Ned._Pon._Uto._Sre._Čet._Pet._Sub.'.split('_'),
+  weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+  months: 'Januar_Februar_Mart_April_Maj_Jun_Jul_Avgust_Septembar_Oktobar_Novembar_Decembar'.split('_'),
+  monthsShort: 'Jan._Feb._Mar._Apr._Maj_Jun_Jul_Avg._Sep._Okt._Nov._Dec.'.split('_'),
+  weekStart: 1,
+  relativeTime: {
+    future: 'za %s',
+    past: 'pre %s',
+    s: 'nekoliko sekundi',
+    m: translator.relativeTimeFormatter,
+    mm: translator.relativeTimeFormatter,
+    h: translator.relativeTimeFormatter,
+    hh: translator.relativeTimeFormatter,
+    d: translator.relativeTimeFormatter,
+    dd: translator.relativeTimeFormatter,
+    M: translator.relativeTimeFormatter,
+    MM: translator.relativeTimeFormatter,
+    y: translator.relativeTimeFormatter,
+    yy: translator.relativeTimeFormatter
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  },
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'D. M. YYYY.',
+    LL: 'D. MMMM YYYY.',
+    LLL: 'D. MMMM YYYY. H:mm',
+    LLLL: 'dddd, D. MMMM YYYY. H:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ss.js b/node_modules/dayjs/esm/locale/ss.js
new file mode 100644
index 0000000..4354a48
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ss.js
@@ -0,0 +1,39 @@
+// siSwati [ss]
+import dayjs from '../index';
+var locale = {
+  name: 'ss',
+  weekdays: 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),
+  months: "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),
+  monthsShort: 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),
+  weekdaysMin: 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'nga %s',
+    past: 'wenteka nga %s',
+    s: 'emizuzwana lomcane',
+    m: 'umzuzu',
+    mm: '%d emizuzu',
+    h: 'lihora',
+    hh: '%d emahora',
+    d: 'lilanga',
+    dd: '%d emalanga',
+    M: 'inyanga',
+    MM: '%d tinyanga',
+    y: 'umnyaka',
+    yy: '%d iminyaka'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sv-fi.js b/node_modules/dayjs/esm/locale/sv-fi.js
new file mode 100644
index 0000000..a18977f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sv-fi.js
@@ -0,0 +1,46 @@
+// Finland Swedish [sv-fi]
+import dayjs from '../index';
+var locale = {
+  name: 'sv-fi',
+  weekdays: 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+  weekdaysShort: 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+  weekdaysMin: 'sö_må_ti_on_to_fr_lö'.split('_'),
+  months: 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  ordinal: function ordinal(n) {
+    var b = n % 10;
+    var o = b === 1 || b === 2 ? 'a' : 'e';
+    return "[" + n + o + "]";
+  },
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM YYYY',
+    LLL: 'D. MMMM YYYY, [kl.] HH.mm',
+    LLLL: 'dddd, D. MMMM YYYY, [kl.] HH.mm',
+    l: 'D.M.YYYY',
+    ll: 'D. MMM YYYY',
+    lll: 'D. MMM YYYY, [kl.] HH.mm',
+    llll: 'ddd, D. MMM YYYY, [kl.] HH.mm'
+  },
+  relativeTime: {
+    future: 'om %s',
+    past: 'för %s sedan',
+    s: 'några sekunder',
+    m: 'en minut',
+    mm: '%d minuter',
+    h: 'en timme',
+    hh: '%d timmar',
+    d: 'en dag',
+    dd: '%d dagar',
+    M: 'en månad',
+    MM: '%d månader',
+    y: 'ett år',
+    yy: '%d år'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sv.js b/node_modules/dayjs/esm/locale/sv.js
new file mode 100644
index 0000000..2563ee7
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sv.js
@@ -0,0 +1,44 @@
+// Swedish [sv]
+import dayjs from '../index';
+var locale = {
+  name: 'sv',
+  weekdays: 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+  weekdaysShort: 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+  weekdaysMin: 'sö_må_ti_on_to_fr_lö'.split('_'),
+  months: 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+  monthsShort: 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+  weekStart: 1,
+  yearStart: 4,
+  ordinal: function ordinal(n) {
+    var b = n % 10;
+    var o = b === 1 || b === 2 ? 'a' : 'e';
+    return "[" + n + o + "]";
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY [kl.] HH:mm',
+    LLLL: 'dddd D MMMM YYYY [kl.] HH:mm',
+    lll: 'D MMM YYYY HH:mm',
+    llll: 'ddd D MMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'om %s',
+    past: 'för %s sedan',
+    s: 'några sekunder',
+    m: 'en minut',
+    mm: '%d minuter',
+    h: 'en timme',
+    hh: '%d timmar',
+    d: 'en dag',
+    dd: '%d dagar',
+    M: 'en månad',
+    MM: '%d månader',
+    y: 'ett år',
+    yy: '%d år'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/sw.js b/node_modules/dayjs/esm/locale/sw.js
new file mode 100644
index 0000000..287bf33
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/sw.js
@@ -0,0 +1,39 @@
+// Swahili [sw]
+import dayjs from '../index';
+var locale = {
+  name: 'sw',
+  weekdays: 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),
+  weekdaysShort: 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),
+  weekdaysMin: 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),
+  months: 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),
+  monthsShort: 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),
+  weekStart: 1,
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  relativeTime: {
+    future: '%s baadaye',
+    past: 'tokea %s',
+    s: 'hivi punde',
+    m: 'dakika moja',
+    mm: 'dakika %d',
+    h: 'saa limoja',
+    hh: 'masaa %d',
+    d: 'siku moja',
+    dd: 'masiku %d',
+    M: 'mwezi mmoja',
+    MM: 'miezi %d',
+    y: 'mwaka mmoja',
+    yy: 'miaka %d'
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ta.js b/node_modules/dayjs/esm/locale/ta.js
new file mode 100644
index 0000000..6df25f8
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ta.js
@@ -0,0 +1,38 @@
+// Tamil [ta]
+import dayjs from '../index';
+var locale = {
+  name: 'ta',
+  weekdays: 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+  months: 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+  weekdaysShort: 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+  monthsShort: 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+  weekdaysMin: 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, HH:mm',
+    LLLL: 'dddd, D MMMM YYYY, HH:mm'
+  },
+  relativeTime: {
+    future: '%s இல்',
+    past: '%s முன்',
+    s: 'ஒரு சில விநாடிகள்',
+    m: 'ஒரு நிமிடம்',
+    mm: '%d நிமிடங்கள்',
+    h: 'ஒரு மணி நேரம்',
+    hh: '%d மணி நேரம்',
+    d: 'ஒரு நாள்',
+    dd: '%d நாட்கள்',
+    M: 'ஒரு மாதம்',
+    MM: '%d மாதங்கள்',
+    y: 'ஒரு வருடம்',
+    yy: '%d ஆண்டுகள்'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/te.js b/node_modules/dayjs/esm/locale/te.js
new file mode 100644
index 0000000..392a247
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/te.js
@@ -0,0 +1,38 @@
+// Telugu [te]
+import dayjs from '../index';
+var locale = {
+  name: 'te',
+  weekdays: 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),
+  months: 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జులై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),
+  weekdaysShort: 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),
+  monthsShort: 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జులై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),
+  weekdaysMin: 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'A h:mm',
+    LTS: 'A h:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY, A h:mm',
+    LLLL: 'dddd, D MMMM YYYY, A h:mm'
+  },
+  relativeTime: {
+    future: '%s లో',
+    past: '%s క్రితం',
+    s: 'కొన్ని క్షణాలు',
+    m: 'ఒక నిమిషం',
+    mm: '%d నిమిషాలు',
+    h: 'ఒక గంట',
+    hh: '%d గంటలు',
+    d: 'ఒక రోజు',
+    dd: '%d రోజులు',
+    M: 'ఒక నెల',
+    MM: '%d నెలలు',
+    y: 'ఒక సంవత్సరం',
+    yy: '%d సంవత్సరాలు'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tet.js b/node_modules/dayjs/esm/locale/tet.js
new file mode 100644
index 0000000..ff83eea
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tet.js
@@ -0,0 +1,39 @@
+// Tetun Dili (East Timor) [tet]
+import dayjs from '../index';
+var locale = {
+  name: 'tet',
+  weekdays: 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu'.split('_'),
+  months: 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Dom_Seg_Ters_Kua_Kint_Sest_Sab'.split('_'),
+  monthsShort: 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+  weekdaysMin: 'Do_Seg_Te_Ku_Ki_Ses_Sa'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'iha %s',
+    past: '%s liuba',
+    s: 'minutu balun',
+    m: 'minutu ida',
+    mm: 'minutu %d',
+    h: 'oras ida',
+    hh: 'oras %d',
+    d: 'loron ida',
+    dd: 'loron %d',
+    M: 'fulan ida',
+    MM: 'fulan %d',
+    y: 'tinan ida',
+    yy: 'tinan %d'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tg.js b/node_modules/dayjs/esm/locale/tg.js
new file mode 100644
index 0000000..536df0b
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tg.js
@@ -0,0 +1,39 @@
+// Tajik [tg]
+import dayjs from '../index';
+var locale = {
+  name: 'tg',
+  weekdays: 'якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе'.split('_'),
+  months: 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'яшб_дшб_сшб_чшб_пшб_ҷум_шнб'.split('_'),
+  monthsShort: 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+  weekdaysMin: 'яш_дш_сш_чш_пш_ҷм_шб'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'баъди %s',
+    past: '%s пеш',
+    s: 'якчанд сония',
+    m: 'як дақиқа',
+    mm: '%d дақиқа',
+    h: 'як соат',
+    hh: '%d соат',
+    d: 'як рӯз',
+    dd: '%d рӯз',
+    M: 'як моҳ',
+    MM: '%d моҳ',
+    y: 'як сол',
+    yy: '%d сол'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/th.js b/node_modules/dayjs/esm/locale/th.js
new file mode 100644
index 0000000..5cbcdf2
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/th.js
@@ -0,0 +1,38 @@
+// Thai [th]
+import dayjs from '../index';
+var locale = {
+  name: 'th',
+  weekdays: 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+  weekdaysShort: 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'),
+  weekdaysMin: 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+  months: 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+  monthsShort: 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),
+  formats: {
+    LT: 'H:mm',
+    LTS: 'H:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY เวลา H:mm',
+    LLLL: 'วันddddที่ D MMMM YYYY เวลา H:mm'
+  },
+  relativeTime: {
+    future: 'อีก %s',
+    past: '%sที่แล้ว',
+    s: 'ไม่กี่วินาที',
+    m: '1 นาที',
+    mm: '%d นาที',
+    h: '1 ชั่วโมง',
+    hh: '%d ชั่วโมง',
+    d: '1 วัน',
+    dd: '%d วัน',
+    M: '1 เดือน',
+    MM: '%d เดือน',
+    y: '1 ปี',
+    yy: '%d ปี'
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tk.js b/node_modules/dayjs/esm/locale/tk.js
new file mode 100644
index 0000000..93390f1
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tk.js
@@ -0,0 +1,39 @@
+// Turkmen [tk]
+import dayjs from '../index';
+var locale = {
+  name: 'tk',
+  weekdays: 'Ýekşenbe_Duşenbe_Sişenbe_Çarşenbe_Penşenbe_Anna_Şenbe'.split('_'),
+  weekdaysShort: 'Ýek_Duş_Siş_Çar_Pen_Ann_Şen'.split('_'),
+  weekdaysMin: 'Ýk_Dş_Sş_Çr_Pn_An_Şn'.split('_'),
+  months: 'Ýanwar_Fewral_Mart_Aprel_Maý_Iýun_Iýul_Awgust_Sentýabr_Oktýabr_Noýabr_Dekabr'.split('_'),
+  monthsShort: 'Ýan_Few_Mar_Apr_Maý_Iýn_Iýl_Awg_Sen_Okt_Noý_Dek'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%s soň',
+    past: '%s öň',
+    s: 'birnäçe sekunt',
+    m: 'bir minut',
+    mm: '%d minut',
+    h: 'bir sagat',
+    hh: '%d sagat',
+    d: 'bir gün',
+    dd: '%d gün',
+    M: 'bir aý',
+    MM: '%d aý',
+    y: 'bir ýyl',
+    yy: '%d ýyl'
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tl-ph.js b/node_modules/dayjs/esm/locale/tl-ph.js
new file mode 100644
index 0000000..0fa84f3
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tl-ph.js
@@ -0,0 +1,39 @@
+// Tagalog (Philippines) [tl-ph]
+import dayjs from '../index';
+var locale = {
+  name: 'tl-ph',
+  weekdays: 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+  months: 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+  monthsShort: 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+  weekdaysMin: 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'MM/D/YYYY',
+    LL: 'MMMM D, YYYY',
+    LLL: 'MMMM D, YYYY HH:mm',
+    LLLL: 'dddd, MMMM DD, YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'sa loob ng %s',
+    past: '%s ang nakalipas',
+    s: 'ilang segundo',
+    m: 'isang minuto',
+    mm: '%d minuto',
+    h: 'isang oras',
+    hh: '%d oras',
+    d: 'isang araw',
+    dd: '%d araw',
+    M: 'isang buwan',
+    MM: '%d buwan',
+    y: 'isang taon',
+    yy: '%d taon'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tlh.js b/node_modules/dayjs/esm/locale/tlh.js
new file mode 100644
index 0000000..30f52fe
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tlh.js
@@ -0,0 +1,24 @@
+// Klingon [tlh]
+import dayjs from '../index';
+var locale = {
+  name: 'tlh',
+  weekdays: 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+  months: 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+  monthsShort: 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),
+  weekdaysMin: 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tr.js b/node_modules/dayjs/esm/locale/tr.js
new file mode 100644
index 0000000..e7fe24f
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tr.js
@@ -0,0 +1,39 @@
+// Turkish [tr]
+import dayjs from '../index';
+var locale = {
+  name: 'tr',
+  weekdays: 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+  weekdaysShort: 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+  weekdaysMin: 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+  months: 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+  monthsShort: 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+  weekStart: 1,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%s sonra',
+    past: '%s önce',
+    s: 'birkaç saniye',
+    m: 'bir dakika',
+    mm: '%d dakika',
+    h: 'bir saat',
+    hh: '%d saat',
+    d: 'bir gün',
+    dd: '%d gün',
+    M: 'bir ay',
+    MM: '%d ay',
+    y: 'bir yıl',
+    yy: '%d yıl'
+  },
+  ordinal: function ordinal(n) {
+    return n + ".";
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/types.d.ts b/node_modules/dayjs/esm/locale/types.d.ts
new file mode 100644
index 0000000..2c24a64
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/types.d.ts
@@ -0,0 +1,33 @@
+declare interface ILocale {
+  name: string
+  weekdays?: string[]
+  months?: string[]
+  weekStart?: number
+  weekdaysShort?: string[]
+  monthsShort?: string[]
+  weekdaysMin?: string[]
+  ordinal?: (n: number) => number | string
+  formats: Partial<{
+    LT: string
+    LTS: string
+    L: string
+    LL: string
+    LLL: string
+    LLLL: string
+  }>
+  relativeTime: Partial<{
+    future: string
+    past: string
+    s: string
+    m: string
+    mm: string
+    h: string
+    hh: string
+    d: string
+    dd: string
+    M: string
+    MM: string
+    y: string
+    yy: string
+  }>
+}
diff --git a/node_modules/dayjs/esm/locale/tzl.js b/node_modules/dayjs/esm/locale/tzl.js
new file mode 100644
index 0000000..9fa0cd2
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tzl.js
@@ -0,0 +1,24 @@
+// Talossan [tzl]
+import dayjs from '../index';
+var locale = {
+  name: 'tzl',
+  weekdays: 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),
+  months: 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),
+  monthsShort: 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),
+  weekdaysMin: 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH.mm',
+    LTS: 'HH.mm.ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D. MMMM [dallas] YYYY',
+    LLL: 'D. MMMM [dallas] YYYY HH.mm',
+    LLLL: 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tzm-latn.js b/node_modules/dayjs/esm/locale/tzm-latn.js
new file mode 100644
index 0000000..e5ac6af
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tzm-latn.js
@@ -0,0 +1,39 @@
+// Central Atlas Tamazight Latin [tzm-latn]
+import dayjs from '../index';
+var locale = {
+  name: 'tzm-latn',
+  weekdays: 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+  months: 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+  weekStart: 6,
+  weekdaysShort: 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+  monthsShort: 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+  weekdaysMin: 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'dadkh s yan %s',
+    past: 'yan %s',
+    s: 'imik',
+    m: 'minuḍ',
+    mm: '%d minuḍ',
+    h: 'saɛa',
+    hh: '%d tassaɛin',
+    d: 'ass',
+    dd: '%d ossan',
+    M: 'ayowr',
+    MM: '%d iyyirn',
+    y: 'asgas',
+    yy: '%d isgasn'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/tzm.js b/node_modules/dayjs/esm/locale/tzm.js
new file mode 100644
index 0000000..d94a6c0
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/tzm.js
@@ -0,0 +1,39 @@
+// Central Atlas Tamazight [tzm]
+import dayjs from '../index';
+var locale = {
+  name: 'tzm',
+  weekdays: 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+  months: 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+  weekStart: 6,
+  weekdaysShort: 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+  monthsShort: 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+  weekdaysMin: 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+    past: 'ⵢⴰⵏ %s',
+    s: 'ⵉⵎⵉⴽ',
+    m: 'ⵎⵉⵏⵓⴺ',
+    mm: '%d ⵎⵉⵏⵓⴺ',
+    h: 'ⵙⴰⵄⴰ',
+    hh: '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+    d: 'ⴰⵙⵙ',
+    dd: '%d oⵙⵙⴰⵏ',
+    M: 'ⴰⵢoⵓⵔ',
+    MM: '%d ⵉⵢⵢⵉⵔⵏ',
+    y: 'ⴰⵙⴳⴰⵙ',
+    yy: '%d ⵉⵙⴳⴰⵙⵏ'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ug-cn.js b/node_modules/dayjs/esm/locale/ug-cn.js
new file mode 100644
index 0000000..d3d6392
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ug-cn.js
@@ -0,0 +1,39 @@
+// Uyghur (China) [ug-cn]
+import dayjs from '../index';
+var locale = {
+  name: 'ug-cn',
+  weekdays: 'يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە'.split('_'),
+  months: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
+  monthsShort: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split('_'),
+  weekdaysMin: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY-MM-DD',
+    LL: 'YYYY-يىلىM-ئاينىڭD-كۈنى',
+    LLL: 'YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm',
+    LLLL: 'dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm'
+  },
+  relativeTime: {
+    future: '%s كېيىن',
+    past: '%s بۇرۇن',
+    s: 'نەچچە سېكونت',
+    m: 'بىر مىنۇت',
+    mm: '%d مىنۇت',
+    h: 'بىر سائەت',
+    hh: '%d سائەت',
+    d: 'بىر كۈن',
+    dd: '%d كۈن',
+    M: 'بىر ئاي',
+    MM: '%d ئاي',
+    y: 'بىر يىل',
+    yy: '%d يىل'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/uk.js b/node_modules/dayjs/esm/locale/uk.js
new file mode 100644
index 0000000..3c70b13
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/uk.js
@@ -0,0 +1,77 @@
+// Ukrainian [uk]
+import dayjs from '../index';
+var monthFormat = 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_');
+var monthStandalone = 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_');
+var MONTHS_IN_FORMAT = /D[oD]?(\[[^[\]]*\]|\s)+MMMM?/;
+
+function plural(word, num) {
+  var forms = word.split('_');
+  return num % 10 === 1 && num % 100 !== 11 ? forms[0] : num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]; // eslint-disable-line
+}
+
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+  var format = {
+    ss: withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд',
+    mm: withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',
+    hh: withoutSuffix ? 'година_години_годин' : 'годину_години_годин',
+    dd: 'день_дні_днів',
+    MM: 'місяць_місяці_місяців',
+    yy: 'рік_роки_років'
+  };
+
+  if (key === 'm') {
+    return withoutSuffix ? 'хвилина' : 'хвилину';
+  } else if (key === 'h') {
+    return withoutSuffix ? 'година' : 'годину';
+  }
+
+  return number + " " + plural(format[key], +number);
+}
+
+var months = function months(dayjsInstance, format) {
+  if (MONTHS_IN_FORMAT.test(format)) {
+    return monthFormat[dayjsInstance.month()];
+  }
+
+  return monthStandalone[dayjsInstance.month()];
+};
+
+months.s = monthStandalone;
+months.f = monthFormat;
+var locale = {
+  name: 'uk',
+  weekdays: 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+  weekdaysShort: 'ндл_пнд_втр_срд_чтв_птн_сбт'.split('_'),
+  weekdaysMin: 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+  months: months,
+  monthsShort: 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+  weekStart: 1,
+  relativeTime: {
+    future: 'за %s',
+    past: '%s тому',
+    s: 'декілька секунд',
+    m: relativeTimeWithPlural,
+    mm: relativeTimeWithPlural,
+    h: relativeTimeWithPlural,
+    hh: relativeTimeWithPlural,
+    d: 'день',
+    dd: relativeTimeWithPlural,
+    M: 'місяць',
+    MM: relativeTimeWithPlural,
+    y: 'рік',
+    yy: relativeTimeWithPlural
+  },
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD.MM.YYYY',
+    LL: 'D MMMM YYYY р.',
+    LLL: 'D MMMM YYYY р., HH:mm',
+    LLLL: 'dddd, D MMMM YYYY р., HH:mm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/ur.js b/node_modules/dayjs/esm/locale/ur.js
new file mode 100644
index 0000000..7464c1e
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/ur.js
@@ -0,0 +1,39 @@
+// Urdu [ur]
+import dayjs from '../index';
+var locale = {
+  name: 'ur',
+  weekdays: 'اتوار_پیر_منگل_بدھ_جمعرات_جمعہ_ہفتہ'.split('_'),
+  months: 'جنوری_فروری_مارچ_اپریل_مئی_جون_جولائی_اگست_ستمبر_اکتوبر_نومبر_دسمبر'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'اتوار_پیر_منگل_بدھ_جمعرات_جمعہ_ہفتہ'.split('_'),
+  monthsShort: 'جنوری_فروری_مارچ_اپریل_مئی_جون_جولائی_اگست_ستمبر_اکتوبر_نومبر_دسمبر'.split('_'),
+  weekdaysMin: 'اتوار_پیر_منگل_بدھ_جمعرات_جمعہ_ہفتہ'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd، D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%s بعد',
+    past: '%s قبل',
+    s: 'چند سیکنڈ',
+    m: 'ایک منٹ',
+    mm: '%d منٹ',
+    h: 'ایک گھنٹہ',
+    hh: '%d گھنٹے',
+    d: 'ایک دن',
+    dd: '%d دن',
+    M: 'ایک ماہ',
+    MM: '%d ماہ',
+    y: 'ایک سال',
+    yy: '%d سال'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/uz-latn.js b/node_modules/dayjs/esm/locale/uz-latn.js
new file mode 100644
index 0000000..befdfee
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/uz-latn.js
@@ -0,0 +1,39 @@
+// Uzbek Latin [uz-latn]
+import dayjs from '../index';
+var locale = {
+  name: 'uz-latn',
+  weekdays: 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),
+  months: 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),
+  monthsShort: 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),
+  weekdaysMin: 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'D MMMM YYYY, dddd HH:mm'
+  },
+  relativeTime: {
+    future: 'Yaqin %s ichida',
+    past: '%s oldin',
+    s: 'soniya',
+    m: 'bir daqiqa',
+    mm: '%d daqiqa',
+    h: 'bir soat',
+    hh: '%d soat',
+    d: 'bir kun',
+    dd: '%d kun',
+    M: 'bir oy',
+    MM: '%d oy',
+    y: 'bir yil',
+    yy: '%d yil'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/uz.js b/node_modules/dayjs/esm/locale/uz.js
new file mode 100644
index 0000000..4433263
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/uz.js
@@ -0,0 +1,39 @@
+// Uzbek [uz]
+import dayjs from '../index';
+var locale = {
+  name: 'uz',
+  weekdays: 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+  months: 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+  monthsShort: 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+  weekdaysMin: 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'D MMMM YYYY, dddd HH:mm'
+  },
+  relativeTime: {
+    future: 'Якин %s ичида',
+    past: '%s олдин',
+    s: 'фурсат',
+    m: 'бир дакика',
+    mm: '%d дакика',
+    h: 'бир соат',
+    hh: '%d соат',
+    d: 'бир кун',
+    dd: '%d кун',
+    M: 'бир ой',
+    MM: '%d ой',
+    y: 'бир йил',
+    yy: '%d йил'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/vi.js b/node_modules/dayjs/esm/locale/vi.js
new file mode 100644
index 0000000..f55cc73
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/vi.js
@@ -0,0 +1,43 @@
+// Vietnamese [vi]
+import dayjs from '../index';
+var locale = {
+  name: 'vi',
+  weekdays: 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+  months: 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+  monthsShort: 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+  weekdaysMin: 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM [năm] YYYY',
+    LLL: 'D MMMM [năm] YYYY HH:mm',
+    LLLL: 'dddd, D MMMM [năm] YYYY HH:mm',
+    l: 'DD/M/YYYY',
+    ll: 'D MMM YYYY',
+    lll: 'D MMM YYYY HH:mm',
+    llll: 'ddd, D MMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: '%s tới',
+    past: '%s trước',
+    s: 'vài giây',
+    m: 'một phút',
+    mm: '%d phút',
+    h: 'một giờ',
+    hh: '%d giờ',
+    d: 'một ngày',
+    dd: '%d ngày',
+    M: 'một tháng',
+    MM: '%d tháng',
+    y: 'một năm',
+    yy: '%d năm'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/x-pseudo.js b/node_modules/dayjs/esm/locale/x-pseudo.js
new file mode 100644
index 0000000..ceb6782
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/x-pseudo.js
@@ -0,0 +1,39 @@
+// Pseudo [x-pseudo]
+import dayjs from '../index';
+var locale = {
+  name: 'x-pseudo',
+  weekdays: 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),
+  months: 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),
+  monthsShort: 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),
+  weekdaysMin: 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY HH:mm',
+    LLLL: 'dddd, D MMMM YYYY HH:mm'
+  },
+  relativeTime: {
+    future: 'í~ñ %s',
+    past: '%s á~gó',
+    s: 'á ~féw ~sécó~ñds',
+    m: 'á ~míñ~úté',
+    mm: '%d m~íñú~tés',
+    h: 'á~ñ hó~úr',
+    hh: '%d h~óúrs',
+    d: 'á ~dáý',
+    dd: '%d d~áýs',
+    M: 'á ~móñ~th',
+    MM: '%d m~óñt~hs',
+    y: 'á ~ýéár',
+    yy: '%d ý~éárs'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/yo.js b/node_modules/dayjs/esm/locale/yo.js
new file mode 100644
index 0000000..1f79468
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/yo.js
@@ -0,0 +1,39 @@
+// Yoruba Nigeria [yo]
+import dayjs from '../index';
+var locale = {
+  name: 'yo',
+  weekdays: 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),
+  months: 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),
+  weekStart: 1,
+  weekdaysShort: 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),
+  monthsShort: 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),
+  weekdaysMin: 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),
+  ordinal: function ordinal(n) {
+    return n;
+  },
+  formats: {
+    LT: 'h:mm A',
+    LTS: 'h:mm:ss A',
+    L: 'DD/MM/YYYY',
+    LL: 'D MMMM YYYY',
+    LLL: 'D MMMM YYYY h:mm A',
+    LLLL: 'dddd, D MMMM YYYY h:mm A'
+  },
+  relativeTime: {
+    future: 'ní %s',
+    past: '%s kọjá',
+    s: 'ìsẹjú aayá die',
+    m: 'ìsẹjú kan',
+    mm: 'ìsẹjú %d',
+    h: 'wákati kan',
+    hh: 'wákati %d',
+    d: 'ọjọ́ kan',
+    dd: 'ọjọ́ %d',
+    M: 'osù kan',
+    MM: 'osù %d',
+    y: 'ọdún kan',
+    yy: 'ọdún %d'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/zh-cn.js b/node_modules/dayjs/esm/locale/zh-cn.js
new file mode 100644
index 0000000..1a7ebf4
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/zh-cn.js
@@ -0,0 +1,67 @@
+// Chinese (China) [zh-cn]
+import dayjs from '../index';
+var locale = {
+  name: 'zh-cn',
+  weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+  weekdaysShort: '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+  weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
+  months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+  monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  ordinal: function ordinal(number, period) {
+    switch (period) {
+      case 'W':
+        return number + "\u5468";
+
+      default:
+        return number + "\u65E5";
+    }
+  },
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY/MM/DD',
+    LL: 'YYYY年M月D日',
+    LLL: 'YYYY年M月D日Ah点mm分',
+    LLLL: 'YYYY年M月D日ddddAh点mm分',
+    l: 'YYYY/M/D',
+    ll: 'YYYY年M月D日',
+    lll: 'YYYY年M月D日 HH:mm',
+    llll: 'YYYY年M月D日dddd HH:mm'
+  },
+  relativeTime: {
+    future: '%s内',
+    past: '%s前',
+    s: '几秒',
+    m: '1 分钟',
+    mm: '%d 分钟',
+    h: '1 小时',
+    hh: '%d 小时',
+    d: '1 天',
+    dd: '%d 天',
+    M: '1 个月',
+    MM: '%d 个月',
+    y: '1 年',
+    yy: '%d 年'
+  },
+  meridiem: function meridiem(hour, minute) {
+    var hm = hour * 100 + minute;
+
+    if (hm < 600) {
+      return '凌晨';
+    } else if (hm < 900) {
+      return '早上';
+    } else if (hm < 1100) {
+      return '上午';
+    } else if (hm < 1300) {
+      return '中午';
+    } else if (hm < 1800) {
+      return '下午';
+    }
+
+    return '晚上';
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/zh-hk.js b/node_modules/dayjs/esm/locale/zh-hk.js
new file mode 100644
index 0000000..3896747
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/zh-hk.js
@@ -0,0 +1,44 @@
+// Chinese (Hong Kong) [zh-hk]
+import dayjs from '../index';
+var locale = {
+  name: 'zh-hk',
+  months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+  monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+  weekdaysShort: '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+  weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
+  ordinal: function ordinal(number, period) {
+    switch (period) {
+      case 'W':
+        return number + "\u9031";
+
+      default:
+        return number + "\u65E5";
+    }
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY/MM/DD',
+    LL: 'YYYY年M月D日',
+    LLL: 'YYYY年M月D日 HH:mm',
+    LLLL: 'YYYY年M月D日dddd HH:mm'
+  },
+  relativeTime: {
+    future: '%s內',
+    past: '%s前',
+    s: '幾秒',
+    m: '一分鐘',
+    mm: '%d 分鐘',
+    h: '一小時',
+    hh: '%d 小時',
+    d: '一天',
+    dd: '%d 天',
+    M: '一個月',
+    MM: '%d 個月',
+    y: '一年',
+    yy: '%d 年'
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/zh-tw.js b/node_modules/dayjs/esm/locale/zh-tw.js
new file mode 100644
index 0000000..ada89ee
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/zh-tw.js
@@ -0,0 +1,65 @@
+// Chinese (Taiwan) [zh-tw]
+import dayjs from '../index';
+var locale = {
+  name: 'zh-tw',
+  weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+  weekdaysShort: '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+  weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
+  months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+  monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  ordinal: function ordinal(number, period) {
+    switch (period) {
+      case 'W':
+        return number + "\u9031";
+
+      default:
+        return number + "\u65E5";
+    }
+  },
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY/MM/DD',
+    LL: 'YYYY年M月D日',
+    LLL: 'YYYY年M月D日 HH:mm',
+    LLLL: 'YYYY年M月D日dddd HH:mm',
+    l: 'YYYY/M/D',
+    ll: 'YYYY年M月D日',
+    lll: 'YYYY年M月D日 HH:mm',
+    llll: 'YYYY年M月D日dddd HH:mm'
+  },
+  relativeTime: {
+    future: '%s內',
+    past: '%s前',
+    s: '幾秒',
+    m: '1 分鐘',
+    mm: '%d 分鐘',
+    h: '1 小時',
+    hh: '%d 小時',
+    d: '1 天',
+    dd: '%d 天',
+    M: '1 個月',
+    MM: '%d 個月',
+    y: '1 年',
+    yy: '%d 年'
+  },
+  meridiem: function meridiem(hour, minute) {
+    var hm = hour * 100 + minute;
+
+    if (hm < 600) {
+      return '凌晨';
+    } else if (hm < 900) {
+      return '早上';
+    } else if (hm < 1100) {
+      return '上午';
+    } else if (hm < 1300) {
+      return '中午';
+    } else if (hm < 1800) {
+      return '下午';
+    }
+
+    return '晚上';
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/locale/zh.js b/node_modules/dayjs/esm/locale/zh.js
new file mode 100644
index 0000000..b98ab70
--- /dev/null
+++ b/node_modules/dayjs/esm/locale/zh.js
@@ -0,0 +1,67 @@
+// Chinese [zh]
+import dayjs from '../index';
+var locale = {
+  name: 'zh',
+  weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+  weekdaysShort: '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+  weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
+  months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+  monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+  ordinal: function ordinal(number, period) {
+    switch (period) {
+      case 'W':
+        return number + "\u5468";
+
+      default:
+        return number + "\u65E5";
+    }
+  },
+  weekStart: 1,
+  yearStart: 4,
+  formats: {
+    LT: 'HH:mm',
+    LTS: 'HH:mm:ss',
+    L: 'YYYY/MM/DD',
+    LL: 'YYYY年M月D日',
+    LLL: 'YYYY年M月D日Ah点mm分',
+    LLLL: 'YYYY年M月D日ddddAh点mm分',
+    l: 'YYYY/M/D',
+    ll: 'YYYY年M月D日',
+    lll: 'YYYY年M月D日 HH:mm',
+    llll: 'YYYY年M月D日dddd HH:mm'
+  },
+  relativeTime: {
+    future: '%s后',
+    past: '%s前',
+    s: '几秒',
+    m: '1 分钟',
+    mm: '%d 分钟',
+    h: '1 小时',
+    hh: '%d 小时',
+    d: '1 天',
+    dd: '%d 天',
+    M: '1 个月',
+    MM: '%d 个月',
+    y: '1 年',
+    yy: '%d 年'
+  },
+  meridiem: function meridiem(hour, minute) {
+    var hm = hour * 100 + minute;
+
+    if (hm < 600) {
+      return '凌晨';
+    } else if (hm < 900) {
+      return '早上';
+    } else if (hm < 1100) {
+      return '上午';
+    } else if (hm < 1300) {
+      return '中午';
+    } else if (hm < 1800) {
+      return '下午';
+    }
+
+    return '晚上';
+  }
+};
+dayjs.locale(locale, null, true);
+export default locale;
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/advancedFormat/index.d.ts b/node_modules/dayjs/esm/plugin/advancedFormat/index.d.ts
new file mode 100644
index 0000000..a17c896
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/advancedFormat/index.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/advancedFormat/index.js b/node_modules/dayjs/esm/plugin/advancedFormat/index.js
new file mode 100644
index 0000000..f45e4e0
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/advancedFormat/index.js
@@ -0,0 +1,66 @@
+import { FORMAT_DEFAULT } from '../../constant';
+export default (function (o, c) {
+  // locale needed later
+  var proto = c.prototype;
+  var oldFormat = proto.format;
+
+  proto.format = function (formatStr) {
+    var _this = this;
+
+    var locale = this.$locale();
+
+    if (!this.isValid()) {
+      return oldFormat.bind(this)(formatStr);
+    }
+
+    var utils = this.$utils();
+    var str = formatStr || FORMAT_DEFAULT;
+    var result = str.replace(/\[([^\]]+)]|Q|wo|ww|w|WW|W|zzz|z|gggg|GGGG|Do|X|x|k{1,2}|S/g, function (match) {
+      switch (match) {
+        case 'Q':
+          return Math.ceil((_this.$M + 1) / 3);
+
+        case 'Do':
+          return locale.ordinal(_this.$D);
+
+        case 'gggg':
+          return _this.weekYear();
+
+        case 'GGGG':
+          return _this.isoWeekYear();
+
+        case 'wo':
+          return locale.ordinal(_this.week(), 'W');
+        // W for week
+
+        case 'w':
+        case 'ww':
+          return utils.s(_this.week(), match === 'w' ? 1 : 2, '0');
+
+        case 'W':
+        case 'WW':
+          return utils.s(_this.isoWeek(), match === 'W' ? 1 : 2, '0');
+
+        case 'k':
+        case 'kk':
+          return utils.s(String(_this.$H === 0 ? 24 : _this.$H), match === 'k' ? 1 : 2, '0');
+
+        case 'X':
+          return Math.floor(_this.$d.getTime() / 1000);
+
+        case 'x':
+          return _this.$d.getTime();
+
+        case 'z':
+          return "[" + _this.offsetName() + "]";
+
+        case 'zzz':
+          return "[" + _this.offsetName('long') + "]";
+
+        default:
+          return match;
+      }
+    });
+    return oldFormat.bind(this)(result);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/arraySupport/index.d.ts b/node_modules/dayjs/esm/plugin/arraySupport/index.d.ts
new file mode 100644
index 0000000..30f8d9c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/arraySupport/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare module 'dayjs/esm' {
+  interface ConfigTypeMap {
+    arraySupport: [number?, number?, number?, number?, number?, number?, number?]
+  }
+}
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/arraySupport/index.js b/node_modules/dayjs/esm/plugin/arraySupport/index.js
new file mode 100644
index 0000000..c7edc79
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/arraySupport/index.js
@@ -0,0 +1,33 @@
+export default (function (o, c, dayjs) {
+  var proto = c.prototype;
+
+  var parseDate = function parseDate(cfg) {
+    var date = cfg.date,
+        utc = cfg.utc;
+
+    if (Array.isArray(date)) {
+      if (utc) {
+        if (!date.length) {
+          return new Date();
+        }
+
+        return new Date(Date.UTC.apply(null, date));
+      }
+
+      if (date.length === 1) {
+        return dayjs(String(date[0])).toDate();
+      }
+
+      return new (Function.prototype.bind.apply(Date, [null].concat(date)))();
+    }
+
+    return date;
+  };
+
+  var oldParse = proto.parse;
+
+  proto.parse = function (cfg) {
+    cfg.date = parseDate.bind(this)(cfg);
+    oldParse.bind(this)(cfg);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/badMutable/index.d.ts b/node_modules/dayjs/esm/plugin/badMutable/index.d.ts
new file mode 100644
index 0000000..a17c896
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/badMutable/index.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/badMutable/index.js b/node_modules/dayjs/esm/plugin/badMutable/index.js
new file mode 100644
index 0000000..679edee
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/badMutable/index.js
@@ -0,0 +1,61 @@
+export default (function (o, c) {
+  // locale needed later
+  var proto = c.prototype;
+
+  proto.$g = function (input, get, set) {
+    if (this.$utils().u(input)) return this[get];
+    return this.$set(set, input);
+  };
+
+  proto.set = function (string, _int) {
+    return this.$set(string, _int);
+  };
+
+  var oldStartOf = proto.startOf;
+
+  proto.startOf = function (units, startOf) {
+    this.$d = oldStartOf.bind(this)(units, startOf).toDate();
+    this.init();
+    return this;
+  };
+
+  var oldAdd = proto.add;
+
+  proto.add = function (number, units) {
+    this.$d = oldAdd.bind(this)(number, units).toDate();
+    this.init();
+    return this;
+  };
+
+  var oldLocale = proto.locale;
+
+  proto.locale = function (preset, object) {
+    if (!preset) return this.$L;
+    this.$L = oldLocale.bind(this)(preset, object).$L;
+    return this;
+  };
+
+  var oldDaysInMonth = proto.daysInMonth;
+
+  proto.daysInMonth = function () {
+    return oldDaysInMonth.bind(this.clone())();
+  };
+
+  var oldIsSame = proto.isSame;
+
+  proto.isSame = function (that, units) {
+    return oldIsSame.bind(this.clone())(that, units);
+  };
+
+  var oldIsBefore = proto.isBefore;
+
+  proto.isBefore = function (that, units) {
+    return oldIsBefore.bind(this.clone())(that, units);
+  };
+
+  var oldIsAfter = proto.isAfter;
+
+  proto.isAfter = function (that, units) {
+    return oldIsAfter.bind(this.clone())(that, units);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/bigIntSupport/index.d.ts b/node_modules/dayjs/esm/plugin/bigIntSupport/index.d.ts
new file mode 100644
index 0000000..0829ead
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/bigIntSupport/index.d.ts
@@ -0,0 +1,11 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare module 'dayjs/esm' {
+  interface ConfigTypeMap {
+    bigIntSupport: BigInt
+  }
+  export function unix(t: BigInt): Dayjs
+}
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/bigIntSupport/index.js b/node_modules/dayjs/esm/plugin/bigIntSupport/index.js
new file mode 100644
index 0000000..fa93982
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/bigIntSupport/index.js
@@ -0,0 +1,32 @@
+// eslint-disable-next-line valid-typeof
+var isBigInt = function isBigInt(num) {
+  return typeof num === 'bigint';
+};
+
+export default (function (o, c, dayjs) {
+  var proto = c.prototype;
+
+  var parseDate = function parseDate(cfg) {
+    var date = cfg.date;
+
+    if (isBigInt(date)) {
+      return Number(date);
+    }
+
+    return date;
+  };
+
+  var oldParse = proto.parse;
+
+  proto.parse = function (cfg) {
+    cfg.date = parseDate.bind(this)(cfg);
+    oldParse.bind(this)(cfg);
+  };
+
+  var oldUnix = dayjs.unix;
+
+  dayjs.unix = function (timestamp) {
+    var ts = isBigInt(timestamp) ? Number(timestamp) : timestamp;
+    return oldUnix(ts);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/buddhistEra/index.d.ts b/node_modules/dayjs/esm/plugin/buddhistEra/index.d.ts
new file mode 100644
index 0000000..a17c896
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/buddhistEra/index.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/buddhistEra/index.js b/node_modules/dayjs/esm/plugin/buddhistEra/index.js
new file mode 100644
index 0000000..76ce44c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/buddhistEra/index.js
@@ -0,0 +1,21 @@
+import { FORMAT_DEFAULT } from '../../constant';
+export default (function (o, c) {
+  // locale needed later
+  var proto = c.prototype;
+  var oldFormat = proto.format; // extend en locale here
+
+  proto.format = function (formatStr) {
+    var _this = this;
+
+    var yearBias = 543;
+    var str = formatStr || FORMAT_DEFAULT;
+    var result = str.replace(/(\[[^\]]+])|BBBB|BB/g, function (match, a) {
+      var _this$$utils;
+
+      var year = String(_this.$y + yearBias);
+      var args = match === 'BB' ? [year.slice(-2), 2] : [year, 4];
+      return a || (_this$$utils = _this.$utils()).s.apply(_this$$utils, args.concat(['0']));
+    });
+    return oldFormat.bind(this)(result);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/calendar/index.d.ts b/node_modules/dayjs/esm/plugin/calendar/index.d.ts
new file mode 100644
index 0000000..42bff4b
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/calendar/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    calendar(referenceTime?: ConfigType, formats?: object): string
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/calendar/index.js b/node_modules/dayjs/esm/plugin/calendar/index.js
new file mode 100644
index 0000000..9abf1e9
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/calendar/index.js
@@ -0,0 +1,32 @@
+export default (function (o, c, d) {
+  var LT = 'h:mm A';
+  var L = 'MM/DD/YYYY';
+  var calendarFormat = {
+    lastDay: "[Yesterday at] " + LT,
+    sameDay: "[Today at] " + LT,
+    nextDay: "[Tomorrow at] " + LT,
+    nextWeek: "dddd [at] " + LT,
+    lastWeek: "[Last] dddd [at] " + LT,
+    sameElse: L
+  };
+  var proto = c.prototype;
+
+  proto.calendar = function (referenceTime, formats) {
+    var format = formats || this.$locale().calendar || calendarFormat;
+    var referenceStartOfDay = d(referenceTime || undefined).startOf('d');
+    var diff = this.diff(referenceStartOfDay, 'd', true);
+    var sameElse = 'sameElse';
+    /* eslint-disable no-nested-ternary */
+
+    var retVal = diff < -6 ? sameElse : diff < -1 ? 'lastWeek' : diff < 0 ? 'lastDay' : diff < 1 ? 'sameDay' : diff < 2 ? 'nextDay' : diff < 7 ? 'nextWeek' : sameElse;
+    /* eslint-enable no-nested-ternary */
+
+    var currentFormat = format[retVal] || calendarFormat[retVal];
+
+    if (typeof currentFormat === 'function') {
+      return currentFormat.call(this, d());
+    }
+
+    return this.format(currentFormat);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/customParseFormat/index.d.ts b/node_modules/dayjs/esm/plugin/customParseFormat/index.d.ts
new file mode 100644
index 0000000..7da585e
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/customParseFormat/index.d.ts
@@ -0,0 +1,8 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare interface PluginOptions {
+    parseTwoDigitYear?: (yearString: string) => number
+}
+
+declare const plugin: PluginFunc<PluginOptions>
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/customParseFormat/index.js b/node_modules/dayjs/esm/plugin/customParseFormat/index.js
new file mode 100644
index 0000000..1fd5936
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/customParseFormat/index.js
@@ -0,0 +1,320 @@
+import { u } from '../localizedFormat/utils';
+var formattingTokens = /(\[[^[]*\])|([-_:/.,()\s]+)|(A|a|YYYY|YY?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g;
+var match1 = /\d/; // 0 - 9
+
+var match2 = /\d\d/; // 00 - 99
+
+var match3 = /\d{3}/; // 000 - 999
+
+var match4 = /\d{4}/; // 0000 - 9999
+
+var match1to2 = /\d\d?/; // 0 - 99
+
+var matchSigned = /[+-]?\d+/; // -inf - inf
+
+var matchOffset = /[+-]\d\d:?(\d\d)?|Z/; // +00:00 -00:00 +0000 or -0000 +00 or Z
+
+var matchWord = /\d*[^-_:/,()\s\d]+/; // Word
+
+var locale = {};
+
+var parseTwoDigitYear = function parseTwoDigitYear(input) {
+  input = +input;
+  return input + (input > 68 ? 1900 : 2000);
+};
+
+function offsetFromString(string) {
+  if (!string) return 0;
+  if (string === 'Z') return 0;
+  var parts = string.match(/([+-]|\d\d)/g);
+  var minutes = +(parts[1] * 60) + (+parts[2] || 0);
+  return minutes === 0 ? 0 : parts[0] === '+' ? -minutes : minutes; // eslint-disable-line no-nested-ternary
+}
+
+var addInput = function addInput(property) {
+  return function (input) {
+    this[property] = +input;
+  };
+};
+
+var zoneExpressions = [matchOffset, function (input) {
+  var zone = this.zone || (this.zone = {});
+  zone.offset = offsetFromString(input);
+}];
+
+var getLocalePart = function getLocalePart(name) {
+  var part = locale[name];
+  return part && (part.indexOf ? part : part.s.concat(part.f));
+};
+
+var meridiemMatch = function meridiemMatch(input, isLowerCase) {
+  var isAfternoon;
+  var _locale = locale,
+      meridiem = _locale.meridiem;
+
+  if (!meridiem) {
+    isAfternoon = input === (isLowerCase ? 'pm' : 'PM');
+  } else {
+    for (var i = 1; i <= 24; i += 1) {
+      // todo: fix input === meridiem(i, 0, isLowerCase)
+      if (input.indexOf(meridiem(i, 0, isLowerCase)) > -1) {
+        isAfternoon = i > 12;
+        break;
+      }
+    }
+  }
+
+  return isAfternoon;
+};
+
+var expressions = {
+  A: [matchWord, function (input) {
+    this.afternoon = meridiemMatch(input, false);
+  }],
+  a: [matchWord, function (input) {
+    this.afternoon = meridiemMatch(input, true);
+  }],
+  S: [match1, function (input) {
+    this.milliseconds = +input * 100;
+  }],
+  SS: [match2, function (input) {
+    this.milliseconds = +input * 10;
+  }],
+  SSS: [match3, function (input) {
+    this.milliseconds = +input;
+  }],
+  s: [match1to2, addInput('seconds')],
+  ss: [match1to2, addInput('seconds')],
+  m: [match1to2, addInput('minutes')],
+  mm: [match1to2, addInput('minutes')],
+  H: [match1to2, addInput('hours')],
+  h: [match1to2, addInput('hours')],
+  HH: [match1to2, addInput('hours')],
+  hh: [match1to2, addInput('hours')],
+  D: [match1to2, addInput('day')],
+  DD: [match2, addInput('day')],
+  Do: [matchWord, function (input) {
+    var _locale2 = locale,
+        ordinal = _locale2.ordinal;
+
+    var _input$match = input.match(/\d+/);
+
+    this.day = _input$match[0];
+    if (!ordinal) return;
+
+    for (var i = 1; i <= 31; i += 1) {
+      if (ordinal(i).replace(/\[|\]/g, '') === input) {
+        this.day = i;
+      }
+    }
+  }],
+  M: [match1to2, addInput('month')],
+  MM: [match2, addInput('month')],
+  MMM: [matchWord, function (input) {
+    var months = getLocalePart('months');
+    var monthsShort = getLocalePart('monthsShort');
+    var matchIndex = (monthsShort || months.map(function (_) {
+      return _.slice(0, 3);
+    })).indexOf(input) + 1;
+
+    if (matchIndex < 1) {
+      throw new Error();
+    }
+
+    this.month = matchIndex % 12 || matchIndex;
+  }],
+  MMMM: [matchWord, function (input) {
+    var months = getLocalePart('months');
+    var matchIndex = months.indexOf(input) + 1;
+
+    if (matchIndex < 1) {
+      throw new Error();
+    }
+
+    this.month = matchIndex % 12 || matchIndex;
+  }],
+  Y: [matchSigned, addInput('year')],
+  YY: [match2, function (input) {
+    this.year = parseTwoDigitYear(input);
+  }],
+  YYYY: [match4, addInput('year')],
+  Z: zoneExpressions,
+  ZZ: zoneExpressions
+};
+
+function correctHours(time) {
+  var afternoon = time.afternoon;
+
+  if (afternoon !== undefined) {
+    var hours = time.hours;
+
+    if (afternoon) {
+      if (hours < 12) {
+        time.hours += 12;
+      }
+    } else if (hours === 12) {
+      time.hours = 0;
+    }
+
+    delete time.afternoon;
+  }
+}
+
+function makeParser(format) {
+  format = u(format, locale && locale.formats);
+  var array = format.match(formattingTokens);
+  var length = array.length;
+
+  for (var i = 0; i < length; i += 1) {
+    var token = array[i];
+    var parseTo = expressions[token];
+    var regex = parseTo && parseTo[0];
+    var parser = parseTo && parseTo[1];
+
+    if (parser) {
+      array[i] = {
+        regex: regex,
+        parser: parser
+      };
+    } else {
+      array[i] = token.replace(/^\[|\]$/g, '');
+    }
+  }
+
+  return function (input) {
+    var time = {};
+
+    for (var _i = 0, start = 0; _i < length; _i += 1) {
+      var _token = array[_i];
+
+      if (typeof _token === 'string') {
+        start += _token.length;
+      } else {
+        var _regex = _token.regex,
+            _parser = _token.parser;
+        var part = input.slice(start);
+
+        var match = _regex.exec(part);
+
+        var value = match[0];
+
+        _parser.call(time, value);
+
+        input = input.replace(value, '');
+      }
+    }
+
+    correctHours(time);
+    return time;
+  };
+}
+
+var parseFormattedInput = function parseFormattedInput(input, format, utc) {
+  try {
+    if (['x', 'X'].indexOf(format) > -1) return new Date((format === 'X' ? 1000 : 1) * input);
+    var parser = makeParser(format);
+
+    var _parser2 = parser(input),
+        year = _parser2.year,
+        month = _parser2.month,
+        day = _parser2.day,
+        hours = _parser2.hours,
+        minutes = _parser2.minutes,
+        seconds = _parser2.seconds,
+        milliseconds = _parser2.milliseconds,
+        zone = _parser2.zone;
+
+    var now = new Date();
+    var d = day || (!year && !month ? now.getDate() : 1);
+    var y = year || now.getFullYear();
+    var M = 0;
+
+    if (!(year && !month)) {
+      M = month > 0 ? month - 1 : now.getMonth();
+    }
+
+    var h = hours || 0;
+    var m = minutes || 0;
+    var s = seconds || 0;
+    var ms = milliseconds || 0;
+
+    if (zone) {
+      return new Date(Date.UTC(y, M, d, h, m, s, ms + zone.offset * 60 * 1000));
+    }
+
+    if (utc) {
+      return new Date(Date.UTC(y, M, d, h, m, s, ms));
+    }
+
+    return new Date(y, M, d, h, m, s, ms);
+  } catch (e) {
+    return new Date(''); // Invalid Date
+  }
+};
+
+export default (function (o, C, d) {
+  d.p.customParseFormat = true;
+
+  if (o && o.parseTwoDigitYear) {
+    parseTwoDigitYear = o.parseTwoDigitYear;
+  }
+
+  var proto = C.prototype;
+  var oldParse = proto.parse;
+
+  proto.parse = function (cfg) {
+    var date = cfg.date,
+        utc = cfg.utc,
+        args = cfg.args;
+    this.$u = utc;
+    var format = args[1];
+
+    if (typeof format === 'string') {
+      var isStrictWithoutLocale = args[2] === true;
+      var isStrictWithLocale = args[3] === true;
+      var isStrict = isStrictWithoutLocale || isStrictWithLocale;
+      var pl = args[2];
+
+      if (isStrictWithLocale) {
+        pl = args[2];
+      }
+
+      locale = this.$locale();
+
+      if (!isStrictWithoutLocale && pl) {
+        locale = d.Ls[pl];
+      }
+
+      this.$d = parseFormattedInput(date, format, utc);
+      this.init();
+      if (pl && pl !== true) this.$L = this.locale(pl).$L; // use != to treat
+      // input number 1410715640579 and format string '1410715640579' equal
+      // eslint-disable-next-line eqeqeq
+
+      if (isStrict && date != this.format(format)) {
+        this.$d = new Date('');
+      } // reset global locale to make parallel unit test
+
+
+      locale = {};
+    } else if (format instanceof Array) {
+      var len = format.length;
+
+      for (var i = 1; i <= len; i += 1) {
+        args[1] = format[i - 1];
+        var result = d.apply(this, args);
+
+        if (result.isValid()) {
+          this.$d = result.$d;
+          this.$L = result.$L;
+          this.init();
+          break;
+        }
+
+        if (i === len) this.$d = new Date('');
+      }
+    } else {
+      oldParse.call(this, cfg);
+    }
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/dayOfYear/index.d.ts b/node_modules/dayjs/esm/plugin/dayOfYear/index.d.ts
new file mode 100644
index 0000000..4b9601e
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/dayOfYear/index.d.ts
@@ -0,0 +1,11 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    dayOfYear(): number
+    dayOfYear(value: number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/dayOfYear/index.js b/node_modules/dayjs/esm/plugin/dayOfYear/index.js
new file mode 100644
index 0000000..0cb1158
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/dayOfYear/index.js
@@ -0,0 +1,9 @@
+export default (function (o, c, d) {
+  var proto = c.prototype;
+
+  proto.dayOfYear = function (input) {
+    // d(this) is for badMutable
+    var dayOfYear = Math.round((d(this).startOf('day') - d(this).startOf('year')) / 864e5) + 1;
+    return input == null ? dayOfYear : this.add(input - dayOfYear, 'day');
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/devHelper/index.d.ts b/node_modules/dayjs/esm/plugin/devHelper/index.d.ts
new file mode 100644
index 0000000..a17c896
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/devHelper/index.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/devHelper/index.js b/node_modules/dayjs/esm/plugin/devHelper/index.js
new file mode 100644
index 0000000..9e2af82
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/devHelper/index.js
@@ -0,0 +1,38 @@
+/* eslint-disable no-console */
+export default (function (o, c, d) {
+  /* istanbul ignore next line */
+  if (!process || process.env.NODE_ENV !== 'production') {
+    var proto = c.prototype;
+    var oldParse = proto.parse;
+
+    proto.parse = function (cfg) {
+      var date = cfg.date;
+
+      if (typeof date === 'string' && date.length === 13) {
+        console.warn("To parse a Unix timestamp like " + date + ", you should pass it as a Number. https://day.js.org/docs/en/parse/unix-timestamp-milliseconds");
+      }
+
+      if (typeof date === 'number' && String(date).length === 4) {
+        console.warn("Guessing you may want to parse the Year " + date + ", you should pass it as a String " + date + ", not a Number. Otherwise, " + date + " will be treated as a Unix timestamp");
+      }
+
+      if (cfg.args.length >= 2 && !d.p.customParseFormat) {
+        console.warn("To parse a date-time string like " + date + " using the given format, you should enable customParseFormat plugin first. https://day.js.org/docs/en/parse/string-format");
+      }
+
+      return oldParse.bind(this)(cfg);
+    };
+
+    var oldLocale = d.locale;
+
+    d.locale = function (preset, object, isLocal) {
+      if (typeof object === 'undefined' && typeof preset === 'string') {
+        if (!d.Ls[preset]) {
+          console.warn("Guessing you may want to use locale " + preset + ", you have to load it before using it. https://day.js.org/docs/en/i18n/loading-into-nodejs");
+        }
+      }
+
+      return oldLocale(preset, object, isLocal);
+    };
+  }
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/duration/index.d.ts b/node_modules/dayjs/esm/plugin/duration/index.d.ts
new file mode 100644
index 0000000..dc974a5
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/duration/index.d.ts
@@ -0,0 +1,88 @@
+import { PluginFunc } from 'dayjs/esm'
+import { OpUnitType, UnitTypeLongPlural } from 'dayjs/esm';
+
+declare const plugin: PluginFunc
+export as namespace plugin;
+export = plugin
+
+declare namespace plugin {
+  /**
+   * @deprecated Please use more strict types
+   */
+  type DurationInputType = string | number | object
+  /**
+   * @deprecated Please use more strict types
+   */
+  type DurationAddType = number | object | Duration
+  
+  type DurationUnitsObjectType = Partial<{
+    [unit in Exclude<UnitTypeLongPlural, "dates"> | "weeks"]: number
+  }>;
+  type DurationUnitType = Exclude<OpUnitType, "date" | "dates">
+  type CreateDurationType = 
+    ((units: DurationUnitsObjectType) => Duration)
+    & ((time: number, unit?: DurationUnitType) => Duration)
+    & ((ISO_8601: string) => Duration)
+  type AddDurationType = CreateDurationType & ((duration: Duration) => Duration)
+
+  interface Duration {
+    new (input: string | number | object, unit?: string, locale?: string): Duration
+
+    clone(): Duration
+
+    humanize(withSuffix?: boolean): string
+
+    milliseconds(): number
+    asMilliseconds(): number
+
+    seconds(): number
+    asSeconds(): number
+
+    minutes(): number
+    asMinutes(): number
+
+    hours(): number
+    asHours(): number
+
+    days(): number
+    asDays(): number
+
+    weeks(): number
+    asWeeks(): number
+
+    months(): number
+    asMonths(): number
+
+    years(): number
+    asYears(): number
+
+    as(unit: DurationUnitType): number
+
+    get(unit: DurationUnitType): number
+
+    add: AddDurationType
+    
+    subtract: AddDurationType
+
+    toJSON(): string
+
+    toISOString(): string
+
+    format(formatStr?: string): string
+
+    locale(locale: string): Duration
+  }
+}
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    add(duration: plugin.Duration): Dayjs
+    subtract(duration: plugin.Duration): Dayjs
+  }
+
+  /**
+   * @param time If unit is not present, time treated as number of milliseconds
+   */
+  export const duration: plugin.CreateDurationType;
+  export function isDuration(d: any): d is plugin.Duration
+}
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/duration/index.js b/node_modules/dayjs/esm/plugin/duration/index.js
new file mode 100644
index 0000000..a241d4b
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/duration/index.js
@@ -0,0 +1,356 @@
+import { MILLISECONDS_A_DAY, MILLISECONDS_A_HOUR, MILLISECONDS_A_MINUTE, MILLISECONDS_A_SECOND, MILLISECONDS_A_WEEK, REGEX_FORMAT } from '../../constant';
+var MILLISECONDS_A_YEAR = MILLISECONDS_A_DAY * 365;
+var MILLISECONDS_A_MONTH = MILLISECONDS_A_YEAR / 12;
+var durationRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
+var unitToMS = {
+  years: MILLISECONDS_A_YEAR,
+  months: MILLISECONDS_A_MONTH,
+  days: MILLISECONDS_A_DAY,
+  hours: MILLISECONDS_A_HOUR,
+  minutes: MILLISECONDS_A_MINUTE,
+  seconds: MILLISECONDS_A_SECOND,
+  milliseconds: 1,
+  weeks: MILLISECONDS_A_WEEK
+};
+
+var isDuration = function isDuration(d) {
+  return d instanceof Duration;
+}; // eslint-disable-line no-use-before-define
+
+
+var $d;
+var $u;
+
+var wrapper = function wrapper(input, instance, unit) {
+  return new Duration(input, unit, instance.$l);
+}; // eslint-disable-line no-use-before-define
+
+
+var prettyUnit = function prettyUnit(unit) {
+  return $u.p(unit) + "s";
+};
+
+var isNegative = function isNegative(number) {
+  return number < 0;
+};
+
+var roundNumber = function roundNumber(number) {
+  return isNegative(number) ? Math.ceil(number) : Math.floor(number);
+};
+
+var absolute = function absolute(number) {
+  return Math.abs(number);
+};
+
+var getNumberUnitFormat = function getNumberUnitFormat(number, unit) {
+  if (!number) {
+    return {
+      negative: false,
+      format: ''
+    };
+  }
+
+  if (isNegative(number)) {
+    return {
+      negative: true,
+      format: "" + absolute(number) + unit
+    };
+  }
+
+  return {
+    negative: false,
+    format: "" + number + unit
+  };
+};
+
+var Duration = /*#__PURE__*/function () {
+  function Duration(input, unit, locale) {
+    var _this = this;
+
+    this.$d = {};
+    this.$l = locale;
+
+    if (input === undefined) {
+      this.$ms = 0;
+      this.parseFromMilliseconds();
+    }
+
+    if (unit) {
+      return wrapper(input * unitToMS[prettyUnit(unit)], this);
+    }
+
+    if (typeof input === 'number') {
+      this.$ms = input;
+      this.parseFromMilliseconds();
+      return this;
+    }
+
+    if (typeof input === 'object') {
+      Object.keys(input).forEach(function (k) {
+        _this.$d[prettyUnit(k)] = input[k];
+      });
+      this.calMilliseconds();
+      return this;
+    }
+
+    if (typeof input === 'string') {
+      var d = input.match(durationRegex);
+
+      if (d) {
+        var properties = d.slice(2);
+        var numberD = properties.map(function (value) {
+          return value != null ? Number(value) : 0;
+        });
+        this.$d.years = numberD[0];
+        this.$d.months = numberD[1];
+        this.$d.weeks = numberD[2];
+        this.$d.days = numberD[3];
+        this.$d.hours = numberD[4];
+        this.$d.minutes = numberD[5];
+        this.$d.seconds = numberD[6];
+        this.calMilliseconds();
+        return this;
+      }
+    }
+
+    return this;
+  }
+
+  var _proto = Duration.prototype;
+
+  _proto.calMilliseconds = function calMilliseconds() {
+    var _this2 = this;
+
+    this.$ms = Object.keys(this.$d).reduce(function (total, unit) {
+      return total + (_this2.$d[unit] || 0) * unitToMS[unit];
+    }, 0);
+  };
+
+  _proto.parseFromMilliseconds = function parseFromMilliseconds() {
+    var $ms = this.$ms;
+    this.$d.years = roundNumber($ms / MILLISECONDS_A_YEAR);
+    $ms %= MILLISECONDS_A_YEAR;
+    this.$d.months = roundNumber($ms / MILLISECONDS_A_MONTH);
+    $ms %= MILLISECONDS_A_MONTH;
+    this.$d.days = roundNumber($ms / MILLISECONDS_A_DAY);
+    $ms %= MILLISECONDS_A_DAY;
+    this.$d.hours = roundNumber($ms / MILLISECONDS_A_HOUR);
+    $ms %= MILLISECONDS_A_HOUR;
+    this.$d.minutes = roundNumber($ms / MILLISECONDS_A_MINUTE);
+    $ms %= MILLISECONDS_A_MINUTE;
+    this.$d.seconds = roundNumber($ms / MILLISECONDS_A_SECOND);
+    $ms %= MILLISECONDS_A_SECOND;
+    this.$d.milliseconds = $ms;
+  };
+
+  _proto.toISOString = function toISOString() {
+    var Y = getNumberUnitFormat(this.$d.years, 'Y');
+    var M = getNumberUnitFormat(this.$d.months, 'M');
+    var days = +this.$d.days || 0;
+
+    if (this.$d.weeks) {
+      days += this.$d.weeks * 7;
+    }
+
+    var D = getNumberUnitFormat(days, 'D');
+    var H = getNumberUnitFormat(this.$d.hours, 'H');
+    var m = getNumberUnitFormat(this.$d.minutes, 'M');
+    var seconds = this.$d.seconds || 0;
+
+    if (this.$d.milliseconds) {
+      seconds += this.$d.milliseconds / 1000;
+      seconds = Math.round(seconds * 1000) / 1000;
+    }
+
+    var S = getNumberUnitFormat(seconds, 'S');
+    var negativeMode = Y.negative || M.negative || D.negative || H.negative || m.negative || S.negative;
+    var T = H.format || m.format || S.format ? 'T' : '';
+    var P = negativeMode ? '-' : '';
+    var result = P + "P" + Y.format + M.format + D.format + T + H.format + m.format + S.format;
+    return result === 'P' || result === '-P' ? 'P0D' : result;
+  };
+
+  _proto.toJSON = function toJSON() {
+    return this.toISOString();
+  };
+
+  _proto.format = function format(formatStr) {
+    var str = formatStr || 'YYYY-MM-DDTHH:mm:ss';
+    var matches = {
+      Y: this.$d.years,
+      YY: $u.s(this.$d.years, 2, '0'),
+      YYYY: $u.s(this.$d.years, 4, '0'),
+      M: this.$d.months,
+      MM: $u.s(this.$d.months, 2, '0'),
+      D: this.$d.days,
+      DD: $u.s(this.$d.days, 2, '0'),
+      H: this.$d.hours,
+      HH: $u.s(this.$d.hours, 2, '0'),
+      m: this.$d.minutes,
+      mm: $u.s(this.$d.minutes, 2, '0'),
+      s: this.$d.seconds,
+      ss: $u.s(this.$d.seconds, 2, '0'),
+      SSS: $u.s(this.$d.milliseconds, 3, '0')
+    };
+    return str.replace(REGEX_FORMAT, function (match, $1) {
+      return $1 || String(matches[match]);
+    });
+  };
+
+  _proto.as = function as(unit) {
+    return this.$ms / unitToMS[prettyUnit(unit)];
+  };
+
+  _proto.get = function get(unit) {
+    var base = this.$ms;
+    var pUnit = prettyUnit(unit);
+
+    if (pUnit === 'milliseconds') {
+      base %= 1000;
+    } else if (pUnit === 'weeks') {
+      base = roundNumber(base / unitToMS[pUnit]);
+    } else {
+      base = this.$d[pUnit];
+    }
+
+    return base || 0; // a === 0 will be true on both 0 and -0
+  };
+
+  _proto.add = function add(input, unit, isSubtract) {
+    var another;
+
+    if (unit) {
+      another = input * unitToMS[prettyUnit(unit)];
+    } else if (isDuration(input)) {
+      another = input.$ms;
+    } else {
+      another = wrapper(input, this).$ms;
+    }
+
+    return wrapper(this.$ms + another * (isSubtract ? -1 : 1), this);
+  };
+
+  _proto.subtract = function subtract(input, unit) {
+    return this.add(input, unit, true);
+  };
+
+  _proto.locale = function locale(l) {
+    var that = this.clone();
+    that.$l = l;
+    return that;
+  };
+
+  _proto.clone = function clone() {
+    return wrapper(this.$ms, this);
+  };
+
+  _proto.humanize = function humanize(withSuffix) {
+    return $d().add(this.$ms, 'ms').locale(this.$l).fromNow(!withSuffix);
+  };
+
+  _proto.valueOf = function valueOf() {
+    return this.asMilliseconds();
+  };
+
+  _proto.milliseconds = function milliseconds() {
+    return this.get('milliseconds');
+  };
+
+  _proto.asMilliseconds = function asMilliseconds() {
+    return this.as('milliseconds');
+  };
+
+  _proto.seconds = function seconds() {
+    return this.get('seconds');
+  };
+
+  _proto.asSeconds = function asSeconds() {
+    return this.as('seconds');
+  };
+
+  _proto.minutes = function minutes() {
+    return this.get('minutes');
+  };
+
+  _proto.asMinutes = function asMinutes() {
+    return this.as('minutes');
+  };
+
+  _proto.hours = function hours() {
+    return this.get('hours');
+  };
+
+  _proto.asHours = function asHours() {
+    return this.as('hours');
+  };
+
+  _proto.days = function days() {
+    return this.get('days');
+  };
+
+  _proto.asDays = function asDays() {
+    return this.as('days');
+  };
+
+  _proto.weeks = function weeks() {
+    return this.get('weeks');
+  };
+
+  _proto.asWeeks = function asWeeks() {
+    return this.as('weeks');
+  };
+
+  _proto.months = function months() {
+    return this.get('months');
+  };
+
+  _proto.asMonths = function asMonths() {
+    return this.as('months');
+  };
+
+  _proto.years = function years() {
+    return this.get('years');
+  };
+
+  _proto.asYears = function asYears() {
+    return this.as('years');
+  };
+
+  return Duration;
+}();
+
+var manipulateDuration = function manipulateDuration(date, duration, k) {
+  return date.add(duration.years() * k, 'y').add(duration.months() * k, 'M').add(duration.days() * k, 'd').add(duration.hours() * k, 'h').add(duration.minutes() * k, 'm').add(duration.seconds() * k, 's').add(duration.milliseconds() * k, 'ms');
+};
+
+export default (function (option, Dayjs, dayjs) {
+  $d = dayjs;
+  $u = dayjs().$utils();
+
+  dayjs.duration = function (input, unit) {
+    var $l = dayjs.locale();
+    return wrapper(input, {
+      $l: $l
+    }, unit);
+  };
+
+  dayjs.isDuration = isDuration;
+  var oldAdd = Dayjs.prototype.add;
+  var oldSubtract = Dayjs.prototype.subtract;
+
+  Dayjs.prototype.add = function (value, unit) {
+    if (isDuration(value)) {
+      return manipulateDuration(this, value, 1);
+    }
+
+    return oldAdd.bind(this)(value, unit);
+  };
+
+  Dayjs.prototype.subtract = function (value, unit) {
+    if (isDuration(value)) {
+      return manipulateDuration(this, value, -1);
+    }
+
+    return oldSubtract.bind(this)(value, unit);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isBetween/index.d.ts b/node_modules/dayjs/esm/plugin/isBetween/index.d.ts
new file mode 100644
index 0000000..1c62711
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isBetween/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType, OpUnitType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isBetween(a: ConfigType, b: ConfigType, c?: OpUnitType | null, d?: '()' | '[]' | '[)' | '(]'): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isBetween/index.js b/node_modules/dayjs/esm/plugin/isBetween/index.js
new file mode 100644
index 0000000..2182a89
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isBetween/index.js
@@ -0,0 +1,10 @@
+export default (function (o, c, d) {
+  c.prototype.isBetween = function (a, b, u, i) {
+    var dA = d(a);
+    var dB = d(b);
+    i = i || '()';
+    var dAi = i[0] === '(';
+    var dBi = i[1] === ')';
+    return (dAi ? this.isAfter(dA, u) : !this.isBefore(dA, u)) && (dBi ? this.isBefore(dB, u) : !this.isAfter(dB, u)) || (dAi ? this.isBefore(dA, u) : !this.isAfter(dA, u)) && (dBi ? this.isAfter(dB, u) : !this.isBefore(dB, u));
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isLeapYear/index.d.ts b/node_modules/dayjs/esm/plugin/isLeapYear/index.d.ts
new file mode 100644
index 0000000..627ec5a
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isLeapYear/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isLeapYear(): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isLeapYear/index.js b/node_modules/dayjs/esm/plugin/isLeapYear/index.js
new file mode 100644
index 0000000..bf1309d
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isLeapYear/index.js
@@ -0,0 +1,7 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.isLeapYear = function () {
+    return this.$y % 4 === 0 && this.$y % 100 !== 0 || this.$y % 400 === 0;
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isMoment/index.d.ts b/node_modules/dayjs/esm/plugin/isMoment/index.d.ts
new file mode 100644
index 0000000..6e3a69f
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isMoment/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+
+  export function isMoment(input: any): boolean
+
+}
diff --git a/node_modules/dayjs/esm/plugin/isMoment/index.js b/node_modules/dayjs/esm/plugin/isMoment/index.js
new file mode 100644
index 0000000..48c8a89
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isMoment/index.js
@@ -0,0 +1,5 @@
+export default (function (o, c, f) {
+  f.isMoment = function (input) {
+    return f.isDayjs(input);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isSameOrAfter/index.d.ts b/node_modules/dayjs/esm/plugin/isSameOrAfter/index.d.ts
new file mode 100644
index 0000000..7b6d239
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isSameOrAfter/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType, OpUnitType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isSameOrAfter(date?: ConfigType, unit?: OpUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isSameOrAfter/index.js b/node_modules/dayjs/esm/plugin/isSameOrAfter/index.js
new file mode 100644
index 0000000..6a5c56f
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isSameOrAfter/index.js
@@ -0,0 +1,5 @@
+export default (function (o, c) {
+  c.prototype.isSameOrAfter = function (that, units) {
+    return this.isSame(that, units) || this.isAfter(that, units);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isSameOrBefore/index.d.ts b/node_modules/dayjs/esm/plugin/isSameOrBefore/index.d.ts
new file mode 100644
index 0000000..7ec009f
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isSameOrBefore/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType, OpUnitType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isSameOrBefore(date?: ConfigType, unit?: OpUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isSameOrBefore/index.js b/node_modules/dayjs/esm/plugin/isSameOrBefore/index.js
new file mode 100644
index 0000000..18d526a
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isSameOrBefore/index.js
@@ -0,0 +1,5 @@
+export default (function (o, c) {
+  c.prototype.isSameOrBefore = function (that, units) {
+    return this.isSame(that, units) || this.isBefore(that, units);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isToday/index.d.ts b/node_modules/dayjs/esm/plugin/isToday/index.d.ts
new file mode 100644
index 0000000..8d55da8
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isToday/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isToday(): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isToday/index.js b/node_modules/dayjs/esm/plugin/isToday/index.js
new file mode 100644
index 0000000..93b36c8
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isToday/index.js
@@ -0,0 +1,9 @@
+export default (function (o, c, d) {
+  var proto = c.prototype;
+
+  proto.isToday = function () {
+    var comparisonTemplate = 'YYYY-MM-DD';
+    var now = d();
+    return this.format(comparisonTemplate) === now.format(comparisonTemplate);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isTomorrow/index.d.ts b/node_modules/dayjs/esm/plugin/isTomorrow/index.d.ts
new file mode 100644
index 0000000..7652237
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isTomorrow/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isTomorrow(): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isTomorrow/index.js b/node_modules/dayjs/esm/plugin/isTomorrow/index.js
new file mode 100644
index 0000000..8cc7238
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isTomorrow/index.js
@@ -0,0 +1,9 @@
+export default (function (o, c, d) {
+  var proto = c.prototype;
+
+  proto.isTomorrow = function () {
+    var comparisonTemplate = 'YYYY-MM-DD';
+    var tomorrow = d().add(1, 'day');
+    return this.format(comparisonTemplate) === tomorrow.format(comparisonTemplate);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isYesterday/index.d.ts b/node_modules/dayjs/esm/plugin/isYesterday/index.d.ts
new file mode 100644
index 0000000..f4370dc
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isYesterday/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isYesterday(): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isYesterday/index.js b/node_modules/dayjs/esm/plugin/isYesterday/index.js
new file mode 100644
index 0000000..fa55373
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isYesterday/index.js
@@ -0,0 +1,9 @@
+export default (function (o, c, d) {
+  var proto = c.prototype;
+
+  proto.isYesterday = function () {
+    var comparisonTemplate = 'YYYY-MM-DD';
+    var yesterday = d().subtract(1, 'day');
+    return this.format(comparisonTemplate) === yesterday.format(comparisonTemplate);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isoWeek/index.d.ts b/node_modules/dayjs/esm/plugin/isoWeek/index.d.ts
new file mode 100644
index 0000000..6e6a75a
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isoWeek/index.d.ts
@@ -0,0 +1,27 @@
+import { PluginFunc, OpUnitType, ConfigType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+type ISOUnitType = OpUnitType | 'isoWeek';
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isoWeekYear(): number
+    isoWeek(): number
+    isoWeek(value: number): Dayjs
+
+    isoWeekday(): number
+    isoWeekday(value: number): Dayjs
+
+    startOf(unit: ISOUnitType): Dayjs
+
+    endOf(unit: ISOUnitType): Dayjs
+
+    isSame(date?: ConfigType, unit?: ISOUnitType): boolean
+
+    isBefore(date?: ConfigType, unit?: ISOUnitType): boolean
+
+    isAfter(date?: ConfigType, unit?: ISOUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isoWeek/index.js b/node_modules/dayjs/esm/plugin/isoWeek/index.js
new file mode 100644
index 0000000..289ea7c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isoWeek/index.js
@@ -0,0 +1,57 @@
+import { D, W, Y } from '../../constant';
+var isoWeekPrettyUnit = 'isoweek';
+export default (function (o, c, d) {
+  var getYearFirstThursday = function getYearFirstThursday(year, isUtc) {
+    var yearFirstDay = (isUtc ? d.utc : d)().year(year).startOf(Y);
+    var addDiffDays = 4 - yearFirstDay.isoWeekday();
+
+    if (yearFirstDay.isoWeekday() > 4) {
+      addDiffDays += 7;
+    }
+
+    return yearFirstDay.add(addDiffDays, D);
+  };
+
+  var getCurrentWeekThursday = function getCurrentWeekThursday(ins) {
+    return ins.add(4 - ins.isoWeekday(), D);
+  };
+
+  var proto = c.prototype;
+
+  proto.isoWeekYear = function () {
+    var nowWeekThursday = getCurrentWeekThursday(this);
+    return nowWeekThursday.year();
+  };
+
+  proto.isoWeek = function (week) {
+    if (!this.$utils().u(week)) {
+      return this.add((week - this.isoWeek()) * 7, D);
+    }
+
+    var nowWeekThursday = getCurrentWeekThursday(this);
+    var diffWeekThursday = getYearFirstThursday(this.isoWeekYear(), this.$u);
+    return nowWeekThursday.diff(diffWeekThursday, W) + 1;
+  };
+
+  proto.isoWeekday = function (week) {
+    if (!this.$utils().u(week)) {
+      return this.day(this.day() % 7 ? week : week - 7);
+    }
+
+    return this.day() || 7;
+  };
+
+  var oldStartOf = proto.startOf;
+
+  proto.startOf = function (units, startOf) {
+    var utils = this.$utils();
+    var isStartOf = !utils.u(startOf) ? startOf : true;
+    var unit = utils.p(units);
+
+    if (unit === isoWeekPrettyUnit) {
+      return isStartOf ? this.date(this.date() - (this.isoWeekday() - 1)).startOf('day') : this.date(this.date() - 1 - (this.isoWeekday() - 1) + 7).endOf('day');
+    }
+
+    return oldStartOf.bind(this)(units, startOf);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/isoWeeksInYear/index.d.ts b/node_modules/dayjs/esm/plugin/isoWeeksInYear/index.d.ts
new file mode 100644
index 0000000..986360f
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isoWeeksInYear/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    isoWeeksInYear(): number
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/isoWeeksInYear/index.js b/node_modules/dayjs/esm/plugin/isoWeeksInYear/index.js
new file mode 100644
index 0000000..7161894
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/isoWeeksInYear/index.js
@@ -0,0 +1,15 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.isoWeeksInYear = function () {
+    var isLeapYear = this.isLeapYear();
+    var last = this.endOf('y');
+    var day = last.day();
+
+    if (day === 4 || isLeapYear && day === 5) {
+      return 53;
+    }
+
+    return 52;
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/localeData/index.d.ts b/node_modules/dayjs/esm/plugin/localeData/index.d.ts
new file mode 100644
index 0000000..9f8762e
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/localeData/index.d.ts
@@ -0,0 +1,44 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  type WeekdayNames = [string, string, string, string, string, string, string];
+  type MonthNames = [string, string, string, string, string, string, string, string, string, string, string, string];
+
+  interface InstanceLocaleDataReturn {
+    firstDayOfWeek(): number;
+    weekdays(instance?: Dayjs): WeekdayNames;
+    weekdaysShort(instance?: Dayjs): WeekdayNames;
+    weekdaysMin(instance?: Dayjs): WeekdayNames;
+    months(instance?: Dayjs): MonthNames;
+    monthsShort(instance?: Dayjs): MonthNames;
+    longDateFormat(format: string): string;
+    meridiem(hour?: number, minute?: number, isLower?: boolean): string;
+    ordinal(n: number): string
+  }
+
+  interface GlobalLocaleDataReturn {
+    firstDayOfWeek(): number;
+    weekdays(): WeekdayNames;
+    weekdaysShort(): WeekdayNames;
+    weekdaysMin(): WeekdayNames;
+    months(): MonthNames;
+    monthsShort(): MonthNames;
+    longDateFormat(format: string): string;
+    meridiem(hour?: number, minute?: number, isLower?: boolean): string;
+    ordinal(n: number): string
+  }
+
+  interface Dayjs {
+    localeData(): InstanceLocaleDataReturn;
+  }
+
+  export function weekdays(localOrder?: boolean): WeekdayNames;
+  export function weekdaysShort(localOrder?: boolean): WeekdayNames;
+  export function weekdaysMin(localOrder?: boolean): WeekdayNames;
+  export function monthsShort(): MonthNames;
+  export function months(): MonthNames;
+  export function localeData(): GlobalLocaleDataReturn;
+}
diff --git a/node_modules/dayjs/esm/plugin/localeData/index.js b/node_modules/dayjs/esm/plugin/localeData/index.js
new file mode 100644
index 0000000..c48d92c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/localeData/index.js
@@ -0,0 +1,114 @@
+import { t } from '../localizedFormat/utils';
+export default (function (o, c, dayjs) {
+  // locale needed later
+  var proto = c.prototype;
+
+  var getLocalePart = function getLocalePart(part) {
+    return part && (part.indexOf ? part : part.s);
+  };
+
+  var getShort = function getShort(ins, target, full, num, localeOrder) {
+    var locale = ins.name ? ins : ins.$locale();
+    var targetLocale = getLocalePart(locale[target]);
+    var fullLocale = getLocalePart(locale[full]);
+    var result = targetLocale || fullLocale.map(function (f) {
+      return f.slice(0, num);
+    });
+    if (!localeOrder) return result;
+    var weekStart = locale.weekStart;
+    return result.map(function (_, index) {
+      return result[(index + (weekStart || 0)) % 7];
+    });
+  };
+
+  var getDayjsLocaleObject = function getDayjsLocaleObject() {
+    return dayjs.Ls[dayjs.locale()];
+  };
+
+  var getLongDateFormat = function getLongDateFormat(l, format) {
+    return l.formats[format] || t(l.formats[format.toUpperCase()]);
+  };
+
+  var localeData = function localeData() {
+    var _this = this;
+
+    return {
+      months: function months(instance) {
+        return instance ? instance.format('MMMM') : getShort(_this, 'months');
+      },
+      monthsShort: function monthsShort(instance) {
+        return instance ? instance.format('MMM') : getShort(_this, 'monthsShort', 'months', 3);
+      },
+      firstDayOfWeek: function firstDayOfWeek() {
+        return _this.$locale().weekStart || 0;
+      },
+      weekdays: function weekdays(instance) {
+        return instance ? instance.format('dddd') : getShort(_this, 'weekdays');
+      },
+      weekdaysMin: function weekdaysMin(instance) {
+        return instance ? instance.format('dd') : getShort(_this, 'weekdaysMin', 'weekdays', 2);
+      },
+      weekdaysShort: function weekdaysShort(instance) {
+        return instance ? instance.format('ddd') : getShort(_this, 'weekdaysShort', 'weekdays', 3);
+      },
+      longDateFormat: function longDateFormat(format) {
+        return getLongDateFormat(_this.$locale(), format);
+      },
+      meridiem: this.$locale().meridiem,
+      ordinal: this.$locale().ordinal
+    };
+  };
+
+  proto.localeData = function () {
+    return localeData.bind(this)();
+  };
+
+  dayjs.localeData = function () {
+    var localeObject = getDayjsLocaleObject();
+    return {
+      firstDayOfWeek: function firstDayOfWeek() {
+        return localeObject.weekStart || 0;
+      },
+      weekdays: function weekdays() {
+        return dayjs.weekdays();
+      },
+      weekdaysShort: function weekdaysShort() {
+        return dayjs.weekdaysShort();
+      },
+      weekdaysMin: function weekdaysMin() {
+        return dayjs.weekdaysMin();
+      },
+      months: function months() {
+        return dayjs.months();
+      },
+      monthsShort: function monthsShort() {
+        return dayjs.monthsShort();
+      },
+      longDateFormat: function longDateFormat(format) {
+        return getLongDateFormat(localeObject, format);
+      },
+      meridiem: localeObject.meridiem,
+      ordinal: localeObject.ordinal
+    };
+  };
+
+  dayjs.months = function () {
+    return getShort(getDayjsLocaleObject(), 'months');
+  };
+
+  dayjs.monthsShort = function () {
+    return getShort(getDayjsLocaleObject(), 'monthsShort', 'months', 3);
+  };
+
+  dayjs.weekdays = function (localeOrder) {
+    return getShort(getDayjsLocaleObject(), 'weekdays', null, null, localeOrder);
+  };
+
+  dayjs.weekdaysShort = function (localeOrder) {
+    return getShort(getDayjsLocaleObject(), 'weekdaysShort', 'weekdays', 3, localeOrder);
+  };
+
+  dayjs.weekdaysMin = function (localeOrder) {
+    return getShort(getDayjsLocaleObject(), 'weekdaysMin', 'weekdays', 2, localeOrder);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/localizedFormat/index.d.ts b/node_modules/dayjs/esm/plugin/localizedFormat/index.d.ts
new file mode 100644
index 0000000..a17c896
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/localizedFormat/index.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/localizedFormat/index.js b/node_modules/dayjs/esm/plugin/localizedFormat/index.js
new file mode 100644
index 0000000..9defb1f
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/localizedFormat/index.js
@@ -0,0 +1,20 @@
+import { FORMAT_DEFAULT } from '../../constant';
+import { u, englishFormats } from './utils';
+export default (function (o, c, d) {
+  var proto = c.prototype;
+  var oldFormat = proto.format;
+  d.en.formats = englishFormats;
+
+  proto.format = function (formatStr) {
+    if (formatStr === void 0) {
+      formatStr = FORMAT_DEFAULT;
+    }
+
+    var _this$$locale = this.$locale(),
+        _this$$locale$formats = _this$$locale.formats,
+        formats = _this$$locale$formats === void 0 ? {} : _this$$locale$formats;
+
+    var result = u(formatStr, formats);
+    return oldFormat.call(this, result);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/localizedFormat/utils.js b/node_modules/dayjs/esm/plugin/localizedFormat/utils.js
new file mode 100644
index 0000000..1f48eff
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/localizedFormat/utils.js
@@ -0,0 +1,20 @@
+// eslint-disable-next-line import/prefer-default-export
+export var t = function t(format) {
+  return format.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g, function (_, a, b) {
+    return a || b.slice(1);
+  });
+};
+export var englishFormats = {
+  LTS: 'h:mm:ss A',
+  LT: 'h:mm A',
+  L: 'MM/DD/YYYY',
+  LL: 'MMMM D, YYYY',
+  LLL: 'MMMM D, YYYY h:mm A',
+  LLLL: 'dddd, MMMM D, YYYY h:mm A'
+};
+export var u = function u(formatStr, formats) {
+  return formatStr.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g, function (_, a, b) {
+    var B = b && b.toUpperCase();
+    return a || formats[b] || englishFormats[b] || t(formats[B]);
+  });
+};
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/minMax/index.d.ts b/node_modules/dayjs/esm/plugin/minMax/index.d.ts
new file mode 100644
index 0000000..143370c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/minMax/index.d.ts
@@ -0,0 +1,11 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  export function max(dayjs: Dayjs[]): Dayjs | null
+  export function max(...dayjs: Dayjs[]): Dayjs | null
+  export function min(dayjs: Dayjs[]): Dayjs | null
+  export function min(...dayjs: Dayjs[]): Dayjs | null
+}
diff --git a/node_modules/dayjs/esm/plugin/minMax/index.js b/node_modules/dayjs/esm/plugin/minMax/index.js
new file mode 100644
index 0000000..0fd68e9
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/minMax/index.js
@@ -0,0 +1,39 @@
+export default (function (o, c, d) {
+  var sortBy = function sortBy(method, dates) {
+    if (!dates || !dates.length || dates.length === 1 && !dates[0] || dates.length === 1 && Array.isArray(dates[0]) && !dates[0].length) {
+      return null;
+    }
+
+    if (dates.length === 1 && dates[0].length > 0) {
+      var _dates = dates;
+      dates = _dates[0];
+    }
+
+    dates = dates.filter(function (date) {
+      return date;
+    });
+    var result;
+    var _dates2 = dates;
+    result = _dates2[0];
+
+    for (var i = 1; i < dates.length; i += 1) {
+      if (!dates[i].isValid() || dates[i][method](result)) {
+        result = dates[i];
+      }
+    }
+
+    return result;
+  };
+
+  d.max = function () {
+    var args = [].slice.call(arguments, 0); // eslint-disable-line prefer-rest-params
+
+    return sortBy('isAfter', args);
+  };
+
+  d.min = function () {
+    var args = [].slice.call(arguments, 0); // eslint-disable-line prefer-rest-params
+
+    return sortBy('isBefore', args);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/objectSupport/index.d.ts b/node_modules/dayjs/esm/plugin/objectSupport/index.d.ts
new file mode 100644
index 0000000..03b8b7c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/objectSupport/index.d.ts
@@ -0,0 +1,48 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+    interface Dayjs {
+        set(argument: object): Dayjs
+        add(argument: object): Dayjs
+        subtract(argument: object): Dayjs
+    }
+
+    interface ConfigTypeMap {
+        objectSupport: {
+            years?: number | string;
+            year?: number | string;
+            y?: number | string;
+
+            months?: number | string;
+            month?: number | string;
+            M?: number | string;
+
+            days?: number | string;
+            day?: number | string;
+            d?: number | string;
+
+            dates?: number | string;
+            date?: number | string;
+            D?: number | string;
+
+            hours?: number | string;
+            hour?: number | string;
+            h?: number | string;
+
+            minutes?: number | string;
+            minute?: number | string;
+            m?: number | string;
+
+            seconds?: number | string;
+            second?: number | string;
+            s?: number | string;
+
+            milliseconds?: number | string;
+            millisecond?: number | string;
+            ms?: number | string;
+        }
+    }
+}
diff --git a/node_modules/dayjs/esm/plugin/objectSupport/index.js b/node_modules/dayjs/esm/plugin/objectSupport/index.js
new file mode 100644
index 0000000..61636e7
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/objectSupport/index.js
@@ -0,0 +1,97 @@
+export default (function (o, c, dayjs) {
+  var proto = c.prototype;
+
+  var isObject = function isObject(obj) {
+    return obj !== null && !(obj instanceof Date) && !(obj instanceof Array) && !proto.$utils().u(obj) && obj.constructor.name === 'Object';
+  };
+
+  var prettyUnit = function prettyUnit(u) {
+    var unit = proto.$utils().p(u);
+    return unit === 'date' ? 'day' : unit;
+  };
+
+  var parseDate = function parseDate(cfg) {
+    var date = cfg.date,
+        utc = cfg.utc;
+    var $d = {};
+
+    if (isObject(date)) {
+      if (!Object.keys(date).length) {
+        return new Date();
+      }
+
+      var now = utc ? dayjs.utc() : dayjs();
+      Object.keys(date).forEach(function (k) {
+        $d[prettyUnit(k)] = date[k];
+      });
+      var d = $d.day || (!$d.year && !($d.month >= 0) ? now.date() : 1);
+      var y = $d.year || now.year();
+      var M = $d.month >= 0 ? $d.month : !$d.year && !$d.day ? now.month() : 0; // eslint-disable-line no-nested-ternary,max-len
+
+      var h = $d.hour || 0;
+      var m = $d.minute || 0;
+      var s = $d.second || 0;
+      var ms = $d.millisecond || 0;
+
+      if (utc) {
+        return new Date(Date.UTC(y, M, d, h, m, s, ms));
+      }
+
+      return new Date(y, M, d, h, m, s, ms);
+    }
+
+    return date;
+  };
+
+  var oldParse = proto.parse;
+
+  proto.parse = function (cfg) {
+    cfg.date = parseDate.bind(this)(cfg);
+    oldParse.bind(this)(cfg);
+  };
+
+  var oldSet = proto.set;
+  var oldAdd = proto.add;
+  var oldSubtract = proto.subtract;
+
+  var callObject = function callObject(call, argument, string, offset) {
+    if (offset === void 0) {
+      offset = 1;
+    }
+
+    var keys = Object.keys(argument);
+    var chain = this;
+    keys.forEach(function (key) {
+      chain = call.bind(chain)(argument[key] * offset, key);
+    });
+    return chain;
+  };
+
+  proto.set = function (unit, value) {
+    value = value === undefined ? unit : value;
+
+    if (unit.constructor.name === 'Object') {
+      return callObject.bind(this)(function (i, s) {
+        return oldSet.bind(this)(s, i);
+      }, value, unit);
+    }
+
+    return oldSet.bind(this)(unit, value);
+  };
+
+  proto.add = function (value, unit) {
+    if (value.constructor.name === 'Object') {
+      return callObject.bind(this)(oldAdd, value, unit);
+    }
+
+    return oldAdd.bind(this)(value, unit);
+  };
+
+  proto.subtract = function (value, unit) {
+    if (value.constructor.name === 'Object') {
+      return callObject.bind(this)(oldAdd, value, unit, -1);
+    }
+
+    return oldSubtract.bind(this)(value, unit);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/pluralGetSet/index.d.ts b/node_modules/dayjs/esm/plugin/pluralGetSet/index.d.ts
new file mode 100644
index 0000000..7ef7167
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/pluralGetSet/index.d.ts
@@ -0,0 +1,44 @@
+import { PluginFunc, UnitType, ConfigType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    years(): number
+
+    years(value: number): Dayjs
+
+    months(): number
+
+    months(value: number): Dayjs
+
+    dates(): number
+
+    dates(value: number): Dayjs
+
+    weeks(): number
+
+    weeks(value: number): Dayjs
+
+    days(): number
+
+    days(value: number): Dayjs
+
+    hours(): number
+
+    hours(value: number): Dayjs
+
+    minutes(): number
+
+    minutes(value: number): Dayjs
+
+    seconds(): number
+
+    seconds(value: number): Dayjs
+
+    milliseconds(): number
+
+    milliseconds(value: number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/pluralGetSet/index.js b/node_modules/dayjs/esm/plugin/pluralGetSet/index.js
new file mode 100644
index 0000000..d8214d6
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/pluralGetSet/index.js
@@ -0,0 +1,7 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+  var pluralAliases = ['milliseconds', 'seconds', 'minutes', 'hours', 'days', 'weeks', 'isoWeeks', 'months', 'quarters', 'years', 'dates'];
+  pluralAliases.forEach(function (alias) {
+    proto[alias] = proto[alias.replace(/s$/, '')];
+  });
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/preParsePostFormat/index.d.ts b/node_modules/dayjs/esm/plugin/preParsePostFormat/index.d.ts
new file mode 100644
index 0000000..a17c896
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/preParsePostFormat/index.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/esm/plugin/preParsePostFormat/index.js b/node_modules/dayjs/esm/plugin/preParsePostFormat/index.js
new file mode 100644
index 0000000..7654ccb
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/preParsePostFormat/index.js
@@ -0,0 +1,40 @@
+// Plugin template from https://day.js.org/docs/en/plugin/plugin
+export default (function (option, dayjsClass) {
+  var oldParse = dayjsClass.prototype.parse;
+
+  dayjsClass.prototype.parse = function (cfg) {
+    if (typeof cfg.date === 'string') {
+      var locale = this.$locale();
+      cfg.date = locale && locale.preparse ? locale.preparse(cfg.date) : cfg.date;
+    } // original parse result
+
+
+    return oldParse.bind(this)(cfg);
+  }; // // overriding existing API
+  // // e.g. extend dayjs().format()
+
+
+  var oldFormat = dayjsClass.prototype.format;
+
+  dayjsClass.prototype.format = function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    // original format result
+    var result = oldFormat.call.apply(oldFormat, [this].concat(args)); // return modified result
+
+    var locale = this.$locale();
+    return locale && locale.postformat ? locale.postformat(result) : result;
+  };
+
+  var oldFromTo = dayjsClass.prototype.fromToBase;
+
+  if (oldFromTo) {
+    dayjsClass.prototype.fromToBase = function (input, withoutSuffix, instance, isFrom) {
+      var locale = this.$locale() || instance.$locale(); // original format result
+
+      return oldFromTo.call(this, input, withoutSuffix, instance, isFrom, locale && locale.postformat);
+    };
+  }
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/quarterOfYear/index.d.ts b/node_modules/dayjs/esm/plugin/quarterOfYear/index.d.ts
new file mode 100644
index 0000000..37691c1
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/quarterOfYear/index.d.ts
@@ -0,0 +1,26 @@
+import { PluginFunc, ConfigType, QUnitType, OpUnitType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    quarter(): number
+
+    quarter(quarter: number): Dayjs
+
+    add(value: number, unit: QUnitType): Dayjs
+
+    subtract(value: number, unit: QUnitType): Dayjs
+
+    startOf(unit: QUnitType | OpUnitType): Dayjs
+
+    endOf(unit: QUnitType | OpUnitType): Dayjs
+
+    isSame(date?: ConfigType, unit?: QUnitType): boolean
+
+    isBefore(date?: ConfigType, unit?: QUnitType): boolean
+
+    isAfter(date?: ConfigType, unit?: QUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/quarterOfYear/index.js b/node_modules/dayjs/esm/plugin/quarterOfYear/index.js
new file mode 100644
index 0000000..e376889
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/quarterOfYear/index.js
@@ -0,0 +1,41 @@
+import { Q, M, D } from '../../constant';
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.quarter = function (quarter) {
+    if (!this.$utils().u(quarter)) {
+      return this.month(this.month() % 3 + (quarter - 1) * 3);
+    }
+
+    return Math.ceil((this.month() + 1) / 3);
+  };
+
+  var oldAdd = proto.add;
+
+  proto.add = function (number, units) {
+    number = Number(number); // eslint-disable-line no-param-reassign
+
+    var unit = this.$utils().p(units);
+
+    if (unit === Q) {
+      return this.add(number * 3, M);
+    }
+
+    return oldAdd.bind(this)(number, units);
+  };
+
+  var oldStartOf = proto.startOf;
+
+  proto.startOf = function (units, startOf) {
+    var utils = this.$utils();
+    var isStartOf = !utils.u(startOf) ? startOf : true;
+    var unit = utils.p(units);
+
+    if (unit === Q) {
+      var quarter = this.quarter() - 1;
+      return isStartOf ? this.month(quarter * 3).startOf(M).startOf(D) : this.month(quarter * 3 + 2).endOf(M).endOf(D);
+    }
+
+    return oldStartOf.bind(this)(units, startOf);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/relativeTime/index.d.ts b/node_modules/dayjs/esm/plugin/relativeTime/index.d.ts
new file mode 100644
index 0000000..e1b17cf
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/relativeTime/index.d.ts
@@ -0,0 +1,24 @@
+import { PluginFunc, ConfigType } from 'dayjs/esm'
+
+declare interface RelativeTimeThreshold {
+  l: string
+  r?: number
+  d?: string
+}
+
+declare interface RelativeTimeOptions {
+  rounding?: (num: number) => number
+  thresholds?: RelativeTimeThreshold[]
+}
+
+declare const plugin: PluginFunc<RelativeTimeOptions>
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    fromNow(withoutSuffix?: boolean): string
+    from(compared: ConfigType, withoutSuffix?: boolean): string
+    toNow(withoutSuffix?: boolean): string
+    to(compared: ConfigType, withoutSuffix?: boolean): string
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/relativeTime/index.js b/node_modules/dayjs/esm/plugin/relativeTime/index.js
new file mode 100644
index 0000000..88fdbbe
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/relativeTime/index.js
@@ -0,0 +1,130 @@
+import * as C from '../../constant';
+export default (function (o, c, d) {
+  o = o || {};
+  var proto = c.prototype;
+  var relObj = {
+    future: 'in %s',
+    past: '%s ago',
+    s: 'a few seconds',
+    m: 'a minute',
+    mm: '%d minutes',
+    h: 'an hour',
+    hh: '%d hours',
+    d: 'a day',
+    dd: '%d days',
+    M: 'a month',
+    MM: '%d months',
+    y: 'a year',
+    yy: '%d years'
+  };
+  d.en.relativeTime = relObj;
+
+  proto.fromToBase = function (input, withoutSuffix, instance, isFrom, postFormat) {
+    var loc = instance.$locale().relativeTime || relObj;
+    var T = o.thresholds || [{
+      l: 's',
+      r: 44,
+      d: C.S
+    }, {
+      l: 'm',
+      r: 89
+    }, {
+      l: 'mm',
+      r: 44,
+      d: C.MIN
+    }, {
+      l: 'h',
+      r: 89
+    }, {
+      l: 'hh',
+      r: 21,
+      d: C.H
+    }, {
+      l: 'd',
+      r: 35
+    }, {
+      l: 'dd',
+      r: 25,
+      d: C.D
+    }, {
+      l: 'M',
+      r: 45
+    }, {
+      l: 'MM',
+      r: 10,
+      d: C.M
+    }, {
+      l: 'y',
+      r: 17
+    }, {
+      l: 'yy',
+      d: C.Y
+    }];
+    var Tl = T.length;
+    var result;
+    var out;
+    var isFuture;
+
+    for (var i = 0; i < Tl; i += 1) {
+      var t = T[i];
+
+      if (t.d) {
+        result = isFrom ? d(input).diff(instance, t.d, true) : instance.diff(input, t.d, true);
+      }
+
+      var abs = (o.rounding || Math.round)(Math.abs(result));
+      isFuture = result > 0;
+
+      if (abs <= t.r || !t.r) {
+        if (abs <= 1 && i > 0) t = T[i - 1]; // 1 minutes -> a minute, 0 seconds -> 0 second
+
+        var format = loc[t.l];
+
+        if (postFormat) {
+          abs = postFormat("" + abs);
+        }
+
+        if (typeof format === 'string') {
+          out = format.replace('%d', abs);
+        } else {
+          out = format(abs, withoutSuffix, t.l, isFuture);
+        }
+
+        break;
+      }
+    }
+
+    if (withoutSuffix) return out;
+    var pastOrFuture = isFuture ? loc.future : loc.past;
+
+    if (typeof pastOrFuture === 'function') {
+      return pastOrFuture(out);
+    }
+
+    return pastOrFuture.replace('%s', out);
+  };
+
+  function fromTo(input, withoutSuffix, instance, isFrom) {
+    return proto.fromToBase(input, withoutSuffix, instance, isFrom);
+  }
+
+  proto.to = function (input, withoutSuffix) {
+    return fromTo(input, withoutSuffix, this, true);
+  };
+
+  proto.from = function (input, withoutSuffix) {
+    return fromTo(input, withoutSuffix, this);
+  };
+
+  var makeNow = function makeNow(thisDay) {
+    return thisDay.$u ? d.utc() : d();
+  };
+
+  proto.toNow = function (withoutSuffix) {
+    return this.to(makeNow(this), withoutSuffix);
+  };
+
+  proto.fromNow = function (withoutSuffix) {
+    return this.from(makeNow(this), withoutSuffix);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/timezone/index.d.ts b/node_modules/dayjs/esm/plugin/timezone/index.d.ts
new file mode 100644
index 0000000..5a2d9f2
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/timezone/index.d.ts
@@ -0,0 +1,20 @@
+import { PluginFunc, ConfigType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    tz(timezone?: string, keepLocalTime?: boolean): Dayjs
+    offsetName(type?: 'short' | 'long'): string | undefined
+  }
+
+  interface DayjsTimezone {
+    (date?: ConfigType, timezone?: string): Dayjs
+    (date: ConfigType, format: string, timezone?: string): Dayjs
+    guess(): string
+    setDefault(timezone?: string): void
+  }
+
+  const tz: DayjsTimezone
+}
diff --git a/node_modules/dayjs/esm/plugin/timezone/index.js b/node_modules/dayjs/esm/plugin/timezone/index.js
new file mode 100644
index 0000000..490aff2
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/timezone/index.js
@@ -0,0 +1,189 @@
+import { MIN, MS } from '../../constant';
+var typeToPos = {
+  year: 0,
+  month: 1,
+  day: 2,
+  hour: 3,
+  minute: 4,
+  second: 5
+}; // Cache time-zone lookups from Intl.DateTimeFormat,
+// as it is a *very* slow method.
+
+var dtfCache = {};
+
+var getDateTimeFormat = function getDateTimeFormat(timezone, options) {
+  if (options === void 0) {
+    options = {};
+  }
+
+  var timeZoneName = options.timeZoneName || 'short';
+  var key = timezone + "|" + timeZoneName;
+  var dtf = dtfCache[key];
+
+  if (!dtf) {
+    dtf = new Intl.DateTimeFormat('en-US', {
+      hour12: false,
+      timeZone: timezone,
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+      timeZoneName: timeZoneName
+    });
+    dtfCache[key] = dtf;
+  }
+
+  return dtf;
+};
+
+export default (function (o, c, d) {
+  var defaultTimezone;
+
+  var makeFormatParts = function makeFormatParts(timestamp, timezone, options) {
+    if (options === void 0) {
+      options = {};
+    }
+
+    var date = new Date(timestamp);
+    var dtf = getDateTimeFormat(timezone, options);
+    return dtf.formatToParts(date);
+  };
+
+  var tzOffset = function tzOffset(timestamp, timezone) {
+    var formatResult = makeFormatParts(timestamp, timezone);
+    var filled = [];
+
+    for (var i = 0; i < formatResult.length; i += 1) {
+      var _formatResult$i = formatResult[i],
+          type = _formatResult$i.type,
+          value = _formatResult$i.value;
+      var pos = typeToPos[type];
+
+      if (pos >= 0) {
+        filled[pos] = parseInt(value, 10);
+      }
+    }
+
+    var hour = filled[3]; // Workaround for the same behavior in different node version
+    // https://github.com/nodejs/node/issues/33027
+
+    /* istanbul ignore next */
+
+    var fixedHour = hour === 24 ? 0 : hour;
+    var utcString = filled[0] + "-" + filled[1] + "-" + filled[2] + " " + fixedHour + ":" + filled[4] + ":" + filled[5] + ":000";
+    var utcTs = d.utc(utcString).valueOf();
+    var asTS = +timestamp;
+    var over = asTS % 1000;
+    asTS -= over;
+    return (utcTs - asTS) / (60 * 1000);
+  }; // find the right offset a given local time. The o input is our guess, which determines which
+  // offset we'll pick in ambiguous cases (e.g. there are two 3 AMs b/c Fallback DST)
+  // https://github.com/moment/luxon/blob/master/src/datetime.js#L76
+
+
+  var fixOffset = function fixOffset(localTS, o0, tz) {
+    // Our UTC time is just a guess because our offset is just a guess
+    var utcGuess = localTS - o0 * 60 * 1000; // Test whether the zone matches the offset for this ts
+
+    var o2 = tzOffset(utcGuess, tz); // If so, offset didn't change and we're done
+
+    if (o0 === o2) {
+      return [utcGuess, o0];
+    } // If not, change the ts by the difference in the offset
+
+
+    utcGuess -= (o2 - o0) * 60 * 1000; // If that gives us the local time we want, we're done
+
+    var o3 = tzOffset(utcGuess, tz);
+
+    if (o2 === o3) {
+      return [utcGuess, o2];
+    } // If it's different, we're in a hole time.
+    // The offset has changed, but the we don't adjust the time
+
+
+    return [localTS - Math.min(o2, o3) * 60 * 1000, Math.max(o2, o3)];
+  };
+
+  var proto = c.prototype;
+
+  proto.tz = function (timezone, keepLocalTime) {
+    if (timezone === void 0) {
+      timezone = defaultTimezone;
+    }
+
+    var oldOffset = this.utcOffset();
+    var date = this.toDate();
+    var target = date.toLocaleString('en-US', {
+      timeZone: timezone
+    });
+    var diff = Math.round((date - new Date(target)) / 1000 / 60);
+    var ins = d(target, {
+      locale: this.$L
+    }).$set(MS, this.$ms).utcOffset(-Math.round(date.getTimezoneOffset() / 15) * 15 - diff, true);
+
+    if (keepLocalTime) {
+      var newOffset = ins.utcOffset();
+      ins = ins.add(oldOffset - newOffset, MIN);
+    }
+
+    ins.$x.$timezone = timezone;
+    return ins;
+  };
+
+  proto.offsetName = function (type) {
+    // type: short(default) / long
+    var zone = this.$x.$timezone || d.tz.guess();
+    var result = makeFormatParts(this.valueOf(), zone, {
+      timeZoneName: type
+    }).find(function (m) {
+      return m.type.toLowerCase() === 'timezonename';
+    });
+    return result && result.value;
+  };
+
+  var oldStartOf = proto.startOf;
+
+  proto.startOf = function (units, startOf) {
+    if (!this.$x || !this.$x.$timezone) {
+      return oldStartOf.call(this, units, startOf);
+    }
+
+    var withoutTz = d(this.format('YYYY-MM-DD HH:mm:ss:SSS'), {
+      locale: this.$L
+    });
+    var startOfWithoutTz = oldStartOf.call(withoutTz, units, startOf);
+    return startOfWithoutTz.tz(this.$x.$timezone, true);
+  };
+
+  d.tz = function (input, arg1, arg2) {
+    var parseFormat = arg2 && arg1;
+    var timezone = arg2 || arg1 || defaultTimezone;
+    var previousOffset = tzOffset(+d(), timezone);
+
+    if (typeof input !== 'string') {
+      // timestamp number || js Date || Day.js
+      return d(input).tz(timezone);
+    }
+
+    var localTs = d.utc(input, parseFormat).valueOf();
+
+    var _fixOffset = fixOffset(localTs, previousOffset, timezone),
+        targetTs = _fixOffset[0],
+        targetOffset = _fixOffset[1];
+
+    var ins = d(targetTs).utcOffset(targetOffset);
+    ins.$x.$timezone = timezone;
+    return ins;
+  };
+
+  d.tz.guess = function () {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone;
+  };
+
+  d.tz.setDefault = function (timezone) {
+    defaultTimezone = timezone;
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/toArray/index.d.ts b/node_modules/dayjs/esm/plugin/toArray/index.d.ts
new file mode 100644
index 0000000..5033831
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/toArray/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    toArray(): number[]
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/toArray/index.js b/node_modules/dayjs/esm/plugin/toArray/index.js
new file mode 100644
index 0000000..2b795f4
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/toArray/index.js
@@ -0,0 +1,7 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.toArray = function () {
+    return [this.$y, this.$M, this.$D, this.$H, this.$m, this.$s, this.$ms];
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/toObject/index.d.ts b/node_modules/dayjs/esm/plugin/toObject/index.d.ts
new file mode 100644
index 0000000..ad21520
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/toObject/index.d.ts
@@ -0,0 +1,20 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+interface DayjsObject {
+  years: number
+  months: number
+  date: number
+  hours: number
+  minutes: number
+  seconds: number
+  milliseconds: number
+}
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    toObject(): DayjsObject
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/toObject/index.js b/node_modules/dayjs/esm/plugin/toObject/index.js
new file mode 100644
index 0000000..e35d93f
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/toObject/index.js
@@ -0,0 +1,15 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.toObject = function () {
+    return {
+      years: this.$y,
+      months: this.$M,
+      date: this.$D,
+      hours: this.$H,
+      minutes: this.$m,
+      seconds: this.$s,
+      milliseconds: this.$ms
+    };
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/updateLocale/index.d.ts b/node_modules/dayjs/esm/plugin/updateLocale/index.d.ts
new file mode 100644
index 0000000..994a884
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/updateLocale/index.d.ts
@@ -0,0 +1,8 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  export function updateLocale(localeName: string, customConfig: Record<string, unknown>): Record<string, unknown>
+}
diff --git a/node_modules/dayjs/esm/plugin/updateLocale/index.js b/node_modules/dayjs/esm/plugin/updateLocale/index.js
new file mode 100644
index 0000000..1b9965c
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/updateLocale/index.js
@@ -0,0 +1,12 @@
+export default (function (option, Dayjs, dayjs) {
+  dayjs.updateLocale = function (locale, customConfig) {
+    var localeList = dayjs.Ls;
+    var localeConfig = localeList[locale];
+    if (!localeConfig) return;
+    var customConfigKeys = customConfig ? Object.keys(customConfig) : [];
+    customConfigKeys.forEach(function (c) {
+      localeConfig[c] = customConfig[c];
+    });
+    return localeConfig; // eslint-disable-line consistent-return
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/utc/index.d.ts b/node_modules/dayjs/esm/plugin/utc/index.d.ts
new file mode 100644
index 0000000..15c61fe
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/utc/index.d.ts
@@ -0,0 +1,19 @@
+import { PluginFunc, ConfigType } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    
+    utc(keepLocalTime?: boolean): Dayjs
+    
+    local(): Dayjs
+
+    isUTC(): boolean
+
+    utcOffset(offset: number | string, keepLocalTime?: boolean): Dayjs
+  }
+
+  export function utc(config?: ConfigType, format?: string, strict?: boolean): Dayjs
+}
diff --git a/node_modules/dayjs/esm/plugin/utc/index.js b/node_modules/dayjs/esm/plugin/utc/index.js
new file mode 100644
index 0000000..a8a05f5
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/utc/index.js
@@ -0,0 +1,188 @@
+import { MILLISECONDS_A_MINUTE, MIN } from '../../constant';
+var REGEX_VALID_OFFSET_FORMAT = /[+-]\d\d(?::?\d\d)?/g;
+var REGEX_OFFSET_HOURS_MINUTES_FORMAT = /([+-]|\d\d)/g;
+
+function offsetFromString(value) {
+  if (value === void 0) {
+    value = '';
+  }
+
+  var offset = value.match(REGEX_VALID_OFFSET_FORMAT);
+
+  if (!offset) {
+    return null;
+  }
+
+  var _ref = ("" + offset[0]).match(REGEX_OFFSET_HOURS_MINUTES_FORMAT) || ['-', 0, 0],
+      indicator = _ref[0],
+      hoursOffset = _ref[1],
+      minutesOffset = _ref[2];
+
+  var totalOffsetInMinutes = +hoursOffset * 60 + +minutesOffset;
+
+  if (totalOffsetInMinutes === 0) {
+    return 0;
+  }
+
+  return indicator === '+' ? totalOffsetInMinutes : -totalOffsetInMinutes;
+}
+
+export default (function (option, Dayjs, dayjs) {
+  var proto = Dayjs.prototype;
+
+  dayjs.utc = function (date) {
+    var cfg = {
+      date: date,
+      utc: true,
+      args: arguments
+    }; // eslint-disable-line prefer-rest-params
+
+    return new Dayjs(cfg); // eslint-disable-line no-use-before-define
+  };
+
+  proto.utc = function (keepLocalTime) {
+    var ins = dayjs(this.toDate(), {
+      locale: this.$L,
+      utc: true
+    });
+
+    if (keepLocalTime) {
+      return ins.add(this.utcOffset(), MIN);
+    }
+
+    return ins;
+  };
+
+  proto.local = function () {
+    return dayjs(this.toDate(), {
+      locale: this.$L,
+      utc: false
+    });
+  };
+
+  var oldParse = proto.parse;
+
+  proto.parse = function (cfg) {
+    if (cfg.utc) {
+      this.$u = true;
+    }
+
+    if (!this.$utils().u(cfg.$offset)) {
+      this.$offset = cfg.$offset;
+    }
+
+    oldParse.call(this, cfg);
+  };
+
+  var oldInit = proto.init;
+
+  proto.init = function () {
+    if (this.$u) {
+      var $d = this.$d;
+      this.$y = $d.getUTCFullYear();
+      this.$M = $d.getUTCMonth();
+      this.$D = $d.getUTCDate();
+      this.$W = $d.getUTCDay();
+      this.$H = $d.getUTCHours();
+      this.$m = $d.getUTCMinutes();
+      this.$s = $d.getUTCSeconds();
+      this.$ms = $d.getUTCMilliseconds();
+    } else {
+      oldInit.call(this);
+    }
+  };
+
+  var oldUtcOffset = proto.utcOffset;
+
+  proto.utcOffset = function (input, keepLocalTime) {
+    var _this$$utils = this.$utils(),
+        u = _this$$utils.u;
+
+    if (u(input)) {
+      if (this.$u) {
+        return 0;
+      }
+
+      if (!u(this.$offset)) {
+        return this.$offset;
+      }
+
+      return oldUtcOffset.call(this);
+    }
+
+    if (typeof input === 'string') {
+      input = offsetFromString(input);
+
+      if (input === null) {
+        return this;
+      }
+    }
+
+    var offset = Math.abs(input) <= 16 ? input * 60 : input;
+    var ins = this;
+
+    if (keepLocalTime) {
+      ins.$offset = offset;
+      ins.$u = input === 0;
+      return ins;
+    }
+
+    if (input !== 0) {
+      var localTimezoneOffset = this.$u ? this.toDate().getTimezoneOffset() : -1 * this.utcOffset();
+      ins = this.local().add(offset + localTimezoneOffset, MIN);
+      ins.$offset = offset;
+      ins.$x.$localOffset = localTimezoneOffset;
+    } else {
+      ins = this.utc();
+    }
+
+    return ins;
+  };
+
+  var oldFormat = proto.format;
+  var UTC_FORMAT_DEFAULT = 'YYYY-MM-DDTHH:mm:ss[Z]';
+
+  proto.format = function (formatStr) {
+    var str = formatStr || (this.$u ? UTC_FORMAT_DEFAULT : '');
+    return oldFormat.call(this, str);
+  };
+
+  proto.valueOf = function () {
+    var addedOffset = !this.$utils().u(this.$offset) ? this.$offset + (this.$x.$localOffset || this.$d.getTimezoneOffset()) : 0;
+    return this.$d.valueOf() - addedOffset * MILLISECONDS_A_MINUTE;
+  };
+
+  proto.isUTC = function () {
+    return !!this.$u;
+  };
+
+  proto.toISOString = function () {
+    return this.toDate().toISOString();
+  };
+
+  proto.toString = function () {
+    return this.toDate().toUTCString();
+  };
+
+  var oldToDate = proto.toDate;
+
+  proto.toDate = function (type) {
+    if (type === 's' && this.$offset) {
+      return dayjs(this.format('YYYY-MM-DD HH:mm:ss:SSS')).toDate();
+    }
+
+    return oldToDate.call(this);
+  };
+
+  var oldDiff = proto.diff;
+
+  proto.diff = function (input, units, _float) {
+    if (input && this.$u === input.$u) {
+      return oldDiff.call(this, input, units, _float);
+    }
+
+    var localThis = this.local();
+    var localInput = dayjs(input).local();
+    return oldDiff.call(localThis, localInput, units, _float);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/weekOfYear/index.d.ts b/node_modules/dayjs/esm/plugin/weekOfYear/index.d.ts
new file mode 100644
index 0000000..340051b
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/weekOfYear/index.d.ts
@@ -0,0 +1,12 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    week(): number
+
+    week(value : number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/weekOfYear/index.js b/node_modules/dayjs/esm/plugin/weekOfYear/index.js
new file mode 100644
index 0000000..c92406e
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/weekOfYear/index.js
@@ -0,0 +1,44 @@
+import { MS, Y, D, W } from '../../constant';
+export default (function (o, c, d) {
+  var proto = c.prototype;
+
+  proto.week = function (week) {
+    if (week === void 0) {
+      week = null;
+    }
+
+    if (week !== null) {
+      return this.add((week - this.week()) * 7, D);
+    }
+
+    var yearStart = this.$locale().yearStart || 1;
+
+    if (this.month() === 11 && this.date() > 25) {
+      // d(this) is for badMutable
+      var nextYearStartDay = d(this).startOf(Y).add(1, Y).date(yearStart);
+      var thisEndOfWeek = d(this).endOf(W);
+
+      if (nextYearStartDay.isBefore(thisEndOfWeek)) {
+        return 1;
+      }
+    }
+
+    var yearStartDay = d(this).startOf(Y).date(yearStart);
+    var yearStartWeek = yearStartDay.startOf(W).subtract(1, MS);
+    var diffInWeek = this.diff(yearStartWeek, W, true);
+
+    if (diffInWeek < 0) {
+      return d(this).startOf('week').week();
+    }
+
+    return Math.ceil(diffInWeek);
+  };
+
+  proto.weeks = function (week) {
+    if (week === void 0) {
+      week = null;
+    }
+
+    return this.week(week);
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/weekYear/index.d.ts b/node_modules/dayjs/esm/plugin/weekYear/index.d.ts
new file mode 100644
index 0000000..5b713e5
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/weekYear/index.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    weekYear(): number
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/weekYear/index.js b/node_modules/dayjs/esm/plugin/weekYear/index.js
new file mode 100644
index 0000000..140dcd4
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/weekYear/index.js
@@ -0,0 +1,19 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.weekYear = function () {
+    var month = this.month();
+    var weekOfYear = this.week();
+    var year = this.year();
+
+    if (weekOfYear === 1 && month === 11) {
+      return year + 1;
+    }
+
+    if (month === 0 && weekOfYear >= 52) {
+      return year - 1;
+    }
+
+    return year;
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/plugin/weekday/index.d.ts b/node_modules/dayjs/esm/plugin/weekday/index.d.ts
new file mode 100644
index 0000000..41945e7
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/weekday/index.d.ts
@@ -0,0 +1,12 @@
+import { PluginFunc } from 'dayjs/esm'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs/esm' {
+  interface Dayjs {
+    weekday(): number
+
+    weekday(value: number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/esm/plugin/weekday/index.js b/node_modules/dayjs/esm/plugin/weekday/index.js
new file mode 100644
index 0000000..18032b3
--- /dev/null
+++ b/node_modules/dayjs/esm/plugin/weekday/index.js
@@ -0,0 +1,15 @@
+export default (function (o, c) {
+  var proto = c.prototype;
+
+  proto.weekday = function (input) {
+    var weekStart = this.$locale().weekStart || 0;
+    var $W = this.$W;
+    var weekday = ($W < weekStart ? $W + 7 : $W) - weekStart;
+
+    if (this.$utils().u(input)) {
+      return weekday;
+    }
+
+    return this.subtract(weekday, 'day').add(input, 'day');
+  };
+});
\ No newline at end of file
diff --git a/node_modules/dayjs/esm/utils.js b/node_modules/dayjs/esm/utils.js
new file mode 100644
index 0000000..b5a8131
--- /dev/null
+++ b/node_modules/dayjs/esm/utils.js
@@ -0,0 +1,58 @@
+import * as C from './constant';
+
+var padStart = function padStart(string, length, pad) {
+  var s = String(string);
+  if (!s || s.length >= length) return string;
+  return "" + Array(length + 1 - s.length).join(pad) + string;
+};
+
+var padZoneStr = function padZoneStr(instance) {
+  var negMinutes = -instance.utcOffset();
+  var minutes = Math.abs(negMinutes);
+  var hourOffset = Math.floor(minutes / 60);
+  var minuteOffset = minutes % 60;
+  return "" + (negMinutes <= 0 ? '+' : '-') + padStart(hourOffset, 2, '0') + ":" + padStart(minuteOffset, 2, '0');
+};
+
+var monthDiff = function monthDiff(a, b) {
+  // function from moment.js in order to keep the same result
+  if (a.date() < b.date()) return -monthDiff(b, a);
+  var wholeMonthDiff = (b.year() - a.year()) * 12 + (b.month() - a.month());
+  var anchor = a.clone().add(wholeMonthDiff, C.M);
+  var c = b - anchor < 0;
+  var anchor2 = a.clone().add(wholeMonthDiff + (c ? -1 : 1), C.M);
+  return +(-(wholeMonthDiff + (b - anchor) / (c ? anchor - anchor2 : anchor2 - anchor)) || 0);
+};
+
+var absFloor = function absFloor(n) {
+  return n < 0 ? Math.ceil(n) || 0 : Math.floor(n);
+};
+
+var prettyUnit = function prettyUnit(u) {
+  var special = {
+    M: C.M,
+    y: C.Y,
+    w: C.W,
+    d: C.D,
+    D: C.DATE,
+    h: C.H,
+    m: C.MIN,
+    s: C.S,
+    ms: C.MS,
+    Q: C.Q
+  };
+  return special[u] || String(u || '').toLowerCase().replace(/s$/, '');
+};
+
+var isUndefined = function isUndefined(s) {
+  return s === undefined;
+};
+
+export default {
+  s: padStart,
+  z: padZoneStr,
+  m: monthDiff,
+  a: absFloor,
+  p: prettyUnit,
+  u: isUndefined
+};
\ No newline at end of file
diff --git a/node_modules/dayjs/index.d.ts b/node_modules/dayjs/index.d.ts
new file mode 100644
index 0000000..766bd79
--- /dev/null
+++ b/node_modules/dayjs/index.d.ts
@@ -0,0 +1,429 @@
+/// <reference path="./locale/index.d.ts" />
+
+export = dayjs;
+
+declare function dayjs (date?: dayjs.ConfigType): dayjs.Dayjs
+
+declare function dayjs (date?: dayjs.ConfigType, format?: dayjs.OptionType, strict?: boolean): dayjs.Dayjs
+
+declare function dayjs (date?: dayjs.ConfigType, format?: dayjs.OptionType, locale?: string, strict?: boolean): dayjs.Dayjs
+
+declare namespace dayjs {
+  interface ConfigTypeMap {
+    default: string | number | Date | Dayjs | null | undefined
+  }
+
+  export type ConfigType = ConfigTypeMap[keyof ConfigTypeMap]
+
+  export interface FormatObject { locale?: string, format?: string, utc?: boolean }
+
+  export type OptionType = FormatObject | string | string[]
+
+  export type UnitTypeShort = 'd' | 'D' | 'M' | 'y' | 'h' | 'm' | 's' | 'ms'
+
+  export type UnitTypeLong = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' | 'date'
+
+  export type UnitTypeLongPlural = 'milliseconds' | 'seconds' | 'minutes' | 'hours' | 'days' | 'months' | 'years' | 'dates'
+  
+  export type UnitType = UnitTypeLong | UnitTypeLongPlural | UnitTypeShort;
+
+  export type OpUnitType = UnitType | "week" | "weeks" | 'w';
+  export type QUnitType = UnitType | "quarter" | "quarters" | 'Q';
+  export type ManipulateType = Exclude<OpUnitType, 'date' | 'dates'>;
+  class Dayjs {
+    constructor (config?: ConfigType)
+    /**
+     * All Day.js objects are immutable. Still, `dayjs#clone` can create a clone of the current object if you need one.
+     * ```
+     * dayjs().clone()// => Dayjs
+     * dayjs(dayjs('2019-01-25')) // passing a Dayjs object to a constructor will also clone it
+     * ```
+     * Docs: https://day.js.org/docs/en/parse/dayjs-clone
+     */
+    clone(): Dayjs
+    /**
+     * This returns a `boolean` indicating whether the Day.js object contains a valid date or not.
+     * ```
+     * dayjs().isValid()// => boolean
+     * ```
+     * Docs: https://day.js.org/docs/en/parse/is-valid
+     */
+    isValid(): boolean
+    /**
+     * Get the year.
+     * ```
+     * dayjs().year()// => 2020
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/year
+     */
+    year(): number
+    /**
+     * Set the year.
+     * ```
+     * dayjs().year(2000)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/year
+     */
+    year(value: number): Dayjs
+    /**
+     * Get the month.
+     *
+     * Months are zero indexed, so January is month 0.
+     * ```
+     * dayjs().month()// => 0-11
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/month
+     */
+    month(): number
+    /**
+     * Set the month.
+     *
+     * Months are zero indexed, so January is month 0.
+     *
+     * Accepts numbers from 0 to 11. If the range is exceeded, it will bubble up to the next year.
+     * ```
+     * dayjs().month(0)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/month
+     */
+    month(value: number): Dayjs
+    /**
+     * Get the date of the month.
+     * ```
+     * dayjs().date()// => 1-31
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/date
+     */
+    date(): number
+    /**
+     * Set the date of the month.
+     *
+     * Accepts numbers from 1 to 31. If the range is exceeded, it will bubble up to the next months.
+     * ```
+     * dayjs().date(1)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/date
+     */
+    date(value: number): Dayjs
+    /**
+     * Get the day of the week.
+     *
+     * Returns numbers from 0 (Sunday) to 6 (Saturday).
+     * ```
+     * dayjs().day()// 0-6
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/day
+     */
+    day(): number
+    /**
+     * Set the day of the week.
+     *
+     * Accepts numbers from 0 (Sunday) to 6 (Saturday). If the range is exceeded, it will bubble up to next weeks.
+     * ```
+     * dayjs().day(0)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/day
+     */
+    day(value: number): Dayjs
+    /**
+     * Get the hour.
+     * ```
+     * dayjs().hour()// => 0-23
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/hour
+     */
+    hour(): number
+    /**
+     * Set the hour.
+     *
+     * Accepts numbers from 0 to 23. If the range is exceeded, it will bubble up to the next day.
+     * ```
+     * dayjs().hour(12)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/hour
+     */
+    hour(value: number): Dayjs
+    /**
+     * Get the minutes.
+     * ```
+     * dayjs().minute()// => 0-59
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/minute
+     */
+    minute(): number
+    /**
+     * Set the minutes.
+     *
+     * Accepts numbers from 0 to 59. If the range is exceeded, it will bubble up to the next hour.
+     * ```
+     * dayjs().minute(59)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/minute
+     */
+    minute(value: number): Dayjs
+    /**
+     * Get the seconds.
+     * ```
+     * dayjs().second()// => 0-59
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/second
+     */
+    second(): number
+    /**
+     * Set the seconds.
+     *
+     * Accepts numbers from 0 to 59. If the range is exceeded, it will bubble up to the next minutes.
+     * ```
+     * dayjs().second(1)// Dayjs
+     * ```
+     */
+    second(value: number): Dayjs
+    /**
+     * Get the milliseconds.
+     * ```
+     * dayjs().millisecond()// => 0-999
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/millisecond
+     */
+    millisecond(): number
+    /**
+     * Set the milliseconds.
+     *
+     * Accepts numbers from 0 to 999. If the range is exceeded, it will bubble up to the next seconds.
+     * ```
+     * dayjs().millisecond(1)// => Dayjs
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/millisecond
+     */
+    millisecond(value: number): Dayjs
+    /**
+     * Generic setter, accepting unit as first argument, and value as second, returns a new instance with the applied changes.
+     *
+     * In general:
+     * ```
+     * dayjs().set(unit, value) === dayjs()[unit](value)
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     * ```
+     * dayjs().set('date', 1)
+     * dayjs().set('month', 3) // April
+     * dayjs().set('second', 30)
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/set
+     */
+    set(unit: UnitType, value: number): Dayjs
+    /**
+     * String getter, returns the corresponding information getting from Day.js object.
+     *
+     * In general:
+     * ```
+     * dayjs().get(unit) === dayjs()[unit]()
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     * ```
+     * dayjs().get('year')
+     * dayjs().get('month') // start 0
+     * dayjs().get('date')
+     * ```
+     * Docs: https://day.js.org/docs/en/get-set/get
+     */
+    get(unit: UnitType): number
+    /**
+     * Returns a cloned Day.js object with a specified amount of time added.
+     * ```
+     * dayjs().add(7, 'day')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/add
+     */
+    add(value: number, unit?: ManipulateType): Dayjs
+    /**
+     * Returns a cloned Day.js object with a specified amount of time subtracted.
+     * ```
+     * dayjs().subtract(7, 'year')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/subtract
+     */
+    subtract(value: number, unit?: ManipulateType): Dayjs
+    /**
+     * Returns a cloned Day.js object and set it to the start of a unit of time.
+     * ```
+     * dayjs().startOf('year')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/start-of
+     */
+    startOf(unit: OpUnitType): Dayjs
+    /**
+     * Returns a cloned Day.js object and set it to the end of a unit of time.
+     * ```
+     * dayjs().endOf('month')// => Dayjs
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/manipulate/end-of
+     */
+    endOf(unit: OpUnitType): Dayjs
+    /**
+     * Get the formatted date according to the string of tokens passed in.
+     *
+     * To escape characters, wrap them in square brackets (e.g. [MM]).
+     * ```
+     * dayjs().format()// => current date in ISO8601, without fraction seconds e.g. '2020-04-02T08:02:17-05:00'
+     * dayjs('2019-01-25').format('[YYYYescape] YYYY-MM-DDTHH:mm:ssZ[Z]')// 'YYYYescape 2019-01-25T00:00:00-02:00Z'
+     * dayjs('2019-01-25').format('DD/MM/YYYY') // '25/01/2019'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/format
+     */
+    format(template?: string): string
+    /**
+     * This indicates the difference between two date-time in the specified unit.
+     *
+     * To get the difference in milliseconds, use `dayjs#diff`
+     * ```
+     * const date1 = dayjs('2019-01-25')
+     * const date2 = dayjs('2018-06-05')
+     * date1.diff(date2) // 20214000000 default milliseconds
+     * date1.diff() // milliseconds to current time
+     * ```
+     *
+     * To get the difference in another unit of measurement, pass that measurement as the second argument.
+     * ```
+     * const date1 = dayjs('2019-01-25')
+     * date1.diff('2018-06-05', 'month') // 7
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/display/difference
+     */
+    diff(date?: ConfigType, unit?: QUnitType | OpUnitType, float?: boolean): number
+    /**
+     * This returns the number of **milliseconds** since the Unix Epoch of the Day.js object.
+     * ```
+     * dayjs('2019-01-25').valueOf() // 1548381600000
+     * +dayjs(1548381600000) // 1548381600000
+     * ```
+     * To get a Unix timestamp (the number of seconds since the epoch) from a Day.js object, you should use Unix Timestamp `dayjs#unix()`.
+     *
+     * Docs: https://day.js.org/docs/en/display/unix-timestamp-milliseconds
+     */
+    valueOf(): number
+    /**
+     * This returns the Unix timestamp (the number of **seconds** since the Unix Epoch) of the Day.js object.
+     * ```
+     * dayjs('2019-01-25').unix() // 1548381600
+     * ```
+     * This value is floored to the nearest second, and does not include a milliseconds component.
+     *
+     * Docs: https://day.js.org/docs/en/display/unix-timestamp
+     */
+    unix(): number
+    /**
+     * Get the number of days in the current month.
+     * ```
+     * dayjs('2019-01-25').daysInMonth() // 31
+     * ```
+     * Docs: https://day.js.org/docs/en/display/days-in-month
+     */
+    daysInMonth(): number
+    /**
+     * To get a copy of the native `Date` object parsed from the Day.js object use `dayjs#toDate`.
+     * ```
+     * dayjs('2019-01-25').toDate()// => Date
+     * ```
+     */
+    toDate(): Date
+    /**
+     * To serialize as an ISO 8601 string.
+     * ```
+     * dayjs('2019-01-25').toJSON() // '2019-01-25T02:00:00.000Z'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/as-json
+     */
+    toJSON(): string
+    /**
+     * To format as an ISO 8601 string.
+     * ```
+     * dayjs('2019-01-25').toISOString() // '2019-01-25T02:00:00.000Z'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/as-iso-string
+     */
+    toISOString(): string
+    /**
+     * Returns a string representation of the date.
+     * ```
+     * dayjs('2019-01-25').toString() // 'Fri, 25 Jan 2019 02:00:00 GMT'
+     * ```
+     * Docs: https://day.js.org/docs/en/display/as-string
+     */
+    toString(): string
+    /**
+     * Get the UTC offset in minutes.
+     * ```
+     * dayjs().utcOffset()
+     * ```
+     * Docs: https://day.js.org/docs/en/manipulate/utc-offset
+     */
+    utcOffset(): number
+    /**
+     * This indicates whether the Day.js object is before the other supplied date-time.
+     * ```
+     * dayjs().isBefore(dayjs('2011-01-01')) // default milliseconds
+     * ```
+     * If you want to limit the granularity to a unit other than milliseconds, pass it as the second parameter.
+     * ```
+     * dayjs().isBefore('2011-01-01', 'year')// => boolean
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/query/is-before
+     */
+    isBefore(date?: ConfigType, unit?: OpUnitType): boolean
+    /**
+     * This indicates whether the Day.js object is the same as the other supplied date-time.
+     * ```
+     * dayjs().isSame(dayjs('2011-01-01')) // default milliseconds
+     * ```
+     * If you want to limit the granularity to a unit other than milliseconds, pass it as the second parameter.
+     * ```
+     * dayjs().isSame('2011-01-01', 'year')// => boolean
+     * ```
+     * Docs: https://day.js.org/docs/en/query/is-same
+     */
+    isSame(date?: ConfigType, unit?: OpUnitType): boolean
+    /**
+     * This indicates whether the Day.js object is after the other supplied date-time.
+     * ```
+     * dayjs().isAfter(dayjs('2011-01-01')) // default milliseconds
+     * ```
+     * If you want to limit the granularity to a unit other than milliseconds, pass it as the second parameter.
+     * ```
+     * dayjs().isAfter('2011-01-01', 'year')// => boolean
+     * ```
+     * Units are case insensitive, and support plural and short forms.
+     *
+     * Docs: https://day.js.org/docs/en/query/is-after
+     */
+    isAfter(date?: ConfigType, unit?: OpUnitType): boolean
+
+    locale(): string
+
+    locale(preset: string | ILocale, object?: Partial<ILocale>): Dayjs
+  }
+
+  export type PluginFunc<T = unknown> = (option: T, c: typeof Dayjs, d: typeof dayjs) => void
+
+  export function extend<T = unknown>(plugin: PluginFunc<T>, option?: T): Dayjs
+
+  export function locale(preset?: string | ILocale, object?: Partial<ILocale>, isLocal?: boolean): string
+
+  export function isDayjs(d: any): d is Dayjs
+
+  export function unix(t: number): Dayjs
+
+  const Ls : { [key: string] :  ILocale }
+}
diff --git a/node_modules/dayjs/locale.json b/node_modules/dayjs/locale.json
new file mode 100644
index 0000000..45a01c4
--- /dev/null
+++ b/node_modules/dayjs/locale.json
@@ -0,0 +1 @@
+[{"key":"af","name":"Afrikaans"},{"key":"am","name":"Amharic"},{"key":"ar-dz","name":"Arabic (Algeria)"},{"key":"ar-iq","name":" Arabic (Iraq)"},{"key":"ar-kw","name":"Arabic (Kuwait)"},{"key":"ar-ly","name":"Arabic (Lybia)"},{"key":"ar-ma","name":"Arabic (Morocco)"},{"key":"ar-sa","name":"Arabic (Saudi Arabia)"},{"key":"ar-tn","name":" Arabic (Tunisia)"},{"key":"ar","name":"Arabic"},{"key":"az","name":"Azerbaijani"},{"key":"be","name":"Belarusian"},{"key":"bg","name":"Bulgarian"},{"key":"bi","name":"Bislama"},{"key":"bm","name":"Bambara"},{"key":"bn-bd","name":"Bengali (Bangladesh)"},{"key":"bn","name":"Bengali"},{"key":"bo","name":"Tibetan"},{"key":"br","name":"Breton"},{"key":"bs","name":"Bosnian"},{"key":"ca","name":"Catalan"},{"key":"cs","name":"Czech"},{"key":"cv","name":"Chuvash"},{"key":"cy","name":"Welsh"},{"key":"da","name":"Danish"},{"key":"de-at","name":"German (Austria)"},{"key":"de-ch","name":"German (Switzerland)"},{"key":"de","name":"German"},{"key":"dv","name":"Maldivian"},{"key":"el","name":"Greek"},{"key":"en-au","name":"English (Australia)"},{"key":"en-ca","name":"English (Canada)"},{"key":"en-gb","name":"English (United Kingdom)"},{"key":"en-ie","name":"English (Ireland)"},{"key":"en-il","name":"English (Israel)"},{"key":"en-in","name":"English (India)"},{"key":"en-nz","name":"English (New Zealand)"},{"key":"en-sg","name":"English (Singapore)"},{"key":"en-tt","name":"English (Trinidad & Tobago)"},{"key":"en","name":"English"},{"key":"eo","name":"Esperanto"},{"key":"es-do","name":"Spanish (Dominican Republic)"},{"key":"es-mx","name":"Spanish (Mexico)"},{"key":"es-pr","name":"Spanish (Puerto Rico)"},{"key":"es-us","name":"Spanish (United States)"},{"key":"es","name":"Spanish"},{"key":"et","name":"Estonian"},{"key":"eu","name":"Basque"},{"key":"fa","name":"Persian"},{"key":"fi","name":"Finnish"},{"key":"fo","name":"Faroese"},{"key":"fr-ca","name":"French (Canada)"},{"key":"fr-ch","name":"French (Switzerland)"},{"key":"fr","name":"French"},{"key":"fy","name":"Frisian"},{"key":"ga","name":"Irish or Irish Gaelic"},{"key":"gd","name":"Scottish Gaelic"},{"key":"gl","name":"Galician"},{"key":"gom-latn","name":"Konkani Latin script"},{"key":"gu","name":"Gujarati"},{"key":"hi","name":"Hindi"},{"key":"he","name":"Hebrew"},{"key":"hr","name":"Croatian"},{"key":"ht","name":"Haitian Creole (Haiti)"},{"key":"hu","name":"Hungarian"},{"key":"hy-am","name":"Armenian"},{"key":"id","name":"Indonesian"},{"key":"is","name":"Icelandic"},{"key":"it-ch","name":"Italian (Switzerland)"},{"key":"it","name":"Italian"},{"key":"ja","name":"Japanese"},{"key":"jv","name":"Javanese"},{"key":"ka","name":"Georgian"},{"key":"kk","name":"Kazakh"},{"key":"km","name":"Cambodian"},{"key":"kn","name":"Kannada"},{"key":"ko","name":"Korean"},{"key":"ku","name":"Kurdish"},{"key":"ky","name":"Kyrgyz"},{"key":"lb","name":"Luxembourgish"},{"key":"lo","name":"Lao"},{"key":"lt","name":"Lithuanian"},{"key":"lv","name":"Latvian"},{"key":"me","name":"Montenegrin"},{"key":"mi","name":"Maori"},{"key":"mk","name":"Macedonian"},{"key":"ml","name":"Malayalam"},{"key":"mn","name":"Mongolian"},{"key":"mr","name":"Marathi"},{"key":"ms-my","name":"Malay"},{"key":"ms","name":"Malay"},{"key":"mt","name":"Maltese (Malta)"},{"key":"my","name":"Burmese"},{"key":"nb","name":"Norwegian Bokmål"},{"key":"ne","name":"Nepalese"},{"key":"nl-be","name":"Dutch (Belgium)"},{"key":"nl","name":"Dutch"},{"key":"nn","name":"Nynorsk"},{"key":"oc-lnc","name":"Occitan, lengadocian dialecte"},{"key":"pa-in","name":"Punjabi (India)"},{"key":"pl","name":"Polish"},{"key":"pt-br","name":"Portuguese (Brazil)"},{"key":"pt","name":"Portuguese"},{"key":"rn","name":"Kirundi"},{"key":"ro","name":"Romanian"},{"key":"sd","name":"Sindhi"},{"key":"si","name":"Sinhalese"},{"key":"se","name":"Northern Sami"},{"key":"sk","name":"Slovak"},{"key":"sl","name":"Slovenian"},{"key":"sq","name":"Albanian"},{"key":"sr-cyrl","name":"Serbian Cyrillic"},{"key":"sr","name":"Serbian"},{"key":"ss","name":"siSwati"},{"key":"sv-fi","name":"Finland Swedish"},{"key":"sv","name":"Swedish"},{"key":"sw","name":"Swahili"},{"key":"ta","name":"Tamil"},{"key":"te","name":"Telugu"},{"key":"tg","name":"Tajik"},{"key":"tet","name":"Tetun Dili (East Timor)"},{"key":"th","name":"Thai"},{"key":"tk","name":"Turkmen"},{"key":"tl-ph","name":"Tagalog (Philippines)"},{"key":"tlh","name":"Klingon"},{"key":"tr","name":"Turkish"},{"key":"tzl","name":"Talossan"},{"key":"tzm-latn","name":"Central Atlas Tamazight Latin"},{"key":"ug-cn","name":"Uyghur (China)"},{"key":"tzm","name":"Central Atlas Tamazight"},{"key":"uk","name":"Ukrainian"},{"key":"ur","name":"Urdu"},{"key":"uz-latn","name":"Uzbek Latin"},{"key":"vi","name":"Vietnamese"},{"key":"uz","name":"Uzbek"},{"key":"yo","name":"Yoruba Nigeria"},{"key":"x-pseudo","name":"Pseudo"},{"key":"zh-cn","name":"Chinese (China)"},{"key":"zh-hk","name":"Chinese (Hong Kong)"},{"key":"zh-tw","name":"Chinese (Taiwan)"},{"key":"zh","name":"Chinese"},{"key":"rw","name":"Kinyarwanda (Rwanda)"},{"key":"ru","name":"Russian"}]
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/af.js b/node_modules/dayjs/locale/af.js
new file mode 100644
index 0000000..62c75e4
--- /dev/null
+++ b/node_modules/dayjs/locale/af.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_af=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=a(e),t={name:"af",weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),weekStart:1,weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),monthsShort:"Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"}};return n.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/am.js b/node_modules/dayjs/locale/am.js
new file mode 100644
index 0000000..7b588a8
--- /dev/null
+++ b/node_modules/dayjs/locale/am.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_am=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"am",weekdays:"እሑድ_ሰኞ_ማክሰኞ_ረቡዕ_ሐሙስ_አርብ_ቅዳሜ".split("_"),weekdaysShort:"እሑድ_ሰኞ_ማክሰ_ረቡዕ_ሐሙስ_አርብ_ቅዳሜ".split("_"),weekdaysMin:"እሑ_ሰኞ_ማክ_ረቡ_ሐሙ_አር_ቅዳ".split("_"),months:"ጃንዋሪ_ፌብሯሪ_ማርች_ኤፕሪል_ሜይ_ጁን_ጁላይ_ኦገስት_ሴፕቴምበር_ኦክቶበር_ኖቬምበር_ዲሴምበር".split("_"),monthsShort:"ጃንዋ_ፌብሯ_ማርች_ኤፕሪ_ሜይ_ጁን_ጁላይ_ኦገስ_ሴፕቴ_ኦክቶ_ኖቬም_ዲሴም".split("_"),weekStart:1,yearStart:4,relativeTime:{future:"በ%s",past:"%s በፊት",s:"ጥቂት ሰከንዶች",m:"አንድ ደቂቃ",mm:"%d ደቂቃዎች",h:"አንድ ሰዓት",hh:"%d ሰዓታት",d:"አንድ ቀን",dd:"%d ቀናት",M:"አንድ ወር",MM:"%d ወራት",y:"አንድ ዓመት",yy:"%d ዓመታት"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"MMMM D ፣ YYYY",LLL:"MMMM D ፣ YYYY HH:mm",LLLL:"dddd ፣ MMMM D ፣ YYYY HH:mm"},ordinal:function(e){return e+"ኛ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-dz.js b/node_modules/dayjs/locale/ar-dz.js
new file mode 100644
index 0000000..5522790
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-dz.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ar_dz=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ar-dz",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdaysShort:"احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdaysMin:"أح_إث_ثلا_أر_خم_جم_سب".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiem:function(_){return _>12?"م":"ص"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-iq.js b/node_modules/dayjs/locale/ar-iq.js
new file mode 100644
index 0000000..07e8c71
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-iq.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ar_iq=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"ar-iq",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"كانون الثاني_شباط_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_ تشرين الثاني_كانون الأول".split("_"),weekStart:1,weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"كانون الثاني_شباط_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_ تشرين الثاني_كانون الأول".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiem:function(e){return e>12?"م":"ص"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-kw.js b/node_modules/dayjs/locale/ar-kw.js
new file mode 100644
index 0000000..a876ca0
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-kw.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ar_kw=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ar-kw",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdaysShort:"احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiem:function(_){return _>12?"م":"ص"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-ly.js b/node_modules/dayjs/locale/ar-ly.js
new file mode 100644
index 0000000..9dbe09b
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-ly.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ar_ly=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),n={name:"ar-ly",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekStart:6,weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),ordinal:function(_){return _},meridiem:function(_){return _>12?"م":"ص"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/‏M/‏YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-ma.js b/node_modules/dayjs/locale/ar-ma.js
new file mode 100644
index 0000000..dbb77cc
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-ma.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ar_ma=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"ar-ma",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekStart:6,weekdaysShort:"احد_إثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiem:function(e){return e>12?"م":"ص"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-sa.js b/node_modules/dayjs/locale/ar-sa.js
new file mode 100644
index 0000000..9c2c0d4
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-sa.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ar_sa=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ar-sa",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiem:function(_){return _>12?"م":"ص"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar-tn.js b/node_modules/dayjs/locale/ar-tn.js
new file mode 100644
index 0000000..944b46d
--- /dev/null
+++ b/node_modules/dayjs/locale/ar-tn.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ar_tn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"ar-tn",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),months:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekStart:1,weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),monthsShort:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiem:function(e){return e>12?"م":"ص"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ar.js b/node_modules/dayjs/locale/ar.js
new file mode 100644
index 0000000..517c49e
--- /dev/null
+++ b/node_modules/dayjs/locale/ar.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ar=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=t(e),r="يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),d={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},_={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},o={name:"ar",weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),months:r,monthsShort:r,weekStart:6,meridiem:function(e){return e>12?"م":"ص"},relativeTime:{future:"بعد %s",past:"منذ %s",s:"ثانية واحدة",m:"دقيقة واحدة",mm:"%d دقائق",h:"ساعة واحدة",hh:"%d ساعات",d:"يوم واحد",dd:"%d أيام",M:"شهر واحد",MM:"%d أشهر",y:"عام واحد",yy:"%d أعوام"},preparse:function(e){return e.replace(/[١٢٣٤٥٦٧٨٩٠]/g,(function(e){return _[e]})).replace(/،/g,",")},postformat:function(e){return e.replace(/\d/g,(function(e){return d[e]})).replace(/,/g,"،")},ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/‏M/‏YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"}};return n.default.locale(o,null,!0),o}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/az.js b/node_modules/dayjs/locale/az.js
new file mode 100644
index 0000000..d63ed1f
--- /dev/null
+++ b/node_modules/dayjs/locale/az.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_az=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var _=e(a),t={name:"az",weekdays:"Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə".split("_"),weekdaysShort:"Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən".split("_"),weekdaysMin:"Bz_BE_ÇA_Çə_CA_Cü_Şə".split("_"),months:"yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),monthsShort:"yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., H:mm",LLLL:"dddd, D MMMM YYYY г., H:mm"},relativeTime:{future:"%s sonra",past:"%s əvvəl",s:"bir neçə saniyə",m:"bir dəqiqə",mm:"%d dəqiqə",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir il",yy:"%d il"},ordinal:function(a){return a}};return _.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/be.js b/node_modules/dayjs/locale/be.js
new file mode 100644
index 0000000..704a87d
--- /dev/null
+++ b/node_modules/dayjs/locale/be.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_be=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),n={name:"be",weekdays:"нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу".split("_"),months:"студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня".split("_"),weekStart:1,weekdaysShort:"нд_пн_ат_ср_чц_пт_сб".split("_"),monthsShort:"студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж".split("_"),weekdaysMin:"нд_пн_ат_ср_чц_пт_сб".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., HH:mm",LLLL:"dddd, D MMMM YYYY г., HH:mm"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bg.js b/node_modules/dayjs/locale/bg.js
new file mode 100644
index 0000000..4a3d316
--- /dev/null
+++ b/node_modules/dayjs/locale/bg.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_bg=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"bg",weekdays:"неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"),weekdaysShort:"нед_пон_вто_сря_чет_пет_съб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),months:"януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"),monthsShort:"янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"),weekStart:1,ordinal:function(e){var _=e%100;if(_>10&&_<20)return e+"-ти";var t=e%10;return 1===t?e+"-ви":2===t?e+"-ри":7===t||8===t?e+"-ми":e+"-ти"},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},relativeTime:{future:"след %s",past:"преди %s",s:"няколко секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дена",M:"месец",MM:"%d месеца",y:"година",yy:"%d години"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bi.js b/node_modules/dayjs/locale/bi.js
new file mode 100644
index 0000000..e457dff
--- /dev/null
+++ b/node_modules/dayjs/locale/bi.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_bi=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=a(e),_={name:"bi",weekdays:"Sande_Mande_Tusde_Wenesde_Tosde_Fraede_Sarade".split("_"),months:"Januari_Februari_Maj_Eprel_Mei_Jun_Julae_Okis_Septemba_Oktoba_Novemba_Disemba".split("_"),weekStart:1,weekdaysShort:"San_Man_Tus_Wen_Tos_Frae_Sar".split("_"),monthsShort:"Jan_Feb_Maj_Epr_Mai_Jun_Jul_Oki_Sep_Okt_Nov_Dis".split("_"),weekdaysMin:"San_Ma_Tu_We_To_Fr_Sar".split("_"),ordinal:function(e){return e},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},relativeTime:{future:"lo %s",past:"%s bifo",s:"sam seken",m:"wan minit",mm:"%d minit",h:"wan haoa",hh:"%d haoa",d:"wan dei",dd:"%d dei",M:"wan manis",MM:"%d manis",y:"wan yia",yy:"%d yia"}};return n.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bm.js b/node_modules/dayjs/locale/bm.js
new file mode 100644
index 0000000..3c4fbdd
--- /dev/null
+++ b/node_modules/dayjs/locale/bm.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_bm=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var l=e(a),t={name:"bm",weekdays:"Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri".split("_"),months:"Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo".split("_"),weekStart:1,weekdaysShort:"Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib".split("_"),monthsShort:"Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des".split("_"),weekdaysMin:"Ka_Nt_Ta_Ar_Al_Ju_Si".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"MMMM [tile] D [san] YYYY",LLL:"MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm",LLLL:"dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm"},relativeTime:{future:"%s kɔnɔ",past:"a bɛ %s bɔ",s:"sanga dama dama",m:"miniti kelen",mm:"miniti %d",h:"lɛrɛ kelen",hh:"lɛrɛ %d",d:"tile kelen",dd:"tile %d",M:"kalo kelen",MM:"kalo %d",y:"san kelen",yy:"san %d"}};return l.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bn-bd.js b/node_modules/dayjs/locale/bn-bd.js
new file mode 100644
index 0000000..ae76f9f
--- /dev/null
+++ b/node_modules/dayjs/locale/bn-bd.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_bn_bd=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=t(e),n={1:"১",2:"২",3:"৩",4:"৪",5:"৫",6:"৬",7:"৭",8:"৮",9:"৯",0:"০"},d={"১":"1","২":"2","৩":"3","৪":"4","৫":"5","৬":"6","৭":"7","৮":"8","৯":"9","০":"0"},r={name:"bn-bd",weekdays:"রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার".split("_"),months:"জানুয়ারি_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর".split("_"),weekdaysShort:"রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি".split("_"),monthsShort:"জানু_ফেব্রু_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্ট_অক্টো_নভে_ডিসে".split("_"),weekdaysMin:"রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি".split("_"),weekStart:0,preparse:function(e){return e.replace(/[১২৩৪৫৬৭৮৯০]/g,(function(e){return d[e]}))},postformat:function(e){return e.replace(/\d/g,(function(e){return n[e]}))},ordinal:function(e){var t=["ই","লা","রা","ঠা","শে"],_=e%100;return"["+e+(t[(_-20)%10]||t[_]||t[0])+"]"},formats:{LT:"A h:mm সময়",LTS:"A h:mm:ss সময়",L:"DD/MM/YYYY খ্রিস্টাব্দ",LL:"D MMMM YYYY খ্রিস্টাব্দ",LLL:"D MMMM YYYY খ্রিস্টাব্দ, A h:mm সময়",LLLL:"dddd, D MMMM YYYY খ্রিস্টাব্দ, A h:mm সময়"},meridiem:function(e){return e<4?"রাত":e<6?"ভোর":e<12?"সকাল":e<15?"দুপুর":e<18?"বিকাল":e<20?"সন্ধ্যা":"রাত"},relativeTime:{future:"%s পরে",past:"%s আগে",s:"কয়েক সেকেন্ড",m:"এক মিনিট",mm:"%d মিনিট",h:"এক ঘন্টা",hh:"%d ঘন্টা",d:"এক দিন",dd:"%d দিন",M:"এক মাস",MM:"%d মাস",y:"এক বছর",yy:"%d বছর"}};return _.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bn.js b/node_modules/dayjs/locale/bn.js
new file mode 100644
index 0000000..30ffa02
--- /dev/null
+++ b/node_modules/dayjs/locale/bn.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_bn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),n={1:"১",2:"২",3:"৩",4:"৪",5:"৫",6:"৬",7:"৭",8:"৮",9:"৯",0:"০"},d={"১":"1","২":"2","৩":"3","৪":"4","৫":"5","৬":"6","৭":"7","৮":"8","৯":"9","০":"0"},o={name:"bn",weekdays:"রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার".split("_"),months:"জানুয়ারি_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর".split("_"),weekdaysShort:"রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি".split("_"),monthsShort:"জানু_ফেব্রু_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্ট_অক্টো_নভে_ডিসে".split("_"),weekdaysMin:"রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি".split("_"),preparse:function(e){return e.replace(/[১২৩৪৫৬৭৮৯০]/g,(function(e){return d[e]}))},postformat:function(e){return e.replace(/\d/g,(function(e){return n[e]}))},ordinal:function(e){return e},formats:{LT:"A h:mm সময়",LTS:"A h:mm:ss সময়",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm সময়",LLLL:"dddd, D MMMM YYYY, A h:mm সময়"},relativeTime:{future:"%s পরে",past:"%s আগে",s:"কয়েক সেকেন্ড",m:"এক মিনিট",mm:"%d মিনিট",h:"এক ঘন্টা",hh:"%d ঘন্টা",d:"এক দিন",dd:"%d দিন",M:"এক মাস",MM:"%d মাস",y:"এক বছর",yy:"%d বছর"}};return t.default.locale(o,null,!0),o}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bo.js b/node_modules/dayjs/locale/bo.js
new file mode 100644
index 0000000..92bb7cc
--- /dev/null
+++ b/node_modules/dayjs/locale/bo.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_bo=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"bo",weekdays:"གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་".split("_"),weekdaysShort:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),weekdaysMin:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),months:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),monthsShort:"ཟླ་དང་པོ_ཟླ་གཉིས་པ_ཟླ་གསུམ་པ_ཟླ་བཞི་པ_ཟླ་ལྔ་པ_ཟླ་དྲུག་པ_ཟླ་བདུན་པ_ཟླ་བརྒྱད་པ_ཟླ་དགུ་པ_ཟླ་བཅུ་པ_ཟླ་བཅུ་གཅིག་པ_ཟླ་བཅུ་གཉིས་པ".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},relativeTime:{future:"%s ལ་",past:"%s སྔོན་ལ་",s:"ཏོག་ཙམ་",m:"སྐར་མ་གཅིག་",mm:"སྐར་མ་ %d",h:"ཆུ་ཚོད་གཅིག་",hh:"ཆུ་ཚོད་ %d",d:"ཉིན་གཅིག་",dd:"ཉིན་ %d",M:"ཟླ་བ་གཅིག་",MM:"ཟླ་བ་ %d",y:"ལོ་གཅིག་",yy:"ལོ་ %d"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/br.js b/node_modules/dayjs/locale/br.js
new file mode 100644
index 0000000..0b2317f
--- /dev/null
+++ b/node_modules/dayjs/locale/br.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_br=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var u=n(e);function r(e){return e>9?r(e%10):e}function t(e,n,u){return e+" "+function(e,n){return 2===n?function(e){return{m:"v",b:"v",d:"z"}[e.charAt(0)]+e.substring(1)}(e):e}({mm:"munutenn",MM:"miz",dd:"devezh"}[u],e)}var o={name:"br",weekdays:"Sul_Lun_Meurzh_Mercʼher_Yaou_Gwener_Sadorn".split("_"),months:"Genver_Cʼhwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),weekStart:1,weekdaysShort:"Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),monthsShort:"Gen_Cʼhwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),weekdaysMin:"Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"h[e]mm A",LTS:"h[e]mm:ss A",L:"DD/MM/YYYY",LL:"D [a viz] MMMM YYYY",LLL:"D [a viz] MMMM YYYY h[e]mm A",LLLL:"dddd, D [a viz] MMMM YYYY h[e]mm A"},relativeTime:{future:"a-benn %s",past:"%s ʼzo",s:"un nebeud segondennoù",m:"ur vunutenn",mm:t,h:"un eur",hh:"%d eur",d:"un devezh",dd:t,M:"ur miz",MM:t,y:"ur bloaz",yy:function(e){switch(r(e)){case 1:case 3:case 4:case 5:case 9:return e+" bloaz";default:return e+" vloaz"}}},meridiem:function(e){return e<12?"a.m.":"g.m."}};return u.default.locale(o,null,!0),o}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/bs.js b/node_modules/dayjs/locale/bs.js
new file mode 100644
index 0000000..25dcd6d
--- /dev/null
+++ b/node_modules/dayjs/locale/bs.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_bs=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=t(e),a={name:"bs",weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),months:"januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar".split("_"),weekStart:1,weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),ordinal:function(e){return e},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"}};return _.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ca.js b/node_modules/dayjs/locale/ca.js
new file mode 100644
index 0000000..1614cc2
--- /dev/null
+++ b/node_modules/dayjs/locale/ca.js
@@ -0,0 +1 @@
+!function(e,s){"object"==typeof exports&&"undefined"!=typeof module?module.exports=s(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],s):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ca=s(e.dayjs)}(this,(function(e){"use strict";function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=s(e),_={name:"ca",weekdays:"Diumenge_Dilluns_Dimarts_Dimecres_Dijous_Divendres_Dissabte".split("_"),weekdaysShort:"Dg._Dl._Dt._Dc._Dj._Dv._Ds.".split("_"),weekdaysMin:"Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"),months:"Gener_Febrer_Març_Abril_Maig_Juny_Juliol_Agost_Setembre_Octubre_Novembre_Desembre".split("_"),monthsShort:"Gen._Febr._Març_Abr._Maig_Juny_Jul._Ag._Set._Oct._Nov._Des.".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [de] YYYY",LLL:"D MMMM [de] YYYY [a les] H:mm",LLLL:"dddd D MMMM [de] YYYY [a les] H:mm",ll:"D MMM YYYY",lll:"D MMM YYYY, H:mm",llll:"ddd D MMM YYYY, H:mm"},relativeTime:{future:"d'aquí %s",past:"fa %s",s:"uns segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},ordinal:function(e){return""+e+(1===e||3===e?"r":2===e?"n":4===e?"t":"è")}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/cs.js b/node_modules/dayjs/locale/cs.js
new file mode 100644
index 0000000..43bddb9
--- /dev/null
+++ b/node_modules/dayjs/locale/cs.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_cs=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e);function s(e){return e>1&&e<5&&1!=~~(e/10)}function r(e,n,t,r){var d=e+" ";switch(t){case"s":return n||r?"pár sekund":"pár sekundami";case"m":return n?"minuta":r?"minutu":"minutou";case"mm":return n||r?d+(s(e)?"minuty":"minut"):d+"minutami";case"h":return n?"hodina":r?"hodinu":"hodinou";case"hh":return n||r?d+(s(e)?"hodiny":"hodin"):d+"hodinami";case"d":return n||r?"den":"dnem";case"dd":return n||r?d+(s(e)?"dny":"dní"):d+"dny";case"M":return n||r?"měsíc":"měsícem";case"MM":return n||r?d+(s(e)?"měsíce":"měsíců"):d+"měsíci";case"y":return n||r?"rok":"rokem";case"yy":return n||r?d+(s(e)?"roky":"let"):d+"lety"}}var d={name:"cs",weekdays:"neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"),weekdaysShort:"ne_po_út_st_čt_pá_so".split("_"),weekdaysMin:"ne_po_út_st_čt_pá_so".split("_"),months:"leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_"),monthsShort:"led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"),weekStart:1,yearStart:4,ordinal:function(e){return e+"."},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm",l:"D. M. YYYY"},relativeTime:{future:"za %s",past:"před %s",s:r,m:r,mm:r,h:r,hh:r,d:r,dd:r,M:r,MM:r,y:r,yy:r}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/cv.js b/node_modules/dayjs/locale/cv.js
new file mode 100644
index 0000000..a30efe0
--- /dev/null
+++ b/node_modules/dayjs/locale/cv.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_cv=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),n={name:"cv",weekdays:"вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун".split("_"),months:"кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав".split("_"),weekStart:1,weekdaysShort:"выр_тун_ытл_юн_кӗҫ_эрн_шӑм".split("_"),monthsShort:"кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш".split("_"),weekdaysMin:"вр_тн_ыт_юн_кҫ_эр_шм".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]",LLL:"YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm",LLLL:"dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/cy.js b/node_modules/dayjs/locale/cy.js
new file mode 100644
index 0000000..ee1910f
--- /dev/null
+++ b/node_modules/dayjs/locale/cy.js
@@ -0,0 +1 @@
+!function(d,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(d="undefined"!=typeof globalThis?globalThis:d||self).dayjs_locale_cy=e(d.dayjs)}(this,(function(d){"use strict";function e(d){return d&&"object"==typeof d&&"default"in d?d:{default:d}}var _=e(d),a={name:"cy",weekdays:"Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),months:"Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),weekStart:1,weekdaysShort:"Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),monthsShort:"Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),weekdaysMin:"Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),ordinal:function(d){return d},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"mewn %s",past:"%s yn ôl",s:"ychydig eiliadau",m:"munud",mm:"%d munud",h:"awr",hh:"%d awr",d:"diwrnod",dd:"%d diwrnod",M:"mis",MM:"%d mis",y:"blwyddyn",yy:"%d flynedd"}};return _.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/da.js b/node_modules/dayjs/locale/da.js
new file mode 100644
index 0000000..fd45a45
--- /dev/null
+++ b/node_modules/dayjs/locale/da.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_da=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var d=t(e),n={name:"da",weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn._man._tirs._ons._tors._fre._lør.".split("_"),weekdaysMin:"sø._ma._ti._on._to._fr._lø.".split("_"),months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj_juni_juli_aug._sept._okt._nov._dec.".split("_"),weekStart:1,ordinal:function(e){return e+"."},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd [d.] D. MMMM YYYY [kl.] HH:mm"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"}};return d.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/de-at.js b/node_modules/dayjs/locale/de-at.js
new file mode 100644
index 0000000..ca51ef5
--- /dev/null
+++ b/node_modules/dayjs/locale/de-at.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_de_at=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),i={s:"ein paar Sekunden",m:["eine Minute","einer Minute"],mm:"%d Minuten",h:["eine Stunde","einer Stunde"],hh:"%d Stunden",d:["ein Tag","einem Tag"],dd:["%d Tage","%d Tagen"],M:["ein Monat","einem Monat"],MM:["%d Monate","%d Monaten"],y:["ein Jahr","einem Jahr"],yy:["%d Jahre","%d Jahren"]};function a(e,n,t){var a=i[t];return Array.isArray(a)&&(a=a[n?0:1]),a.replace("%d",e)}var r={name:"de-at",weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),months:"Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),ordinal:function(e){return e+"."},weekStart:1,formats:{LTS:"HH:mm:ss",LT:"HH:mm",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},relativeTime:{future:"in %s",past:"vor %s",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a}};return t.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/de-ch.js b/node_modules/dayjs/locale/de-ch.js
new file mode 100644
index 0000000..3fef218
--- /dev/null
+++ b/node_modules/dayjs/locale/de-ch.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_de_ch=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),a={s:"ein paar Sekunden",m:["eine Minute","einer Minute"],mm:"%d Minuten",h:["eine Stunde","einer Stunde"],hh:"%d Stunden",d:["ein Tag","einem Tag"],dd:["%d Tage","%d Tagen"],M:["ein Monat","einem Monat"],MM:["%d Monate","%d Monaten"],y:["ein Jahr","einem Jahr"],yy:["%d Jahre","%d Jahren"]};function i(e,n,t){var i=a[t];return Array.isArray(i)&&(i=i[n?0:1]),i.replace("%d",e)}var r={name:"de-ch",weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),ordinal:function(e){return e+"."},weekStart:1,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},relativeTime:{future:"in %s",past:"vor %s",s:i,m:i,mm:i,h:i,hh:i,d:i,dd:i,M:i,MM:i,y:i,yy:i}};return t.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/de.js b/node_modules/dayjs/locale/de.js
new file mode 100644
index 0000000..35f05ec
--- /dev/null
+++ b/node_modules/dayjs/locale/de.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_de=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),a={s:"ein paar Sekunden",m:["eine Minute","einer Minute"],mm:"%d Minuten",h:["eine Stunde","einer Stunde"],hh:"%d Stunden",d:["ein Tag","einem Tag"],dd:["%d Tage","%d Tagen"],M:["ein Monat","einem Monat"],MM:["%d Monate","%d Monaten"],y:["ein Jahr","einem Jahr"],yy:["%d Jahre","%d Jahren"]};function i(e,n,t){var i=a[t];return Array.isArray(i)&&(i=i[n?0:1]),i.replace("%d",e)}var r={name:"de",weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sept._Okt._Nov._Dez.".split("_"),ordinal:function(e){return e+"."},weekStart:1,yearStart:4,formats:{LTS:"HH:mm:ss",LT:"HH:mm",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},relativeTime:{future:"in %s",past:"vor %s",s:i,m:i,mm:i,h:i,hh:i,d:i,dd:i,M:i,MM:i,y:i,yy:i}};return t.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/dv.js b/node_modules/dayjs/locale/dv.js
new file mode 100644
index 0000000..b0bd8f9
--- /dev/null
+++ b/node_modules/dayjs/locale/dv.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_dv=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"dv",weekdays:"އާދިއްތަ_ހޯމަ_އަންގާރަ_ބުދަ_ބުރާސްފަތި_ހުކުރު_ހޮނިހިރު".split("_"),months:"ޖެނުއަރީ_ފެބްރުއަރީ_މާރިޗު_އޭޕްރީލު_މޭ_ޖޫން_ޖުލައި_އޯގަސްޓު_ސެޕްޓެމްބަރު_އޮކްޓޯބަރު_ނޮވެމްބަރު_ޑިސެމްބަރު".split("_"),weekStart:7,weekdaysShort:"އާދިއްތަ_ހޯމަ_އަންގާރަ_ބުދަ_ބުރާސްފަތި_ހުކުރު_ހޮނިހިރު".split("_"),monthsShort:"ޖެނުއަރީ_ފެބްރުއަރީ_މާރިޗު_އޭޕްރީލު_މޭ_ޖޫން_ޖުލައި_އޯގަސްޓު_ސެޕްޓެމްބަރު_އޮކްޓޯބަރު_ނޮވެމްބަރު_ޑިސެމްބަރު".split("_"),weekdaysMin:"އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/M/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"ތެރޭގައި %s",past:"ކުރިން %s",s:"ސިކުންތުކޮޅެއް",m:"މިނިޓެއް",mm:"މިނިޓު %d",h:"ގަޑިއިރެއް",hh:"ގަޑިއިރު %d",d:"ދުވަހެއް",dd:"ދުވަސް %d",M:"މަހެއް",MM:"މަސް %d",y:"އަހަރެއް",yy:"އަހަރު %d"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/el.js b/node_modules/dayjs/locale/el.js
new file mode 100644
index 0000000..1488034
--- /dev/null
+++ b/node_modules/dayjs/locale/el.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_el=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"el",weekdays:"Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"),weekdaysShort:"Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"),weekdaysMin:"Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"),months:"Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"),monthsShort:"Ιαν_Φεβ_Μαρ_Απρ_Μαι_Ιουν_Ιουλ_Αυγ_Σεπτ_Οκτ_Νοε_Δεκ".split("_"),ordinal:function(e){return e},weekStart:1,relativeTime:{future:"σε %s",past:"πριν %s",s:"μερικά δευτερόλεπτα",m:"ένα λεπτό",mm:"%d λεπτά",h:"μία ώρα",hh:"%d ώρες",d:"μία μέρα",dd:"%d μέρες",M:"ένα μήνα",MM:"%d μήνες",y:"ένα χρόνο",yy:"%d χρόνια"},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-au.js b/node_modules/dayjs/locale/en-au.js
new file mode 100644
index 0000000..b952cdb
--- /dev/null
+++ b/node_modules/dayjs/locale/en-au.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_au=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),_={name:"en-au",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),weekStart:1,weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-ca.js b/node_modules/dayjs/locale/en-ca.js
new file mode 100644
index 0000000..bf76621
--- /dev/null
+++ b/node_modules/dayjs/locale/en-ca.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_ca=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=a(e),t={name:"en-ca",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}};return _.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-gb.js b/node_modules/dayjs/locale/en-gb.js
new file mode 100644
index 0000000..7fc7c3f
--- /dev/null
+++ b/node_modules/dayjs/locale/en-gb.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_gb=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),_={name:"en-gb",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekStart:1,yearStart:4,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},ordinal:function(e){var a=["th","st","nd","rd"],t=e%100;return"["+e+(a[(t-20)%10]||a[t]||a[0])+"]"}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-ie.js b/node_modules/dayjs/locale/en-ie.js
new file mode 100644
index 0000000..b0ad3f9
--- /dev/null
+++ b/node_modules/dayjs/locale/en-ie.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_ie=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),_={name:"en-ie",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),weekStart:1,weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-il.js b/node_modules/dayjs/locale/en-il.js
new file mode 100644
index 0000000..d8bea62
--- /dev/null
+++ b/node_modules/dayjs/locale/en-il.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_il=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=a(e),t={name:"en-il",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}};return _.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-in.js b/node_modules/dayjs/locale/en-in.js
new file mode 100644
index 0000000..af8cff3
--- /dev/null
+++ b/node_modules/dayjs/locale/en-in.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_in=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),n={name:"en-in",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekStart:1,yearStart:4,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},ordinal:function(e){var a=["th","st","nd","rd"],t=e%100;return"["+e+(a[(t-20)%10]||a[t]||a[0])+"]"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-nz.js b/node_modules/dayjs/locale/en-nz.js
new file mode 100644
index 0000000..058abbe
--- /dev/null
+++ b/node_modules/dayjs/locale/en-nz.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_nz=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),n={name:"en-nz",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),weekStart:1,weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ordinal:function(e){var a=["th","st","nd","rd"],t=e%100;return"["+e+(a[(t-20)%10]||a[t]||a[0])+"]"},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-sg.js b/node_modules/dayjs/locale/en-sg.js
new file mode 100644
index 0000000..787fa84
--- /dev/null
+++ b/node_modules/dayjs/locale/en-sg.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_sg=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),_={name:"en-sg",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),weekStart:1,weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en-tt.js b/node_modules/dayjs/locale/en-tt.js
new file mode 100644
index 0000000..afc4d36
--- /dev/null
+++ b/node_modules/dayjs/locale/en-tt.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en_tt=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),_={name:"en-tt",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekStart:1,yearStart:4,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},ordinal:function(e){var t=["th","st","nd","rd"],a=e%100;return"["+e+(t[(a-20)%10]||t[a]||t[0])+"]"}};return a.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/en.js b/node_modules/dayjs/locale/en.js
new file mode 100644
index 0000000..847cbfd
--- /dev/null
+++ b/node_modules/dayjs/locale/en.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_en=n()}(this,(function(){"use strict";return{name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return"["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/eo.js b/node_modules/dayjs/locale/eo.js
new file mode 100644
index 0000000..2dcbe01
--- /dev/null
+++ b/node_modules/dayjs/locale/eo.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_eo=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=o(e),t={name:"eo",weekdays:"dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato".split("_"),months:"januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro".split("_"),weekStart:1,weekdaysShort:"dim_lun_mard_merk_ĵaŭ_ven_sab".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec".split("_"),weekdaysMin:"di_lu_ma_me_ĵa_ve_sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D[-a de] MMMM, YYYY",LLL:"D[-a de] MMMM, YYYY HH:mm",LLLL:"dddd, [la] D[-a de] MMMM, YYYY HH:mm"},relativeTime:{future:"post %s",past:"antaŭ %s",s:"sekundoj",m:"minuto",mm:"%d minutoj",h:"horo",hh:"%d horoj",d:"tago",dd:"%d tagoj",M:"monato",MM:"%d monatoj",y:"jaro",yy:"%d jaroj"}};return a.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/es-do.js b/node_modules/dayjs/locale/es-do.js
new file mode 100644
index 0000000..07907ad
--- /dev/null
+++ b/node_modules/dayjs/locale/es-do.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_es_do=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"es-do",weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),weekStart:1,relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY h:mm A",LLLL:"dddd, D [de] MMMM [de] YYYY h:mm A"}};return s.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/es-mx.js b/node_modules/dayjs/locale/es-mx.js
new file mode 100644
index 0000000..f865a2d
--- /dev/null
+++ b/node_modules/dayjs/locale/es-mx.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_es_mx=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"es-mx",weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"}};return s.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/es-pr.js b/node_modules/dayjs/locale/es-pr.js
new file mode 100644
index 0000000..56fdeb4
--- /dev/null
+++ b/node_modules/dayjs/locale/es-pr.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_es_pr=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"es-pr",monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),weekStart:1,formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"MM/DD/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY h:mm A",LLLL:"dddd, D [de] MMMM [de] YYYY h:mm A"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"}};return s.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/es-us.js b/node_modules/dayjs/locale/es-us.js
new file mode 100644
index 0000000..35f5535
--- /dev/null
+++ b/node_modules/dayjs/locale/es-us.js
@@ -0,0 +1 @@
+!function(e,s){"object"==typeof exports&&"undefined"!=typeof module?module.exports=s(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],s):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_es_us=s(e.dayjs)}(this,(function(e){"use strict";function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=s(e),d={name:"es-us",weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"MM/DD/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY h:mm A",LLLL:"dddd, D [de] MMMM [de] YYYY h:mm A"}};return o.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/es.js b/node_modules/dayjs/locale/es.js
new file mode 100644
index 0000000..eb33b81
--- /dev/null
+++ b/node_modules/dayjs/locale/es.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_es=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"es",monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"}};return s.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/et.js b/node_modules/dayjs/locale/et.js
new file mode 100644
index 0000000..4158d13
--- /dev/null
+++ b/node_modules/dayjs/locale/et.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_et=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e);function u(e,a,t,u){var s={s:["mõne sekundi","mõni sekund","paar sekundit"],m:["ühe minuti","üks minut"],mm:["%d minuti","%d minutit"],h:["ühe tunni","tund aega","üks tund"],hh:["%d tunni","%d tundi"],d:["ühe päeva","üks päev"],M:["kuu aja","kuu aega","üks kuu"],MM:["%d kuu","%d kuud"],y:["ühe aasta","aasta","üks aasta"],yy:["%d aasta","%d aastat"]};return a?(s[t][2]?s[t][2]:s[t][1]).replace("%d",e):(u?s[t][0]:s[t][1]).replace("%d",e)}var s={name:"et",weekdays:"pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"),weekdaysShort:"P_E_T_K_N_R_L".split("_"),weekdaysMin:"P_E_T_K_N_R_L".split("_"),months:"jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),monthsShort:"jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),ordinal:function(e){return e+"."},weekStart:1,relativeTime:{future:"%s pärast",past:"%s tagasi",s:u,m:u,mm:u,h:u,hh:u,d:u,dd:"%d päeva",M:u,MM:u,y:u,yy:u},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"}};return t.default.locale(s,null,!0),s}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/eu.js b/node_modules/dayjs/locale/eu.js
new file mode 100644
index 0000000..ed8e228
--- /dev/null
+++ b/node_modules/dayjs/locale/eu.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_eu=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var t=e(a),l={name:"eu",weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),weekStart:1,weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] HH:mm",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] HH:mm",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] HH:mm",llll:"ddd, YYYY[ko] MMM D[a] HH:mm"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"}};return t.default.locale(l,null,!0),l}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fa.js b/node_modules/dayjs/locale/fa.js
new file mode 100644
index 0000000..648bb4e
--- /dev/null
+++ b/node_modules/dayjs/locale/fa.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_fa=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"fa",weekdays:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysShort:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysMin:"ی_د_س_چ_پ_ج_ش".split("_"),weekStart:6,months:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),monthsShort:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"در %s",past:"%s پیش",s:"چند ثانیه",m:"یک دقیقه",mm:"%d دقیقه",h:"یک ساعت",hh:"%d ساعت",d:"یک روز",dd:"%d روز",M:"یک ماه",MM:"%d ماه",y:"یک سال",yy:"%d سال"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fi.js b/node_modules/dayjs/locale/fi.js
new file mode 100644
index 0000000..2681ebd
--- /dev/null
+++ b/node_modules/dayjs/locale/fi.js
@@ -0,0 +1 @@
+!function(u,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(u="undefined"!=typeof globalThis?globalThis:u||self).dayjs_locale_fi=e(u.dayjs)}(this,(function(u){"use strict";function e(u){return u&&"object"==typeof u&&"default"in u?u:{default:u}}var t=e(u);function n(u,e,t,n){var i={s:"muutama sekunti",m:"minuutti",mm:"%d minuuttia",h:"tunti",hh:"%d tuntia",d:"päivä",dd:"%d päivää",M:"kuukausi",MM:"%d kuukautta",y:"vuosi",yy:"%d vuotta",numbers:"nolla_yksi_kaksi_kolme_neljä_viisi_kuusi_seitsemän_kahdeksan_yhdeksän".split("_")},a={s:"muutaman sekunnin",m:"minuutin",mm:"%d minuutin",h:"tunnin",hh:"%d tunnin",d:"päivän",dd:"%d päivän",M:"kuukauden",MM:"%d kuukauden",y:"vuoden",yy:"%d vuoden",numbers:"nollan_yhden_kahden_kolmen_neljän_viiden_kuuden_seitsemän_kahdeksan_yhdeksän".split("_")},s=n&&!e?a:i,_=s[t];return u<10?_.replace("%d",s.numbers[u]):_.replace("%d",u)}var i={name:"fi",weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),ordinal:function(u){return u+"."},weekStart:1,yearStart:4,relativeTime:{future:"%s päästä",past:"%s sitten",s:n,m:n,mm:n,h:n,hh:n,d:n,dd:n,M:n,MM:n,y:n,yy:n},formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"D. MMMM[ta] YYYY",LLL:"D. MMMM[ta] YYYY, [klo] HH.mm",LLLL:"dddd, D. MMMM[ta] YYYY, [klo] HH.mm",l:"D.M.YYYY",ll:"D. MMM YYYY",lll:"D. MMM YYYY, [klo] HH.mm",llll:"ddd, D. MMM YYYY, [klo] HH.mm"}};return t.default.locale(i,null,!0),i}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fo.js b/node_modules/dayjs/locale/fo.js
new file mode 100644
index 0000000..ff6f8d8
--- /dev/null
+++ b/node_modules/dayjs/locale/fo.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_fo=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),r={name:"fo",weekdays:"sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur".split("_"),months:"januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember".split("_"),weekStart:1,weekdaysShort:"sun_mán_týs_mik_hós_frí_ley".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdaysMin:"su_má_tý_mi_hó_fr_le".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D. MMMM, YYYY HH:mm"},relativeTime:{future:"um %s",past:"%s síðani",s:"fá sekund",m:"ein minuttur",mm:"%d minuttir",h:"ein tími",hh:"%d tímar",d:"ein dagur",dd:"%d dagar",M:"ein mánaður",MM:"%d mánaðir",y:"eitt ár",yy:"%d ár"}};return a.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fr-ca.js b/node_modules/dayjs/locale/fr-ca.js
new file mode 100644
index 0000000..9cc0d03
--- /dev/null
+++ b/node_modules/dayjs/locale/fr-ca.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_fr_ca=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=n(e),_={name:"fr-ca",weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"}};return i.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fr-ch.js b/node_modules/dayjs/locale/fr-ch.js
new file mode 100644
index 0000000..1308de9
--- /dev/null
+++ b/node_modules/dayjs/locale/fr-ch.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_fr_ch=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=n(e),_={name:"fr-ch",weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),weekStart:1,weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"}};return i.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fr.js b/node_modules/dayjs/locale/fr.js
new file mode 100644
index 0000000..8c42be4
--- /dev/null
+++ b/node_modules/dayjs/locale/fr.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_fr=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),i={name:"fr",weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinal:function(e){return""+e+(1===e?"er":"")}};return t.default.locale(i,null,!0),i}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/fy.js b/node_modules/dayjs/locale/fy.js
new file mode 100644
index 0000000..291dd5f
--- /dev/null
+++ b/node_modules/dayjs/locale/fy.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_fy=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=n(e),t={name:"fy",weekdays:"snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon".split("_"),months:"jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber".split("_"),monthsShort:"jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.".split("_"),weekStart:1,weekdaysShort:"si._mo._ti._wo._to._fr._so.".split("_"),weekdaysMin:"Si_Mo_Ti_Wo_To_Fr_So".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"oer %s",past:"%s lyn",s:"in pear sekonden",m:"ien minút",mm:"%d minuten",h:"ien oere",hh:"%d oeren",d:"ien dei",dd:"%d dagen",M:"ien moanne",MM:"%d moannen",y:"ien jier",yy:"%d jierren"}};return i.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ga.js b/node_modules/dayjs/locale/ga.js
new file mode 100644
index 0000000..0b2489f
--- /dev/null
+++ b/node_modules/dayjs/locale/ga.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_ga=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var i=e(a),n={name:"ga",weekdays:"Dé Domhnaigh_Dé Luain_Dé Máirt_Dé Céadaoin_Déardaoin_Dé hAoine_Dé Satharn".split("_"),months:"Eanáir_Feabhra_Márta_Aibreán_Bealtaine_Méitheamh_Iúil_Lúnasa_Meán Fómhair_Deaireadh Fómhair_Samhain_Nollaig".split("_"),weekStart:1,weekdaysShort:"Dom_Lua_Mái_Céa_Déa_hAo_Sat".split("_"),monthsShort:"Eaná_Feab_Márt_Aibr_Beal_Méit_Iúil_Lúna_Meán_Deai_Samh_Noll".split("_"),weekdaysMin:"Do_Lu_Má_Ce_Dé_hA_Sa".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"i %s",past:"%s ó shin",s:"cúpla soicind",m:"nóiméad",mm:"%d nóiméad",h:"uair an chloig",hh:"%d uair an chloig",d:"lá",dd:"%d lá",M:"mí",MM:"%d mí",y:"bliain",yy:"%d bliain"}};return i.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/gd.js b/node_modules/dayjs/locale/gd.js
new file mode 100644
index 0000000..c7e47ab
--- /dev/null
+++ b/node_modules/dayjs/locale/gd.js
@@ -0,0 +1 @@
+!function(a,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],i):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_gd=i(a.dayjs)}(this,(function(a){"use strict";function i(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var n=i(a),e={name:"gd",weekdays:"Didòmhnaich_Diluain_Dimàirt_Diciadain_Diardaoin_Dihaoine_Disathairne".split("_"),months:"Am Faoilleach_An Gearran_Am Màrt_An Giblean_An Cèitean_An t-Ògmhios_An t-Iuchar_An Lùnastal_An t-Sultain_An Dàmhair_An t-Samhain_An Dùbhlachd".split("_"),weekStart:1,weekdaysShort:"Did_Dil_Dim_Dic_Dia_Dih_Dis".split("_"),monthsShort:"Faoi_Gear_Màrt_Gibl_Cèit_Ògmh_Iuch_Lùn_Sult_Dàmh_Samh_Dùbh".split("_"),weekdaysMin:"Dò_Lu_Mà_Ci_Ar_Ha_Sa".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"ann an %s",past:"bho chionn %s",s:"beagan diogan",m:"mionaid",mm:"%d mionaidean",h:"uair",hh:"%d uairean",d:"latha",dd:"%d latha",M:"mìos",MM:"%d mìosan",y:"bliadhna",yy:"%d bliadhna"}};return n.default.locale(e,null,!0),e}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/gl.js b/node_modules/dayjs/locale/gl.js
new file mode 100644
index 0000000..f5cf483
--- /dev/null
+++ b/node_modules/dayjs/locale/gl.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_gl=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"gl",weekdays:"domingo_luns_martes_mércores_xoves_venres_sábado".split("_"),months:"xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro".split("_"),weekStart:1,weekdaysShort:"dom._lun._mar._mér._xov._ven._sáb.".split("_"),monthsShort:"xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.".split("_"),weekdaysMin:"do_lu_ma_mé_xo_ve_sá".split("_"),ordinal:function(e){return e+"º"},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},relativeTime:{future:"en %s",past:"fai %s",s:"uns segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"}};return s.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/gom-latn.js b/node_modules/dayjs/locale/gom-latn.js
new file mode 100644
index 0000000..1596618
--- /dev/null
+++ b/node_modules/dayjs/locale/gom-latn.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_gom_latn=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),_={name:"gom-latn",weekdays:"Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son'var".split("_"),months:"Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr".split("_"),weekStart:1,weekdaysShort:"Ait._Som._Mon._Bud._Bre._Suk._Son.".split("_"),monthsShort:"Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.".split("_"),weekdaysMin:"Ai_Sm_Mo_Bu_Br_Su_Sn".split("_"),ordinal:function(e){return e},formats:{LT:"A h:mm [vazta]",LTS:"A h:mm:ss [vazta]",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY A h:mm [vazta]",LLLL:"dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]",llll:"ddd, D MMM YYYY, A h:mm [vazta]"}};return a.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/gu.js b/node_modules/dayjs/locale/gu.js
new file mode 100644
index 0000000..f42a17c
--- /dev/null
+++ b/node_modules/dayjs/locale/gu.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_gu=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"gu",weekdays:"રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર".split("_"),months:"જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર".split("_"),weekdaysShort:"રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ".split("_"),monthsShort:"જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.".split("_"),weekdaysMin:"ર_સો_મં_બુ_ગુ_શુ_શ".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm વાગ્યે",LTS:"A h:mm:ss વાગ્યે",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm વાગ્યે",LLLL:"dddd, D MMMM YYYY, A h:mm વાગ્યે"},relativeTime:{future:"%s મા",past:"%s પેહલા",s:"અમુક પળો",m:"એક મિનિટ",mm:"%d મિનિટ",h:"એક કલાક",hh:"%d કલાક",d:"એક દિવસ",dd:"%d દિવસ",M:"એક મહિનો",MM:"%d મહિનો",y:"એક વર્ષ",yy:"%d વર્ષ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/he.js b/node_modules/dayjs/locale/he.js
new file mode 100644
index 0000000..3e4062e
--- /dev/null
+++ b/node_modules/dayjs/locale/he.js
@@ -0,0 +1 @@
+!function(Y,M){"object"==typeof exports&&"undefined"!=typeof module?module.exports=M(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],M):(Y="undefined"!=typeof globalThis?globalThis:Y||self).dayjs_locale_he=M(Y.dayjs)}(this,(function(Y){"use strict";function M(Y){return Y&&"object"==typeof Y&&"default"in Y?Y:{default:Y}}var d=M(Y),e={s:"מספר שניות",ss:"%d שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:"%d שעות",hh2:"שעתיים",d:"יום",dd:"%d ימים",dd2:"יומיים",M:"חודש",MM:"%d חודשים",MM2:"חודשיים",y:"שנה",yy:"%d שנים",yy2:"שנתיים"};function _(Y,M,d){return(e[d+(2===Y?"2":"")]||e[d]).replace("%d",Y)}var l={name:"he",weekdays:"ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"א׳_ב׳_ג׳_ד׳_ה׳_ו_ש׳".split("_"),months:"ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו_פבר_מרץ_אפר_מאי_יונ_יול_אוג_ספט_אוק_נוב_דצמ".split("_"),relativeTime:{future:"בעוד %s",past:"לפני %s",s:_,m:_,mm:_,h:_,hh:_,d:_,dd:_,M:_,MM:_,y:_,yy:_},ordinal:function(Y){return Y},format:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY HH:mm",LLLL:"dddd, D [ב]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY HH:mm",LLLL:"dddd, D [ב]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"}};return d.default.locale(l,null,!0),l}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/hi.js b/node_modules/dayjs/locale/hi.js
new file mode 100644
index 0000000..9dca3cf
--- /dev/null
+++ b/node_modules/dayjs/locale/hi.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_hi=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"hi",weekdays:"रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),months:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),weekdaysShort:"रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि".split("_"),monthsShort:"जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm बजे",LTS:"A h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm बजे",LLLL:"dddd, D MMMM YYYY, A h:mm बजे"},relativeTime:{future:"%s में",past:"%s पहले",s:"कुछ ही क्षण",m:"एक मिनट",mm:"%d मिनट",h:"एक घंटा",hh:"%d घंटे",d:"एक दिन",dd:"%d दिन",M:"एक महीने",MM:"%d महीने",y:"एक वर्ष",yy:"%d वर्ष"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/hr.js b/node_modules/dayjs/locale/hr.js
new file mode 100644
index 0000000..12e8387
--- /dev/null
+++ b/node_modules/dayjs/locale/hr.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_hr=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),s="siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca".split("_"),n="siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_"),_=/D[oD]?(\[[^[\]]*\]|\s)+MMMM?/,o=function(e,a){return _.test(a)?s[e.month()]:n[e.month()]};o.s=n,o.f=s;var i={name:"hr",weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),months:o,monthsShort:"sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},relativeTime:{future:"za %s",past:"prije %s",s:"sekunda",m:"minuta",mm:"%d minuta",h:"sat",hh:"%d sati",d:"dan",dd:"%d dana",M:"mjesec",MM:"%d mjeseci",y:"godina",yy:"%d godine"},ordinal:function(e){return e+"."}};return t.default.locale(i,null,!0),i}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ht.js b/node_modules/dayjs/locale/ht.js
new file mode 100644
index 0000000..3b2d9a3
--- /dev/null
+++ b/node_modules/dayjs/locale/ht.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ht=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var d=n(e),a={name:"ht",weekdays:"dimanch_lendi_madi_mèkredi_jedi_vandredi_samdi".split("_"),months:"janvye_fevriye_mas_avril_me_jen_jiyè_out_septanm_oktòb_novanm_desanm".split("_"),weekdaysShort:"dim._len._mad._mèk._jed._van._sam.".split("_"),monthsShort:"jan._fev._mas_avr._me_jen_jiyè._out_sept._okt._nov._des.".split("_"),weekdaysMin:"di_le_ma_mè_je_va_sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"nan %s",past:"sa gen %s",s:"kèk segond",m:"yon minit",mm:"%d minit",h:"inèdtan",hh:"%d zè",d:"yon jou",dd:"%d jou",M:"yon mwa",MM:"%d mwa",y:"yon ane",yy:"%d ane"}};return d.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/hu.js b/node_modules/dayjs/locale/hu.js
new file mode 100644
index 0000000..e2aff04
--- /dev/null
+++ b/node_modules/dayjs/locale/hu.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_hu=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),r={name:"hu",weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),ordinal:function(e){return e+"."},weekStart:1,relativeTime:{future:"%s múlva",past:"%s",s:function(e,n,t,r){return"néhány másodperc"+(r||n?"":"e")},m:function(e,n,t,r){return"egy perc"+(r||n?"":"e")},mm:function(e,n,t,r){return e+" perc"+(r||n?"":"e")},h:function(e,n,t,r){return"egy "+(r||n?"óra":"órája")},hh:function(e,n,t,r){return e+" "+(r||n?"óra":"órája")},d:function(e,n,t,r){return"egy "+(r||n?"nap":"napja")},dd:function(e,n,t,r){return e+" "+(r||n?"nap":"napja")},M:function(e,n,t,r){return"egy "+(r||n?"hónap":"hónapja")},MM:function(e,n,t,r){return e+" "+(r||n?"hónap":"hónapja")},y:function(e,n,t,r){return"egy "+(r||n?"év":"éve")},yy:function(e,n,t,r){return e+" "+(r||n?"év":"éve")}},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D. H:mm",LLLL:"YYYY. MMMM D., dddd H:mm"}};return t.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/hy-am.js b/node_modules/dayjs/locale/hy-am.js
new file mode 100644
index 0000000..44daa15
--- /dev/null
+++ b/node_modules/dayjs/locale/hy-am.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_hy_am=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"hy-am",weekdays:"կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ".split("_"),months:"հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի".split("_"),weekStart:1,weekdaysShort:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),monthsShort:"հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ".split("_"),weekdaysMin:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY թ.",LLL:"D MMMM YYYY թ., HH:mm",LLLL:"dddd, D MMMM YYYY թ., HH:mm"},relativeTime:{future:"%s հետո",past:"%s առաջ",s:"մի քանի վայրկյան",m:"րոպե",mm:"%d րոպե",h:"ժամ",hh:"%d ժամ",d:"օր",dd:"%d օր",M:"ամիս",MM:"%d ամիս",y:"տարի",yy:"%d տարի"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/id.js b/node_modules/dayjs/locale/id.js
new file mode 100644
index 0000000..0637a65
--- /dev/null
+++ b/node_modules/dayjs/locale/id.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_id=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),_={name:"id",weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),weekStart:1,formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},ordinal:function(e){return e+"."}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/index.d.ts b/node_modules/dayjs/locale/index.d.ts
new file mode 100644
index 0000000..bd2dca2
--- /dev/null
+++ b/node_modules/dayjs/locale/index.d.ts
@@ -0,0 +1,11 @@
+/// <reference path="./types.d.ts" />
+
+declare module 'dayjs/locale/*' {
+  namespace locale {
+    interface Locale extends ILocale {}
+  }
+
+  const locale: locale.Locale
+
+  export = locale
+}
diff --git a/node_modules/dayjs/locale/is.js b/node_modules/dayjs/locale/is.js
new file mode 100644
index 0000000..de6799b
--- /dev/null
+++ b/node_modules/dayjs/locale/is.js
@@ -0,0 +1 @@
+!function(u,r){"object"==typeof exports&&"undefined"!=typeof module?module.exports=r(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],r):(u="undefined"!=typeof globalThis?globalThis:u||self).dayjs_locale_is=r(u.dayjs)}(this,(function(u){"use strict";function r(u){return u&&"object"==typeof u&&"default"in u?u:{default:u}}var n=r(u),e={s:["nokkrar sekúndur","nokkrar sekúndur","nokkrum sekúndum"],m:["mínúta","mínútu","mínútu"],mm:["mínútur","mínútur","mínútum"],h:["klukkustund","klukkustund","klukkustund"],hh:["klukkustundir","klukkustundir","klukkustundum"],d:["dagur","dag","degi"],dd:["dagar","daga","dögum"],M:["mánuður","mánuð","mánuði"],MM:["mánuðir","mánuði","mánuðum"],y:["ár","ár","ári"],yy:["ár","ár","árum"]};function t(u,r,n,t){var a=function(u,r,n,t){var a=t?0:n?1:2,d=2===u.length&&r%10==1?u[0]:u,m=e[d][a];return 1===u.length?m:"%d "+m}(n,u,t,r);return a.replace("%d",u)}var a={name:"is",weekdays:"sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),months:"janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),weekStart:1,weekdaysShort:"sun_mán_þri_mið_fim_fös_lau".split("_"),monthsShort:"jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),weekdaysMin:"Su_Má_Þr_Mi_Fi_Fö_La".split("_"),ordinal:function(u){return u},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd, D. MMMM YYYY [kl.] H:mm"},relativeTime:{future:"eftir %s",past:"fyrir %s síðan",s:t,m:t,mm:t,h:t,hh:t,d:t,dd:t,M:t,MM:t,y:t,yy:t}};return n.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/it-ch.js b/node_modules/dayjs/locale/it-ch.js
new file mode 100644
index 0000000..7e1c92f
--- /dev/null
+++ b/node_modules/dayjs/locale/it-ch.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_it_ch=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=o(e),t={name:"it-ch",weekdays:"domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato".split("_"),months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),weekStart:1,weekdaysShort:"dom_lun_mar_mer_gio_ven_sab".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdaysMin:"do_lu_ma_me_gi_ve_sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"tra %s",past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"}};return n.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/it.js b/node_modules/dayjs/locale/it.js
new file mode 100644
index 0000000..2ddf44b
--- /dev/null
+++ b/node_modules/dayjs/locale/it.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_it=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=o(e),n={name:"it",weekdays:"domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato".split("_"),weekdaysShort:"dom_lun_mar_mer_gio_ven_sab".split("_"),weekdaysMin:"do_lu_ma_me_gi_ve_sa".split("_"),months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),weekStart:1,monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"tra %s",past:"%s fa",s:"qualche secondo",m:"un minuto",mm:"%d minuti",h:"un' ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinal:function(e){return e+"º"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ja.js b/node_modules/dayjs/locale/ja.js
new file mode 100644
index 0000000..cd52f36
--- /dev/null
+++ b/node_modules/dayjs/locale/ja.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ja=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"ja",weekdays:"日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_火_水_木_金_土".split("_"),weekdaysMin:"日_月_火_水_木_金_土".split("_"),months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e){return e+"日"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日 dddd HH:mm",l:"YYYY/MM/DD",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日(ddd) HH:mm"},meridiem:function(e){return e<12?"午前":"午後"},relativeTime:{future:"%s後",past:"%s前",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/jv.js b/node_modules/dayjs/locale/jv.js
new file mode 100644
index 0000000..7566308
--- /dev/null
+++ b/node_modules/dayjs/locale/jv.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_jv=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),_={name:"jv",weekdays:"Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu".split("_"),months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember".split("_"),weekStart:1,weekdaysShort:"Min_Sen_Sel_Reb_Kem_Jem_Sep".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sp".split("_"),ordinal:function(e){return e},formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},relativeTime:{future:"wonten ing %s",past:"%s ingkang kepengker",s:"sawetawis detik",m:"setunggal menit",mm:"%d menit",h:"setunggal jam",hh:"%d jam",d:"sedinten",dd:"%d dinten",M:"sewulan",MM:"%d wulan",y:"setaun",yy:"%d taun"}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ka.js b/node_modules/dayjs/locale/ka.js
new file mode 100644
index 0000000..7b2ce53
--- /dev/null
+++ b/node_modules/dayjs/locale/ka.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ka=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ka",weekdays:"კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი".split("_"),weekdaysShort:"კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ".split("_"),weekdaysMin:"კვ_ორ_სა_ოთ_ხუ_პა_შა".split("_"),months:"იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი".split("_"),monthsShort:"იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ".split("_"),weekStart:1,formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},relativeTime:{future:"%s შემდეგ",past:"%s წინ",s:"წამი",m:"წუთი",mm:"%d წუთი",h:"საათი",hh:"%d საათის",d:"დღეს",dd:"%d დღის განმავლობაში",M:"თვის",MM:"%d თვის",y:"წელი",yy:"%d წლის"},ordinal:function(_){return _}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/kk.js b/node_modules/dayjs/locale/kk.js
new file mode 100644
index 0000000..a2f17a3
--- /dev/null
+++ b/node_modules/dayjs/locale/kk.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_kk=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"kk",weekdays:"жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі".split("_"),weekdaysShort:"жек_дүй_сей_сәр_бей_жұм_сен".split("_"),weekdaysMin:"жк_дй_сй_ср_бй_жм_сн".split("_"),months:"қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан".split("_"),monthsShort:"қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел".split("_"),weekStart:1,relativeTime:{future:"%s ішінде",past:"%s бұрын",s:"бірнеше секунд",m:"бір минут",mm:"%d минут",h:"бір сағат",hh:"%d сағат",d:"бір күн",dd:"%d күн",M:"бір ай",MM:"%d ай",y:"бір жыл",yy:"%d жыл"},ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/km.js b/node_modules/dayjs/locale/km.js
new file mode 100644
index 0000000..528923e
--- /dev/null
+++ b/node_modules/dayjs/locale/km.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_km=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"km",weekdays:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),months:"មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),weekStart:1,weekdaysShort:"អា_ច_អ_ព_ព្រ_សុ_ស".split("_"),monthsShort:"មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),weekdaysMin:"អា_ច_អ_ព_ព្រ_សុ_ស".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"%sទៀត",past:"%sមុន",s:"ប៉ុន្មានវិនាទី",m:"មួយនាទី",mm:"%d នាទី",h:"មួយម៉ោង",hh:"%d ម៉ោង",d:"មួយថ្ងៃ",dd:"%d ថ្ងៃ",M:"មួយខែ",MM:"%d ខែ",y:"មួយឆ្នាំ",yy:"%d ឆ្នាំ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/kn.js b/node_modules/dayjs/locale/kn.js
new file mode 100644
index 0000000..e040eba
--- /dev/null
+++ b/node_modules/dayjs/locale/kn.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_kn=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"kn",weekdays:"ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ".split("_"),months:"ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್".split("_"),weekdaysShort:"ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ".split("_"),monthsShort:"ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ".split("_"),weekdaysMin:"ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},relativeTime:{future:"%s ನಂತರ",past:"%s ಹಿಂದೆ",s:"ಕೆಲವು ಕ್ಷಣಗಳು",m:"ಒಂದು ನಿಮಿಷ",mm:"%d ನಿಮಿಷ",h:"ಒಂದು ಗಂಟೆ",hh:"%d ಗಂಟೆ",d:"ಒಂದು ದಿನ",dd:"%d ದಿನ",M:"ಒಂದು ತಿಂಗಳು",MM:"%d ತಿಂಗಳು",y:"ಒಂದು ವರ್ಷ",yy:"%d ವರ್ಷ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ko.js b/node_modules/dayjs/locale/ko.js
new file mode 100644
index 0000000..cfe8b37
--- /dev/null
+++ b/node_modules/dayjs/locale/ko.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ko=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var d=_(e),t={name:"ko",weekdays:"일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"),weekdaysShort:"일_월_화_수_목_금_토".split("_"),weekdaysMin:"일_월_화_수_목_금_토".split("_"),months:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),monthsShort:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),ordinal:function(e){return e+"일"},formats:{LT:"A h:mm",LTS:"A h:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY년 MMMM D일",LLL:"YYYY년 MMMM D일 A h:mm",LLLL:"YYYY년 MMMM D일 dddd A h:mm",l:"YYYY.MM.DD.",ll:"YYYY년 MMMM D일",lll:"YYYY년 MMMM D일 A h:mm",llll:"YYYY년 MMMM D일 dddd A h:mm"},meridiem:function(e){return e<12?"오전":"오후"},relativeTime:{future:"%s 후",past:"%s 전",s:"몇 초",m:"1분",mm:"%d분",h:"한 시간",hh:"%d시간",d:"하루",dd:"%d일",M:"한 달",MM:"%d달",y:"일 년",yy:"%d년"}};return d.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ku.js b/node_modules/dayjs/locale/ku.js
new file mode 100644
index 0000000..cd98fc2
--- /dev/null
+++ b/node_modules/dayjs/locale/ku.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("dayjs")):"function"==typeof define&&define.amd?define(["exports","dayjs"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ku={},e.dayjs)}(this,(function(e,t){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var r=n(t),d={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},o={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},u=["کانوونی دووەم","شوبات","ئادار","نیسان","ئایار","حوزەیران","تەممووز","ئاب","ئەیلوول","تشرینی یەکەم","تشرینی دووەم","کانوونی یەکەم"],i={name:"ku",months:u,monthsShort:u,weekdays:"یەکشەممە_دووشەممە_سێشەممە_چوارشەممە_پێنجشەممە_هەینی_شەممە".split("_"),weekdaysShort:"یەکشەم_دووشەم_سێشەم_چوارشەم_پێنجشەم_هەینی_شەممە".split("_"),weekStart:6,weekdaysMin:"ی_د_س_چ_پ_هـ_ش".split("_"),preparse:function(e){return e.replace(/[١٢٣٤٥٦٧٨٩٠]/g,(function(e){return o[e]})).replace(/،/g,",")},postformat:function(e){return e.replace(/\d/g,(function(e){return d[e]})).replace(/,/g,"،")},ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiem:function(e){return e<12?"پ.ن":"د.ن"},relativeTime:{future:"لە %s",past:"لەمەوپێش %s",s:"چەند چرکەیەک",m:"یەک خولەک",mm:"%d خولەک",h:"یەک کاتژمێر",hh:"%d کاتژمێر",d:"یەک ڕۆژ",dd:"%d ڕۆژ",M:"یەک مانگ",MM:"%d مانگ",y:"یەک ساڵ",yy:"%d ساڵ"}};r.default.locale(i,null,!0),e.default=i,e.englishToArabicNumbersMap=d,Object.defineProperty(e,"__esModule",{value:!0})}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ky.js b/node_modules/dayjs/locale/ky.js
new file mode 100644
index 0000000..1fdc40e
--- /dev/null
+++ b/node_modules/dayjs/locale/ky.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ky=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ky",weekdays:"Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби".split("_"),months:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),weekStart:1,weekdaysShort:"Жек_Дүй_Шей_Шар_Бей_Жум_Ише".split("_"),monthsShort:"янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек".split("_"),weekdaysMin:"Жк_Дй_Шй_Шр_Бй_Жм_Иш".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"%s ичинде",past:"%s мурун",s:"бирнече секунд",m:"бир мүнөт",mm:"%d мүнөт",h:"бир саат",hh:"%d саат",d:"бир күн",dd:"%d күн",M:"бир ай",MM:"%d ай",y:"бир жыл",yy:"%d жыл"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/lb.js b/node_modules/dayjs/locale/lb.js
new file mode 100644
index 0000000..b6895f2
--- /dev/null
+++ b/node_modules/dayjs/locale/lb.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_lb=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),n={name:"lb",weekdays:"Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),months:"Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),weekStart:1,weekdaysShort:"So._Mé._Dë._Më._Do._Fr._Sa.".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdaysMin:"So_Mé_Dë_Më_Do_Fr_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"H:mm [Auer]",LTS:"H:mm:ss [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm [Auer]",LLLL:"dddd, D. MMMM YYYY H:mm [Auer]"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/lo.js b/node_modules/dayjs/locale/lo.js
new file mode 100644
index 0000000..1bf09d1
--- /dev/null
+++ b/node_modules/dayjs/locale/lo.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_lo=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"lo",weekdays:"ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ".split("_"),months:"ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ".split("_"),weekdaysShort:"ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ".split("_"),monthsShort:"ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ".split("_"),weekdaysMin:"ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"ວັນdddd D MMMM YYYY HH:mm"},relativeTime:{future:"ອີກ %s",past:"%sຜ່ານມາ",s:"ບໍ່ເທົ່າໃດວິນາທີ",m:"1 ນາທີ",mm:"%d ນາທີ",h:"1 ຊົ່ວໂມງ",hh:"%d ຊົ່ວໂມງ",d:"1 ມື້",dd:"%d ມື້",M:"1 ເດືອນ",MM:"%d ເດືອນ",y:"1 ປີ",yy:"%d ປີ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/lt.js b/node_modules/dayjs/locale/lt.js
new file mode 100644
index 0000000..52f2225
--- /dev/null
+++ b/node_modules/dayjs/locale/lt.js
@@ -0,0 +1 @@
+!function(e,s){"object"==typeof exports&&"undefined"!=typeof module?module.exports=s(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],s):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_lt=s(e.dayjs)}(this,(function(e){"use strict";function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=s(e),d="sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"),a="sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis".split("_"),l=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/,M=function(e,s){return l.test(s)?d[e.month()]:a[e.month()]};M.s=a,M.f=d;var t={name:"lt",weekdays:"sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"),weekdaysShort:"sek_pir_ant_tre_ket_pen_šeš".split("_"),weekdaysMin:"s_p_a_t_k_pn_š".split("_"),months:M,monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),ordinal:function(e){return e+"."},weekStart:1,relativeTime:{future:"už %s",past:"prieš %s",s:"kelias sekundes",m:"minutę",mm:"%d minutes",h:"valandą",hh:"%d valandas",d:"dieną",dd:"%d dienas",M:"mėnesį",MM:"%d mėnesius",y:"metus",yy:"%d metus"},format:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], HH:mm [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], HH:mm [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], HH:mm [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], HH:mm [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"}};return i.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/lv.js b/node_modules/dayjs/locale/lv.js
new file mode 100644
index 0000000..98fc126
--- /dev/null
+++ b/node_modules/dayjs/locale/lv.js
@@ -0,0 +1 @@
+!function(e,s){"object"==typeof exports&&"undefined"!=typeof module?module.exports=s(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],s):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_lv=s(e.dayjs)}(this,(function(e){"use strict";function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=s(e),d={name:"lv",weekdays:"svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),months:"janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),weekStart:1,weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),monthsShort:"jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, HH:mm",LLLL:"YYYY. [gada] D. MMMM, dddd, HH:mm"},relativeTime:{future:"pēc %s",past:"pirms %s",s:"dažām sekundēm",m:"minūtes",mm:"%d minūtēm",h:"stundas",hh:"%d stundām",d:"dienas",dd:"%d dienām",M:"mēneša",MM:"%d mēnešiem",y:"gada",yy:"%d gadiem"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/me.js b/node_modules/dayjs/locale/me.js
new file mode 100644
index 0000000..ecb22ae
--- /dev/null
+++ b/node_modules/dayjs/locale/me.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_me=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=t(e),a={name:"me",weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),months:"januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),weekStart:1,weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),monthsShort:"jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),ordinal:function(e){return e},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"}};return _.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/mi.js b/node_modules/dayjs/locale/mi.js
new file mode 100644
index 0000000..1b328f0
--- /dev/null
+++ b/node_modules/dayjs/locale/mi.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_mi=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=a(e),t={name:"mi",weekdays:"Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei".split("_"),months:"Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea".split("_"),weekStart:1,weekdaysShort:"Ta_Ma_Tū_We_Tāi_Pa_Hā".split("_"),monthsShort:"Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki".split("_"),weekdaysMin:"Ta_Ma_Tū_We_Tāi_Pa_Hā".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [i] HH:mm",LLLL:"dddd, D MMMM YYYY [i] HH:mm"},relativeTime:{future:"i roto i %s",past:"%s i mua",s:"te hēkona ruarua",m:"he meneti",mm:"%d meneti",h:"te haora",hh:"%d haora",d:"he ra",dd:"%d ra",M:"he marama",MM:"%d marama",y:"he tau",yy:"%d tau"}};return i.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/mk.js b/node_modules/dayjs/locale/mk.js
new file mode 100644
index 0000000..0f2ece1
--- /dev/null
+++ b/node_modules/dayjs/locale/mk.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_mk=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"mk",weekdays:"недела_понеделник_вторник_среда_четврток_петок_сабота".split("_"),months:"јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември".split("_"),weekStart:1,weekdaysShort:"нед_пон_вто_сре_чет_пет_саб".split("_"),monthsShort:"јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек".split("_"),weekdaysMin:"нe_пo_вт_ср_че_пе_сa".split("_"),ordinal:function(e){return e},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},relativeTime:{future:"после %s",past:"пред %s",s:"неколку секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дена",M:"месец",MM:"%d месеци",y:"година",yy:"%d години"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ml.js b/node_modules/dayjs/locale/ml.js
new file mode 100644
index 0000000..8e7db4f
--- /dev/null
+++ b/node_modules/dayjs/locale/ml.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ml=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ml",weekdays:"ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച".split("_"),months:"ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ".split("_"),weekdaysShort:"ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി".split("_"),monthsShort:"ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.".split("_"),weekdaysMin:"ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm -നു",LTS:"A h:mm:ss -നു",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm -നു",LLLL:"dddd, D MMMM YYYY, A h:mm -നു"},relativeTime:{future:"%s കഴിഞ്ഞ്",past:"%s മുൻപ്",s:"അൽപ നിമിഷങ്ങൾ",m:"ഒരു മിനിറ്റ്",mm:"%d മിനിറ്റ്",h:"ഒരു മണിക്കൂർ",hh:"%d മണിക്കൂർ",d:"ഒരു ദിവസം",dd:"%d ദിവസം",M:"ഒരു മാസം",MM:"%d മാസം",y:"ഒരു വർഷം",yy:"%d വർഷം"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/mn.js b/node_modules/dayjs/locale/mn.js
new file mode 100644
index 0000000..4de299b
--- /dev/null
+++ b/node_modules/dayjs/locale/mn.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_mn=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"mn",weekdays:"Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба".split("_"),months:"Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар".split("_"),weekdaysShort:"Ням_Дав_Мяг_Лха_Пүр_Баа_Бям".split("_"),monthsShort:"1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар".split("_"),weekdaysMin:"Ня_Да_Мя_Лх_Пү_Ба_Бя".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY оны MMMMын D",LLL:"YYYY оны MMMMын D HH:mm",LLLL:"dddd, YYYY оны MMMMын D HH:mm"},relativeTime:{future:"%s",past:"%s",s:"саяхан",m:"м",mm:"%dм",h:"1ц",hh:"%dц",d:"1ө",dd:"%dө",M:"1с",MM:"%dс",y:"1ж",yy:"%dж"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/mr.js b/node_modules/dayjs/locale/mr.js
new file mode 100644
index 0000000..af6bb3a
--- /dev/null
+++ b/node_modules/dayjs/locale/mr.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_mr=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),n={name:"mr",weekdays:"रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),months:"जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर".split("_"),weekdaysShort:"रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि".split("_"),monthsShort:"जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm वाजता",LTS:"A h:mm:ss वाजता",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm वाजता",LLLL:"dddd, D MMMM YYYY, A h:mm वाजता"}};return t.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ms-my.js b/node_modules/dayjs/locale/ms-my.js
new file mode 100644
index 0000000..1917d7a
--- /dev/null
+++ b/node_modules/dayjs/locale/ms-my.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ms_my=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),_={name:"ms-my",weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),weekStart:1,weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),ordinal:function(e){return e},formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ms.js b/node_modules/dayjs/locale/ms.js
new file mode 100644
index 0000000..be4f88e
--- /dev/null
+++ b/node_modules/dayjs/locale/ms.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ms=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=a(e),s={name:"ms",weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekStart:1,formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH.mm",LLLL:"dddd, D MMMM YYYY HH.mm"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},ordinal:function(e){return e+"."}};return t.default.locale(s,null,!0),s}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/mt.js b/node_modules/dayjs/locale/mt.js
new file mode 100644
index 0000000..43d481a
--- /dev/null
+++ b/node_modules/dayjs/locale/mt.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_mt=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),i={name:"mt",weekdays:"Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt".split("_"),months:"Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru".split("_"),weekStart:1,weekdaysShort:"Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib".split("_"),monthsShort:"Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ".split("_"),weekdaysMin:"Ħa_Tn_Tl_Er_Ħa_Ġi_Si".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"f’ %s",past:"%s ilu",s:"ftit sekondi",m:"minuta",mm:"%d minuti",h:"siegħa",hh:"%d siegħat",d:"ġurnata",dd:"%d ġranet",M:"xahar",MM:"%d xhur",y:"sena",yy:"%d sni"}};return a.default.locale(i,null,!0),i}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/my.js b/node_modules/dayjs/locale/my.js
new file mode 100644
index 0000000..95adead
--- /dev/null
+++ b/node_modules/dayjs/locale/my.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_my=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"my",weekdays:"တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ".split("_"),months:"ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ".split("_"),weekStart:1,weekdaysShort:"နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),monthsShort:"ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ".split("_"),weekdaysMin:"နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"လာမည့် %s မှာ",past:"လွန်ခဲ့သော %s က",s:"စက္ကန်.အနည်းငယ်",m:"တစ်မိနစ်",mm:"%d မိနစ်",h:"တစ်နာရီ",hh:"%d နာရီ",d:"တစ်ရက်",dd:"%d ရက်",M:"တစ်လ",MM:"%d လ",y:"တစ်နှစ်",yy:"%d နှစ်"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/nb.js b/node_modules/dayjs/locale/nb.js
new file mode 100644
index 0000000..ece1f31
--- /dev/null
+++ b/node_modules/dayjs/locale/nb.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_nb=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=t(e),a={name:"nb",weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"sø._ma._ti._on._to._fr._lø.".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"),ordinal:function(e){return e+"."},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] HH:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},relativeTime:{future:"om %s",past:"%s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"}};return n.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ne.js b/node_modules/dayjs/locale/ne.js
new file mode 100644
index 0000000..3d166bc
--- /dev/null
+++ b/node_modules/dayjs/locale/ne.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ne=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"ne",weekdays:"आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार".split("_"),weekdaysShort:"आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.".split("_"),weekdaysMin:"आ._सो._मं._बु._बि._शु._श.".split("_"),months:"जनवरी_फेब्रुवरी_मार्च_अप्रिल_मे_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर".split("_"),monthsShort:"जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.".split("_"),relativeTime:{future:"%s पछि",past:"%s अघि",s:"सेकेन्ड",m:"एक मिनेट",mm:"%d मिनेट",h:"घन्टा",hh:"%d घन्टा",d:"एक दिन",dd:"%d दिन",M:"एक महिना",MM:"%d महिना",y:"एक वर्ष",yy:"%d वर्ष"},ordinal:function(e){return(""+e).replace(/\d/g,(function(e){return"०१२३४५६७८९"[e]}))},formats:{LT:"Aको h:mm बजे",LTS:"Aको h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, Aको h:mm बजे",LLLL:"dddd, D MMMM YYYY, Aको h:mm बजे"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/nl-be.js b/node_modules/dayjs/locale/nl-be.js
new file mode 100644
index 0000000..7a2f60f
--- /dev/null
+++ b/node_modules/dayjs/locale/nl-be.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_nl_be=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=a(e),d={name:"nl-be",weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),weekStart:1,weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"zo_ma_di_wo_do_vr_za".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"}};return n.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/nl.js b/node_modules/dayjs/locale/nl.js
new file mode 100644
index 0000000..47e789f
--- /dev/null
+++ b/node_modules/dayjs/locale/nl.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_nl=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var d=a(e),n={name:"nl",weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"zo_ma_di_wo_do_vr_za".split("_"),months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),ordinal:function(e){return"["+e+(1===e||8===e||e>=20?"ste":"de")+"]"},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"een minuut",mm:"%d minuten",h:"een uur",hh:"%d uur",d:"een dag",dd:"%d dagen",M:"een maand",MM:"%d maanden",y:"een jaar",yy:"%d jaar"}};return d.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/nn.js b/node_modules/dayjs/locale/nn.js
new file mode 100644
index 0000000..eba3c24
--- /dev/null
+++ b/node_modules/dayjs/locale/nn.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_nn=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=t(e),a={name:"nn",weekdays:"sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),weekdaysShort:"sun_mån_tys_ons_tor_fre_lau".split("_"),weekdaysMin:"su_må_ty_on_to_fr_la".split("_"),months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),ordinal:function(e){return e+"."},weekStart:1,relativeTime:{future:"om %s",past:"for %s sidan",s:"nokre sekund",m:"eitt minutt",mm:"%d minutt",h:"ein time",hh:"%d timar",d:"ein dag",dd:"%d dagar",M:"ein månad",MM:"%d månadar",y:"eitt år",yy:"%d år"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"}};return n.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/oc-lnc.js b/node_modules/dayjs/locale/oc-lnc.js
new file mode 100644
index 0000000..12e162c
--- /dev/null
+++ b/node_modules/dayjs/locale/oc-lnc.js
@@ -0,0 +1 @@
+!function(e,d){"object"==typeof exports&&"undefined"!=typeof module?module.exports=d(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],d):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_oc_lnc=d(e.dayjs)}(this,(function(e){"use strict";function d(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=d(e),s={name:"oc-lnc",weekdays:"dimenge_diluns_dimars_dimècres_dijòus_divendres_dissabte".split("_"),weekdaysShort:"Dg_Dl_Dm_Dc_Dj_Dv_Ds".split("_"),weekdaysMin:"dg_dl_dm_dc_dj_dv_ds".split("_"),months:"genièr_febrièr_març_abrial_mai_junh_julhet_agost_setembre_octòbre_novembre_decembre".split("_"),monthsShort:"gen_feb_març_abr_mai_junh_julh_ago_set_oct_nov_dec".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [de] YYYY",LLL:"D MMMM [de] YYYY [a] H:mm",LLLL:"dddd D MMMM [de] YYYY [a] H:mm"},relativeTime:{future:"d'aquí %s",past:"fa %s",s:"unas segondas",m:"una minuta",mm:"%d minutas",h:"una ora",hh:"%d oras",d:"un jorn",dd:"%d jorns",M:"un mes",MM:"%d meses",y:"un an",yy:"%d ans"},ordinal:function(e){return e+"º"}};return n.default.locale(s,null,!0),s}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/pa-in.js b/node_modules/dayjs/locale/pa-in.js
new file mode 100644
index 0000000..4ee3884
--- /dev/null
+++ b/node_modules/dayjs/locale/pa-in.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_pa_in=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"pa-in",weekdays:"ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ".split("_"),months:"ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ".split("_"),weekdaysShort:"ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ".split("_"),monthsShort:"ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ".split("_"),weekdaysMin:"ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm ਵਜੇ",LTS:"A h:mm:ss ਵਜੇ",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm ਵਜੇ",LLLL:"dddd, D MMMM YYYY, A h:mm ਵਜੇ"},relativeTime:{future:"%s ਵਿੱਚ",past:"%s ਪਿਛਲੇ",s:"ਕੁਝ ਸਕਿੰਟ",m:"ਇਕ ਮਿੰਟ",mm:"%d ਮਿੰਟ",h:"ਇੱਕ ਘੰਟਾ",hh:"%d ਘੰਟੇ",d:"ਇੱਕ ਦਿਨ",dd:"%d ਦਿਨ",M:"ਇੱਕ ਮਹੀਨਾ",MM:"%d ਮਹੀਨੇ",y:"ਇੱਕ ਸਾਲ",yy:"%d ਸਾਲ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/pl.js b/node_modules/dayjs/locale/pl.js
new file mode 100644
index 0000000..3f5148c
--- /dev/null
+++ b/node_modules/dayjs/locale/pl.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_pl=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=t(e);function a(e){return e%10<5&&e%10>1&&~~(e/10)%10!=1}function n(e,t,i){var n=e+" ";switch(i){case"m":return t?"minuta":"minutę";case"mm":return n+(a(e)?"minuty":"minut");case"h":return t?"godzina":"godzinę";case"hh":return n+(a(e)?"godziny":"godzin");case"MM":return n+(a(e)?"miesiące":"miesięcy");case"yy":return n+(a(e)?"lata":"lat")}}var r="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),_="styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"),s=/D MMMM/,d=function(e,t){return s.test(t)?r[e.month()]:_[e.month()]};d.s=_,d.f=r;var o={name:"pl",weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"ndz_pon_wt_śr_czw_pt_sob".split("_"),weekdaysMin:"Nd_Pn_Wt_Śr_Cz_Pt_So".split("_"),months:d,monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),ordinal:function(e){return e+"."},weekStart:1,yearStart:4,relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:n,mm:n,h:n,hh:n,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:n,y:"rok",yy:n},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"}};return i.default.locale(o,null,!0),o}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/pt-br.js b/node_modules/dayjs/locale/pt-br.js
new file mode 100644
index 0000000..629c2f1
--- /dev/null
+++ b/node_modules/dayjs/locale/pt-br.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_pt_br=o(e.dayjs)}(this,(function(e){"use strict";function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=o(e),s={name:"pt-br",weekdays:"domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado".split("_"),weekdaysShort:"dom_seg_ter_qua_qui_sex_sáb".split("_"),weekdaysMin:"Do_2ª_3ª_4ª_5ª_6ª_Sá".split("_"),months:"janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),ordinal:function(e){return e+"º"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [às] HH:mm"},relativeTime:{future:"em %s",past:"há %s",s:"poucos segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"}};return a.default.locale(s,null,!0),s}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/pt.js b/node_modules/dayjs/locale/pt.js
new file mode 100644
index 0000000..91652e8
--- /dev/null
+++ b/node_modules/dayjs/locale/pt.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_pt=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=a(e),t={name:"pt",weekdays:"domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado".split("_"),weekdaysShort:"dom_seg_ter_qua_qui_sex_sab".split("_"),weekdaysMin:"Do_2ª_3ª_4ª_5ª_6ª_Sa".split("_"),months:"janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),ordinal:function(e){return e+"º"},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [às] HH:mm"},relativeTime:{future:"em %s",past:"há %s",s:"alguns segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"}};return o.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/rn.js b/node_modules/dayjs/locale/rn.js
new file mode 100644
index 0000000..a093364
--- /dev/null
+++ b/node_modules/dayjs/locale/rn.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_rn=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var t=e(a),u={name:"rn",weekdays:"Ku wa Mungu_Ku wa Mbere_Ku wa Kabiri_Ku wa Gatatu_Ku wa Kane_Ku wa Gatanu_Ku wa Gatandatu".split("_"),weekdaysShort:"Kngu_Kmbr_Kbri_Ktat_Kkan_Ktan_Kdat".split("_"),weekdaysMin:"K7_K1_K2_K3_K4_K5_K6".split("_"),months:"Nzero_Ruhuhuma_Ntwarante_Ndamukiza_Rusama_Ruhenshi_Mukakaro_Myandagaro_Nyakanga_Gitugutu_Munyonyo_Kigarama".split("_"),monthsShort:"Nzer_Ruhuh_Ntwar_Ndam_Rus_Ruhen_Muk_Myand_Nyak_Git_Muny_Kig".split("_"),weekStart:1,ordinal:function(a){return a},relativeTime:{future:"mu %s",past:"%s",s:"amasegonda",m:"Umunota",mm:"%d iminota",h:"isaha",hh:"%d amasaha",d:"Umunsi",dd:"%d iminsi",M:"ukwezi",MM:"%d amezi",y:"umwaka",yy:"%d imyaka"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"}};return t.default.locale(u,null,!0),u}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ro.js b/node_modules/dayjs/locale/ro.js
new file mode 100644
index 0000000..445af3d
--- /dev/null
+++ b/node_modules/dayjs/locale/ro.js
@@ -0,0 +1 @@
+!function(e,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],i):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ro=i(e.dayjs)}(this,(function(e){"use strict";function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=i(e),_={name:"ro",weekdays:"Duminică_Luni_Marți_Miercuri_Joi_Vineri_Sâmbătă".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),months:"Ianuarie_Februarie_Martie_Aprilie_Mai_Iunie_Iulie_August_Septembrie_Octombrie_Noiembrie_Decembrie".split("_"),monthsShort:"Ian._Febr._Mart._Apr._Mai_Iun._Iul._Aug._Sept._Oct._Nov._Dec.".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},relativeTime:{future:"peste %s",past:"acum %s",s:"câteva secunde",m:"un minut",mm:"%d minute",h:"o oră",hh:"%d ore",d:"o zi",dd:"%d zile",M:"o lună",MM:"%d luni",y:"un an",yy:"%d ani"},ordinal:function(e){return e}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ru.js b/node_modules/dayjs/locale/ru.js
new file mode 100644
index 0000000..f896790
--- /dev/null
+++ b/node_modules/dayjs/locale/ru.js
@@ -0,0 +1 @@
+!function(_,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ru=t(_.dayjs)}(this,(function(_){"use strict";function t(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var e=t(_),n="января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря".split("_"),s="январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),r="янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.".split("_"),o="янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.".split("_"),i=/D[oD]?(\[[^[\]]*\]|\s)+MMMM?/;function d(_,t,e){var n,s;return"m"===e?t?"минута":"минуту":_+" "+(n=+_,s={mm:t?"минута_минуты_минут":"минуту_минуты_минут",hh:"час_часа_часов",dd:"день_дня_дней",MM:"месяц_месяца_месяцев",yy:"год_года_лет"}[e].split("_"),n%10==1&&n%100!=11?s[0]:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?s[1]:s[2])}var u=function(_,t){return i.test(t)?n[_.month()]:s[_.month()]};u.s=s,u.f=n;var a=function(_,t){return i.test(t)?r[_.month()]:o[_.month()]};a.s=o,a.f=r;var m={name:"ru",weekdays:"воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"),weekdaysShort:"вск_пнд_втр_срд_чтв_птн_сбт".split("_"),weekdaysMin:"вс_пн_вт_ср_чт_пт_сб".split("_"),months:u,monthsShort:a,weekStart:1,yearStart:4,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., H:mm",LLLL:"dddd, D MMMM YYYY г., H:mm"},relativeTime:{future:"через %s",past:"%s назад",s:"несколько секунд",m:d,mm:d,h:"час",hh:d,d:"день",dd:d,M:"месяц",MM:d,y:"год",yy:d},ordinal:function(_){return _},meridiem:function(_){return _<4?"ночи":_<12?"утра":_<17?"дня":"вечера"}};return e.default.locale(m,null,!0),m}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/rw.js b/node_modules/dayjs/locale/rw.js
new file mode 100644
index 0000000..bf4c280
--- /dev/null
+++ b/node_modules/dayjs/locale/rw.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_rw=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var u=e(a),t={name:"rw",weekdays:"Ku Cyumweru_Kuwa Mbere_Kuwa Kabiri_Kuwa Gatatu_Kuwa Kane_Kuwa Gatanu_Kuwa Gatandatu".split("_"),months:"Mutarama_Gashyantare_Werurwe_Mata_Gicurasi_Kamena_Nyakanga_Kanama_Nzeri_Ukwakira_Ugushyingo_Ukuboza".split("_"),relativeTime:{future:"mu %s",past:"%s",s:"amasegonda",m:"Umunota",mm:"%d iminota",h:"isaha",hh:"%d amasaha",d:"Umunsi",dd:"%d iminsi",M:"ukwezi",MM:"%d amezi",y:"umwaka",yy:"%d imyaka"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},ordinal:function(a){return a}};return u.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sd.js b/node_modules/dayjs/locale/sd.js
new file mode 100644
index 0000000..b1e1ee4
--- /dev/null
+++ b/node_modules/dayjs/locale/sd.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_sd=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"sd",weekdays:"آچر_سومر_اڱارو_اربع_خميس_جمع_ڇنڇر".split("_"),months:"جنوري_فيبروري_مارچ_اپريل_مئي_جون_جولاءِ_آگسٽ_سيپٽمبر_آڪٽوبر_نومبر_ڊسمبر".split("_"),weekStart:1,weekdaysShort:"آچر_سومر_اڱارو_اربع_خميس_جمع_ڇنڇر".split("_"),monthsShort:"جنوري_فيبروري_مارچ_اپريل_مئي_جون_جولاءِ_آگسٽ_سيپٽمبر_آڪٽوبر_نومبر_ڊسمبر".split("_"),weekdaysMin:"آچر_سومر_اڱارو_اربع_خميس_جمع_ڇنڇر".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd، D MMMM YYYY HH:mm"},relativeTime:{future:"%s پوء",past:"%s اڳ",s:"چند سيڪنڊ",m:"هڪ منٽ",mm:"%d منٽ",h:"هڪ ڪلاڪ",hh:"%d ڪلاڪ",d:"هڪ ڏينهن",dd:"%d ڏينهن",M:"هڪ مهينو",MM:"%d مهينا",y:"هڪ سال",yy:"%d سال"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/se.js b/node_modules/dayjs/locale/se.js
new file mode 100644
index 0000000..2cbb224
--- /dev/null
+++ b/node_modules/dayjs/locale/se.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_se=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=a(e),t={name:"se",weekdays:"sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat".split("_"),months:"ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu".split("_"),weekStart:1,weekdaysShort:"sotn_vuos_maŋ_gask_duor_bear_láv".split("_"),monthsShort:"ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov".split("_"),weekdaysMin:"s_v_m_g_d_b_L".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"MMMM D. [b.] YYYY",LLL:"MMMM D. [b.] YYYY [ti.] HH:mm",LLLL:"dddd, MMMM D. [b.] YYYY [ti.] HH:mm"},relativeTime:{future:"%s geažes",past:"maŋit %s",s:"moadde sekunddat",m:"okta minuhta",mm:"%d minuhtat",h:"okta diimmu",hh:"%d diimmut",d:"okta beaivi",dd:"%d beaivvit",M:"okta mánnu",MM:"%d mánut",y:"okta jahki",yy:"%d jagit"}};return n.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/si.js b/node_modules/dayjs/locale/si.js
new file mode 100644
index 0000000..216ae8a
--- /dev/null
+++ b/node_modules/dayjs/locale/si.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_si=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"si",weekdays:"ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා".split("_"),months:"දුරුතු_නවම්_මැදින්_බක්_වෙසක්_පොසොන්_ඇසළ_නිකිණි_බිනර_වප්_ඉල්_උඳුවප්".split("_"),weekdaysShort:"ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන".split("_"),monthsShort:"දුරු_නව_මැදි_බක්_වෙස_පොසො_ඇස_නිකි_බින_වප්_ඉල්_උඳු".split("_"),weekdaysMin:"ඉ_ස_අ_බ_බ්‍ර_සි_සෙ".split("_"),ordinal:function(_){return _},formats:{LT:"a h:mm",LTS:"a h:mm:ss",L:"YYYY/MM/DD",LL:"YYYY MMMM D",LLL:"YYYY MMMM D, a h:mm",LLLL:"YYYY MMMM D [වැනි] dddd, a h:mm:ss"},relativeTime:{future:"%sකින්",past:"%sකට පෙර",s:"තත්පර කිහිපය",m:"විනාඩිය",mm:"විනාඩි %d",h:"පැය",hh:"පැය %d",d:"දිනය",dd:"දින %d",M:"මාසය",MM:"මාස %d",y:"වසර",yy:"වසර %d"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sk.js b/node_modules/dayjs/locale/sk.js
new file mode 100644
index 0000000..b2707e3
--- /dev/null
+++ b/node_modules/dayjs/locale/sk.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sk=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=t(e);function r(e){return e>1&&e<5&&1!=~~(e/10)}function o(e,t,n,o){var a=e+" ";switch(n){case"s":return t||o?"pár sekúnd":"pár sekundami";case"m":return t?"minúta":o?"minútu":"minútou";case"mm":return t||o?a+(r(e)?"minúty":"minút"):a+"minútami";case"h":return t?"hodina":o?"hodinu":"hodinou";case"hh":return t||o?a+(r(e)?"hodiny":"hodín"):a+"hodinami";case"d":return t||o?"deň":"dňom";case"dd":return t||o?a+(r(e)?"dni":"dní"):a+"dňami";case"M":return t||o?"mesiac":"mesiacom";case"MM":return t||o?a+(r(e)?"mesiace":"mesiacov"):a+"mesiacmi";case"y":return t||o?"rok":"rokom";case"yy":return t||o?a+(r(e)?"roky":"rokov"):a+"rokmi"}}var a={name:"sk",weekdays:"nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_št_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_št_pi_so".split("_"),months:"január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_"),monthsShort:"jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"),weekStart:1,yearStart:4,ordinal:function(e){return e+"."},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm",l:"D. M. YYYY"},relativeTime:{future:"za %s",past:"pred %s",s:o,m:o,mm:o,h:o,hh:o,d:o,dd:o,M:o,MM:o,y:o,yy:o}};return n.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sl.js b/node_modules/dayjs/locale/sl.js
new file mode 100644
index 0000000..162d2ec
--- /dev/null
+++ b/node_modules/dayjs/locale/sl.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sl=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e);function r(e){return e%100==2}function a(e){return e%100==3||e%100==4}function s(e,n,t,s){var m=e+" ";switch(t){case"s":return n||s?"nekaj sekund":"nekaj sekundami";case"m":return n?"ena minuta":"eno minuto";case"mm":return r(e)?m+(n||s?"minuti":"minutama"):a(e)?m+(n||s?"minute":"minutami"):m+(n||s?"minut":"minutami");case"h":return n?"ena ura":"eno uro";case"hh":return r(e)?m+(n||s?"uri":"urama"):a(e)?m+(n||s?"ure":"urami"):m+(n||s?"ur":"urami");case"d":return n||s?"en dan":"enim dnem";case"dd":return r(e)?m+(n||s?"dneva":"dnevoma"):m+(n||s?"dni":"dnevi");case"M":return n||s?"en mesec":"enim mesecem";case"MM":return r(e)?m+(n||s?"meseca":"mesecema"):a(e)?m+(n||s?"mesece":"meseci"):m+(n||s?"mesecev":"meseci");case"y":return n||s?"eno leto":"enim letom";case"yy":return r(e)?m+(n||s?"leti":"letoma"):a(e)?m+(n||s?"leta":"leti"):m+(n||s?"let":"leti")}}var m={name:"sl",weekdays:"nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"),months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),weekStart:1,weekdaysShort:"ned._pon._tor._sre._čet._pet._sob.".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),weekdaysMin:"ne_po_to_sr_če_pe_so".split("_"),ordinal:function(e){return e+"."},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm",l:"D. M. YYYY"},relativeTime:{future:"čez %s",past:"pred %s",s:s,m:s,mm:s,h:s,hh:s,d:s,dd:s,M:s,MM:s,y:s,yy:s}};return t.default.locale(m,null,!0),m}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sq.js b/node_modules/dayjs/locale/sq.js
new file mode 100644
index 0000000..99bca9a
--- /dev/null
+++ b/node_modules/dayjs/locale/sq.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sq=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=t(e),n={name:"sq",weekdays:"E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë".split("_"),months:"Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor".split("_"),weekStart:1,weekdaysShort:"Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"),monthsShort:"Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj".split("_"),weekdaysMin:"D_H_Ma_Më_E_P_Sh".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"në %s",past:"%s më parë",s:"disa sekonda",m:"një minutë",mm:"%d minuta",h:"një orë",hh:"%d orë",d:"një ditë",dd:"%d ditë",M:"një muaj",MM:"%d muaj",y:"një vit",yy:"%d vite"}};return _.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sr-cyrl.js b/node_modules/dayjs/locale/sr-cyrl.js
new file mode 100644
index 0000000..90daeeb
--- /dev/null
+++ b/node_modules/dayjs/locale/sr-cyrl.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sr_cyrl=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var r=t(e),a={words:{m:["један минут","једног минута"],mm:["%d минут","%d минута","%d минута"],h:["један сат","једног сата"],hh:["%d сат","%d сата","%d сати"],d:["један дан","једног дана"],dd:["%d дан","%d дана","%d дана"],M:["један месец","једног месеца"],MM:["%d месец","%d месеца","%d месеци"],y:["једну годину","једне године"],yy:["%d годину","%d године","%d година"]},correctGrammarCase:function(e,t){return e%10>=1&&e%10<=4&&(e%100<10||e%100>=20)?e%10==1?t[0]:t[1]:t[2]},relativeTimeFormatter:function(e,t,r,d){var i=a.words[r];if(1===r.length)return"y"===r&&t?"једна година":d||t?i[0]:i[1];var m=a.correctGrammarCase(e,i);return"yy"===r&&t&&"%d годину"===m?e+" година":m.replace("%d",e)}},d={name:"sr-cyrl",weekdays:"Недеља_Понедељак_Уторак_Среда_Четвртак_Петак_Субота".split("_"),weekdaysShort:"Нед._Пон._Уто._Сре._Чет._Пет._Суб.".split("_"),weekdaysMin:"не_по_ут_ср_че_пе_су".split("_"),months:"Јануар_Фебруар_Март_Април_Мај_Јун_Јул_Август_Септембар_Октобар_Новембар_Децембар".split("_"),monthsShort:"Јан._Феб._Мар._Апр._Мај_Јун_Јул_Авг._Сеп._Окт._Нов._Дец.".split("_"),weekStart:1,relativeTime:{future:"за %s",past:"пре %s",s:"неколико секунди",m:a.relativeTimeFormatter,mm:a.relativeTimeFormatter,h:a.relativeTimeFormatter,hh:a.relativeTimeFormatter,d:a.relativeTimeFormatter,dd:a.relativeTimeFormatter,M:a.relativeTimeFormatter,MM:a.relativeTimeFormatter,y:a.relativeTimeFormatter,yy:a.relativeTimeFormatter},ordinal:function(e){return e+"."},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"D. M. YYYY.",LL:"D. MMMM YYYY.",LLL:"D. MMMM YYYY. H:mm",LLLL:"dddd, D. MMMM YYYY. H:mm"}};return r.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sr.js b/node_modules/dayjs/locale/sr.js
new file mode 100644
index 0000000..35a5b55
--- /dev/null
+++ b/node_modules/dayjs/locale/sr.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sr=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),r={words:{m:["jedan minut","jednog minuta"],mm:["%d minut","%d minuta","%d minuta"],h:["jedan sat","jednog sata"],hh:["%d sat","%d sata","%d sati"],d:["jedan dan","jednog dana"],dd:["%d dan","%d dana","%d dana"],M:["jedan mesec","jednog meseca"],MM:["%d mesec","%d meseca","%d meseci"],y:["jednu godinu","jedne godine"],yy:["%d godinu","%d godine","%d godina"]},correctGrammarCase:function(e,t){return e%10>=1&&e%10<=4&&(e%100<10||e%100>=20)?e%10==1?t[0]:t[1]:t[2]},relativeTimeFormatter:function(e,t,a,d){var n=r.words[a];if(1===a.length)return"y"===a&&t?"jedna godina":d||t?n[0]:n[1];var i=r.correctGrammarCase(e,n);return"yy"===a&&t&&"%d godinu"===i?e+" godina":i.replace("%d",e)}},d={name:"sr",weekdays:"Nedelja_Ponedeljak_Utorak_Sreda_Četvrtak_Petak_Subota".split("_"),weekdaysShort:"Ned._Pon._Uto._Sre._Čet._Pet._Sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),months:"Januar_Februar_Mart_April_Maj_Jun_Jul_Avgust_Septembar_Oktobar_Novembar_Decembar".split("_"),monthsShort:"Jan._Feb._Mar._Apr._Maj_Jun_Jul_Avg._Sep._Okt._Nov._Dec.".split("_"),weekStart:1,relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",m:r.relativeTimeFormatter,mm:r.relativeTimeFormatter,h:r.relativeTimeFormatter,hh:r.relativeTimeFormatter,d:r.relativeTimeFormatter,dd:r.relativeTimeFormatter,M:r.relativeTimeFormatter,MM:r.relativeTimeFormatter,y:r.relativeTimeFormatter,yy:r.relativeTimeFormatter},ordinal:function(e){return e+"."},formats:{LT:"H:mm",LTS:"H:mm:ss",L:"D. M. YYYY.",LL:"D. MMMM YYYY.",LLL:"D. MMMM YYYY. H:mm",LLLL:"dddd, D. MMMM YYYY. H:mm"}};return a.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ss.js b/node_modules/dayjs/locale/ss.js
new file mode 100644
index 0000000..4df16a5
--- /dev/null
+++ b/node_modules/dayjs/locale/ss.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_ss=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=n(e),i={name:"ss",weekdays:"Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo".split("_"),months:"Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split("_"),weekStart:1,weekdaysShort:"Lis_Umb_Lsb_Les_Lsi_Lsh_Umg".split("_"),monthsShort:"Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo".split("_"),weekdaysMin:"Li_Us_Lb_Lt_Ls_Lh_Ug".split("_"),ordinal:function(e){return e},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},relativeTime:{future:"nga %s",past:"wenteka nga %s",s:"emizuzwana lomcane",m:"umzuzu",mm:"%d emizuzu",h:"lihora",hh:"%d emahora",d:"lilanga",dd:"%d emalanga",M:"inyanga",MM:"%d tinyanga",y:"umnyaka",yy:"%d iminyaka"}};return a.default.locale(i,null,!0),i}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sv-fi.js b/node_modules/dayjs/locale/sv-fi.js
new file mode 100644
index 0000000..5b2f8af
--- /dev/null
+++ b/node_modules/dayjs/locale/sv-fi.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sv_fi=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),d={name:"sv-fi",weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekStart:1,yearStart:4,ordinal:function(e){var t=e%10;return"["+e+(1===t||2===t?"a":"e")+"]"},formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY, [kl.] HH.mm",LLLL:"dddd, D. MMMM YYYY, [kl.] HH.mm",l:"D.M.YYYY",ll:"D. MMM YYYY",lll:"D. MMM YYYY, [kl.] HH.mm",llll:"ddd, D. MMM YYYY, [kl.] HH.mm"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"}};return a.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sv.js b/node_modules/dayjs/locale/sv.js
new file mode 100644
index 0000000..16e6d37
--- /dev/null
+++ b/node_modules/dayjs/locale/sv.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_sv=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=t(e),d={name:"sv",weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekStart:1,yearStart:4,ordinal:function(e){var t=e%10;return"["+e+(1===t||2===t?"a":"e")+"]"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [kl.] HH:mm",LLLL:"dddd D MMMM YYYY [kl.] HH:mm",lll:"D MMM YYYY HH:mm",llll:"ddd D MMM YYYY HH:mm"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"}};return a.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/sw.js b/node_modules/dayjs/locale/sw.js
new file mode 100644
index 0000000..a13bd44
--- /dev/null
+++ b/node_modules/dayjs/locale/sw.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_sw=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var i=e(a),t={name:"sw",weekdays:"Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi".split("_"),weekdaysShort:"Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos".split("_"),weekdaysMin:"J2_J3_J4_J5_Al_Ij_J1".split("_"),months:"Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des".split("_"),weekStart:1,ordinal:function(a){return a},relativeTime:{future:"%s baadaye",past:"tokea %s",s:"hivi punde",m:"dakika moja",mm:"dakika %d",h:"saa limoja",hh:"masaa %d",d:"siku moja",dd:"masiku %d",M:"mwezi mmoja",MM:"miezi %d",y:"mwaka mmoja",yy:"miaka %d"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"}};return i.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ta.js b/node_modules/dayjs/locale/ta.js
new file mode 100644
index 0000000..406cf13
--- /dev/null
+++ b/node_modules/dayjs/locale/ta.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ta=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ta",weekdays:"ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை".split("_"),months:"ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),weekdaysShort:"ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி".split("_"),monthsShort:"ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),weekdaysMin:"ஞா_தி_செ_பு_வி_வெ_ச".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, HH:mm",LLLL:"dddd, D MMMM YYYY, HH:mm"},relativeTime:{future:"%s இல்",past:"%s முன்",s:"ஒரு சில விநாடிகள்",m:"ஒரு நிமிடம்",mm:"%d நிமிடங்கள்",h:"ஒரு மணி நேரம்",hh:"%d மணி நேரம்",d:"ஒரு நாள்",dd:"%d நாட்கள்",M:"ஒரு மாதம்",MM:"%d மாதங்கள்",y:"ஒரு வருடம்",yy:"%d ஆண்டுகள்"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/te.js b/node_modules/dayjs/locale/te.js
new file mode 100644
index 0000000..c7593db
--- /dev/null
+++ b/node_modules/dayjs/locale/te.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_te=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"te",weekdays:"ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం".split("_"),months:"జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జులై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్".split("_"),weekdaysShort:"ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని".split("_"),monthsShort:"జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జులై_ఆగ._సెప్._అక్టో._నవ._డిసె.".split("_"),weekdaysMin:"ఆ_సో_మం_బు_గు_శు_శ".split("_"),ordinal:function(_){return _},formats:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},relativeTime:{future:"%s లో",past:"%s క్రితం",s:"కొన్ని క్షణాలు",m:"ఒక నిమిషం",mm:"%d నిమిషాలు",h:"ఒక గంట",hh:"%d గంటలు",d:"ఒక రోజు",dd:"%d రోజులు",M:"ఒక నెల",MM:"%d నెలలు",y:"ఒక సంవత్సరం",yy:"%d సంవత్సరాలు"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tet.js b/node_modules/dayjs/locale/tet.js
new file mode 100644
index 0000000..aec6f68
--- /dev/null
+++ b/node_modules/dayjs/locale/tet.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_tet=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var u=t(e),a={name:"tet",weekdays:"Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu".split("_"),months:"Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru".split("_"),weekStart:1,weekdaysShort:"Dom_Seg_Ters_Kua_Kint_Sest_Sab".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdaysMin:"Do_Seg_Te_Ku_Ki_Ses_Sa".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"iha %s",past:"%s liuba",s:"minutu balun",m:"minutu ida",mm:"minutu %d",h:"oras ida",hh:"oras %d",d:"loron ida",dd:"loron %d",M:"fulan ida",MM:"fulan %d",y:"tinan ida",yy:"tinan %d"}};return u.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tg.js b/node_modules/dayjs/locale/tg.js
new file mode 100644
index 0000000..7643103
--- /dev/null
+++ b/node_modules/dayjs/locale/tg.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_tg=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"tg",weekdays:"якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе".split("_"),months:"январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр".split("_"),weekStart:1,weekdaysShort:"яшб_дшб_сшб_чшб_пшб_ҷум_шнб".split("_"),monthsShort:"янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),weekdaysMin:"яш_дш_сш_чш_пш_ҷм_шб".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"баъди %s",past:"%s пеш",s:"якчанд сония",m:"як дақиқа",mm:"%d дақиқа",h:"як соат",hh:"%d соат",d:"як рӯз",dd:"%d рӯз",M:"як моҳ",MM:"%d моҳ",y:"як сол",yy:"%d сол"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/th.js b/node_modules/dayjs/locale/th.js
new file mode 100644
index 0000000..185d4eb
--- /dev/null
+++ b/node_modules/dayjs/locale/th.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_th=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"th",weekdays:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"),weekdaysShort:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"),weekdaysMin:"อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),months:"มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"),monthsShort:"ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.".split("_"),formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY เวลา H:mm",LLLL:"วันddddที่ D MMMM YYYY เวลา H:mm"},relativeTime:{future:"อีก %s",past:"%sที่แล้ว",s:"ไม่กี่วินาที",m:"1 นาที",mm:"%d นาที",h:"1 ชั่วโมง",hh:"%d ชั่วโมง",d:"1 วัน",dd:"%d วัน",M:"1 เดือน",MM:"%d เดือน",y:"1 ปี",yy:"%d ปี"},ordinal:function(_){return _+"."}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tk.js b/node_modules/dayjs/locale/tk.js
new file mode 100644
index 0000000..1e737b5
--- /dev/null
+++ b/node_modules/dayjs/locale/tk.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_tk=n(e.dayjs)}(this,(function(e){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),_={name:"tk",weekdays:"Ýekşenbe_Duşenbe_Sişenbe_Çarşenbe_Penşenbe_Anna_Şenbe".split("_"),weekdaysShort:"Ýek_Duş_Siş_Çar_Pen_Ann_Şen".split("_"),weekdaysMin:"Ýk_Dş_Sş_Çr_Pn_An_Şn".split("_"),months:"Ýanwar_Fewral_Mart_Aprel_Maý_Iýun_Iýul_Awgust_Sentýabr_Oktýabr_Noýabr_Dekabr".split("_"),monthsShort:"Ýan_Few_Mar_Apr_Maý_Iýn_Iýl_Awg_Sen_Okt_Noý_Dek".split("_"),weekStart:1,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"%s soň",past:"%s öň",s:"birnäçe sekunt",m:"bir minut",mm:"%d minut",h:"bir sagat",hh:"%d sagat",d:"bir gün",dd:"%d gün",M:"bir aý",MM:"%d aý",y:"bir ýyl",yy:"%d ýyl"},ordinal:function(e){return e+"."}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tl-ph.js b/node_modules/dayjs/locale/tl-ph.js
new file mode 100644
index 0000000..885f8a9
--- /dev/null
+++ b/node_modules/dayjs/locale/tl-ph.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],a):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_tl_ph=a(e.dayjs)}(this,(function(e){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var n=a(e),t={name:"tl-ph",weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),weekStart:1,weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY HH:mm",LLLL:"dddd, MMMM DD, YYYY HH:mm"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"}};return n.default.locale(t,null,!0),t}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tlh.js b/node_modules/dayjs/locale/tlh.js
new file mode 100644
index 0000000..03d8996
--- /dev/null
+++ b/node_modules/dayjs/locale/tlh.js
@@ -0,0 +1 @@
+!function(a,j){"object"==typeof exports&&"undefined"!=typeof module?module.exports=j(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],j):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_tlh=j(a.dayjs)}(this,(function(a){"use strict";function j(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var t=j(a),e={name:"tlh",weekdays:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),months:"tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’".split("_"),weekStart:1,weekdaysShort:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),monthsShort:"jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’".split("_"),weekdaysMin:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"}};return t.default.locale(e,null,!0),e}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tr.js b/node_modules/dayjs/locale/tr.js
new file mode 100644
index 0000000..9c7844a
--- /dev/null
+++ b/node_modules/dayjs/locale/tr.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_tr=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var t=e(a),_={name:"tr",weekdays:"Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),months:"Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),monthsShort:"Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),weekStart:1,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"%s sonra",past:"%s önce",s:"birkaç saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir yıl",yy:"%d yıl"},ordinal:function(a){return a+"."}};return t.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/types.d.ts b/node_modules/dayjs/locale/types.d.ts
new file mode 100644
index 0000000..2c24a64
--- /dev/null
+++ b/node_modules/dayjs/locale/types.d.ts
@@ -0,0 +1,33 @@
+declare interface ILocale {
+  name: string
+  weekdays?: string[]
+  months?: string[]
+  weekStart?: number
+  weekdaysShort?: string[]
+  monthsShort?: string[]
+  weekdaysMin?: string[]
+  ordinal?: (n: number) => number | string
+  formats: Partial<{
+    LT: string
+    LTS: string
+    L: string
+    LL: string
+    LLL: string
+    LLLL: string
+  }>
+  relativeTime: Partial<{
+    future: string
+    past: string
+    s: string
+    m: string
+    mm: string
+    h: string
+    hh: string
+    d: string
+    dd: string
+    M: string
+    MM: string
+    y: string
+    yy: string
+  }>
+}
diff --git a/node_modules/dayjs/locale/tzl.js b/node_modules/dayjs/locale/tzl.js
new file mode 100644
index 0000000..2b1d598
--- /dev/null
+++ b/node_modules/dayjs/locale/tzl.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_tzl=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),a={name:"tzl",weekdays:"Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi".split("_"),months:"Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar".split("_"),weekStart:1,weekdaysShort:"Súl_Lún_Mai_Már_Xhú_Vié_Sát".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec".split("_"),weekdaysMin:"Sú_Lú_Ma_Má_Xh_Vi_Sá".split("_"),ordinal:function(e){return e},formats:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"D. MMMM [dallas] YYYY",LLL:"D. MMMM [dallas] YYYY HH.mm",LLLL:"dddd, [li] D. MMMM [dallas] YYYY HH.mm"}};return t.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tzm-latn.js b/node_modules/dayjs/locale/tzm-latn.js
new file mode 100644
index 0000000..3f7cdd4
--- /dev/null
+++ b/node_modules/dayjs/locale/tzm-latn.js
@@ -0,0 +1 @@
+!function(a,s){"object"==typeof exports&&"undefined"!=typeof module?module.exports=s(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],s):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_tzm_latn=s(a.dayjs)}(this,(function(a){"use strict";function s(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var n=s(a),i={name:"tzm-latn",weekdays:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),months:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),weekStart:6,weekdaysShort:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),monthsShort:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),weekdaysMin:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"dadkh s yan %s",past:"yan %s",s:"imik",m:"minuḍ",mm:"%d minuḍ",h:"saɛa",hh:"%d tassaɛin",d:"ass",dd:"%d ossan",M:"ayowr",MM:"%d iyyirn",y:"asgas",yy:"%d isgasn"}};return n.default.locale(i,null,!0),i}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/tzm.js b/node_modules/dayjs/locale/tzm.js
new file mode 100644
index 0000000..e4c4031
--- /dev/null
+++ b/node_modules/dayjs/locale/tzm.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_tzm=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"tzm",weekdays:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),months:"ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),weekStart:6,weekdaysShort:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),monthsShort:"ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),weekdaysMin:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s",past:"ⵢⴰⵏ %s",s:"ⵉⵎⵉⴽ",m:"ⵎⵉⵏⵓⴺ",mm:"%d ⵎⵉⵏⵓⴺ",h:"ⵙⴰⵄⴰ",hh:"%d ⵜⴰⵙⵙⴰⵄⵉⵏ",d:"ⴰⵙⵙ",dd:"%d oⵙⵙⴰⵏ",M:"ⴰⵢoⵓⵔ",MM:"%d ⵉⵢⵢⵉⵔⵏ",y:"ⴰⵙⴳⴰⵙ",yy:"%d ⵉⵙⴳⴰⵙⵏ"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ug-cn.js b/node_modules/dayjs/locale/ug-cn.js
new file mode 100644
index 0000000..995c3b3
--- /dev/null
+++ b/node_modules/dayjs/locale/ug-cn.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ug_cn=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ug-cn",weekdays:"يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە".split("_"),months:"يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر".split("_"),weekStart:1,weekdaysShort:"يە_دۈ_سە_چا_پە_جۈ_شە".split("_"),monthsShort:"يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر".split("_"),weekdaysMin:"يە_دۈ_سە_چا_پە_جۈ_شە".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY-يىلىM-ئاينىڭD-كۈنى",LLL:"YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm",LLLL:"dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm"},relativeTime:{future:"%s كېيىن",past:"%s بۇرۇن",s:"نەچچە سېكونت",m:"بىر مىنۇت",mm:"%d مىنۇت",h:"بىر سائەت",hh:"%d سائەت",d:"بىر كۈن",dd:"%d كۈن",M:"بىر ئاي",MM:"%d ئاي",y:"بىر يىل",yy:"%d يىل"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/uk.js b/node_modules/dayjs/locale/uk.js
new file mode 100644
index 0000000..537afb1
--- /dev/null
+++ b/node_modules/dayjs/locale/uk.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_uk=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),s="січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_"),n="січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_"),o=/D[oD]?(\[[^[\]]*\]|\s)+MMMM?/;function d(_,e,t){var s,n;return"m"===t?e?"хвилина":"хвилину":"h"===t?e?"година":"годину":_+" "+(s=+_,n={ss:e?"секунда_секунди_секунд":"секунду_секунди_секунд",mm:e?"хвилина_хвилини_хвилин":"хвилину_хвилини_хвилин",hh:e?"година_години_годин":"годину_години_годин",dd:"день_дні_днів",MM:"місяць_місяці_місяців",yy:"рік_роки_років"}[t].split("_"),s%10==1&&s%100!=11?n[0]:s%10>=2&&s%10<=4&&(s%100<10||s%100>=20)?n[1]:n[2])}var i=function(_,e){return o.test(e)?s[_.month()]:n[_.month()]};i.s=n,i.f=s;var r={name:"uk",weekdays:"неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),weekdaysShort:"ндл_пнд_втр_срд_чтв_птн_сбт".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),months:i,monthsShort:"січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),weekStart:1,relativeTime:{future:"за %s",past:"%s тому",s:"декілька секунд",m:d,mm:d,h:d,hh:d,d:"день",dd:d,M:"місяць",MM:d,y:"рік",yy:d},ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., HH:mm",LLLL:"dddd, D MMMM YYYY р., HH:mm"}};return t.default.locale(r,null,!0),r}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/ur.js b/node_modules/dayjs/locale/ur.js
new file mode 100644
index 0000000..4f83c8b
--- /dev/null
+++ b/node_modules/dayjs/locale/ur.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_ur=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"ur",weekdays:"اتوار_پیر_منگل_بدھ_جمعرات_جمعہ_ہفتہ".split("_"),months:"جنوری_فروری_مارچ_اپریل_مئی_جون_جولائی_اگست_ستمبر_اکتوبر_نومبر_دسمبر".split("_"),weekStart:1,weekdaysShort:"اتوار_پیر_منگل_بدھ_جمعرات_جمعہ_ہفتہ".split("_"),monthsShort:"جنوری_فروری_مارچ_اپریل_مئی_جون_جولائی_اگست_ستمبر_اکتوبر_نومبر_دسمبر".split("_"),weekdaysMin:"اتوار_پیر_منگل_بدھ_جمعرات_جمعہ_ہفتہ".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd، D MMMM YYYY HH:mm"},relativeTime:{future:"%s بعد",past:"%s قبل",s:"چند سیکنڈ",m:"ایک منٹ",mm:"%d منٹ",h:"ایک گھنٹہ",hh:"%d گھنٹے",d:"ایک دن",dd:"%d دن",M:"ایک ماہ",MM:"%d ماہ",y:"ایک سال",yy:"%d سال"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/uz-latn.js b/node_modules/dayjs/locale/uz-latn.js
new file mode 100644
index 0000000..a8ebab4
--- /dev/null
+++ b/node_modules/dayjs/locale/uz-latn.js
@@ -0,0 +1 @@
+!function(a,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(a="undefined"!=typeof globalThis?globalThis:a||self).dayjs_locale_uz_latn=e(a.dayjs)}(this,(function(a){"use strict";function e(a){return a&&"object"==typeof a&&"default"in a?a:{default:a}}var _=e(a),n={name:"uz-latn",weekdays:"Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),months:"Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),weekStart:1,weekdaysShort:"Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),monthsShort:"Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),weekdaysMin:"Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),ordinal:function(a){return a},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},relativeTime:{future:"Yaqin %s ichida",past:"%s oldin",s:"soniya",m:"bir daqiqa",mm:"%d daqiqa",h:"bir soat",hh:"%d soat",d:"bir kun",dd:"%d kun",M:"bir oy",MM:"%d oy",y:"bir yil",yy:"%d yil"}};return _.default.locale(n,null,!0),n}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/uz.js b/node_modules/dayjs/locale/uz.js
new file mode 100644
index 0000000..f6992b1
--- /dev/null
+++ b/node_modules/dayjs/locale/uz.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_uz=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"uz",weekdays:"Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба".split("_"),months:"январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр".split("_"),weekStart:1,weekdaysShort:"Якш_Душ_Сеш_Чор_Пай_Жум_Шан".split("_"),monthsShort:"янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),weekdaysMin:"Як_Ду_Се_Чо_Па_Жу_Ша".split("_"),ordinal:function(_){return _},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},relativeTime:{future:"Якин %s ичида",past:"%s олдин",s:"фурсат",m:"бир дакика",mm:"%d дакика",h:"бир соат",hh:"%d соат",d:"бир кун",dd:"%d кун",M:"бир ой",MM:"%d ой",y:"бир йил",yy:"%d йил"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/vi.js b/node_modules/dayjs/locale/vi.js
new file mode 100644
index 0000000..ee33954
--- /dev/null
+++ b/node_modules/dayjs/locale/vi.js
@@ -0,0 +1 @@
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],n):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_locale_vi=n(t.dayjs)}(this,(function(t){"use strict";function n(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var h=n(t),_={name:"vi",weekdays:"chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),months:"tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),weekStart:1,weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),ordinal:function(t){return t},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [năm] YYYY",LLL:"D MMMM [năm] YYYY HH:mm",LLLL:"dddd, D MMMM [năm] YYYY HH:mm",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},relativeTime:{future:"%s tới",past:"%s trước",s:"vài giây",m:"một phút",mm:"%d phút",h:"một giờ",hh:"%d giờ",d:"một ngày",dd:"%d ngày",M:"một tháng",MM:"%d tháng",y:"một năm",yy:"%d năm"}};return h.default.locale(_,null,!0),_}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/x-pseudo.js b/node_modules/dayjs/locale/x-pseudo.js
new file mode 100644
index 0000000..c1215d6
--- /dev/null
+++ b/node_modules/dayjs/locale/x-pseudo.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_x_pseudo=t(e.dayjs)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var _=t(e),d={name:"x-pseudo",weekdays:"S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý".split("_"),months:"J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér".split("_"),weekStart:1,weekdaysShort:"S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát".split("_"),monthsShort:"J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc".split("_"),weekdaysMin:"S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá".split("_"),ordinal:function(e){return e},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},relativeTime:{future:"í~ñ %s",past:"%s á~gó",s:"á ~féw ~sécó~ñds",m:"á ~míñ~úté",mm:"%d m~íñú~tés",h:"á~ñ hó~úr",hh:"%d h~óúrs",d:"á ~dáý",dd:"%d d~áýs",M:"á ~móñ~th",MM:"%d m~óñt~hs",y:"á ~ýéár",yy:"%d ý~éárs"}};return _.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/yo.js b/node_modules/dayjs/locale/yo.js
new file mode 100644
index 0000000..b12b37b
--- /dev/null
+++ b/node_modules/dayjs/locale/yo.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_yo=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),a={name:"yo",weekdays:"Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta".split("_"),months:"Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀".split("_"),weekStart:1,weekdaysShort:"Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá".split("_"),monthsShort:"Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀".split("_"),weekdaysMin:"Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb".split("_"),ordinal:function(e){return e},formats:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},relativeTime:{future:"ní %s",past:"%s kọjá",s:"ìsẹjú aayá die",m:"ìsẹjú kan",mm:"ìsẹjú %d",h:"wákati kan",hh:"wákati %d",d:"ọjọ́ kan",dd:"ọjọ́ %d",M:"osù kan",MM:"osù %d",y:"ọdún kan",yy:"ọdún %d"}};return t.default.locale(a,null,!0),a}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/zh-cn.js b/node_modules/dayjs/locale/zh-cn.js
new file mode 100644
index 0000000..21cf228
--- /dev/null
+++ b/node_modules/dayjs/locale/zh-cn.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_zh_cn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh-cn",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){return"W"===_?e+"周":e+"日"},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/zh-hk.js b/node_modules/dayjs/locale/zh-hk.js
new file mode 100644
index 0000000..f4b220d
--- /dev/null
+++ b/node_modules/dayjs/locale/zh-hk.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_zh_hk=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"zh-hk",months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),ordinal:function(_,e){return"W"===e?_+"週":_+"日"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",m:"一分鐘",mm:"%d 分鐘",h:"一小時",hh:"%d 小時",d:"一天",dd:"%d 天",M:"一個月",MM:"%d 個月",y:"一年",yy:"%d 年"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/zh-tw.js b/node_modules/dayjs/locale/zh-tw.js
new file mode 100644
index 0000000..5970f17
--- /dev/null
+++ b/node_modules/dayjs/locale/zh-tw.js
@@ -0,0 +1 @@
+!function(_,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],e):(_="undefined"!=typeof globalThis?globalThis:_||self).dayjs_locale_zh_tw=e(_.dayjs)}(this,(function(_){"use strict";function e(_){return _&&"object"==typeof _&&"default"in _?_:{default:_}}var t=e(_),d={name:"zh-tw",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(_,e){return"W"===e?_+"週":_+"日"},formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"},meridiem:function(_,e){var t=100*_+e;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/locale/zh.js b/node_modules/dayjs/locale/zh.js
new file mode 100644
index 0000000..2e80015
--- /dev/null
+++ b/node_modules/dayjs/locale/zh.js
@@ -0,0 +1 @@
+!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("dayjs")):"function"==typeof define&&define.amd?define(["dayjs"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_zh=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){return"W"===_?e+"周":e+"日"},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s后",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d}));
\ No newline at end of file
diff --git a/node_modules/dayjs/package.json b/node_modules/dayjs/package.json
new file mode 100644
index 0000000..0fb7526
--- /dev/null
+++ b/node_modules/dayjs/package.json
@@ -0,0 +1,115 @@
+{
+  "_from": "dayjs",
+  "_id": "dayjs@1.11.10",
+  "_inBundle": false,
+  "_integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==",
+  "_location": "/dayjs",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "dayjs",
+    "name": "dayjs",
+    "escapedName": "dayjs",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
+  "_shasum": "68acea85317a6e164457d6d6947564029a6a16a0",
+  "_spec": "dayjs",
+  "_where": "C:\\Users\\Administrator\\Desktop\\jundaosuzhou_wechatxcx",
+  "author": {
+    "name": "iamkun"
+  },
+  "bugs": {
+    "url": "https://github.com/iamkun/dayjs/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "2KB immutable date time library alternative to Moment.js with the same modern API ",
+  "devDependencies": {
+    "@babel/cli": "^7.0.0-beta.44",
+    "@babel/core": "^7.0.0-beta.44",
+    "@babel/node": "^7.0.0-beta.44",
+    "@babel/preset-env": "^7.0.0-beta.44",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-jest": "^22.4.3",
+    "babel-plugin-external-helpers": "^6.22.0",
+    "cross-env": "^5.1.6",
+    "eslint": "^4.19.1",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-plugin-import": "^2.10.0",
+    "eslint-plugin-jest": "^21.15.0",
+    "gzip-size-cli": "^2.1.0",
+    "jasmine-core": "^2.99.1",
+    "jest": "^22.4.3",
+    "karma": "^2.0.2",
+    "karma-jasmine": "^1.1.2",
+    "karma-sauce-launcher": "^1.1.0",
+    "mockdate": "^2.0.2",
+    "moment": "2.29.2",
+    "moment-timezone": "0.5.31",
+    "ncp": "^2.0.0",
+    "pre-commit": "^1.2.2",
+    "prettier": "^1.16.1",
+    "rollup": "^2.45.1",
+    "rollup-plugin-babel": "^4.4.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "size-limit": "^0.18.0",
+    "typescript": "^2.8.3"
+  },
+  "homepage": "https://day.js.org",
+  "jest": {
+    "roots": [
+      "test"
+    ],
+    "testRegex": "test/(.*?/)?.*test.js$",
+    "testURL": "http://localhost",
+    "coverageDirectory": "./coverage/",
+    "collectCoverage": true,
+    "collectCoverageFrom": [
+      "src/**/*"
+    ]
+  },
+  "keywords": [
+    "dayjs",
+    "date",
+    "time",
+    "immutable",
+    "moment"
+  ],
+  "license": "MIT",
+  "main": "dayjs.min.js",
+  "name": "dayjs",
+  "pre-commit": [
+    "lint"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iamkun/dayjs.git"
+  },
+  "scripts": {
+    "babel": "cross-env BABEL_ENV=build babel src --out-dir esm --copy-files && node build/esm",
+    "build": "cross-env BABEL_ENV=build node build && npm run size",
+    "lint": "eslint src/* test/* build/*",
+    "prettier": "prettier --write \"docs/**/*.md\"",
+    "sauce": "npx karma start karma.sauce.conf.js",
+    "size": "size-limit && gzip-size dayjs.min.js",
+    "test": "TZ=Pacific/Auckland npm run test-tz && TZ=Europe/London npm run test-tz && TZ=America/Whitehorse npm run test-tz && npm run test-tz && jest",
+    "test-tz": "date && jest test/timezone.test --coverage=false",
+    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2  && npm run sauce -- 3"
+  },
+  "size-limit": [
+    {
+      "limit": "2.99 KB",
+      "path": "dayjs.min.js"
+    }
+  ],
+  "types": "index.d.ts",
+  "version": "1.11.10"
+}
diff --git a/node_modules/dayjs/plugin/advancedFormat.d.ts b/node_modules/dayjs/plugin/advancedFormat.d.ts
new file mode 100644
index 0000000..30ec75e
--- /dev/null
+++ b/node_modules/dayjs/plugin/advancedFormat.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/advancedFormat.js b/node_modules/dayjs/plugin/advancedFormat.js
new file mode 100644
index 0000000..88d62e7
--- /dev/null
+++ b/node_modules/dayjs/plugin/advancedFormat.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_advancedFormat=t()}(this,(function(){"use strict";return function(e,t){var r=t.prototype,n=r.format;r.format=function(e){var t=this,r=this.$locale();if(!this.isValid())return n.bind(this)(e);var s=this.$utils(),a=(e||"YYYY-MM-DDTHH:mm:ssZ").replace(/\[([^\]]+)]|Q|wo|ww|w|WW|W|zzz|z|gggg|GGGG|Do|X|x|k{1,2}|S/g,(function(e){switch(e){case"Q":return Math.ceil((t.$M+1)/3);case"Do":return r.ordinal(t.$D);case"gggg":return t.weekYear();case"GGGG":return t.isoWeekYear();case"wo":return r.ordinal(t.week(),"W");case"w":case"ww":return s.s(t.week(),"w"===e?1:2,"0");case"W":case"WW":return s.s(t.isoWeek(),"W"===e?1:2,"0");case"k":case"kk":return s.s(String(0===t.$H?24:t.$H),"k"===e?1:2,"0");case"X":return Math.floor(t.$d.getTime()/1e3);case"x":return t.$d.getTime();case"z":return"["+t.offsetName()+"]";case"zzz":return"["+t.offsetName("long")+"]";default:return e}}));return n.bind(this)(a)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/arraySupport.d.ts b/node_modules/dayjs/plugin/arraySupport.d.ts
new file mode 100644
index 0000000..e4e44b2
--- /dev/null
+++ b/node_modules/dayjs/plugin/arraySupport.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare module 'dayjs' {
+  interface ConfigTypeMap {
+    arraySupport: [number?, number?, number?, number?, number?, number?, number?]
+  }
+}
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/arraySupport.js b/node_modules/dayjs/plugin/arraySupport.js
new file mode 100644
index 0000000..b16675f
--- /dev/null
+++ b/node_modules/dayjs/plugin/arraySupport.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_arraySupport=t()}(this,(function(){"use strict";return function(e,t,n){var o=t.prototype,i=function(e){var t=e.date,o=e.utc;return Array.isArray(t)?o?t.length?new Date(Date.UTC.apply(null,t)):new Date:1===t.length?n(String(t[0])).toDate():new(Function.prototype.bind.apply(Date,[null].concat(t))):t},a=o.parse;o.parse=function(e){e.date=i.bind(this)(e),a.bind(this)(e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/badMutable.d.ts b/node_modules/dayjs/plugin/badMutable.d.ts
new file mode 100644
index 0000000..30ec75e
--- /dev/null
+++ b/node_modules/dayjs/plugin/badMutable.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/badMutable.js b/node_modules/dayjs/plugin/badMutable.js
new file mode 100644
index 0000000..68270cc
--- /dev/null
+++ b/node_modules/dayjs/plugin/badMutable.js
@@ -0,0 +1 @@
+!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_badMutable=i()}(this,(function(){"use strict";return function(t,i){var n=i.prototype;n.$g=function(t,i,n){return this.$utils().u(t)?this[i]:this.$set(n,t)},n.set=function(t,i){return this.$set(t,i)};var e=n.startOf;n.startOf=function(t,i){return this.$d=e.bind(this)(t,i).toDate(),this.init(),this};var s=n.add;n.add=function(t,i){return this.$d=s.bind(this)(t,i).toDate(),this.init(),this};var o=n.locale;n.locale=function(t,i){return t?(this.$L=o.bind(this)(t,i).$L,this):this.$L};var r=n.daysInMonth;n.daysInMonth=function(){return r.bind(this.clone())()};var u=n.isSame;n.isSame=function(t,i){return u.bind(this.clone())(t,i)};var f=n.isBefore;n.isBefore=function(t,i){return f.bind(this.clone())(t,i)};var d=n.isAfter;n.isAfter=function(t,i){return d.bind(this.clone())(t,i)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/bigIntSupport.d.ts b/node_modules/dayjs/plugin/bigIntSupport.d.ts
new file mode 100644
index 0000000..d9f2f39
--- /dev/null
+++ b/node_modules/dayjs/plugin/bigIntSupport.d.ts
@@ -0,0 +1,11 @@
+import { PluginFunc } from 'dayjs'
+
+declare module 'dayjs' {
+  interface ConfigTypeMap {
+    bigIntSupport: BigInt
+  }
+  export function unix(t: BigInt): Dayjs
+}
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/bigIntSupport.js b/node_modules/dayjs/plugin/bigIntSupport.js
new file mode 100644
index 0000000..0c7efac
--- /dev/null
+++ b/node_modules/dayjs/plugin/bigIntSupport.js
@@ -0,0 +1 @@
+!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(n="undefined"!=typeof globalThis?globalThis:n||self).dayjs_plugin_bigIntSupport=e()}(this,(function(){"use strict";var n=function(n){return"bigint"==typeof n};return function(e,t,i){var o=t.prototype,u=function(e){var t=e.date;return n(t)?Number(t):t},r=o.parse;o.parse=function(n){n.date=u.bind(this)(n),r.bind(this)(n)};var f=i.unix;i.unix=function(e){var t=n(e)?Number(e):e;return f(t)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/buddhistEra.d.ts b/node_modules/dayjs/plugin/buddhistEra.d.ts
new file mode 100644
index 0000000..30ec75e
--- /dev/null
+++ b/node_modules/dayjs/plugin/buddhistEra.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/buddhistEra.js b/node_modules/dayjs/plugin/buddhistEra.js
new file mode 100644
index 0000000..58b137c
--- /dev/null
+++ b/node_modules/dayjs/plugin/buddhistEra.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_buddhistEra=e()}(this,(function(){"use strict";return function(t,e){var n=e.prototype,i=n.format;n.format=function(t){var e=this,n=(t||"YYYY-MM-DDTHH:mm:ssZ").replace(/(\[[^\]]+])|BBBB|BB/g,(function(t,n){var i,o=String(e.$y+543),f="BB"===t?[o.slice(-2),2]:[o,4];return n||(i=e.$utils()).s.apply(i,f.concat(["0"]))}));return i.bind(this)(n)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/calendar.d.ts b/node_modules/dayjs/plugin/calendar.d.ts
new file mode 100644
index 0000000..a8d064f
--- /dev/null
+++ b/node_modules/dayjs/plugin/calendar.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    calendar(referenceTime?: ConfigType, formats?: object): string
+  }
+}
diff --git a/node_modules/dayjs/plugin/calendar.js b/node_modules/dayjs/plugin/calendar.js
new file mode 100644
index 0000000..c577098
--- /dev/null
+++ b/node_modules/dayjs/plugin/calendar.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_calendar=t()}(this,(function(){"use strict";return function(e,t,a){var n="h:mm A",d={lastDay:"[Yesterday at] "+n,sameDay:"[Today at] "+n,nextDay:"[Tomorrow at] "+n,nextWeek:"dddd [at] "+n,lastWeek:"[Last] dddd [at] "+n,sameElse:"MM/DD/YYYY"};t.prototype.calendar=function(e,t){var n=t||this.$locale().calendar||d,o=a(e||void 0).startOf("d"),s=this.diff(o,"d",!0),i="sameElse",f=s<-6?i:s<-1?"lastWeek":s<0?"lastDay":s<1?"sameDay":s<2?"nextDay":s<7?"nextWeek":i,l=n[f]||d[f];return"function"==typeof l?l.call(this,a()):this.format(l)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/customParseFormat.d.ts b/node_modules/dayjs/plugin/customParseFormat.d.ts
new file mode 100644
index 0000000..1b41c0d
--- /dev/null
+++ b/node_modules/dayjs/plugin/customParseFormat.d.ts
@@ -0,0 +1,8 @@
+import { PluginFunc } from 'dayjs'
+
+declare interface PluginOptions {
+    parseTwoDigitYear?: (yearString: string) => number
+}
+
+declare const plugin: PluginFunc<PluginOptions>
+export = plugin
diff --git a/node_modules/dayjs/plugin/customParseFormat.js b/node_modules/dayjs/plugin/customParseFormat.js
new file mode 100644
index 0000000..66d6089
--- /dev/null
+++ b/node_modules/dayjs/plugin/customParseFormat.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_customParseFormat=t()}(this,(function(){"use strict";var e={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},t=/(\[[^[]*\])|([-_:/.,()\s]+)|(A|a|YYYY|YY?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g,n=/\d\d/,r=/\d\d?/,i=/\d*[^-_:/,()\s\d]+/,o={},s=function(e){return(e=+e)+(e>68?1900:2e3)};var a=function(e){return function(t){this[e]=+t}},f=[/[+-]\d\d:?(\d\d)?|Z/,function(e){(this.zone||(this.zone={})).offset=function(e){if(!e)return 0;if("Z"===e)return 0;var t=e.match(/([+-]|\d\d)/g),n=60*t[1]+(+t[2]||0);return 0===n?0:"+"===t[0]?-n:n}(e)}],h=function(e){var t=o[e];return t&&(t.indexOf?t:t.s.concat(t.f))},u=function(e,t){var n,r=o.meridiem;if(r){for(var i=1;i<=24;i+=1)if(e.indexOf(r(i,0,t))>-1){n=i>12;break}}else n=e===(t?"pm":"PM");return n},d={A:[i,function(e){this.afternoon=u(e,!1)}],a:[i,function(e){this.afternoon=u(e,!0)}],S:[/\d/,function(e){this.milliseconds=100*+e}],SS:[n,function(e){this.milliseconds=10*+e}],SSS:[/\d{3}/,function(e){this.milliseconds=+e}],s:[r,a("seconds")],ss:[r,a("seconds")],m:[r,a("minutes")],mm:[r,a("minutes")],H:[r,a("hours")],h:[r,a("hours")],HH:[r,a("hours")],hh:[r,a("hours")],D:[r,a("day")],DD:[n,a("day")],Do:[i,function(e){var t=o.ordinal,n=e.match(/\d+/);if(this.day=n[0],t)for(var r=1;r<=31;r+=1)t(r).replace(/\[|\]/g,"")===e&&(this.day=r)}],M:[r,a("month")],MM:[n,a("month")],MMM:[i,function(e){var t=h("months"),n=(h("monthsShort")||t.map((function(e){return e.slice(0,3)}))).indexOf(e)+1;if(n<1)throw new Error;this.month=n%12||n}],MMMM:[i,function(e){var t=h("months").indexOf(e)+1;if(t<1)throw new Error;this.month=t%12||t}],Y:[/[+-]?\d+/,a("year")],YY:[n,function(e){this.year=s(e)}],YYYY:[/\d{4}/,a("year")],Z:f,ZZ:f};function c(n){var r,i;r=n,i=o&&o.formats;for(var s=(n=r.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(t,n,r){var o=r&&r.toUpperCase();return n||i[r]||e[r]||i[o].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(e,t,n){return t||n.slice(1)}))}))).match(t),a=s.length,f=0;f<a;f+=1){var h=s[f],u=d[h],c=u&&u[0],l=u&&u[1];s[f]=l?{regex:c,parser:l}:h.replace(/^\[|\]$/g,"")}return function(e){for(var t={},n=0,r=0;n<a;n+=1){var i=s[n];if("string"==typeof i)r+=i.length;else{var o=i.regex,f=i.parser,h=e.slice(r),u=o.exec(h)[0];f.call(t,u),e=e.replace(u,"")}}return function(e){var t=e.afternoon;if(void 0!==t){var n=e.hours;t?n<12&&(e.hours+=12):12===n&&(e.hours=0),delete e.afternoon}}(t),t}}return function(e,t,n){n.p.customParseFormat=!0,e&&e.parseTwoDigitYear&&(s=e.parseTwoDigitYear);var r=t.prototype,i=r.parse;r.parse=function(e){var t=e.date,r=e.utc,s=e.args;this.$u=r;var a=s[1];if("string"==typeof a){var f=!0===s[2],h=!0===s[3],u=f||h,d=s[2];h&&(d=s[2]),o=this.$locale(),!f&&d&&(o=n.Ls[d]),this.$d=function(e,t,n){try{if(["x","X"].indexOf(t)>-1)return new Date(("X"===t?1e3:1)*e);var r=c(t)(e),i=r.year,o=r.month,s=r.day,a=r.hours,f=r.minutes,h=r.seconds,u=r.milliseconds,d=r.zone,l=new Date,m=s||(i||o?1:l.getDate()),M=i||l.getFullYear(),Y=0;i&&!o||(Y=o>0?o-1:l.getMonth());var p=a||0,v=f||0,D=h||0,g=u||0;return d?new Date(Date.UTC(M,Y,m,p,v,D,g+60*d.offset*1e3)):n?new Date(Date.UTC(M,Y,m,p,v,D,g)):new Date(M,Y,m,p,v,D,g)}catch(e){return new Date("")}}(t,a,r),this.init(),d&&!0!==d&&(this.$L=this.locale(d).$L),u&&t!=this.format(a)&&(this.$d=new Date("")),o={}}else if(a instanceof Array)for(var l=a.length,m=1;m<=l;m+=1){s[1]=a[m-1];var M=n.apply(this,s);if(M.isValid()){this.$d=M.$d,this.$L=M.$L,this.init();break}m===l&&(this.$d=new Date(""))}else i.call(this,e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/dayOfYear.d.ts b/node_modules/dayjs/plugin/dayOfYear.d.ts
new file mode 100644
index 0000000..4fd6601
--- /dev/null
+++ b/node_modules/dayjs/plugin/dayOfYear.d.ts
@@ -0,0 +1,11 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    dayOfYear(): number
+    dayOfYear(value: number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/plugin/dayOfYear.js b/node_modules/dayjs/plugin/dayOfYear.js
new file mode 100644
index 0000000..4a57000
--- /dev/null
+++ b/node_modules/dayjs/plugin/dayOfYear.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_dayOfYear=t()}(this,(function(){"use strict";return function(e,t,n){t.prototype.dayOfYear=function(e){var t=Math.round((n(this).startOf("day")-n(this).startOf("year"))/864e5)+1;return null==e?t:this.add(e-t,"day")}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/devHelper.d.ts b/node_modules/dayjs/plugin/devHelper.d.ts
new file mode 100644
index 0000000..30ec75e
--- /dev/null
+++ b/node_modules/dayjs/plugin/devHelper.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/devHelper.js b/node_modules/dayjs/plugin/devHelper.js
new file mode 100644
index 0000000..a3f6daf
--- /dev/null
+++ b/node_modules/dayjs/plugin/devHelper.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_devHelper=t()}(this,(function(){"use strict";return function(e,t,o){if(!process||"production"!==process.env.NODE_ENV){var s=t.prototype,n=s.parse;s.parse=function(e){var t=e.date;return"string"==typeof t&&13===t.length&&console.warn("To parse a Unix timestamp like "+t+", you should pass it as a Number. https://day.js.org/docs/en/parse/unix-timestamp-milliseconds"),"number"==typeof t&&4===String(t).length&&console.warn("Guessing you may want to parse the Year "+t+", you should pass it as a String "+t+", not a Number. Otherwise, "+t+" will be treated as a Unix timestamp"),e.args.length>=2&&!o.p.customParseFormat&&console.warn("To parse a date-time string like "+t+" using the given format, you should enable customParseFormat plugin first. https://day.js.org/docs/en/parse/string-format"),n.bind(this)(e)};var a=o.locale;o.locale=function(e,t,s){return void 0===t&&"string"==typeof e&&(o.Ls[e]||console.warn("Guessing you may want to use locale "+e+", you have to load it before using it. https://day.js.org/docs/en/i18n/loading-into-nodejs")),a(e,t,s)}}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/duration.d.ts b/node_modules/dayjs/plugin/duration.d.ts
new file mode 100644
index 0000000..9675a80
--- /dev/null
+++ b/node_modules/dayjs/plugin/duration.d.ts
@@ -0,0 +1,88 @@
+import { PluginFunc } from 'dayjs'
+import { OpUnitType, UnitTypeLongPlural } from 'dayjs';
+
+declare const plugin: PluginFunc
+export as namespace plugin;
+export = plugin
+
+declare namespace plugin {
+  /**
+   * @deprecated Please use more strict types
+   */
+  type DurationInputType = string | number | object
+  /**
+   * @deprecated Please use more strict types
+   */
+  type DurationAddType = number | object | Duration
+  
+  type DurationUnitsObjectType = Partial<{
+    [unit in Exclude<UnitTypeLongPlural, "dates"> | "weeks"]: number
+  }>;
+  type DurationUnitType = Exclude<OpUnitType, "date" | "dates">
+  type CreateDurationType = 
+    ((units: DurationUnitsObjectType) => Duration)
+    & ((time: number, unit?: DurationUnitType) => Duration)
+    & ((ISO_8601: string) => Duration)
+  type AddDurationType = CreateDurationType & ((duration: Duration) => Duration)
+
+  interface Duration {
+    new (input: string | number | object, unit?: string, locale?: string): Duration
+
+    clone(): Duration
+
+    humanize(withSuffix?: boolean): string
+
+    milliseconds(): number
+    asMilliseconds(): number
+
+    seconds(): number
+    asSeconds(): number
+
+    minutes(): number
+    asMinutes(): number
+
+    hours(): number
+    asHours(): number
+
+    days(): number
+    asDays(): number
+
+    weeks(): number
+    asWeeks(): number
+
+    months(): number
+    asMonths(): number
+
+    years(): number
+    asYears(): number
+
+    as(unit: DurationUnitType): number
+
+    get(unit: DurationUnitType): number
+
+    add: AddDurationType
+    
+    subtract: AddDurationType
+
+    toJSON(): string
+
+    toISOString(): string
+
+    format(formatStr?: string): string
+
+    locale(locale: string): Duration
+  }
+}
+
+declare module 'dayjs' {
+  interface Dayjs {
+    add(duration: plugin.Duration): Dayjs
+    subtract(duration: plugin.Duration): Dayjs
+  }
+
+  /**
+   * @param time If unit is not present, time treated as number of milliseconds
+   */
+  export const duration: plugin.CreateDurationType;
+  export function isDuration(d: any): d is plugin.Duration
+}
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/duration.js b/node_modules/dayjs/plugin/duration.js
new file mode 100644
index 0000000..4578f06
--- /dev/null
+++ b/node_modules/dayjs/plugin/duration.js
@@ -0,0 +1 @@
+!function(t,s){"object"==typeof exports&&"undefined"!=typeof module?module.exports=s():"function"==typeof define&&define.amd?define(s):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_duration=s()}(this,(function(){"use strict";var t,s,n=1e3,i=6e4,e=36e5,r=864e5,o=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,u=31536e6,d=2628e6,a=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/,h={years:u,months:d,days:r,hours:e,minutes:i,seconds:n,milliseconds:1,weeks:6048e5},c=function(t){return t instanceof g},f=function(t,s,n){return new g(t,n,s.$l)},m=function(t){return s.p(t)+"s"},l=function(t){return t<0},$=function(t){return l(t)?Math.ceil(t):Math.floor(t)},y=function(t){return Math.abs(t)},v=function(t,s){return t?l(t)?{negative:!0,format:""+y(t)+s}:{negative:!1,format:""+t+s}:{negative:!1,format:""}},g=function(){function l(t,s,n){var i=this;if(this.$d={},this.$l=n,void 0===t&&(this.$ms=0,this.parseFromMilliseconds()),s)return f(t*h[m(s)],this);if("number"==typeof t)return this.$ms=t,this.parseFromMilliseconds(),this;if("object"==typeof t)return Object.keys(t).forEach((function(s){i.$d[m(s)]=t[s]})),this.calMilliseconds(),this;if("string"==typeof t){var e=t.match(a);if(e){var r=e.slice(2).map((function(t){return null!=t?Number(t):0}));return this.$d.years=r[0],this.$d.months=r[1],this.$d.weeks=r[2],this.$d.days=r[3],this.$d.hours=r[4],this.$d.minutes=r[5],this.$d.seconds=r[6],this.calMilliseconds(),this}}return this}var y=l.prototype;return y.calMilliseconds=function(){var t=this;this.$ms=Object.keys(this.$d).reduce((function(s,n){return s+(t.$d[n]||0)*h[n]}),0)},y.parseFromMilliseconds=function(){var t=this.$ms;this.$d.years=$(t/u),t%=u,this.$d.months=$(t/d),t%=d,this.$d.days=$(t/r),t%=r,this.$d.hours=$(t/e),t%=e,this.$d.minutes=$(t/i),t%=i,this.$d.seconds=$(t/n),t%=n,this.$d.milliseconds=t},y.toISOString=function(){var t=v(this.$d.years,"Y"),s=v(this.$d.months,"M"),n=+this.$d.days||0;this.$d.weeks&&(n+=7*this.$d.weeks);var i=v(n,"D"),e=v(this.$d.hours,"H"),r=v(this.$d.minutes,"M"),o=this.$d.seconds||0;this.$d.milliseconds&&(o+=this.$d.milliseconds/1e3,o=Math.round(1e3*o)/1e3);var u=v(o,"S"),d=t.negative||s.negative||i.negative||e.negative||r.negative||u.negative,a=e.format||r.format||u.format?"T":"",h=(d?"-":"")+"P"+t.format+s.format+i.format+a+e.format+r.format+u.format;return"P"===h||"-P"===h?"P0D":h},y.toJSON=function(){return this.toISOString()},y.format=function(t){var n=t||"YYYY-MM-DDTHH:mm:ss",i={Y:this.$d.years,YY:s.s(this.$d.years,2,"0"),YYYY:s.s(this.$d.years,4,"0"),M:this.$d.months,MM:s.s(this.$d.months,2,"0"),D:this.$d.days,DD:s.s(this.$d.days,2,"0"),H:this.$d.hours,HH:s.s(this.$d.hours,2,"0"),m:this.$d.minutes,mm:s.s(this.$d.minutes,2,"0"),s:this.$d.seconds,ss:s.s(this.$d.seconds,2,"0"),SSS:s.s(this.$d.milliseconds,3,"0")};return n.replace(o,(function(t,s){return s||String(i[t])}))},y.as=function(t){return this.$ms/h[m(t)]},y.get=function(t){var s=this.$ms,n=m(t);return"milliseconds"===n?s%=1e3:s="weeks"===n?$(s/h[n]):this.$d[n],s||0},y.add=function(t,s,n){var i;return i=s?t*h[m(s)]:c(t)?t.$ms:f(t,this).$ms,f(this.$ms+i*(n?-1:1),this)},y.subtract=function(t,s){return this.add(t,s,!0)},y.locale=function(t){var s=this.clone();return s.$l=t,s},y.clone=function(){return f(this.$ms,this)},y.humanize=function(s){return t().add(this.$ms,"ms").locale(this.$l).fromNow(!s)},y.valueOf=function(){return this.asMilliseconds()},y.milliseconds=function(){return this.get("milliseconds")},y.asMilliseconds=function(){return this.as("milliseconds")},y.seconds=function(){return this.get("seconds")},y.asSeconds=function(){return this.as("seconds")},y.minutes=function(){return this.get("minutes")},y.asMinutes=function(){return this.as("minutes")},y.hours=function(){return this.get("hours")},y.asHours=function(){return this.as("hours")},y.days=function(){return this.get("days")},y.asDays=function(){return this.as("days")},y.weeks=function(){return this.get("weeks")},y.asWeeks=function(){return this.as("weeks")},y.months=function(){return this.get("months")},y.asMonths=function(){return this.as("months")},y.years=function(){return this.get("years")},y.asYears=function(){return this.as("years")},l}(),p=function(t,s,n){return t.add(s.years()*n,"y").add(s.months()*n,"M").add(s.days()*n,"d").add(s.hours()*n,"h").add(s.minutes()*n,"m").add(s.seconds()*n,"s").add(s.milliseconds()*n,"ms")};return function(n,i,e){t=e,s=e().$utils(),e.duration=function(t,s){var n=e.locale();return f(t,{$l:n},s)},e.isDuration=c;var r=i.prototype.add,o=i.prototype.subtract;i.prototype.add=function(t,s){return c(t)?p(this,t,1):r.bind(this)(t,s)},i.prototype.subtract=function(t,s){return c(t)?p(this,t,-1):o.bind(this)(t,s)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isBetween.d.ts b/node_modules/dayjs/plugin/isBetween.d.ts
new file mode 100644
index 0000000..431fff8
--- /dev/null
+++ b/node_modules/dayjs/plugin/isBetween.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType, OpUnitType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isBetween(a: ConfigType, b: ConfigType, c?: OpUnitType | null, d?: '()' | '[]' | '[)' | '(]'): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isBetween.js b/node_modules/dayjs/plugin/isBetween.js
new file mode 100644
index 0000000..68046cb
--- /dev/null
+++ b/node_modules/dayjs/plugin/isBetween.js
@@ -0,0 +1 @@
+!function(e,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isBetween=i()}(this,(function(){"use strict";return function(e,i,t){i.prototype.isBetween=function(e,i,s,f){var n=t(e),o=t(i),r="("===(f=f||"()")[0],u=")"===f[1];return(r?this.isAfter(n,s):!this.isBefore(n,s))&&(u?this.isBefore(o,s):!this.isAfter(o,s))||(r?this.isBefore(n,s):!this.isAfter(n,s))&&(u?this.isAfter(o,s):!this.isBefore(o,s))}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isLeapYear.d.ts b/node_modules/dayjs/plugin/isLeapYear.d.ts
new file mode 100644
index 0000000..5be7409
--- /dev/null
+++ b/node_modules/dayjs/plugin/isLeapYear.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isLeapYear(): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isLeapYear.js b/node_modules/dayjs/plugin/isLeapYear.js
new file mode 100644
index 0000000..030bd46
--- /dev/null
+++ b/node_modules/dayjs/plugin/isLeapYear.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isLeapYear=t()}(this,(function(){"use strict";return function(e,t){t.prototype.isLeapYear=function(){return this.$y%4==0&&this.$y%100!=0||this.$y%400==0}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isMoment.d.ts b/node_modules/dayjs/plugin/isMoment.d.ts
new file mode 100644
index 0000000..dac24f6
--- /dev/null
+++ b/node_modules/dayjs/plugin/isMoment.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+
+  export function isMoment(input: any): boolean
+
+}
diff --git a/node_modules/dayjs/plugin/isMoment.js b/node_modules/dayjs/plugin/isMoment.js
new file mode 100644
index 0000000..be26412
--- /dev/null
+++ b/node_modules/dayjs/plugin/isMoment.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isMoment=n()}(this,(function(){"use strict";return function(e,n,t){t.isMoment=function(e){return t.isDayjs(e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isSameOrAfter.d.ts b/node_modules/dayjs/plugin/isSameOrAfter.d.ts
new file mode 100644
index 0000000..916bc80
--- /dev/null
+++ b/node_modules/dayjs/plugin/isSameOrAfter.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType, OpUnitType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isSameOrAfter(date?: ConfigType, unit?: OpUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isSameOrAfter.js b/node_modules/dayjs/plugin/isSameOrAfter.js
new file mode 100644
index 0000000..76f8a33
--- /dev/null
+++ b/node_modules/dayjs/plugin/isSameOrAfter.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isSameOrAfter=t()}(this,(function(){"use strict";return function(e,t){t.prototype.isSameOrAfter=function(e,t){return this.isSame(e,t)||this.isAfter(e,t)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isSameOrBefore.d.ts b/node_modules/dayjs/plugin/isSameOrBefore.d.ts
new file mode 100644
index 0000000..d52b095
--- /dev/null
+++ b/node_modules/dayjs/plugin/isSameOrBefore.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc, ConfigType, OpUnitType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isSameOrBefore(date?: ConfigType, unit?: OpUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isSameOrBefore.js b/node_modules/dayjs/plugin/isSameOrBefore.js
new file mode 100644
index 0000000..57a767e
--- /dev/null
+++ b/node_modules/dayjs/plugin/isSameOrBefore.js
@@ -0,0 +1 @@
+!function(e,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isSameOrBefore=i()}(this,(function(){"use strict";return function(e,i){i.prototype.isSameOrBefore=function(e,i){return this.isSame(e,i)||this.isBefore(e,i)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isToday.d.ts b/node_modules/dayjs/plugin/isToday.d.ts
new file mode 100644
index 0000000..04ac581
--- /dev/null
+++ b/node_modules/dayjs/plugin/isToday.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isToday(): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isToday.js b/node_modules/dayjs/plugin/isToday.js
new file mode 100644
index 0000000..ee9f9cd
--- /dev/null
+++ b/node_modules/dayjs/plugin/isToday.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isToday=o()}(this,(function(){"use strict";return function(e,o,t){o.prototype.isToday=function(){var e="YYYY-MM-DD",o=t();return this.format(e)===o.format(e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isTomorrow.d.ts b/node_modules/dayjs/plugin/isTomorrow.d.ts
new file mode 100644
index 0000000..08110b6
--- /dev/null
+++ b/node_modules/dayjs/plugin/isTomorrow.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isTomorrow(): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isTomorrow.js b/node_modules/dayjs/plugin/isTomorrow.js
new file mode 100644
index 0000000..ca85044
--- /dev/null
+++ b/node_modules/dayjs/plugin/isTomorrow.js
@@ -0,0 +1 @@
+!function(o,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(o="undefined"!=typeof globalThis?globalThis:o||self).dayjs_plugin_isTomorrow=e()}(this,(function(){"use strict";return function(o,e,t){e.prototype.isTomorrow=function(){var o="YYYY-MM-DD",e=t().add(1,"day");return this.format(o)===e.format(o)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isYesterday.d.ts b/node_modules/dayjs/plugin/isYesterday.d.ts
new file mode 100644
index 0000000..2d8ae9e
--- /dev/null
+++ b/node_modules/dayjs/plugin/isYesterday.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isYesterday(): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isYesterday.js b/node_modules/dayjs/plugin/isYesterday.js
new file mode 100644
index 0000000..b63b68a
--- /dev/null
+++ b/node_modules/dayjs/plugin/isYesterday.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isYesterday=t()}(this,(function(){"use strict";return function(e,t,n){t.prototype.isYesterday=function(){var e="YYYY-MM-DD",t=n().subtract(1,"day");return this.format(e)===t.format(e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isoWeek.d.ts b/node_modules/dayjs/plugin/isoWeek.d.ts
new file mode 100644
index 0000000..3f4d88f
--- /dev/null
+++ b/node_modules/dayjs/plugin/isoWeek.d.ts
@@ -0,0 +1,27 @@
+import { PluginFunc, OpUnitType, ConfigType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+type ISOUnitType = OpUnitType | 'isoWeek';
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isoWeekYear(): number
+    isoWeek(): number
+    isoWeek(value: number): Dayjs
+
+    isoWeekday(): number
+    isoWeekday(value: number): Dayjs
+
+    startOf(unit: ISOUnitType): Dayjs
+
+    endOf(unit: ISOUnitType): Dayjs
+
+    isSame(date?: ConfigType, unit?: ISOUnitType): boolean
+
+    isBefore(date?: ConfigType, unit?: ISOUnitType): boolean
+
+    isAfter(date?: ConfigType, unit?: ISOUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/isoWeek.js b/node_modules/dayjs/plugin/isoWeek.js
new file mode 100644
index 0000000..202ade7
--- /dev/null
+++ b/node_modules/dayjs/plugin/isoWeek.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isoWeek=t()}(this,(function(){"use strict";var e="day";return function(t,i,s){var a=function(t){return t.add(4-t.isoWeekday(),e)},d=i.prototype;d.isoWeekYear=function(){return a(this).year()},d.isoWeek=function(t){if(!this.$utils().u(t))return this.add(7*(t-this.isoWeek()),e);var i,d,n,o,r=a(this),u=(i=this.isoWeekYear(),d=this.$u,n=(d?s.utc:s)().year(i).startOf("year"),o=4-n.isoWeekday(),n.isoWeekday()>4&&(o+=7),n.add(o,e));return r.diff(u,"week")+1},d.isoWeekday=function(e){return this.$utils().u(e)?this.day()||7:this.day(this.day()%7?e:e-7)};var n=d.startOf;d.startOf=function(e,t){var i=this.$utils(),s=!!i.u(t)||t;return"isoweek"===i.p(e)?s?this.date(this.date()-(this.isoWeekday()-1)).startOf("day"):this.date(this.date()-1-(this.isoWeekday()-1)+7).endOf("day"):n.bind(this)(e,t)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/isoWeeksInYear.d.ts b/node_modules/dayjs/plugin/isoWeeksInYear.d.ts
new file mode 100644
index 0000000..2bc02cd
--- /dev/null
+++ b/node_modules/dayjs/plugin/isoWeeksInYear.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    isoWeeksInYear(): number
+  }
+}
diff --git a/node_modules/dayjs/plugin/isoWeeksInYear.js b/node_modules/dayjs/plugin/isoWeeksInYear.js
new file mode 100644
index 0000000..2bd20cd
--- /dev/null
+++ b/node_modules/dayjs/plugin/isoWeeksInYear.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_isoWeeksInYear=n()}(this,(function(){"use strict";return function(e,n){n.prototype.isoWeeksInYear=function(){var e=this.isLeapYear(),n=this.endOf("y").day();return 4===n||e&&5===n?53:52}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/localeData.d.ts b/node_modules/dayjs/plugin/localeData.d.ts
new file mode 100644
index 0000000..ae9e557
--- /dev/null
+++ b/node_modules/dayjs/plugin/localeData.d.ts
@@ -0,0 +1,44 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  type WeekdayNames = [string, string, string, string, string, string, string];
+  type MonthNames = [string, string, string, string, string, string, string, string, string, string, string, string];
+
+  interface InstanceLocaleDataReturn {
+    firstDayOfWeek(): number;
+    weekdays(instance?: Dayjs): WeekdayNames;
+    weekdaysShort(instance?: Dayjs): WeekdayNames;
+    weekdaysMin(instance?: Dayjs): WeekdayNames;
+    months(instance?: Dayjs): MonthNames;
+    monthsShort(instance?: Dayjs): MonthNames;
+    longDateFormat(format: string): string;
+    meridiem(hour?: number, minute?: number, isLower?: boolean): string;
+    ordinal(n: number): string
+  }
+
+  interface GlobalLocaleDataReturn {
+    firstDayOfWeek(): number;
+    weekdays(): WeekdayNames;
+    weekdaysShort(): WeekdayNames;
+    weekdaysMin(): WeekdayNames;
+    months(): MonthNames;
+    monthsShort(): MonthNames;
+    longDateFormat(format: string): string;
+    meridiem(hour?: number, minute?: number, isLower?: boolean): string;
+    ordinal(n: number): string
+  }
+
+  interface Dayjs {
+    localeData(): InstanceLocaleDataReturn;
+  }
+
+  export function weekdays(localOrder?: boolean): WeekdayNames;
+  export function weekdaysShort(localOrder?: boolean): WeekdayNames;
+  export function weekdaysMin(localOrder?: boolean): WeekdayNames;
+  export function monthsShort(): MonthNames;
+  export function months(): MonthNames;
+  export function localeData(): GlobalLocaleDataReturn;
+}
diff --git a/node_modules/dayjs/plugin/localeData.js b/node_modules/dayjs/plugin/localeData.js
new file mode 100644
index 0000000..55e01ee
--- /dev/null
+++ b/node_modules/dayjs/plugin/localeData.js
@@ -0,0 +1 @@
+!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(n="undefined"!=typeof globalThis?globalThis:n||self).dayjs_plugin_localeData=e()}(this,(function(){"use strict";return function(n,e,t){var r=e.prototype,o=function(n){return n&&(n.indexOf?n:n.s)},u=function(n,e,t,r,u){var i=n.name?n:n.$locale(),a=o(i[e]),s=o(i[t]),f=a||s.map((function(n){return n.slice(0,r)}));if(!u)return f;var d=i.weekStart;return f.map((function(n,e){return f[(e+(d||0))%7]}))},i=function(){return t.Ls[t.locale()]},a=function(n,e){return n.formats[e]||function(n){return n.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(n,e,t){return e||t.slice(1)}))}(n.formats[e.toUpperCase()])},s=function(){var n=this;return{months:function(e){return e?e.format("MMMM"):u(n,"months")},monthsShort:function(e){return e?e.format("MMM"):u(n,"monthsShort","months",3)},firstDayOfWeek:function(){return n.$locale().weekStart||0},weekdays:function(e){return e?e.format("dddd"):u(n,"weekdays")},weekdaysMin:function(e){return e?e.format("dd"):u(n,"weekdaysMin","weekdays",2)},weekdaysShort:function(e){return e?e.format("ddd"):u(n,"weekdaysShort","weekdays",3)},longDateFormat:function(e){return a(n.$locale(),e)},meridiem:this.$locale().meridiem,ordinal:this.$locale().ordinal}};r.localeData=function(){return s.bind(this)()},t.localeData=function(){var n=i();return{firstDayOfWeek:function(){return n.weekStart||0},weekdays:function(){return t.weekdays()},weekdaysShort:function(){return t.weekdaysShort()},weekdaysMin:function(){return t.weekdaysMin()},months:function(){return t.months()},monthsShort:function(){return t.monthsShort()},longDateFormat:function(e){return a(n,e)},meridiem:n.meridiem,ordinal:n.ordinal}},t.months=function(){return u(i(),"months")},t.monthsShort=function(){return u(i(),"monthsShort","months",3)},t.weekdays=function(n){return u(i(),"weekdays",null,null,n)},t.weekdaysShort=function(n){return u(i(),"weekdaysShort","weekdays",3,n)},t.weekdaysMin=function(n){return u(i(),"weekdaysMin","weekdays",2,n)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/localizedFormat.d.ts b/node_modules/dayjs/plugin/localizedFormat.d.ts
new file mode 100644
index 0000000..30ec75e
--- /dev/null
+++ b/node_modules/dayjs/plugin/localizedFormat.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/localizedFormat.js b/node_modules/dayjs/plugin/localizedFormat.js
new file mode 100644
index 0000000..2aa4665
--- /dev/null
+++ b/node_modules/dayjs/plugin/localizedFormat.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_localizedFormat=t()}(this,(function(){"use strict";var e={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"};return function(t,o,n){var r=o.prototype,i=r.format;n.en.formats=e,r.format=function(t){void 0===t&&(t="YYYY-MM-DDTHH:mm:ssZ");var o=this.$locale().formats,n=function(t,o){return t.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(t,n,r){var i=r&&r.toUpperCase();return n||o[r]||e[r]||o[i].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(e,t,o){return t||o.slice(1)}))}))}(t,void 0===o?{}:o);return i.call(this,n)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/minMax.d.ts b/node_modules/dayjs/plugin/minMax.d.ts
new file mode 100644
index 0000000..4c5f6dc
--- /dev/null
+++ b/node_modules/dayjs/plugin/minMax.d.ts
@@ -0,0 +1,11 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  export function max(dayjs: Dayjs[]): Dayjs | null
+  export function max(...dayjs: Dayjs[]): Dayjs | null
+  export function min(dayjs: Dayjs[]): Dayjs | null
+  export function min(...dayjs: Dayjs[]): Dayjs | null
+}
diff --git a/node_modules/dayjs/plugin/minMax.js b/node_modules/dayjs/plugin/minMax.js
new file mode 100644
index 0000000..ce06314
--- /dev/null
+++ b/node_modules/dayjs/plugin/minMax.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_minMax=n()}(this,(function(){"use strict";return function(e,n,t){var i=function(e,n){if(!n||!n.length||1===n.length&&!n[0]||1===n.length&&Array.isArray(n[0])&&!n[0].length)return null;var t;1===n.length&&n[0].length>0&&(n=n[0]);t=(n=n.filter((function(e){return e})))[0];for(var i=1;i<n.length;i+=1)n[i].isValid()&&!n[i][e](t)||(t=n[i]);return t};t.max=function(){var e=[].slice.call(arguments,0);return i("isAfter",e)},t.min=function(){var e=[].slice.call(arguments,0);return i("isBefore",e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/objectSupport.d.ts b/node_modules/dayjs/plugin/objectSupport.d.ts
new file mode 100644
index 0000000..ad0e1ff
--- /dev/null
+++ b/node_modules/dayjs/plugin/objectSupport.d.ts
@@ -0,0 +1,48 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+    interface Dayjs {
+        set(argument: object): Dayjs
+        add(argument: object): Dayjs
+        subtract(argument: object): Dayjs
+    }
+
+    interface ConfigTypeMap {
+        objectSupport: {
+            years?: number | string;
+            year?: number | string;
+            y?: number | string;
+
+            months?: number | string;
+            month?: number | string;
+            M?: number | string;
+
+            days?: number | string;
+            day?: number | string;
+            d?: number | string;
+
+            dates?: number | string;
+            date?: number | string;
+            D?: number | string;
+
+            hours?: number | string;
+            hour?: number | string;
+            h?: number | string;
+
+            minutes?: number | string;
+            minute?: number | string;
+            m?: number | string;
+
+            seconds?: number | string;
+            second?: number | string;
+            s?: number | string;
+
+            milliseconds?: number | string;
+            millisecond?: number | string;
+            ms?: number | string;
+        }
+    }
+}
diff --git a/node_modules/dayjs/plugin/objectSupport.js b/node_modules/dayjs/plugin/objectSupport.js
new file mode 100644
index 0000000..a9e1398
--- /dev/null
+++ b/node_modules/dayjs/plugin/objectSupport.js
@@ -0,0 +1 @@
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_objectSupport=n()}(this,(function(){"use strict";return function(t,n,e){var i=n.prototype,r=function(t){var n,r=t.date,o=t.utc,u={};if(!(null===(n=r)||n instanceof Date||n instanceof Array||i.$utils().u(n)||"Object"!==n.constructor.name)){if(!Object.keys(r).length)return new Date;var a=o?e.utc():e();Object.keys(r).forEach((function(t){var n,e;u[(n=t,e=i.$utils().p(n),"date"===e?"day":e)]=r[t]}));var c=u.day||(u.year||u.month>=0?1:a.date()),s=u.year||a.year(),d=u.month>=0?u.month:u.year||u.day?0:a.month(),f=u.hour||0,b=u.minute||0,h=u.second||0,y=u.millisecond||0;return o?new Date(Date.UTC(s,d,c,f,b,h,y)):new Date(s,d,c,f,b,h,y)}return r},o=i.parse;i.parse=function(t){t.date=r.bind(this)(t),o.bind(this)(t)};var u=i.set,a=i.add,c=i.subtract,s=function(t,n,e,i){void 0===i&&(i=1);var r=Object.keys(n),o=this;return r.forEach((function(e){o=t.bind(o)(n[e]*i,e)})),o};i.set=function(t,n){return n=void 0===n?t:n,"Object"===t.constructor.name?s.bind(this)((function(t,n){return u.bind(this)(n,t)}),n,t):u.bind(this)(t,n)},i.add=function(t,n){return"Object"===t.constructor.name?s.bind(this)(a,t,n):a.bind(this)(t,n)},i.subtract=function(t,n){return"Object"===t.constructor.name?s.bind(this)(a,t,n,-1):c.bind(this)(t,n)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/pluralGetSet.d.ts b/node_modules/dayjs/plugin/pluralGetSet.d.ts
new file mode 100644
index 0000000..ab2d89a
--- /dev/null
+++ b/node_modules/dayjs/plugin/pluralGetSet.d.ts
@@ -0,0 +1,44 @@
+import { PluginFunc, UnitType, ConfigType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    years(): number
+
+    years(value: number): Dayjs
+
+    months(): number
+
+    months(value: number): Dayjs
+
+    dates(): number
+
+    dates(value: number): Dayjs
+
+    weeks(): number
+
+    weeks(value: number): Dayjs
+
+    days(): number
+
+    days(value: number): Dayjs
+
+    hours(): number
+
+    hours(value: number): Dayjs
+
+    minutes(): number
+
+    minutes(value: number): Dayjs
+
+    seconds(): number
+
+    seconds(value: number): Dayjs
+
+    milliseconds(): number
+
+    milliseconds(value: number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/plugin/pluralGetSet.js b/node_modules/dayjs/plugin/pluralGetSet.js
new file mode 100644
index 0000000..d758494
--- /dev/null
+++ b/node_modules/dayjs/plugin/pluralGetSet.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_pluralGetSet=o()}(this,(function(){"use strict";return function(e,o){var s=o.prototype;["milliseconds","seconds","minutes","hours","days","weeks","isoWeeks","months","quarters","years","dates"].forEach((function(e){s[e]=s[e.replace(/s$/,"")]}))}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/preParsePostFormat.d.ts b/node_modules/dayjs/plugin/preParsePostFormat.d.ts
new file mode 100644
index 0000000..30ec75e
--- /dev/null
+++ b/node_modules/dayjs/plugin/preParsePostFormat.d.ts
@@ -0,0 +1,4 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
diff --git a/node_modules/dayjs/plugin/preParsePostFormat.js b/node_modules/dayjs/plugin/preParsePostFormat.js
new file mode 100644
index 0000000..5611d10
--- /dev/null
+++ b/node_modules/dayjs/plugin/preParsePostFormat.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_preParsePostFormat=e()}(this,(function(){"use strict";return function(t,e){var o=e.prototype.parse;e.prototype.parse=function(t){if("string"==typeof t.date){var e=this.$locale();t.date=e&&e.preparse?e.preparse(t.date):t.date}return o.bind(this)(t)};var r=e.prototype.format;e.prototype.format=function(){for(var t=arguments.length,e=new Array(t),o=0;o<t;o++)e[o]=arguments[o];var a=r.call.apply(r,[this].concat(e)),p=this.$locale();return p&&p.postformat?p.postformat(a):a};var a=e.prototype.fromToBase;a&&(e.prototype.fromToBase=function(t,e,o,r){var p=this.$locale()||o.$locale();return a.call(this,t,e,o,r,p&&p.postformat)})}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/quarterOfYear.d.ts b/node_modules/dayjs/plugin/quarterOfYear.d.ts
new file mode 100644
index 0000000..317e0ad
--- /dev/null
+++ b/node_modules/dayjs/plugin/quarterOfYear.d.ts
@@ -0,0 +1,26 @@
+import { PluginFunc, ConfigType, QUnitType, OpUnitType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    quarter(): number
+
+    quarter(quarter: number): Dayjs
+
+    add(value: number, unit: QUnitType): Dayjs
+
+    subtract(value: number, unit: QUnitType): Dayjs
+
+    startOf(unit: QUnitType | OpUnitType): Dayjs
+
+    endOf(unit: QUnitType | OpUnitType): Dayjs
+
+    isSame(date?: ConfigType, unit?: QUnitType): boolean
+
+    isBefore(date?: ConfigType, unit?: QUnitType): boolean
+
+    isAfter(date?: ConfigType, unit?: QUnitType): boolean
+  }
+}
diff --git a/node_modules/dayjs/plugin/quarterOfYear.js b/node_modules/dayjs/plugin/quarterOfYear.js
new file mode 100644
index 0000000..6bfe4c2
--- /dev/null
+++ b/node_modules/dayjs/plugin/quarterOfYear.js
@@ -0,0 +1 @@
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_quarterOfYear=n()}(this,(function(){"use strict";var t="month",n="quarter";return function(e,i){var r=i.prototype;r.quarter=function(t){return this.$utils().u(t)?Math.ceil((this.month()+1)/3):this.month(this.month()%3+3*(t-1))};var s=r.add;r.add=function(e,i){return e=Number(e),this.$utils().p(i)===n?this.add(3*e,t):s.bind(this)(e,i)};var u=r.startOf;r.startOf=function(e,i){var r=this.$utils(),s=!!r.u(i)||i;if(r.p(e)===n){var o=this.quarter()-1;return s?this.month(3*o).startOf(t).startOf("day"):this.month(3*o+2).endOf(t).endOf("day")}return u.bind(this)(e,i)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/relativeTime.d.ts b/node_modules/dayjs/plugin/relativeTime.d.ts
new file mode 100644
index 0000000..444b0c2
--- /dev/null
+++ b/node_modules/dayjs/plugin/relativeTime.d.ts
@@ -0,0 +1,24 @@
+import { PluginFunc, ConfigType } from 'dayjs'
+
+declare interface RelativeTimeThreshold {
+  l: string
+  r?: number
+  d?: string
+}
+
+declare interface RelativeTimeOptions {
+  rounding?: (num: number) => number
+  thresholds?: RelativeTimeThreshold[]
+}
+
+declare const plugin: PluginFunc<RelativeTimeOptions>
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    fromNow(withoutSuffix?: boolean): string
+    from(compared: ConfigType, withoutSuffix?: boolean): string
+    toNow(withoutSuffix?: boolean): string
+    to(compared: ConfigType, withoutSuffix?: boolean): string
+  }
+}
diff --git a/node_modules/dayjs/plugin/relativeTime.js b/node_modules/dayjs/plugin/relativeTime.js
new file mode 100644
index 0000000..898eee6
--- /dev/null
+++ b/node_modules/dayjs/plugin/relativeTime.js
@@ -0,0 +1 @@
+!function(r,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(r="undefined"!=typeof globalThis?globalThis:r||self).dayjs_plugin_relativeTime=e()}(this,(function(){"use strict";return function(r,e,t){r=r||{};var n=e.prototype,o={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"};function i(r,e,t,o){return n.fromToBase(r,e,t,o)}t.en.relativeTime=o,n.fromToBase=function(e,n,i,d,u){for(var f,a,s,l=i.$locale().relativeTime||o,h=r.thresholds||[{l:"s",r:44,d:"second"},{l:"m",r:89},{l:"mm",r:44,d:"minute"},{l:"h",r:89},{l:"hh",r:21,d:"hour"},{l:"d",r:35},{l:"dd",r:25,d:"day"},{l:"M",r:45},{l:"MM",r:10,d:"month"},{l:"y",r:17},{l:"yy",d:"year"}],m=h.length,c=0;c<m;c+=1){var y=h[c];y.d&&(f=d?t(e).diff(i,y.d,!0):i.diff(e,y.d,!0));var p=(r.rounding||Math.round)(Math.abs(f));if(s=f>0,p<=y.r||!y.r){p<=1&&c>0&&(y=h[c-1]);var v=l[y.l];u&&(p=u(""+p)),a="string"==typeof v?v.replace("%d",p):v(p,n,y.l,s);break}}if(n)return a;var M=s?l.future:l.past;return"function"==typeof M?M(a):M.replace("%s",a)},n.to=function(r,e){return i(r,e,this,!0)},n.from=function(r,e){return i(r,e,this)};var d=function(r){return r.$u?t.utc():t()};n.toNow=function(r){return this.to(d(this),r)},n.fromNow=function(r){return this.from(d(this),r)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/timezone.d.ts b/node_modules/dayjs/plugin/timezone.d.ts
new file mode 100644
index 0000000..049bb08
--- /dev/null
+++ b/node_modules/dayjs/plugin/timezone.d.ts
@@ -0,0 +1,20 @@
+import { PluginFunc, ConfigType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    tz(timezone?: string, keepLocalTime?: boolean): Dayjs
+    offsetName(type?: 'short' | 'long'): string | undefined
+  }
+
+  interface DayjsTimezone {
+    (date?: ConfigType, timezone?: string): Dayjs
+    (date: ConfigType, format: string, timezone?: string): Dayjs
+    guess(): string
+    setDefault(timezone?: string): void
+  }
+
+  const tz: DayjsTimezone
+}
diff --git a/node_modules/dayjs/plugin/timezone.js b/node_modules/dayjs/plugin/timezone.js
new file mode 100644
index 0000000..b778bef
--- /dev/null
+++ b/node_modules/dayjs/plugin/timezone.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_timezone=e()}(this,(function(){"use strict";var t={year:0,month:1,day:2,hour:3,minute:4,second:5},e={};return function(n,i,o){var r,a=function(t,n,i){void 0===i&&(i={});var o=new Date(t),r=function(t,n){void 0===n&&(n={});var i=n.timeZoneName||"short",o=t+"|"+i,r=e[o];return r||(r=new Intl.DateTimeFormat("en-US",{hour12:!1,timeZone:t,year:"numeric",month:"2-digit",day:"2-digit",hour:"2-digit",minute:"2-digit",second:"2-digit",timeZoneName:i}),e[o]=r),r}(n,i);return r.formatToParts(o)},u=function(e,n){for(var i=a(e,n),r=[],u=0;u<i.length;u+=1){var f=i[u],s=f.type,m=f.value,c=t[s];c>=0&&(r[c]=parseInt(m,10))}var d=r[3],l=24===d?0:d,h=r[0]+"-"+r[1]+"-"+r[2]+" "+l+":"+r[4]+":"+r[5]+":000",v=+e;return(o.utc(h).valueOf()-(v-=v%1e3))/6e4},f=i.prototype;f.tz=function(t,e){void 0===t&&(t=r);var n=this.utcOffset(),i=this.toDate(),a=i.toLocaleString("en-US",{timeZone:t}),u=Math.round((i-new Date(a))/1e3/60),f=o(a,{locale:this.$L}).$set("millisecond",this.$ms).utcOffset(15*-Math.round(i.getTimezoneOffset()/15)-u,!0);if(e){var s=f.utcOffset();f=f.add(n-s,"minute")}return f.$x.$timezone=t,f},f.offsetName=function(t){var e=this.$x.$timezone||o.tz.guess(),n=a(this.valueOf(),e,{timeZoneName:t}).find((function(t){return"timezonename"===t.type.toLowerCase()}));return n&&n.value};var s=f.startOf;f.startOf=function(t,e){if(!this.$x||!this.$x.$timezone)return s.call(this,t,e);var n=o(this.format("YYYY-MM-DD HH:mm:ss:SSS"),{locale:this.$L});return s.call(n,t,e).tz(this.$x.$timezone,!0)},o.tz=function(t,e,n){var i=n&&e,a=n||e||r,f=u(+o(),a);if("string"!=typeof t)return o(t).tz(a);var s=function(t,e,n){var i=t-60*e*1e3,o=u(i,n);if(e===o)return[i,e];var r=u(i-=60*(o-e)*1e3,n);return o===r?[i,o]:[t-60*Math.min(o,r)*1e3,Math.max(o,r)]}(o.utc(t,i).valueOf(),f,a),m=s[0],c=s[1],d=o(m).utcOffset(c);return d.$x.$timezone=a,d},o.tz.guess=function(){return Intl.DateTimeFormat().resolvedOptions().timeZone},o.tz.setDefault=function(t){r=t}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/toArray.d.ts b/node_modules/dayjs/plugin/toArray.d.ts
new file mode 100644
index 0000000..45f1f0c
--- /dev/null
+++ b/node_modules/dayjs/plugin/toArray.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    toArray(): number[]
+  }
+}
diff --git a/node_modules/dayjs/plugin/toArray.js b/node_modules/dayjs/plugin/toArray.js
new file mode 100644
index 0000000..ac06750
--- /dev/null
+++ b/node_modules/dayjs/plugin/toArray.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_toArray=e()}(this,(function(){"use strict";return function(t,e){e.prototype.toArray=function(){return[this.$y,this.$M,this.$D,this.$H,this.$m,this.$s,this.$ms]}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/toObject.d.ts b/node_modules/dayjs/plugin/toObject.d.ts
new file mode 100644
index 0000000..ca12aaf
--- /dev/null
+++ b/node_modules/dayjs/plugin/toObject.d.ts
@@ -0,0 +1,20 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+interface DayjsObject {
+  years: number
+  months: number
+  date: number
+  hours: number
+  minutes: number
+  seconds: number
+  milliseconds: number
+}
+
+declare module 'dayjs' {
+  interface Dayjs {
+    toObject(): DayjsObject
+  }
+}
diff --git a/node_modules/dayjs/plugin/toObject.js b/node_modules/dayjs/plugin/toObject.js
new file mode 100644
index 0000000..573b49e
--- /dev/null
+++ b/node_modules/dayjs/plugin/toObject.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_toObject=e()}(this,(function(){"use strict";return function(t,e){e.prototype.toObject=function(){return{years:this.$y,months:this.$M,date:this.$D,hours:this.$H,minutes:this.$m,seconds:this.$s,milliseconds:this.$ms}}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/updateLocale.d.ts b/node_modules/dayjs/plugin/updateLocale.d.ts
new file mode 100644
index 0000000..ef1c01d
--- /dev/null
+++ b/node_modules/dayjs/plugin/updateLocale.d.ts
@@ -0,0 +1,8 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  export function updateLocale(localeName: string, customConfig: Record<string, unknown>): Record<string, unknown>
+}
diff --git a/node_modules/dayjs/plugin/updateLocale.js b/node_modules/dayjs/plugin/updateLocale.js
new file mode 100644
index 0000000..811d9e9
--- /dev/null
+++ b/node_modules/dayjs/plugin/updateLocale.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_updateLocale=n()}(this,(function(){"use strict";return function(e,n,t){t.updateLocale=function(e,n){var o=t.Ls[e];if(o)return(n?Object.keys(n):[]).forEach((function(e){o[e]=n[e]})),o}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/utc.d.ts b/node_modules/dayjs/plugin/utc.d.ts
new file mode 100644
index 0000000..544ea4e
--- /dev/null
+++ b/node_modules/dayjs/plugin/utc.d.ts
@@ -0,0 +1,19 @@
+import { PluginFunc, ConfigType } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    
+    utc(keepLocalTime?: boolean): Dayjs
+    
+    local(): Dayjs
+
+    isUTC(): boolean
+
+    utcOffset(offset: number | string, keepLocalTime?: boolean): Dayjs
+  }
+
+  export function utc(config?: ConfigType, format?: string, strict?: boolean): Dayjs
+}
diff --git a/node_modules/dayjs/plugin/utc.js b/node_modules/dayjs/plugin/utc.js
new file mode 100644
index 0000000..af07564
--- /dev/null
+++ b/node_modules/dayjs/plugin/utc.js
@@ -0,0 +1 @@
+!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs_plugin_utc=i()}(this,(function(){"use strict";var t="minute",i=/[+-]\d\d(?::?\d\d)?/g,e=/([+-]|\d\d)/g;return function(s,f,n){var u=f.prototype;n.utc=function(t){var i={date:t,utc:!0,args:arguments};return new f(i)},u.utc=function(i){var e=n(this.toDate(),{locale:this.$L,utc:!0});return i?e.add(this.utcOffset(),t):e},u.local=function(){return n(this.toDate(),{locale:this.$L,utc:!1})};var o=u.parse;u.parse=function(t){t.utc&&(this.$u=!0),this.$utils().u(t.$offset)||(this.$offset=t.$offset),o.call(this,t)};var r=u.init;u.init=function(){if(this.$u){var t=this.$d;this.$y=t.getUTCFullYear(),this.$M=t.getUTCMonth(),this.$D=t.getUTCDate(),this.$W=t.getUTCDay(),this.$H=t.getUTCHours(),this.$m=t.getUTCMinutes(),this.$s=t.getUTCSeconds(),this.$ms=t.getUTCMilliseconds()}else r.call(this)};var a=u.utcOffset;u.utcOffset=function(s,f){var n=this.$utils().u;if(n(s))return this.$u?0:n(this.$offset)?a.call(this):this.$offset;if("string"==typeof s&&(s=function(t){void 0===t&&(t="");var s=t.match(i);if(!s)return null;var f=(""+s[0]).match(e)||["-",0,0],n=f[0],u=60*+f[1]+ +f[2];return 0===u?0:"+"===n?u:-u}(s),null===s))return this;var u=Math.abs(s)<=16?60*s:s,o=this;if(f)return o.$offset=u,o.$u=0===s,o;if(0!==s){var r=this.$u?this.toDate().getTimezoneOffset():-1*this.utcOffset();(o=this.local().add(u+r,t)).$offset=u,o.$x.$localOffset=r}else o=this.utc();return o};var h=u.format;u.format=function(t){var i=t||(this.$u?"YYYY-MM-DDTHH:mm:ss[Z]":"");return h.call(this,i)},u.valueOf=function(){var t=this.$utils().u(this.$offset)?0:this.$offset+(this.$x.$localOffset||this.$d.getTimezoneOffset());return this.$d.valueOf()-6e4*t},u.isUTC=function(){return!!this.$u},u.toISOString=function(){return this.toDate().toISOString()},u.toString=function(){return this.toDate().toUTCString()};var l=u.toDate;u.toDate=function(t){return"s"===t&&this.$offset?n(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate():l.call(this)};var c=u.diff;u.diff=function(t,i,e){if(t&&this.$u===t.$u)return c.call(this,t,i,e);var s=this.local(),f=n(t).local();return c.call(s,f,i,e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/weekOfYear.d.ts b/node_modules/dayjs/plugin/weekOfYear.d.ts
new file mode 100644
index 0000000..d988014
--- /dev/null
+++ b/node_modules/dayjs/plugin/weekOfYear.d.ts
@@ -0,0 +1,12 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    week(): number
+
+    week(value : number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/plugin/weekOfYear.js b/node_modules/dayjs/plugin/weekOfYear.js
new file mode 100644
index 0000000..7e234c4
--- /dev/null
+++ b/node_modules/dayjs/plugin/weekOfYear.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_weekOfYear=t()}(this,(function(){"use strict";var e="week",t="year";return function(i,n,r){var f=n.prototype;f.week=function(i){if(void 0===i&&(i=null),null!==i)return this.add(7*(i-this.week()),"day");var n=this.$locale().yearStart||1;if(11===this.month()&&this.date()>25){var f=r(this).startOf(t).add(1,t).date(n),s=r(this).endOf(e);if(f.isBefore(s))return 1}var a=r(this).startOf(t).date(n).startOf(e).subtract(1,"millisecond"),o=this.diff(a,e,!0);return o<0?r(this).startOf("week").week():Math.ceil(o)},f.weeks=function(e){return void 0===e&&(e=null),this.week(e)}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/weekYear.d.ts b/node_modules/dayjs/plugin/weekYear.d.ts
new file mode 100644
index 0000000..df25331
--- /dev/null
+++ b/node_modules/dayjs/plugin/weekYear.d.ts
@@ -0,0 +1,10 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    weekYear(): number
+  }
+}
diff --git a/node_modules/dayjs/plugin/weekYear.js b/node_modules/dayjs/plugin/weekYear.js
new file mode 100644
index 0000000..d90d137
--- /dev/null
+++ b/node_modules/dayjs/plugin/weekYear.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_weekYear=t()}(this,(function(){"use strict";return function(e,t){t.prototype.weekYear=function(){var e=this.month(),t=this.week(),n=this.year();return 1===t&&11===e?n+1:0===e&&t>=52?n-1:n}}}));
\ No newline at end of file
diff --git a/node_modules/dayjs/plugin/weekday.d.ts b/node_modules/dayjs/plugin/weekday.d.ts
new file mode 100644
index 0000000..87a8025
--- /dev/null
+++ b/node_modules/dayjs/plugin/weekday.d.ts
@@ -0,0 +1,12 @@
+import { PluginFunc } from 'dayjs'
+
+declare const plugin: PluginFunc
+export = plugin
+
+declare module 'dayjs' {
+  interface Dayjs {
+    weekday(): number
+
+    weekday(value: number): Dayjs
+  }
+}
diff --git a/node_modules/dayjs/plugin/weekday.js b/node_modules/dayjs/plugin/weekday.js
new file mode 100644
index 0000000..ae2276b
--- /dev/null
+++ b/node_modules/dayjs/plugin/weekday.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_weekday=t()}(this,(function(){"use strict";return function(e,t){t.prototype.weekday=function(e){var t=this.$locale().weekStart||0,i=this.$W,n=(i<t?i+7:i)-t;return this.$utils().u(e)?n:this.subtract(n,"day").add(e,"day")}}}));
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..aac4a5c
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,16 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "chinese-workday": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmmirror.com/chinese-workday/-/chinese-workday-1.10.0.tgz",
+      "integrity": "sha512-wHar+6Qd/lPDHYHdnCrb1ZJvj8Kjyy3lPrjQEqtlWqw9TRlRLTWnPUi/esB5OJFbEedYGJEP5o5zrrp4wLBCVA=="
+    },
+    "dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..4f41f2d
--- /dev/null
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "chinese-workday": "^1.10.0",
+    "dayjs": "^1.11.10"
+  }
+}
diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js
new file mode 100644
index 0000000..7473118
--- /dev/null
+++ b/pages/component/newCalendar/index.js
@@ -0,0 +1,378 @@
+// components/xx-calendar/xx-calendar.js
+import calendarFormatter from "./xx_calendar";
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        use_date_arr:{
+            type:Array,
+            value:[]
+        }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        // 本月指的是选择的当前月份
+        year: new Date().getFullYear(),
+        month: new Date().getMonth() + 1,
+        weeksArr: ['日', '一', '二', '三', '四', '五', '六'],
+        nowMonth: new Date().getMonth() + 1, //本月是几月
+        nowDay: new Date().getDate(), //本月当天的日期
+        lastMonthDays: [], //上一个月
+        nowMonthDays: [], //本月 
+        nextMonthDays: [], //下一个月 
+        weekDay:[], //周 日期list
+        activeDateStr:'',  // 当前日期,
+        currentViewType: 'week'   //当前选中的是周还是月
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        //获取当月天数
+        getThisMonthDays(year, month) {
+            return new Date(year, month, 0).getDate();
+        },
+        /** 总方法 */
+        //创建日期
+        createDays(year, month) {
+
+          if(  this.data.currentViewType === "month" ) {
+            this.getLastMonthDays(year, month)
+            this.getNowMonthDays(year, month)
+            this.getNextMonthDays(year, month)
+          } else {
+            this.getWeekData()
+          }
+         
+        },
+
+         /** 视图收起/展开 */
+    toggleMode() {
+      this.setData({
+        currentViewType: this.data.currentViewType === "month" ? "week" : "month",
+      })
+      const activeDateStr = this.data.activeDateStr 
+      const arr = activeDateStr.split("/")
+      const { year, month} = this.data
+      if(  this.data.currentViewType === "month" ) {
+          this.getLastMonthDays(year, month)
+          this.getNowMonthDays(year, month)
+          this.getNextMonthDays(year, month)
+        } else {
+          this.getWeekData()
+        }
+      this.setData({ 
+        headerDate: `${arr[0]} 年 ${arr[1]} 月`
+      })
+      this.triggerEvent('modeChange', {
+        viewType: this.data.currentViewType,
+      });
+    },
+        /** 获取上个月日期 */
+        getLastMonthDays(year, month) {
+            let nowMonthFirstDays = new Date(year, month - 1, 1).getDay()
+            let lastMonthDays = []
+            if (nowMonthFirstDays) { //判断当月的第一天是不是星期天
+                //上个月显示多少天
+                let lastMonthNums = month - 1 < 0 ? this.getThisMonthDays(year - 1, 12) : this.getThisMonthDays(year, month - 1); //判断是否会跨年
+                //上个月从几号开始显示
+                for (let i = lastMonthNums - nowMonthFirstDays + 1; i <= lastMonthNums; i++) {
+          
+                  let time = new Date(year, month - 2, i).toLocaleDateString() //对应的时间
+                  let timer = time.replace(/\//g, "-") 
+                    
+                    lastMonthDays.push({
+                        date: i, //几号
+                        week: this.data.weeksArr[new Date(year, month - 2, i).getDay()], //星期几
+                        time:time, 
+                        isNowMonthDay: ''
+                    });
+                }
+            }
+            this.setData({
+                lastMonthDays
+            })
+            console.log(lastMonthDays);
+        },
+        /** 获取当月日期 */
+        getNowMonthDays(year, month) {
+            let {
+                nowMonth,
+                nowDay
+            } = this.data
+            let nowMonthDays = []
+            let days = this.getThisMonthDays(year, month); //获取当月的天数
+            for (let i = 1; i <= days; i++) { 
+                let d = new Date(year, month - 1, i)
+                let years = d.getFullYear()
+                let months = d.getMonth() + 1
+                let day2 = d.getDate()
+                let time = `${years+'/'+months +'/'+day2}` // 2022/3/3
+                let timer = time.replace(/\//g, "-")
+                let timer2 = timer.split('-')
+                var day = calendarFormatter.solar2lunar(timer2[0], timer2[1], timer2[2]);
+                let newdate
+                if (day.IDayCn == '初一') {
+                    newdate = day.IMonthCn
+                } else {
+                    newdate = day.IDayCn
+                } 
+                 // 当前月数据
+                let festival = calendarFormatter.getFestival(timer) // 返回当前节假日名称, 不是节日返回 '工作日'
+                nowMonthDays.push({
+                    date: i, //几号
+                    week: this.data.weeksArr[new Date(year, month - 1, i).getDay()], //星期几
+                    time,
+                    color: false,
+                    day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 ? newdate : festival,
+                    // day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 || [如果有不想展示的日期,放这里].includes(timer) ? newdate : festival,
+
+                    isNowMonthDay: (month == nowMonth && i == nowDay) ? "isNowMonthDay" : "",
+                    isHoliday: calendarFormatter.isHoliday(timer), // 判断是否是休息日 是的话返回true, 不是的话返回false
+                    
+                });
+            }
+            this.data.use_date_arr.forEach(ele => {
+                ele = ele.replace(/\-/g, "/")
+                nowMonthDays.forEach(item => {
+                    if (ele == item.time) {
+                        console.log(item);
+                        item.color = true
+                    }
+                })
+            })
+            this.setData({
+                nowMonthDays
+            }) 
+        },
+        /** 获取下个月日期 */
+        getNextMonthDays(year, month) {
+            let {
+                lastMonthDays,
+                nowMonthDays,
+            } = this.data
+            let nextMonthDays = []
+            let nextMonthNums = (lastMonthDays.length + nowMonthDays.length) > 35 ? 42 - (lastMonthDays.length + nowMonthDays.length) : 35 - (lastMonthDays.length + nowMonthDays.length) //下个月显示多少天
+            let nowYear = (parseInt(month) + 1) > 12 ? year + 1 : year //下一个月的年份
+            let nowMonth = (parseInt(month) + 1) > 12 ? 1 : parseInt(month) + 1 //下一个月的月份
+            if (nextMonthNums) { //判断当前天数是否大于零
+                for (let i = 1; i <= nextMonthNums; i++) {
+                    let time = new Date(year, month - 1, i).toLocaleDateString()
+                    nextMonthDays.push({
+                        date: i, //几号
+                        week: this.data.weeksArr[new Date(nowYear, nowMonth - 1, i).getDay()], //星期几
+                        time,
+                        isNowMonthDay: ''
+                    });
+                }
+            }
+            this.setData({
+                nextMonthDays
+            })
+            console.log(nextMonthDays)
+        },
+        /** 切换月份 */
+        changeMonthFun(e){
+          if (this.data.currentViewType === "month") {
+            let {
+              year,
+              month,
+              nowDay
+            } = this.data
+            let type = e.currentTarget.dataset.type //类型
+            if (type == 'prev') { //上一个月
+                year = month - 1 > 0 ? year : year - 1
+                month = month - 1 > 0 ? month - 1 : 12
+            } else { //next 下个月
+                year = (parseInt(month) + 1) > 12 ? year + 1 : year
+                month = (parseInt(month) + 1) > 12 ? 1 : parseInt(month) + 1
+            }
+            this.setData({
+                year,
+                month,
+                nowMonth: month,
+                activeDateStr: `${year}/${month}/${nowDay}`
+            })
+            this.createDays(year, month)
+          } else {
+            let type = e.currentTarget.dataset.type //类型  
+            let newActiveDateStr =   this.getActiveDateStrByWeek(this.data.activeDateStr, type)
+            this.getWeekData(newActiveDateStr)
+            this.setData({
+              activeDateStr: newActiveDateStr, 
+            })
+          }
+            
+        },
+ 
+   /** 获取周视图数据 */
+    getWeekData(defaultDate) {  
+      /** 是否是从周一开始 */
+      const isStartFromMonday = this.properties.startDay === "monday"
+      if (!defaultDate) {
+        defaultDate = this.data.activeDateStr 
+      } 
+      const YEAR = new Date(defaultDate).getFullYear()
+      const MONTH = new Date(defaultDate).getMonth() + 1
+      const DATE = new Date(defaultDate).getDate()
+      const WEEK = isStartFromMonday
+        ? new Date(defaultDate).getDay() || 7
+        : new Date(defaultDate).getDay()
+      /** 上月最后一天 */
+      let lastDayOfLastMonth = new Date(YEAR, MONTH - 1, 0)
+      /** 上月最后一天是周几 */
+      let lastDateOfLastMonth = lastDayOfLastMonth.getDate()
+      /** 当月最后一天 */
+      let lastDay = new Date(YEAR, MONTH, 0)
+      /** 当月最后一天是几号 */
+      let lastDate = lastDay.getDate()
+
+      var ret = []
+      /** 前面有几天 */
+      let preCount = isStartFromMonday ? WEEK - 1 : WEEK
+      for (let i = 0; i < 7; i++) {
+        /** 用于计算的日期，可能为负数，可能大于当月最后一天 */
+        let date = i + (DATE - preCount)
+        /** 真实的日期 */
+        let showDate = date
+        /** 真实的月 */
+        let showMonth = MONTH
+        /** 真实的年 */
+        let showYear = YEAR
+        if (date <= 0) {
+          // 上个月
+          showMonth = MONTH - 1
+          showDate = lastDateOfLastMonth + date
+        } else if (date > lastDate) {
+          // 下个月
+          showMonth = MONTH + 1
+          showDate = showDate - lastDate
+        }
+        if (showMonth === 0) {
+          showMonth = 12
+          showYear = YEAR - 1
+        }
+        if (showMonth === 13) {
+          showMonth = 1
+          showYear = YEAR + 1
+        } 
+        var day = calendarFormatter.solar2lunar(showYear,showMonth, showDate);
+        let newdate
+        if (day.IDayCn == '初一') {
+            newdate = day.IMonthCn
+        } else {
+            newdate = day.IDayCn
+        }  
+        let { 
+          month,
+          nowDay
+        } = this.data
+        // 当前周数据
+        let festival = calendarFormatter.getFestival(`${showYear}-${showMonth}-${showDate}`) // 返回当前节假日名称, 不是节日返回 '工作日'
+        ret.push({
+          year: showYear,
+          month: showMonth,
+          date: showDate,
+          calDate: date,
+          day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 ? newdate : festival,
+          dateStr: `${showYear}/${showMonth}/${showDate}`,
+          isNowMonthDay: (month == showMonth && nowDay == showDate) ? "isNowMonthDay" : "",
+          isHoliday: calendarFormatter.isHoliday(`${showYear}-${showMonth}-${showDate}`), // 判断是否是休息日 是的话返回true, 不是的话返回false
+        })
+      }  
+      this.setData({
+        weekDay: ret,
+        year: YEAR,
+        month: MONTH,
+      }) 
+    },
+
+    /**
+     * 周视图下，左右切换时，获取新的高亮日期
+     * @param {string} curActiveDateStr 当前高亮的日期
+     * @param {string} type "prev" or "next"
+     */
+    getActiveDateStrByWeek(curActiveDateStr, type) {
+      const arr = curActiveDateStr.split("/")
+      const year = +arr[0]
+      const month = +arr[1]
+      const date = +arr[2]
+
+      let newYear = year, newMonth = month, newDate = date;
+      /** 上月最后一天 */
+      const lastMonthLastDate = new Date(year, month - 1, 0).getDate()
+      /** 本月最后一天 */
+      const curMonthLastDate = new Date(year, month, 0).getDate()
+      if (type === "prev") {
+        // 如果减7小于0， 说明跳月了
+        if (date - 7 <= 0) {
+          newYear = month === 1 ? year - 1 : year
+          newMonth = month === 1 ? 12 : month - 1
+          newDate = lastMonthLastDate + date - 7
+        } else {
+          newDate = date - 7
+        }
+      } else if (type == "next") {
+        // 如果加7大于本月最后一天，说明跳月了
+        if (date + 7 > curMonthLastDate) {
+          newYear = month === 12 ? year + 1 : year
+          newMonth = month === 12 ? 1 : month + 1
+          newDate = (date + 7) - curMonthLastDate
+        } else {
+          newDate = date + 7
+        }
+      }
+      return `${newYear}/${newMonth}/${newDate}`
+    },
+
+ 
+        /** 选择日期触发 */
+        selectDate(e){
+            let type = e.currentTarget.dataset.type //选择的时间类型
+            let index = e.currentTarget.dataset.index //选择的下标
+            // let date = e.currentTarget.dataset.item.time //选择的下标
+            let date = e.currentTarget.dataset.item.dateStr //选择的下标
+            let selectDate = date.replace(/\//g, "-")
+            console.log("选择的时间", selectDate)
+            // 自定义事件，父组件调用，回调 选择的时间selectDate
+            this.triggerEvent('selectDate', selectDate)
+             //将选择的时间类型的 isNowMonthDay 全改为''
+             this.data[type]?.forEach(item => {
+                item.isNowMonthDay = ''
+            }) 
+            this.data[type]?.forEach((item, idx) => {
+                if (index == idx) {
+                    item.isNowMonthDay = (item.time == new Date().toLocaleDateString() ? "isNowMonthDay" : "isNotNowMonthDay"); //判断当前选中的日期是否是当前时间
+                } else {
+                    item.isNowMonthDay = ''
+                }
+            })
+            const dateArr = date.split('/')
+            this.setData({
+                [type]: this.data[type],
+                activeDateStr: date,
+                year: dateArr[0],
+                month:dateArr[1],
+                nowMonth: dateArr[1],
+                nowDay: dateArr[2],
+            })
+        },
+    },
+    ready() {
+        let {
+            year,
+            month,
+            nowDay
+        } = this.data 
+        this.setData({ 
+          activeDateStr: `${year}/${month}/${nowDay}`
+      })
+        this.createDays(year, month, nowDay) 
+
+    }
+})
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.json b/pages/component/newCalendar/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/pages/component/newCalendar/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
new file mode 100644
index 0000000..0f8b87b
--- /dev/null
+++ b/pages/component/newCalendar/index.wxml
@@ -0,0 +1,61 @@
+<!--components/xx-calendar/xx-calendar.wxml-->
+<!-- 头部 -->
+<view class="title-wrap">
+    <view class="change-date">
+        <view class="prev" bindtap="changeMonthFun" data-type="prev">
+            <image style="margin-right: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/283ac46c0fab03c04dad40f765854514.png" mode="" />
+            <text wx:if="{{currentViewType==='month'}}">上一月</text>
+            <text wx:else>上一周</text>
+        </view>
+        <view class="year-mouth">
+            {{year}}年 {{month}}月 
+        </view>
+        <view class="next" bindtap="changeMonthFun" data-type="next">
+            <text wx:if="{{currentViewType==='month'}}">下一月</text>
+            <text wx:else>下一周</text>
+            <image style="margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/ab2097432f5c34915665cb376e72c4aa.png" mode="" />
+        </view>
+    </view>
+</view>
+<!-- 日期 -->
+<view class="date-wrap">
+    <view class="week">
+        <text wx:for="{{weeksArr}}" wx:key="*this">{{item}}</text>
+    </view>
+    <!-- 上个月日期 -->
+    <view wx:if="{{currentViewType === 'month'}}" wx:for="{{lastMonthDays}}" wx:key="*this" class="mouth-date last-mouth">
+        <text class="day-text">{{item.date}}</text> 
+    </view>
+
+
+    <!-- 当月日期 -->
+    <view class="mouth-date current-mouth  " wx:for="{{currentViewType === 'month' ? nowMonthDays : weekDay}}" wx:key="*this" bindtap="selectDate"
+     data-item="{{item}}" data-type="nowMonthDays" data-index="{{index}}"
+    > 
+       <!-- <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}"> -->
+       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}">
+        <text class="day-text {{item.color?'color':''}} ">
+          <text>{{item.date}}</text>
+          <text wx:if="{{item.isHoliday}}" class="xiu" >休</text>
+        </text>
+        <!-- day 后面会换成农历展示 -->
+        <text class="day-nongli">{{item.day}}</text>
+        <text class=" {{item.color?'day-dot':'not-dot'}}"></text>
+       </view>
+    </view>
+
+
+    <!-- 下个月日期 -->
+    <view wx:if="{{currentViewType === 'month'}}" class="mouth-date next-mouth" wx:for="{{nextMonthDays}}" wx:key="*this">
+        <text class="day-text">{{item.date}}</text> 
+    </view>
+
+    <view class="footer" bindtap="toggleMode">
+        <!-- <view class="arrow {{currentViewType==='month'?'arrow-up':'arrow-down'}}">></view>
+        <view> {{currentViewType==="month"?"收起":"更多"}} </view> -->
+        <image wx:if="{{currentViewType==='week'}}" src="https://static.ticket.sz-trip.com/uploads/20240327/8b5f8a284de3831392560c367f8c59ca.png" mode=""/>
+        <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
+    </view>
+</view> 
+
+ 
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
new file mode 100644
index 0000000..c1fabb5
--- /dev/null
+++ b/pages/component/newCalendar/index.wxss
@@ -0,0 +1,168 @@
+/* components/xx-calendar/xx-calendar.wxss */
+/* 头部样式start */
+.title-wrap{
+    background-color: #F2F2F2;
+    /* padding-top: 20rpx; */
+    /* border-bottom: 1px solid #D4DBDC; */
+    /* padding-bottom: 10rpx; */
+    /* width: 697rpx; */
+    margin: 0 auto;
+    padding: 37rpx 22rpx 40rpx;
+}
+.change-date{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.change-date image{
+    width: 50rpx;
+    height: 50rpx;
+    transform: scale(1.5);
+    display: flex;
+}
+.year-mouth{
+    margin: 0 60rpx;
+    font-weight: bold;
+    font-size: 35rpx;
+    color: #000;
+}
+.week{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    margin-top: 30rpx;
+    color: #1F1F1F;
+}
+.week text{
+    flex: 1;
+    text-align: center;
+}
+/* 头部样式end */
+/* 日期区域样式start */
+.date-wrap{
+    /* height: 500rpx; */
+    width: 697rpx;
+    margin: 0 auto;
+    background-color: #fff;
+    display: flex;
+    flex-wrap: wrap;
+    border-radius: 20rpx;
+}
+.mouth-date{
+    display: flex;
+    font-size: 24rpx;
+    flex-direction: column;
+    align-items: center;
+    width: calc(100% / 7);
+    /* border-bottom: 1rpx solid rgb(229, 234, 235); */
+    padding-top: 10rpx;
+}
+.last-mouth text,.next-mouth text{
+    opacity: 0;
+}
+.mouth-date .day{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: #1F1F1F;
+
+}
+.mouth-date  .day-nongli{
+    font-size: 18rpx;
+    color: #888888;
+    margin-bottom: 6rpx;
+}
+.mouth-date .color{
+    color: #8096F0;
+}
+.mouth-date  .day-dot{
+    width: 8rpx;
+    height: 8rpx;
+    border-radius: 50%;
+    background-color: #8096F0;
+}
+.mouth-date .day-box{
+    border-radius: 27rpx;
+    width: 86rpx;
+    padding-top: 10rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-bottom: 10rpx;
+    padding-bottom: 8rpx;
+}
+.mouth-date .active{
+    background-color: #0B898E;
+}
+.mouth-date .active text{
+    color: #fff;
+}
+.mouth-date .active .day-text{
+    font-weight: 600;
+}
+.not-dot{
+    width: 8rpx;
+    height: 8rpx;
+}
+.holiday-box{
+  background-color: #ffecda;
+   border-radius: 10px;
+}
+.holiday {
+  /* background-color: #ffecda; */
+  position: relative;
+  /* color: #e1856e; */
+}
+.holiday .xiu {
+   font-size: 6px;
+   position: absolute;
+   right: 5px;
+   top: 5px;
+}
+.holiday .day-nongli {
+  /* color: #e1856e; */
+}
+
+  .footer{
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  height: 54rpx;
+  color:#adb1b3;
+  font-size:24rpx;
+}
+ .footer .arrow{
+  width:22rpx;
+  height: 34rpx;
+}
+
+.footer image {
+    width: 20rpx;
+    height: 20rpx;
+    margin: 12rpx auto 20rpx;
+}
+
+.arrow-left{
+  transform-origin:50% 50%;
+  transform: rotate(180deg)
+}
+.arrow-down{
+  transform-origin:50% 50%;
+  transform: rotate(90deg)
+}
+.arrow-up{
+  transform-origin:50% 50%;
+  transform: rotate(-90deg)
+}
+.next, .prev {
+  display: flex;
+  align-items: baseline;
+  font-size: 27rpx;
+  font-weight: 500;
+  color: #000;
+}
+.next image, .prev image {
+  width: 20rpx;
+  height: 20rpx;
+}
diff --git a/pages/component/newCalendar/xx_calendar.js b/pages/component/newCalendar/xx_calendar.js
new file mode 100644
index 0000000..3e6774f
--- /dev/null
+++ b/pages/component/newCalendar/xx_calendar.js
@@ -0,0 +1,986 @@
+const dayjs = require('dayjs')
+const ww = require('chinese-workday');
+/**
+ 
+* @1900-2100区间内的公历、农历互转
+ 
+* @charset UTF-8
+ 
+* @Author  jiangjiazhi
+ 
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+ 
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+ 
+*/
+
+
+
+/**
+ 
+* 农历1900-2100的润大小信息表
+ 
+* @Array Of Property
+ 
+* @return Hex
+ 
+*/
+
+var lunarInfo = [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+
+    0x0d520
+] // 2100
+
+
+
+var solarMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
+
+
+/**
+ 
+  * 天干地支之天干速查表
+  * @Array Of Property trans['甲','乙','丙','丁','戊','己','庚','辛','壬','癸']
+  * @return Cn string
+  */
+var Gan = ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678']
+
+
+
+/**
+ 
+  * 天干地支之地支速查表
+  * @Array Of Property
+  * @trans['子','丑','寅','卯','辰','巳','午','未','申','酉','戌','亥']
+  * @return Cn string
+  */
+var Zhi = ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5']
+
+
+
+/**
+ 
+  * 天干地支之地支速查表<=>生肖
+  * @Array Of Property
+  * @trans['鼠','牛','虎','兔','龙','蛇','马','羊','猴','鸡','狗','猪']
+  * @return Cn string
+  */
+var Animals = ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a']
+
+
+
+/**
+ 
+  * 24节气速查表
+  * @Array Of Property
+  * @trans['小寒','大寒','立春','雨水','惊蛰','春分','清明','谷雨','立夏','小满','芒种','夏至','小暑','大暑','立秋','处暑','白露','秋分','寒露','霜降','立冬','小雪','大雪','冬至']
+  * @return Cn string
+  */
+var solarTerm = ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3']
+
+
+
+/**
+ 
+  * 1900-2100各年的24节气日期速查表
+  * @Array Of Property
+  * @return 0x string For splice
+  */
+var sTermInfo = ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'
+]
+
+
+
+/**
+ 
+   * 数字转中文速查表
+  * @Array Of Property
+  * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+  * @return Cn string
+   */
+var nStr1 = ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341']
+
+
+
+/**
+ 
+  * 日期转农历称呼速查表
+  * @Array Of Property
+  * @trans ['初','十','廿','卅']
+  * @return Cn string
+  */
+var nStr2 = ['\u521d', '\u5341', '\u5eff', '\u5345']
+
+
+
+/**
+ 
+  * 月份转农历称呼速查表
+  * @Array Of Property
+  * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+  * @return Cn string
+  */
+var nStr3 = ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a']
+
+
+
+/**
+ 
+  * 返回农历y年一整年的总天数
+  * @param lunar Year
+   * @return Number
+  * @eg:var count = calendar.lYearDays(1987) ;//count=387
+  */
+function lYearDays(y) {
+    var i
+
+    var sum = 348
+
+    for (i = 0x8000; i > 0x8; i >>= 1) {
+        sum += (lunarInfo[y - 1900] & i) ? 1 : 0
+    }
+    return (sum + leapDays(y))
+
+}
+
+
+
+/**
+ 
+  * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+  * @param lunar Year
+  * @return Number (0-12)
+   * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+  */
+function leapMonth(y) { // 闰字编码 \u95f0
+
+    return (lunarInfo[y - 1900] & 0xf)
+
+}
+
+
+
+/**
+ 
+  * 返回农历y年闰月的天数 若该年没有闰月则返回0
+  * @param lunar Year
+  * @return Number (0、29、30)
+  * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+  */
+function leapDays(y) {
+    if (leapMonth(y)) {
+        return ((lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+
+    }
+
+    return (0)
+
+}
+
+
+
+/**
+ 
+  * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+  * @param lunar Year
+  * @return Number (-1、29、30)
+   * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+  */
+function monthDays(y, m) {
+    if (m > 12 || m < 1) {
+        return -1
+    } // 月份参数从1至12，参数错误返回-1
+
+    return ((lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+}
+
+
+
+/**
+ 
+  * 返回公历(!)y年m月的天数
+  * @param solar Year
+  * @return Number (-1、28、29、30、31)
+  * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+  */
+function solarDays(y, m) {
+    if (m > 12 || m < 1) {
+        return -1
+    } // 若参数错误 返回-1
+
+    var ms = m - 1
+
+    if (ms === 1) { // 2月份的闰平规律测算后确认返回28或29
+
+        return (((y % 4 === 0) && (y % 100 !== 0) || (y % 400 === 0)) ? 29 : 28)
+
+    } else {
+        return (solarMonth[ms])
+
+    }
+
+}
+
+
+
+/**
+ 
+  * 农历年份转换为干支纪年
+  * @param  lYear 农历年的年份数
+  * @return Cn string
+  */
+function toGanZhiYear(lYear) {
+    var ganKey = (lYear - 3) % 10
+
+    var zhiKey = (lYear - 3) % 12
+
+    if (ganKey === 0) ganKey = 10 // 如果余数为0则为最后一个天干
+
+    if (zhiKey === 0) zhiKey = 12 // 如果余数为0则为最后一个地支
+
+    return Gan[ganKey - 1] + Zhi[zhiKey - 1]
+
+}
+
+
+
+/**
+ 
+  * 公历月、日判断所属星座
+  * @param  cMonth [description]
+  * @param  cDay [description]
+  * @return Cn string
+  */
+function toAstro(cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' // 座
+
+}
+
+
+
+/**
+ 
+  * 传入offset偏移量返回干支
+  * @param offset 相对甲子的偏移量
+  * @return Cn string
+  */
+function toGanZhi(offset) {
+    return Gan[offset % 10] + Zhi[offset % 12]
+
+}
+
+
+
+/**
+ 
+  * 传入公历(!)y年获得该年第n个节气的公历日期
+  * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+  * @return day Number
+  * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+  */
+function getTerm(y, n) {
+    if (y < 1900 || y > 2100) {
+        return -1
+    }
+
+    if (n < 1 || n > 24) {
+        return -1
+    }
+
+    var _table = sTermInfo[y - 1900]
+
+    var _info = [
+
+        parseInt('0x' + _table.substr(0, 5)).toString(),
+
+        parseInt('0x' + _table.substr(5, 5)).toString(),
+
+        parseInt('0x' + _table.substr(10, 5)).toString(),
+
+        parseInt('0x' + _table.substr(15, 5)).toString(),
+
+        parseInt('0x' + _table.substr(20, 5)).toString(),
+
+        parseInt('0x' + _table.substr(25, 5)).toString()
+
+    ]
+
+    var _calday = [
+
+        _info[0].substr(0, 1),
+
+        _info[0].substr(1, 2),
+
+        _info[0].substr(3, 1),
+
+        _info[0].substr(4, 2),
+
+
+
+        _info[1].substr(0, 1),
+
+        _info[1].substr(1, 2),
+
+        _info[1].substr(3, 1),
+
+        _info[1].substr(4, 2),
+
+
+
+        _info[2].substr(0, 1),
+
+        _info[2].substr(1, 2),
+
+        _info[2].substr(3, 1),
+
+        _info[2].substr(4, 2),
+
+
+
+        _info[3].substr(0, 1),
+
+        _info[3].substr(1, 2),
+
+        _info[3].substr(3, 1),
+
+        _info[3].substr(4, 2),
+
+
+
+        _info[4].substr(0, 1),
+
+        _info[4].substr(1, 2),
+
+        _info[4].substr(3, 1),
+
+        _info[4].substr(4, 2),
+
+
+
+        _info[5].substr(0, 1),
+
+        _info[5].substr(1, 2),
+
+        _info[5].substr(3, 1),
+
+        _info[5].substr(4, 2)
+
+    ]
+
+    return parseInt(_calday[n - 1])
+
+}
+
+
+
+/**
+ 
+  * 传入农历数字月份返回汉语通俗表示法
+  * @param lunar month
+  * @return Cn string
+  * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+  */
+function toChinaMonth(m) { // 月 => \u6708
+
+    if (m > 12 || m < 1) {
+        return -1
+    } // 若参数错误 返回-1
+
+    var s = nStr3[m - 1]
+
+    s += '\u6708' // 加上月字
+
+    return s
+
+}
+
+
+
+/**
+ 
+  * 传入农历日期数字返回汉字表示法
+  * @param lunar day
+  * @return Cn string
+  * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+  */
+function toChinaDay(d) { // 日 => \u65e5
+
+    var s
+
+    switch (d) {
+        case 10:
+
+            s = '\u521d\u5341'
+
+            break
+
+        case 20:
+
+            s = '\u4e8c\u5341'
+
+            break
+
+        case 30:
+
+            s = '\u4e09\u5341'
+
+            break
+
+        default:
+
+            s = nStr2[Math.floor(d / 10)]
+
+            s += nStr1[d % 10]
+
+    }
+
+    return (s)
+
+}
+
+
+
+/**
+ 
+  * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+  * @param y year
+  * @return Cn string
+  * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+  */
+function getAnimal(y) {
+    return Animals[(y - 4) % 12]
+
+}
+
+
+
+/**
+ 
+  * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+  * @param y  solar year
+  * @param m  solar month
+  * @param d  solar day
+  * @return JSON object
+  * @eg:console.log(calendar.solar2lunar(1987,11,01));
+  */
+function solar2lunar(y, m, d) { // 参数区间1900.1.31~2100.12.31
+
+    // 年份限定、上限
+
+    if (y < 1900 || y > 2100) {
+        return -1 // undefined转换为数字变为NaN
+
+    }
+
+    // 公历传参最下限
+
+    if (y === 1900 && m === 1 && d < 31) {
+        return -1
+
+    }
+
+    // 未传参  获得当天
+
+    var objDate = null
+
+    if (!y) {
+        objDate = new Date()
+
+    } else {
+        objDate = new Date(y, parseInt(m) - 1, d)
+
+    }
+
+    var i
+
+    var leap = 0
+
+    var temp = 0
+
+    // 修正ymd参数
+
+    y = objDate.getFullYear()
+
+    m = objDate.getMonth() + 1
+
+    d = objDate.getDate()
+
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+        temp = lYearDays(i)
+
+        offset -= temp
+
+    }
+
+    if (offset < 0) {
+        offset += temp;
+        i--
+
+    }
+
+
+
+    // 是否今天
+
+    var isTodayObj = new Date()
+
+    var isToday = false
+
+    if (isTodayObj.getFullYear() === y && isTodayObj.getMonth() + 1 === m && isTodayObj.getDate() === d) {
+        isToday = true
+
+    }
+
+    // 星期几
+
+    var nWeek = objDate.getDay()
+
+    var cWeek = nStr1[nWeek]
+
+    // 数字表示周几顺应天朝周一开始的惯例
+
+    if (nWeek === 0) {
+        nWeek = 7
+
+    }
+
+    // 农历年
+
+    var year = i
+
+    leap = leapMonth(i) // 闰哪个月
+
+    var isLeap = false
+
+
+
+    // 效验闰月
+
+    for (i = 1; i < 13 && offset > 0; i++) {
+        // 闰月
+
+        if (leap > 0 && i === (leap + 1) && isLeap === false) {
+            --i
+
+            isLeap = true;
+            temp = leapDays(year) // 计算农历闰月天数
+
+        } else {
+            temp = monthDays(year, i) // 计算农历普通月天数
+
+        }
+
+        // 解除闰月
+
+        if (isLeap === true && i === (leap + 1)) {
+            isLeap = false
+        }
+
+        offset -= temp
+
+    }
+
+    // 闰月导致数组下标重叠取反
+
+    if (offset === 0 && leap > 0 && i === leap + 1) {
+        if (isLeap) {
+            isLeap = false
+
+        } else {
+            isLeap = true;
+            --i
+
+        }
+
+    }
+
+    if (offset < 0) {
+        offset += temp;
+        --i
+
+    }
+
+    // 农历月
+
+    var month = i
+
+    // 农历日
+
+    var day = offset + 1
+
+    // 天干地支处理
+
+    var sm = m - 1
+
+    var gzY = toGanZhiYear(year)
+
+
+
+    // 当月的两个节气
+
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+
+    var firstNode = getTerm(y, (m * 2 - 1)) // 返回当月「节」为几日开始
+
+    var secondNode = getTerm(y, (m * 2)) // 返回当月「节」为几日开始
+
+
+
+    // 依据12节气修正干支月
+
+    var gzM = toGanZhi((y - 1900) * 12 + m + 11)
+
+    if (d >= firstNode) {
+        gzM = toGanZhi((y - 1900) * 12 + m + 12)
+
+    }
+
+    // 传入的日期的节气与否
+
+    var isTerm = false
+
+    var Term = null
+
+    if (firstNode === d) {
+        isTerm = true
+
+        Term = solarTerm[m * 2 - 2]
+
+    }
+
+    if (secondNode === d) {
+        isTerm = true
+
+        Term = solarTerm[m * 2 - 1]
+
+    }
+
+    // 日柱 当月一日与 1900/1/1 相差天数
+
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+
+    var gzD = toGanZhi(dayCyclical + d - 1)
+
+    // 该日期所属的星座
+
+    var astro = toAstro(m, d)
+
+    return {
+        'lYear': year,
+        'lMonth': month,
+        'lDay': day,
+        'Animal': getAnimal(year),
+        'IMonthCn': (isLeap ? '\u95f0' : '') + toChinaMonth(month),
+        'IDayCn': toChinaDay(day),
+        'cYear': y,
+        'cMonth': m,
+        'cDay': d,
+        'gzYear': gzY,
+        'gzMonth': gzM,
+        'gzDay': gzD,
+        'isToday': isToday,
+        'isLeap': isLeap,
+        'nWeek': nWeek,
+        'ncWeek': '\u661f\u671f' + cWeek,
+        'isTerm': isTerm,
+        'Term': Term,
+        'astro': astro
+    }
+
+}
+
+
+
+
+var calendarFormatter = {
+    // 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+
+    solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+
+        return solar2lunar(y, m, d)
+
+    },
+
+    isHoliday: function(day) {    
+      const isHoliday = ww.isHoliday;  //是否是休息日   
+      return isHoliday(day) 
+    },
+
+    getFestival: function(day) {     
+      const getFestival = ww.getFestival;  // 获取今天是什么节日
+      let festival  = getFestival(day) 
+      return festival
+    },
+
+    /**
+ 
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+    lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+
+        isLeapMonth = !!isLeapMonth
+
+        if (isLeapMonth && (leapMonth !== m)) {
+            return -1
+        } // 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+
+        if (y === 2100 && m === 12 && d > 1 || y === 1900 && m === 1 && d < 31) {
+            return -1
+        } // 超出了最大极限值
+
+        var day = monthDays(y, m)
+
+        var _day = day
+
+        // bugFix 2016-9-25
+
+        // if month is leap, _day use leapDays method
+
+        if (isLeapMonth) {
+            _day = leapDays(y, m)
+
+        }
+
+        if (y < 1900 || y > 2100 || d > _day) {
+            return -1
+        } // 参数合法性效验
+
+
+
+        // 计算农历的时间差
+
+        var offset = 0
+
+        for (var i = 1900; i < y; i++) {
+            offset += lYearDays(i)
+
+        }
+
+        var leap = 0
+
+        var isAdd = false
+
+        for (i = 1; i < m; i++) {
+            leap = leapMonth(y)
+
+            if (!isAdd) { // 处理闰月
+
+                if (leap <= i && leap > 0) {
+                    offset += leapDays(y);
+                    isAdd = true
+
+                }
+
+            }
+
+            offset += monthDays(y, i)
+
+        }
+
+        // 转换闰月农历 需补充该年闰月的前一个月的时差
+
+        if (isLeapMonth) {
+            offset += day
+        }
+
+        // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+
+        var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+
+        var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+
+        var cY = calObj.getUTCFullYear()
+
+        var cM = calObj.getUTCMonth() + 1
+
+        var cD = calObj.getUTCDate()
+
+        return solar2lunar(cY, cM, cD)
+
+    }
+
+}
+
+export default calendarFormatter
\ No newline at end of file
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 0fe9198..e70edcf 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -28,8 +28,9 @@ Page({
     keywords: "",
     realKeywords: "",
     movieAreas:[],
-    movieArea:0
-
+    movieArea:0,
+    defaultDate: "2020-3-31",
+    startDay: "sunday"
   },
 
   /**
diff --git a/pages/list/activitynew/index.json b/pages/list/activitynew/index.json
index 721f32c..1825d8d 100644
--- a/pages/list/activitynew/index.json
+++ b/pages/list/activitynew/index.json
@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "title-header": "/pages/component/TitleHeader",
-    "common-image":"/pages/component/commonImage/index"
+    "common-image":"/pages/component/commonImage/index",
+    "new-calendar":"/pages/component/newCalendar"
   }
 }
\ No newline at end of file
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index 1de8b0c..be9df22 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -26,20 +26,22 @@ Page({
     let item = e.currentTarget.dataset.item;
     console.log(item);
     if (item.id==5461) {
-        wx.navigateToMiniProgram({
-            appId: 'wxfef80ee1ab7e58a2',
-            path: 'pages/inners/main'
-          })
+        // wx.navigateToMiniProgram({
+        //     appId: 'wxfef80ee1ab7e58a2',
+        //     path: 'pages/inners/main'
+        //   })
           return;
     }
 
     util.gotoDetail(item,1);
   },
   gotoDetailOther: function(e) {
-    wx.navigateToMiniProgram({
-      appId: 'wxfef80ee1ab7e58a2',
-      path: 'pages/index/index'
-    })
+    // 全都到其他小程序预约--新跳转地址
+    // wx.navigateToMiniProgram({
+    //   appId: 'wxfef80ee1ab7e58a2',
+    //   path: 'pages/index/index'
+    // })
+    //西馆单独预约
   //   if (e.currentTarget.dataset.id==44703) {
   //     wx.navigateToMiniProgram({
   //         appId: 'wxfef80ee1ab7e58a2',
@@ -47,9 +49,10 @@ Page({
   //       })
   //       return;
   // }
-  //   wx.navigateTo({
-  //     url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
-  //   })
+  //本平台预约
+    wx.navigateTo({
+      url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+    })
   },
   search:function(e){
     this.setData(e.detail);
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 9ce66e8..c52327f 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -14,7 +14,7 @@
     </view>
     <view class="info textOver" wx:else style="height:320rpx;">
       <view class="title textOver">{{item.title}}</view>
-      <view class="com-flex border" catchtap="gotoDetailOther">
+      <view class="com-flex border" catchtap="gotoDetailOther" data-id='5461'>
         <text>博物馆本馆</text>
         <view class="btn-yy">预约</view>
       </view>
diff --git a/project.config.json b/project.config.json
index 97cb0a5..fab7ecc 100644
--- a/project.config.json
+++ b/project.config.json
@@ -16,6 +16,12 @@
     "nodeModules": false,
     "autoAudits": false,
     "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [
+      {
+        "packageJsonPath": "./package.json",
+        "miniprogramNpmDistDir": "./miniprogram/"
+      }
+    ],
     "scopeDataCheck": false,
     "uglifyFileName": false,
     "checkInvalidKey": true,
@@ -37,7 +43,6 @@
     "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
-    "packNpmRelationList": [],
     "minifyWXSS": true,
     "lazyloadPlaceholderEnable": false,
     "useStaticServer": true,

From ad6420f3adec04b612de6baa609677e379725f84 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Apr 2024 09:04:57 +0800
Subject: [PATCH 136/471] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |  2 +-
 pages/index/index.js   | 47 ++++++++++++++++++++++++++++++------------
 pages/index/index.wxml | 19 ++++++++++++++---
 pages/index/index.wxss | 46 +++++++++++++++++++++++++++++++++++++----
 4 files changed, 93 insertions(+), 21 deletions(-)

diff --git a/app.js b/app.js
index 5e58be0..eab8757 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.isTest107? true : false;
+      data.isTest = data.isTest108? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index c6f3103..c1c7e0d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -34,11 +34,12 @@ Page({
     activeBannerIndex: 0,
     smBannerIndex: 0,
     indexSeason: {},
-    startList: [], // 启动页广告
+    // startList: [], // 启动页广告
+    startList: {head_img:''}, // 启动页广告
     alertSwipeList: [], //弹窗广告
     showAdv: false, //弹窗开关
     showFullAdv: true, //全屏广告开关
-    time: 5, //全屏广告剩余时间
+    time: 3, //全屏广告剩余时间
     showTime:false,
     xpth:{}, // 元旦新增 新品特惠和sqjNew
     djs:null, // 元旦新增 新品特惠倒计时
@@ -54,9 +55,11 @@ Page({
       'https://static.ticket.sz-trip.com/uploads/20240228/c7de980e14c66a39215e7bf5f66ba218.png',
       'https://static.ticket.sz-trip.com/uploads/20240228/24010b7a7a88b91c0ea75cf3f073702e.png',
       'https://static.ticket.sz-trip.com/uploads/20240228/59e199b98bfb9fbe4fd996503d5f5698.png',
-    ]
+    ],
+    // viewHeight:"0px",
   },
   onLoad: function (options) {
+    // this.getHeight()
     //全屏广告
     wx.hideTabBar() //这里隐藏了底部导航栏
     commonApi._post("adv/getAdv", {
@@ -72,20 +75,26 @@ Page({
             time: this.data.time - 1
           })
           if (this.data.time == 0) {
-            timer = null
+            clearInterval(timer)
+            wx.showTabBar() //倒计时结束清除定时器显示导航栏
             this.setData({
               showFullAdv: false
             })
-            if (this.data.alertSwipeList.length==0) {
-              wx.showTabBar() //倒计时结束清楚定时器显示导航栏
-            }
-           
           }
-
         }, 1000)
-        this.setData({
-          startList: res.data || []
-        })
+        let length = res.data.length
+        if (res.data.length > 1) {
+          let num = Math.round(Math.random()*length);
+          console.log('num',num);
+          this.setData({
+            startList:res.data[num]
+          })
+          console.log(this.data.startList.head_img);
+        } else {
+          this.setData({
+            startList:res.data[0]
+          })
+        }
       }else{
         this.setData({
           showFullAdv: false
@@ -137,6 +146,18 @@ Page({
     this.getVideoPrize()
     this.getXpthList()
   },
+  // getHeight() {
+  //   let that = this
+  //   wx.getSystemInfo({
+  //     success(res) {
+  //       console.log(res)
+  //       that.setData({
+  //         viewHeight:res.windowHeight+'px'
+  //       })
+  //       console.log(that.data.viewHeight)
+  //     }
+  //   })
+  // },
   getXpthList:function () {
     // 元旦新增 新品特惠
     commonApi._post("product/get_product_indulgence", {
@@ -863,7 +884,7 @@ Page({
     this.pagePoint({
       event: 'home_view'
     }, 1)
-    this.data.time!=5?wx.showTabBar():1
+    // this.data.time!=5?wx.showTabBar():1
   },
 
   /**
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 817be63..9de722f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -632,12 +632,25 @@
 </view>
 <!-- 广告弹窗结束 -->
 <view class="fullavd" wx:if="{{showFullAdv}}">
-<view class="time" bindtap="closeFullAdv" wx:if="{{showTime}}">跳过 {{time}}</view>
-  <swiper class="fullsp"  autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+  <view class="time" bindtap="closeFullAdv" wx:if="{{showTime}}">{{time}}s跳过</view>
+    <!-- <view class="Qtop" style="height:{{viewHeight}}"> -->
+    <view class="Qtop" style="min-height:100vh">
+      <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
+  <!-- <swiper class="fullsp"  autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
     <block wx:for="{{startList}}" wx:key="*this">
     <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
       <image src="{{item.head_img}}" style="width: 100%;height: 100%;" mode="widthFix"></image>
     </swiper-item>
     </block>
-  </swiper>
+  </swiper> -->
 </view>
+<!-- <view class="topBox">
+    <view class="Qtop" :style="{height:height}">
+      <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+    </view>
+    <view class="jumpBox">
+      <view class="time">{{time}}s</view>
+      <view bind:tap="gotoIndex">跳过</view>
+    </view>
+</view> -->
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c058797..e8175c6 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -790,11 +790,11 @@ page {
 .time{
   width: 150rpx;
   height: 60rpx;
-  background-color: #999999;
-  color: #fff;
+  background-color: #fff;
+  color: #000;
   position: absolute;
-  right: 20rpx;
-  top: 200rpx;
+  left: 20rpx;
+  top: 120rpx;
   border-radius:6rpx ;
   text-align: center;
   line-height: 60rpx;
@@ -1034,4 +1034,42 @@ page {
   right: -22rpx;
   z-index: 2;
   /* top: -20rpx; */
+}
+
+.Qtop{
+  width: 100%;
+}
+.Qtop img{
+  width: 100%;
+}
+.miao{
+  position: fixed;
+  top: 100rpx;
+  background: antiquewhite;
+  margin: 18rpx;
+  width: 129rpx;
+  height: 63rpx;
+  background: rgba(17, 17, 17, 0.1);
+  text-align: center;
+  border-radius: 13rpx;
+  line-height: 63rpx;
+}
+.topBox {
+    /* display: flex;
+    padding-top: 120rpx;
+    padding-left: 20rpx; */
+}
+.jumpBox {
+    color: #000;
+    background: rgba(255,255,255, 0.911);
+    display: flex;
+    align-items: center;
+    border-radius: 10rpx;
+    padding: 10rpx 20rpx;
+    position: fixed;
+    top: 150rpx;
+    left: 20rpx;
+}
+.time{
+  padding-right: 10rpx;
 }
\ No newline at end of file

From 75f457a97c2fd1d14a0f76c19db8bc1844090dcd Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Apr 2024 10:11:17 +0800
Subject: [PATCH 137/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index c1c7e0d..307d89f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -84,7 +84,7 @@ Page({
         }, 1000)
         let length = res.data.length
         if (res.data.length > 1) {
-          let num = Math.round(Math.random()*length);
+          let num = Math.round(Math.random()*length)-1;
           console.log('num',num);
           this.setData({
             startList:res.data[num]

From 50d2e32e9819d598e511dcc20e061a4f28129001 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Apr 2024 10:19:20 +0800
Subject: [PATCH 138/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index eab8757..3d3d370 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.isTest108? true : false;
+      data.isTest = data.isTest109? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From f159e97a15a5c29475a936a03c581663e32bb84b Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Apr 2024 10:37:41 +0800
Subject: [PATCH 139/471] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 307d89f..03a741e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -56,10 +56,10 @@ Page({
       'https://static.ticket.sz-trip.com/uploads/20240228/24010b7a7a88b91c0ea75cf3f073702e.png',
       'https://static.ticket.sz-trip.com/uploads/20240228/59e199b98bfb9fbe4fd996503d5f5698.png',
     ],
-    // viewHeight:"0px",
+    viewHeight:"0px",
   },
   onLoad: function (options) {
-    // this.getHeight()
+    this.getHeight()
     //全屏广告
     wx.hideTabBar() //这里隐藏了底部导航栏
     commonApi._post("adv/getAdv", {
@@ -84,7 +84,7 @@ Page({
         }, 1000)
         let length = res.data.length
         if (res.data.length > 1) {
-          let num = Math.round(Math.random()*length)-1;
+          let num = Math.floor(Math.random()*length);
           console.log('num',num);
           this.setData({
             startList:res.data[num]
@@ -146,18 +146,18 @@ Page({
     this.getVideoPrize()
     this.getXpthList()
   },
-  // getHeight() {
-  //   let that = this
-  //   wx.getSystemInfo({
-  //     success(res) {
-  //       console.log(res)
-  //       that.setData({
-  //         viewHeight:res.windowHeight+'px'
-  //       })
-  //       console.log(that.data.viewHeight)
-  //     }
-  //   })
-  // },
+  getHeight() {
+    let that = this
+    wx.getSystemInfo({
+      success(res) {
+        console.log(res)
+        that.setData({
+          viewHeight:res.windowHeight+'px'
+        })
+        console.log(that.data.viewHeight)
+      }
+    })
+  },
   getXpthList:function () {
     // 元旦新增 新品特惠
     commonApi._post("product/get_product_indulgence", {

From 98515ab8fffcf7d3d6ba01063856c1374383e6ef Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 17 Apr 2024 14:38:17 +0800
Subject: [PATCH 140/471] =?UTF-8?q?2024=E4=B9=A6=E5=88=B8=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   | 2 +-
 pages/order/pay/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 3d3d370..e0fd14a 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.isTest109? true : false;
+      data.isTest = data.isTest110? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 461a0ae..c1e6dd1 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -84,7 +84,7 @@ Page({
       order_id:this.data.id
     }).then(res=>{
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013){
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265){
 		  this.setData({
 		    isBook:true
 		  })

From 3875ea632e588e615bd54c2003aa78dd0d4a19f0 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 18 Apr 2024 10:10:25 +0800
Subject: [PATCH 141/471] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E5=AE=9E=E5=90=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     |  2 +-
 pages/order/scene/index.js | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index e0fd14a..845ff83 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.isTest110? true : false;
+      data.isTest = data.isTest111? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6990497..366ba51 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -32,6 +32,7 @@ Page({
     isCar:'single',
     showMask: false,
     price:0,
+    is_need_idcard:1,
   },
 
   /**
@@ -48,9 +49,10 @@ Page({
       flag:options.flag,
       date:null,
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
-			isCar:options.isCar
+      isCar:options.isCar,
+      is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard
     })
-    console.log('-------',app.globalData.product);
+    console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
 
     if (!app.globalData.product) {
       util.back();
@@ -370,12 +372,14 @@ Page({
 	  console.log(this.data)
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
-    if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-      wx.showToast({
-        title: '请添加出行人',
-        icon: "none"
-      })
-      return;
+    if (this.data.is_need_idcard == 1) {
+      if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+        wx.showToast({
+          title: '请添加出行人',
+          icon: "none"
+        })
+        return;
+      }
     }
     if (!date && this.data.ticket_type == 1) {
       wx.showToast({

From 4c50efb6dd65f24697e8a0feeddef91fb6bc866d Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 24 Apr 2024 16:51:23 +0800
Subject: [PATCH 142/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E6=97=85=E9=89=B4=E8=B5=8F=EF=BC=8C=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=EF=BC=8C=E4=BA=BA=E5=B7=A5=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E6=8F=90=E7=A4=BA=EF=BC=8C=E7=B2=BE=E5=BD=A9=E5=9B=9E?=
 =?UTF-8?q?=E9=A1=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |   2 +-
 pages/component/newCalendar/index.js   | 164 ++++++++++++++++++++-----
 pages/component/newCalendar/index.wxml |  17 +--
 pages/component/newCalendar/index.wxss |  19 ++-
 pages/index/index.wxml                 | 146 +++++++++++-----------
 pages/list/activitynew/index.js        |  11 ++
 pages/list/activitynew/index.wxml      |  45 ++++---
 pages/list/activitynew/index.wxss      |  66 ++++++++--
 pages/pbService/activity/index.js      |  19 ++-
 pages/pbService/activity/index.wxml    |   3 +
 pages/pbService/activity/index.wxss    |   2 +-
 pages/pbService/index.wxml             |  26 ++--
 pages/user/service/list/index.wxml     |   3 +-
 pages/user/user.wxml                   |   3 +-
 14 files changed, 361 insertions(+), 165 deletions(-)

diff --git a/app.js b/app.js
index 845ff83..3c1f567 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.isTest111? true : false;
+      data.isTest = data.isTest112? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js
index 7473118..5bc7fe1 100644
--- a/pages/component/newCalendar/index.js
+++ b/pages/component/newCalendar/index.js
@@ -1,5 +1,6 @@
 // components/xx-calendar/xx-calendar.js
 import calendarFormatter from "./xx_calendar";
+import commonApi from "../../../utils/https/common"
 Component({
     /**
      * 组件的属性列表
@@ -26,7 +27,10 @@ Component({
         nextMonthDays: [], //下一个月 
         weekDay:[], //周 日期list
         activeDateStr:'',  // 当前日期,
-        currentViewType: 'week'   //当前选中的是周还是月
+        currentViewType: 'week',   //当前选中的是周还是月
+        holidayList:[], //节假日
+        holidayList2:['2024/01/01','2024/02/10','2024/04/04', '2024/05/01', '2024/06/10','2024/09/17','2024/10/01'], // 节假日()
+        // lisClickNext: true, // 是否可以点下一周
     },
 
     /**
@@ -40,7 +44,6 @@ Component({
         /** 总方法 */
         //创建日期
         createDays(year, month) {
-
           if(  this.data.currentViewType === "month" ) {
             this.getLastMonthDays(year, month)
             this.getNowMonthDays(year, month)
@@ -53,6 +56,9 @@ Component({
 
          /** 视图收起/展开 */
     toggleMode() {
+      if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2025)) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2023))) {
+        return
+      }
       this.setData({
         currentViewType: this.data.currentViewType === "month" ? "week" : "month",
       })
@@ -124,18 +130,22 @@ Component({
                 } 
                  // 当前月数据
                 let festival = calendarFormatter.getFestival(timer) // 返回当前节假日名称, 不是节日返回 '工作日'
+                let realDate = new Date() 
+                let realMonth = realDate.getMonth() + 1
+                 let _time = `${years}/${+months < 10 ? '0'+months : months}/${+day2 < 10 ? '0'+day2 :day2}`
+                 console.log(this.data.holidayList2.includes(_time))
                 nowMonthDays.push({
                     date: i, //几号
                     week: this.data.weeksArr[new Date(year, month - 1, i).getDay()], //星期几
                     time,
+                    _time,
                     color: false,
-                    day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 ? newdate : festival,
+                    day: newdate,
                     // day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 || [如果有不想展示的日期,放这里].includes(timer) ? newdate : festival,
-
-                    isNowMonthDay: (month == nowMonth && i == nowDay) ? "isNowMonthDay" : "",
-                    isHoliday: calendarFormatter.isHoliday(timer), // 判断是否是休息日 是的话返回true, 不是的话返回false
-                    
-                });
+                    isNowMonthDay: (month == realMonth && i == nowDay) ? "isNowMonthDay" : "",
+                    isHoliday: this.data.holidayList.find(s => s.date == _time ), // 判断是否是休息日 是的话返回true, 不是的话返回false
+                    holidayList2: this.data.holidayList2.includes(_time)
+                }); 
             }
             this.data.use_date_arr.forEach(ele => {
                 ele = ele.replace(/\-/g, "/")
@@ -192,6 +202,9 @@ Component({
                 year = (parseInt(month) + 1) > 12 ? year + 1 : year
                 month = (parseInt(month) + 1) > 12 ? 1 : parseInt(month) + 1
             }
+            if (year != this.data.year) {
+              return
+            }
             this.setData({
                 year,
                 month,
@@ -200,23 +213,106 @@ Component({
             })
             this.createDays(year, month)
           } else {
-            let type = e.currentTarget.dataset.type //类型  
-            let newActiveDateStr =   this.getActiveDateStrByWeek(this.data.activeDateStr, type)
+            let {
+              year,
+              month,
+              nowDay
+            } = this.data
+            let type = e.currentTarget.dataset.type //类型
+            if ((type == 'next' && this.data.weekDay[0].year === 2025) || (type == 'prev' && this.data.weekDay[0].year === 2023)) {
+                return
+            }  
+            // if (type == 'next' && this.data.weekDay[0].year === 2025) {
+            //     // debugger
+            //     return
+            // }  
+            // let newActiveDateStr =   this.getActiveDateStrByWeek(this.data.activeDateStr, type)
+            let newActiveDateStr =   this.getActiveDateStrByWeek(this.data.weekDay[6].dateStr, type)
+            // debugger
             this.getWeekData(newActiveDateStr)
-            this.setData({
-              activeDateStr: newActiveDateStr, 
-            })
+            console.log(this.data.weekDay);
+            // this.data.lisClickNext = this.data.weekDay.every(s => s.year == 2024)
           }
             
         },
- 
+
+        // 获取节假日
+        getHoliday(){
+          commonApi._post("pbservice/Actcalendar/getHoliday",{year:this.data.year}).then(res => {
+            // console.log(res);
+            this.setData({
+              holidayList: res.data
+            })
+             this.data.holidayList = this.data.holidayList.map(item=> {
+              if (item.name == '清明节') {
+                return {
+                  ...item,
+                  color:'#009EA3',
+                  background:'#DAF0EE'
+                }
+              }else if (item.name == '劳动节') {
+                return {
+                    ...item,
+                    color:'#DE4126',
+                    background:'#FFECDB'
+                  }
+              }else if (item.name == '春节') {
+                return {
+                    ...item,
+                    color:'#D10000',
+                    background:'#FAE3E3'
+                  }
+              }else if (item.name == '元旦') {
+                return {
+                    ...item,
+                    color:'#EB3300',
+                    background:'#FFDED9'
+                  }
+              }else if (item.name == '端午节') {
+                return {
+                    ...item,
+                    color:'#0B8E3F',
+                    background:'#CEEDDB'
+                  }
+              }else if (item.name == '国庆节') {
+                return {
+                    ...item,
+                    color:'#D41E1E',
+                    background:'#FFE8E8'
+                  }
+              }else if (item.name == '中秋节') {
+                return {
+                    ...item,
+                    color:'#FF8E24',
+                    background:'#FFF3DB'
+                  }
+              } else {
+                return {
+                    ...item,
+                    color:'#fff',
+                    background:'#fff'
+                  }
+              }
+            })
+            console.log('------------------------------',this.data.holidayList);
+            let {
+              year,
+              month,
+              nowDay
+          } = this.data 
+          this.setData({ 
+            activeDateStr: `${year}/${month}/${nowDay}`
+        })
+          this.createDays(year, month, nowDay) 
+          })
+        },
    /** 获取周视图数据 */
     getWeekData(defaultDate) {  
       /** 是否是从周一开始 */
       const isStartFromMonday = this.properties.startDay === "monday"
       if (!defaultDate) {
         defaultDate = this.data.activeDateStr 
-      } 
+      }  
       const YEAR = new Date(defaultDate).getFullYear()
       const MONTH = new Date(defaultDate).getMonth() + 1
       const DATE = new Date(defaultDate).getDate()
@@ -231,7 +327,7 @@ Component({
       let lastDay = new Date(YEAR, MONTH, 0)
       /** 当月最后一天是几号 */
       let lastDate = lastDay.getDate()
-
+// debugger
       var ret = []
       /** 前面有几天 */
       let preCount = isStartFromMonday ? WEEK - 1 : WEEK
@@ -272,19 +368,26 @@ Component({
           month,
           nowDay
         } = this.data
+         let realMonth =new Date().getMonth() + 1
         // 当前周数据
         let festival = calendarFormatter.getFestival(`${showYear}-${showMonth}-${showDate}`) // 返回当前节假日名称, 不是节日返回 '工作日'
+      //  debugger
         ret.push({
           year: showYear,
           month: showMonth,
           date: showDate,
           calDate: date,
-          day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 ? newdate : festival,
+          day: newdate,
           dateStr: `${showYear}/${showMonth}/${showDate}`,
-          isNowMonthDay: (month == showMonth && nowDay == showDate) ? "isNowMonthDay" : "",
-          isHoliday: calendarFormatter.isHoliday(`${showYear}-${showMonth}-${showDate}`), // 判断是否是休息日 是的话返回true, 不是的话返回false
+          isNowMonthDay: ( realMonth  == showMonth && nowDay == showDate) ? "isNowMonthDay" : "",
+          isHoliday: this.data.holidayList.find(s => s.date === `${showYear}/${+showMonth < 10 ? '0'+showMonth : showMonth}/${+showDate < 10 ? '0'+showDate :showDate}` ),
+          holidayList2: this.data.holidayList2.includes(`${showYear}/${+showMonth < 10 ? '0'+showMonth : showMonth}/${+showDate < 10 ? '0'+showDate :showDate}` )
+          // `${showYear}/${showMonth}/${showDate}`
+          // isHoliday: calendarFormatter.isHoliday(`${showYear}-${showMonth}-${showDate}`), // 判断是否是休息日 是的话返回true, 不是的话返回false
         })
-      }  
+      }
+      console.log(ret);
+      // debugger
       this.setData({
         weekDay: ret,
         year: YEAR,
@@ -335,8 +438,13 @@ Component({
         selectDate(e){
             let type = e.currentTarget.dataset.type //选择的时间类型
             let index = e.currentTarget.dataset.index //选择的下标
-            // let date = e.currentTarget.dataset.item.time //选择的下标
-            let date = e.currentTarget.dataset.item.dateStr //选择的下标
+            let date
+            if (this.data.currentViewType == 'week') {
+              date = e.currentTarget.dataset.item.dateStr //选择的下标
+              type = 'weekDay'
+            } else {
+              date = e.currentTarget.dataset.item.time //选择的下标
+            }
             let selectDate = date.replace(/\//g, "-")
             console.log("选择的时间", selectDate)
             // 自定义事件，父组件调用，回调 选择的时间selectDate
@@ -345,6 +453,7 @@ Component({
              this.data[type]?.forEach(item => {
                 item.isNowMonthDay = ''
             }) 
+            console.log(index,this.data,[type]);
             this.data[type]?.forEach((item, idx) => {
                 if (index == idx) {
                     item.isNowMonthDay = (item.time == new Date().toLocaleDateString() ? "isNowMonthDay" : "isNotNowMonthDay"); //判断当前选中的日期是否是当前时间
@@ -364,15 +473,8 @@ Component({
         },
     },
     ready() {
-        let {
-            year,
-            month,
-            nowDay
-        } = this.data 
-        this.setData({ 
-          activeDateStr: `${year}/${month}/${nowDay}`
-      })
-        this.createDays(year, month, nowDay) 
+      this.getHoliday()
+
 
     }
 })
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 0f8b87b..4ee36f8 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -10,9 +10,9 @@
         <view class="year-mouth">
             {{year}}年 {{month}}月 
         </view>
-        <view class="next" bindtap="changeMonthFun" data-type="next">
+        <view class="next" bindtap="changeMonthFun" data-type="next" >
             <text wx:if="{{currentViewType==='month'}}">下一月</text>
-            <text wx:else>下一周</text>
+            <text wx:else>下一周 </text>
             <image style="margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/ab2097432f5c34915665cb376e72c4aa.png" mode="" />
         </view>
     </view>
@@ -32,14 +32,15 @@
     <view class="mouth-date current-mouth  " wx:for="{{currentViewType === 'month' ? nowMonthDays : weekDay}}" wx:key="*this" bindtap="selectDate"
      data-item="{{item}}" data-type="nowMonthDays" data-index="{{index}}"
     > 
-       <!-- <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}"> -->
-       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}">
-        <text class="day-text {{item.color?'color':''}} ">
-          <text>{{item.date}}</text>
+       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}{{item.isHoliday&&item.isNowMonthDay ? 'active' : ''}}" style="background: {{ item.isHoliday.background }};color: {{ item.isHoliday.color }}">
+        <text class="day-text">
+        <!-- <text class="day-text {{item.isHoliday?'color':''}} "> -->
+          <text>{{item.date}}</text> 
           <text wx:if="{{item.isHoliday}}" class="xiu" >休</text>
         </text>
-        <!-- day 后面会换成农历展示 -->
-        <text class="day-nongli">{{item.day}}</text>
+        <!-- day 后面会换成农历展示 -->  
+        <text class="day-nongli"  wx:if="{{item.isHoliday && item.holidayList2}}" style="color: {{ item.isHoliday.color }}">{{ item.isHoliday.name}} </text> 
+        <text class="day-nongli"  wx:else="" style="color:  {{ item.isHoliday ? item.isHoliday.color : '#888888' }}">{{ item.day}}</text> 
         <text class=" {{item.color?'day-dot':'not-dot'}}"></text>
        </view>
     </view>
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index c1fabb5..4c61809 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -70,7 +70,7 @@
 }
 .mouth-date  .day-nongli{
     font-size: 18rpx;
-    color: #888888;
+    /* color: #888888; */
     margin-bottom: 6rpx;
 }
 .mouth-date .color{
@@ -93,11 +93,15 @@
     padding-bottom: 8rpx;
 }
 .mouth-date .active{
-    background-color: #0B898E;
+    background-color: #0B898E !important;
 }
+
+
 .mouth-date .active text{
-    color: #fff;
+    color: #fff !important;
 }
+
+
 .mouth-date .active .day-text{
     font-weight: 600;
 }
@@ -114,6 +118,15 @@
   position: relative;
   /* color: #e1856e; */
 }
+.holidayactive {
+  position: relative;
+}
+.day-text .xiu {
+   font-size: 6px;
+   position: absolute;
+   right: 5px;
+   top: 5px;
+}
 .holiday .xiu {
    font-size: 6px;
    position: absolute;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9de722f..d96ad95 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -230,13 +230,85 @@
   <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
   <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
     <view class="pbservice" style="margin-bottom:30rpx">
-      <view bindtap="gotoUrl" style="margin-left:20rpx" data-title="非遗鉴赏" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+      <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
         <view>非遗鉴赏</view> -->
         <!-- 元旦修改 第一个pbservice-item新增margin-left -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240228/e975683fe59dcd25bbbc6790fc7d0979.png" mode="widthFix"></image>
         <view class="text">非遗鉴赏</view>
       </view>
+      <view bindtap="goH5" data-title="数字博物馆"
+        data-path="BwsInfo" class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
+        <view>数字博物馆</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/5969e3a1d76f1110c6308017a60db97c.png" mode="widthFix"></image>
+        <view class="text">数字博物馆</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
+	    class="pbservice-item">
+	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+	    <view>公共文化资源库</view> -->
+      <!-- 元旦修改 -->
+      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
+      <view class="text">公共文化资源库</view>
+	  </view>
+    <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+        <view>云上文博会</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/2a438fc454c328b907d5648c3300ba20.png" mode="widthFix"></image>
+        <view class="text">云上文博会</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
+        <view>云上观展</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/51a356aa37b192792d04f0fb7c1d6b3b.png" mode="widthFix"></image>
+        <view>云上观展</view>
+      </view>
+      <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
+        <view>精彩回顾</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/86f6ca0f39c0b5e6e262f97047bdb871.png" mode="widthFix"></image>
+        <view class="text">精彩回顾</view>
+      </view>
+      <view bindtap="gotoPath" data-event="institution_click" 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> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/85017f4a5732416391618582107429e5.png" mode="widthFix"></image>
+        <view class="text">文旅单位</view>
+      </view>
+      <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
+        <view class="text">书仓</view>
+      </view>
+      <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
+        <view>苏影通</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/4e60d8de231e1c9a93446a9493e09470.png" mode="widthFix"></image>
+        <view class="text">苏影通</view>
+      </view>
+      <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
+        data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
+        <view>视觉中心</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
+        <view class="text">视觉中心</view>
+      </view>
       <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
         data-path="/pages/pbService/wwcx/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
@@ -255,27 +327,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
         <view>博物馆查询</view>
       </view> -->
-      <view bindtap="goH5" data-title="数字博物馆"
-        data-path="BwsInfo" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
-        <view>数字博物馆</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/5969e3a1d76f1110c6308017a60db97c.png" mode="widthFix"></image>
-        <view class="text">数字博物馆</view>
-      </view>
       <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
       </view> -->
-      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-        <view>云上文博会</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/2a438fc454c328b907d5648c3300ba20.png" mode="widthFix"></image>
-        <view class="text">云上文博会</view>
-      </view>
       <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
@@ -289,14 +345,6 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
         <view>数字文物</view>
       </view> -->
-      <view bindtap="gotoPath" data-event="institution_click" 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> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/85017f4a5732416391618582107429e5.png" mode="widthFix"></image>
-        <view class="text">文旅单位</view>
-      </view>
       <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
@@ -309,60 +357,12 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
-      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
-        <view class="text">书香借阅</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
-	    class="pbservice-item">
-	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-	    <view>公共文化资源库</view> -->
-      <!-- 元旦修改 -->
-      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
-      <view class="text">公共文化资源库</view>
-	  </view>
-			<view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
-        <view>苏影通</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/4e60d8de231e1c9a93446a9493e09470.png" mode="widthFix"></image>
-        <view class="text">苏影通</view>
-      </view>
 
       <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
       </view> -->
-      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
-        <view>云上观展</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/51a356aa37b192792d04f0fb7c1d6b3b.png" mode="widthFix"></image>
-        <view>云上观展</view>
-      </view>
-      <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
-        <view>精彩回顾</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/86f6ca0f39c0b5e6e262f97047bdb871.png" mode="widthFix"></image>
-        <view class="text">精彩回顾</view>
-      </view>
-      <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
-        data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
-        <view>视觉中心</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
-        <view class="text">视觉中心</view>
-      </view>
     </view>
   </scroll-view>
   <view class="scroll-line">
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index e70edcf..381f693 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -82,6 +82,17 @@ Page({
       })
     })
   },
+  selectDate: function (e) {
+    console.log(e.detail);
+    this.setData({
+      date: e.detail,
+      pageNo: 1,
+      list: [],
+      total: 1,
+      moreFlag: true
+    })
+    this.getList()
+  },
   changeType: function (e) {
     this.setData({
       type: e.currentTarget.dataset.type,
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 19edc3b..a32bb9e 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -1,20 +1,30 @@
 <!--pages/activity/index.wxml-->
 <title-header title="活动日历"></title-header>
+<new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
-  <view class="acitivity-search-box" >
-    <!-- <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea">
+  <view class="acitivity-search-box">
+    <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
         <view class="areatext">{{areas[area].area_name}}</view>
         <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
-    </picker> -->
+    </picker>
     <view class="my-search-box">
       <view class="iconfont icon-sousuo"></view>
       <input bindinput="changeKeywords" value="{{realKeywords}}" type="text" placeholder="请输入搜索关键字" />
       <view class="search-btn" bindtap="search">搜索</view>
     </view>
   </view>
-  <view scroll-x enable-flex class="types">
+  <view class="types-box">
+    <view class="{{type==9?'types-item-active':'types-item'}}" bindtap="changeType" data-type="9">全部</view>
+    <view class="{{type==3?'types-item-active':'types-item'}}" bindtap="changeType" data-type="3">景区活动</view>
+    <view class="{{type==1?'types-item-active':'types-item'}}" bindtap="changeType" data-type="1">演出</view>
+    <view class="{{type==2?'types-item-active':'types-item'}}" bindtap="changeType" data-type="2">展览</view>
+    <view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4">电影</view>
+    <view class="{{type==7?'types-item-active':'types-item'}}" bindtap="changeType" data-type="7">文化惠民</view>
+    <view class="{{type==6?'types-item-active':'types-item'}}" bindtap="changeType" data-type="6">其他</view>
+  </view>
+  <!-- <view scroll-x enable-flex class="types">
     <view class="type-item" bindtap="changeType" data-type="9">
       <image src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
       <view style="{{type==9?'color: #0B898E':''}}">全部</view>
@@ -38,20 +48,20 @@
     <view class="type-item" bindtap="changeType" data-type="7">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==7?'color:#F75D2A':''}}">文化惠民</view>
-    </view>
+    </view> -->
 
     <!-- <view class="type-item" bindtap="changeType" data-type="5">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
     </view> -->
 
-    <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
+    <!-- <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>
     </view>
     <view style="width:1rpx;flex-shrink:0;height:1rpx"></view>
-  </view>
-  <view class="date-box" hidden="{{type==4}}">
+  </view> -->
+  <!-- <view class="date-box" hidden="{{type==4}}">
     <view class="yulan{{isYL?' active':''}}" data-flag="0" bindtap="yulan">
       <view>
         全部
@@ -69,7 +79,7 @@
         <image width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20230208/967796a90039681fee47e9271c2207d7.png"></image>
       </view>
     </picker>
-  </view>
+  </view> -->
 </view>
 <view class="activity-list activity-list1">
   <view class="movie-types" wx:if="{{type==4}}">
@@ -89,22 +99,23 @@
     <view class="{{sort=='distance'?'active':''}} m-sort" bindtap="setSort" data-sort="distance">离我最近</view>
     <view class="{{sort=='price'?'active':''}} m-sort" bindtap="setSort" data-sort="price">价格最低</view>
   </view>
-  <view wx:if="{{list.length>0 && type!=4}}" style="background:#0B898E;padding:1rpx 0">
-    <view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="activity-item-out">
-      <view class="activity-item">
+  <view wx:if="{{list.length>0 && type!=4}}" style="background:#fff;padding:1rpx 0">
+    <!-- <view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="activity-item-out"> -->
+      <view class="activity-item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
+        <common-image width="320rpx" height='220rpx' style="margin-right: 13rpx;" src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
         <view class="activity-info">
           <view class="activity-title textOver2">{{item.name || item.title}}</view>
           <view>
             <view style="margin-bottom:10rpx">{{item.begin_date}}—{{item.end_date}}</view>
-            <view class="textOver2">{{item.detail_address?item.detail_address:""}}</view>
+            <view class="textOver2">{{item.from_platform}}</view>
+            <!-- <view class="textOver2">{{item.detail_address?item.detail_address:""}}</view> -->
           </view>
         </view>
-        <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
         <view class="end-mask" wx:if="{{item.is_act_end}}">已结束</view>
       </view>
-      <view class="new-tip">{{item.from_platform}}</view>
+      <!-- <view class="new-tip">{{item.from_platform}}</view> -->
     </view>
-  </view>
+  <!-- </view> -->
   <!-- 后面都是电影的 -->
   <view wx:if="{{list.length>0 && type==4 && movieType!=2}}">
     <view bindtap="gotoDetail" data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0" wx:for="{{list}}">
@@ -131,7 +142,7 @@
       </view>
     </view>
   </view>
-  <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:430rpx">
+  <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:430rpx;position: inherit;">
     <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
     <view>暂无内容</view>
   </view>
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index e2f4f27..1a91b9b 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -1,14 +1,14 @@
 /* pages/activity/index.wxss */
 
 page {
-  background: #fff;
+  background: #F2F2F2;
 }
 .types {
   /* justify-content: space-between; */
   background: #fff;
   display: flex;
   color: #666;
-  width: 750rpx;
+  width: 697rpx;
   overflow-x: scroll;
   border-bottom: 1rpx solid #d8d8d8;
   font-size: 0;
@@ -121,11 +121,18 @@ background: rgba(11, 137, 142, .1);
 }
 .top-fixed-box {
   background: #FFF;
+  width: 697rpx;
+  margin: 0 auto;
+  border-radius: 20rpx;
+  margin-top: 20rpx;
 }
 .activity-list {
-  padding: 0 24rpx;
-  background: #0B898E;
+  width: 697rpx;
+  /* padding: 0 24rpx; */
+  /* background: #0B898E; */
+  background: #FFFFFF;
   min-height:1300rpx;
+  margin: 0 auto;
 }
 .acitivity-search-box {
   display: flex;
@@ -133,6 +140,7 @@ background: rgba(11, 137, 142, .1);
   margin-bottom: 0;
   justify-content: space-between;
   align-items: center;
+  padding-top: 30rpx;
 }
 .acitivity-search-box .picker {
   margin-right: 30rpx;
@@ -188,13 +196,14 @@ background: rgba(11, 137, 142, .1);
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 27rpx 22rpx;
+  padding: 10rpx 22rpx;
+  /* padding: 27rpx 22rpx; */
   position: relative;
 }
 .end-mask {
   position: absolute;
   right: 22rpx;
-  top: 27rpx;
+  /* top: 27rpx; */
   text-align: center;
   width: 320rpx;
   height: 220rpx;
@@ -228,17 +237,20 @@ background: rgba(11, 137, 142, .1);
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  font-size: 23rpx;
-  color: #999;
+  /* font-size: 23rpx;
+  color: #999; */
   flex: 1;
   min-height: 220rpx;
-  margin-right: 28rpx;
+  /* margin-right: 28rpx; */
+  font-size: 24rpx;
+  color: #666;
 }
 .activity-title {
   font-weight: 500;
   font-size: 31rpx;
   line-height: 45rpx;
-  color: #333;
+  color: #000;
+  /* color: #333; */
 }
 
 .movie-types {
@@ -318,4 +330,38 @@ flex-shrink: 0;
  padding: 6rpx 20rpx;
  border-radius: 40rpx;
  margin-left: 10rpx;
+}
+.types-box {
+    /* margin-top: 31rpx; */
+    font-size: 28rpx;
+    color: #000;
+    font-weight: 500;
+    display: flex;
+    overflow-x: scroll;
+    padding: 31rpx 30rpx 30rpx;
+}
+.types-item {
+    border: 1px solid #999999;
+    border-radius: 27rpx;
+    height: 53rpx;
+    padding: 0 25rpx;
+    display: inline-block;
+    line-height: 53rpx;
+    margin-right: 13rpx;
+    flex-shrink: 0;
+}
+.types-item-active {
+  padding: 0 25rpx;
+  height: 57rpx;
+  line-height: 57rpx;
+  display: inline-block;
+  background: #0B898E;
+  color: #FFFFFF;
+  border-radius: 27rpx;
+  margin-right: 13rpx;
+  flex-shrink: 0;
+}
+/* 不显示滚动条 */
+.types-box::-webkit-scrollbar {
+  display: none;
 }
\ No newline at end of file
diff --git a/pages/pbService/activity/index.js b/pages/pbService/activity/index.js
index ff44eab..9c9d916 100644
--- a/pages/pbService/activity/index.js
+++ b/pages/pbService/activity/index.js
@@ -10,10 +10,12 @@ Page({
     list:[],
     page:1,
     total:1,
-    navList: [{title: '精彩2023', year: 2023}, {title: '往期回顾', year: 2022}],
+    navList: [{title: '精彩2024', year: 2024}, {title: '往期回顾', year: 2023}],
     navIndex: 0,
     sNavIndex:0,
-    sNavList:[{title: '回顾2022', year: 2022}, {title: '回顾2021', year: 2021}]
+    sNavList:[{title: '回顾2023', year: 2023},{title: '回顾2022', year: 2022}, {title: '回顾2021', year: 2021}],
+    last_page:0,
+    current_page:1
   },
 
   /**
@@ -26,7 +28,8 @@ Page({
     this.setData({
       page:0,
       list:[],
-      navIndex:e.currentTarget.dataset.index
+      navIndex:e.currentTarget.dataset.index,
+      last_page:0
     })
     this.getList()
   },
@@ -34,12 +37,14 @@ Page({
     this.setData({
       page:0,
       list:[],
-      sNavIndex:e.currentTarget.dataset.index
+      sNavIndex:e.currentTarget.dataset.index,
+      last_page:0
     })
     this.getList()
   },
   getList:function(){
-    if(this.data.list.length>=this.data.total) return;
+    // if(this.data.list.length>=this.data.total) return;
+    if(this.data.current_page == this.data.last_page) return;
     https._post("review/getList",{
       limit:10,
       page:this.data.page,
@@ -48,7 +53,9 @@ Page({
       this.setData({
         total:res.data.total,
         list:this.data.list.concat(res.data.data),
-        page:this.data.page+1
+        page:this.data.page+1,
+        last_page:res.data.last_page,
+        current_page: res.data.current_page
       })
     })
   },
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index 13cb93c..74bb0a7 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -19,3 +19,6 @@
     </view>
   </view>
 </view>
+<view style="margin: 0 auto;width: 200rpx;">
+  没有更多了
+</view>
diff --git a/pages/pbService/activity/index.wxss b/pages/pbService/activity/index.wxss
index 55e544c..00f42f3 100644
--- a/pages/pbService/activity/index.wxss
+++ b/pages/pbService/activity/index.wxss
@@ -73,7 +73,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 122rpx;
+  padding: 0 42rpx;
   margin-top: 45rpx;
 }
 .s_item{
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index d92ec0e..78cdec0 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -9,10 +9,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
-    <view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
-      data-path="/pages/pbService/security/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
-      <view>安全服务</view>
+    <view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath"
+      data-path="/pages/pbService/sceneComfort/index">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+      <view>景区舒适度</view>
     </view>
     <view class="pb-item" bindtap="gotoUrl" data-event="xlqc" 
     data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
@@ -24,10 +24,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
       <view>找厕所</view>
     </view>
-    <view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath"
-      data-path="/pages/pbService/sceneComfort/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-      <view>景区舒适度</view>
+    <view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
+      data-path="/pages/pbService/security/index">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
+      <view>安全服务</view>
     </view>
     <!-- <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath"
       data-path="/pages/pbService/gym/index">
@@ -38,11 +38,6 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
       <view>垃圾分类</view>
     </view>
-    <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-      class="pb-item">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-      <view>12348</view>
-    </view>
     <!-- <view class="pb-item" data-title="文化配送" bindtap="gotoPath" data-path="/pages/culture/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
       <view>文化配送</view>
@@ -51,6 +46,11 @@
       <image src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
       <view>附近图书馆</view>
     </view>
+    <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
+      class="pb-item">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
+      <view>12348</view>
+    </view>
   </view>
 </view>
 <image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml
index 4b548a6..dc1785c 100644
--- a/pages/user/service/list/index.wxml
+++ b/pages/user/service/list/index.wxml
@@ -22,7 +22,8 @@
     <!-- 成功 -->
     <view class="modal-dialog" wx:if="{{showModal && ses}}">
       <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
- <view>客服服务时间：08:30-17:30</view>
+ <view>客服服务时间：8：30-11:30,</view>
+ <view>13:00-17:30</view>
 如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view></view></view>
       <view class="modal-footer">
         <view
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 27baf57..c8a04cf 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -126,7 +126,8 @@
 
     <view class="model-content">
       <view>即将跳转人工客服</view>
-      <view style="margin-top: 40rpx;">客服服务时间：08：30-17：30</view>
+      <view style="margin-top: 40rpx;">客服服务时间：08：30-17：30，</view>
+      <view style="margin-top: 30rpx;margin-left: 110rpx;">13:00-17:30</view>
     </view>
     <view class="btn-list">
         <button class="model-btn" bindtap="closeModel">

From 186ccd6abbf59a8cd02fd18f3abc86a509d9ae49 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Sun, 28 Apr 2024 09:20:04 +0800
Subject: [PATCH 143/471] =?UTF-8?q?=E5=BC=80=E5=B1=8F=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86=E4=BA=94=E4=B8=80=EF=BC=8C?=
 =?UTF-8?q?=E6=99=AF=E7=82=B9=E4=B8=8B=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/newCalendar/index.wxml |  1 +
 pages/component/newCalendar/index.wxss | 11 +++++-
 pages/index/index.js                   | 11 +++++-
 pages/index/index.wxml                 |  2 +-
 pages/index/index.wxss                 |  3 ++
 pages/list/activitynew/index.wxml      |  2 ++
 pages/list/activitynew/index.wxss      | 23 ++++++++++---
 pages/map/index.wxml                   | 46 +++++++++++++-------------
 pages/map/index.wxss                   |  9 ++++-
 pages/order/scene/index.js             | 10 ++++--
 10 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 4ee36f8..8dd1fc8 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -57,6 +57,7 @@
         <image wx:if="{{currentViewType==='week'}}" src="https://static.ticket.sz-trip.com/uploads/20240327/8b5f8a284de3831392560c367f8c59ca.png" mode=""/>
         <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
     </view>
+    <image wx:if="{{currentViewType==='month'}}" style="width: 180rpx;height: 157.33rpx;position: absolute;right: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bottom.png" mode=""/>
 </view> 
 
  
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index 4c61809..b7b528f 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -1,13 +1,20 @@
 /* components/xx-calendar/xx-calendar.wxss */
 /* 头部样式start */
 .title-wrap{
-    background-color: #F2F2F2;
+    /* background-color: #F2F2F2; */
     /* padding-top: 20rpx; */
     /* border-bottom: 1px solid #D4DBDC; */
     /* padding-bottom: 10rpx; */
     /* width: 697rpx; */
+    /* margin: 0 auto;
+    padding: 37rpx 22rpx 40rpx; */
+    background-color: #FFD6B2;
     margin: 0 auto;
     padding: 37rpx 22rpx 40rpx;
+    background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png");
+    background-size: 100% 100%;
+    width: 90%;
+    height: 65.67rpx
 }
 .change-date{
     display: flex;
@@ -48,6 +55,8 @@
     display: flex;
     flex-wrap: wrap;
     border-radius: 20rpx;
+    margin-top: -28rpx;
+    position: relative;
 }
 .mouth-date{
     display: flex;
diff --git a/pages/index/index.js b/pages/index/index.js
index 03a741e..4c6b95a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -39,6 +39,7 @@ Page({
     alertSwipeList: [], //弹窗广告
     showAdv: false, //弹窗开关
     showFullAdv: true, //全屏广告开关
+    opacity: 1,
     time: 3, //全屏广告剩余时间
     showTime:false,
     xpth:{}, // 元旦新增 新品特惠和sqjNew
@@ -74,8 +75,16 @@ Page({
           this.setData({
             time: this.data.time - 1
           })
-          if (this.data.time == 0) {
+          if (this.data.time === 0) {
+            var opacityTimer =  setInterval(() => {
+              this.setData({
+                opacity: this.data.opacity - 0.3
+              })
+            }, 100)
+          }
+          if (this.data.time == -1) {
             clearInterval(timer)
+            clearInterval(opacityTimer)
             wx.showTabBar() //倒计时结束清除定时器显示导航栏
             this.setData({
               showFullAdv: false
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d96ad95..88ac756 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -631,7 +631,7 @@
   <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
 </view>
 <!-- 广告弹窗结束 -->
-<view class="fullavd" wx:if="{{showFullAdv}}">
+<view class="fullavd" wx:if="{{showFullAdv}}"  style="opacity: {{opacity}}">
   <view class="time" bindtap="closeFullAdv" wx:if="{{showTime}}">{{time}}s跳过</view>
     <!-- <view class="Qtop" style="height:{{viewHeight}}"> -->
     <view class="Qtop" style="min-height:100vh">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index e8175c6..aa2e27b 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -782,6 +782,9 @@ page {
   height: 100%;
   z-index: 1001;
   background-color: #fff;
+  opacity: 1;
+  transition: all 1s;
+  
 }
 .fullsp{
   width: 100%;
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index a32bb9e..d826ce0 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -1,7 +1,9 @@
 <!--pages/activity/index.wxml-->
 <title-header title="活动日历"></title-header>
+<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png" mode=""/> -->
 <new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
+  <image class="bg-pic" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-center.png" mode="widthFix"/>
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 1a91b9b..c5f9f59 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -1,7 +1,8 @@
 /* pages/activity/index.wxss */
 
 page {
-  background: #F2F2F2;
+  /* background: #F2F2F2; */
+  background: #FFD6B2;
 }
 .types {
   /* justify-content: space-between; */
@@ -123,8 +124,9 @@ background: rgba(11, 137, 142, .1);
   background: #FFF;
   width: 697rpx;
   margin: 0 auto;
-  border-radius: 20rpx;
+  border-radius: 20rpx 20rpx 0 0;
   margin-top: 20rpx;
+  position: relative;
 }
 .activity-list {
   width: 697rpx;
@@ -352,16 +354,27 @@ flex-shrink: 0;
 }
 .types-item-active {
   padding: 0 25rpx;
-  height: 57rpx;
-  line-height: 57rpx;
+  /* height: 57rpx; */
+  height: 68rpx;
+  line-height: 58rpx;
   display: inline-block;
-  background: #0B898E;
+  /* background: #0B898E; */
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
   flex-shrink: 0;
+  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png");
+  background-size: 100% 100%;
+  margin-top: -5rpx;
+    text-align: center;
 }
 /* 不显示滚动条 */
 .types-box::-webkit-scrollbar {
   display: none;
+}
+.bg-pic {
+  width: 266.67rpx;
+  height: 106.67rpx;
+  position: absolute;
+  right: 0;
 }
\ No newline at end of file
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 849530a..29cc225 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -12,7 +12,7 @@
 </picker>
 <view class="menus" wx:if="{{showMore=='close'}}">
   <!-- <view class="open" bindtap="changeShow"></view> -->
-  <image bindtap="changeShow" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240129/e06f57483a5dfb145a30ab13226d2e93.png" mode=""/>
+  <image bindtap="changeShow" class="img-icon-new" src="https://static.ticket.sz-trip.com/uploads/20240426/dcc098205e0fbf21f0056ebe6046d10f.png" mode=""/>
   <view class="menu-list">
     <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
       <image class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
@@ -45,46 +45,46 @@
       <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
       <text class="text">场馆</text>
     </view>
+    <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
+      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
+      <text class="text">停车场</text>
+    </view>
+    <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
+      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
+      <text class="text">游客中心</text>
+    </view>
     <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
       <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
     </view>
-    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
-      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
-      <text class="text">公共自行车</text>
+    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
+      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
+      <text class="text">行李寄存</text>
+    </view>
+    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
+      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
+      <text class="text">特产</text>
     </view>
     <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
       <image class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
       <text class="text">美食</text>
     </view>
-    <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
-      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
-      <text class="text">文保单位</text>
+    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <text class="text">公共自行车</text>
     </view>
     <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
       <image class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
       <text class="text">运河十景</text>
     </view>
+    <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
+      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
+      <text class="text">文保单位</text>
+    </view>
     <view class="menus-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
       <image class="menu-item-img" src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20240123/a95f3135ee4c9550b7bb0e855e8eb13b.png':'https://static.ticket.sz-trip.com/uploads/20240123/7dc1051d06ad9a4703edc209b065e851.png'}}" mode="aspectFill"/>
       <text class="text">江南小书场</text>
     </view>
-    <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
-      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
-      <text class="text">停车场</text>
-    </view>
-    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
-      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
-      <text class="text">行李寄存</text>
-    </view>
-    <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
-      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
-      <text class="text">游客中心</text>
-    </view>
-    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
-      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
-      <text class="text">特产</text>
-    </view>
     <view class="menus-item{{type==13?' active':''}}" bindtap="changeType" data-title="红色地图" data-type="13">
       <image class="menu-item-img" src="{{type==13?'https://static.ticket.sz-trip.com/uploads/20240123/176d442b0df8b16329ac62ffd481815a.png':'https://static.ticket.sz-trip.com/uploads/20240123/789606012a481332c98a5bd7ccb07306.png'}}" mode="aspectFill"/>
       <text class="text">红色地图</text>
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 2ede90a..6af56b0 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -492,7 +492,7 @@
   left: 26.67rpx;
   bottom: 26.67rpx;
   width: 697rpx;
-  height: 200rpx;
+  height: 213.33rpx;
   background: rgba(255,255,255,0.8);
   box-shadow: 0rpx 1rpx 16rpx 0rpx rgba(153,153,153,0.35);
   border-radius: 20rpx;
@@ -630,4 +630,11 @@
 .img-icon {
   width: 686.67rpx;
   height: 40rpx;
+}
+
+.img-icon-new {
+    width: 105.33rpx;
+    height: 17.33rpx;
+    margin: 17rpx auto 32rpx;
+    display: block;
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 366ba51..5066c8f 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -53,6 +53,7 @@ Page({
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard
     })
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
+    console.log('---期票类型----',app.globalData.product.sku.ticket_type);
 
     if (!app.globalData.product) {
       util.back();
@@ -71,7 +72,8 @@ Page({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
-    this.showAllPrice()
+    this.getNewCoupon()
+    // this.showAllPrice()
   //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];
@@ -86,9 +88,10 @@ Page({
     // console.log('detail',app.globalData.product);
     // console.log('singlePrice',this.data.singlePrice);
     // console.log('productNum',this.data.productNum);
-    if (app.globalData.product.price) {
+    console.log('couponInfo',app.globalData.couponInfo);
+    if (this.data.ticket_type != 1) {
       this.setData({
-        singlePrice:app.globalData.product.price
+        singlePrice:app.globalData.product.product.price
       })
       let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
       if (price >0) {
@@ -545,6 +548,7 @@ Page({
    this.setData({
       coupon:e.detail
    })
+   this.showAllPrice()
   },
 
   /**

From fa0358b40aea1b3929253b9af39bb75013b0ba67 Mon Sep 17 00:00:00 2001
From: panyiping <981892160@qq.com>
Date: Sun, 28 Apr 2024 14:43:01 +0800
Subject: [PATCH 144/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20tab=20active=E5=9B=BE=E6=A0=87=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                 |   8 +-
 images/index-selds_1.png | Bin 0 -> 17388 bytes
 images/my-selds_1.png    | Bin 0 -> 12776 bytes
 images/tuyou-selds_1.png | Bin 0 -> 26535 bytes
 pages/index/index.js     |  28 +--
 pages/index/index.wxml   | 384 +++++++++++++++++++++------------------
 pages/index/index.wxss   | 194 +++++++++++++-------
 7 files changed, 356 insertions(+), 258 deletions(-)
 create mode 100644 images/index-selds_1.png
 create mode 100644 images/my-selds_1.png
 create mode 100644 images/tuyou-selds_1.png

diff --git a/app.json b/app.json
index 75d9431..5cdd85e 100644
--- a/app.json
+++ b/app.json
@@ -213,26 +213,26 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999",
-    "selectedColor": "#72674E",
+    "selectedColor": "#3FB87F",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/index-selds.png",
+        "selectedIconPath": "/images/index-selds_1.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/tuyou-selds.png",
+        "selectedIconPath": "/images/tuyou-selds_1.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/my-selds.png",
+        "selectedIconPath": "/images/my-selds_1.png",
         "text": "我的"
       }
     ]
diff --git a/images/index-selds_1.png b/images/index-selds_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa7ca9a71bb880cca1a31f5c0c1c77f8d84aa25f
GIT binary patch
literal 17388
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

literal 0
HcmV?d00001

diff --git a/images/my-selds_1.png b/images/my-selds_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e5cb3bb6be69e3b315b2ae8f18c00e54d578136
GIT binary patch
literal 12776
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

literal 0
HcmV?d00001

diff --git a/images/tuyou-selds_1.png b/images/tuyou-selds_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8efcbcdda90f49b893ddc48a91fd3e82889799c
GIT binary patch
literal 26535
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

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index 4c6b95a..b940de5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -46,16 +46,16 @@ Page({
     djs:null, // 元旦新增 新品特惠倒计时
     djsTime:null,
     sqjNew:[
-      'https://static.ticket.sz-trip.com/uploads/20240228/6b66d72217daf237b872e5d9a2940145.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/dd505af3726fece9f68797dd3b1fadde.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/e9b1bba16e57eb1058559f2e3cb900c3.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/264e088f95b6670fca4fc81f3bc80688.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/5cd8254c6e19b586dad65e8d56683e4c.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/6ebcfcd73f85014dc8642b8daac1e1b0.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/8df6e95a348a64474ff3ed55299924b9.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/c7de980e14c66a39215e7bf5f66ba218.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/24010b7a7a88b91c0ea75cf3f073702e.png',
-      'https://static.ticket.sz-trip.com/uploads/20240228/59e199b98bfb9fbe4fd996503d5f5698.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/6d2a807d0bf5fe4d48ebc7d9ef052a86.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/be55040b6dbf55a69ba15487bde5a924.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/b14e5e8ccf6c725bf1d5a144f6a25ff8.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/94c63d92ca6719feb691111d5785ff3d.png',
     ],
     viewHeight:"0px",
   },
@@ -885,8 +885,12 @@ Page({
     if (app.globalData.loadIndexSeason) {
       this.getIndexSeason()
     } else {
-      setTimeout(() => {
-        this.getIndexSeason()
+      let t = setInterval(() => {
+        if (app.globalData.loadIndexSeason) {
+          this.getIndexSeason()
+          clearInterval(t)
+          t = null
+        }
       }, 500)
     }
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 88ac756..8e9ed96 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -5,15 +5,15 @@
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
 <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-<view wx:if="{{weather}}" class="top-box">
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
   <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240228/689361afd100817d1670335d95e9cb00.png"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
     mode="aspectFill"></image>
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20240228/5c5a9073f90f695f56560e51c1d7b26a.png" mode="aspectFill"></image>
+    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
   <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
     mode="aspectFill"></image>
@@ -26,7 +26,7 @@
     <view class="textOver">搜索想要的旅游产品或服务</view>
   </navigator>
 </view>
-<view style="position:relative" >
+<view style="position:relative;z-index: 1;" >
   <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
     <block wx:for="{{banner}}" wx:key="*this">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -50,15 +50,19 @@
 <view class="top-icons" wx:if="{{!isTest}}">
   <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
     class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/0d6708cc448c7c0b35a676cbd19e8de4.png" mode="widthFix"></image>
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/c95f7fcc652cdbd03290530fd842abd7.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/c95f7fcc652cdbd03290530fd842abd7.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">活动日历</view>
   </view>
   <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
     data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/9d26b6b0dcb3c63ace2f893a5a631925.png" mode="widthFix"></image>
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/b09f9cee20a7f4df6aafc4eec739d959.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/b09f9cee20a7f4df6aafc4eec739d959.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">场馆预约</view>
   </view>
@@ -67,57 +71,73 @@
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
   <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/def5de89d7cf5d6b418c6515616f8ffa.png" mode="widthFix"></image>
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/b5614719b2a439913c7a1d265624b294.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/b5614719b2a439913c7a1d265624b294.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">非遗专卖</view>
   </view>
   <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
     data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/a95f9ecd6a3cce5ae993d2bdcfdde104.png" mode="widthFix"></image>
        <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/f35952c7189bf21bd25c5a9e0a65b215.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/f35952c7189bf21bd25c5a9e0a65b215.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">剧场演出</view>
   </view>
   <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
     data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/10eb0440e299f1903954488643e54f8e.png" mode="widthFix"></image>
     <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/bfe5f12189f1306bebb7be5a37cbea75.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/bfe5f12189f1306bebb7be5a37cbea75.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">文创特产</view>
   </view>
   <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
     class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/c6581705831291617546adf5eaf05499.png" mode="widthFix"></image>
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/c73151735eb762996e7d05237743e87f.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/c73151735eb762996e7d05237743e87f.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">景点门票</view>
   </view>
   <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
     class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/fa7ff24b9d091f8dc1ce2011d5368808.png" mode="widthFix"></image>
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/712b4334114a909946af5f04131109f0.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/712b4334114a909946af5f04131109f0.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">酒店住宿</view>
   </view>
   <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
     class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/b3f7b2fd1378696b0f034b397ed04612.png" mode="widthFix"></image>
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/a85e941945a2f380f1e0a4a8ae7a00dd.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/a85e941945a2f380f1e0a4a8ae7a00dd.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">夜游苏州</view>
   </view>
   <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
     class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/db92c695c836b657ca680493bee36635.png" mode="widthFix"></image>
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/9afe8b7ab4763cfb82c55c34a737e7d2.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/9afe8b7ab4763cfb82c55c34a737e7d2.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">一日游</view>
   </view>
   <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
     class="top-icon-item">
+    <!-- 五一修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240428/dab27c5383df197e665021081dd3a791.png" mode="widthFix"></image>
      <!-- 元旦修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240228/4191bbe5ac87821164818fab546d0908.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/4191bbe5ac87821164818fab546d0908.png" mode="widthFix"></image> -->
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">研学游</view>
   </view>
@@ -166,7 +186,11 @@
       </view>
     </view>
   </view>
-  <view class="small-swiper-box">
+  <!-- 五一修改 一张banner不滚动 -->
+  <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+    <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+  </view>
+  <view class="small-swiper-box" wx:else>
     <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
@@ -181,7 +205,7 @@
     </view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;" wx:if="{{!isTest}}">
+  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
     <!-- 上方标题部分 -->
     <view class="xsth-title">
       <view class="xsth-left" style="display: flex;">
@@ -189,8 +213,10 @@
       </view>
       <view class="time-box" style="z-index: 9;">
       倒计时
-        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}:</view>
-        <view class="xsth-time">{{djs.m}}:</view>
+        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+        <text>:</text>
+        <view class="xsth-time">{{djs.m}}</view>
+        <text>:</text>
         <view class="xsth-time">{{djs.s}}</view>
       </view>
       <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
@@ -202,8 +228,7 @@
     <view class="xpth-product">
       <!-- 左边的2个产品 -->
       <view class="xpth-left">
-        <view wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" style="padding: 4rpx;background: #72674e;clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%);margin-bottom: 10rpx;">
-          <view class="xpth-item" >
+        <view  class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}">
           <image src="{{item.headimg}}" mode=""/>
           <view class="xpth-item-content">
             <view class="xpth-item-title textOver2">{{item.title}}</view>
@@ -214,179 +239,178 @@
             </view>
           </view>
         </view>
-        </view>
       </view>
       <!-- 右边的banner -->
-      <view class="xpth-banner">
-        <image bindtap="goBanner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode=""/>
-      </view>
+      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill"/>
     </view>
   </view>
-
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/20d7571beb1388c88d21e92e942775d8.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/39d175e82c6761ed81bb1be507536caa.png" mode=""/>
   </view>
-  <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-  <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-    <view class="pbservice" style="margin-bottom:30rpx">
-      <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
-        <view>非遗鉴赏</view> -->
-        <!-- 元旦修改 第一个pbservice-item新增margin-left -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/e975683fe59dcd25bbbc6790fc7d0979.png" mode="widthFix"></image>
-        <view class="text">非遗鉴赏</view>
-      </view>
-      <view bindtap="goH5" data-title="数字博物馆"
-        data-path="BwsInfo" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
-        <view>数字博物馆</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/5969e3a1d76f1110c6308017a60db97c.png" mode="widthFix"></image>
-        <view class="text">数字博物馆</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
-	    class="pbservice-item">
-	    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-	    <view>公共文化资源库</view> -->
-      <!-- 元旦修改 -->
-      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
-      <view class="text">公共文化资源库</view>
-	  </view>
-    <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-        <view>云上文博会</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/2a438fc454c328b907d5648c3300ba20.png" mode="widthFix"></image>
-        <view class="text">云上文博会</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
-        <view>云上观展</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/51a356aa37b192792d04f0fb7c1d6b3b.png" mode="widthFix"></image>
-        <view>云上观展</view>
-      </view>
-      <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
-        <view>精彩回顾</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/86f6ca0f39c0b5e6e262f97047bdb871.png" mode="widthFix"></image>
-        <view class="text">精彩回顾</view>
-      </view>
-      <view bindtap="gotoPath" data-event="institution_click" 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> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/85017f4a5732416391618582107429e5.png" mode="widthFix"></image>
-        <view class="text">文旅单位</view>
-      </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
-        <view class="text">书仓</view>
-      </view>
-      <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
-        <view>苏影通</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/4e60d8de231e1c9a93446a9493e09470.png" mode="widthFix"></image>
-        <view class="text">苏影通</view>
-      </view>
-      <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
-        data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
-        <view>视觉中心</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
-        <view class="text">视觉中心</view>
-      </view>
-      <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-        data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-        <view>文物查询</view>
-      </view> -->
-      <view bindtap="goH5"  data-title="文化场馆查询"
-        data-path="Museum" class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
-        <view>文化场馆查询</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/7b891ca4466caeb1a1e57fa9e8f90d33.png" mode="widthFix"></image>
-        <view class="text">文化场馆查询</view>
-      </view>
-      <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-        data-path="/pages/pbService/museum/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-        <view>博物馆查询</view>
-      </view> -->
-      <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-        <view>云上文博会</view>
-      </view> -->
-      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+  <!-- 五一修改 .slide-out-box 增加背景色-->
+  <view class="slide-out-box">
+    <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+    <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+      <view class="pbservice" style="margin-bottom:30rpx">
+        <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
+          <view>非遗鉴赏</view> -->
+          <!-- 元旦修改 第一个pbservice-item新增margin-left -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/8b3ea6eb8d4fb576e913902550b94d2e.png" mode="widthFix"></image>
+          <view class="text">非遗鉴赏</view>
+        </view>
+        <view bindtap="goH5" data-title="数字博物馆"
+          data-path="BwsInfo" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
+          <view>数字博物馆</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/0de5585512ec3d1f552ee55da44c045d.png" mode="widthFix"></image>
+          <view class="text">数字博物馆</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
         class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-        <view>投资导引图</view> -->
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+        <view>公共文化资源库</view> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/f674d3d20eb2cc00ace8e9fc5c132c4a.png" mode="widthFix"></image>
-        <view class="text">投资导引图</view>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240428/8095d53bdf22777671618e09d3819af7.png" mode="widthFix"></image>
+        <view class="text">公共文化资源库</view>
       </view>
-      <!-- <view bindtap="gotoUrl" data-title="数字文物"
-        data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-        <view>数字文物</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-        <view>团体预约</view>
-      </view> -->
+      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+          <view>云上文博会</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/6378cb81c3b94756f3b46daf9ba2d11d.png" mode="widthFix"></image>
+          <view class="text">云上文博会</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+          data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
+          <view>云上观展</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/20bd0f6233048ba51cd22157e14e686d.png" mode="widthFix"></image>
+          <view>云上观展</view>
+        </view>
+        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
+          <view>精彩回顾</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/9304e0e40bb0b66601c33433cb954ebd.png" mode="widthFix"></image>
+          <view class="text">精彩回顾</view>
+        </view>
+        <view bindtap="gotoPath" data-event="institution_click" 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> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/d3905d90e670af5b68de79b8eaedc6ab.png" mode="widthFix"></image>
+          <view class="text">文旅单位</view>
+        </view>
+        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+          <view>书香借阅</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/559b7345b76e07c2eda23b184b086a2f.png" mode="widthFix"></image>
+          <view class="text">书仓</view>
+        </view>
+        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
+          <view>苏影通</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/170121c61fb9e4b71a20574cab510ad7.png" mode="widthFix"></image>
+          <view class="text">苏影通</view>
+        </view>
+        <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
+          data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
+          <view>视觉中心</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/03e1ce0f626cfcc4874180bb29e3244a.png" mode="widthFix"></image>
+          <view class="text">视觉中心</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+          data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+          <view>文物查询</view>
+        </view> -->
+        <view bindtap="goH5"  data-title="文化场馆查询"
+          data-path="Museum" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
+          <view>文化场馆查询</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/928b340a3b619787dae9b194b0619a09.png" mode="widthFix"></image>
+          <view class="text">文化场馆查询</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+          data-path="/pages/pbService/museum/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+          <view>博物馆查询</view>
+        </view> -->
+        <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+          <view>云上文博会</view>
+        </view> -->
+        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
+          <view>投资导引图</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240428/4dcc3f8e1ad4002a08ce08aa0aa68313.png" mode="widthFix"></image>
+          <view class="text">投资导引图</view>
+        </view>
+        <!-- <view bindtap="gotoUrl" data-title="数字文物"
+          data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+          <view>数字文物</view>
+        </view> -->
+        <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+          <view>团体预约</view>
+        </view> -->
 
-      <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-        data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-        <view>廉洁地图</view>
-      </view> -->
+        <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+          data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+          <view>廉洁地图</view>
+        </view> -->
 
-      <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-        <view>文化配送</view>
-      </view> -->
+        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+          <view>文化配送</view>
+        </view> -->
+      </view>
+    </scroll-view>
+    <view class="scroll-line">
+      <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+      <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+      <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+      <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
     </view>
-  </scroll-view>
-  <view class="scroll-line">
-    <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-    <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-    <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-    <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/26e37b2730cade399160dfa6a3d561cf.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/118befe20ab47fea88bdd704ae1fbe20.png" mode=""/>
   </view>
   <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
     <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/uploads/20240228/54a08fbb38bca354e0b4ba22799ccdb6.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
       <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
       data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240228/920c31f6a34998d7d266caa2c944114e.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
       <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/uploads/20240228/d3513a8d5ab72627d69076942c306989.png" mode="aspectFill">
+      src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
     </image>
     <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240228/261182d448deb8502da596b679ea933d.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
     <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
@@ -413,15 +437,15 @@
     <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
       mode="aspectFill"></image> -->
   </view>
-  <view class="sale-road-boxes" style="margin-top:0;align-items:center;margin: 34rpx 0 40rpx;">
+  <view class="sale-road-boxes" style="margin-top:0;">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">更多<text
+    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">查看全部 <text
         class="iconfont icon-you"></text> </navigator>
     <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
   </view>
-  <view style="overflow-x:auto">
+  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;">
     <!-- 元旦修改 ggfw为新增类名 -->
-    <view class="pbservice ggfw-list" style="width:100%;">
+    <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;">
       <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
         data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
@@ -431,28 +455,28 @@
             <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/a96691fb6cb3b6e3f239486c5a0826b6.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240428/be9d01a4552438a93681b1e6b3c1c783.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/75fe37e3f5a05a422b9a6ae460565ce1.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240428/9ad72c94d55ef5c94f942b8c91e63f83.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/29113cf86ffcc35ae30f1c36dec1fc53.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240428/2fa6724e47aeb565873660a8c9e2624a.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/0546d19c09812ef7fc07e56971d2a899.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240428/ccc1b7554d388861f2d4936d7577c347.png" mode="widthFix"></image>
         <view>实时路况</view>
       </view>
       <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
@@ -472,9 +496,9 @@
       </view> -->
     </view>
   </view>
-  <view class="sale-road-boxes" style="margin-top:0">
+  <view class="sale-road-boxes">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/4cbea6a0a55120e8c5a5c744d2ae4594.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode=""/>
   </view>
   <!-- <view class="six-box">
     <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
@@ -491,7 +515,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/3dc7bc262a60fbce4f47a4459dd36b2c.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
   </view>
   <view class="other-plats" wx:if="{{otherPlat}}">
     <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}">
@@ -501,7 +525,7 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240228/c7dfb2e92637bbbd506c6d44fe2d5e25.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode=""/>
   </view>
   <view class="hot-list" wx:if="{{isTest==false}}">
     <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index aa2e27b..8812310 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -3,16 +3,16 @@
 page {
   background: #f5f2ed;
   padding-bottom: 36.67rpx;
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/indexBg.png"); */
+  /* background-image: url("https://static.ticket.sz-trip.com/uploads/20240428/7e9d12e2157ba5d4e77ef1b12f049012.png"); */
   background-size: 100% 100%;
-  background: url("https://static.ticket.sz-trip.com/uploads/20240227/0c1fbee84d17f1089aabb3ee81ddbfec.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20240428/7e9d12e2157ba5d4e77ef1b12f049012.png");
   background-repeat: round;
 }
 .swiper,.swiper image {
-  width: 690rpx;
+  width: 697rpx;
   display: block;
-  height: 358rpx;
-  border-radius: 13rpx;
+  height: 335rpx;
+  border-radius: 27rpx;
 }
 .swiper {
   margin: 0 auto;
@@ -43,10 +43,14 @@ page {
   /* background: rgba(255, 255, 255, 0.6); */
   /* border-radius: 32rpx; */
   /* color: #666; */
-  height: 70.67rpx;
-  color: #72674E;
-  background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
-  background-size: 100% 100%;
+  /* height: 70.67rpx; */
+  height: 64rpx;
+  background: rgba(255,255,255,0.7);
+  border-radius: 32rpx;
+  /* color: #72674E; */
+  color: #333333;
+  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
+  background-size: 100% 100%; */
   display: flex;
   align-items: center;
   font-size: 25rpx;
@@ -55,12 +59,12 @@ page {
   font-size: 30rpx;
   margin-left: 20rpx;
   margin-right: 10rpx;
-  color: #72674E;
+  /* color: #72674E; */
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
-  /* color: #333; */
-  color: #72674E;
+  color: #333;
+  /* color: #72674E; */
 }
 .top-box .weather-num {
   font-size: 29rpx;
@@ -76,18 +80,22 @@ page {
 .top-icons {
   /* background: #FFFFFF; */
   /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
-  border-radius: 27rpx;
-  margin: 0 20rpx;
+  border-radius: 0 0 27rpx 27rpx;
+  width: 697rpx;
+  margin: 0 auto;
   position: relative;
-  z-index: 1;
+  z-index: 0;
   display: flex;
   padding: 34rpx 0;
   padding-bottom: 7rpx;
   justify-content: space-between;
   flex-wrap: wrap;
+  background: #FFFED6;
+  margin-top: -20rpx;
+  padding-top: 54rpx;
 }
 .top-icon-item {
-  margin-bottom: 30rpx;
+  margin-bottom: 20rpx;
   line-height: 37rpx;
   font-size: 25rpx;
   color: #000;
@@ -99,10 +107,10 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 87rpx;
+  width: 113rpx;
   display: block;
   margin: 0 auto;
-  margin-bottom: 18rpx;
+  margin-bottom: 10rpx;
 }
 .content {
   margin: 0 25rpx;
@@ -112,6 +120,8 @@ page {
   justify-content: space-between;
   margin-top: 40rpx;
   position: relative;
+  align-items: flex-end;
+  margin-bottom: 28rpx;
 }
 .sale-box {
   flex-shrink: 0;
@@ -199,7 +209,7 @@ page {
   border-radius: 20rpx;
   /* border-radius: 77rpx; */
   overflow: hidden;
-  margin-bottom: 63rpx;
+  margin-bottom: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -315,15 +325,29 @@ page {
   flex-wrap: wrap;
 }
 .title-more {
-  font-size: 27rpx;
+  font-size: 24rpx;
   /* color: #0B898E; */
   /* 元旦修改 */
   color: #54504D;
   z-index: 9;
+  width: 173rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 20rpx;
+  text-align: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
+.slide-out-box {
+  margin-top: 20rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  padding-bottom: 1rpx;
+  margin-bottom: 40rpx;
+}
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
@@ -359,8 +383,8 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 93.33rpx;
-  margin-bottom: 16.67rpx;
+  width: 106rpx;
+  margin-bottom: 10rpx;
 }
 .six-box {
   margin-top: 43rpx;
@@ -546,7 +570,8 @@ page {
   /* 元旦修改 以上为注释部分 下面为新内容*/
   width: 73rpx !important;
   height: 7rpx;
-  background: #DDCEAC;
+  /* background: #DDCEAC; */
+  background: #CAED72;
   border-radius: 3rpx;
   margin: 33.33rpx auto;
 }
@@ -557,13 +582,14 @@ page {
   background: #0B898E; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
   height: 7rpx;
-  background: #72674E;
+  /* background: #72674E; */
+  background: #3EB978;
   border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 37.33rpx;
-  background: #72674E;
+  background: #3EB978;
   height: 7rpx;
   border-radius: 3rpx;
 }
@@ -666,21 +692,25 @@ page {
 .other-plats {
   display: flex;
   font-size: 25rpx;
-  margin: 20rpx;
   text-align: center;
-  margin-bottom: 70rpx;
+  margin-bottom: 30rpx;
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
+  background: #FFFED6;
+  justify-content: space-around;
+  height: 187rpx;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  align-items: center;
 }
 .other-plats image {
-  width: 107rpx;
+  width: 80rpx;
   display: block;
-  height: 107rpx;
+  height: 80rpx;
+  margin-bottom: 15rpx;
 }
 .other-plat {
-  margin-right: 79rpx;
-  margin-top: 20rpx;
   /* 春节新增样式 */
   color: #54504D;
 }
@@ -807,40 +837,54 @@ page {
 /* 元旦修改新增样式 */
 .xpth {
   /* width: 697rpx; */
-  height: 462rpx;
+  /* height: 462rpx; */
   /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
   border-radius: 20rpx;
-  padding: 22.67rpx 18rpx 15.33rpx 0;
+  padding: 22.67rpx 0 15.33rpx 0;
   position: relative;
+  flex-direction: column;
 }
 /* 元旦修改新增样式 */
 .time-box {
   font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #54504D;
+  /* color: #54504D; */
+  color: #000000;
   display: flex;
   align-items: center;
   height: 37px;
   margin-left: -50rpx;
   z-index: 9;
+  flex-wrap: nowrap;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
   /* margin: 0 5rpx; */
   /* width: 50rpx; */
-  height: 33rpx;
+  /* height: 33rpx; */
+  width: 43rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  background: #4AB648;
   /* background: #F9F1DB; */
-  border-radius: 5rpx;
+  /* border-radius: 5rpx; */
+  border-radius: 13rpx;
   font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #D62828;
+  /* color: #D62828; */
+  color: white;
+  text-align: center;
+  /* line-height: 33rpx; */
+}
+.time-box text {
+  width: 18rpx;
   text-align: center;
-  line-height: 33rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-left {
+  width: 393rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -850,6 +894,8 @@ page {
   display: flex;
   justify-content: space-between;
   width: 100%;
+  align-items: flex-end;
+  margin-bottom: 20rpx;
 }
 /* 元旦修改新增样式 */
 .xsth-more {
@@ -876,51 +922,74 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-product {
-  position: absolute;
-  left: 0;
+  /* position: absolute; */
+  width: 697rpx;
+  height: 373rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  padding: 25rpx 15rpx;
+  box-sizing: border-box;
+  /* left: 0;
   bottom: 15.33rpx;
+  /* width: 710rpx; */
   display: flex;
-  width: 710rpx;
-  justify-content: space-between;
+  justify-content: space-between; 
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
   /* width: 270rpx; */
   /* height: 333rpx; */
-  height: 340rpx;
+  /* height: 340rpx; */
   /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
-  background-size: 100% 100%;
+  /* background-size: 100% 100%; */
   border-radius: 20rpx;
-  padding: 4rpx;
+  flex: 1;
+  margin-left: 15rpx;
+  /* padding: 4rpx;
   background: #72674e;
-  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%);
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  height: 319rpx;
 }
 .xpth-banner image {
-  width: 270rpx;
+  /* width: 270rpx; */
+  flex: 1;
+  height: 319rpx;
+  border-radius: 20rpx;
   /* height: 333rpx; */
-  height: 340rpx;
-  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%);
+  /* height: 340rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
   /* border-radius: 20rpx; */
 }
 /* 元旦修改新增样式 */
 .xpth-item {
-  width: 413rpx;
-  height: 160rpx;
+  /* width: 413rpx;
+  height: 160rpx; */
   /* background: #FFFFFF; */
-  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
-  background-size: 100% 100%;
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%; */
   border-radius: 20rpx;
+  height: 153rpx;
+  background: #FFFFFF;
   display: flex;
+  margin-bottom: 13rpx;
   /* margin-bottom: 10rpx; */
-  clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%);
+  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
   /* padding: 5rpx; */
 }
+.xpth-item:last-child {
+  margin-bottom: 0;
+}
 /* 元旦修改新增样式 */
 .xpth-item image {
-  width: 160rpx;
+  /* width: 160rpx;
   height: 160rpx;
   background: #FFE7C0;
-  border-radius: 15rpx 0 0 15rpx;
+  border-radius: 15rpx 0 0 15rpx; */
+  width: 157rpx;
+  height: 154rpx;
+  background: #72707D;
+  border-radius: 20rpx;
   /* margin-right: 15.33rpx; */
   flex-shrink: 0;
 }
@@ -930,7 +999,7 @@ page {
   display: flex;
   flex-direction: column;
   justify-content: space-around;
-  background: #FBECDE;
+  /* background: #FBECDE; */
   padding-left: 15.33rpx;
   border-radius: 0 15rpx 15rpx 0;
 }
@@ -994,7 +1063,6 @@ page {
 }
 .ggfw {
   width: auto;
-  margin-bottom: 54rpx;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
@@ -1004,7 +1072,6 @@ page {
 
 .six-box-new {
   width: 697rpx;
-  height: 285rpx;
   /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
   border-radius: 20rpx;
   display: flex;
@@ -1013,7 +1080,7 @@ page {
   padding-left: 13.33rpx;
   overflow: scroll;
   margin-bottom: 53.33rpx;
-  z-index: 9;
+  z-index: 1;
   position: relative;
 }
 
@@ -1031,10 +1098,13 @@ page {
 }
 
 .rmtj-right {
-  width: 313.33rpx;
-  height: 154rpx;
+  /* width: 313.33rpx;
+  height: 154rpx; */
+  width: 240rpx;
+  height: 66rpx;
   position: absolute;
   right: -22rpx;
+  right: 0;
   z-index: 2;
   /* top: -20rpx; */
 }

From e5b314b0665fa4244601e13595079d24f85d5abb Mon Sep 17 00:00:00 2001
From: panyiping <981892160@qq.com>
Date: Sun, 28 Apr 2024 14:45:04 +0800
Subject: [PATCH 145/471] fix more btn

---
 pages/index/index.wxss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 8812310..239ffcd 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -554,12 +554,11 @@ page {
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #72674E;
-  border-radius: 7rpx;
+  border: 1px solid #111;
+  border-radius: 35rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #72674E;
 }
 .scroll-line {
   /* height: 6rpx;

From 3ec495113d5d7377d0281d0a126d93bf4330bf38 Mon Sep 17 00:00:00 2001
From: yvette <pypcwt@163.com>
Date: Sun, 28 Apr 2024 19:48:44 +0800
Subject: [PATCH 146/471] =?UTF-8?q?=E4=BA=94=E4=B8=80=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 8 ++++----
 pages/index/index.wxml | 4 ++--
 pages/index/index.wxss | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index b940de5..3ee47db 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -50,12 +50,12 @@ Page({
       'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
       'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
       'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/6d2a807d0bf5fe4d48ebc7d9ef052a86.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/be55040b6dbf55a69ba15487bde5a924.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
       'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/b14e5e8ccf6c725bf1d5a144f6a25ff8.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
       'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/94c63d92ca6719feb691111d5785ff3d.png',
+      'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
     ],
     viewHeight:"0px",
   },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8e9ed96..d52cd90 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -458,12 +458,12 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20240428/be9d01a4552438a93681b1e6b3c1c783.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view>
-      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240428/9ad72c94d55ef5c94f942b8c91e63f83.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
+        <view>高峰预警</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 239ffcd..d876702 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1065,8 +1065,8 @@ page {
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 93.33rpx !important;
-  height: 93.33rpx !important;
+  width: 70rpx !important;
+  height: 70rpx !important;
 }
 
 .six-box-new {

From fd525f0608e0cea39368a0e5cf44a33181471925 Mon Sep 17 00:00:00 2001
From: panyiping <981892160@qq.com>
Date: Mon, 29 Apr 2024 09:32:23 +0800
Subject: [PATCH 147/471] =?UTF-8?q?fix=20=E4=BA=94=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/my-selds_1.png | Bin 12776 -> 18998 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/my-selds_1.png b/images/my-selds_1.png
index 7e5cb3bb6be69e3b315b2ae8f18c00e54d578136..c5103f629828c28e78faf45e90733ed55ed45db1 100644
GIT binary patch
literal 18998
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

literal 12776
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


From f806025d5e5d91425376eb94cc86019399defef3 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 29 Apr 2024 16:35:36 +0800
Subject: [PATCH 148/471] =?UTF-8?q?=E5=9B=BE=E6=B8=B8=EF=BC=8C=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/homeSel.png                | Bin 3530 -> 0 bytes
 images/index-seld.png             | Bin 13015 -> 0 bytes
 images/mapSeld.png                | Bin 6306 -> 0 bytes
 images/my-seld.png                | Bin 15868 -> 0 bytes
 images/tuyou-seld.png             | Bin 23265 -> 0 bytes
 images/userSel.png                | Bin 4506 -> 0 bytes
 pages/list/activitynew/index.wxml |   5 ++-
 pages/list/activitynew/index.wxss |   5 ++-
 pages/map/index.js                |  15 ++++++++
 pages/map/index.wxml              |  33 +++++++++++++++-
 pages/map/index.wxss              |  61 +++++++++++++++++++++++-------
 11 files changed, 100 insertions(+), 19 deletions(-)
 delete mode 100755 images/homeSel.png
 delete mode 100644 images/index-seld.png
 delete mode 100755 images/mapSeld.png
 delete mode 100644 images/my-seld.png
 delete mode 100644 images/tuyou-seld.png
 delete mode 100755 images/userSel.png

diff --git a/images/homeSel.png b/images/homeSel.png
deleted file mode 100755
index 718704c1d083cdbe3f7b81aa0098c20d5a0a3f33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3530
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
Eg6J2#_y7O^

diff --git a/images/index-seld.png b/images/index-seld.png
deleted file mode 100644
index c45cad0e3ba34b72ca7266b853381d98ce3650a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13015
zcmbtbWmg<cx9!2*CAdq12M_K9cXtRL+;wmd?izx->!87d1Sja=!QBa5p7$@@58bs^
z)mgi&cURRur=nDpWYAHFQ2+oy|12x1_LkQD_aGs>y=z-{jNTHEtD1~BP%}w-005N0
zXGt*)FQXHG8z;QQw7t8v@eeFW17?jxv7$KQNVK8s*}OsZ=w9CXD;&O%fLXGC=4O@w
zHy^Rr$nv719ymlSeSGLUUKIu;6(sMjeNXS~MQ+I)O+;a6si;DAV(at!Ot8fDHFt%6
zBx{DDvZ&ywsft>L{#;re_q|%JRmywHjYFzYl`rtV*s81d@L(R+@?EIGX$ViSqRNr&
z$1RWmyHb}-W-M9ZacT49J$(bm`piIwI%#`F$$zBxMtzY=CYxd*yyVBOf-9Em&4jz8
ztSfK}fxtmSkuZt8ZXVVI^_SPzc^`E{1k~xU053c*Ebt9?;}xl6zc`9fXlg19E1fEw
zNs`3x=vqsb$RoU_n1bn~2!q5adJpNI%)kq?GsY4O2O`QKp!WxOAZWR8wS1#922|79
zs}DB@|1q^-Y!>Y|7J;awqyvhMBO^syjo+%@^J<tU$PsTAv9(B+5;#ZN{H>zP-<OrA
zhQcdu5dtug7XAid;}Th{e#rVP{@j!72qJF|{;G9ezN27ktZGa_wuuwG2?EQ6fylEs
z89cXkkc$_V+<^dU(KrywwM~WPnfv<$cQh*AC+<6je>_*W86)eHEA_RD@OuMgJd%zm
zTuxbq$yr${{!PB+Axlhn_VlWsO%6q&kGCOm+zzlC#fiB6Em%hIP6n~9KXn`(?PdoX
zgZLBoq~UnZN8mNJIR!SZ2~vm&Nhp^96MRZ_(*FH1HSQq55G*<81SDWm=Hzgcv-sJg
z_Jk#F11)^y!lNgtS0Dk7%PwTDbAJmh?GP14Jp=kJ2+D{wRhqznx^wg<;yFE@L+fRC
zfdQ|$HkcnKQ;c2Yd&)l&G*BfyhqGa5K8aI$!c)hUV_@^``EFjK<94#I3;^{#{uiXz
z7Dh&gy6GGO3RIA#1Kaq>S1|MkDKof%_)tfLQFC0Q3{aUPoZ!J>a0-V)$fEin#{{)A
zfI^bgj~NZagXV!B0U(#wLyV4gVZaaFBcZ7!IoCw3p|;4{?p)eZiRDD=CYpv7BLOQv
z4xc0>c=DiSJDPvD{XQpt-T=5tgp$Z}@cUs^>MJ?n?{J{Bz^*emFqc*r7Snx9it|$&
zegik#zv*4TJ77lGp+kMn!<r&8bGbB0vz<l33WHX?^V?HtiAnvb8Mj|kahvyI=&U;K
zynteXOKFERj(^UY$2Y13{tKLEs(7fZ3cXFly7EWh+=TzaVt#8-)J=$a9j-p7R~<Hl
z(BKi`NCCGG=K?mn{i8CKc-UWCb4h9TxO75C$InSWYJkhlWMjb@Y6rq20+%04q1arI
z!7-RxXlsafvZb)_|2us;L!A8PYr+pWMLSKVrR=!v3rLB3<5Sm0nXp84jw9e_yqIr>
zG_9cs^B{D79jLA~a(Vo?(X-N7LYb!to&3o2m;@#Px<yTRf^z00OlE56ouuH<hc+Dt
zeJGSWcAF6$_BXLf0Y0j1V~~>W?laE!N~LICDz8bZlFD|0&=w8#Tlv@IGt-#V-}PB(
z(X~;V&0i$G{PC+_zoO-hnQ<C00KU&vf6l<IICd0udN*|Xap4ax@<w-4;Y;@EwQz;<
zLK)EOEZt{Q&X`BRVJS4452#5%4}$DNs7$5!jSLW+v7ip{&Wwivo;?!j2tclZ23Nep
zBx(T!W5hN=DwJ`}V_&WT7jUq}%jUQY!Y4(O`e}8>JDd!^M!`7FaM5)JX}pAZcMV>d
zVHo3YHHYSY5;EO>+*TV8N1`NTaT-u*L6(q7OKl0@{%!wGsQ^*sNXfv(+h`<XKdb?R
zfDP=mK-K>_LiW&)+$qi^H|!WZ952v8Z3WYMwKn5F!_7|eVILpF&nC8Gh+6d#VK&^9
z#Eg>lR)Dh`D<(J3O2ly5#mL-W#;u&*p^BNQ!E7;M6=?(&JpL2#pdP$%Ch6V(XE}@^
z(`F|pc9-r7Yc*_WT!sC$cbluNyRdEGT@}rQ{vkO%yZ^fuDmiEpR(>S+lMh)yz_!P+
zXSNJcMolJZ9&Rpd2C-e$@&KDkT`!jOc4V?Pih#2srbofrm+DS^7ZfE#ReR++WM{z1
zN^>%Mh2|7t27&>V0wl80@svXek;#L19h@hyr$&433jj5&yPca!ivh^rciq&%>1gL@
z;8iMnv$g6<EUtv5L;mNsyUx>==5*NBD_k4#93w3ayc_Z61?X3BC7DUu&=JNU57uQ|
zFKPI$7UKFQ9sfzXPCQ4<rjU_vU>+_?HMR+-i8d%lhO(+eS`GKLSIL@@{+npsir#TU
z`x;@so5xlZOdYW2cJthhVidQpD49AzI>J-d$w$9HbB`W0WnH%t;#voN>%KV|M~SFV
zbCK6KM62osT-pUB9R*oyMvveG3~U~xT^eTyELoU~<ys#Duh2mhs7~!m>91e=lKu5J
zV95Fzzb|%zF2?7HqPC}NHk9>RxU!@Dkk)Cw2nU5s?|`+wknV`DRcyNj^64yDs8jlO
zBko(-TxvU5{1WxJTIWJh+v0yPpeA=W>kAC?IbLSKYEzL{P3>+hWMyijhK_v}^OvHS
z`RY&l!;XJhP!5_^eC*D^qw-tSvo(=}tsrNANQYk@Nh6cck|LLI<i12%pF@b!TG|Zk
z=00@;&9Ir(6t1n3AT}V}(&QF&1f|pQ4uKL67`8*0XlLR-UQL8=l)Dz@uP-0@Twctx
zp1G8?X_r^KD;u<5#yUfG&5r4V*<hGCkga4~x;{rMf{!S(kp94%XfqN!1kB`+#dCw_
z_uhu?p6KY)5mm#q9>g9@6wYNNepiCj3*(~O`-x`NCQe9Wm!O5?=jU`pTe~&L8Qau2
zb`_{CXy+G<_X6PkHV!Ce!Eux=s>dM8R|QS;A4Bva*o)@q(C{&wT|Hy0WeSOVi2P)|
zL?b$RWF_^vxl47ba;e+kq{ujB7TX8;z0f{QEPI|%>G}!fA_nw6C8$>5vve*3zLcPq
zOyuU3GD;+cHgM(T{)gFoS1S6MFMzS1v)o3gA`gfEYg$63mJ{57!^|3qtE1s0g3qDF
ze7{wdQyi@Kgj!x{f#mxZjfI_WjUjFDJzmlOM!-*<SHAlBq1Q#j7`?VUq~*++x#nd&
zXGhXHOmp@~AG7*-XhjR=&d#_H7S&q#6O<d@lZbB=cU$(64y|%GHGJ!h;mSAzdyiHn
z2pmV{6H)Ub=TNr&)N$?2%9)Mtqz^a-{2*2KJU{DG!}kp5AqaB=V`BCpSmcu3G-a86
zok2^JoN<K9jT~Kuid6M`{NL?EOBfRerJqSV1)kCy5{WHd!$dv!wvO2s_>HG$3NP^D
zcW-n+_unQ^JBfUPOUH|Ue-?UPy|BezWOUJC^sU+quxnVXEJo}^UhK|FmG^8fUMq93
zN-Cz`JbpK#1VBI|?}?9Hde>TO-1B`5ytjs7dIRdaE-y13mb#Jbc!PfzT=QdWVyL!?
z!P54?J0&ILia%J06Y32u|KwRXR1y=c-1eM(66_p;seKoeC4K0zu#D^3%|42bf9@-u
zmBJ8ig%JvE5&V{QUk^ALK0tK89n}<aII1_}mLX?K4DyssJPE-K3ptfK@ARTssjVD8
zKFZLqY`)E=J#YBFpqFDpz_&FRbU?1U!EN7!;V;|{UzCtT>`IWz(>B7E40&(9Hi7a~
z^W@dgNIVh*ZlqCi)i?FIsif%80I_Hi$)oZBI^@DC98IF9Z6wTeyqqfTJt59DT%+K6
z9B#n?mkXCQIN}Iu%%7PynD^SP-;AQr1%^XR_LT3i^q9WcheGjTu2w<Kgh|<Q=rV9w
zCKi=Q!T~AUh}UaV8tD^<%^uv8M_5*R(T42G-lrPbI<p0Wi5M{G1P$u%d3Xub;@8Zb
z>wGOht4$U!Xy0`mOq(2j{(>VwbHik~`o-8rl_K4L49a1dR(Z)pjN2!(Bk|;#Qg`jY
z&@tcq`cbr+PX2wNaem)%Xu*_n7|tJ}o4U%yPgcf!t|hKqSC+Fv@w8xl+c7JtAN9=_
zdSCo>2Wp$0wC^`_gQ=)_0n(7fwV^Qw(?0X<;>US`Gd{YLIL>#?^Rz~Y_c)BZ^yJEZ
z>GVniD{Fwgd?3Pz(Qsc)<blHoLc~PKGbQ<ZfMEi`)H+VZh;W377&uMX3>xT08GQVl
z=!3Jbq;n=JmTxoe(PCPZUH&~oDkdgx(s^y4xy&-<<wrHfbH`x$p5#`KBg_oirV{L*
z#kG*V`ID2w=m6SU8I)f1)WO;65tJG47(K^W9j=r=1xxq^>frE~*qB^1bKg()R!1Fa
zXXL1zj*LZvU$(2jP;?21$@^kB7xmrbC3{8T0~lvD$|r*(`;)_)WpYg{k&l3b!Q(L=
z=4lq3mmPeD^1A<Jw>b~sW6f_9B&2mbX^lB0TtUKx(_FR>gL&%u`x3a`7D>q+Aqme_
z!D<CBi96qQaOC;mVS4CdnsAdW6R_qiq{HU(;EW)k#Kf7Ns#u1Iel?mEHz6^>^rJZ9
zyWz82*8o>m=@Af4MDm?}NFWxt_y|^u$YD>&mDTujjMq@#Gcu-hk@L^Lt6n{R8B^#8
z<OeC*v0>QIf|;C>JpUM}#xj~htefVAy!L|?q=dZ+Yc7(*PQp?wkO#@LcMhj-GMGXJ
zjIf=s*|`KZ7rlOv7H8>koHGAyw34Hs%I2#CRe9w8u9_p|(W$xXQo8O^@~qiG)hYM|
z+yI_Zrk;C){d(qi_08UAU-Te%<l}o^rDlH$wWk*NuVDf(AJ7tifV?G0kDGp2Gl9GG
zSk~j(8OZVfe4zv1sCyN5?7Zi-)bdJMM4Il#8w?*Ov4rJXgW#u-VXSq*C;P@v1qO4v
z<MOZ_5whl3x-_-a`@<LA-ZAd6ABWO8sQ#vgvf}uf=hm0t?@!rHY*lqP;Pehx%IB3h
z5rt(_79zILk@nlGe4!S_oc~F`O1E`#c(hAnH5|tven`OTH-?_Q%f3!>Zg`@DMCr)r
z0VA5OsSEQYWP<A8Tm1)Ps|xnK9Uc`$;A-Ln$10jACiNgdk7jyxSgI1@L`=0LG3H@s
zRz1(aR>6Z&gNI!99-++^w@3P-a<a0~Tm?_RK^2|S3dtTjtE;QM#rY=jcsHsMrB^N$
z+0|c6;=Dq1jPzq*!Jh=6u|sS{vTZ{Ac2{ORN-93c&J7aa{eC}64|{>w<U18Tz0aqo
z*$RVgDMQH+f2F9zT)gD@J;?=NY2Q2dw;9cI6w;!)3hQ;$eGsdvP{=h7-<t8PJq6fU
zrq-Ri`ktN<@E18B790Pvu;p%kj{>(FMZFSY#z4D1+^%F^0y>SfEay+e2ZS|LIk*=k
z(`J{n-|uO{6vN=5!PR=eH3WCRG^n5l__On^eC3;IC=`CeB)NmtrhgGOT5i6#Q7)Q!
z*Nu|lj>Y`B<QUV8AyVJWIXuCC%S784<C|4B|Ah*u3g)X}leMk#5-ZIy6IOKybj1oD
zHbfN%s;O6{NZDy{blO7ickHaJM`~yC^oI$RP|5Y`*afyxNz$k>>qJ3;crRxfS*#MP
z)6{|uOCVEmKQ;mdIvYcv7_&Q+79Fw3Qf?zE-z;QTL5WLJ=Cu%=Fj3)+Ubp5-&!v?w
zNJP3M9d*7J9bL{*>Zu!u)7k=5Hk-7UFrZs7;OOZ-L34u>{|!NZAP=?RS&eF+eFwF@
zX$8T;425g!yh#RZqD0_+F-r--iYmeZ8|-6u$rgT|((=OghbPrjLnnQ47<X>ed=x2j
zO@hfItU2OGo{Iv;7QV=0{jSIGC7i~FT6P1khPLjP?^gqu@V#%wC`9f|=;zTbjnwrS
zqNcXLqh9_5<v-Q@i&*)5%ue7NwE8$!LLYa5Uc-?94uGdI^;WW;Ctn!<CdJBb!!7{&
z!q6e+8cppR>wFtcXzR7)o9GPWv%Jro<L+a|No=LkQRXK3dj;{tUx`V^jD62gKG0z|
zUi;3Om>i#Q|D6ewc|2d2%XHJ}x^?Og^oi7dxHL2ih9oZiU?ySE*eTXH&ww}!=9OKB
zDp0w{ja?d@audqKcd_lw@E)GOOs!}`Rwe8G(n*xPE4EFQeFvWPx-+=>tb^^ncXYc$
z7{@w-=mM%v@#HtLh=aDzp4sQV5@)3*>5D|wmEHGFq_RY?=l^Lc?>FfPJi1g{Kss_}
zE)~iByd+x_jlN-g6#JC*mAr(;79{?h7<@iu@fujhdL3?;iqaMHIat5qimZ1woc3|t
zJ#s+x5&c4jMt=vEBb-=Ak-+$nt@hm^rx5Ggx&q>Xf$!r8RLtD$GIjA#M?*HZEz^KP
z@(&f{{X22;=}I7<bUi0r#v?|ZDtdBgdPB!{{nab;U%F}Pl#qo>8p3wP%$BHOvfhZj
z@zHE{?pC?b!-6Hs0W)A0A$Sq2M<$eX&vn8{u=42QWhUjn(i~A2uY8>%S1<Kfvwy%S
z>^|rM|6MO`DN<R4iNK&kOwd!|^eJwoUQc)4d(bx~aO#H`b}c3I#bhtVUO7Oyxaj5n
zER&t&5y_}7!SI`tC*!hvkzh#hNJ=k7sy9wn+t80H&VG0C6oFm~mai!lQUAs<n7YJm
zK<zS_g?VMJW}0?((xQS6fJ0eT4%EAg?%Ou+<*e8GF5FG8$G&<>LngtTF^BLi*my?r
zuyJ(dstoK<wOF3D#F<D(;D!IY$zLNF2{TnT+gjBF=l6(cC(Xh(SG6_CYwdm;(DvPB
z2+q`0s^_Z)YRm-f2g;BMgcF%#n{QPeAE=&W{}7zGAAY>pGVl5me{}VYS&xf_fkBPc
zj0bBEADBn@X!_2hP(IRwh7VXWtXcGIDtx$X`;;?8+G||(Av48wC5>o!y6J9FQsc@@
zui{TZau(l8!9-&ZZ5?8-(&EuSKZx<YD#G%gq@)~KKGMU{BX?5esgApzOCJ}=S*gb$
z>r^|b_np5;zx{yrGZuM8Q9k2`Y_1ie-klwo)475eM17lB4-(3!l<y-)95-LK%c5p+
z#5){U^|W~E*@l@E36_BKobED^f-T`VMIOV~fAbc%B%6*`2Kw4Qh5tI;_I<>M9-i-?
z&LHLlIkjv~o$Nn5zJDG{H2CiPUVKyZ6%#7{`8tCK4VUVXG+e;E#*YHobKSuA-lbMJ
zStO&uCh9UKDd{tRdqXH!He6Odqdb~_>lLL(uw2N{`<8g*Csn?g6?UWjOb*z(+n2a-
zYJ9LRX5~7mR`5rOlVZMYmwh#6yW8_GFcdL^TIR>~6+^Cier#<xI0<(qN&z}tQD!CT
zt3=|Hg-e;@nP}`3)U33suyLOF1=^-h9~bv1!jHcf{6wii_8NTm#9~sT)&5mmX89v;
zo)eV$J0A({dV*?5t)F7fVWb>H9J9bc*aPW{<2d)tb{}ILGWf{WazBEmeQ<#<>t6-Y
z0C$nXJ}^;f87dl>3$dVjdcXSRFBwX&@7-BTO$j~R^*GAPUvax)oHW$1k1_1Hpy|l^
zx|>mw&x{eB%}$4}ye5)Y2vS{E!AIi0qu4wG(!^#n-t`q1(E*ncy&JzfXipPdD*oLX
zFSJH6p;?THW-m=0*UcdQ_%qpn>Et<Vpl__c;o)Dj{A#3k5(KIebe!CQP%lC?v3sb;
z<%H^pFnCCC2Dv^lmcd@M8nya0K!n&y)Oi1jtE!&1wr6B!XJ6&))kck=N;gJv|6|~A
z;>zBWFyx}u>;`!o$d3=12_7ppRabs%vP0i&604#DeH%tG&(&_;2?BmKjohjnhbq}o
zmClj3gs(7&6A#U3kj62ejy(O&;`eTEy(FB0!mF*r=)fl)&}#g_NRkcaoD=TJ*PVLN
zX1iOR#y4Mj_@~+`lHyY&N#IpiiCn3OVaLp_&q;s%+ZWN)M&bl<05=pzcp<*B#HHy3
z=Aoavp?c~-xcN<x!sd_Fz!flZX#cIx2BRohHcgSq`tc^BMD%y0IIurQPY^HQYCcK0
zYd(M*PyDvE7+ife<K2T$25XD;gdL&bH-&GZyAN`+J6tb%-;e8@iLmgycL&h+Jj;+3
z-08jg{=2DLH`FpBy)a`-SYi&=q};1Wmf4mH7lw;hpoZ0fg`X#)St6kGRQ|g?nn*ur
zYhmhG(>Xw_FTaJ3t!oif-hC@qoj@@x$wqksbIQ%$DL7ndEQ}Cws|vcW<aWJu@YuuG
zHMiX+8t_0LDUI!IPcQI~&%WuDBgY>0KC?fVp*ib*eJLx;P5f%O5Wh!QDM!C|Q=nzC
z9<Ho8iUzx`o`-p<HP$yQd0j9+XY9F6L6m%=iGNZ}N;O|{ENLYC3p<|GfDP-W#r93L
zUqYs&PT;Aarx&@*LBzy=#{q_SBB_uYd*;zn$<ww)nw*Bm{K8X&!oT_Plv-sU`K7^p
z`H#dAhV9Z$vi|`UpA3E4QpU5S<T_B#tXt<>v>@J*q(EA>-ON2w4SxQ(aBxDRNR?c~
z58CcBOEqg$gExx?@r8=d7OkSf90w2PA$}>4hBFZ|xhBZ6qA@dqx$g+8qUF<H(Jhuf
z$7C32^WH2inbS|~soT7j2tr32(1%}2hribiwBEWZ7>}h07`jsnD-_dE9pQ-f!)km!
zUpV<2=1$0V`^{~yjh;tS+?$A?7OawYUmnCQG#48iEg5$?&?}7MiQ3gMHsrbyH<Y75
z(mVE_R==8{_T}R6FB^~%Aks*siS;5T8N&p7lQ&|F0DO}#{ode*eDKeeDWEaS1&jZu
zQzgydywLCw>0>-%4$V%1`F&9HkNq9|fp*++>S)LZa2DQt6zy84m+%H|<$)PBi(Z5x
z;|kf7K>PJv7!!?uUlU;PpB(=wFetK9D;A<?iXQm~Z*_k11HX6wET=UK2pqAV7e1CW
z54`5$&wWB@3>SclcXK`C72Z|3Bcr^b6p7Y54yZXeet23FSl!64)K&2kIAm6nK^$Nk
zYwM@IBs()>*m7pqTU6SA45jXT{MAQJUak!72DBQ#|M)G4dL($J{eqxzCA^KL;L$gi
z{+Se|$swd8gu6Eo1sBfq@(V10x$c3lA))EaQuV+I(uzQ17{pN=l|e0ZJCg@F5yG($
zESbeVTk1;qx^_&xv&{*|bKCX8r`nVkhuFZ!d{!X)o2u#BAAODNjL~h5+PS84y!6CE
zSlgXm0`IO2RQ`eTPxF&E@z&bIjmKQfUYN8{fuNRHGUah)Q6CTu()5S~fph4IR&92a
zn*)2wYeBw21hZ_l;47u5-2QrKIS#g%K%71HB}IjD-hAB%Vh0z&s_Wxe=;RShWtJC_
zsG>4)bZ(^W9zSKi*l|RStbfPeKppThFW@9M#j0b%yr}ao4&G4eM4kiuRn}|q`U_jk
zOK^}sxkU$P9b?*lZbCNT6AXYk6#6NI-fh?6ujk#%d+x-KKLMpG*~|jh0{dd<StapG
zya<*LE-wS;Z%}7mzcvoJK%4?3CRg?)5@=`KlA%An=>PtM=}_5D`N$WCLjp#J+j0CR
z58G!-V%)BvDhR6k)yh3xIxat@nrCW30*ux3O{(h??~aD}`IG5o=_5ZHASg(BXlr{Z
zF}*?}`d}W(?E4NNh?eQ&M`}sB@2rQZ>vq4|Dn+HXRHGy7E-L=X#kdYAW8w>7<4;q}
z=q5c4E(>kllG(969FBGMiz0$_It!H{J~l1ee23&(jbcxjBIY<6f56qh-Th!UIfkJW
zE^%vt?REc#=FVcc^$z0u*+nn_KS#qfxH?)O#|F3Gn2h^&rd6VK2;5`LAx+HpuxG0@
zusR}6G9|qM_h{PUnOYys23ru=*7z0fPGF#=jAJ-GpYLkINezP9yUbNv)o`qf*)S#=
z0B2GROl5gR9*`O4jTHTUy}<`hHL->5^C7<3|0`a0Qz}wNwRl#=c<=zAPq0gpj+N-g
zcF<w$-VdPSC2?=H!x`&<T!esXt|*mpvE$HGVHiT-p-Dv2RGVvuoOm*)4faheaL^SH
z5V6;0KvAewH-?-|D)8eoJ$xO+^t?|?nL@8qXU1${)w?b32*bp~-&M-m={^JpzN6nj
z0sI1iO5_VZJ7^Icm(D1k|88DtI>;M07)9}tY(Qy1K3a;Ak8MEAyp3rn?}tPtt}qyL
zu0Pksd=t&fFRv-UCXmYV?bk_*@zofYPoa-z>O$Dq<I>M}CZ-Tz&DrVR0|#QgRkG3e
zJK03M2t`cHUQzkIAVfL@9gmsNMDByY#ZNEW`~8O(+kg4Vmx=q=^DH74^M-qH+*1_-
zBA-Z**a-XfUgrMpgWi8%SRm=Q#~Q&8&QDr8m4Zy66z-|nzM8_H&wZ}3w15M;+5AB8
z=l|6cO`YjOKL@iSSFd_SuZg>n>XRmZ;V)&9Pv^0c;8|7oa}~0>zTSlqS#R^%#yd9a
zi1rBdg9!i1@T1H@EeOAJKH+y$ibPWb=kUd?XS+IURaxy~N0(=fC~RraathU-!l2YJ
ztPw4<W9ug0&*B>^aqhO*eS}nnHc!8h#$`3L9<78Nr3QUMr*BR|5@CmiSa)y3r)(M+
zNj}KG04C@K-~AXpB2_9PSh|r!Mh{U;lysnru^Gx0diql~ZackFZ%#dK@N1Ds!QS`t
zUQcT-ac?L`@$@NOoW%*2IoG|+oSR|!O;p6#G5f{&)NCkeFq9e1gU!xb<U0^xJfem|
z0P^IWQffe_z9)<Nxkc#0iP+sUf4A#|E&t}(MKDQSOzBSukbXTj1uZF?X~{?<a675V
z<)@}9<|J6f9E^VYAOLFAlfY8@aq$ez_d1qL&&Po`g1O-RMLhWuj-Fb4A}+Wa99C{A
zLER``9a#y(U#LmlmGCF9`KQs+s<7YdCeTX*>$IBc=L&1{65H#N&OD;Q99naY$o6is
zf<}TgHj2rcRxL6cm+Z?%$bCKl;Dr4b3qb8R3U)-cC|@23_^oGa8If;Otwd-9yCb5-
z-SWz!td(YqlueLvTUkw8%V#*`2=7uQqUze|;=)_fl;3U)_yEvEdory3b;3ElPl0lM
za_P+Dc;G-M7!?TvWz>_jve1AlgY5%#8s8X13NkjBOm(!f)^Eh$$|o^cVEEZR#7!%1
zqFx~t7stj|J2NxNqLc6zdD0nlV~=*HS@aKNJpG3M_>~dO9qz*LZ|=?p2>`F1Y;QB&
zi!15-Gk<i+N!i^snU|*PGubHV*-K>x(SW~R9>X*0C;O*&DaKt_-x{xfm5loP*Jpw=
z#X&#J9EOU{Y^T%-Yc`ap(Qlq%WAa%U$KNxS>@V2T&3Xw5jk|p|#<imqj69Rv@x*$*
zJ1n{FG5?v=@X9=7tCWmDp^P|yFY0<1kGpi_Ex5G8QT_E~_h*)f`vwzm?k~k<EjpXj
zAZG^&q`STvBM`?L(-HL*l;4v_5)R|&L6)M4VA5l?#hR!~4<}JL>v+_tV$(AHm+}!$
zp45WSq=<^RAr800rADKvNmBX)I=aJHdv0R}*W(W(MB8t<<FVNS5ZV;2++o}+F-7y0
zQhNiv%Lc@>L<8hVAL+S6KGdxOdSj)(;=Z4KI~PtAnS|cjB-^S0YeXPOf*!`BavaZ1
z&u99IUPHuvDYJ2fA(eBxaRoPw-ag+SAbVh6X$vW&AFNB~2|xIiC>Oo9v)D8HQ60uS
zteO&&4`HRleEM<z$4K4p&;LmKx{<F0Wfrbm*>zx@zHd#z>RBu1!aiv(nab-*tSrvq
zWC<N-C&6Z7)8yZ7qOKQg8+_z>UXvw3ej^$G*fnh);hy-<r75)ga4IHE*!WVG95Z1_
z(Lby^PkBGr4pIVb%b1PKOnI>H%XvbP69ep6UvV*WutywC?_WX&@a^`Vn)6_G!>rUH
z<ztH-)QiA=^uAZCfWyG2ROC+cVN_@nv(a%V4R+eN%^lyE{eR3rth4;W#bWsBkHi#0
zg2=+9fi#oP5GTRR({-H5GM=8Cy3ZucB?+Ma;a3GohIA(EKU@8uf%N_P{3$l00~1by
zrj6?0wa|y`iXqM?nYt>fh_N?aon>O8Tf42ju%ARHe6#z#6pf+i8y)11BQDTWzkH$A
zqYZULwQ!HjAto!mrsnpqh6={ob5QI5penB|7YSq{Q@^;M*-{)j-^Y4kl-#3Td>0Md
zR@pPKL<J7iT$^k0zn+mjn*@3fM&Hx?Xj)F(-%aQHb_Jnuv98bAnZ1}%3&2d|Ql<_`
zuWYILsDQ#Voh;~to$y1;qLT1RsRlCD$8r-DCr{{b$=LH(<Zlld^-oyPYQBKC>_|_A
zFcH8<(>q%7d29ZJfgp<84p|qqP!8M<M^A6wjr*$P`DgTJ>!HikK(d3f?g$6$L*ei;
zZl#jp?<_Q%^zUuy2;ZVs381bt&lIVOUj=3icdUouiM^VVNQR%dDC&1K9!NRVY)Cu9
zv8sOx$jDcsyyKxBQZ|&`ZYT;XIYgqSt$A>U>s7UT2<zgwu%F<)u|+H$WTz{&D`Q?~
z+&RPiB7P4L1S}ZSoYbZx0!ro)<g-+VW*AbAO4ye~R95O1;Yi$64JwS@c%OXkNih7P
zdK$$gs|LR&EuwpAGHwtvZ6ICM#HN^{0HhjwL>E&hU3Vtyt7^$4(bA|@Q3Npl$z)m2
z8CHgo5)pWgqTc)rd7u(*&jI4=c8=Cr*Bu|nnv>(v?AfkUXdhyQ452l&plL2LC<h{j
zi&Zn;Ml^Ynn^I-=>9`R^Al7Yv-`9bez;Ja2hpfDueKiCYK>TkhN#?DHN|=-wLTM^@
zg$FQz9E{rr4+Q`U^y;Ecx)Bfne1Ov@zR_h45EvG)V&R+B)%maR07`2&4ELXXGgQIK
z^uNN=kmM>d-2dzsf;n@;;DO1Hz^m=W);ab5EgY{P)#6dieSnT4FwU`^H=m4Q^vvO}
zRmLx%wP?{*miyNuK1`qQ1ilCj4alJbUd%K{i*mYuqxHPh-;{u|h$Sd`v--^tJc1}D
z9O9>iw7AR-{@R$TP>b7rLO*F;Xxj*<+0%2Cm!ImC(2yhkad77I)(2*wPTIG<e$uw*
zJ5RfoWD|mz5_PmZuYHaSl{7|qsDO?LV)v7dxo7!=YOgEp5lvGB!|kUNny>f*m#G71
zNWgOfh?$%Fd$Q3Yr<r*+S{Zly0{t)BI1hDBPh-JNVWX1F4cr;gpVj2!d56i>gq-!?
zfL=_Z-Z=UETybRWLDFaP(AwRE;?Iqyq4jH-y}z(rt<N6r8K~)Rlc-vJ79K=?Dd(2|
z8VH5~L@WRb{~9j`Mq8ur=Q3vXV=9&pJQDOCfoS`(w5lH9`&hG=6&(vuX(Qx+RlE`R
ziUpz=YWZ3?G=Msa4&$VE5q)rc&lfx09EO&f+xEWK2>W?zSJ6s@D54xe=q+wX0>No}
zW(J;Ml{umHvj)S5%~f?+%tc{dTriOfM$a;%FUaPE4W&&8;p`v2;(qqW`n<PK05HK^
zl^j_qFcv*!MOVOPDngV^Dd1_s{%-lBGK-uCodtJkdU;At&KkkF6{rR<b*EOc&u(~9
zS_AxraAW>Af`0Zk2f^&^s@zT$$j-yDSgSDq_TtjvAgtHfY9e#;a2GgnSSaQ2zCM5r
zO)i2RM4c?`gjZS}+l7k_AK*g;j+03I(Mj1h4;Dk^HQ=@FHthfgWO5jVYz8Blkw~IB
zWmB$Bkul$<mZZ`{?a=ThBZWdNBXo{^PyC4qJ#ubyZ2)Qy@04Sp3FKoZ`ojeLrEcwR
zC_e~?;GQj~Xf8gz=*>5cG6vxQd@CSkz8~nNEIW(JgxBP`Z;G5=b7CXP>ULYk+fZPb
z1b-!Hpg^Dirp@2HH|wM_f`TsbZv?0Y7U-#8_A{)+{+vZUFsA)7ul&|xx#RX)M#&GH
z(*P!Fw?8>3!VJloFaf_s$G6q)EpNUT?@HCNAP833puwT^HV-%G*0}6W@?|D`1+%(r
z*s$7`^MXi|{C=HFZ#5JN5WIGPBYtBReL(3p&s+2v(7TOLqagT}13(p^_N#kH04d<L
z+M61Mi1;5Vk#pi!NdF^cJW1Qf3uv+?T`lZyav~A(CCj6zgG8}DW66FiOhhg{dP?3F
z*L&i3&;0CY;QUZlDc}|2V!N_A?E&YXz=G@rMNBjjtR{C0prT%8a8UUn0pttaer@ps
zcw5Nm5!@KP+5eQddjim=0j}c$++T7V1%qq=gaZ!jh`OT=`*8H8J_=CSmpp9<?L{Gs
zYBeG}|73qC;bEN3A?=#O-H&p^t@4b0E{+Pt)O_1boc4^@lVJm1*Oz{n>>_%4mz)VA
z40Wa|rAkb#z;R>m2D9U*PS0!3V$U~~*-OsU8a6BtiX(C<dD;Y40Cddll#`y>y4o*C
z4{1&w`-!?>fOw@<ly%-WH=wP{i2&Ryau7EwQ8b<HI~yi_%*$L+51oux!`Y?VgTIz?
zuQeQqbuB@MS<r>(xPQR|XB>%R#d12X9n8NOB$+~A<qIeCc1x9w$J{=Lzx@DVY2A0i
z3JX_B;Q8gPcS=M3aZTDK+KdYKQo$UetiYwd^3Ll#S8gT6n!>>b_a5M21mRoVm((WN
z$`8ILf?GD6u@+S>WK8Pbp+kC^7H<(4udTGVKc2MEQ-H9B4m2i3j7Omcdxr<BNPM|)
zqcUa~*QdS|1ZQ@%dS-FJ65nsYT}sHg>1%GoPuLSJ+Kq#%q^^oe%|9=3JHlS7g9wPJ
zwNIdYU~bB|4U$9}>Lr|p_1nF)D`TsQhC(?`;CzHbQ#&MKJ5}rVSP#%fp70Uuowc7Y
zxG?~iF6$?kh}k8)|ND~Ds+;IRfu_^^4SqCUvAXyw)F5A0-`FnFW>hUcYTWpQ_<;rd
zwcySZw`071=JvKbk;VV|hccVK23~!`XOloYYv}ck&RcB5uTZmQgy%&(X56u+om^XD
zVjK<@F2<!pwE(i@$(D*CCgM*5HH#UrOCrSt_=;PhIkwKnmZIz2JB{6kije46M`~#?
zvOX5@aZEU50sm%SVCd#6E~ZFFo3-UqTejGXMr5j`ik`oTIPKkc?~7UZJkBpl8pkNZ
z8G52duzWFCyzTi>Y?Y^HMz9Zvyael7Z^0=jwyU*oQ(mJ3%r-SO$x1Hhh6GADy$=##
zt1>shQSEbwVSsn(1sm_+RQtEIc6Krxw}+*v1FM(E8CBD+vDRnMv%J%|J<okstW5+Q
zN1&`^fa&U4g^*eRU_OIv8wh$Z&*kQyeahpdcacR@UBqJ3oXd@mav0CH3S%<a@vb(5
z+Z2S^r1io@bQRh%z#Wl6*h^0?krvJmJU4Uv<SO(x!x?vskd7|7-@A-wr{`oJ-k6rp
z@VgLHyYkgLMl=Rq8L)0K6CiaibPC1$EwAC`lR!8hjA0gM6?emEhQ_ZCmkLuw$xbmK
zi7&|m(!u-*l=vuZaN=>!6OZ~A5M0?HsR(R5iCADqf02zW6-{|pphqbWOp@MbNQNow
z-uBcX^wbZnG(+xJ;k(ZW+bQnsRsp{Pg3}`XK`Ht@h#fc%O9Qo-@*?KOnEBxVG!5!=
z$2MY^u52E~3FM_elGiZ2v&%X7F4619@iDC528?I@UB*z^?CWUN4(!6^4~U>E*X-xq
z6?r+Ay*)DwQuPBdEeREv5sT^%snpFJa1je6-}2Rx(#YR`1LFcp^gHi^6r62hFCRz6
zBb<#kjE8iwdhnLX@;DzX6#cu>w#H=ZQ#n8*PD#&h2aW3V9G>k+a|G*1g-clcpQj8i
zg@;APX71+V9Q9N0kMwRZ9<%9QTF~!F4_|E=>Nnm6;GujW==DJocK3NvUua{yUi`NP
z^!<WK*&z;Z>WAJNiujSK@2mVNt7>|uf4IoWA^m!27etCv|GJ3UDWg5tS`MF7Zzo7s
z$ab7#pv5(P;bPP>)D64&Nz`&<8bahdaZOKL7KGo69b%rjnj&Ghx3hb@$L1#Z&@Q@;
zRX0N0jdjp9_*bU5@*~+}vthHzKEC|bd&ZTx)UFNXudh7n@CeC{{561*QsIr);AV{3
zmmgS6u~1!!aQ|%1i(g9GUOzVSo;J#jfgYYLXb$jHow%_x<nrxHgO}0O)*!sUl3P2~
z%e&x-q24ljSxb+NSC*lG&_LmWES>9#s>n#Syyf_9I4a-wdsh&0U#escYiZE&id$I5
z_Tadls4b|>ke5U>p#OT#HEoQMGkliax2hzT@Kvovw2f(RGel>Ar^aE*05U`dzy`vY
z(Ex^8L%T_H_Q*e%9!)VWHWG)dnv-4Ti2dxVwD*TDSp{PYs&@Eoj{_Sd1XYFH{<d>4
z?S!Ym8N<Fw6niKZANoeYJ9euBKj#MIhJ2~9Ve~2jW8!=S{?m2nxnrcS6mxe{kS2QY
z`t;%CCIFO=G$d&ml20R|MYt9bkp{dwi{e}WpKTm}-t4}CuMTvA5$xUo+uVE_JISPc
z=j{O!)U~(%1*D*`8{6=J=s_du-}q=+CIDJVO1YK*sl=0orLX?{dySeh%L1J4g$uiX
zscMSb{~lzJ)HK&+19Lbz+2*mv^F9!^T&g}U>%L3}Q3tjAIF%UxZPF+$l$BMTzrXgP
z)6Ui>unc)teMQi6L@__Ww_aHy^BXf3*D(h7q2)K!t5HhUkORZMjcWPIYM(#cz!}w1
z=SN7~S`S{ho@5$GxUj}OJ_guYch@)Mq>V}AN$4;pT<mK3!(<Sc;1Rbfy1_gfNp|C3
zCc#fO#_zl2L{z$;Ew@J0iwS2wV2ppmr8~XucPNG4N|rLzPB{z84=WXo7A(HM`B%Ly
ztLzX@h%7_x&!7GyQ&^Q@vG9^#2bH1JQHhZhIpWIaDkpEXEc16N5vu&|?;wnwFoR0+
zaY&v)?T_;`?In&;{kL<3ykFwbt7`%RA4N2RlDT1Df+&p5XG*|H&kP0OOC=l(V0APJ
zcO)kd0|L+DsIxQbzg>0U)Ayv;(bmI30&>zag2n!Pc)P*yr-QSvV<zeCP}($rhc>2#
z3<pdu<RUMmroCa5(v_H~w8*`|wwx-|)ilw*VX$z(hcsxu!8W>E1-lp1y<ylyy?>Wd
z{U2<#0B#i%%NvH0yh2}red-&m{aU7p;s2*;y|0KQr<1PVeGv-YZmIyErIaLV#7%<#
E53$pCiU0rr

diff --git a/images/mapSeld.png b/images/mapSeld.png
deleted file mode 100755
index e52c6197370a374bb9cade0f62e1941ca5b05809..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6306
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
YpYDbB+`)%vssI2007*qoM6N<$f*<!P_5c6?

diff --git a/images/my-seld.png b/images/my-seld.png
deleted file mode 100644
index 3a88c5c25f3508f8ef32fe13559043dd63ca6435..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15868
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
Yk<4zBPhKA#+yH>Al#*nXxbe^b18%4h=>Px#

diff --git a/images/tuyou-seld.png b/images/tuyou-seld.png
deleted file mode 100644
index ff577b2355aae2eefc4d69b191ce08cd24f94129..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23265
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
O0000<MNUMnLSTZdAhjF-

diff --git a/images/userSel.png b/images/userSel.png
deleted file mode 100755
index 12c5867ad5fc0730053a9969df26004ea0957415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4506
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

diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index d826ce0..acc1842 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -7,8 +7,9 @@
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
-        <view class="areatext">{{areas[area].area_name}}</view>
-        <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+        <view class="areatext" style="font-size: 31rpx;font-weight: bold;color: #000;">{{areas[area].area_name}}</view>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240429/be4c68c518d5ee781e6345a09121f882.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image> -->
       </view>
     </picker>
     <view class="my-search-box">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index c5f9f59..337ffad 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -299,7 +299,8 @@ background: rgba(11, 137, 142, .1);
   align-items: center;
   border-radius: 30rpx;
   height: 60rpx;
-  background: #ededed;
+  /* background: #ededed; */
+  background-color: rgba(204,204,204, .3);
   margin-bottom: 0;
   font-size: 26rpx;
 }
@@ -318,7 +319,7 @@ background: rgba(11, 137, 142, .1);
   flex-shrink: 0;
   line-height: 40rpx;
   border-left: 1rpx solid #ccc;
-  color: #0B898E;
+  color: #DE4126;
 }
 .new-top-search-box {
   display: flex;
diff --git a/pages/map/index.js b/pages/map/index.js
index 7bf0522..0d73bd3 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -31,6 +31,7 @@ Page({
     timeList:{},
     showMore:'close',
     scrollLeft: 0,
+    levelList:[]
   },
   listenScroll(e) {
     this.setData({
@@ -74,6 +75,11 @@ Page({
       })
       
     })
+    commonApi._post("pbservice/Comfort/getComfortLevel").then(res=>{
+      that.setData({
+        levelList:res.data
+      })
+    })
   },
   changeClose() {
     this.setData({
@@ -631,6 +637,15 @@ Page({
               mapItem.info = item;
               if(item.type=='scenic'){
                 mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/c59dc041fcfd8b7a62ad2ac2444adcda.png";
+                if (mapItem.info.comfort_arr) {
+                  that.data.levelList.forEach(element => {
+                    if (element.level == mapItem.info.comfort_arr.comfort_level) {
+                      mapItem.info.comfort_arr.text = element.desc
+                      mapItem.info.comfort_arr.color = element.color
+                      mapItem.info.comfort_arr.bgColor = element.bgColor
+                    }
+                  });
+                }
               }else if (item.type=='venue') {
                 mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/04aedae4dc498d45267f3636d5524af6.png";
               }else if (item.type=='room') {
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 29cc225..8bcf488 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -34,7 +34,7 @@
 </view>
 <view class="menus2" wx:else>
   <!-- <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/> -->
-  <image bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240129/4450fe629f3c33cb6c8407e8f6ebb021.png" mode=""/>
+  <image bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240429/f2443b72067da82373d545db179f4dca.png" mode=""/>
   <scroll-view scroll-x style="height:280rpx" bindscroll="listenScroll" class="">
     <view class="menus-list1" style="margin-bottom:30rpx">
       <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
@@ -186,7 +186,36 @@
     <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">查看详情</view>
   </view>
 </view>
-<view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage')}}">
+<view class="map-item scenic-item" wx:if="{{showInfo && info && info.info.type=='scenic'}}">
+  <view style="display: flex;">
+    <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+    <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
+    <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
+      <view class="title textOver">{{info.info.title}}</view>
+      <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+      <view style="display: flex;justify-content:space-between;width: 426rpx;">
+        <view wx:if="{{info.info.comfort_arr}}" class="sort" style="border: 2rpx solid {{ info.info.comfort_arr.color}};color: {{ info.info.comfort_arr.color}};">
+          {{info.info.comfort_arr.text}}
+        </view>
+        <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
+      </view>
+    </view>
+  </view>
+  <view wx:if="{{info.info.comfort_arr}}" style="background: {{ info.info.comfort_arr.bgColor}};border-radius: 7rpx;padding: 28rpx 32rpx 22rpx 20rpx;margin-top: 19.33rpx;">
+    <view class="comfort-box">
+      <view>
+        当前客流量:{{info.info.comfort_arr.ins_carry_capacity}}人 
+      </view>
+      <view>
+        景区最大承载量:{{info.info.comfort_arr.max_carry_capacity}}人
+      </view>
+    </view>
+    <view style="font-weight: 500;font-size: 25rpx;color: #666666;">
+      更新时间:{{info.info.comfort_arr.updated_time}}
+    </view>
+  </view>
+</view>
+<view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage'&&info.info.type!='scenic')}}">
   <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
   <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 6af56b0..bde614b 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -109,28 +109,37 @@
   border-top: none;
 }
 .map-item {
-  display: flex;
+  /* display: flex; */
   background: #FFFFFF;
   box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3);
   border-radius: 13rpx;
-  justify-content: space-between;
-  padding: 25rpx;
-  width: 530rpx;
+  /* justify-content: space-between; */
+  padding: 13rpx;
+  /* padding: 25rpx;
+  width: 530rpx; */
+  width: 670rpx;
   position: absolute;
-  left: 44rpx;
+  left: 26rpx;
+  /* left: 44rpx; */
   top: 50%;
   margin-top: -100rpx;
 }
 
+.scenic-item {
+  background-color: rgba(255,255,255, .8);
+}
+
 .map-item image {
   display: block;
-  width: 200rpx;
-  height: 207rpx;
+  width: 213rpx;
+  height: 213rpx;
+  border-radius: 13rpx;
   flex-shrink: 0;
   margin-right: 20rpx;
 }
 .map-item .info {
-  width: 300rpx;
+  /* width: 300rpx; */
+  width: 100%;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -146,9 +155,12 @@
   margin: 10rpx 0;
 }
 .info-btn {
-  margin: 0 auto;
-  width: 199rpx;
-  line-height: 56rpx;
+  /* margin: 0 auto; */
+  /* width: 199rpx; */
+  width: 173rpx;
+  height: 46.67rpx;
+  line-height: 46.67rpx;
+  /* line-height: 56rpx; */
   color: #fff;
   background: linear-gradient(180deg, #FDAB70, #FE7F19);
   font-size: 28rpx;
@@ -628,8 +640,10 @@
 }
 
 .img-icon {
-  width: 686.67rpx;
-  height: 40rpx;
+    width: 105.33rpx;
+    height: 17.33rpx;
+    display: block;
+    margin: 18rpx auto 24.67rpx;
 }
 
 .img-icon-new {
@@ -637,4 +651,25 @@
     height: 17.33rpx;
     margin: 17rpx auto 32rpx;
     display: block;
+}
+
+.comfort-box {
+    display: flex;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #333333;
+    justify-content: space-between;
+    margin-bottom: 34rpx;
+}
+
+.sort {
+    width: 93rpx;
+    height: 40rpx;
+    /* border: 4rpx solid #83d851; */
+    border-radius: 20rpx;
+    font-weight: bold;
+    font-size: 27rpx;
+    /* color: #83D851; */
+    text-align: center;
+    line-height: 40rpx;
 }
\ No newline at end of file

From 0646aa95ddbe629fe22f21defe5821312fcdbe6a Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 29 Apr 2024 16:37:01 +0800
Subject: [PATCH 149/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 3c1f567..65da1a0 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.isTest112? true : false;
+      data.isTest = data.isTest113? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 35cd2a07e13734edd17beb012be7e33395cc10f7 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 7 May 2024 09:27:18 +0800
Subject: [PATCH 150/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8D=81=E5=85=A8?=
 =?UTF-8?q?=E5=8D=81=E7=BE=8E=E5=90=B4=E6=B1=9F=E8=B7=B3=E8=BD=AC=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js               | 2 +-
 pages/index/index.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 65da1a0..d27cb79 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.isTest113? true : false;
+      data.isTest = data.isTest114? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 3ee47db..02d45ff 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -478,6 +478,12 @@ Page({
         path: 'pages/home/index'
       })
       return;
+    }else if (e.currentTarget.dataset.event == 'wujiang_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx8eadea4ee2d42d4b',
+        path: 'pages/index/index'
+      })
+      return;
     }
     wx.navigateTo({
       url: e.currentTarget.dataset.path,

From 04f341cfceac4c7e1a1551922c479cdb55e757af Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 16 May 2024 14:56:00 +0800
Subject: [PATCH 151/471] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=97=A5=E5=B8=B8=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/newCalendar/index.wxml |  3 ++-
 pages/component/newCalendar/index.wxss |  8 ++++---
 pages/index/index.wxml                 |  4 ++--
 pages/list/activitynew/index.wxml      |  3 ++-
 pages/list/activitynew/index.wxss      | 25 ++++++++++++---------
 pages/order/components/date/index.js   |  5 ++++-
 pages/order/components/date/index.wxml |  2 +-
 utils/filter.wxs                       | 30 +++++++++++++++++---------
 utils/util.js                          | 17 ++++++++++++++-
 9 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 8dd1fc8..ee667a4 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -57,7 +57,8 @@
         <image wx:if="{{currentViewType==='week'}}" src="https://static.ticket.sz-trip.com/uploads/20240327/8b5f8a284de3831392560c367f8c59ca.png" mode=""/>
         <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
     </view>
-    <image wx:if="{{currentViewType==='month'}}" style="width: 180rpx;height: 157.33rpx;position: absolute;right: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bottom.png" mode=""/>
+    <!-- 节假日花样 -->
+    <!-- <image wx:if="{{currentViewType==='month'}}" style="width: 180rpx;height: 157.33rpx;position: absolute;right: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bottom.png" mode=""/> -->
 </view> 
 
  
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index b7b528f..9c8d8ea 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -8,11 +8,13 @@
     /* width: 697rpx; */
     /* margin: 0 auto;
     padding: 37rpx 22rpx 40rpx; */
-    background-color: #FFD6B2;
+    /* 节假日花样 */
+    /* background-color: #FFD6B2; */
     margin: 0 auto;
     padding: 37rpx 22rpx 40rpx;
-    background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png");
-    background-size: 100% 100%;
+    /* 节假日花样 */
+    /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png");
+    background-size: 100% 100%; */
     width: 90%;
     height: 65.67rpx
 }
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d52cd90..8e9ed96 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -458,12 +458,12 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20240428/be9d01a4552438a93681b1e6b3c1c783.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view>
-      <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240428/9ad72c94d55ef5c94f942b8c91e63f83.png" mode="widthFix"></image>
-        <view>高峰预警</view>
+        <view>景区舒适度</view>
       </view>
       <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index acc1842..748360a 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -3,7 +3,8 @@
 <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png" mode=""/> -->
 <new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
-  <image class="bg-pic" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-center.png" mode="widthFix"/>
+  <!-- 节假日花样 -->
+  <!-- <image class="bg-pic" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-center.png" mode="widthFix"/> -->
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 337ffad..80dc266 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -1,8 +1,9 @@
 /* pages/activity/index.wxss */
 
 page {
-  /* background: #F2F2F2; */
-  background: #FFD6B2;
+  background: #F2F2F2;
+  /* 节假日花样 */
+  /* background: #FFD6B2; */
 }
 .types {
   /* justify-content: space-between; */
@@ -204,7 +205,7 @@ background: rgba(11, 137, 142, .1);
 }
 .end-mask {
   position: absolute;
-  right: 22rpx;
+  right: 30rpx;
   /* top: 27rpx; */
   text-align: center;
   width: 320rpx;
@@ -319,7 +320,9 @@ background: rgba(11, 137, 142, .1);
   flex-shrink: 0;
   line-height: 40rpx;
   border-left: 1rpx solid #ccc;
-  color: #DE4126;
+  color: #0B898E;
+  /* 节假日花样 */
+  /* color: #DE4126; */
 }
 .new-top-search-box {
   display: flex;
@@ -355,18 +358,20 @@ flex-shrink: 0;
 }
 .types-item-active {
   padding: 0 25rpx;
-  /* height: 57rpx; */
-  height: 68rpx;
-  line-height: 58rpx;
+  height: 57rpx;
+  /* 节假日花样 */
+  /* height: 68rpx; */
+  line-height: 57rpx;
   display: inline-block;
-  /* background: #0B898E; */
+  background: #0B898E;
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
   flex-shrink: 0;
-  background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png");
+  /* 节假日花样 */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png");
   background-size: 100% 100%;
-  margin-top: -5rpx;
+  margin-top: -5rpx; */
     text-align: center;
 }
 /* 不显示滚动条 */
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index a13c832..8e25a91 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -36,7 +36,10 @@ Component({
     isSzMuseum: false,
     kjIdCom: null,
     gpIdCom: null,
-    date_price:0
+    date_price:0,
+    today:util.formatDate(new Date()),
+    tomorrow:util.formatMing(new Date()),
+    afterTom:util.formatHou(new Date()),
   },
   lifetimes: {
     attached: function () {
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 13a90d3..90bbd65 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -4,7 +4,7 @@
   <view class="box-title">使用日期</view>
   <view class="dates-boxes">
     <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{threeDays}}">
-      <view>{{tool.showAllSeldDate(item.date,index)}}</view>
+      <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view>
       <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
       <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
       <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 8fe5028..6a3c348 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -26,18 +26,28 @@ var gotoUrl = function(item){
   return str;
 }
   // 价格日历显示返回
-var showAllSeldDate = function (date, index) {
+var showAllSeldDate = function (date, index,today,tomorrow,afterTom) {
     // return date.substring(5, 10)
-    switch (index) {
-      case 0:
-        return '今天' + date.substring(5, 10)
-      case 1:
-        return '明天' + date.substring(5, 10)
-      case 2:
-        return '后天' + date.substring(5, 10)
-      default:
-        return date.substring(5, 10)
+    console.log('tool的',date,today,tomorrow,afterTom);
+    if (date == today) {
+      return '今天' + date.substring(5, 10)
+    }else if (date == tomorrow) {
+      return '明天' + date.substring(5, 10)
+    }else if (date == afterTom) {
+      return '后天' + date.substring(5, 10)
+    }else {
+      return date.substring(5, 10)
     }
+    // switch (index) {
+    //   case 0:
+    //     return '今天' + date.substring(5, 10)
+    //   case 1:
+    //     return '明天' + date.substring(5, 10)
+    //   case 2:
+    //     return '后天' + date.substring(5, 10)
+    //   default:
+    //     return date.substring(5, 10)
+    // }
   }
 var toFix = function(value) {
       return (value / 100).toFixed(2);
diff --git a/utils/util.js b/utils/util.js
index cf8390c..8ccbf50 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -16,6 +16,19 @@ const formatDate = date => {
   const day = date.getDate()
   return [year, month, day].map(formatNumber).join('-');
 }
+const formatMing = date => {
+  var tomorrow = new Date(date.getTime() + 24 * 60 * 60 * 1000) // 获取明天的日期
+  var tomorrowDate = tomorrow.getDate();  // 获取明天的日期数字
+  var tomorrowMonth = tomorrow.getMonth() + 1;  // 获取明天的月份（注意：月份是从0开始计算的，所以要加1）
+  var tomorrowYear = tomorrow.getFullYear();
+  return [tomorrowYear, tomorrowMonth, tomorrowDate].map(formatNumber).join('-');
+}
+const formatHou= date => {
+  date.setDate(date.getDate() + 2);
+  // 格式化日期为YYYY-MM-DD
+  var houtian = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + date.getDate()).slice(-2);
+  return houtian
+}
 
 const formatNumber = n => {
   n = n.toString()
@@ -444,5 +457,7 @@ module.exports = {
   gotoOrder:gotoOrder,
   orderMoreTime:orderMoreTime,
   goKjOrder:goKjOrder,
-  pagePoint: pagePoint
+  pagePoint: pagePoint,
+  formatMing:formatMing,
+  formatHou:formatHou
 }

From a4c665c4d7041b6e68f61808dce91b2fdc9a1d85 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 20 May 2024 16:58:31 +0800
Subject: [PATCH 152/471] =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E5=B1=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            | 2 +-
 pages/list/activitynew/index.wxss | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index d27cb79..99fcdd3 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.isTest114? true : false;
+      data.isTest = data.isTest115? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 80dc266..3a6de75 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -205,7 +205,9 @@ background: rgba(11, 137, 142, .1);
 }
 .end-mask {
   position: absolute;
-  right: 30rpx;
+  /* 产品需求24/5/20 已结束就是盖在图片上，按此需求调整 */
+  left: 22rpx;
+  /* right: 30rpx; */
   /* top: 27rpx; */
   text-align: center;
   width: 320rpx;

From 1bd999268a59f037b3a6861c0e255766e1920b4d Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 27 May 2024 10:35:29 +0800
Subject: [PATCH 153/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/SearchHeader.wxml |  4 ++
 pages/list/scene/index.js         | 39 +++++++++++--
 pages/list/scene/index.wxml       | 23 ++++++--
 pages/list/scene/index.wxss       | 91 ++++++++++++++++++++++++++++---
 4 files changed, 139 insertions(+), 18 deletions(-)

diff --git a/pages/component/SearchHeader.wxml b/pages/component/SearchHeader.wxml
index e763ada..3ffcdf9 100644
--- a/pages/component/SearchHeader.wxml
+++ b/pages/component/SearchHeader.wxml
@@ -4,6 +4,10 @@
     <view bindtap="indexFocus" class="search-box" style="margin-right:{{right + 5}}px;">
       <icon class="iconfont icon-sousuo"></icon>
       <input bindfocus="inputFocus" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="searchInput" bindconfirm="search" class="weui-input" placeholder="搜索" />
+      <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
+        <view style="color: #ccc;">|</view>
+        <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;" bindtap="search">搜索</view>
+      </view>
     </view>
   </view>
 </view>
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 6c7b01e..a0c865f 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -3,7 +3,6 @@ import commonApi from "../../../utils/https/common"
 import util from "../../../utils/util"
 let app = getApp()
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -13,7 +12,9 @@ Page({
     latitude:"",
     longitude:"",
     keywords:'',
-    area_id:''
+    area_id:'',
+    navList:[],
+    navIndex:0,
   },
 
   /**
@@ -37,12 +38,39 @@ Page({
           latitude:res.latitude,
           longitude:res.longitude
         })
-        that.getList()
+        // that.getList()
       },
       fail:function(){
-        that.getList()
+        // that.getList()
       }
     })
+    // 获取头部景点分类
+    commonApi._post("scene/get_scene_tags",{
+      pid:4
+    }).then(res=>{
+      this.setData({
+        navList:res.data
+      })
+      console.log(this.data.navList);
+      this.getList()
+    })
+  },
+  search:function(){
+    this.setData({
+      list:[],
+      total:1
+    })
+    this.getList()
+  },
+  changeType:function (e) {
+    console.log(e);
+    this.setData({
+      navIndex:e.currentTarget.dataset.index,
+      list:[],
+      total:1
+    })
+    console.log(this.data.navIndex);
+    this.getList()
   },
   search:function(e){
     this.setData(e.detail);
@@ -60,7 +88,8 @@ Page({
     let list = this.data.list;
     if(list.length>=this.data.total) return;
     commonApi._post("scene/get_scene_by_tag",{
-      tag_id:"4",
+      // tag_id:"4",
+      tag_id:this.data.navList[this.data.navIndex].id,
       limit:10,
       lon:this.data.longitude,
       lat:this.data.latitude,
diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml
index cbb3e41..18b337e 100644
--- a/pages/list/scene/index.wxml
+++ b/pages/list/scene/index.wxml
@@ -5,25 +5,38 @@
   <view class="hot-item" wx:for="{{10}}">产品产品产</view>
 </view> -->
 <!-- <view style="height:100rpx"></view> -->
+<image class="topImg" src="https://static.ticket.sz-trip.com/uploads/20240521/3022ab8f3d45444ead1e77f9a2112dc0.png" mode=""/>
+<view class="navBox">
+  <view class="nav {{index == navIndex?'seld-nav':''}}" wx:for="{{navList}}" data-item="{{item}}" bindtap="changeType" data-index="{{index}}">
+    <image src="https://static.ticket.sz-trip.com{{item.icon}}" mode=""/>
+    <view class="{{index == navIndex?'seld-nav-text':'nav-text'}}">
+      {{item.name}}
+    </view>
+  </view>
+</view>
 <view style="height:30rpx"></view>
 <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/sceneProductInfo/index?id={{item.id}}" class="item">
   <image src="{{item.headimg}}" mode="aspectFill"></image>
   <!-- <view class="no-text" wx:if="{{index<3 && keywords==''}}">NO.{{index+1}}</view> -->
-  <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view>
+  <!-- <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view> -->
   <view class="right-info">
     <view class="title textOver2">{{item.title}}</view>
     <view class="tags">
       <view class="tag" wx:for="{{item.tags}}">{{item}}</view>
     </view>
-    <view class="location textOver" style="width:432rpx"><text class="iconfont icon-location"></text>{{item.address}}</view>
+    <!-- <view class="location textOver" style="width:432rpx"><text class="iconfont icon-location"></text>{{item.address}}</view> -->
     <view class="price-box">
-      <text wx:if="{{item.distance}}">距您直线距离{{item.distance}}</text>
-      <text wx:else></text>
+      <view style="width: 280rpx;display: flex;align-items: center;font-weight: 400;font-size: 24rpx;color: #999999;" class="textOver">
+        <text wx:if="{{item.distance}}">{{item.distance}}</text>
+        <text wx:else></text>
+        <view style="width: 1rpx;height: 21rpx;background: #999999;flex-shrink: 0;margin: 0 12rpx;"></view>
+        <view class="location">{{item.address}}</view>
+      </view>
       <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
     </view>
   </view>
 </view>
-<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
+<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top: 220rpx;">
   <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/scene/index.wxss b/pages/list/scene/index.wxss
index c6f453d..41ba0b2 100644
--- a/pages/list/scene/index.wxss
+++ b/pages/list/scene/index.wxss
@@ -31,18 +31,18 @@
   align-items: center;
   margin: 40rpx 25rpx;
   margin-top: 0;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   position: relative;
 }
 .item .info {
   flex: 1;
 }
 .item image {
-  width: 233rpx;
-  height: 233rpx;
+  width: 186rpx;
+  height: 186rpx;
   border-radius: 11rpx;
   display: block;
-  margin-right: 24rpx;
+  margin-right: 26rpx;
   flex-shrink: 0;
 }
 .item .no-text {
@@ -79,13 +79,16 @@
 }
 .tag {
   color: #0B898E;
-  font-size: 20rpx;
-  margin-right: 30rpx;
+  font-size: 23rpx;
+  margin-right: 20rpx;
   position: relative;
-  line-height: 20rpx;
+  line-height: 32rpx;
   white-space: nowrap;
   overflow-x: hidden;
   text-overflow: ellipsis;
+  padding: 5rpx 9rpx;
+  background: #E6F3F3;
+  border-radius: 7rpx;
 }
 .tags .tag::after {
   content: "1";
@@ -124,4 +127,76 @@
 .price-box .price text:nth-child(3){
   font-size: 20rpx;
   color: #8D8D8D;
-}
\ No newline at end of file
+}
+
+.topImg {
+  width: 750rpx;
+  height: 266.67rpx;
+}
+
+.navBox {
+    display: flex;
+    padding: 14.67rpx 0 9.33rpx 26rpx;
+    border-bottom: 1px solid #E0E0E0;
+    overflow-x: scroll;
+    flex-wrap: nowrap;
+}
+
+.nav {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 30.67rpx;
+    padding: 12rpx 13.5rpx 16.67rpx;
+    flex-shrink: 0;
+}
+
+.seld-nav {
+  border-radius: 13rpx;
+  border: 1px solid #0B898E;
+}
+
+.nav image {
+    width: 80.67rpx;
+    height: 80.67rpx;
+}
+
+.nav-text {
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #7C8594;
+  margin-top: 20.67rpx;
+}
+
+.seld-nav-text {
+  margin-top: 20.67rpx;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #0B898E;
+}
+
+.right-info {
+  padding: 10.67rpx 0 7.33rpx;
+}
+
+.title-box,.title-header{
+  background: #ffff;
+}
+
+.bg-box,.bg-box .title-header {
+  background: transparent;
+  color: #ccc;
+}
+
+.title-header {
+  position: fixed;
+  left: 0;
+  right: 0;
+  display: flex;
+  top: 0;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 32rpx;
+  line-height: 90rpx;
+  z-index: 2;
+}

From ae6f5113d818c82fe83339d8193a8f90072c3d5f Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 30 May 2024 16:44:06 +0800
Subject: [PATCH 154/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |   2 +-
 images/empty.png                            | Bin 7496 -> 0 bytes
 images/empty2.png                           | Bin 13246 -> 0 bytes
 pages/order/components/contact/index.js     | 297 ++++++++++++++++++--
 pages/order/components/contact/index.json   |   4 +-
 pages/order/components/contact/index.wxml   | 110 +++++++-
 pages/order/components/contact/index.wxss   |  84 +++++-
 pages/order/orderList/index.js              |   6 +-
 pages/order/orderList/index.wxml            |  19 +-
 pages/order/scene/index.js                  |  98 +++++--
 pages/order/scene/index.wxml                |  10 +-
 pages/user/order/museumOrderInfo/index.js   |   9 +-
 pages/user/order/museumOrderInfo/index.wxml |  21 +-
 pages/user/order/sceneOrderInfo/index.js    |   2 +
 pages/user/order/sceneOrderInfo/index.wxml  |  33 ++-
 15 files changed, 609 insertions(+), 86 deletions(-)
 delete mode 100755 images/empty.png
 delete mode 100755 images/empty2.png

diff --git a/app.js b/app.js
index 99fcdd3..dca3e71 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.isTest115? true : false;
+      data.isTest = data.isTest116? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/images/empty.png b/images/empty.png
deleted file mode 100755
index 7be0cc631b55b6246a6eeebace284539759296ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7496
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
Xb$$1a^7}xC^opLgF|<<CA?kksW;mE+

diff --git a/images/empty2.png b/images/empty2.png
deleted file mode 100755
index fb4ec04dc9c1f6d42e9bff437fbac967fac52e29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13246
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%0AN(m
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

diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js
index 980d2a3..9699645 100644
--- a/pages/order/components/contact/index.js
+++ b/pages/order/components/contact/index.js
@@ -1,6 +1,7 @@
 // pages/order/components/contact/index.js
 import userApi from "../../../../utils/https/user"
 import commonApi from "../../../../utils/https/common"
+import util from "../../../../utils/util.js"
 let app = getApp()
 Component({
   /**
@@ -18,6 +19,26 @@ Component({
     type:{
       type:String,
       value:""
+    },
+    productNum:{
+      type:Number,
+      value:1,
+      observer(nv, ov, path) {
+        if (nv) { 
+          let num = nv-this.data.selectLinkman.length
+          this.setData({
+            showNum:num
+          })
+        }
+      }
+    },
+    is_authentication:{// 是否实名，0否1是，默认实名
+      type:String,
+      value:''
+    },
+    is_real_name:{// 是否是一证一票，0否1是，
+      type:String,
+      value:''
     }
   },
 
@@ -29,11 +50,39 @@ Component({
     linkmanList:[],
     showMask:false,
     editId:null,
-    isGroup:null
+    isGroup:null,
+    showManList:[],
+    showNum:0,
+    showAdd:false,
+    formData:{},
+    types:[],
+    selectIndex:0,
+    person:{},
+    personId:null,
+    r:[],
+    phone:'',//非实名时需要传的电话
   },
   lifetimes: {
     attached: function() {
       // 在组件实例进入页面节点树时执行
+      console.log(this.properties.productNum);
+      console.log(this.properties.is_real_name);
+      // if (this.properties.is_real_name == '1') {
+        this.setData({
+          showNum:this.properties.productNum
+        })
+      // }
+      // 不实名时直接获取手机号
+      if (this.properties.is_authentication) {
+        commonApi.user_post("uservice/user/getMyInfo",{}).then(res=>{
+          if(res.code==1){
+            this.setData({
+              phone:res.data.mobile
+            })
+            this.triggerEvent("setLinkman",{phone:this.data.phone})
+          }
+        })
+      }
       // 获取默认联系人
       commonApi.user_post("token/check").then(res=>{
         this.setData({
@@ -44,8 +93,11 @@ Component({
             contactType:"CONTACT"
           }).then(res=>{
             if(res.data){
+              let length =[res.data].length
               this.setData({
-                selectLinkman:[res.data]
+                selectLinkman:[res.data],
+                showNum:this.data.showNum-length,
+                showManList:[res.data]
               })
               this.triggerEvent("setLinkman",[res.data])
             }
@@ -53,6 +105,18 @@ Component({
           })
         }
       })
+      // 获取证件列表
+      userApi.user_post("user/getCardTypeList", {}).then(r => {
+        console.log(r)
+        let data = [];
+        r.data.map(item=>{
+          data.push(item.title)
+        })
+        this.setData({
+          types: r.data,
+          typeList:data
+        })
+      })
     },
     detached: function() {
       // 在组件实例被从页面节点树移除时执行
@@ -61,7 +125,6 @@ Component({
   pageLifetimes: {
     show: function() {
       // 页面被展示
-      
       if(this.data.editId){
         let editId = this.data.editId;
         userApi.user_post("user/getContactInfoById",{
@@ -117,16 +180,60 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    // getPhoneNumber:function(e) {
+    //   console.log(e);
+    //   const code = e.detail.code
+    //   wx.request({
+    //     url: `https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${app.globalData.appId}&secret=${app.globalData.secret}`,
+    //     method: 'GET',
+    //     success:res=>{
+    //       if(res.statusCode!==200) return
+    //       const access_token = res.data.access_token
+    //       wx.request({
+    //         url: `https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=${access_token}`,
+    //         method: 'POST',
+    //         data: {
+    //           code
+    //         },
+    //         success:data=>{
+    //           if(data.statusCode!==200) return
+    //           console.log(data.data.phone_info);
+    //           debugger
+    //           const { phoneNumber } = data.data.phone_info // 这里就是获取到的手机号
+    //         }
+    //       })
+    //     }
+    //   })
+    // },
     gotoEdit:function(e){
-      this.setData({
-        editId:e.currentTarget.dataset.item.id
+      userApi.user_post("user/getContactInfoById", { id: e.currentTarget.dataset.item.id }).then(res => {
+        console.log(res);
+        res.data.isDefault = res.data.is_default == '1' ? true : false;
+        res.data.username = res.data.name;
+        res.data.mobile = res.data.tel;
+        res.data.idNumber = res.data.id_number;
+        console.log(res.data);
+        this.setData({
+          showMask:!this.data.showMask,
+          formData: res.data,
+          idTypeId: res.data.idcard_type,
+          editId:e.currentTarget.dataset.item.id,
+          selectIndex:this.data.types.findIndex(item=>item.type == res.data.idcard_type && item.code == res.data.document_type)
+        })
       })
+      this.showAddMask()
     },
     showLinkman:function(){
       this.setData({
         showMask:!this.data.showMask
       })
     },
+    showAddMask:function(){
+      this.setData({
+        showAdd:!this.data.showAdd,
+        showMask:!this.data.showMask
+      })
+    },
     cancel:function(){
       let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
       linkmanList.map(linkman=>{
@@ -142,6 +249,116 @@ Component({
       })
       this.showLinkman()
     },
+    selectType:function(e){
+      this.setData({
+        selectIndex:e.detail.value
+      })
+    },
+    // 保存
+  save:function(){
+    if (!this.data.formData.username){
+      wx.showToast({
+        title: '请输入姓名！',
+        icon:"none"
+      })
+      return false;
+    }
+    if (!this.data.formData.mobile) {
+      wx.showToast({
+        title: '请输入手机号码！',
+        icon: "none"
+      })
+      return false;
+    }
+    if (!util.isTel(this.data.formData.mobile)) {
+      wx.showToast({
+        title: '请输入正确的手机号码！',
+        icon: "none"
+      })
+      return false;
+    }
+    // if (!this.data.idTypeId) {
+    //   wx.showToast({
+    //     title: '请选择证件类型！',
+    //     icon: "none"
+    //   })
+    //   return false;
+    // }
+    // if (!this.data.formData.idNumber) {
+    //   wx.showToast({
+    //     title: '请输入证件号！',
+    //     icon: "none"
+    //   })
+    //   return false;
+    // }
+    let data = this.data.formData;
+    data.idcard_type = this.data.types[this.data.selectIndex].type;
+    data.is_default = data.isDefault?'1':'0';
+    data.document_type = this.data.types[this.data.selectIndex].code;
+    data.id_number = this.data.formData.idNumber;
+    let service ="addNewContact";
+    if(this.data.editId){
+      data.contactId = this.data.editId;
+      service = "editContactById";
+    }
+    userApi.user_post("user/"+service,data).then(res=>{
+      if(res.code==1){
+        wx.showToast({
+          title: '保存成功！',
+          icon:"success",
+          success:function(){
+            // util.back();
+          }
+        })
+        this.setData({
+          showAdd:!this.data.showAdd
+        })
+      }
+    })
+  },
+  //取消添加出行人
+  del:function(){
+    this.setData({
+      formData:{},
+      showAdd:!this.data.showAdd
+    })
+  },
+    // 输入监听 不是双向绑定啊 绝望
+    nameInput:function(e){
+      var formData = this.data.formData;
+      formData.username = e.detail.value;
+      this.setData({
+        formData: formData
+      })
+    },
+    idNumberInput:function(e){
+      var formData = this.data.formData;
+      formData.idNumber = e.detail.value;
+      this.setData({
+        formData: formData
+      })
+    },
+    telInput:function(e){
+      var formData = this.data.formData;
+      formData.mobile = e.detail.value;
+      this.setData({
+        formData: formData
+      })
+    },
+    phoneInput:function(e){
+      this.setData({
+        phone: e.detail.value
+      })
+      this.triggerEvent("setLinkman",{phone:this.data.phone})
+    },
+    // 设为默认
+  setAddDefault:function(e){
+    var formData = this.data.formData;
+    formData.isDefault = e.detail.value;
+    this.setData({
+      formData: formData
+    })
+  },
     confirm:function(){
       let linkmanList = this.data.linkmanList,selectLinkman = [];
       linkmanList.map(linkman=>{
@@ -149,15 +366,23 @@ Component({
           selectLinkman.push(linkman);
         }
       })
-      if(this.properties.maxNum!=-1 && selectLinkman.length>Number(this.properties.maxNum)){
-        wx.showToast({
-          title: '最多只能选择'+this.properties.maxNum+"个出行人",
-          icon:'none'
-        })
-        return;
-      }
+      // 需要 改成 根据父组件的购买数量
+      let showNum = this.properties.productNum
+      // let showNum = this.data.showNum
+      showNum = showNum-selectLinkman.length
+      let showManList = this.data.showManList
+      showManList = [...selectLinkman]
+      // if(this.properties.maxNum!=-1 && selectLinkman.length>Number(this.properties.maxNum)){
+      //   wx.showToast({
+      //     title: '最多只能选择'+this.properties.maxNum+"个出行人",
+      //     icon:'none'
+      //   })
+      //   return;
+      // }
       this.setData({
-        selectLinkman:selectLinkman
+        selectLinkman:selectLinkman,
+        showManList:showManList,
+        showNum:showNum
       })
       this.triggerEvent("setLinkman",selectLinkman)
       this.showLinkman()
@@ -210,17 +435,55 @@ Component({
       wx.showLoading({
         title: '加载中',
       })
-      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman;
+      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman,showManList = this.data.showManList;
       selectLinkman.splice(index,1);
+      showManList.splice(index,1);
       this.triggerEvent("setLinkman",selectLinkman)
       this.setData({
-        selectLinkman:selectLinkman
+        selectLinkman:selectLinkman,
+        showManList:showManList,
+        showNum:selectLinkman.length>0?this.data.showNum+1:1
       })
       wx.hideLoading()
     },
+    select:function(e) {
+      console.log(e);
+      let item = e.target.dataset.item
+      if (this.properties.is_real_name == '1') { // 一证一票
+        this.selectIt(item)
+      } else {
+        this.selectOne(item)
+      }
+    },
+    // 一证一票不让他多选
+    selectOne:function(e) {
+      console.log(e);
+      let item = e,linkmanList = this.data.linkmanList,num = 0
+      linkmanList.map(linkman=>{
+        if(linkman.selected==1){
+          num++;
+        }
+      })
+      console.log(num);
+      linkmanList.map(linkman=>{
+        if(item.id==linkman.id){
+          // linkman.selected = linkman.selected==1?0:1;
+          linkman.selected = 1
+        }else {
+          linkman.selected = 0
+        }
+      })
+      console.log(linkmanList);
+      this.setData({
+        linkmanList
+      })
+    },
+    // 可多选
     selectIt:function(e){
-	  console.log(e,app.globalData.product)
-      let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1);
+    console.log(e,app.globalData.product)
+    console.log(e);
+      // let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1);
+      let item = e,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1);
       // 先计算出全部选中的出行人
 	  console.log(111)
       linkmanList.map(linkman=>{
diff --git a/pages/order/components/contact/index.json b/pages/order/components/contact/index.json
index e8cfaaf..da13845 100644
--- a/pages/order/components/contact/index.json
+++ b/pages/order/components/contact/index.json
@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "add":"/pages/user/linkman/add"
+  }
 }
\ No newline at end of file
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index f3a66b1..42a67e3 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -4,11 +4,20 @@
       <view>{{isGroup==1?'发起人信息':'出行人信息'}}</view>
       <view wx:if="{{isGroup==1}}" class="group-tip-text">（*预约发起后前往个人中心-团体预约订单中查看详情）</view>
     </view>
-    <view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman.length>0 && isGroup!=1}}"><text class="iconfont icon-add-select"></text>添加</view>
+    <view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman.length>0 && isGroup!=1&&is_authentication != '0'}}"><text class="iconfont icon-add-select"></text>添加</view>
     <view class="group-edit" bindtap="showLinkman" wx:if="{{isGroup==1 && selectLinkman.length>0}}">编辑</view>
   </view>
   <view wx:if="{{isGroup!=1}}">
-    <view class="contacts-list" wx:if="{{selectLinkman.length>0}}">
+    <!-- 不实名 -->
+    <view wx:if="{{is_authentication == '0'}}">
+      <view class="tel-input">
+        <text class="input-text">手机号</text>
+        <!-- <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button> -->
+        <input bindinput="phoneInput" type="number" value="{{phone}}" class="weui-input" placeholder="请输入手机号" />
+      </view>
+    </view>
+    <!-- 实名 -->
+    <!-- <view class="contacts-list" wx:if="{{selectLinkman.length>0}}">
       <view class="contact-item" wx:for="{{selectLinkman}}">
         <view class="iconfont icon-jian" bindtap="delLinkman" data-index="{{index}}"></view>
         <view class="contact-info">
@@ -18,11 +27,53 @@
         </view>
         <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
       </view>
-    </view>
-    <view class="contacts-list" wx:else>
-      <view style="height:25rpx"></view>
+    </view> -->
+    <!-- <view class="contacts-list" wx:else> -->
+      <!-- <view style="height:25rpx"></view>
       <view bindtap="showLinkman" class="add-btn1"><text class="iconfont icon-add-select"></text>添加</view>
-      <view style="height:25rpx"></view>
+      <view style="height:25rpx"></view> -->
+    <view class="contacts-list" wx:else>
+      <view wx:if="{{showManList.length>0}}" style="display: flex;position: relative;">
+        <view style="width: 550rpx;display: flex;overflow-x: scroll;">
+          <view class="name-box"  wx:for="{{showManList}}">
+            <text>{{item.name}}</text>
+            <image class="name-selected-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/dui.png" mode=""/>
+          </view>
+        </view>
+        <view class="more" bindtap="showLinkman">
+          更多>
+        </view>
+      </view>
+      <view class="contact-item" wx:for="{{selectLinkman}}" wx:if="{{selectLinkman.length>0}}">
+        <view class="iconfont icon-jian" bindtap="delLinkman" data-index="{{index}}"></view>
+        <view class="contact-info">
+          <view class="contact-name">{{item.name}}</view>
+          <view class="contact-other" style="margin-bottom:10rpx"><text>手机号</text>{{item.tel}}</view>
+          <view class="contact-other"><text>{{item.title}}</text>{{item.id_number}}</view>
+        </view>
+        <view bindtap="gotoEdit" data-item="{{item}}" class="iconfont icon-bianji1"></view>
+        <!-- <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator> -->
+      </view>
+      <view wx:if="{{is_real_name=='1'}}">
+        <view class="text1" bindtap="showLinkman" wx:for="{{showNum}}" wx:for-index="index" wx:if="{{showNum>0}}">
+          <view style="display: flex;align-items: center;">
+            <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
+            <view style="margin-right: 36rpx;">出行人{{index+1}}</view>
+            <view>点击填写1位出行人信息</view>
+          </view>
+          <image style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
+        </view>
+      </view>
+      <view wx:if="{{is_real_name=='0' && selectLinkman.length==0}}">
+        <view class="text1" bindtap="showLinkman">
+          <view style="display: flex;align-items: center;">
+            <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
+            <view style="margin-right: 36rpx;">出行人1</view>
+            <view>点击填写1位出行人信息</view>
+          </view>
+          <image style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
+        </view>
+      </view>
     </view>
   </view>
   <view wx:else>
@@ -43,18 +94,59 @@
       <view bindtap="cancel">取消</view>
       <view bindtap="confirm">确定</view>
     </view>
-    <navigator url="/pages/user/linkman/add/index" class="add-btn">添加出行人</navigator>
+    <!-- <navigator url="/pages/user/linkman/add/index" class="add-btn">添加出行人</navigator> -->
+    <view class="add-btn" bindtap="showAddMask">添加出行人</view>
     <view class="linkmanlist-item" wx:for="{{linkmanList}}">
       <view class="linkmanlist-item-top">
-        <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
+        <!-- <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator> -->
+        <view bindtap="gotoEdit" data-item="{{item}}" class="iconfont icon-bianji1"></view>
         <view class="linkman-nickname">{{item.name}}</view>
         <view class="linkman-info">
           <view class="linkman-tel" style="margin-bottom:20rpx">手机号 {{item.tel}}</view>
           <view class="linkman-tel">{{item.title}}： {{item.id_number}}</view>
         </view>
-        <view class="iconfont {{item.selected==1?'icon-gou':'icon-quan'}}" bindtap="selectIt" data-item="{{item}}"></view>
+        <view class="iconfont {{item.selected==1?'icon-gou':'icon-quan'}}" bindtap="select" data-item="{{item}}"></view>
       </view>
       <view class="linkmanlist-tip" bindtap="setDefault" data-item="{{item}}"><text class="iconfont {{item.is_default==1?'icon-iconfontoptionbutton':'icon-quan'}}"></text> 设为默认出行人</view>
     </view>
   </view>
+</view>
+<view wx:if="{{showAdd}}" class="mask">
+  <view class="mask-bg"></view>
+  <view style="position: fixed;bottom: 0;">
+    <view class="mask-content1">
+    <view class="btns1">
+      <view bindtap="del">取消</view>
+      <view>{{editId?'编辑':'添加'}}出行人</view>
+      <view bindtap="save">保存</view>
+    </view>
+    <view class="input-box" style="margin:0;padding: 0 24.67rpx;">
+    <view class="input-item">
+      <text class="input-label">姓名</text>
+      <input bindinput="nameInput" value="{{formData.username}}" class="weui-input" auto-focus placeholder="请输入姓名" />
+    </view>
+    <view class="input-item">
+      <text class="input-label">证件类型</text>
+      <picker class="weui-input select-card" bindchange="selectType" value="{{selectIndex}}" range="{{typeList}}">
+        <view class="picker" style="display: flex;justify-content: space-between;align-items: baseline;width: 480rpx;">
+          <view>{{typeList[selectIndex]}}</view>
+          <icon class="iconfont icon-xia"></icon>
+        </view>
+      </picker>
+    </view>
+    <view class="input-item">
+      <text class="input-label">证件号</text>
+      <input bindinput="idNumberInput" value="{{formData.idNumber}}" class="weui-input" placeholder="请输入证件号" />
+    </view>
+    <view class="input-item">
+      <text class="input-label">手机号</text>
+      <input bindinput="telInput" type="number" value="{{formData.mobile}}" class="weui-input" placeholder="请输入手机号" />
+    </view>
+    <view class="input-item">
+      <text class="input-label">设为默认</text>
+      <switch active-value="DEFAULT" inactive-value="NORMAL" checked="{{formData.isDefault}}" bindchange="setAddDefault" />
+    </view>
+  </view>
+  </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index ecbc0b4..ea9490c 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -10,11 +10,12 @@
 }
 .contacts-list {
   border-top: 1rpx solid #ccc;
-  padding: 0 21rpx;
+  /* padding: 0 21rpx; */
+  padding: 42rpx 20rpx 18rpx;
 }
 .contact-item {
   padding: 30rpx 0;
-  border-bottom: 1rpx solid #ccc;
+  /* border-bottom: 1rpx solid #ccc; */
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -69,6 +70,14 @@
   margin-bottom: 10rpx;
   line-height: 90rpx;
 }
+.btns1 {
+  display: flex;
+  justify-content: space-between;
+  font-size: 31rpx;
+  color: #000;
+  margin-bottom: 47.33rpx;
+  /* line-height: 90rpx; */
+}
 .add-btn {
   line-height: 80rpx;
   background: #FFFFFF;
@@ -85,6 +94,13 @@
   background: #F7F7F7;
   max-height: 50%;
 }
+.mask-content1 {
+    width: 700rpx;
+    padding: 50rpx 20rpx 112rpx;
+    overflow-y: auto;
+    background: #F7F7F7;
+    max-height: 50%;
+}
 .linkmanlist-item {
   background: white;
   margin-bottom: 24rpx;
@@ -167,4 +183,68 @@
   color: #333333;
   font-size: 30rpx;
   justify-content: space-between;
+}
+
+.text1 {
+    display: flex;
+    padding: 16rpx 19.33rpx 17.33rpx 20rpx;
+    background: rgba(11,137,142,.06);
+    justify-content: space-between;
+    align-items: center;
+    font-weight: 400;
+    font-size: 27rpx;
+    color: #0B898E;
+    margin-bottom: 26.67rpx;
+    border-radius: 13rpx;
+}
+
+.name-box {
+  flex-shrink: 0;
+  margin-right: 15.33rpx;
+    width: 167rpx;
+    height: 73rpx;
+    background: rgba(11,137,142,0.06);
+    border-radius: 11rpx;
+    border: 2rpx solid #0B898E;
+    font-weight: 400;
+    font-size: 29rpx;
+    color: #000000;
+    text-align: center;
+    line-height: 73rpx;
+    position: relative;
+}
+
+.name-selected-icon {
+    width: 28rpx;
+    height: 28rpx;
+    position: absolute;
+    bottom: 0;
+    right: -2rpx;
+}
+
+.tel-input {
+  display: flex;
+    padding: 40rpx 20.67rpx 38.67rpx 21.33rpx;
+    border-top: 1rpx solid #ccc;
+    font-weight: 400;
+    font-size: 32rpx;
+    color: #000000;
+}
+
+.input-text {
+  margin-right: 70rpx;
+}
+
+.more {
+  width: 110rpx;
+  height: 73rpx;
+  background: #F1F1F1;
+  border-radius: 11rpx;
+  font-weight: 400;
+  font-size: 29rpx;
+  color: #0B898E;
+  line-height: 73rpx;
+  text-align: center;
+  position: absolute;
+  right: 0;
 }
\ No newline at end of file
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index ac9592b..5793f24 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -37,7 +37,8 @@ Page({
       flag:options.flag,
       // linkmanList: app.globalData.linkmanList
     })
-    console.log('-------------',app.globalData.list);
+    console.log('-------------',this.data.ticketList);
+    // debugger
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
       if (!app.globalData.kjId && !this.data.gp_id) {
@@ -50,7 +51,8 @@ Page({
       sku_id.push(item.sku.id)
     })
     app.globalData.list.map(item => {
-      price = price + item.sku.price * item.linkmanList.length;
+      // price = price + item.sku.price * item.linkmanList.length;
+      price = price + item.sku.price * item.num;
       sku_id.push(item.sku.id)
     })
     this.setData({
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 1bffe7b..aa9e7c4 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -42,15 +42,22 @@
 				{{item.sku.sku_name}}
 			</view>
 			<view>
-				<!-- X{{item.num}} -->
-				X{{item.linkmanList.length}}
+				X{{item.num}}
+				<!-- X{{item.linkmanList.length}} -->
 			</view>
 		</view>
     <view style="padding-left: 10rpx;margin: 30rpx 0 22.67rpx;">出行人信息</view>
-    <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
-      <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
-      <view class="text"><view class="text-left">证件号：</view>{{items.id_number}}</view>
-      <view class="text"><view class="text-left">手机号：</view>{{items.tel}}</view>
+    <view wx:if="{{item.sku.sku_model.is_authentication != 0}}">
+      <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
+        <view>
+          <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
+          <view class="text"><view class="text-left">证件号：</view>{{items.id_number}}</view>
+          <view class="text"><view class="text-left">手机号：</view>{{items.tel}}</view>
+        </view>
+      </view>
+    </view>
+    <view wx:else>
+      <view class="text"><view class="text-left">手机号：</view>{{item.phone}}</view>
     </view>
 	</view>
 </view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 5066c8f..38c008c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -33,6 +33,9 @@ Page({
     showMask: false,
     price:0,
     is_need_idcard:1,
+    is_authentication:1, // 是否实名，0否1是，默认实名
+    phone:'', //不实名时传的手机号
+    is_real_name:1, // 是否是一证一票，0否1是，
   },
 
   /**
@@ -50,10 +53,13 @@ Page({
       date:null,
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
       isCar:options.isCar,
-      is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard
+      is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_real_name:app.globalData.product.sku.sku_model.is_real_name,
     })
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
-    console.log('---期票类型----',app.globalData.product.sku.ticket_type);
+    console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
+    console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name);
 
     if (!app.globalData.product) {
       util.back();
@@ -65,7 +71,7 @@ Page({
       })
     }else{
 		this.setData({
-		  productNum: app.globalData.product.num < 1 ? 1 : app.globalData.product.num
+		  productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num
 		})
   }
     this.setData({
@@ -127,21 +133,27 @@ Page({
     })
   },
   setLinkman: function (e) {
-    let linkmanList = e.detail;
-    if (this.data.productNum != linkmanList.length && this.data.coupon) {
-      wx.showToast({
-        title: '订单价格发生变化，请重新选择优惠券',
-        icon: 'none'
+    if (e.detail.phone) {
+      this.setData({
+        phone:e.detail.phone
       })
-      // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
-      //   this.couponCom.setNullCoupon()
-      // }
-      // app.globalData.couponInfo = null;
-      // this.setData({
-      //   coupon: null
-      // })
-    }
-    let productNum = linkmanList.length == 0 ? 1 : this.data.productNum > linkmanList.length ? this.data.productNum : linkmanList.length;
+    }else {
+      console.log(e);
+      let linkmanList = e.detail;
+      if (this.data.productNum != linkmanList.length && this.data.coupon) {
+        wx.showToast({
+          title: '订单价格发生变化，请重新选择优惠券',
+          icon: 'none'
+        })
+        // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
+        //   this.couponCom.setNullCoupon()
+        // }
+        // app.globalData.couponInfo = null;
+        // this.setData({
+        //   coupon: null
+        // })
+      }
+      let productNum = linkmanList.length == 0 ? 1 : this.data.productNum < linkmanList.length ? linkmanList.length : this.data.productNum;
     if (this.data.gp_id) {
       productNum = app.globalData.product.maxNum;
     }
@@ -149,7 +161,9 @@ Page({
       productNum: productNum,
       linkmanList: linkmanList
     })
-    this.changePrice()
+    // this.changePrice()
+    this.totalPrice(this.data.singlePrice)
+    }
   },
   add: function () {
     if (this.data.productNum==undefined) {
@@ -190,7 +204,7 @@ Page({
       })
     }
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag && this.data.type!='museum') {
-      this.couponCom.setNullCoupon()
+      // this.couponCom.setNullCoupon()
 
     }
     app.globalData.couponInfo = null;
@@ -276,6 +290,13 @@ Page({
   order:function() {
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
+    if (linkmanList.length==0 && this.data.is_authentication == 1) {
+      wx.showToast({
+        title: '请选择出行人',
+        icon: 'none'
+      })
+      return
+    }
     linkmanList.map(item => {
       linkmanIds.push(item.id)
     })
@@ -291,12 +312,13 @@ Page({
         use_date: date ? date.date : '',
         visitors: linkmanIds.join(","),
         remark: remark,
-        product_num: app.globalData.product.isGroup == 1 ? 1 : productNum
+        product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
+        phone:this.data.phone,// 不实名的时候传的手机号参数
       }],
       originate_order_id: this.data.kjId,
       gp_id: app.globalData.gp_id,
       team_id: app.globalData.team_id,
-      linkmanList:this.data.linkmanList
+      linkmanList:this.data.is_authentication == 1?this.data.linkmanList:[]
     }
     if (app.globalData.from) {
       data.system_name = app.globalData.from;
@@ -321,8 +343,14 @@ Page({
       postData.type = 1;
     }
 	if(app.globalData.list){
-		app.globalData.list[app.globalData.index] = this.data.product
-		app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    app.globalData.list[app.globalData.index] = this.data.product
+    // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+      app.globalData.list[app.globalData.index].phone = this.data.phone
+      app.globalData.list[app.globalData.index].linkmanList = []
+    }else {
+      app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    }
   }
   // app.globalData.linkmanList = this.data.linkmanList
   app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
@@ -331,8 +359,9 @@ Page({
 		if(app.globalData.createDate){
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{
-			app.globalData.createDate = data
+      app.globalData.createDate = data
     }
+    console.log(app.globalData.createDate);
 		app.globalData.index = app.globalData.index + 1
 		app.globalData.product = app.globalData.list[app.globalData.index]
 		wx.redirectTo({
@@ -391,6 +420,20 @@ Page({
       })
       return
     }
+    if (linkmanList.length!=productNum && this.data.is_authentication == 1 && this.data.is_real_name == 1) {
+      wx.showToast({
+        title: '购票数量要和出行人数量一致',
+        icon: 'none'
+      })
+      return
+    }
+    if (!util.isTel(this.data.phone) &&this.data.is_authentication == 0) {
+      wx.showToast({
+        title: '请输入正确的手机号',
+        icon: 'none'
+      })
+      return
+    }
     if (!time && date && date.is_time_stock == true) {
       wx.showToast({
         title: '请选择使用时间',
@@ -405,6 +448,13 @@ Page({
       })
       return;
     }
+    // if (this.data.phone) {
+    //   linkmanList.map(item => {
+    //     linkmanIds.push(item.id)
+    //   })
+    // }
+    // console.log(app.globalData);
+    // debugger
     this.setData({
       showMask:true
     })
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index ae82641..cb558a8 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -21,7 +21,7 @@
       <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view>
     </view>
   </view>
-  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman"></contact>
+  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
   <!-- 补贴 -->
   <view class="box">
     <view class="box-title allowance" wx:if="{{allowance_price}}">
@@ -64,7 +64,7 @@
       <view class="dialog-top">
         <view class="scene-title">{{product.product.title}}-{{product.sku.sku_name}}</view>
         <view class="people-message">出行人信息</view>
-        <view style="max-height:430rpx;overflow: scroll;">
+        <view style="max-height:430rpx;overflow: scroll;" wx:if="{{is_authentication=='1'}}">
           <view class="people" wx:for="{{linkmanList}}">
             <view class="flex">
               <view>姓名：</view>
@@ -80,6 +80,12 @@
             </view>
           </view>
         </view>
+        <view wx:else>
+            <view class="flex" style="margin: 10rpx 0 30rpx;">
+              <view>手机号：</view>
+              <view style="color: #333;">{{phone}}</view>
+            </view>
+          </view>
       </view>
       <view class="bottom-btn">
         <view class="cancle" bindtap="cancel">取消</view>
diff --git a/pages/user/order/museumOrderInfo/index.js b/pages/user/order/museumOrderInfo/index.js
index 582c3d3..a1c91a7 100644
--- a/pages/user/order/museumOrderInfo/index.js
+++ b/pages/user/order/museumOrderInfo/index.js
@@ -20,7 +20,9 @@ Page({
     id:null,
     minute:"",
     second:"",
-    ids:[]
+    ids:[],
+    is_authentication:1, // 是否实名0否1是
+    phone:'',// 非实名时的电话
   },
 
   /**
@@ -207,8 +209,11 @@ Page({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
         product_model:res.data.order_product_list[0].product_model,
-        ids: proId.join(",")
+        ids: proId.join(","),
+        is_authentication:res.data.order_product_list[0].sku_model.is_authentication,
+        phone:res.data.order_product_list[0].phone
       })
+      console.log(res.data.order_product_list[0]);
       this.getCodeImg()
       // 获取行程规划
       let that = this;
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index be35fec..6fd5664 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -71,15 +71,22 @@
 </view>
 <view class="box" wx:if="{{info}}">
   <view class="box-title">出行人信息</view>
-  <view wx:for="{{info.order_product_list[0].contacts_info}}">
+  <view wx:if="{{is_authentication == 0}}">
     <view class="detail-item">
-      <text>姓名：{{item.name}}</text>
+      <text>手机号：{{phone}}</text>
     </view>
-    <view class="detail-item">
-      <text>{{item.title}}：{{item.id_number}}</text>
-    </view>
-    <view class="detail-item" wx:if="{{item.tel}}">
-      <text>手机号：{{item.tel}}</text>
+  </view>
+  <view wx:else>
+    <view wx:for="{{info.order_product_list[0].contacts_info}}">
+      <view class="detail-item">
+        <text>姓名：{{item.name}}</text>
+      </view>
+      <view class="detail-item">
+        <text>{{item.title}}：{{item.id_number}}</text>
+      </view>
+      <view class="detail-item" wx:if="{{item.tel}}">
+        <text>手机号：{{item.tel}}</text>
+      </view>
     </view>
   </view>
 </view>
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index e16cd84..b15311c 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -285,6 +285,8 @@ Page({
         product_model:"ticket"||res.data.order_product_list[0].product_model,
         ids: proId.join(",")
       })
+      console.log(res.data);
+      // debugger
       console.log('ids',this.data.ids);
       this.getCodeImg()
       // 获取行程规划
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 4bccaf9..f80ffa2 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -88,20 +88,27 @@
           <view>出行人信息</view>
           <view bindtap="showMsg" data-msg="cxr1" style="color: rgb(49, 154, 158);">{{cxr1Text}}</view>
         </view>
-        <view wx:if="{{cxr1}}" wx:for="{{item.contacts_info}}">
-          <view class="line" wx:if="{{index!=0}}"></view>
-          <view class="detail-item">
-            <text>姓名： {{item.name}}</text>
-            <!-- <text>￥168</text> -->
-          </view>
-          <view class="detail-item">
-            <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text>
-            <!-- <text>-￥10</te、xt> -->
-          </view>
+        <view wx:if="{{item.sku_model.is_authentication == 0}}">
           <view class="detail-item">
-            <text>手机号： {{item.tel}}</text>
-            <!-- <text>-￥10</text> -->
-          </view>
+              <text>手机号： {{item.phone}}</text>
+            </view>
+        </view>
+        <view wx:else>
+          <view wx:if="{{cxr1}}" wx:for="{{item.contacts_info}}">
+          <view class="line" wx:if="{{index!=0}}"></view>
+            <view class="detail-item">
+              <text>姓名： {{item.name}}</text>
+              <!-- <text>￥168</text> -->
+            </view>
+            <view class="detail-item">
+              <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text>
+              <!-- <text>-￥10</te、xt> -->
+            </view>
+            <view class="detail-item">
+              <text>手机号： {{item.tel}}</text>
+              <!-- <text>-￥10</text> -->
+            </view>
+        </view>
         </view>
       </view>
       <view wx:if="{{item.product_model=='ticket'}}">

From 11b46caeba0499c08224fc0c83bee5b5252c46b4 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 30 May 2024 17:06:58 +0800
Subject: [PATCH 155/471] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BC=80?=
 =?UTF-8?q?=E5=B1=8F=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |    2 +-
 pages/index/index.js   | 1854 +++++++++++++++++++++-------------------
 pages/index/index.wxml |   40 +-
 pages/index/index.wxss |   29 +
 utils/https.js         |    3 +-
 5 files changed, 1011 insertions(+), 917 deletions(-)

diff --git a/app.js b/app.js
index dca3e71..bc54044 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.isTest116? true : false;
+      data.isTest = data.isTest117? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 02d45ff..164d0c2 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -5,918 +5,966 @@ import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 Page({
-  data: {
-    banner: [],
-    xiaobanner: [],
-    height: 0,
-    padHeight: 0,
-    right: 0,
-    weather: null,
-    saleProduct: null,
-    roadProduct: null,
-    fourProduct: [],
-    hotIndex: 0,
-    indexHot: [],
-    area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu", "gongyeyuanqu", "gaoxin"],
-    month: "",
-    months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
-    date: "",
-    list: [],
-    listMore: true,
-    isTest: false,
-    lat: "",
-    lon: "",
-    urltopage: {},
-    scrollLeft: 0,
-    videoPrize: false,
-    prizeInfo: null,
-    otherPlat: null,
-    activeBannerIndex: 0,
-    smBannerIndex: 0,
-    indexSeason: {},
-    // startList: [], // 启动页广告
-    startList: {head_img:''}, // 启动页广告
-    alertSwipeList: [], //弹窗广告
-    showAdv: false, //弹窗开关
-    showFullAdv: true, //全屏广告开关
-    opacity: 1,
-    time: 3, //全屏广告剩余时间
-    showTime:false,
-    xpth:{}, // 元旦新增 新品特惠和sqjNew
-    djs:null, // 元旦新增 新品特惠倒计时
-    djsTime:null,
-    sqjNew:[
-      'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-      'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
-    ],
-    viewHeight:"0px",
-  },
-  onLoad: function (options) {
-    this.getHeight()
-    //全屏广告
-    wx.hideTabBar() //这里隐藏了底部导航栏
-    commonApi._post("adv/getAdv", {
-      position: 2,
-      type_id: 3
-    }).then(res => {
-      if (res.data.length > 0) {
-        this.setData({
-          showTime:true
-        })
-        var timer = setInterval(() => {
-          this.setData({
-            time: this.data.time - 1
-          })
-          if (this.data.time === 0) {
-            var opacityTimer =  setInterval(() => {
-              this.setData({
-                opacity: this.data.opacity - 0.3
-              })
-            }, 100)
-          }
-          if (this.data.time == -1) {
-            clearInterval(timer)
-            clearInterval(opacityTimer)
-            wx.showTabBar() //倒计时结束清除定时器显示导航栏
-            this.setData({
-              showFullAdv: false
-            })
-          }
-        }, 1000)
-        let length = res.data.length
-        if (res.data.length > 1) {
-          let num = Math.floor(Math.random()*length);
-          console.log('num',num);
-          this.setData({
-            startList:res.data[num]
-          })
-          console.log(this.data.startList.head_img);
-        } else {
-          this.setData({
-            startList:res.data[0]
-          })
-        }
-      }else{
-        this.setData({
-          showFullAdv: false
-        })
-      }
-    })
-    if (options.from) {
-      app.globalData.from = options.from;
-    }
-    let systemInfo = wx.getSystemInfoSync(),
-      rect = wx.getMenuButtonBoundingClientRect();
-    let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
-    wx.getLocation({
-      type: 'gcj02',
-      success: (res) => {
-        this.setData({
-          lat: res.latitude,
-          lon: res.longitude
-        })
-        this.getList()
-      },
-      fail: (err) => {
-        this.getList()
-      }
-    })
-    this.setData({
-      height: height,
-      padHeight: systemInfo.statusBarHeight,
-      right: (systemInfo.screenWidth - rect.right) + rect.width
-    })
+	data: {
+		banner: [],
+		xiaobanner: [],
+		height: 0,
+		padHeight: 0,
+		right: 0,
+		weather: null,
+		saleProduct: null,
+		roadProduct: null,
+		fourProduct: [],
+		hotIndex: 0,
+		indexHot: [],
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
+		month: "",
+		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
+		date: "",
+		list: [],
+		listMore: true,
+		isTest: false,
+		lat: "",
+		lon: "",
+		urltopage: {},
+		scrollLeft: 0,
+		videoPrize: false,
+		prizeInfo: null,
+		otherPlat: null,
+		activeBannerIndex: 0,
+		smBannerIndex: 0,
+		indexSeason: {},
+		// startList: [], // 启动页广告
+		startList: {
+			head_img: ''
+		}, // 启动页广告
+		alertSwipeList: [], //弹窗广告
+		showAdv: false, //弹窗开关
+		showFullAdv: true, //全屏广告开关
+		opacity: 1,
+		time: 3, //全屏广告剩余时间
+		showTime: false,
+		xpth: {}, // 元旦新增 新品特惠和sqjNew
+		djs: null, // 元旦新增 新品特惠倒计时
+		djsTime: null,
+		sqjNew: [
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+		],
+		viewHeight: "0px",
+		isMuted: true,
+		videoPlay: false,
+	},
+	onLoad: function(options) {
+		this.getHeight()
+		//全屏广告
+		wx.hideTabBar() //这里隐藏了底部导航栏
+		commonApi._post("adv/getAdv", {
+			position: 2,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+				if (res.data.length > 1) {
+					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
+					this.setData({
+						startList: res.data[num]
+					})
+					console.log(this.data.startList.head_img);
+				} else {
+					this.setData({
+						startList: res.data[0]
+					})
+				}
 
-    commonApi._post("pbservice/Other/getClientConfig", {
-      unique_key: "urltopage"
-    }).then(res => {
-      let data = JSON.parse(res.data)
-      this.setData({
-        urltopage: data
-      })
-    })
-    this.getTwoProduct()
-    this.getBanner()
-    this.getWeather()
-    // 获取今天的日期
-    let today = new Date();
-    this.setData({
-      month: (this.data.months[today.getMonth()]).toUpperCase(),
-      date: today.getDate()
-    })
-    this.getVideoPrize()
-    this.getXpthList()
-  },
-  getHeight() {
-    let that = this
-    wx.getSystemInfo({
-      success(res) {
-        console.log(res)
-        that.setData({
-          viewHeight:res.windowHeight+'px'
-        })
-        console.log(that.data.viewHeight)
-      }
-    })
-  },
-  getXpthList:function () {
-    // 元旦新增 新品特惠
-    commonApi._post("product/get_product_indulgence", {
-      tag_id: 275,
-      typeId:3,
-    }).then(res => {
-      console.log('data',res.data);
-      this.setData({
-        xpth: res.data,
-        djsTime: res.data.time
-      })
-      let time = setInterval(()=>{
-        this.setData({
-          djsTime:this.data.djsTime-1
-        })
-        this.formatDate(this.data.djsTime)
-      },1000)
-      if(this.data.djsTime==0) {
-        clearInterval(time)
-      }
-    })
-  },
-  // 元旦新品特惠 倒计时 
-  formatDate: function (oTime) {
-    let h = parseInt(oTime/3600)
-    let m = parseInt((oTime%3600)/60)
-    let s = parseInt(oTime%60)
-    h=h<10?"0"+h:h;
-    m=m<10?"0"+m:m;
-    s=s<10?"0"+s:s;
-    this.setData({
-      djs:{h:h,m:m,s:s}
-    })
-    return
-  },
-  goFeiyi: function () {
-    app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-    wx.navigateTo({
-      url:"/pages/pbService/web/index"
-    })
-  },
-  onTabItemTap: function (e) {
-    console.log(e, 99999999)
-  },
-  changeBannerIndex: function (e) {
-    this.setData({
-      activeBannerIndex: e.detail.current
-    })
-  },
-  changeSmBannerIndex: function (e) {
-    this.setData({
-      smBannerIndex: e.detail.current
-    })
-  },
-  // 一城百馆
-  city: function () {
-    wx.navigateToMiniProgram({
-      appId: 'wx114d514f39cb1fed',
-      path: "pages/entry/index"
-    })
-    commonApi._post("browse/burying_point", {
-      drive: "mini",
-      title: "一城百馆",
-      uuid: app.globalData.uuid
-    }).then(res => {
+				// 图片
+				if (this.data.startList.media_type) {
+					this.setData({
+						showTime: true
+					})
+					var timer = setInterval(() => {
+						this.setData({
+							time: this.data.time - 1
+						})
+						if (this.data.time === 0) {
+							var opacityTimer = setInterval(() => {
+								this.setData({
+									opacity: this.data.opacity - 0.3
+								})
+							}, 100)
+						}
+						if (this.data.time == -1) {
+							clearInterval(timer)
+							clearInterval(opacityTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							this.setData({
+								showFullAdv: false
+							})
+						}
+					}, 1000)
+				} else {
+					// 视频
+				}
+			} else {
+				this.setData({
+					showFullAdv: false
+				})
+			}
+		})
+		if (options.from) {
+			app.globalData.from = options.from;
+		}
+		let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+		wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+				this.getList()
+			},
+			fail: (err) => {
+				this.getList()
+			}
+		})
+		this.setData({
+			height: height,
+			padHeight: systemInfo.statusBarHeight,
+			right: (systemInfo.screenWidth - rect.right) + rect.width
+		})
 
-    })
-  },
-  changeHotIndex: function (e) {
-    this.setData({
-      hotIndex: e.currentTarget.dataset.index,
-      fourProduct: []
-    })
-    this.getFourProduct()
-  },
-  getBanner: function () {
-    // commonApi._post("adv/getAdvByKey",{
-    //   key:"xcxBanner"
-    // }).then(res=>{
-    //   console.log(res)
-    //   this.setData({
-    //     banner:res.data.content || []
-    //   })
-    // })
-    // commonApi._post("adv/getAdvByKey",{
-    //   key:"xiaobanner"
-    // }).then(res=>{
-    //   this.setData({
-    //     xiaobanner:res.data.content || []
-    //   })
-    // })
-    // return;
-    commonApi._post("adv/getAdv", {
-      position: 0,
-      type_id: 3
-    }).then(res => {
-      this.setData({
-        banner: res.data || []
-      })
-    })
-    commonApi._post("adv/getAdv", {
-      position: 1,
-      type_id: 3
-    }).then(res => {
-      this.setData({
-        xiaobanner: res.data || []
-      })
-    })
-    //弹窗广告
-    commonApi._post("adv/getAdv", {
-      position: 3,
-      type_id: 3
-    }).then(res => {
-      if (res.data.length > 0) {
-        this.setData({
-          alertSwipeList: res.data || [],
-          showAdv: true
-        })
-      }else if(!this.data.showFullAdv){
-        wx.showTabBar({
-          animation: true,
-        })
-      }
-    })
+		commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
+			this.setData({
+				urltopage: data
+			})
+		})
+		this.getTwoProduct()
+		this.getBanner()
+		this.getWeather()
+		// 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+		this.getVideoPrize()
+		this.getXpthList()
+	},
+	getHeight() {
+		let that = this
+		wx.getSystemInfo({
+			success(res) {
+				console.log(res)
+				that.setData({
+					viewHeight: res.windowHeight + 'px'
+				})
+				console.log(that.data.viewHeight)
+			}
+		})
+	},
+	getXpthList: function() {
+		// 元旦新增 新品特惠
+		commonApi._post("product/get_product_indulgence", {
+			tag_id: 275,
+			typeId: 3,
+		}).then(res => {
+			console.log('data', res.data);
+			this.setData({
+				xpth: res.data,
+				djsTime: res.data.time
+			})
+			let time = setInterval(() => {
+				this.setData({
+					djsTime: this.data.djsTime - 1
+				})
+				this.formatDate(this.data.djsTime)
+			}, 1000)
+			if (this.data.djsTime == 0) {
+				clearInterval(time)
+			}
+		})
+	},
+	// 元旦新品特惠 倒计时 
+	formatDate: function(oTime) {
+		let h = parseInt(oTime / 3600)
+		let m = parseInt((oTime % 3600) / 60)
+		let s = parseInt(oTime % 60)
+		h = h < 10 ? "0" + h : h;
+		m = m < 10 ? "0" + m : m;
+		s = s < 10 ? "0" + s : s;
+		this.setData({
+			djs: {
+				h: h,
+				m: m,
+				s: s
+			}
+		})
+		return
+	},
+	goFeiyi: function() {
+		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+		wx.navigateTo({
+			url: "/pages/pbService/web/index"
+		})
+	},
+	onTabItemTap: function(e) {
+		console.log(e, 99999999)
+	},
+	changeBannerIndex: function(e) {
+		this.setData({
+			activeBannerIndex: e.detail.current
+		})
+	},
+	changeSmBannerIndex: function(e) {
+		this.setData({
+			smBannerIndex: e.detail.current
+		})
+	},
+	// 一城百馆
+	city: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx114d514f39cb1fed',
+			path: "pages/entry/index"
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "一城百馆",
+			uuid: app.globalData.uuid
+		}).then(res => {
 
-  },
-  //获取季节配置
-  getIndexSeason(){
-    this.setData({
-      indexHot: app.globalData.configJson.indexHot,
-      isTest: app.globalData.configJson.isTest,
-      otherPlat: app.globalData.configJson.otherPlats,
-      indexSeason: app.globalData.configJson.indexSeason
-    })
-    this.getFourProduct()
-  },
-  //关闭弹窗广告
-  closeAdv: function () {
-    this.setData({
-      showAdv: false
-    })
-    wx.showTabBar({
-      animation: true,
-    })
-  },
-  //关闭全屏广告
-  closeFullAdv:function(){
-    this.setData({
-      showFullAdv:false
-    })
-    if (!this.data.alertSwipeList.length>0) {
-        wx.showTabBar({
-          animation: true,
-        })
-    }
-  },
-  getWeather: function () {
-    commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-      console.log(res)
-      this.setData({
-        weather: res.data
-      })
-    })
-  },
-  saleDetail: function () {},
-  getTwoProduct: function () {
-    // 获取首页限时特惠
-    commonApi._post('act/fast_sale_now', {
-      offset: 0,
-      limit: 1
-    }).then(res => {
-      if (res.data[0] && res.data[0].fast_sales_sku[0]) {
-        if (res.data[0].fast_sales_sku.length > 0) {
-          let price = res.data[0].fast_sales_sku[0].price
-          let data = res.data[0].fast_sales_sku[0]
-          for (let item of res.data[0].fast_sales_sku) {
-            if (price > item.price) price = item.price
-          }
-          data.price = price
-          this.setData({
-            saleProduct: data
-          })
-        } else {
-          this.setData({
-            saleProduct: res.data[0].fast_sales_sku[0]
-          })
-        }
-      }
-    })
-    commonApi._post("product/get_product_by_tag", {
-      tag_id: 17,
-      offset: 0,
-      limit: 1,
-      sort: 'price',
-      order: 'asc'
-    }).then(res => {
-      if (res.data.list.length > 0) {
-        let price = res.data.list[0].price
-        for (let item of res.data.list) {
-          if (item.price > price) {
-            price = item.price
-          }
-        }
-        let data = res.data.list[0]
-        data.price = price
-        this.setData({
-          roadProduct: data
-        })
-      } else {
-        this.setData({
-          roadProduct: [111]
-        })
-      }
-    })
-  },
-  getFourProduct: function () {
-    let item = this.data.indexHot[this.data.hotIndex],
-      service = "product/get_product_by_tag",
-      data = {
-        tag_id: item.id,
-        offset: 0,
-        limit: 4,
-        sort: 'weight',
-        order: 'desc'
-      };
-    if (item.type == 'scene') {
-      service = "scene/get_scene_by_tag";
-    } else if (item.type == 'movie') {
-      service = "Cinema/getHotMovieList";
-      data = {
-        page: 1,
-        pageSize: 4
-      };
-    }
-    commonApi._post(service, data).then(res => {
-      this.setData({
-        fourProduct: res.data.list || res.data
-      })
-    })
-  },
-  tagGotoDetail: function (e) {
-    let item = e.currentTarget.dataset.item;
-    if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + item.title,
-      })
-    } else {
-      util.gotoDetail(item)
-    }
-  },
-  productGotoDetail: function (e) {
-    let item = e.currentTarget.dataset.item;
-    util.gotoDetail(item)
-  },
-  gotoPath: function (e) {
-    console.log(e)
-    // if (e.currentTarget.dataset.event) {
-    //   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
-    //     wx.navigateToMiniProgram({
-    //       appId: 'wxd323e63a10aa6865',
-    //       path: 'pages/home/index'
-    //     })
-    //     return
-    //   }else{
-    //     this.pagePoint({
-    //       event: e.currentTarget.dataset.event
-    //     }, 1)
-    //   }
-    // }
-    if (e.currentTarget.dataset.title == '书香借阅') {
-      wx.navigateToMiniProgram({
-        appId: 'wx165d4f1727f6bdb0',
-        path: 'pages/home/home'
-      })
-      return;
-    } else if (e.currentTarget.dataset.title == '12348') {
-      wx.navigateToMiniProgram({
-        appId: 'wxcdfd45c001466ba3',
-        path: 'pages/index/index'
-      })
-      return;
-    }else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-      wx.navigateToMiniProgram({
-        appId: 'wxdd39069b9a91dbfe',
-        path: 'pages/index/index'
-      })
-      return;
-    }else if (e.currentTarget.dataset.event == 'kunshan_click') {
-      wx.navigateToMiniProgram({
-        appId: 'wx8888a3fd0862b4c8',
-        path: 'pages/index/index'
-      })
-      return;
-    }else if (e.currentTarget.dataset.event == 'taicang_click') {
-      wx.navigateToMiniProgram({
-        appId: 'wx8853b0d93cbca75e',
-        path: 'pages/home/home'
-      })
-      return;
-    }else if (e.currentTarget.dataset.event == 'changshu_click') {
-      wx.navigateToMiniProgram({
-        appId: 'wx4df5fd9a6a5ea123',
-        path: 'pages/index'
-      })
-      return;
-    }else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
-      wx.navigateToMiniProgram({
-        appId: 'wxd323e63a10aa6865',
-        path: 'pages/home/index'
-      })
-      return;
-    }else if (e.currentTarget.dataset.event == 'wujiang_click') {
-      wx.navigateToMiniProgram({
-        appId: 'wx8eadea4ee2d42d4b',
-        path: 'pages/index/index'
-      })
-      return;
-    }
-    wx.navigateTo({
-      url: e.currentTarget.dataset.path,
-    })
-    if (e.currentTarget.dataset.title) {
-      commonApi._post("browse/burying_point", {
-        uuid: app.globalData.uuid,
-        drive: "mini",
-        title: e.currentTarget.dataset.title
-      }).then(res => {
+		})
+	},
+	changeHotIndex: function(e) {
+		this.setData({
+			hotIndex: e.currentTarget.dataset.index,
+			fourProduct: []
+		})
+		this.getFourProduct()
+	},
+	getBanner: function() {
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xcxBanner"
+		// }).then(res=>{
+		//   console.log(res)
+		//   this.setData({
+		//     banner:res.data.content || []
+		//   })
+		// })
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xiaobanner"
+		// }).then(res=>{
+		//   this.setData({
+		//     xiaobanner:res.data.content || []
+		//   })
+		// })
+		// return;
+		commonApi._post("adv/getAdv", {
+			position: 0,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				banner: res.data || []
+			})
+		})
+		commonApi._post("adv/getAdv", {
+			position: 1,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				xiaobanner: res.data || []
+			})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {
+			position: 3,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
+				})
+			} else if (!this.data.showFullAdv) {
+				wx.showTabBar({
+					animation: true,
+				})
+			}
+		})
 
-      })
-    }
-  },
-  // 元旦  新品特惠部分
-  goBanner: function(e) {
-    console.log('新品特惠',e.currentTarget.dataset.url);
-    let url = e.currentTarget.dataset.url;
-    app.globalData.weburl = url;
-    wx.navigateTo({
-      url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
-    })
-  },
-  gotoUrl: function (e) {
-	  console.log(e)
-    if (e.currentTarget.dataset.event) {
-      this.pagePoint({
-        event: e.currentTarget.dataset.event
-      }, 1)
-    }
-    let url = e.currentTarget.dataset.url;
-    app.globalData.weburl = url;
-    wx.navigateTo({
-      // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
-      url: '/pages/pbService/web/index?weburl='+encodeURIComponent(url),
-    })
-  },
-  gotoMini: function (e) {
-    let appid = e.currentTarget.dataset.appid,
-      path = e.currentTarget.dataset.path
-    wx.navigateToMiniProgram({
-      appId: appid,
-      path: path
-    })
-  },
-  garbage: function () {
-    wx.navigateToMiniProgram({
-      appId: 'wx13be821f3b1afed3',
-      path: 'pages/home/home'
-    })
-  },
-  gotoSku: function () {
-    commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-      console.log(res)
-      app.globalData.weburl = res.data.url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index'
-      })
-      return;
-    })
-  },
-  audioGuide: function () {
-    wx.navigateToMiniProgram({
-      appId: 'wx74f380bc721a0379',
-      path: '/pages/listen/listen?title=君到苏州'
-    })
-    commonApi._post("browse/burying_point", {
-      drive: "mini",
-      title: "语音导览",
-      uuid: app.globalData.uuid
-    }).then(res => {
+	},
+	//获取季节配置
+	getIndexSeason() {
+		this.setData({
+			indexHot: app.globalData.configJson.indexHot,
+			isTest: app.globalData.configJson.isTest,
+			otherPlat: app.globalData.configJson.otherPlats,
+			indexSeason: app.globalData.configJson.indexSeason
+		})
+		this.getFourProduct()
+	},
+	//关闭弹窗广告
+	closeAdv: function() {
+		this.setData({
+			showAdv: false
+		})
+		wx.showTabBar({
+			animation: true,
+		})
+	},
+	//关闭全屏广告
+	closeFullAdv: function() {
+		this.setData({
+			showFullAdv: false
+		})
+		if (!this.data.alertSwipeList.length > 0) {
+			wx.showTabBar({
+				animation: true,
+			})
+		}
+	},
+	// 是否静音
+	closeMuted: function() {
+		this.setData({
+			isMuted: this.data.isMuted = !this.data.isMuted
+		})
+	},
+	// 播放视频
+	videoPlay: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.play();
+		this.setData({
+			videoPlay: false
+		})
+	},
+	// 暂停视频
+	videoPause: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.pause();
+		this.setData({
+			videoPlay: true
+		})
+	},
+	getWeather: function() {
+		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
+			this.setData({
+				weather: res.data
+			})
+		})
+	},
+	saleDetail: function() {},
+	getTwoProduct: function() {
+		// 获取首页限时特惠
+		commonApi._post('act/fast_sale_now', {
+			offset: 0,
+			limit: 1
+		}).then(res => {
+			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
+				if (res.data[0].fast_sales_sku.length > 0) {
+					let price = res.data[0].fast_sales_sku[0].price
+					let data = res.data[0].fast_sales_sku[0]
+					for (let item of res.data[0].fast_sales_sku) {
+						if (price > item.price) price = item.price
+					}
+					data.price = price
+					this.setData({
+						saleProduct: data
+					})
+				} else {
+					this.setData({
+						saleProduct: res.data[0].fast_sales_sku[0]
+					})
+				}
+			}
+		})
+		commonApi._post("product/get_product_by_tag", {
+			tag_id: 17,
+			offset: 0,
+			limit: 1,
+			sort: 'price',
+			order: 'asc'
+		}).then(res => {
+			if (res.data.list.length > 0) {
+				let price = res.data.list[0].price
+				for (let item of res.data.list) {
+					if (item.price > price) {
+						price = item.price
+					}
+				}
+				let data = res.data.list[0]
+				data.price = price
+				this.setData({
+					roadProduct: data
+				})
+			} else {
+				this.setData({
+					roadProduct: [111]
+				})
+			}
+		})
+	},
+	getFourProduct: function() {
+		let item = this.data.indexHot[this.data.hotIndex],
+			service = "product/get_product_by_tag",
+			data = {
+				tag_id: item.id,
+				offset: 0,
+				limit: 4,
+				sort: 'weight',
+				order: 'desc'
+			};
+		if (item.type == 'scene') {
+			service = "scene/get_scene_by_tag";
+		} else if (item.type == 'movie') {
+			service = "Cinema/getHotMovieList";
+			data = {
+				page: 1,
+				pageSize: 4
+			};
+		}
+		commonApi._post(service, data).then(res => {
+			this.setData({
+				fourProduct: res.data.list || res.data
+			})
+		})
+	},
+	tagGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
+			wx.navigateTo({
+				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+					item.title,
+			})
+		} else {
+			util.gotoDetail(item)
+		}
+	},
+	productGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.gotoDetail(item)
+	},
+	gotoPath: function(e) {
+		console.log(e)
+		// if (e.currentTarget.dataset.event) {
+		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
+		//     wx.navigateToMiniProgram({
+		//       appId: 'wxd323e63a10aa6865',
+		//       path: 'pages/home/index'
+		//     })
+		//     return
+		//   }else{
+		//     this.pagePoint({
+		//       event: e.currentTarget.dataset.event
+		//     }, 1)
+		//   }
+		// }
+		if (e.currentTarget.dataset.title == '书香借阅') {
+			wx.navigateToMiniProgram({
+				appId: 'wx165d4f1727f6bdb0',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.title == '12348') {
+			wx.navigateToMiniProgram({
+				appId: 'wxcdfd45c001466ba3',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxdd39069b9a91dbfe',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8888a3fd0862b4c8',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'taicang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8853b0d93cbca75e',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'changshu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx4df5fd9a6a5ea123',
+				path: 'pages/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxd323e63a10aa6865',
+				path: 'pages/home/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wujiang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8eadea4ee2d42d4b',
+				path: 'pages/index/index'
+			})
+			return;
+		}
+		wx.navigateTo({
+			url: e.currentTarget.dataset.path,
+		})
+		if (e.currentTarget.dataset.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: e.currentTarget.dataset.title
+			}).then(res => {
 
-    })
-  },
-  // 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-  getList: function () {
-    if (!this.data.listMore) return;
-    commonApi._post("search/recommend", {
-      offset: this.data.list.length,
-      limit: 16
-    }).then(res => {
-      res.data.map(item => {
-        if (item.ext.display_tags) {
-          item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-        } else {
-          item.ext.display_tags = []
-        }
-      })
-      if (res.data.length < 15) {
-        this.setData({
-          listMore: false
-        })
-      }
-      this.setData({
-        list: this.data.list.concat(res.data)
-      })
-    })
-  },
-  onReachBottom: function () {
-     if (this.data.list.length<30) {
-             this.getList()
-     }
-  },
-  gotoDetail: function (e) {
-    let item = e.currentTarget.dataset.item;
-    util.pagePoint({
-      event: 'recommend_click',
-      param: {
-        id: item.id,
-        type: item.type
-      }
-    }, 1)
-    if (item.type == 'travels') {
-      // 游记做特殊处理 其他都按照原来的来
-      wx.navigateTo({
-        url: '/pages/info/strategyInfo/index?id=' + item.s_id,
-      })
-    } else {
-      util.gotoDetail(item.ext);
-    }
-  },
-  meituan: function () {
-    wx.navigateToMiniProgram({
-      appId: 'wxde8ac0a21135c07d',
-      path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
-    })
-  },
-  // 轮播图点击
-  bannerClick: function (e) {
-    if (this.data.isTest) return;
-    let item = e.currentTarget.dataset.item;
-    this.pagePoint({
-      event: "banner_click",
-      type: 'banner'
-    }, 1)
-    switch (item.jump_type) {
-      case 0:
-        break;
-      case 1:
-        util.gotoDetail(item.product_model)
-        break;
-      case 2:
-        if (item.front_model && item.front_model.mini) {
-          wx.navigateTo({
-            url: "/" + item.front_model.mini
-          })
-        }
-        break;
-      case 3:
-        if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-          // 外部h5
-          console.log(111,item.tdata)
-          app.globalData.weburl = item.tdata.url;
-          wx.navigateTo({
-            url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata.url)
-          })
-        } else {
-          let page = item.tdata.url.split("/");
-          page = page[page.length - 1].split("?")
-          console.log(page[0])
-          let url = this.data.urltopage[page[0]];
-          if (url && url.indexOf('map') != -1) {
-            let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic', 'cinema', 'academes'],
-              type = page[1] ? page[1].split("=") : [];
-            wx.reLaunch({
-              url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-            })
-          } else if (url) {
-            wx.navigateTo({
-              url: url,
-            })
-          } else {
-            app.globalData.weburl = item.tdata.url;
-			console.log(2222,item.tdata.url,app.globalData.weburl)
-            wx.navigateTo({
-              url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata.url)
-            })
-          }
-        }
-        break;
-      case 4:
-        if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-          // 如果是苏心游的小程序 直接把authCode带过去
-          userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-            let weburl = item.tdata.page
-            if (weburl.indexOf('?') != -1) {
-              weburl += '&authCode=' + res.data;
-            } else {
-              weburl += '?authCode=' + res.data
-            }
-            wx.navigateToMiniProgram({
-              appId: item.tdata.appid,
-              path: weburl
-            })
-          }).catch(err => {
-            wx.navigateToMiniProgram({
-              appId: item.tdata.appid,
-              path: item.tdata.page
-            })
-          })
-        } else {
-          wx.navigateToMiniProgram({
-            appId: item.tdata.appid,
-            path: item.tdata.page
-          })
-        }
-        break;
-      default:
-        break;
-    }
-    return;
+			})
+		}
+	},
+	// 元旦  新品特惠部分
+	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
+		})
+	},
+	gotoUrl: function(e) {
+		console.log(e)
+		if (e.currentTarget.dataset.event) {
+			this.pagePoint({
+				event: e.currentTarget.dataset.event
+			}, 1)
+		}
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+		})
+	},
+	gotoMini: function(e) {
+		let appid = e.currentTarget.dataset.appid,
+			path = e.currentTarget.dataset.path
+		wx.navigateToMiniProgram({
+			appId: appid,
+			path: path
+		})
+	},
+	garbage: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx13be821f3b1afed3',
+			path: 'pages/home/home'
+		})
+	},
+	gotoSku: function() {
+		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
+			app.globalData.weburl = res.data.url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index'
+			})
+			return;
+		})
+	},
+	audioGuide: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx74f380bc721a0379',
+			path: '/pages/listen/listen?title=君到苏州'
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "语音导览",
+			uuid: app.globalData.uuid
+		}).then(res => {
 
-  },
-  //博物馆跳转  直接跳君到苏州H5
-  goH5:function(e){
-    console.log(e.currentTarget.dataset.path);
-    let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
-    // app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
-    wx.navigateTo({
-      // url: "/pages/pbService/web/index"
-      url: '/pages/pbService/web/index?weburl='+encodeURIComponent(weburl),
-    })
-  },
-  bannerClick2: function (e) {
-    let item = e.currentTarget.dataset.item;
-    if (item.action == 'href') {
-      if (item.href.indexOf(",") != -1) {
-        let info = item.href.split(",");
-        wx.navigateToMiniProgram({
-          appId: info[0],
-          path: info[1]
-        })
-      } else if (item.href.indexOf('map/index') != -1) {
-        wx.reLaunch({
-          url: item.href
-        })
-      } else {
-        wx.navigateTo({
-          url: item.href,
-        })
-      }
-    } else if (item.action == "web") {
-      app.globalData.weburl = item.href;
-      wx.navigateTo({
-        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-      })
-    }
-  },
-  // 监听文旅查询的scroll
-  listenScroll(e) {
-    this.setData({
-      scrollLeft: e.detail.scrollLeft
-    })
-  },
-  // 获取短视频大赛是否中奖 中奖详情
-  getVideoPrize() {
-    let user_id = wx.getStorageSync('jstrip_userid');
-    if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-    commonApi.user_post('actonline/video_act/getRaffle', {
-      act_id: 5
-    }).then(res => {
-      this.setData({
-        videoPrize: res.data
-      })
-    })
-  },
-  noMoreTip() {
-    wx.setStorageSync('indexPriceNoTip', true)
-    this.closePrice()
-  },
-  closePrice() {
-    this.setData({
-      videoPrize: false,
-      prizeInfo: null
-    })
-  },
-  // 抽奖
-  choosePrize() {
-    commonApi.user_post('actonline/video_act/luckyDraw', {
-      act_id: 5
-    }).then(res => {
-      this.setData({
-        prizeInfo: res.data
-      })
-      if (res.data.type != 'none') {
-        // 抽奖成功的话 弹框
-        wx.showModal({
-          title: "提示",
-          content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-          showCancel: false
-        })
-      }
-    })
-  },
-  bannerJumpNew(item) {
-    let that = this
-    item = item.currentTarget.dataset.item
-    if (item.tdata == '') return
-    that.pagePoint({
-      event: "banner_click",
-      type: 'banner'
-    }, 1)
-    switch (item.jump_type) {
-      case 0:
-        break;
-      case 1:
-        util.gotoDetail(item.product_model)
-        break;
-      case 2:
-        if (item.front_model && item.front_model.mini) {
-          wx.navigateTo({
-            url: "/" + item.front_model.mini
-          })
-        }
-        break;
-      case 3:
-        if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-          // 外部h5
-          console.log(item.tdata)
-          app.globalData.weburl = item.tdata.url;
-          wx.navigateTo({
-            url: "/pages/pbService/web/index"
-          })
-        } else {
-          let page = item.tdata.url.split("/");
-          page = page[page.length - 1].split("?")
-          console.log(page[0])
-          let url = this.data.urltopage[page[0]];
-          if (url && url.indexOf('map') != -1) {
-            let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic', 'cinema', 'academes'],
-              type = page[1] ? page[1].split("=") : [];
-            wx.reLaunch({
-              url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-            })
-          } else if (url) {
-            wx.navigateTo({
-              url: url,
-            })
-          } else {
-            app.globalData.weburl = item.tdata.url;
-            wx.navigateTo({
-              url: "/pages/pbService/web/index"
-            })
-          }
-        }
-        break;
-      case 4:
-        if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-          // 如果是苏心游的小程序 直接把authCode带过去
-          userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-            let weburl = item.tdata.page
-            if (weburl.indexOf('?') != -1) {
-              weburl += '&authCode=' + res.data;
-            } else {
-              weburl += '?authCode=' + res.data
-            }
-            wx.navigateToMiniProgram({
-              appId: item.tdata.appid,
-              path: weburl
-            })
-          }).catch(err => {
-            wx.navigateToMiniProgram({
-              appId: item.tdata.appid,
-              path: item.tdata.page
-            })
-          })
-        } else {
-          wx.navigateToMiniProgram({
-            appId: item.tdata.appid,
-            path: item.tdata.page
-          })
-        }
-        break;
-      default:
-        break;
-    }
-    return
-  },
-  onReady: function () {
+		})
+	},
+	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
+	getList: function() {
+		if (!this.data.listMore) return;
+		commonApi._post("search/recommend", {
+			offset: this.data.list.length,
+			limit: 16
+		}).then(res => {
+			res.data.map(item => {
+				if (item.ext.display_tags) {
+					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+				} else {
+					item.ext.display_tags = []
+				}
+			})
+			if (res.data.length < 15) {
+				this.setData({
+					listMore: false
+				})
+			}
+			this.setData({
+				list: this.data.list.concat(res.data)
+			})
+		})
+	},
+	onReachBottom: function() {
+		if (this.data.list.length < 30) {
+			this.getList()
+		}
+	},
+	gotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.pagePoint({
+			event: 'recommend_click',
+			param: {
+				id: item.id,
+				type: item.type
+			}
+		}, 1)
+		if (item.type == 'travels') {
+			// 游记做特殊处理 其他都按照原来的来
+			wx.navigateTo({
+				url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+			})
+		} else {
+			util.gotoDetail(item.ext);
+		}
+	},
+	meituan: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wxde8ac0a21135c07d',
+			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
+		})
+	},
+	// 轮播图点击
+	bannerClick: function(e) {
+		if (this.data.isTest) return;
+		let item = e.currentTarget.dataset.item;
+		this.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(111, item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+							.url)
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+								null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
+						wx.navigateTo({
+							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+								.tdata.url)
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return;
 
+	},
+	//博物馆跳转  直接跳君到苏州H5
+	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
+		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		wx.navigateTo({
+			// url: "/pages/pbService/web/index"
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
+		})
+	},
+	bannerClick2: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.action == 'href') {
+			if (item.href.indexOf(",") != -1) {
+				let info = item.href.split(",");
+				wx.navigateToMiniProgram({
+					appId: info[0],
+					path: info[1]
+				})
+			} else if (item.href.indexOf('map/index') != -1) {
+				wx.reLaunch({
+					url: item.href
+				})
+			} else {
+				wx.navigateTo({
+					url: item.href,
+				})
+			}
+		} else if (item.action == "web") {
+			app.globalData.weburl = item.href;
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+			})
+		}
+	},
+	// 监听文旅查询的scroll
+	listenScroll(e) {
+		this.setData({
+			scrollLeft: e.detail.scrollLeft
+		})
+	},
+	// 获取短视频大赛是否中奖 中奖详情
+	getVideoPrize() {
+		let user_id = wx.getStorageSync('jstrip_userid');
+		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+		commonApi.user_post('actonline/video_act/getRaffle', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				videoPrize: res.data
+			})
+		})
+	},
+	noMoreTip() {
+		wx.setStorageSync('indexPriceNoTip', true)
+		this.closePrice()
+	},
+	closePrice() {
+		this.setData({
+			videoPrize: false,
+			prizeInfo: null
+		})
+	},
+	// 抽奖
+	choosePrize() {
+		commonApi.user_post('actonline/video_act/luckyDraw', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				prizeInfo: res.data
+			})
+			if (res.data.type != 'none') {
+				// 抽奖成功的话 弹框
+				wx.showModal({
+					title: "提示",
+					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+					showCancel: false
+				})
+			}
+		})
+	},
+	bannerJumpNew(item) {
+		let that = this
+		item = item.currentTarget.dataset.item
+		if (item.tdata == '') return
+		that.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index"
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index"
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return
+	},
+	onReady: function() {
 
-  },
-  gotoOther: function (e) {
-    let item = e.currentTarget.dataset.item;
-    if (item.type == 'h5') {
-      app.globalData.weburl = item.url
-      wx.navigateTo({
-        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-      })
-    } else if (item.type == 'mini') {
-      wx.navigateToMiniProgram({
-        appId: item.appid,
-        path: item.path
-      })
-    } else if (item.type == 'page') {
-      wx.navigateTo({
-        url: item.page,
-      })
-    }
-  },
-  pagePoint: function (e, type) {
-    util.pagePoint(e, type)
-  },
-  onShow: function () {
-    if (app.globalData.loadIndexSeason) {
-      this.getIndexSeason()
-    } else {
-      let t = setInterval(() => {
-        if (app.globalData.loadIndexSeason) {
-          this.getIndexSeason()
-          clearInterval(t)
-          t = null
-        }
-      }, 500)
-    }
 
-    this.pagePoint({
-      event: 'home_view'
-    }, 1)
-    // this.data.time!=5?wx.showTabBar():1
-  },
+	},
+	gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
+	},
+	pagePoint: function(e, type) {
+		util.pagePoint(e, type)
+	},
+	onShow: function() {
+		if (app.globalData.loadIndexSeason) {
+			this.getIndexSeason()
+		} else {
+			let t = setInterval(() => {
+				if (app.globalData.loadIndexSeason) {
+					this.getIndexSeason()
+					clearInterval(t)
+					t = null
+				}
+			}, 500)
+		}
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+		this.pagePoint({
+			event: 'home_view'
+		}, 1)
+		// this.data.time!=5?wx.showTabBar():1
+	},
 
-  },
-  onShareTimeline: function() {
-    return {
-      title: '君到苏州（文化旅游总入口）',
-      query: '',
-      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
-    }
-  }
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+	onShareTimeline: function() {
+		return {
+			title: '君到苏州（文化旅游总入口）',
+			query: '',
+			imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
+		}
+	}
 })
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8e9ed96..3f45489 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -655,19 +655,35 @@
   <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
 </view>
 <!-- 广告弹窗结束 -->
-<view class="fullavd" wx:if="{{showFullAdv}}"  style="opacity: {{opacity}}">
-  <view class="time" bindtap="closeFullAdv" wx:if="{{showTime}}">{{time}}s跳过</view>
-    <!-- <view class="Qtop" style="height:{{viewHeight}}"> -->
-    <view class="Qtop" style="min-height:100vh">
-      <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
-  <!-- <swiper class="fullsp"  autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-    <block wx:for="{{startList}}" wx:key="*this">
-    <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
-      <image src="{{item.head_img}}" style="width: 100%;height: 100%;" mode="widthFix"></image>
-    </swiper-item>
-    </block>
-  </swiper> -->
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
 </view>
 <!-- <view class="topBox">
     <view class="Qtop" :style="{height:height}">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d876702..4809b10 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1144,4 +1144,33 @@ page {
 }
 .time{
   padding-right: 10rpx;
+}
+
+.muteImg {
+	width: 62rpx;
+	height: 62rpx;
+	position: absolute;
+	top: 194rpx;
+	right: 38rpx;
+}
+.logoImg {
+	width: 464.67rpx;
+	height: 342.67rpx;
+	position: absolute;
+	top: 406rpx;
+	left: 142rpx;
+}
+.btnImg {
+	width: 296.67rpx;
+	height: 79.33rpx;
+	position: absolute;
+	left: 226rpx;
+	bottom: 208rpx;
+}
+.playImg {
+	position: absolute;
+	width: 31.33rpx;
+	height: 38rpx;
+	left: 56.67rpx;
+	bottom: 64rpx;
 }
\ No newline at end of file
diff --git a/utils/https.js b/utils/https.js
index 953d1df..50f43f4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -7,7 +7,8 @@ const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"
 } else {
-  baseUrl = "https://api.cloud.sz-trip.com/api/";
+  // baseUrl = "https://api.cloud.sz-trip.com/api/";
+  // baseUrl = "https://test.api.cloud.sz-trip.com/api/"
 }
 const orders = ['', 'weight', 'distance', 'sale_number', 'sale_price', 'price'];
 //封装GET请求

From dbd34d6181835b115b6626cb80275cfd84ba1a94 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Sat, 1 Jun 2024 17:35:51 +0800
Subject: [PATCH 156/471] =?UTF-8?q?=E8=8B=8F=E5=B7=9E=E5=8D=9A=E7=89=A9?=
 =?UTF-8?q?=E9=A6=86=E9=A2=84=E7=BA=A6=E8=B7=B3=E8=BD=AC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     |  2 +-
 pages/list/museum/index.js | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index bc54044..7338f14 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.isTest117? true : false;
+      data.isTest = data.isTest118? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index be9df22..7357404 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -37,6 +37,10 @@ Page({
   },
   gotoDetailOther: function(e) {
     // 全都到其他小程序预约--新跳转地址
+    wx.navigateToMiniProgram({
+      appId: 'wxfef80ee1ab7e58a2',
+      path: 'pages/index/index'
+    })
     // wx.navigateToMiniProgram({
     //   appId: 'wxfef80ee1ab7e58a2',
     //   path: 'pages/index/index'
@@ -50,9 +54,9 @@ Page({
   //       return;
   // }
   //本平台预约
-    wx.navigateTo({
-      url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
-    })
+    // wx.navigateTo({
+    //   url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+    // })
   },
   search:function(e){
     this.setData(e.detail);

From 11ae28e8943eb85177b224b430a515959fe32784 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 7 Jun 2024 14:09:21 +0800
Subject: [PATCH 157/471] =?UTF-8?q?=E5=81=87=E6=97=A5=E7=89=88=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E3=80=81=E7=AB=AF=E5=8D=88ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                  |    8 +-
 pages/component/newCalendar/index.wxml    |    2 +-
 pages/component/newCalendar/index.wxss    |    4 +-
 pages/index/index.js                      |  744 +++++++----
 pages/index/index.wxml                    |  788 +++---------
 pages/index/index.wxss                    |  367 +++++-
 pages/info/museumInfo/index.wxml          |    2 +-
 pages/list/activitynew/index.wxml         |    2 +-
 pages/list/activitynew/index.wxss         |   27 +-
 pages/list/museum/index.wxml              |    2 +-
 pages/list/scene/index.js                 |   14 +-
 pages/order/components/contact/index.js   |   34 +-
 pages/order/components/contact/index.wxml |   17 +-
 pages/order/components/contact/index.wxss |   14 +-
 pages/order/orderList/index.wxml          |    4 +-
 pages/order/scene/index.js                |   10 +-
 pages/order/scene/index.wxml              |    4 +-
 pages/pbService/index.wxml                |    2 +-
 subPackages/index/index.js                |  970 ++++++++++++++
 subPackages/index/index.json              |    6 +
 subPackages/index/index.wxml              |  683 ++++++++++
 subPackages/index/index.wxss              | 1191 +++++++++++++++++
 subPackages/indexs/index.js               | 1198 +++++++++++++++++
 subPackages/indexs/index.json             |    6 +
 subPackages/indexs/index.wxml             |  306 +++++
 subPackages/indexs/index.wxss             | 1427 +++++++++++++++++++++
 26 files changed, 6865 insertions(+), 967 deletions(-)
 create mode 100644 subPackages/index/index.js
 create mode 100644 subPackages/index/index.json
 create mode 100644 subPackages/index/index.wxml
 create mode 100644 subPackages/index/index.wxss
 create mode 100644 subPackages/indexs/index.js
 create mode 100644 subPackages/indexs/index.json
 create mode 100644 subPackages/indexs/index.wxml
 create mode 100644 subPackages/indexs/index.wxss

diff --git a/app.json b/app.json
index 5cdd85e..e5d7717 100644
--- a/app.json
+++ b/app.json
@@ -184,8 +184,14 @@
   "pages/user/userPrivacy/index",
 	"pages/user/personalInfo/index",
   "pages/info/luggageInfo/index"
-
   ],
+  "subpackages": [{
+        "root": "subPackages",
+        "pages": [
+            "indexs/index",
+            "index/index"
+        ]
+    }],
   "plugins": {
       "live-player-plugin": {
           "version": "1.3.5",
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index ee667a4..96240dc 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -58,7 +58,7 @@
         <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
     </view>
     <!-- 节假日花样 -->
-    <!-- <image wx:if="{{currentViewType==='month'}}" style="width: 180rpx;height: 157.33rpx;position: absolute;right: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bottom.png" mode=""/> -->
+    <image wx:if="{{currentViewType==='month'}}" style="width: 250rpx;height: 144.67rpx;position: absolute;right: 0;bottom: 30.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240605/1dda9e2e0fbc5d64aef702b5e692b2e5.png" mode=""/>
 </view> 
 
  
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index 9c8d8ea..afc1141 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -13,8 +13,8 @@
     margin: 0 auto;
     padding: 37rpx 22rpx 40rpx;
     /* 节假日花样 */
-    /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png");
-    background-size: 100% 100%; */
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png");
+    background-size: 100% 100%;
     width: 90%;
     height: 65.67rpx
 }
diff --git a/pages/index/index.js b/pages/index/index.js
index 164d0c2..409e869 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -63,7 +63,68 @@ Page({
 		],
 		viewHeight: "0px",
 		isMuted: true,
-		videoPlay: false,
+    videoPlay: false,
+    hdrlNavList:[
+      {
+        type:null,
+        title:'全部'
+      },
+      {
+        type:'scene',
+        title:'景区活动'
+      },
+      {
+        type:'show',
+        title:'演出'
+      },
+      {
+        type:'exhibition',
+        title:'展览'
+      },
+      {
+        type:'movie',
+        title:'电影'
+      },
+      {
+        type:'other',
+        title:'其他'
+      }
+    ], //活动日历板块导航分类
+    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+    today:null,
+    hdrlList:[],
+    yszNav:['公共服务','旅游助手'],
+    yszIndex:0,
+    bdList:[
+      {
+        bg: 'linear-gradient(-8deg, #B9E1F0, #F4F9FF)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feiwan.png', //非玩不可
+        path:'/pages/list/scene/index',
+        url:'',
+      },
+      {
+        bg: 'linear-gradient(-8deg, #F3FFC4, #F9FFE3)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feimai.png', //非买不可
+        path:'/pages/list/techan/index',
+        url:'',
+      },
+      {
+        bg: 'linear-gradient(-8deg, #A0F292, #E0F7DC)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feiyou.png', //非游不可
+        url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
+        path:'',
+      },
+      {
+        bg: 'linear-gradient(-8deg, #E3D9FF, #F6F2FF)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feikan.png', //非看不可
+        url:'',
+        path:'/pages/list/theatre/index',
+      },
+    ],
+    list1:[], //非玩-景点
+    list2:[], //非买-文创
+    list3:[], //非游-一日游
+    list4:[], //非看-剧场演出
 	},
 	onLoad: function(options) {
 		this.getHeight()
@@ -124,7 +185,21 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-		}
+    }
+    // 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+    let d = new Date();
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
+    this.setData({
+      today: d.getFullYear() + "-" + month + "-" + day
+    })
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -135,10 +210,12 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			},
 			fail: (err) => {
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			}
 		})
 		this.setData({
@@ -157,16 +234,164 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-		this.getWeather()
-		// 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-		this.getVideoPrize()
-		this.getXpthList()
-	},
+    this.getWeather()
+  },
+  gobdDetail(e) {
+    console.log(e);
+    let url = e.currentTarget.dataset.url
+    wx.navigateTo({
+      url: url
+    })
+  },
+  getList() {
+    let bdList = this.data.bdList
+    // 非玩不可--景点
+    commonApi._post("scene/get_scene_by_tag",{
+      tag_id:"4",
+      limit:6,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      offset:0,
+      sort:"weight",
+      title:'',
+      area_id:''
+    }).then(res=>{
+      res.data.list.map(item => {
+        if (item.distance || item.distance == 0) {
+          if (item.distance >= 1000) {
+            item.distance = (item.distance / 1000).toFixed(2) + 'km';
+          } else {
+            item.distance = (item.distance).toFixed(2) + 'm';
+          }
+        }
+      })
+      this.setData({
+        list1:res.data.list
+      })
+    })
+    // 非买不可--文创
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: 326,
+      offset: 0,
+      limit: 6,
+    }).then(res=>{
+      this.setData({
+        list2:res.data.list
+      })
+    })
+    // 非游不可--线路一日游
+    commonApi._post('product/get_product_by_tag',{
+      type_id: 23,
+      tag_id:17,
+      offset: 0,
+      limit: 6,
+      sort: 'weight'
+    }).then(res=>{
+      this.setData({
+        list3:res.data.list
+      })
+    })
+    // 非看不可--剧场演出
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:"6",
+      offset:0,
+      limit:6,
+      sort:'',
+      order:'',
+      lat:this.data.lat,
+      lon:this.data.lon,
+      title:''
+    }).then(res=>{
+      this.setData({
+        list4:res.data.list
+      })
+    })
+  },
+  goDetail(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+    if (type == 'movie') {
+      wx.navigateTo({
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/info/activityInfo/index?id=' + item.id,
+      })
+    }
+  },
+  // 分类为电影时调这个接口
+  getMovieList() {
+    let service = "Cinema/getHotMovieList";
+		let data = {
+			page: 1,
+			pageSize: 5
+    };
+    commonApi._post(service, data).then(res => {
+      console.log(res.data);
+			this.setData({
+				hdrlList: res.data
+			})
+    })
+    console.log(this.data.hdrlList);
+  },
+  // 推荐榜单更多跳转
+  moreBtn(e) {
+    let item = e.currentTarget.dataset.item
+    if (item.path!='') {
+      wx.navigateTo({
+        url: item.path,
+      })
+    } else {
+      // if (e.currentTarget.dataset.event) {
+      //   this.pagePoint({
+      //     event: e.currentTarget.dataset.event
+      //   }, 1)
+      // }
+      let url = item.url;
+      app.globalData.weburl = url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+      })
+    }
+  },
+  // 活动日历下的列表
+  getHdrlList() {
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: 1,
+      date: this.data.today,
+      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+      keywords: '',
+      area_key: '',
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 5
+    }).then(res => {
+      this.setData({
+        hdrlList:res.data.rows
+      })
+    })
+  },
+  // 切换活动日历分类
+  changeHdrlNav(e) {
+    console.log(e.currentTarget.dataset);
+    this.setData({
+      hdrlList:[],
+      hdrlNavIndex:e.currentTarget.dataset.index,
+    })
+    if (this.data.hdrlNavIndex == 4) {
+      this.getMovieList()
+    } else {
+      this.getHdrlList() //切换分类重新获取活动日历列表
+    }
+  },
+  // 游苏州下的公共服务和旅游助手切换
+  changeType(e) {
+    this.setData({
+      yszIndex:e.currentTarget.dataset.index,
+    })
+  },
+  // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
@@ -179,59 +404,62 @@ Page({
 			}
 		})
 	},
-	getXpthList: function() {
-		// 元旦新增 新品特惠
-		commonApi._post("product/get_product_indulgence", {
-			tag_id: 275,
-			typeId: 3,
-		}).then(res => {
-			console.log('data', res.data);
-			this.setData({
-				xpth: res.data,
-				djsTime: res.data.time
-			})
-			let time = setInterval(() => {
-				this.setData({
-					djsTime: this.data.djsTime - 1
-				})
-				this.formatDate(this.data.djsTime)
-			}, 1000)
-			if (this.data.djsTime == 0) {
-				clearInterval(time)
-			}
-		})
-	},
+	// getXpthList: function() {
+	// 	// 元旦新增 新品特惠
+	// 	commonApi._post("product/get_product_indulgence", {
+	// 		tag_id: 275,
+	// 		typeId: 3,
+	// 	}).then(res => {
+	// 		console.log('data', res.data);
+	// 		this.setData({
+	// 			xpth: res.data,
+	// 			djsTime: res.data.time
+	// 		})
+	// 		let time = setInterval(() => {
+	// 			this.setData({
+	// 				djsTime: this.data.djsTime - 1
+	// 			})
+	// 			this.formatDate(this.data.djsTime)
+	// 		}, 1000)
+	// 		if (this.data.djsTime == 0) {
+	// 			clearInterval(time)
+	// 		}
+	// 	})
+	// },
 	// 元旦新品特惠 倒计时 
-	formatDate: function(oTime) {
-		let h = parseInt(oTime / 3600)
-		let m = parseInt((oTime % 3600) / 60)
-		let s = parseInt(oTime % 60)
-		h = h < 10 ? "0" + h : h;
-		m = m < 10 ? "0" + m : m;
-		s = s < 10 ? "0" + s : s;
-		this.setData({
-			djs: {
-				h: h,
-				m: m,
-				s: s
-			}
-		})
-		return
-	},
-	goFeiyi: function() {
-		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-		wx.navigateTo({
-			url: "/pages/pbService/web/index"
-		})
-	},
-	onTabItemTap: function(e) {
-		console.log(e, 99999999)
-	},
+	// formatDate: function(oTime) {
+	// 	let h = parseInt(oTime / 3600)
+	// 	let m = parseInt((oTime % 3600) / 60)
+	// 	let s = parseInt(oTime % 60)
+	// 	h = h < 10 ? "0" + h : h;
+	// 	m = m < 10 ? "0" + m : m;
+	// 	s = s < 10 ? "0" + s : s;
+	// 	this.setData({
+	// 		djs: {
+	// 			h: h,
+	// 			m: m,
+	// 			s: s
+	// 		}
+	// 	})
+	// 	return
+	// },
+  // 非遗跳转
+  // goFeiyi: function() {
+	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+	// 	wx.navigateTo({
+	// 		url: "/pages/pbService/web/index"
+	// 	})
+	// },
+	// onTabItemTap: function(e) {
+	// 	console.log(e, 99999999)
+  // },
+  // 大轮播的监听方法
 	changeBannerIndex: function(e) {
 		this.setData({
 			activeBannerIndex: e.detail.current
 		})
-	},
+  },
+  // 小轮播监听方法
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
@@ -461,7 +689,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-		console.log(e)
+    console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -598,33 +826,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	getList: function() {
-		if (!this.data.listMore) return;
-		commonApi._post("search/recommend", {
-			offset: this.data.list.length,
-			limit: 16
-		}).then(res => {
-			res.data.map(item => {
-				if (item.ext.display_tags) {
-					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-				} else {
-					item.ext.display_tags = []
-				}
-			})
-			if (res.data.length < 15) {
-				this.setData({
-					listMore: false
-				})
-			}
-			this.setData({
-				list: this.data.list.concat(res.data)
-			})
-		})
-	},
+	// getList: function() {
+	// 	if (!this.data.listMore) return;
+	// 	commonApi._post("search/recommend", {
+	// 		offset: this.data.list.length,
+	// 		limit: 16
+	// 	}).then(res => {
+	// 		res.data.map(item => {
+	// 			if (item.ext.display_tags) {
+	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+	// 			} else {
+	// 				item.ext.display_tags = []
+	// 			}
+	// 		})
+	// 		if (res.data.length < 15) {
+	// 			this.setData({
+	// 				listMore: false
+	// 			})
+	// 		}
+	// 		this.setData({
+	// 			list: this.data.list.concat(res.data)
+	// 		})
+	// 	})
+	// },
 	onReachBottom: function() {
-		if (this.data.list.length < 30) {
-			this.getList()
-		}
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+		// }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -752,186 +980,186 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	bannerClick2: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.action == 'href') {
-			if (item.href.indexOf(",") != -1) {
-				let info = item.href.split(",");
-				wx.navigateToMiniProgram({
-					appId: info[0],
-					path: info[1]
-				})
-			} else if (item.href.indexOf('map/index') != -1) {
-				wx.reLaunch({
-					url: item.href
-				})
-			} else {
-				wx.navigateTo({
-					url: item.href,
-				})
-			}
-		} else if (item.action == "web") {
-			app.globalData.weburl = item.href;
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-			})
-		}
-	},
+	// bannerClick2: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.action == 'href') {
+	// 		if (item.href.indexOf(",") != -1) {
+	// 			let info = item.href.split(",");
+	// 			wx.navigateToMiniProgram({
+	// 				appId: info[0],
+	// 				path: info[1]
+	// 			})
+	// 		} else if (item.href.indexOf('map/index') != -1) {
+	// 			wx.reLaunch({
+	// 				url: item.href
+	// 			})
+	// 		} else {
+	// 			wx.navigateTo({
+	// 				url: item.href,
+	// 			})
+	// 		}
+	// 	} else if (item.action == "web") {
+	// 		app.globalData.weburl = item.href;
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+	// 		})
+	// 	}
+	// },
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// 获取短视频大赛是否中奖 中奖详情
-	getVideoPrize() {
-		let user_id = wx.getStorageSync('jstrip_userid');
-		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-		commonApi.user_post('actonline/video_act/getRaffle', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				videoPrize: res.data
-			})
-		})
-	},
-	noMoreTip() {
-		wx.setStorageSync('indexPriceNoTip', true)
-		this.closePrice()
-	},
-	closePrice() {
-		this.setData({
-			videoPrize: false,
-			prizeInfo: null
-		})
-	},
+	// // 获取短视频大赛是否中奖 中奖详情
+	// getVideoPrize() {
+	// 	let user_id = wx.getStorageSync('jstrip_userid');
+	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+	// 	commonApi.user_post('actonline/video_act/getRaffle', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			videoPrize: res.data
+	// 		})
+	// 	})
+	// },
+	// noMoreTip() {
+	// 	wx.setStorageSync('indexPriceNoTip', true)
+	// 	this.closePrice()
+	// },
+	// closePrice() {
+	// 	this.setData({
+	// 		videoPrize: false,
+	// 		prizeInfo: null
+	// 	})
+	// },
 	// 抽奖
-	choosePrize() {
-		commonApi.user_post('actonline/video_act/luckyDraw', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				prizeInfo: res.data
-			})
-			if (res.data.type != 'none') {
-				// 抽奖成功的话 弹框
-				wx.showModal({
-					title: "提示",
-					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-					showCancel: false
-				})
-			}
-		})
-	},
-	bannerJumpNew(item) {
-		let that = this
-		item = item.currentTarget.dataset.item
-		if (item.tdata == '') return
-		that.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					console.log(item.tdata)
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index"
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					console.log(page[0])
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index"
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return
-	},
+	// choosePrize() {
+	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			prizeInfo: res.data
+	// 		})
+	// 		if (res.data.type != 'none') {
+	// 			// 抽奖成功的话 弹框
+	// 			wx.showModal({
+	// 				title: "提示",
+	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+	// 				showCancel: false
+	// 			})
+	// 		}
+	// 	})
+	// },
+	// bannerJumpNew(item) {
+	// 	let that = this
+	// 	item = item.currentTarget.dataset.item
+	// 	if (item.tdata == '') return
+	// 	that.pagePoint({
+	// 		event: "banner_click",
+	// 		type: 'banner'
+	// 	}, 1)
+	// 	switch (item.jump_type) {
+	// 		case 0:
+	// 			break;
+	// 		case 1:
+	// 			util.gotoDetail(item.product_model)
+	// 			break;
+	// 		case 2:
+	// 			if (item.front_model && item.front_model.mini) {
+	// 				wx.navigateTo({
+	// 					url: "/" + item.front_model.mini
+	// 				})
+	// 			}
+	// 			break;
+	// 		case 3:
+	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+	// 				// 外部h5
+	// 				console.log(item.tdata)
+	// 				app.globalData.weburl = item.tdata.url;
+	// 				wx.navigateTo({
+	// 					url: "/pages/pbService/web/index"
+	// 				})
+	// 			} else {
+	// 				let page = item.tdata.url.split("/");
+	// 				page = page[page.length - 1].split("?")
+	// 				console.log(page[0])
+	// 				let url = this.data.urltopage[page[0]];
+	// 				if (url && url.indexOf('map') != -1) {
+	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+	// 							'cinema', 'academes'
+	// 						],
+	// 						type = page[1] ? page[1].split("=") : [];
+	// 					wx.reLaunch({
+	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+	// 					})
+	// 				} else if (url) {
+	// 					wx.navigateTo({
+	// 						url: url,
+	// 					})
+	// 				} else {
+	// 					app.globalData.weburl = item.tdata.url;
+	// 					wx.navigateTo({
+	// 						url: "/pages/pbService/web/index"
+	// 					})
+	// 				}
+	// 			}
+	// 			break;
+	// 		case 4:
+	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+	// 				// 如果是苏心游的小程序 直接把authCode带过去
+	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+	// 					let weburl = item.tdata.page
+	// 					if (weburl.indexOf('?') != -1) {
+	// 						weburl += '&authCode=' + res.data;
+	// 					} else {
+	// 						weburl += '?authCode=' + res.data
+	// 					}
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: weburl
+	// 					})
+	// 				}).catch(err => {
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: item.tdata.page
+	// 					})
+	// 				})
+	// 			} else {
+	// 				wx.navigateToMiniProgram({
+	// 					appId: item.tdata.appid,
+	// 					path: item.tdata.page
+	// 				})
+	// 			}
+	// 			break;
+	// 		default:
+	// 			break;
+	// 	}
+	// 	return
+	// },
 	onReady: function() {
 
 
 	},
-	gotoOther: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.type == 'h5') {
-			app.globalData.weburl = item.url
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-			})
-		} else if (item.type == 'mini') {
-			wx.navigateToMiniProgram({
-				appId: item.appid,
-				path: item.path
-			})
-		} else if (item.type == 'page') {
-			wx.navigateTo({
-				url: item.page,
-			})
-		}
-	},
+	// gotoOther: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.type == 'h5') {
+	// 		app.globalData.weburl = item.url
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+	// 		})
+	// 	} else if (item.type == 'mini') {
+	// 		wx.navigateToMiniProgram({
+	// 			appId: item.appid,
+	// 			path: item.path
+	// 		})
+	// 	} else if (item.type == 'page') {
+	// 		wx.navigateTo({
+	// 			url: item.page,
+	// 		})
+	// 	}
+	// },
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3f45489..bd08211 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,10 +1,7 @@
-<!--index.wxml-->
+<!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
-<!-- <view class="old-btn">关怀模式</view> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/topImg.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
@@ -14,11 +11,6 @@
     mode="aspectFill"></image>
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
     src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
@@ -28,633 +20,259 @@
 </view>
 <view style="position:relative;z-index: 1;" >
   <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
-    <block wx:for="{{banner}}" wx:key="*this">
+    <block wx:for="{{banner}}" wx:key="this">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
   <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}"></view>
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
   </view>
 </view>
-
-<!-- <swiper class="swiper" indicator-dots="{{true}}"
-  autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
-  <block wx:for="{{banner}}" wx:key="*this">
-    <swiper-item bindtap="bannerClick2" data-item="{{item}}">
-      <image src="{{item.img}}" mode="aspectFill"></image>
-    </swiper-item>
-  </block>
-</swiper> -->
-<view class="top-icons" wx:if="{{!isTest}}">
-  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
-    class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/0d6708cc448c7c0b35a676cbd19e8de4.png" mode="widthFix"></image>
-    <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/c95f7fcc652cdbd03290530fd842abd7.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">活动日历</view>
-  </view>
-  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
-    data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/9d26b6b0dcb3c63ace2f893a5a631925.png" mode="widthFix"></image>
-       <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/b09f9cee20a7f4df6aafc4eec739d959.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">场馆预约</view>
-  </view>
-  <!-- 非遗跳专题 -->
-  <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/def5de89d7cf5d6b418c6515616f8ffa.png" mode="widthFix"></image>
-    <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/b5614719b2a439913c7a1d265624b294.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">非遗专卖</view>
-  </view>
-  <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
-    data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/a95f9ecd6a3cce5ae993d2bdcfdde104.png" mode="widthFix"></image>
-       <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/f35952c7189bf21bd25c5a9e0a65b215.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">剧场演出</view>
-  </view>
-  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/10eb0440e299f1903954488643e54f8e.png" mode="widthFix"></image>
-    <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/bfe5f12189f1306bebb7be5a37cbea75.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">文创特产</view>
-  </view>
-  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
-    class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/c6581705831291617546adf5eaf05499.png" mode="widthFix"></image>
-     <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/c73151735eb762996e7d05237743e87f.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">景点门票</view>
-  </view>
-  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
-    class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/fa7ff24b9d091f8dc1ce2011d5368808.png" mode="widthFix"></image>
-     <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/712b4334114a909946af5f04131109f0.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">酒店住宿</view>
-  </view>
-  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
-    class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/b3f7b2fd1378696b0f034b397ed04612.png" mode="widthFix"></image>
-     <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/a85e941945a2f380f1e0a4a8ae7a00dd.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">夜游苏州</view>
-  </view>
-  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
-    class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/db92c695c836b657ca680493bee36635.png" mode="widthFix"></image>
-     <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/9afe8b7ab4763cfb82c55c34a737e7d2.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">一日游</view>
+<view class="content">
+  <!-- 活动日历 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendar.png"></image>
+    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
   </view>
-  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
-    class="top-icon-item">
-    <!-- 五一修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240428/dab27c5383df197e665021081dd3a791.png" mode="widthFix"></image>
-     <!-- 元旦修改 -->
-    <!-- <image src="https://static.ticket.sz-trip.com/uploads/20240228/4191bbe5ac87821164818fab546d0908.png" mode="widthFix"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">研学游</view>
+  <view class="hdrlNavList">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+      {{item.title}}
+    </view>
   </view>
-</view>
-<view class="content">
-  <view class="sale-road-boxes" wx:if="{{false}}">
-    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品"
-      data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-      <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-      <view class="sale-product">
-        <view class="sale-product-bg"></view>
-        <image mode="aspectFill" class="sale-img"
-          src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png"
-          mode="aspectFill">
-        </image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">
-            <view>限时特惠</view>
-            <view>新品推荐</view>
+  <view wx:if="{{hdrlNavIndex!=4}}">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+        <view style="background: #fff;width: 630rpx;display: flex;border-radius: 13rpx;">
+          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <view class="hdrlItem-content">
+            <view class="hdrlItem-title textOver3">{{item.name}}</view>
+            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
           </view>
-          <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
-            ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
         </view>
       </view>
     </view>
-    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路"
-      data-path="/pages/list/road/index">
-      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-      <view class="sale-product">
-        <view class="sale-product-bg road-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx"
-          src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg"
-          mode="aspectFill"></common-image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png"
-          mode="aspectFill">
-        </image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">
-            <view>四季苏州</view>
-            <view>最是江南</view>
+  </view>
+  <view wx:else>
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;">
+      <view class="movieItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
+          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;">
+            <view>{{item.title}}</view>
+            <view style="display: flex;justify-content: flex-end;">
+              <view class="buyMovie">去购票 ></view>
+            </view>
           </view>
-          <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-            ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
         </view>
       </view>
     </view>
   </view>
-  <!-- 五一修改 一张banner不滚动 -->
-  <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-    <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+  <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box">
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image bindtap="gotoPath" data-path="/pages/pbService/sceneComfort/index" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
+      <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
+          </view>
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
+            <view class="text">一卡游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <view class="text">非遗专卖</view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
   </view>
-  <view class="small-swiper-box" wx:else>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
     <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <!-- 原 圆角77rpx，现改为13rpx -->
           <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
     <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}"></view>
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
     </view>
   </view>
-  <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-    <!-- 上方标题部分 -->
-    <view class="xsth-title">
-      <view class="xsth-left" style="display: flex;">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
-      </view>
-      <view class="time-box" style="z-index: 9;">
-      倒计时
-        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-        <text>:</text>
-        <view class="xsth-time">{{djs.m}}</view>
-        <text>:</text>
-        <view class="xsth-time">{{djs.s}}</view>
-      </view>
-      <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-      <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-      </view> -->
-    </view>
-    <!-- 商品部分 -->
-    <view class="xpth-product">
-      <!-- 左边的2个产品 -->
-      <view class="xpth-left">
-        <view  class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}">
-          <image src="{{item.headimg}}" mode=""/>
-          <view class="xpth-item-content">
-            <view class="xpth-item-title textOver2">{{item.title}}</view>
-            <!-- <view class="xpth-tag">唇齿留香</view> -->
-            <view class="xpth-item-bottom">
-              <view class="xpth-item-price">{{item.price/100}}</view>
-              <!-- <view class="xpth-item-buy">立即抢购</view> -->
-            </view>
-          </view>
-        </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 286.67rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/ysz.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
-      <!-- 右边的banner -->
-      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill"/>
     </view>
+    <image style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
   </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/39d175e82c6761ed81bb1be507536caa.png" mode=""/>
-  </view>
-  <!-- 五一修改 .slide-out-box 增加背景色-->
-  <view class="slide-out-box">
-    <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-    <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-      <view class="pbservice" style="margin-bottom:30rpx">
-        <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
-          <view>非遗鉴赏</view> -->
-          <!-- 元旦修改 第一个pbservice-item新增margin-left -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/8b3ea6eb8d4fb576e913902550b94d2e.png" mode="widthFix"></image>
-          <view class="text">非遗鉴赏</view>
-        </view>
-        <view bindtap="goH5" data-title="数字博物馆"
-          data-path="BwsInfo" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
-          <view>数字博物馆</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/0de5585512ec3d1f552ee55da44c045d.png" mode="widthFix"></image>
-          <view class="text">数字博物馆</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-        <view>公共文化资源库</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240428/8095d53bdf22777671618e09d3819af7.png" mode="widthFix"></image>
-        <view class="text">公共文化资源库</view>
-      </view>
-      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-          <view>云上文博会</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/6378cb81c3b94756f3b46daf9ba2d11d.png" mode="widthFix"></image>
-          <view class="text">云上文博会</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-          data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
-          <view>云上观展</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/20bd0f6233048ba51cd22157e14e686d.png" mode="widthFix"></image>
-          <view>云上观展</view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}">
+      <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;justify-content: space-between;">
+        <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
+          <view>安全服务</view>
         </view>
-        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
-          <view>精彩回顾</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/9304e0e40bb0b66601c33433cb954ebd.png" mode="widthFix"></image>
-          <view class="text">精彩回顾</view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gaofeng.png" mode="widthFix"></image>
+          <view>高峰预警</view>
         </view>
-        <view bindtap="gotoPath" data-event="institution_click" 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> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/d3905d90e670af5b68de79b8eaedc6ab.png" mode="widthFix"></image>
-          <view class="text">文旅单位</view>
-        </view>
-        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-          <view>书香借阅</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/559b7345b76e07c2eda23b184b086a2f.png" mode="widthFix"></image>
-          <view class="text">书仓</view>
-        </view>
-        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
-          <view>苏影通</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/170121c61fb9e4b71a20574cab510ad7.png" mode="widthFix"></image>
-          <view class="text">苏影通</view>
-        </view>
-        <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
-          data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
-          <view>视觉中心</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/03e1ce0f626cfcc4874180bb29e3244a.png" mode="widthFix"></image>
-          <view class="text">视觉中心</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-          data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-          <view>文物查询</view>
-        </view> -->
-        <view bindtap="goH5"  data-title="文化场馆查询"
-          data-path="Museum" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
-          <view>文化场馆查询</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/928b340a3b619787dae9b194b0619a09.png" mode="widthFix"></image>
-          <view class="text">文化场馆查询</view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/xingli.png" mode="widthFix"></image>
+          <view>行李寄存</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-          data-path="/pages/pbService/museum/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-          <view>博物馆查询</view>
-        </view> -->
-        <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-          <view>云上文博会</view>
-        </view> -->
-        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-          <view>投资导引图</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240428/4dcc3f8e1ad4002a08ce08aa0aa68313.png" mode="widthFix"></image>
-          <view class="text">投资导引图</view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/shishi.png" mode="widthFix"></image>
+          <view>实时路况</view>
         </view>
-        <!-- <view bindtap="gotoUrl" data-title="数字文物"
-          data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-          <view>数字文物</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-          <view>团体预约</view>
-        </view> -->
-
-        <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-          data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-          <view>廉洁地图</view>
-        </view> -->
-
-        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-          <view>文化配送</view>
-        </view> -->
       </view>
-    </scroll-view>
-    <view class="scroll-line">
-      <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-      <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-      <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-      <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
     </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/118befe20ab47fea88bdd704ae1fbe20.png" mode=""/>
-  </view>
-  <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-      <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-      <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-    </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
-    <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
-    <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
-    <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
-    </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
-      <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
-    <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
-    <image bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
-    </image>
-    <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
-    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-      mode="aspectFill"></image> -->
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0;">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">查看全部 <text
-        class="iconfont icon-you"></text> </navigator>
-    <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
-  </view>
-  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;">
-    <!-- 元旦修改 ggfw为新增类名 -->
-    <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;">
-      <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
-        data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
-      </view> -->
-        <!-- 元旦修改 ggfw为新增类名 -->
-            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240428/be9d01a4552438a93681b1e6b3c1c783.png" mode="widthFix"></image>
-        <view>安全服务</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240428/9ad72c94d55ef5c94f942b8c91e63f83.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240428/2fa6724e47aeb565873660a8c9e2624a.png" mode="widthFix"></image>
-        <view>行李寄存</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240428/ccc1b7554d388861f2d4936d7577c347.png" mode="widthFix"></image>
-        <view>实时路况</view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          data-path="/pages/list/{{isTest?'road':'food'}}/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
       </view>
-      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
-        data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
-        <view>找厕所</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
-        data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
-        <view>停车场</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-        <view>12348</view>
-      </view> -->
     </view>
   </view>
-  <view class="sale-road-boxes">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode=""/>
-  </view>
-  <!-- <view class="six-box">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
-    </image>
-  </view> -->
-  <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
-  <view class="six-box-new" wx:if="{{!isTest}}">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
-      src="{{sqjNew[index]}}" mode="widthFix">
-    </image>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
-  </view>
-  <view class="other-plats" wx:if="{{otherPlat}}">
-    <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}">
-      <image src="{{item.icon}}" mode="widthFix"></image>
-      <view>{{item.name}}</view>
+  <!-- 推荐榜单 -->
+  <image class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
+  <!-- 4个产品榜单 -->
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box">
+  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
+    <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
+    <view class="bd-top">
+      <image class="bd-type" src="{{item.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
     </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode=""/>
-  </view>
-  <view class="hot-list" wx:if="{{isTest==false}}">
-    <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number">
-      <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}">
-        <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}"
-            mode="aspectFill"></common-image>
-          <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png"
-            mode="widthFix"></image>
-          <view class="today-date">{{date}} {{month}}</view>
-          <view class="today-hot-box">
-            <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}">
-              {{item.ext.display_tags[0]}}</view>
-            <view class="today-hot-title">{{item.title}}</view>
-          </view>
-        </view>
-        <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-          <view style="position:relative">
-            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-          </view>
-          <view class="hot-info">
-            <view class="hot-title">{{item.title}}</view>
-            <view class="tags textOver" style="margin-bottom:0">
-              <view class="icon-box">
-                <text class="iconfont icon-xin"></text>
-                <text>{{item.ext.like_number}}</text>
-              </view>
-              <view class="icon-box">
-                <text class="iconfont icon-eye"></text>
-                <text>{{item.ext.view_number}}</text>
-              </view>
+    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
+      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
             </view>
-          </view>
-        </view>
-        <view wx:else class="hot-item">
-          <view style="position:relative">
-            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <!-- <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' && item.ext.price}}" class="hot-price">
-              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
           </view>
         </view>
       </view>
     </view>
-  </view>
-  <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-  <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
-</view>
-<view class="mask prizeMask" wx:if="{{videoPrize}}">
-  <view class="mask-bg"></view>
-  <view class="mask-content"
-    style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-    <!-- 中奖的卡券 -->
-    <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
-        class="prize-tip-text"></image>
-      <view class="prize-name">{{prizeInfo.prize_name}}</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
       </view>
-      <!-- <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-      </view> -->
     </view>
-    <!-- 中奖的产品 -->
-    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
-        class="prize-tip-text"></image>
-      <view class="prize-name">{{prizeInfo.prize_name}}</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
       </view>
-      <!-- <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-      </view> -->
     </view>
-    <!-- 未中奖 -->
-    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix"
-        class="prize-tip-text"></image>
-      <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <view bindtap="closePrice">我知道了</view>
+    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
       </view>
     </view>
-    <!-- 未抽奖状态 -->
-    <view style="position:relative" wx:else>
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-      <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-    </view>
-    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx"
-      src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
   </view>
+ </view>
+
+
+
 </view>
-<!-- 广告弹窗 -->
-<view class="zzc" bindtap="closeAdv"  wx:if="{{showAdv}}"  ></view>
-<view class="alertavd" wx:if="{{showAdv}}">
-  <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-    <block wx:for="{{alertSwipeList}}" wx:key="*this">
-    <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
-      <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-    </swiper-item>
-    </block>
-  </swiper>
-  <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
-</view>
-<!-- 广告弹窗结束 -->
+
+<!-- 开屏页 -->
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
@@ -685,12 +303,4 @@
 		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
 	</view>
 </view>
-<!-- <view class="topBox">
-    <view class="Qtop" :style="{height:height}">
-      <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
-    </view>
-    <view class="jumpBox">
-      <view class="time">{{time}}s</view>
-      <view bind:tap="gotoIndex">跳过</view>
-    </view>
-</view> -->
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 4809b10..330a3d1 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,11 +1,10 @@
-/**index.wxss**/
+/* pages/indexs/index.wxss */
 /* 元旦修改 */
 page {
   background: #f5f2ed;
   padding-bottom: 36.67rpx;
-  /* background-image: url("https://static.ticket.sz-trip.com/uploads/20240428/7e9d12e2157ba5d4e77ef1b12f049012.png"); */
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/bg.png");
   background-size: 100% 100%;
-  background: url("https://static.ticket.sz-trip.com/uploads/20240428/7e9d12e2157ba5d4e77ef1b12f049012.png");
   background-repeat: round;
 }
 .swiper,.swiper image {
@@ -39,18 +38,10 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
-  /* height: 64rpx; */
-  /* background: rgba(255, 255, 255, 0.6); */
-  /* border-radius: 32rpx; */
-  /* color: #666; */
-  /* height: 70.67rpx; */
   height: 64rpx;
   background: rgba(255,255,255,0.7);
   border-radius: 32rpx;
-  /* color: #72674E; */
-  color: #333333;
-  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
-  background-size: 100% 100%; */
+  color: #000;
   display: flex;
   align-items: center;
   font-size: 25rpx;
@@ -59,7 +50,7 @@ page {
   font-size: 30rpx;
   margin-left: 20rpx;
   margin-right: 10rpx;
-  /* color: #72674E; */
+  color: #000;
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -113,7 +104,7 @@ page {
   margin-bottom: 10rpx;
 }
 .content {
-  margin: 0 25rpx;
+  /* margin: 0 25rpx; */
 }
 .sale-road-boxes {
   display: flex;
@@ -203,13 +194,11 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 50rpx 0;
-  width: 100%;
+  margin: 24rpx 26.67rpx 26.67rpx;
+  /* width: 100%; */
   height: 154rpx;
   border-radius: 20rpx;
-  /* border-radius: 77rpx; */
   overflow: hidden;
-  margin-bottom: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -341,34 +330,29 @@ page {
   font-size: 22rpx;
 }
 .slide-out-box {
-  margin-top: 20rpx;
+  /* margin-top: 20rpx;
   background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  margin-bottom: 40rpx;
+  /* margin-bottom: 40rpx; */
 }
 .pbservice {
-  /* width: calc(175rpx * 6); */
-  /* 元旦修改 */
-  width: calc(190rpx * 8);
+  width: calc(160rpx * 8);
   display: flex;
-  margin-top: 20rpx;
-  flex-wrap: wrap;
-  /* margin-bottom: 60rpx; */
-  /* 元旦修改 注释margin-bottom */
+  margin-top: 5rpx;
+  /* flex-wrap: wrap; */
+  flex-wrap: nowrap;
+  /* padding-left: 12rpx; */
+  /* overflow-x: scroll; */
 }
 .pbservice-item {
-  /* 元旦修改 截止到注释的width*/
   width: 120rpx;
-  margin-bottom: 33.33rpx;
-  margin-right: 62.33rpx;
-  /* width: 175rpx; */
+  margin-bottom: 25rpx;
+  margin-right: 32.33rpx;
   text-align: center;
-  font-size: 25rpx;
-  /* color: #333; */
-  /* 春节调整颜色改版 */
-  color: #54504D;
+  font-size: 27rpx;
+  color: #000;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -383,7 +367,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 106rpx;
+  width: 80rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -567,30 +551,24 @@ page {
   overflow: hidden;
   margin: 30rpx auto; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
-  width: 73rpx !important;
-  height: 7rpx;
+  width: 48rpx !important;
+  height: 8rpx;
   /* background: #DDCEAC; */
-  background: #CAED72;
-  border-radius: 3rpx;
-  margin: 33.33rpx auto;
+  background: #fff;
+  border-radius: 4rpx;
+  margin: 0 auto 25rpx;
 }
 .scroll-line-bg {
-  /* width: 300rpx;
-  height: 6rpx;
-  border-radius: 3rpx;
-  background: #0B898E; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
-  height: 7rpx;
-  /* background: #72674E; */
-  background: #3EB978;
-  border-radius: 3rpx;
+  height: 8rpx;
+  background: #078565;
+  border-radius: 4rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 37.33rpx;
-  background: #3EB978;
-  height: 7rpx;
-  border-radius: 3rpx;
+  margin-left: 24rpx;
+  background: #078565;
+  height: 8rpx;
+  border-radius: 4rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -1052,7 +1030,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 158.67rpx !important;
+  width: 150rpx !important;
   height: 218.67rpx !important;
   margin-bottom: 26.67rpx;
 }
@@ -1065,8 +1043,8 @@ page {
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 70rpx !important;
-  height: 70rpx !important;
+  width: 113.33rpx !important;
+  height: 113.33rpx !important;
 }
 
 .six-box-new {
@@ -1173,4 +1151,277 @@ page {
 	height: 38rpx;
 	left: 56.67rpx;
 	bottom: 64rpx;
+}
+
+.right-more {
+  width: 120rpx;
+  height: 47rpx;
+  background-color: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #078565;
+  text-align: center;
+  line-height: 47rpx;
+}
+
+.hdrlNavList {
+  display: flex;
+  margin: 28rpx 26.67rpx 10rpx;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+}
+.hdrlNav {
+  flex-shrink: 0;
+  /* width: 160rpx; */
+  padding: 0 20rpx;
+  height: 53rpx;
+  background: #F8FFDB;
+  border-radius: 13rpx;
+  font-size: 32rpx;
+  color: #078565;
+  text-align: center;
+  line-height: 53rpx;
+  margin-right: 14rpx;
+}
+.hdrlNavActive {
+  background-color: #078565;
+  font-size: 32rpx;
+  color: #FFFFFF;
+}
+.hdrlItem {
+  flex-shrink: 0;
+  padding: 26.67rpx 32rpx 26.67rpx 20rpx;
+  width: 593.33rpx;
+  display: flex;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.hdrlItem-img {
+  width: 280rpx;
+  height: 213rpx;
+  background: #8C8C8C;
+  border-radius: 13rpx;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+}
+.hdrlItem-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 213rpx;
+}
+.hdrlItem-title {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 15.33rpx;
+}
+.hdrlItem-date {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #000000;
+  margin-bottom: 19.33rpx;
+}
+
+.main-box {
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20240603/8ddceea4612d2cfb46d1a0203f4b55ac.png");
+  background-size: 100% 100%;
+  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
+  margin: 0 8rpx;
+}
+.main-box-top {
+  display: flex;
+  margin-bottom: 5.33rpx;
+}
+.gfyj,.sslk {
+  width: 369.33rpx;
+  height: 146rpx;
+  flex-shrink: 0;
+}
+.sslk {
+  margin-left: -48rpx;
+}
+
+.movieItem {
+  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+  flex-shrink: 0;
+}
+.movieItem-img {
+  width: 230rpx;
+  height: 230rpx;
+  border-radius: 18rpx;
+  margin-right: 18rpx;
+  flex-shrink: 0;
+}
+.ysz-box {
+    margin: 0 8rpx 15.33rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png");
+    padding: 43.33rpx 59rpx 46.67rpx 58rpx;
+    background-size: 100% 100%;
+}
+.ysz-more {
+    width: 333rpx;
+    height: 53rpx;
+    background: #FFFFFF;
+    border-radius: 27rpx;
+    margin: 38rpx auto 0;
+    text-align: center;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #078565;
+}
+.ysz-box2 {
+  padding: 20rpx 35rpx;
+}
+.tjbd-title {
+  width: 286.67rpx;
+  height: 80rpx;
+}
+
+.bd-box {
+  position: relative;
+  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
+  margin-left: 26.67rpx;
+  width: 582rpx;
+  /* height: 1133rpx; */
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  border-radius: 20rpx 80rpx 20rpx 20rpx;
+}
+.bd-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+  position: relative;
+}
+.zz {
+    width: 236.67rpx;
+    height: 206.67rpx;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 2;
+}
+.bd-type {
+  width: 167.33rpx;
+  height: 38.67rpx;
+}
+.bd-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #078565;
+  z-index: 9;
+  text-align: center;
+  line-height: 47rpx;
+}
+.bd-index {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #000000;
+}
+.bd-item {
+  margin-left: 45.33rpx;
+  width: 453rpx;
+  height: 147rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  display: flex;
+}
+.bd-item-img {
+    width: 147rpx;
+    height: 147rpx;
+    background: #D9D9D9;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.bd-item-content {
+    padding: 14rpx 29.33rpx 13.33rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.bd-item-title {
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+}
+.bd-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    width: 260rpx;
+}
+.bd-price {
+    font-size: 29.33rpx;
+    color: #F93434;
+    font-weight: bold;
+}
+.bd-price:after {
+  content:'起';
+  color: #999999;
+  font-size: 23rpx;
+  font-weight: 700;
+}
+.bd-price::before {
+  content:'￥';
+  font-size: 23rpx;
+}
+.bd-distance {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #999999;
+}
+
+.buyMovie {
+    width: 160rpx;
+    height: 56rpx;
+    background: #078565;
+    color: #fff;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 56rpx;
+}
+
+.bg1 {
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+}
+.bg2 {
+  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
+}
+.bg3 {
+  background: linear-gradient(180deg, #E0F7DC, #A0F292);
+}
+.bg4 {
+  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
+}
+
+.hdrlNavList::-webkit-scrollbar{
+  display:none;
+}
+.hdrlList::-webkit-scrollbar{
+  display:none;
+}
+.bottom-box::-webkit-scrollbar{
+  display:none;
+}
+.slide-box::-webkit-scrollbar{
+  display:none;
+}
+.pbservice::-webkit-scrollbar{
+  display:none;
+}
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
 }
\ No newline at end of file
diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml
index 0094ca3..b021181 100644
--- a/pages/info/museumInfo/index.wxml
+++ b/pages/info/museumInfo/index.wxml
@@ -38,7 +38,7 @@
   <view wx:if="{{type==1}}">
     <date wx:if="{{isLogin && product && product.sku && product.product && info}}" bind:onChangeDate="changeDate"
       bind:onChangeTime="changeTime" product="{{product}}" isTeam="{{info.team_order && isGroup}}"></date>
-    <view class="detail-title">预订须知</view>
+    <view class="detail-title">参观须知</view>
     <rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
     <view class="detail-title">场馆介绍</view>
     <rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 748360a..77950e4 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -4,7 +4,7 @@
 <new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
   <!-- 节假日花样 -->
-  <!-- <image class="bg-pic" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-center.png" mode="widthFix"/> -->
+  <image class="bg-pic" src="https://static.ticket.sz-trip.com/uploads/20240605/ffe34fccbb11173e96b2bd8feacef6a3.png" mode="widthFix"/>
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 3a6de75..45fe3b4 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -1,9 +1,9 @@
 /* pages/activity/index.wxss */
 
 page {
-  background: #F2F2F2;
+  /* background: #F2F2F2; */
   /* 节假日花样 */
-  /* background: #FFD6B2; */
+  background: #CEEDDB;
 }
 .types {
   /* justify-content: space-between; */
@@ -306,6 +306,7 @@ background: rgba(11, 137, 142, .1);
   background-color: rgba(204,204,204, .3);
   margin-bottom: 0;
   font-size: 26rpx;
+  z-index: 9;
 }
 .my-search-box .iconfont {
   width: 65rpx;
@@ -347,6 +348,9 @@ flex-shrink: 0;
     display: flex;
     overflow-x: scroll;
     padding: 31rpx 30rpx 30rpx;
+    position: relative;
+    z-index: 9;
+    align-items: center;
 }
 .types-item {
     border: 1px solid #999999;
@@ -359,21 +363,21 @@ flex-shrink: 0;
     flex-shrink: 0;
 }
 .types-item-active {
-  padding: 0 25rpx;
-  height: 57rpx;
+  padding: 0 79rpx;
+  /* height: 57rpx; */
   /* 节假日花样 */
-  /* height: 68rpx; */
-  line-height: 57rpx;
+  height: 91.33rpx;
+  line-height: 91.33rpx;
   display: inline-block;
-  background: #0B898E;
+  /* background: #0B898E; */
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
   flex-shrink: 0;
   /* 节假日花样 */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20240606/f4ff3a7f81b4be3508592f656e207497.png");
   background-size: 100% 100%;
-  margin-top: -5rpx; */
+  margin-top: -15rpx;
     text-align: center;
 }
 /* 不显示滚动条 */
@@ -381,8 +385,9 @@ flex-shrink: 0;
   display: none;
 }
 .bg-pic {
-  width: 266.67rpx;
-  height: 106.67rpx;
+  width: 203.33rpx;
+  height: 163.33rpx;
   position: absolute;
   right: 0;
+  z-index: 2;
 }
\ No newline at end of file
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index c52327f..3a39036 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -10,7 +10,7 @@
       <view class="title textOver">{{item.title}}</view>
       <view class="address textOver">地址：{{item.address}}</view>
       <view class="tel textOver">电话：{{item.tel}}</view>
-      <view class="btn">点击预约</view>
+      <view class="btn">点击查看</view>
     </view>
     <view class="info textOver" wx:else style="height:320rpx;">
       <view class="title textOver">{{item.title}}</view>
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index a0c865f..0938434 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -13,7 +13,13 @@ Page({
     longitude:"",
     keywords:'',
     area_id:'',
-    navList:[],
+    navList:[
+      {
+        id:4,
+        name:'全部',
+        icon:'/uploads/20240604/4ac6b939e112ff183aadb95efbf07761.png'
+      }
+    ],
     navIndex:0,
   },
 
@@ -48,8 +54,12 @@ Page({
     commonApi._post("scene/get_scene_tags",{
       pid:4
     }).then(res=>{
+      let list = this.data.navList
+      res.data.forEach(item=> {
+        list.push(item)
+      })
       this.setData({
-        navList:res.data
+        navList:list
       })
       console.log(this.data.navList);
       this.getList()
diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js
index 9699645..d51a4be 100644
--- a/pages/order/components/contact/index.js
+++ b/pages/order/components/contact/index.js
@@ -60,7 +60,7 @@ Component({
     person:{},
     personId:null,
     r:[],
-    phone:'',//非实名时需要传的电话
+    phone:null,//非实名时需要传的电话
   },
   lifetimes: {
     attached: function() {
@@ -180,31 +180,12 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    // getPhoneNumber:function(e) {
-    //   console.log(e);
-    //   const code = e.detail.code
-    //   wx.request({
-    //     url: `https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${app.globalData.appId}&secret=${app.globalData.secret}`,
-    //     method: 'GET',
-    //     success:res=>{
-    //       if(res.statusCode!==200) return
-    //       const access_token = res.data.access_token
-    //       wx.request({
-    //         url: `https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=${access_token}`,
-    //         method: 'POST',
-    //         data: {
-    //           code
-    //         },
-    //         success:data=>{
-    //           if(data.statusCode!==200) return
-    //           console.log(data.data.phone_info);
-    //           debugger
-    //           const { phoneNumber } = data.data.phone_info // 这里就是获取到的手机号
-    //         }
-    //       })
-    //     }
-    //   })
-    // },
+    delTel() {
+      this.setData({
+        phone: ''
+      })
+      this.triggerEvent("setLinkman",{phone:this.data.phone})
+    },
     gotoEdit:function(e){
       userApi.user_post("user/getContactInfoById", { id: e.currentTarget.dataset.item.id }).then(res => {
         console.log(res);
@@ -313,6 +294,7 @@ Component({
         this.setData({
           showAdd:!this.data.showAdd
         })
+        this.getLinkmanList()
       }
     })
   },
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index 42a67e3..25e85ae 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -1,20 +1,24 @@
 <view class="box{{isGroup==1?' group-box':''}}" style="border:none">
   <view class="box-title">
     <view style="flex:1">
-      <view>{{isGroup==1?'发起人信息':'出行人信息'}}</view>
+      <!-- <view wx:if="{{isGroup==1}}">{{isGroup==1?'发起人信息':'添加出行人'}}</view> -->
+      <view wx:if="{{isGroup==1}}">发起人信息</view>
+      <view wx:elif="{{is_authentication == '0'}}">出行人信息</view>
+      <view wx:else>需填{{productNum}}位出行人</view>
       <view wx:if="{{isGroup==1}}" class="group-tip-text">（*预约发起后前往个人中心-团体预约订单中查看详情）</view>
     </view>
-    <view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman.length>0 && isGroup!=1&&is_authentication != '0'}}"><text class="iconfont icon-add-select"></text>添加</view>
-    <view class="group-edit" bindtap="showLinkman" wx:if="{{isGroup==1 && selectLinkman.length>0}}">编辑</view>
+    <!-- <view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman.length>0 && isGroup!=1&&is_authentication != '0'}}"><text class="iconfont icon-add-select"></text>添加</view>
+    <view class="group-edit" bindtap="showLinkman" wx:if="{{isGroup==1 && selectLinkman.length>0}}">编辑</view> -->
   </view>
   <view wx:if="{{isGroup!=1}}">
     <!-- 不实名 -->
-    <view wx:if="{{is_authentication == '0'}}">
+    <view wx:if="{{is_authentication == '0'}}" class="bsm">
       <view class="tel-input">
-        <text class="input-text">手机号</text>
+        <text class="input-text">联系手机</text>
         <!-- <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button> -->
         <input bindinput="phoneInput" type="number" value="{{phone}}" class="weui-input" placeholder="请输入手机号" />
       </view>
+      <image class="cha" bindtap="delTel" wx:if="{{phone!=''}}" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/cha.png" mode=""/>
     </view>
     <!-- 实名 -->
     <!-- <view class="contacts-list" wx:if="{{selectLinkman.length>0}}">
@@ -55,9 +59,10 @@
         <!-- <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator> -->
       </view>
       <view wx:if="{{is_real_name=='1'}}">
-        <view class="text1" bindtap="showLinkman" wx:for="{{showNum}}" wx:for-index="index" wx:if="{{showNum>0}}">
+        <view class="text1" bindtap="showLinkman" wx:for="{{selectLinkman.length?(productNum-selectLinkman.length+1) :showNum}}" wx:for-index="index" wx:if="{{showNum>0 &&index+1>selectLinkman.length}}">
           <view style="display: flex;align-items: center;">
             <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
+            <!-- <view style="margin-right: 36rpx;" wx:if="{{selectLinkman.length>0}}">出行人{{selectLinkman.length+1}}</view> -->
             <view style="margin-right: 36rpx;">出行人{{index+1}}</view>
             <view>点击填写1位出行人信息</view>
           </view>
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index ea9490c..a17cb17 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -225,7 +225,7 @@
 .tel-input {
   display: flex;
     padding: 40rpx 20.67rpx 38.67rpx 21.33rpx;
-    border-top: 1rpx solid #ccc;
+    /* border-top: 1rpx solid #ccc; */
     font-weight: 400;
     font-size: 32rpx;
     color: #000000;
@@ -247,4 +247,16 @@
   text-align: center;
   position: absolute;
   right: 0;
+}
+
+.cha {
+    width: 20rpx;
+    height: 20rpx;
+}
+.bsm {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-top: 1rpx solid #ccc;
+    padding-right: 50rpx;
 }
\ No newline at end of file
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index aa9e7c4..a783dba 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -62,10 +62,10 @@
 	</view>
 </view>
 
-<view class="box-title">
+<!-- <view class="box-title">
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
-  </view>
+  </view> -->
 <coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
 <view class="fixed-bottom">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 38c008c..81be03d 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -133,7 +133,7 @@ Page({
     })
   },
   setLinkman: function (e) {
-    if (e.detail.phone) {
+    if (e.detail.phone || e.detail.phone=='') {
       this.setData({
         phone:e.detail.phone
       })
@@ -297,9 +297,11 @@ Page({
       })
       return
     }
-    linkmanList.map(item => {
-      linkmanIds.push(item.id)
-    })
+    if (this.data.is_authentication == 1) {
+      linkmanList.map(item => {
+        linkmanIds.push(item.id)
+      })
+    }
     let data = {
       coupon_id: this.data.coupon ? this.data.coupon.id : null,
       source: "WECHATXCX",
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index cb558a8..ac543a2 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -38,12 +38,12 @@
   <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
 
-  <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
+  <!-- <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
     <view class="box-title" wx:if="{{flag!='mix'}}">
       <view style="flex-shrink:0">订单备注</view>
       <input type="text" bindinput="changeRemark" placeholder="选填"></input>
     </view>
-  </view>
+  </view> -->
 
   <view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view>
   <view class="fixed-bottom" wx:if="{{type!='museum' && type!='activity'}}">
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 78cdec0..7201975 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -12,7 +12,7 @@
     <view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath"
       data-path="/pages/pbService/sceneComfort/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-      <view>景区舒适度</view>
+      <view>高峰预警</view>
     </view>
     <view class="pb-item" bindtap="gotoUrl" data-event="xlqc" 
     data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
new file mode 100644
index 0000000..31c027a
--- /dev/null
+++ b/subPackages/index/index.js
@@ -0,0 +1,970 @@
+//index.js
+//获取应用实例
+let app = getApp()
+import commonApi from "../../utils/https/common"
+import userApi from "../../utils/https/user"
+import util from "../../utils/util"
+Page({
+	data: {
+		banner: [],
+		xiaobanner: [],
+		height: 0,
+		padHeight: 0,
+		right: 0,
+		weather: null,
+		saleProduct: null,
+		roadProduct: null,
+		fourProduct: [],
+		hotIndex: 0,
+		indexHot: [],
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
+		month: "",
+		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
+		date: "",
+		list: [],
+		listMore: true,
+		isTest: false,
+		lat: "",
+		lon: "",
+		urltopage: {},
+		scrollLeft: 0,
+		videoPrize: false,
+		prizeInfo: null,
+		otherPlat: null,
+		activeBannerIndex: 0,
+		smBannerIndex: 0,
+		indexSeason: {},
+		// startList: [], // 启动页广告
+		startList: {
+			head_img: ''
+		}, // 启动页广告
+		alertSwipeList: [], //弹窗广告
+		showAdv: false, //弹窗开关
+		showFullAdv: true, //全屏广告开关
+		opacity: 1,
+		time: 3, //全屏广告剩余时间
+		showTime: false,
+		xpth: {}, // 元旦新增 新品特惠和sqjNew
+		djs: null, // 元旦新增 新品特惠倒计时
+		djsTime: null,
+		sqjNew: [
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240607/3acf736c1dc9c7af08d3363833669896.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240607/56ccaab57aaf050bb6feccc3a70983bb.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+		],
+		viewHeight: "0px",
+		isMuted: true,
+		videoPlay: false,
+	},
+	onLoad: function(options) {
+		this.getHeight()
+		//全屏广告
+		wx.hideTabBar() //这里隐藏了底部导航栏
+		commonApi._post("adv/getAdv", {
+			position: 2,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+				if (res.data.length > 1) {
+					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
+					this.setData({
+						startList: res.data[num]
+					})
+					console.log(this.data.startList.head_img);
+				} else {
+					this.setData({
+						startList: res.data[0]
+					})
+				}
+
+				// 图片
+				if (this.data.startList.media_type) {
+					this.setData({
+						showTime: true
+					})
+					var timer = setInterval(() => {
+						this.setData({
+							time: this.data.time - 1
+						})
+						if (this.data.time === 0) {
+							var opacityTimer = setInterval(() => {
+								this.setData({
+									opacity: this.data.opacity - 0.3
+								})
+							}, 100)
+						}
+						if (this.data.time == -1) {
+							clearInterval(timer)
+							clearInterval(opacityTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							this.setData({
+								showFullAdv: false
+							})
+						}
+					}, 1000)
+				} else {
+					// 视频
+				}
+			} else {
+				this.setData({
+					showFullAdv: false
+				})
+			}
+		})
+		if (options.from) {
+			app.globalData.from = options.from;
+		}
+		let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+		wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+				this.getList()
+			},
+			fail: (err) => {
+				this.getList()
+			}
+		})
+		this.setData({
+			height: height,
+			padHeight: systemInfo.statusBarHeight,
+			right: (systemInfo.screenWidth - rect.right) + rect.width
+		})
+
+		commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
+			this.setData({
+				urltopage: data
+			})
+		})
+		this.getTwoProduct()
+		this.getBanner()
+		this.getWeather()
+		// 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+		this.getVideoPrize()
+		this.getXpthList()
+	},
+	getHeight() {
+		let that = this
+		wx.getSystemInfo({
+			success(res) {
+				console.log(res)
+				that.setData({
+					viewHeight: res.windowHeight + 'px'
+				})
+				console.log(that.data.viewHeight)
+			}
+		})
+	},
+	getXpthList: function() {
+		// 元旦新增 新品特惠
+		commonApi._post("product/get_product_indulgence", {
+			tag_id: 275,
+			typeId: 3,
+		}).then(res => {
+			console.log('data', res.data);
+			this.setData({
+				xpth: res.data,
+				djsTime: res.data.time
+			})
+			let time = setInterval(() => {
+				this.setData({
+					djsTime: this.data.djsTime - 1
+				})
+				this.formatDate(this.data.djsTime)
+			}, 1000)
+			if (this.data.djsTime == 0) {
+				clearInterval(time)
+			}
+		})
+	},
+	// 元旦新品特惠 倒计时 
+	formatDate: function(oTime) {
+		let h = parseInt(oTime / 3600)
+		let m = parseInt((oTime % 3600) / 60)
+		let s = parseInt(oTime % 60)
+		h = h < 10 ? "0" + h : h;
+		m = m < 10 ? "0" + m : m;
+		s = s < 10 ? "0" + s : s;
+		this.setData({
+			djs: {
+				h: h,
+				m: m,
+				s: s
+			}
+		})
+		return
+	},
+	goFeiyi: function() {
+		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+		wx.navigateTo({
+			url: "/pages/pbService/web/index"
+		})
+	},
+	onTabItemTap: function(e) {
+		console.log(e, 99999999)
+	},
+	changeBannerIndex: function(e) {
+		this.setData({
+			activeBannerIndex: e.detail.current
+		})
+	},
+	changeSmBannerIndex: function(e) {
+		this.setData({
+			smBannerIndex: e.detail.current
+		})
+	},
+	// 一城百馆
+	city: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx114d514f39cb1fed',
+			path: "pages/entry/index"
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "一城百馆",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+	},
+	changeHotIndex: function(e) {
+		this.setData({
+			hotIndex: e.currentTarget.dataset.index,
+			fourProduct: []
+		})
+		this.getFourProduct()
+	},
+	getBanner: function() {
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xcxBanner"
+		// }).then(res=>{
+		//   console.log(res)
+		//   this.setData({
+		//     banner:res.data.content || []
+		//   })
+		// })
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xiaobanner"
+		// }).then(res=>{
+		//   this.setData({
+		//     xiaobanner:res.data.content || []
+		//   })
+		// })
+		// return;
+		commonApi._post("adv/getAdv", {
+			position: 0,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				banner: res.data || []
+			})
+		})
+		commonApi._post("adv/getAdv", {
+			position: 1,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				xiaobanner: res.data || []
+			})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {
+			position: 3,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
+				})
+			} else if (!this.data.showFullAdv) {
+				wx.showTabBar({
+					animation: true,
+				})
+			}
+		})
+
+	},
+	//获取季节配置
+	getIndexSeason() {
+		this.setData({
+			indexHot: app.globalData.configJson.indexHot,
+			isTest: app.globalData.configJson.isTest,
+			otherPlat: app.globalData.configJson.otherPlats,
+			indexSeason: app.globalData.configJson.indexSeason
+		})
+		this.getFourProduct()
+	},
+	//关闭弹窗广告
+	closeAdv: function() {
+		this.setData({
+			showAdv: false
+		})
+		wx.showTabBar({
+			animation: true,
+		})
+	},
+	//关闭全屏广告
+	closeFullAdv: function() {
+		this.setData({
+			showFullAdv: false
+		})
+		if (!this.data.alertSwipeList.length > 0) {
+			wx.showTabBar({
+				animation: true,
+			})
+		}
+	},
+	// 是否静音
+	closeMuted: function() {
+		this.setData({
+			isMuted: this.data.isMuted = !this.data.isMuted
+		})
+	},
+	// 播放视频
+	videoPlay: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.play();
+		this.setData({
+			videoPlay: false
+		})
+	},
+	// 暂停视频
+	videoPause: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.pause();
+		this.setData({
+			videoPlay: true
+		})
+	},
+	getWeather: function() {
+		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
+			this.setData({
+				weather: res.data
+			})
+		})
+	},
+	saleDetail: function() {},
+	getTwoProduct: function() {
+		// 获取首页限时特惠
+		commonApi._post('act/fast_sale_now', {
+			offset: 0,
+			limit: 1
+		}).then(res => {
+			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
+				if (res.data[0].fast_sales_sku.length > 0) {
+					let price = res.data[0].fast_sales_sku[0].price
+					let data = res.data[0].fast_sales_sku[0]
+					for (let item of res.data[0].fast_sales_sku) {
+						if (price > item.price) price = item.price
+					}
+					data.price = price
+					this.setData({
+						saleProduct: data
+					})
+				} else {
+					this.setData({
+						saleProduct: res.data[0].fast_sales_sku[0]
+					})
+				}
+			}
+		})
+		commonApi._post("product/get_product_by_tag", {
+			tag_id: 17,
+			offset: 0,
+			limit: 1,
+			sort: 'price',
+			order: 'asc'
+		}).then(res => {
+			if (res.data.list.length > 0) {
+				let price = res.data.list[0].price
+				for (let item of res.data.list) {
+					if (item.price > price) {
+						price = item.price
+					}
+				}
+				let data = res.data.list[0]
+				data.price = price
+				this.setData({
+					roadProduct: data
+				})
+			} else {
+				this.setData({
+					roadProduct: [111]
+				})
+			}
+		})
+	},
+	getFourProduct: function() {
+		let item = this.data.indexHot[this.data.hotIndex],
+			service = "product/get_product_by_tag",
+			data = {
+				tag_id: item.id,
+				offset: 0,
+				limit: 4,
+				sort: 'weight',
+				order: 'desc'
+			};
+		if (item.type == 'scene') {
+			service = "scene/get_scene_by_tag";
+		} else if (item.type == 'movie') {
+			service = "Cinema/getHotMovieList";
+			data = {
+				page: 1,
+				pageSize: 4
+			};
+		}
+		commonApi._post(service, data).then(res => {
+			this.setData({
+				fourProduct: res.data.list || res.data
+			})
+		})
+	},
+	tagGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
+			wx.navigateTo({
+				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+					item.title,
+			})
+		} else {
+			util.gotoDetail(item)
+		}
+	},
+	productGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.gotoDetail(item)
+	},
+	gotoPath: function(e) {
+		console.log(e)
+		// if (e.currentTarget.dataset.event) {
+		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
+		//     wx.navigateToMiniProgram({
+		//       appId: 'wxd323e63a10aa6865',
+		//       path: 'pages/home/index'
+		//     })
+		//     return
+		//   }else{
+		//     this.pagePoint({
+		//       event: e.currentTarget.dataset.event
+		//     }, 1)
+		//   }
+		// }
+		if (e.currentTarget.dataset.title == '书香借阅') {
+			wx.navigateToMiniProgram({
+				appId: 'wx165d4f1727f6bdb0',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.title == '12348') {
+			wx.navigateToMiniProgram({
+				appId: 'wxcdfd45c001466ba3',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxdd39069b9a91dbfe',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8888a3fd0862b4c8',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'taicang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8853b0d93cbca75e',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'changshu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx4df5fd9a6a5ea123',
+				path: 'pages/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxd323e63a10aa6865',
+				path: 'pages/home/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wujiang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8eadea4ee2d42d4b',
+				path: 'pages/index/index'
+			})
+			return;
+		}
+		wx.navigateTo({
+			url: e.currentTarget.dataset.path,
+		})
+		if (e.currentTarget.dataset.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: e.currentTarget.dataset.title
+			}).then(res => {
+
+			})
+		}
+	},
+	// 元旦  新品特惠部分
+	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
+		})
+	},
+	gotoUrl: function(e) {
+		console.log(e)
+		if (e.currentTarget.dataset.event) {
+			this.pagePoint({
+				event: e.currentTarget.dataset.event
+			}, 1)
+		}
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+		})
+	},
+	gotoMini: function(e) {
+		let appid = e.currentTarget.dataset.appid,
+			path = e.currentTarget.dataset.path
+		wx.navigateToMiniProgram({
+			appId: appid,
+			path: path
+		})
+	},
+	garbage: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx13be821f3b1afed3',
+			path: 'pages/home/home'
+		})
+	},
+	gotoSku: function() {
+		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
+			app.globalData.weburl = res.data.url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index'
+			})
+			return;
+		})
+	},
+	audioGuide: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx74f380bc721a0379',
+			path: '/pages/listen/listen?title=君到苏州'
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "语音导览",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+	},
+	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
+	getList: function() {
+		if (!this.data.listMore) return;
+		commonApi._post("search/recommend", {
+			offset: this.data.list.length,
+			limit: 16
+		}).then(res => {
+			res.data.map(item => {
+				if (item.ext.display_tags) {
+					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+				} else {
+					item.ext.display_tags = []
+				}
+			})
+			if (res.data.length < 15) {
+				this.setData({
+					listMore: false
+				})
+			}
+			this.setData({
+				list: this.data.list.concat(res.data)
+			})
+		})
+	},
+	onReachBottom: function() {
+		if (this.data.list.length < 30) {
+			this.getList()
+		}
+	},
+	gotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.pagePoint({
+			event: 'recommend_click',
+			param: {
+				id: item.id,
+				type: item.type
+			}
+		}, 1)
+		if (item.type == 'travels') {
+			// 游记做特殊处理 其他都按照原来的来
+			wx.navigateTo({
+				url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+			})
+		} else {
+			util.gotoDetail(item.ext);
+		}
+	},
+	meituan: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wxde8ac0a21135c07d',
+			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
+		})
+	},
+	// 轮播图点击
+	bannerClick: function(e) {
+		if (this.data.isTest) return;
+		let item = e.currentTarget.dataset.item;
+		this.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(111, item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+							.url)
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+								null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
+						wx.navigateTo({
+							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+								.tdata.url)
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return;
+
+	},
+	//博物馆跳转  直接跳君到苏州H5
+	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
+		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		wx.navigateTo({
+			// url: "/pages/pbService/web/index"
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
+		})
+	},
+	bannerClick2: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.action == 'href') {
+			if (item.href.indexOf(",") != -1) {
+				let info = item.href.split(",");
+				wx.navigateToMiniProgram({
+					appId: info[0],
+					path: info[1]
+				})
+			} else if (item.href.indexOf('map/index') != -1) {
+				wx.reLaunch({
+					url: item.href
+				})
+			} else {
+				wx.navigateTo({
+					url: item.href,
+				})
+			}
+		} else if (item.action == "web") {
+			app.globalData.weburl = item.href;
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+			})
+		}
+	},
+	// 监听文旅查询的scroll
+	listenScroll(e) {
+		this.setData({
+			scrollLeft: e.detail.scrollLeft
+		})
+	},
+	// 获取短视频大赛是否中奖 中奖详情
+	getVideoPrize() {
+		let user_id = wx.getStorageSync('jstrip_userid');
+		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+		commonApi.user_post('actonline/video_act/getRaffle', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				videoPrize: res.data
+			})
+		})
+	},
+	noMoreTip() {
+		wx.setStorageSync('indexPriceNoTip', true)
+		this.closePrice()
+	},
+	closePrice() {
+		this.setData({
+			videoPrize: false,
+			prizeInfo: null
+		})
+	},
+	// 抽奖
+	choosePrize() {
+		commonApi.user_post('actonline/video_act/luckyDraw', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				prizeInfo: res.data
+			})
+			if (res.data.type != 'none') {
+				// 抽奖成功的话 弹框
+				wx.showModal({
+					title: "提示",
+					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+					showCancel: false
+				})
+			}
+		})
+	},
+	bannerJumpNew(item) {
+		let that = this
+		item = item.currentTarget.dataset.item
+		if (item.tdata == '') return
+		that.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index"
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index"
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return
+	},
+	onReady: function() {
+
+
+	},
+	gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
+	},
+	pagePoint: function(e, type) {
+		util.pagePoint(e, type)
+	},
+	onShow: function() {
+		if (app.globalData.loadIndexSeason) {
+			this.getIndexSeason()
+		} else {
+			let t = setInterval(() => {
+				if (app.globalData.loadIndexSeason) {
+					this.getIndexSeason()
+					clearInterval(t)
+					t = null
+				}
+			}, 500)
+		}
+
+		this.pagePoint({
+			event: 'home_view'
+		}, 1)
+		// this.data.time!=5?wx.showTabBar():1
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+	onShareTimeline: function() {
+		return {
+			title: '君到苏州（文化旅游总入口）',
+			query: '',
+			imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
+		}
+	}
+})
\ No newline at end of file
diff --git a/subPackages/index/index.json b/subPackages/index/index.json
new file mode 100644
index 0000000..7c4437e
--- /dev/null
+++ b/subPackages/index/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "common-image":"/pages/component/commonImage/index",
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
new file mode 100644
index 0000000..59e3171
--- /dev/null
+++ b/subPackages/index/index.wxml
@@ -0,0 +1,683 @@
+<!--index.wxml-->
+<title title="君到苏州（文化旅游总入口）"></title>
+<!-- <view class="old-btn">关怀模式</view> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
+<!-- 后台获取的季节动图 -->
+<image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <view class="weather-num">{{weather.max_temp}}°</view>
+  <view class="weather">{{weather.weather}}</view>
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
+</view>
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+    <view class="iconfont icon-sousuo"></view>
+    <view class="textOver">搜索想要的旅游产品或服务</view>
+  </navigator>
+</view>
+<view style="position:relative;z-index: 1;" >
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+    <block wx:for="{{banner}}" wx:key="*this">
+      <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="com-flex dot-list">
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+  </view>
+</view>
+
+<!-- <swiper class="swiper" indicator-dots="{{true}}"
+  autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
+  <block wx:for="{{banner}}" wx:key="*this">
+    <swiper-item bindtap="bannerClick2" data-item="{{item}}">
+      <image src="{{item.img}}" mode="aspectFill"></image>
+    </swiper-item>
+  </block>
+</swiper> -->
+<view class="top-icons" wx:if="{{!isTest}}">
+  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">活动日历</view>
+  </view>
+  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
+    data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">场馆预约</view>
+  </view>
+  <!-- 非遗跳专题 -->
+  <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
+    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
+  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">非遗专卖</view>
+  </view>
+  <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
+    data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">剧场演出</view>
+  </view>
+  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">文创特产</view>
+  </view>
+  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">景点门票</view>
+  </view>
+  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">酒店住宿</view>
+  </view>
+  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">夜游苏州</view>
+  </view>
+  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">一日游</view>
+  </view>
+  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">研学游</view>
+  </view>
+</view>
+<view class="content">
+  <view class="sale-road-boxes" wx:if="{{false}}">
+    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品"
+      data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+      <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+      <view class="sale-product">
+        <view class="sale-product-bg"></view>
+        <image mode="aspectFill" class="sale-img"
+          src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png"
+          mode="aspectFill">
+        </image>
+        <view class="sale-info">
+          <view class="sale-product-title textOver2">
+            <view>限时特惠</view>
+            <view>新品推荐</view>
+          </view>
+          <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
+            ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
+        </view>
+      </view>
+    </view>
+    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路"
+      data-path="/pages/list/road/index">
+      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+      <view class="sale-product">
+        <view class="sale-product-bg road-product-bg"></view>
+        <common-image class="sale-img" width="173rpx" height="165rpx"
+          src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg"
+          mode="aspectFill"></common-image>
+        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png"
+          mode="aspectFill">
+        </image>
+        <view class="sale-info">
+          <view class="sale-product-title textOver2">
+            <view>四季苏州</view>
+            <view>最是江南</view>
+          </view>
+          <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+            ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 五一修改 一张banner不滚动 -->
+  <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+    <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+  </view>
+  <view class="small-swiper-box" wx:else>
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <!-- 原 圆角77rpx，现改为13rpx -->
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+    </view>
+  </view>
+  <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+  <view style="display: flex;">
+    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort"  class="jqssd" ></view>
+    <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
+  </view>
+  <!-- 元旦修改  限时特惠--新版-->
+  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+    <!-- 上方标题部分 -->
+    <view class="xsth-title">
+      <view class="xsth-left" style="display: flex;">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+      </view>
+      <view class="time-box" style="z-index: 9;">
+      倒计时
+        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+        <text>:</text>
+        <view class="xsth-time">{{djs.m}}</view>
+        <text>:</text>
+        <view class="xsth-time">{{djs.s}}</view>
+      </view>
+      <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
+      <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+      </view> -->
+    </view>
+    <!-- 商品部分 -->
+    <view class="xpth-product">
+      <!-- 左边的2个产品 -->
+      <view class="xpth-left">
+        <view  class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+          <image src="{{item.headimg}}" mode=""/>
+          <view class="xpth-item-content">
+            <view class="xpth-item-title textOver2">{{item.title}}</view>
+            <!-- <view class="xpth-tag">唇齿留香</view> -->
+            <view class="xpth-item-bottom">
+              <view class="xpth-item-price">{{item.price/100}}</view>
+              <!-- <view class="xpth-item-buy">立即抢购</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 右边的banner -->
+      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill"/>
+    </view>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode=""/>
+  </view>
+  <!-- 五一修改 .slide-out-box 增加背景色-->
+  <view class="slide-out-box">
+    <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+    <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+      <view class="pbservice" style="margin-bottom:30rpx">
+        <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
+          <view>非遗鉴赏</view> -->
+          <!-- 元旦修改 第一个pbservice-item新增margin-left -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+          <view class="text">非遗鉴赏</view>
+        </view>
+        <view bindtap="goH5" data-title="数字博物馆"
+          data-path="BwsInfo" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
+          <view>数字博物馆</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+          <view class="text">数字博物馆</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+        <view>公共文化资源库</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+        <view class="text">公共文化资源库</view>
+      </view>
+      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+          <view>云上文博会</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+          <view class="text">云上文博会</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+          data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
+          <view>云上观展</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+          <view>云上观展</view>
+        </view>
+        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
+          <view>精彩回顾</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
+          <view class="text">精彩回顾</view>
+        </view>
+        <view bindtap="gotoPath" data-event="institution_click" 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> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+          <view class="text">文旅单位</view>
+        </view>
+        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+          <view>书香借阅</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+          <view class="text">书仓</view>
+        </view>
+        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
+          <view>苏影通</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
+          <view class="text">苏影通</view>
+        </view>
+        <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
+          data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
+          <view>视觉中心</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+          <view class="text">视觉中心</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+          data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+          <view>文物查询</view>
+        </view> -->
+        <view bindtap="goH5"  data-title="文化场馆查询"
+          data-path="Museum" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
+          <view>文化场馆查询</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+          <view class="text">文化场馆查询</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+          data-path="/pages/pbService/museum/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+          <view>博物馆查询</view>
+        </view> -->
+        <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+          <view>云上文博会</view>
+        </view> -->
+        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
+          <view>投资导引图</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+          <view class="text">投资导引图</view>
+        </view>
+        <!-- <view bindtap="gotoUrl" data-title="数字文物"
+          data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+          <view>数字文物</view>
+        </view> -->
+        <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+          <view>团体预约</view>
+        </view> -->
+
+        <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+          data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+          <view>廉洁地图</view>
+        </view> -->
+
+        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+          <view>文化配送</view>
+        </view> -->
+      </view>
+    </scroll-view>
+    <view class="scroll-line">
+      <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+      <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+      <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+      <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+    </view>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode=""/>
+  </view>
+  <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+      <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+      <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
+    </image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+    <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
+    <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
+    <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
+    </image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
+      <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
+    <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
+    <image bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
+    </image>
+    <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
+    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
+      mode="aspectFill"></image> -->
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0;">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">查看全部 <text
+        class="iconfont icon-you"></text> </navigator>
+    <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
+  </view>
+  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240606/ec3159a8e5b6bb0ccce8aef14ca70f14.png');background-size: 100% 100%;">
+    <!-- 元旦修改 ggfw为新增类名 -->
+    <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;">
+      <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
+        data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+        <view>景区舒适度</view>
+      </view> -->
+        <!-- 元旦修改 ggfw为新增类名 -->
+            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
+        <view>安全服务</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+        <view>景区舒适度</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+        <view>行李寄存</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+        <view>实时路况</view>
+      </view>
+      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
+        data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
+        <view>找厕所</view>
+      </view> -->
+      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
+        data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
+        <view>停车场</view>
+      </view> -->
+      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
+        <view>12348</view>
+      </view> -->
+    </view>
+  </view>
+  <view class="sale-road-boxes">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode=""/>
+  </view>
+  <!-- <view class="six-box">
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
+      src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
+    </image>
+  </view> -->
+  <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+  <view class="six-box-new" wx:if="{{!isTest}}">
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
+      src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+    </image>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
+  </view>
+  <view class="other-plats" wx:if="{{otherPlat}}">
+    <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
+      <image src="{{item.icon}}" mode="widthFix"></image>
+      <view>{{item.name}}</view>
+    </view>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode=""/>
+  </view>
+  <view class="hot-list" wx:if="{{isTest==false}}">
+    <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+      <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+        <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}"
+            mode="aspectFill"></common-image>
+          <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png"
+            mode="widthFix"></image>
+          <view class="today-date">{{date}} {{month}}</view>
+          <view class="today-hot-box">
+            <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
+              {{item.ext.display_tags[0]}}</view>
+            <view class="today-hot-title">{{item.title}}</view>
+          </view>
+        </view>
+        <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+          <view style="position:relative">
+            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+            <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+          </view>
+          <view class="hot-info">
+            <view class="hot-title">{{item.title}}</view>
+            <view class="tags textOver" style="margin-bottom:0">
+              <view class="icon-box">
+                <text class="iconfont icon-xin"></text>
+                <text>{{item.ext.like_number}}</text>
+              </view>
+              <view class="icon-box">
+                <text class="iconfont icon-eye"></text>
+                <text>{{item.ext.view_number}}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view wx:else class="hot-item">
+          <view style="position:relative">
+            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+            <!-- <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' && item.ext.price}}" class="hot-price">
+              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+  <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+</view>
+<view class="mask prizeMask" wx:if="{{videoPrize}}">
+  <view class="mask-bg"></view>
+  <view class="mask-content"
+    style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+    <!-- 中奖的卡券 -->
+    <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
+        class="prize-tip-text"></image>
+      <view class="prize-name">{{prizeInfo.prize_name}}</view>
+      <view class="prize-img">
+        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+      </view>
+      <!-- <view class="btn-box">
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+      </view> -->
+    </view>
+    <!-- 中奖的产品 -->
+    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
+        class="prize-tip-text"></image>
+      <view class="prize-name">{{prizeInfo.prize_name}}</view>
+      <view class="prize-img">
+        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+      </view>
+      <!-- <view class="btn-box">
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+      </view> -->
+    </view>
+    <!-- 未中奖 -->
+    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix"
+        class="prize-tip-text"></image>
+      <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
+      <view class="prize-img">
+        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+      </view>
+      <view class="btn-box">
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+        <view bindtap="closePrice">我知道了</view>
+      </view>
+    </view>
+    <!-- 未抽奖状态 -->
+    <view style="position:relative" wx:else>
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+      <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
+    </view>
+    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx"
+      src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
+  </view>
+</view>
+<!-- 广告弹窗 -->
+<view class="zzc" bindtap="closeAdv"  wx:if="{{showAdv}}"  ></view>
+<view class="alertavd" wx:if="{{showAdv}}">
+  <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+    <block wx:for="{{alertSwipeList}}" wx:key="*this">
+    <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
+      <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+    </swiper-item>
+    </block>
+  </swiper>
+  <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+</view>
+<!-- 广告弹窗结束 -->
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
+</view>
+<!-- <view class="topBox">
+    <view class="Qtop" :style="{height:height}">
+      <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+    </view>
+    <view class="jumpBox">
+      <view class="time">{{time}}s</view>
+      <view bind:tap="gotoIndex">跳过</view>
+    </view>
+</view> -->
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
new file mode 100644
index 0000000..1b3ab46
--- /dev/null
+++ b/subPackages/index/index.wxss
@@ -0,0 +1,1191 @@
+/**index.wxss**/
+/* 元旦修改 */
+page {
+  /* background: #9DDCF5; */
+  padding-bottom: 36.67rpx;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
+  background: #9DDCF5 url('https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png');
+  background-repeat: repeat-y;
+  background-size: contain;
+}
+.swiper,.swiper image {
+  width: 697rpx;
+  display: block;
+  height: 335rpx;
+  border-radius: 27rpx;
+}
+.swiper {
+  margin: 0 auto;
+}
+.top-box {
+  display: flex;
+  padding: 10rpx 0;
+  align-items: center;
+  margin: 0 30rpx;
+  justify-content: flex-start;
+  position: relative;
+  z-index: 1;
+}
+.top-box image {
+  flex-shrink: 0;
+  width: 40rpx;
+  height: 40rpx;
+  /* 样式改版 */
+  /* width: 63rpx;
+  height: 63rpx; */
+  display: block;
+  margin-left: 18rpx;
+}
+.search-box {
+  flex: 1;
+  width: 100%;
+  /* height: 64rpx; */
+  /* background: rgba(255, 255, 255, 0.6); */
+  /* border-radius: 32rpx; */
+  /* color: #666; */
+  /* height: 70.67rpx; */
+  height: 64rpx;
+  background: rgba(255,255,255,0.7);
+  border-radius: 32rpx;
+  /* color: #72674E; */
+  color: #333333;
+  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
+  background-size: 100% 100%; */
+  display: flex;
+  align-items: center;
+  font-size: 25rpx;
+}
+.search-box .iconfont {
+  font-size: 30rpx;
+  margin-left: 20rpx;
+  margin-right: 10rpx;
+  /* color: #72674E; */
+}
+.top-box .weather-num,.top-box .weather {
+  flex-shrink: 0;
+  color: #333;
+  /* color: #72674E; */
+}
+.top-box .weather-num {
+  font-size: 29rpx;
+  margin-bottom: 10rpx;
+  margin-left: 4rpx;
+}
+.top-box .weather {
+  font-size: 19rpx;
+  margin-top: 20rpx;
+  margin-left: -4rpx;
+  margin-right: 30rpx;
+}
+.top-icons {
+  /* background: #FFFFFF; */
+  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
+  border-radius: 0 0 27rpx 27rpx;
+  width: 697rpx;
+  margin: 0 auto;
+  position: relative;
+  z-index: 0;
+  display: flex;
+  padding: 34rpx 0;
+  padding-bottom: 7rpx;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  /* background: #FFFED6; */
+  margin-top: -20rpx;
+  padding-top: 54rpx;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240606/80bc185bf83b276b114415d670eaa57f.png');
+  background-size: 100% 100%;
+}
+.top-icon-item {
+  margin-bottom: 20rpx;
+  line-height: 37rpx;
+  font-size: 25rpx;
+  color: #000;
+  text-align: center;
+  flex-shrink: 0;
+  width: 20%;
+}
+.top-icon-item:nth-child(5n){
+  margin-right: 0;
+}
+.top-icon-item image {
+  width: 113rpx;
+  display: block;
+  margin: 0 auto;
+  margin-bottom: 10rpx;
+}
+.content {
+  margin: 0 25rpx;
+}
+.sale-road-boxes {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 40rpx;
+  position: relative;
+  align-items: flex-end;
+  margin-bottom: 28rpx;
+}
+.sale-box {
+  flex-shrink: 0;
+  width: 337rpx;
+}
+.sale-title {
+  color: #999999;
+  font-size: 20rpx;
+  margin-bottom: 20rpx;
+}
+.sale-title text {
+  color: #000000;
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-right: 8rpx;
+}
+.sale-product {
+  width: 337rpx;
+  position: relative;
+  height: 165rpx;
+  overflow: hidden;
+  border-radius: 8rpx;
+}
+.sale-product-bg {
+  width: 197rpx;
+  height: 165rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background: linear-gradient(90deg, #F78C56, #FB6044);
+  
+}
+.road-product-bg {
+  background: linear-gradient(90deg, #35CFB4, #00A6A0);
+}
+.sale-img {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 173rpx;
+  height: 165rpx;
+}
+.sale-info {
+  position: absolute;
+  left: 20rpx;
+  top: 20rpx;
+  bottom: 20rpx;
+  width: 140rpx;
+}
+.sale-product-title {
+  font-size: 28rpx;
+  color: #fff;
+  font-weight: 500;
+  line-height: 36rpx;
+}
+.sale-price {
+  padding: 0 10rpx;
+  color: #F44747;
+  font-size: 25rpx;
+  line-height: 39rpx;
+  background: #FFFFFF;
+  border-radius: 5rpx;
+  margin-top: 15rpx;
+  display: inline-block;
+}
+.sale-tip-img {
+  position: absolute;
+  width: 200rpx;
+  height: 165rpx;
+  left: 0;
+  top: 0;
+}
+.small-swiper {
+  height: 154rpx;
+}
+.small-swiper image {
+  display: block;
+  width: 100%;
+  height: 154rpx;
+}
+.small-swiper-box {
+  margin: 50rpx 0;
+  width: 100%;
+  height: 154rpx;
+  border-radius: 20rpx;
+  /* border-radius: 77rpx; */
+  overflow: hidden;
+  margin-bottom: 33rpx;
+  position: relative;
+}
+.product-tags {
+  display: flex;
+  margin-top: 40rpx;
+  margin-bottom: 50rpx;
+  overflow-x: auto;
+}
+.product-tag {
+  padding: 0 20rpx;
+  height: 43rpx;
+  background: #F4F4F4;
+  border-radius: 21rpx;
+  font-size: 27rpx;
+  color: #666;
+  margin-right: 20rpx;
+  flex-shrink: 0;
+}
+.product-tag.active {
+  background: #0B898E;
+  color: #fff;
+}
+.tag-product-list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.tag-product {
+  width: 337rpx;
+  background: #FFFFFF;
+  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 13rpx;
+  margin-bottom: 35rpx;
+}
+.tag-product image {
+  display: block;
+  width: 337rpx;
+  height: 213rpx;
+  border-radius: 13rpx 13rpx 0px 0px;
+}
+.tag-product .product-info {
+  padding: 20rpx;
+  padding-bottom: 0;
+}
+.tag-product .tag-product-title {
+  font-size: 33rpx;
+  color: #333333;
+  font-weight: 500;
+  margin-bottom: 10rpx;
+}
+.tag-product .tag-product-address {
+  color: #999;
+  font-size: 22rpx;
+  line-height: 40rpx;
+  padding-bottom: 10rpx;
+}
+.tag-product-price-box {
+  display: flex;
+  height: 70rpx;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+}
+.tag-product .tag-product-address .iconfont {
+  font-size: 26rpx;
+}
+.price {
+  color: #D62828;
+  font-size: 24rpx;
+}
+.price text:nth-child(2){
+  font-weight: 500;
+  font-size: 33rpx;
+}
+.price text:nth-child(3){
+  font-size: 20rpx;
+  color: #8D8D8D;
+  margin-left: 4rpx;
+}
+.sale-number {
+  font-size: 24rpx;
+  color: #666;
+}
+.sale-number text {
+  font-size: 21rpx;
+}
+.more-btn {
+  line-height: 77rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #0B898E;
+  font-size: 31rpx;
+  font-weight: 500;
+}
+/* .pic-list {
+  display: flex;
+  justify-content: space-between;
+  margin: 60rpx 0;
+}
+.pic-list image {
+  width: 155.33rpx;
+  height: 200rpx;
+  display: block;
+} */
+/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
+.pic-list {
+  width: 100%;
+  display: flex;
+  margin-right: 26rpx;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.title-more {
+  font-size: 24rpx;
+  /* color: #0B898E; */
+  /* 元旦修改 */
+  color: #54504D;
+  z-index: 9;
+  width: 173rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 20rpx;
+  text-align: center;
+}
+.title-more .iconfont {
+  font-size: 22rpx;
+}
+.slide-out-box {
+  margin-top: 20rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  padding-bottom: 1rpx;
+  margin-bottom: 40rpx;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
+  background-size: 100% 100%;
+}
+.pbservice {
+  /* width: calc(175rpx * 6); */
+  /* 元旦修改 */
+  width: calc(190rpx * 8);
+  display: flex;
+  margin-top: 20rpx;
+  flex-wrap: wrap;
+  /* margin-bottom: 60rpx; */
+  /* 元旦修改 注释margin-bottom */
+}
+.pbservice-item {
+  /* 元旦修改 截止到注释的width*/
+  width: 120rpx;
+  margin-bottom: 33.33rpx;
+  margin-right: 62.33rpx;
+  /* width: 175rpx; */
+  text-align: center;
+  font-size: 25rpx;
+  /* color: #333; */
+  /* 春节调整颜色改版 */
+  color: #54504D;
+  line-height: 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.text {
+  width: 200rpx;
+}
+.pbservice-item image {
+  /* width: 60rpx;
+  margin-bottom: 20rpx;
+  margin-top: 50rpx; */
+  /* 元旦修改 以上都是之前的*/
+  width: 106rpx;
+  margin-bottom: 10rpx;
+}
+.six-box {
+  margin-top: 43rpx;
+  display: flex;
+  margin-bottom: 50rpx;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.six-box image {
+  width: 128rpx;
+  height: 110rpx;
+  margin-bottom: 20rpx;
+}
+.hot-list {
+  display: flex;
+  margin-top: 47rpx;
+  justify-content: space-between;
+}
+.hot-list-item {
+  width: 337rpx;
+}
+.hot-item {
+  background: white;
+  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 15rpx;
+  margin-bottom: 35rpx;
+}
+.hot-item image:nth-child(1) {
+  display: block;
+  width: 100%;
+  border-radius: 15rpx 15rpx 0 0;
+}
+.hot-item .hot-info {
+  padding: 20rpx 25rpx;
+}
+.hot-item .hot-title {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 500;
+}
+.hot-info .tags {
+  display: flex;
+  align-items: center;
+  width: 286rpx;
+  margin: 15rpx 0;
+}
+.hot-info .tag {
+  margin-right: 16rpx;
+  line-height: 32rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 5rpx;
+  box-sizing: border-box;
+  padding: 0 10rpx;
+  color: #0B898E;
+  font-size: 20rpx;
+}
+.hot-info .tag:last-child {
+  margin-right: 0;
+}
+.hot-price {
+  color: #D62828;
+  font-size: 24rpx;
+  margin-top:28rpx;
+
+}
+.hot-price text:nth-child(2){
+  font-size: 33rpx;
+  font-weight: 500;
+}
+.hot-price text:nth-child(3){
+  font-size: 20rpx;
+  color: #8D8D8D;
+  margin-left: 4rpx;
+}
+.hot-location {
+  position: absolute;
+  color: #fff;
+  line-height: 32rpx;
+  font-size: 19rpx;
+  padding: 20rpx;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.hot-location .iconfont {
+  font-size: 22rpx;
+  margin-right: 10rpx;
+}
+.hot-info .tags .icon-box {
+  flex-shrink: 0;
+  width: 50%;
+  text-align: left;
+  color: #666666;
+  font-size: 21rpx;
+  display: flex;
+  align-items: center;
+}
+.hot-info .tags .icon-box .iconfont {
+  font-size: 30rpx;
+  margin-right: 5rpx;
+}
+.today-hot {
+  position: relative;
+  border-radius: 15rpx;
+  font-size: 0;
+  overflow: hidden;
+}
+.today-hot .today-main-img {
+  border-radius: 15rpx;
+  height: 615rpx;
+}
+.today-hot-box {
+  position: absolute;
+  left: 10rpx;
+  right: 10rpx;
+  bottom: 10rpx;
+}
+.today-hot-tag {
+  line-height: 34rpx;
+  max-width: 265rpx;
+  background: #FF2245;
+  border-radius: 15rpx 15rpx 0px 0px;
+  padding: 0 15rpx;
+  color: #fff;
+  font-size: 20rpx;
+  display: inline-block;
+  margin: 0 40rpx;
+}
+.today-hot-title {
+  background: rgba(255, 255, 255, 0.8);
+  padding: 20rpx 28rpx;
+  border-radius: 13rpx;
+  font-size: 33rpx;
+  color: #000;
+  font-weight: 500;
+
+}
+.today-hot .today-tip-img {
+  position: absolute;
+  width: 154rpx;
+  left: 11rpx;
+  top: 31rpx;
+}
+.today-date {
+  position: absolute;
+  top: 65rpx;
+  left: 11rpx;
+  width: 154rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #fff;
+  letter-spacing: 3rpx;
+  font-weight: 500;
+}
+.title-header .icon-fanhui1 {
+  display: none;
+}
+.more-btn-text {
+  text-align: center;
+  /* color: #0b898e;
+  font-size: 27rpx;
+  width: 200rpx;
+  line-height: 65rpx;
+  border: 1px solid #0b898e;
+  border-radius: 33rpx; */
+  margin: 20rpx auto;
+  width: 200rpx;
+  height: 67rpx;
+  line-height: 67rpx;
+  border: 1px solid #111;
+  border-radius: 35rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+}
+.scroll-line {
+  /* height: 6rpx;
+  border-radius: 3rpx;
+  background: #ccc;
+  overflow: hidden;
+  margin: 30rpx auto; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  width: 73rpx !important;
+  height: 7rpx;
+  /* background: #DDCEAC; */
+  background: #fff;
+  border-radius: 3rpx;
+  margin: 33.33rpx auto;
+}
+.scroll-line-bg {
+  /* width: 300rpx;
+  height: 6rpx;
+  border-radius: 3rpx;
+  background: #0B898E; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  height: 7rpx;
+  background: #56A5EA;
+  border-radius: 3rpx;
+}
+/* 元旦修改  新增样式 */
+.scroll-line-bg2 {
+  margin-left: 37.33rpx;
+  background: #56A5EA;
+  height: 7rpx;
+  border-radius: 3rpx;
+}
+.nomore-tip-btn {
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 78rpx;
+  bottom: 0;
+}
+.prize-tip-text {
+  width: 267rpx;
+  display: block;
+  top: 39rpx;
+  left: 134rpx;
+  position: absolute;
+}
+.prize-name {
+  position: absolute;
+  text-align: center;
+  left: 132rpx;
+  right: 132rpx;
+  top: 169rpx;
+  font-size: 31rpx;
+  color: #333333;  
+}
+.prize-img {
+  width: 333rpx;
+  height: 240rpx;
+  border-radius: 13rpx;
+  overflow: hidden;
+  position: absolute;
+  left: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 269rpx;
+}
+.prize-img image {
+  display: block;
+  width: 333rpx;
+  height: 240rpx;
+}
+.btn-box {
+  position: absolute;
+  width: 400rpx;
+  height: 87rpx;
+  left: 67rpx;
+  bottom: 78rpx;
+  text-align: center;
+  line-height: 87rpx;
+}
+.btn-box image {
+  display: block;
+  width: 100%;
+}
+.btn-box navigator,.btn-box view {
+  color: #fff;
+  font-size: 35rpx;
+  font-weight: bold;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 1;
+  right: 0;
+}
+.prize-coupon {
+  width: 293rpx;
+  height: 227rpx;
+  position: absolute;
+  top: 274rpx;
+  left: 120rpx;
+  color: #fff;
+  font-size: 24rpx;
+  text-align: center;
+}
+.prize-coupon image {
+  display: block;
+  width: 100%;
+}
+.prize-coupon-money {
+  position: absolute;
+  left: 0;
+  right: 0;
+  font-size: 80rpx;
+  font-weight: bold;
+  line-height: 110rpx;
+  top: 12rpx;
+}
+.prize-coupon-money::before{
+  content: "￥";
+  font-size: 32rpx;
+}
+.prize-coupon-tip {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 120rpx;
+}
+.other-plats {
+  display: flex;
+  font-size: 25rpx;
+  text-align: center;
+  margin-bottom: 30rpx;
+  color: #333333;
+  line-height: 42rpx;
+  flex-wrap: wrap;
+  background: #FFFED6;
+  justify-content: space-around;
+  height: 187rpx;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  align-items: center;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240606/e1c3f60baf65787d593c6a7c79f881c7.png');
+  background-size: 100% 100%;
+}
+.other-plats image {
+  width: 80rpx;
+  display: block;
+  height: 80rpx;
+  margin-bottom: 15rpx;
+}
+.other-plat {
+  /* 春节新增样式 */
+  color: #54504D;
+}
+.other-plat:nth-child(4n){
+  margin-right: 0;
+}
+.old-btn {
+  position: fixed;
+  left: 0;
+  top: 170rpx;
+  writing-mode:tb-rl;
+  margin-top: 142rpx;
+  color: #0B898E;
+  font-size: 29rpx;
+  width: 64rpx;
+  height: 140rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  letter-spacing: 3rpx;
+  background: rgba(255, 255, 255, 0.7);
+  box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3);
+  border-radius: 0 13rpx 13rpx 0;
+  font-weight: 500;
+  z-index: 1;
+}
+.top-bg-img {
+  display: block;
+  width: 100%;
+  position: absolute;
+  left: 0;
+}
+.dot-list {
+  display: flex;
+  position: absolute;
+  right: 43rpx;
+  bottom: 15rpx;
+}
+.dot {
+  width: 11rpx;
+  height: 11rpx;
+  background: #FFFFFF;
+  opacity: 0.4;
+  border-radius: 50%;
+  margin-left: 8rpx;
+}
+.dot.active {
+  opacity: 1;
+}
+.sm-dot-list {
+  left: 0;
+  justify-content: center;
+  bottom: 11rpx;
+}
+.sm-dot-list .dot {
+  width: 7rpx;
+  height: 7rpx;
+}
+.sm-dot-list .dot:nth-child(1){
+  margin-left: 0;
+}
+.sm-dot-list .dot.active {
+  width: 20rpx;
+  height: 7rpx;
+  border-radius: 3rpx;
+}
+/* 弹窗广告 */
+.zzc{
+  background: gray;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  width:100%;
+  height: 100%;
+  z-index: 998;
+  filter: alpha(opacity=80);
+  opacity: 0.8 !important;
+}
+.alertavd{
+  width: 500rpx;
+  height: 700rpx;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-250rpx,-300rpx);
+  z-index: 999;
+
+}
+.alertsp{
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+}
+.fullavd{
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  width:100%;
+  height: 100%;
+  z-index: 1001;
+  background-color: #fff;
+  opacity: 1;
+  transition: all 1s;
+  
+}
+.fullsp{
+  width: 100%;
+  height: 100%;
+}
+.time{
+  width: 150rpx;
+  height: 60rpx;
+  background-color: #fff;
+  color: #000;
+  position: absolute;
+  left: 20rpx;
+  top: 120rpx;
+  border-radius:6rpx ;
+  text-align: center;
+  line-height: 60rpx;
+  z-index: 1002;
+}
+
+/* 元旦修改新增样式 */
+.xpth {
+  /* width: 697rpx; */
+  /* height: 462rpx; */
+  /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
+  border-radius: 20rpx;
+  padding: 22.67rpx 0 15.33rpx 0;
+  position: relative;
+  flex-direction: column;
+}
+/* 元旦修改新增样式 */
+.time-box {
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  /* color: #54504D; */
+  color: #000000;
+  display: flex;
+  align-items: center;
+  height: 37px;
+  margin-left: -50rpx;
+  z-index: 9;
+  flex-wrap: nowrap;
+}
+/* 元旦修改新增样式 */
+.xsth-time {
+  width: 43rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  background: #FFEF47;
+  border-radius: 13rpx;
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  color: #000;
+  text-align: center;
+}
+.time-box text {
+  width: 18rpx;
+  text-align: center;
+}
+/* 元旦修改新增样式 */
+.xpth-left {
+  width: 393rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+/* 元旦修改新增样式 */
+.xsth-title {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  align-items: flex-end;
+  margin-bottom: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xsth-more {
+  margin-top: 19.33rpx;
+  font-size: 27rpx;
+  font-family: HYZhongYuan;
+  font-weight: normal;
+  color: #FFE7C0;
+}
+/* 元旦修改新增样式 */
+.xsth-more image {
+  margin-left: 14.67rpx;
+  width: 12.67rpx;
+  height: 22.67rpx;
+  vertical-align: middle;
+}
+/* 元旦修改新增样式 */
+.yanhua {
+  height: 104rpx;
+  width: 104rpx;
+  position: absolute;
+  right: 120rpx;
+  z-index: 999;
+}
+/* 元旦修改新增样式 */
+.xpth-product {
+  /* position: absolute; */
+  width: 700rpx;
+  height: 373rpx;
+  /* background: #FFFED6; */
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  padding: 25rpx;
+  box-sizing: border-box;
+  /* left: 0;
+  bottom: 15.33rpx;
+  /* width: 710rpx; */
+  display: flex;
+  justify-content: space-between; 
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
+  background-size: 100% 100%;
+}
+/* 元旦修改新增样式 */
+.xpth-banner {
+  /* width: 270rpx; */
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
+  /* background-size: 100% 100%; */
+  border-radius: 20rpx;
+  flex: 1;
+  margin-left: 15rpx;
+  /* padding: 4rpx;
+  background: #72674e;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  height: 319rpx;
+}
+.xpth-banner image {
+  /* width: 270rpx; */
+  flex: 1;
+  height: 319rpx;
+  border-radius: 20rpx;
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  /* border-radius: 20rpx; */
+}
+/* 元旦修改新增样式 */
+.xpth-item {
+  /* width: 413rpx;
+  height: 160rpx; */
+  /* background: #FFFFFF; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%; */
+  border-radius: 20rpx;
+  height: 153rpx;
+  background: #FFFFFF;
+  display: flex;
+  margin-bottom: 13rpx;
+  /* margin-bottom: 10rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
+  /* padding: 5rpx; */
+}
+.xpth-item:last-child {
+  margin-bottom: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item image {
+  /* width: 160rpx;
+  height: 160rpx;
+  background: #FFE7C0;
+  border-radius: 15rpx 0 0 15rpx; */
+  width: 157rpx;
+  height: 154rpx;
+  background: #72707D;
+  border-radius: 20rpx;
+  /* margin-right: 15.33rpx; */
+  flex-shrink: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-content {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  /* background: #FBECDE; */
+  padding-left: 15.33rpx;
+  border-radius: 0 15rpx 15rpx 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-title {
+  width: 230rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  margin-right: 18rpx;
+  /* height: 80rpx; */
+}
+.xpth-tag {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #E5A54A;
+}
+/* 元旦修改新增样式 */
+.xpth-item-bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-right: 13.33rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price {
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #D62828;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price::before {
+  content: "￥";
+  font-size: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-buy {
+  width: 111rpx;
+  height: 36rpx;
+  background: linear-gradient(180deg, #FF9B6A, #E63100);
+  border-radius: 18rpx;
+  font-size: 21rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFE7C0;
+  text-align: center;
+  line-height: 36rpx;
+}
+/* 元旦修改新增样式 */
+.new-pic {
+  width: 158.67rpx !important;
+  height: 218.67rpx !important;
+  margin-bottom: 26.67rpx;
+}
+
+.ggfw-list {
+  justify-content: space-around !important;
+}
+.ggfw {
+  width: auto;
+}
+.ggfw image{
+  margin-bottom: 16.67rpx;
+  width: 70rpx !important;
+  height: 70rpx !important;
+}
+
+.six-box-new {
+  width: 697rpx;
+  /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
+  border-radius: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 13.33rpx;
+  overflow: scroll;
+  margin-bottom: 53.33rpx;
+  z-index: 1;
+  position: relative;
+}
+
+.six-box-new image {
+  width: 440rpx;
+  height: 213.33rpx !important;
+  /* background: #FFE7C0; */
+  border-radius: 20rpx;
+  flex-shrink: 0;
+  margin-right: 13.33rpx;
+}
+/* 春节金刚区字体颜色样式更换 */
+.top-icon-text {
+  color: #54504D;
+}
+
+.rmtj-right {
+  /* width: 313.33rpx;
+  height: 154rpx; */
+  width: 240rpx;
+  height: 66rpx;
+  position: absolute;
+  right: -22rpx;
+  right: 0;
+  z-index: 2;
+  /* top: -20rpx; */
+}
+
+.Qtop{
+  width: 100%;
+}
+.Qtop img{
+  width: 100%;
+}
+.miao{
+  position: fixed;
+  top: 100rpx;
+  background: antiquewhite;
+  margin: 18rpx;
+  width: 129rpx;
+  height: 63rpx;
+  background: rgba(17, 17, 17, 0.1);
+  text-align: center;
+  border-radius: 13rpx;
+  line-height: 63rpx;
+}
+.topBox {
+    /* display: flex;
+    padding-top: 120rpx;
+    padding-left: 20rpx; */
+}
+.jumpBox {
+    color: #000;
+    background: rgba(255,255,255, 0.911);
+    display: flex;
+    align-items: center;
+    border-radius: 10rpx;
+    padding: 10rpx 20rpx;
+    position: fixed;
+    top: 150rpx;
+    left: 20rpx;
+}
+.time{
+  padding-right: 10rpx;
+}
+
+.muteImg {
+	width: 62rpx;
+	height: 62rpx;
+	position: absolute;
+	top: 194rpx;
+	right: 38rpx;
+}
+.logoImg {
+	width: 464.67rpx;
+	height: 342.67rpx;
+	position: absolute;
+	top: 406rpx;
+	left: 142rpx;
+}
+.btnImg {
+	width: 296.67rpx;
+	height: 79.33rpx;
+	position: absolute;
+	left: 226rpx;
+	bottom: 208rpx;
+}
+.playImg {
+	position: absolute;
+	width: 31.33rpx;
+	height: 38rpx;
+	left: 56.67rpx;
+	bottom: 64rpx;
+}
+.jqssd {
+  background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
+  background-size: 100% 100%;
+  width: 365.33rpx;
+  height: 166rpx;
+  flex-shrink: 0;
+}
+.sslk {
+  background: url("https://static.ticket.sz-trip.com/uploads/20240606/eec4af8edf598dc7c440cff8a5fdbe98.png");
+  background-size: 100% 100%;
+  width: 365.33rpx;
+  height: 166rpx;
+  flex-shrink: 0;
+  margin-left: -20rpx;
+}
\ No newline at end of file
diff --git a/subPackages/indexs/index.js b/subPackages/indexs/index.js
new file mode 100644
index 0000000..409e869
--- /dev/null
+++ b/subPackages/indexs/index.js
@@ -0,0 +1,1198 @@
+//index.js
+//获取应用实例
+let app = getApp()
+import commonApi from "../../utils/https/common"
+import userApi from "../../utils/https/user"
+import util from "../../utils/util"
+Page({
+	data: {
+		banner: [],
+		xiaobanner: [],
+		height: 0,
+		padHeight: 0,
+		right: 0,
+		weather: null,
+		saleProduct: null,
+		roadProduct: null,
+		fourProduct: [],
+		hotIndex: 0,
+		indexHot: [],
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
+		month: "",
+		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
+		date: "",
+		list: [],
+		listMore: true,
+		isTest: false,
+		lat: "",
+		lon: "",
+		urltopage: {},
+		scrollLeft: 0,
+		videoPrize: false,
+		prizeInfo: null,
+		otherPlat: null,
+		activeBannerIndex: 0,
+		smBannerIndex: 0,
+		indexSeason: {},
+		// startList: [], // 启动页广告
+		startList: {
+			head_img: ''
+		}, // 启动页广告
+		alertSwipeList: [], //弹窗广告
+		showAdv: false, //弹窗开关
+		showFullAdv: true, //全屏广告开关
+		opacity: 1,
+		time: 3, //全屏广告剩余时间
+		showTime: false,
+		xpth: {}, // 元旦新增 新品特惠和sqjNew
+		djs: null, // 元旦新增 新品特惠倒计时
+		djsTime: null,
+		sqjNew: [
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+		],
+		viewHeight: "0px",
+		isMuted: true,
+    videoPlay: false,
+    hdrlNavList:[
+      {
+        type:null,
+        title:'全部'
+      },
+      {
+        type:'scene',
+        title:'景区活动'
+      },
+      {
+        type:'show',
+        title:'演出'
+      },
+      {
+        type:'exhibition',
+        title:'展览'
+      },
+      {
+        type:'movie',
+        title:'电影'
+      },
+      {
+        type:'other',
+        title:'其他'
+      }
+    ], //活动日历板块导航分类
+    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+    today:null,
+    hdrlList:[],
+    yszNav:['公共服务','旅游助手'],
+    yszIndex:0,
+    bdList:[
+      {
+        bg: 'linear-gradient(-8deg, #B9E1F0, #F4F9FF)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feiwan.png', //非玩不可
+        path:'/pages/list/scene/index',
+        url:'',
+      },
+      {
+        bg: 'linear-gradient(-8deg, #F3FFC4, #F9FFE3)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feimai.png', //非买不可
+        path:'/pages/list/techan/index',
+        url:'',
+      },
+      {
+        bg: 'linear-gradient(-8deg, #A0F292, #E0F7DC)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feiyou.png', //非游不可
+        url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
+        path:'',
+      },
+      {
+        bg: 'linear-gradient(-8deg, #E3D9FF, #F6F2FF)',
+        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feikan.png', //非看不可
+        url:'',
+        path:'/pages/list/theatre/index',
+      },
+    ],
+    list1:[], //非玩-景点
+    list2:[], //非买-文创
+    list3:[], //非游-一日游
+    list4:[], //非看-剧场演出
+	},
+	onLoad: function(options) {
+		this.getHeight()
+		//全屏广告
+		wx.hideTabBar() //这里隐藏了底部导航栏
+		commonApi._post("adv/getAdv", {
+			position: 2,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+				if (res.data.length > 1) {
+					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
+					this.setData({
+						startList: res.data[num]
+					})
+					console.log(this.data.startList.head_img);
+				} else {
+					this.setData({
+						startList: res.data[0]
+					})
+				}
+
+				// 图片
+				if (this.data.startList.media_type) {
+					this.setData({
+						showTime: true
+					})
+					var timer = setInterval(() => {
+						this.setData({
+							time: this.data.time - 1
+						})
+						if (this.data.time === 0) {
+							var opacityTimer = setInterval(() => {
+								this.setData({
+									opacity: this.data.opacity - 0.3
+								})
+							}, 100)
+						}
+						if (this.data.time == -1) {
+							clearInterval(timer)
+							clearInterval(opacityTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							this.setData({
+								showFullAdv: false
+							})
+						}
+					}, 1000)
+				} else {
+					// 视频
+				}
+			} else {
+				this.setData({
+					showFullAdv: false
+				})
+			}
+		})
+		if (options.from) {
+			app.globalData.from = options.from;
+    }
+    // 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+    let d = new Date();
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
+    this.setData({
+      today: d.getFullYear() + "-" + month + "-" + day
+    })
+		let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+		wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+        this.getList()
+        this.getHdrlList()
+			},
+			fail: (err) => {
+        this.getList()
+        this.getHdrlList()
+			}
+		})
+		this.setData({
+			height: height,
+			padHeight: systemInfo.statusBarHeight,
+			right: (systemInfo.screenWidth - rect.right) + rect.width
+		})
+
+		commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
+			this.setData({
+				urltopage: data
+			})
+		})
+		this.getTwoProduct()
+		this.getBanner()
+    this.getWeather()
+  },
+  gobdDetail(e) {
+    console.log(e);
+    let url = e.currentTarget.dataset.url
+    wx.navigateTo({
+      url: url
+    })
+  },
+  getList() {
+    let bdList = this.data.bdList
+    // 非玩不可--景点
+    commonApi._post("scene/get_scene_by_tag",{
+      tag_id:"4",
+      limit:6,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      offset:0,
+      sort:"weight",
+      title:'',
+      area_id:''
+    }).then(res=>{
+      res.data.list.map(item => {
+        if (item.distance || item.distance == 0) {
+          if (item.distance >= 1000) {
+            item.distance = (item.distance / 1000).toFixed(2) + 'km';
+          } else {
+            item.distance = (item.distance).toFixed(2) + 'm';
+          }
+        }
+      })
+      this.setData({
+        list1:res.data.list
+      })
+    })
+    // 非买不可--文创
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: 326,
+      offset: 0,
+      limit: 6,
+    }).then(res=>{
+      this.setData({
+        list2:res.data.list
+      })
+    })
+    // 非游不可--线路一日游
+    commonApi._post('product/get_product_by_tag',{
+      type_id: 23,
+      tag_id:17,
+      offset: 0,
+      limit: 6,
+      sort: 'weight'
+    }).then(res=>{
+      this.setData({
+        list3:res.data.list
+      })
+    })
+    // 非看不可--剧场演出
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:"6",
+      offset:0,
+      limit:6,
+      sort:'',
+      order:'',
+      lat:this.data.lat,
+      lon:this.data.lon,
+      title:''
+    }).then(res=>{
+      this.setData({
+        list4:res.data.list
+      })
+    })
+  },
+  goDetail(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+    if (type == 'movie') {
+      wx.navigateTo({
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/info/activityInfo/index?id=' + item.id,
+      })
+    }
+  },
+  // 分类为电影时调这个接口
+  getMovieList() {
+    let service = "Cinema/getHotMovieList";
+		let data = {
+			page: 1,
+			pageSize: 5
+    };
+    commonApi._post(service, data).then(res => {
+      console.log(res.data);
+			this.setData({
+				hdrlList: res.data
+			})
+    })
+    console.log(this.data.hdrlList);
+  },
+  // 推荐榜单更多跳转
+  moreBtn(e) {
+    let item = e.currentTarget.dataset.item
+    if (item.path!='') {
+      wx.navigateTo({
+        url: item.path,
+      })
+    } else {
+      // if (e.currentTarget.dataset.event) {
+      //   this.pagePoint({
+      //     event: e.currentTarget.dataset.event
+      //   }, 1)
+      // }
+      let url = item.url;
+      app.globalData.weburl = url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+      })
+    }
+  },
+  // 活动日历下的列表
+  getHdrlList() {
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: 1,
+      date: this.data.today,
+      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+      keywords: '',
+      area_key: '',
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 5
+    }).then(res => {
+      this.setData({
+        hdrlList:res.data.rows
+      })
+    })
+  },
+  // 切换活动日历分类
+  changeHdrlNav(e) {
+    console.log(e.currentTarget.dataset);
+    this.setData({
+      hdrlList:[],
+      hdrlNavIndex:e.currentTarget.dataset.index,
+    })
+    if (this.data.hdrlNavIndex == 4) {
+      this.getMovieList()
+    } else {
+      this.getHdrlList() //切换分类重新获取活动日历列表
+    }
+  },
+  // 游苏州下的公共服务和旅游助手切换
+  changeType(e) {
+    this.setData({
+      yszIndex:e.currentTarget.dataset.index,
+    })
+  },
+  // 获取导航栏项目标题高度
+	getHeight() {
+		let that = this
+		wx.getSystemInfo({
+			success(res) {
+				console.log(res)
+				that.setData({
+					viewHeight: res.windowHeight + 'px'
+				})
+				console.log(that.data.viewHeight)
+			}
+		})
+	},
+	// getXpthList: function() {
+	// 	// 元旦新增 新品特惠
+	// 	commonApi._post("product/get_product_indulgence", {
+	// 		tag_id: 275,
+	// 		typeId: 3,
+	// 	}).then(res => {
+	// 		console.log('data', res.data);
+	// 		this.setData({
+	// 			xpth: res.data,
+	// 			djsTime: res.data.time
+	// 		})
+	// 		let time = setInterval(() => {
+	// 			this.setData({
+	// 				djsTime: this.data.djsTime - 1
+	// 			})
+	// 			this.formatDate(this.data.djsTime)
+	// 		}, 1000)
+	// 		if (this.data.djsTime == 0) {
+	// 			clearInterval(time)
+	// 		}
+	// 	})
+	// },
+	// 元旦新品特惠 倒计时 
+	// formatDate: function(oTime) {
+	// 	let h = parseInt(oTime / 3600)
+	// 	let m = parseInt((oTime % 3600) / 60)
+	// 	let s = parseInt(oTime % 60)
+	// 	h = h < 10 ? "0" + h : h;
+	// 	m = m < 10 ? "0" + m : m;
+	// 	s = s < 10 ? "0" + s : s;
+	// 	this.setData({
+	// 		djs: {
+	// 			h: h,
+	// 			m: m,
+	// 			s: s
+	// 		}
+	// 	})
+	// 	return
+	// },
+  // 非遗跳转
+  // goFeiyi: function() {
+	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+	// 	wx.navigateTo({
+	// 		url: "/pages/pbService/web/index"
+	// 	})
+	// },
+	// onTabItemTap: function(e) {
+	// 	console.log(e, 99999999)
+  // },
+  // 大轮播的监听方法
+	changeBannerIndex: function(e) {
+		this.setData({
+			activeBannerIndex: e.detail.current
+		})
+  },
+  // 小轮播监听方法
+	changeSmBannerIndex: function(e) {
+		this.setData({
+			smBannerIndex: e.detail.current
+		})
+	},
+	// 一城百馆
+	city: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx114d514f39cb1fed',
+			path: "pages/entry/index"
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "一城百馆",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+	},
+	changeHotIndex: function(e) {
+		this.setData({
+			hotIndex: e.currentTarget.dataset.index,
+			fourProduct: []
+		})
+		this.getFourProduct()
+	},
+	getBanner: function() {
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xcxBanner"
+		// }).then(res=>{
+		//   console.log(res)
+		//   this.setData({
+		//     banner:res.data.content || []
+		//   })
+		// })
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xiaobanner"
+		// }).then(res=>{
+		//   this.setData({
+		//     xiaobanner:res.data.content || []
+		//   })
+		// })
+		// return;
+		commonApi._post("adv/getAdv", {
+			position: 0,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				banner: res.data || []
+			})
+		})
+		commonApi._post("adv/getAdv", {
+			position: 1,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				xiaobanner: res.data || []
+			})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {
+			position: 3,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
+				})
+			} else if (!this.data.showFullAdv) {
+				wx.showTabBar({
+					animation: true,
+				})
+			}
+		})
+
+	},
+	//获取季节配置
+	getIndexSeason() {
+		this.setData({
+			indexHot: app.globalData.configJson.indexHot,
+			isTest: app.globalData.configJson.isTest,
+			otherPlat: app.globalData.configJson.otherPlats,
+			indexSeason: app.globalData.configJson.indexSeason
+		})
+		this.getFourProduct()
+	},
+	//关闭弹窗广告
+	closeAdv: function() {
+		this.setData({
+			showAdv: false
+		})
+		wx.showTabBar({
+			animation: true,
+		})
+	},
+	//关闭全屏广告
+	closeFullAdv: function() {
+		this.setData({
+			showFullAdv: false
+		})
+		if (!this.data.alertSwipeList.length > 0) {
+			wx.showTabBar({
+				animation: true,
+			})
+		}
+	},
+	// 是否静音
+	closeMuted: function() {
+		this.setData({
+			isMuted: this.data.isMuted = !this.data.isMuted
+		})
+	},
+	// 播放视频
+	videoPlay: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.play();
+		this.setData({
+			videoPlay: false
+		})
+	},
+	// 暂停视频
+	videoPause: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.pause();
+		this.setData({
+			videoPlay: true
+		})
+	},
+	getWeather: function() {
+		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
+			this.setData({
+				weather: res.data
+			})
+		})
+	},
+	saleDetail: function() {},
+	getTwoProduct: function() {
+		// 获取首页限时特惠
+		commonApi._post('act/fast_sale_now', {
+			offset: 0,
+			limit: 1
+		}).then(res => {
+			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
+				if (res.data[0].fast_sales_sku.length > 0) {
+					let price = res.data[0].fast_sales_sku[0].price
+					let data = res.data[0].fast_sales_sku[0]
+					for (let item of res.data[0].fast_sales_sku) {
+						if (price > item.price) price = item.price
+					}
+					data.price = price
+					this.setData({
+						saleProduct: data
+					})
+				} else {
+					this.setData({
+						saleProduct: res.data[0].fast_sales_sku[0]
+					})
+				}
+			}
+		})
+		commonApi._post("product/get_product_by_tag", {
+			tag_id: 17,
+			offset: 0,
+			limit: 1,
+			sort: 'price',
+			order: 'asc'
+		}).then(res => {
+			if (res.data.list.length > 0) {
+				let price = res.data.list[0].price
+				for (let item of res.data.list) {
+					if (item.price > price) {
+						price = item.price
+					}
+				}
+				let data = res.data.list[0]
+				data.price = price
+				this.setData({
+					roadProduct: data
+				})
+			} else {
+				this.setData({
+					roadProduct: [111]
+				})
+			}
+		})
+	},
+	getFourProduct: function() {
+		let item = this.data.indexHot[this.data.hotIndex],
+			service = "product/get_product_by_tag",
+			data = {
+				tag_id: item.id,
+				offset: 0,
+				limit: 4,
+				sort: 'weight',
+				order: 'desc'
+			};
+		if (item.type == 'scene') {
+			service = "scene/get_scene_by_tag";
+		} else if (item.type == 'movie') {
+			service = "Cinema/getHotMovieList";
+			data = {
+				page: 1,
+				pageSize: 4
+			};
+		}
+		commonApi._post(service, data).then(res => {
+			this.setData({
+				fourProduct: res.data.list || res.data
+			})
+		})
+	},
+	tagGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
+			wx.navigateTo({
+				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+					item.title,
+			})
+		} else {
+			util.gotoDetail(item)
+		}
+	},
+	productGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.gotoDetail(item)
+	},
+	gotoPath: function(e) {
+    console.log(e)
+		// if (e.currentTarget.dataset.event) {
+		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
+		//     wx.navigateToMiniProgram({
+		//       appId: 'wxd323e63a10aa6865',
+		//       path: 'pages/home/index'
+		//     })
+		//     return
+		//   }else{
+		//     this.pagePoint({
+		//       event: e.currentTarget.dataset.event
+		//     }, 1)
+		//   }
+		// }
+		if (e.currentTarget.dataset.title == '书香借阅') {
+			wx.navigateToMiniProgram({
+				appId: 'wx165d4f1727f6bdb0',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.title == '12348') {
+			wx.navigateToMiniProgram({
+				appId: 'wxcdfd45c001466ba3',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxdd39069b9a91dbfe',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8888a3fd0862b4c8',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'taicang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8853b0d93cbca75e',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'changshu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx4df5fd9a6a5ea123',
+				path: 'pages/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxd323e63a10aa6865',
+				path: 'pages/home/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wujiang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8eadea4ee2d42d4b',
+				path: 'pages/index/index'
+			})
+			return;
+		}
+		wx.navigateTo({
+			url: e.currentTarget.dataset.path,
+		})
+		if (e.currentTarget.dataset.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: e.currentTarget.dataset.title
+			}).then(res => {
+
+			})
+		}
+	},
+	// 元旦  新品特惠部分
+	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
+		})
+	},
+	gotoUrl: function(e) {
+		console.log(e)
+		if (e.currentTarget.dataset.event) {
+			this.pagePoint({
+				event: e.currentTarget.dataset.event
+			}, 1)
+		}
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+		})
+	},
+	gotoMini: function(e) {
+		let appid = e.currentTarget.dataset.appid,
+			path = e.currentTarget.dataset.path
+		wx.navigateToMiniProgram({
+			appId: appid,
+			path: path
+		})
+	},
+	garbage: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx13be821f3b1afed3',
+			path: 'pages/home/home'
+		})
+	},
+	gotoSku: function() {
+		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
+			app.globalData.weburl = res.data.url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index'
+			})
+			return;
+		})
+	},
+	audioGuide: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx74f380bc721a0379',
+			path: '/pages/listen/listen?title=君到苏州'
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "语音导览",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+	},
+	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
+	// getList: function() {
+	// 	if (!this.data.listMore) return;
+	// 	commonApi._post("search/recommend", {
+	// 		offset: this.data.list.length,
+	// 		limit: 16
+	// 	}).then(res => {
+	// 		res.data.map(item => {
+	// 			if (item.ext.display_tags) {
+	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+	// 			} else {
+	// 				item.ext.display_tags = []
+	// 			}
+	// 		})
+	// 		if (res.data.length < 15) {
+	// 			this.setData({
+	// 				listMore: false
+	// 			})
+	// 		}
+	// 		this.setData({
+	// 			list: this.data.list.concat(res.data)
+	// 		})
+	// 	})
+	// },
+	onReachBottom: function() {
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+		// }
+	},
+	gotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.pagePoint({
+			event: 'recommend_click',
+			param: {
+				id: item.id,
+				type: item.type
+			}
+		}, 1)
+		if (item.type == 'travels') {
+			// 游记做特殊处理 其他都按照原来的来
+			wx.navigateTo({
+				url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+			})
+		} else {
+			util.gotoDetail(item.ext);
+		}
+	},
+	meituan: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wxde8ac0a21135c07d',
+			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
+		})
+	},
+	// 轮播图点击
+	bannerClick: function(e) {
+		if (this.data.isTest) return;
+		let item = e.currentTarget.dataset.item;
+		this.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(111, item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+							.url)
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+								null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
+						wx.navigateTo({
+							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+								.tdata.url)
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return;
+
+	},
+	//博物馆跳转  直接跳君到苏州H5
+	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
+		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		wx.navigateTo({
+			// url: "/pages/pbService/web/index"
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
+		})
+	},
+	// bannerClick2: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.action == 'href') {
+	// 		if (item.href.indexOf(",") != -1) {
+	// 			let info = item.href.split(",");
+	// 			wx.navigateToMiniProgram({
+	// 				appId: info[0],
+	// 				path: info[1]
+	// 			})
+	// 		} else if (item.href.indexOf('map/index') != -1) {
+	// 			wx.reLaunch({
+	// 				url: item.href
+	// 			})
+	// 		} else {
+	// 			wx.navigateTo({
+	// 				url: item.href,
+	// 			})
+	// 		}
+	// 	} else if (item.action == "web") {
+	// 		app.globalData.weburl = item.href;
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+	// 		})
+	// 	}
+	// },
+	// 监听文旅查询的scroll
+	listenScroll(e) {
+		this.setData({
+			scrollLeft: e.detail.scrollLeft
+		})
+	},
+	// // 获取短视频大赛是否中奖 中奖详情
+	// getVideoPrize() {
+	// 	let user_id = wx.getStorageSync('jstrip_userid');
+	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+	// 	commonApi.user_post('actonline/video_act/getRaffle', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			videoPrize: res.data
+	// 		})
+	// 	})
+	// },
+	// noMoreTip() {
+	// 	wx.setStorageSync('indexPriceNoTip', true)
+	// 	this.closePrice()
+	// },
+	// closePrice() {
+	// 	this.setData({
+	// 		videoPrize: false,
+	// 		prizeInfo: null
+	// 	})
+	// },
+	// 抽奖
+	// choosePrize() {
+	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			prizeInfo: res.data
+	// 		})
+	// 		if (res.data.type != 'none') {
+	// 			// 抽奖成功的话 弹框
+	// 			wx.showModal({
+	// 				title: "提示",
+	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+	// 				showCancel: false
+	// 			})
+	// 		}
+	// 	})
+	// },
+	// bannerJumpNew(item) {
+	// 	let that = this
+	// 	item = item.currentTarget.dataset.item
+	// 	if (item.tdata == '') return
+	// 	that.pagePoint({
+	// 		event: "banner_click",
+	// 		type: 'banner'
+	// 	}, 1)
+	// 	switch (item.jump_type) {
+	// 		case 0:
+	// 			break;
+	// 		case 1:
+	// 			util.gotoDetail(item.product_model)
+	// 			break;
+	// 		case 2:
+	// 			if (item.front_model && item.front_model.mini) {
+	// 				wx.navigateTo({
+	// 					url: "/" + item.front_model.mini
+	// 				})
+	// 			}
+	// 			break;
+	// 		case 3:
+	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+	// 				// 外部h5
+	// 				console.log(item.tdata)
+	// 				app.globalData.weburl = item.tdata.url;
+	// 				wx.navigateTo({
+	// 					url: "/pages/pbService/web/index"
+	// 				})
+	// 			} else {
+	// 				let page = item.tdata.url.split("/");
+	// 				page = page[page.length - 1].split("?")
+	// 				console.log(page[0])
+	// 				let url = this.data.urltopage[page[0]];
+	// 				if (url && url.indexOf('map') != -1) {
+	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+	// 							'cinema', 'academes'
+	// 						],
+	// 						type = page[1] ? page[1].split("=") : [];
+	// 					wx.reLaunch({
+	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+	// 					})
+	// 				} else if (url) {
+	// 					wx.navigateTo({
+	// 						url: url,
+	// 					})
+	// 				} else {
+	// 					app.globalData.weburl = item.tdata.url;
+	// 					wx.navigateTo({
+	// 						url: "/pages/pbService/web/index"
+	// 					})
+	// 				}
+	// 			}
+	// 			break;
+	// 		case 4:
+	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+	// 				// 如果是苏心游的小程序 直接把authCode带过去
+	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+	// 					let weburl = item.tdata.page
+	// 					if (weburl.indexOf('?') != -1) {
+	// 						weburl += '&authCode=' + res.data;
+	// 					} else {
+	// 						weburl += '?authCode=' + res.data
+	// 					}
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: weburl
+	// 					})
+	// 				}).catch(err => {
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: item.tdata.page
+	// 					})
+	// 				})
+	// 			} else {
+	// 				wx.navigateToMiniProgram({
+	// 					appId: item.tdata.appid,
+	// 					path: item.tdata.page
+	// 				})
+	// 			}
+	// 			break;
+	// 		default:
+	// 			break;
+	// 	}
+	// 	return
+	// },
+	onReady: function() {
+
+
+	},
+	// gotoOther: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.type == 'h5') {
+	// 		app.globalData.weburl = item.url
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+	// 		})
+	// 	} else if (item.type == 'mini') {
+	// 		wx.navigateToMiniProgram({
+	// 			appId: item.appid,
+	// 			path: item.path
+	// 		})
+	// 	} else if (item.type == 'page') {
+	// 		wx.navigateTo({
+	// 			url: item.page,
+	// 		})
+	// 	}
+	// },
+	pagePoint: function(e, type) {
+		util.pagePoint(e, type)
+	},
+	onShow: function() {
+		if (app.globalData.loadIndexSeason) {
+			this.getIndexSeason()
+		} else {
+			let t = setInterval(() => {
+				if (app.globalData.loadIndexSeason) {
+					this.getIndexSeason()
+					clearInterval(t)
+					t = null
+				}
+			}, 500)
+		}
+
+		this.pagePoint({
+			event: 'home_view'
+		}, 1)
+		// this.data.time!=5?wx.showTabBar():1
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+	onShareTimeline: function() {
+		return {
+			title: '君到苏州（文化旅游总入口）',
+			query: '',
+			imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
+		}
+	}
+})
\ No newline at end of file
diff --git a/subPackages/indexs/index.json b/subPackages/indexs/index.json
new file mode 100644
index 0000000..7c4437e
--- /dev/null
+++ b/subPackages/indexs/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "common-image":"/pages/component/commonImage/index",
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml
new file mode 100644
index 0000000..bd08211
--- /dev/null
+++ b/subPackages/indexs/index.wxml
@@ -0,0 +1,306 @@
+<!--pages/indexs/index.wxml-->
+<title title="君到苏州（文化旅游总入口）"></title>
+<!-- 后台获取的季节动图 -->
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/topImg.gif" mode="widthFix"></image>
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <view class="weather-num">{{weather.max_temp}}°</view>
+  <view class="weather">{{weather.weather}}</view>
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+</view>
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+    <view class="iconfont icon-sousuo"></view>
+    <view class="textOver">搜索想要的旅游产品或服务</view>
+  </navigator>
+</view>
+<view style="position:relative;z-index: 1;" >
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+    <block wx:for="{{banner}}" wx:key="this">
+      <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="com-flex dot-list">
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+  </view>
+</view>
+<view class="content">
+  <!-- 活动日历 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendar.png"></image>
+    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+  </view>
+  <view class="hdrlNavList">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+      {{item.title}}
+    </view>
+  </view>
+  <view wx:if="{{hdrlNavIndex!=4}}">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+        <view style="background: #fff;width: 630rpx;display: flex;border-radius: 13rpx;">
+          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <view class="hdrlItem-content">
+            <view class="hdrlItem-title textOver3">{{item.name}}</view>
+            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view wx:else>
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;">
+      <view class="movieItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
+          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;">
+            <view>{{item.title}}</view>
+            <view style="display: flex;justify-content: flex-end;">
+              <view class="buyMovie">去购票 ></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box">
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image bindtap="gotoPath" data-path="/pages/pbService/sceneComfort/index" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
+      <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
+          </view>
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
+            <view class="text">一卡游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <view class="text">非遗专卖</view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+    </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 286.67rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/ysz.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
+    </view>
+    <image style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}">
+      <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;justify-content: space-between;">
+        <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gaofeng.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/xingli.png" mode="widthFix"></image>
+          <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/shishi.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
+    </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          data-path="/pages/list/{{isTest?'road':'food'}}/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
+  <!-- 推荐榜单 -->
+  <image class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
+  <!-- 4个产品榜单 -->
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box">
+  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
+    <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
+    <view class="bd-top">
+      <image class="bd-type" src="{{item.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
+    </view>
+    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
+      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+ </view>
+
+
+
+</view>
+
+<!-- 开屏页 -->
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
+</view>
+
diff --git a/subPackages/indexs/index.wxss b/subPackages/indexs/index.wxss
new file mode 100644
index 0000000..330a3d1
--- /dev/null
+++ b/subPackages/indexs/index.wxss
@@ -0,0 +1,1427 @@
+/* pages/indexs/index.wxss */
+/* 元旦修改 */
+page {
+  background: #f5f2ed;
+  padding-bottom: 36.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/bg.png");
+  background-size: 100% 100%;
+  background-repeat: round;
+}
+.swiper,.swiper image {
+  width: 697rpx;
+  display: block;
+  height: 335rpx;
+  border-radius: 27rpx;
+}
+.swiper {
+  margin: 0 auto;
+}
+.top-box {
+  display: flex;
+  padding: 10rpx 0;
+  align-items: center;
+  margin: 0 30rpx;
+  justify-content: flex-start;
+  position: relative;
+  z-index: 1;
+}
+.top-box image {
+  flex-shrink: 0;
+  width: 40rpx;
+  height: 40rpx;
+  /* 样式改版 */
+  /* width: 63rpx;
+  height: 63rpx; */
+  display: block;
+  margin-left: 18rpx;
+}
+.search-box {
+  flex: 1;
+  width: 100%;
+  height: 64rpx;
+  background: rgba(255,255,255,0.7);
+  border-radius: 32rpx;
+  color: #000;
+  display: flex;
+  align-items: center;
+  font-size: 25rpx;
+}
+.search-box .iconfont {
+  font-size: 30rpx;
+  margin-left: 20rpx;
+  margin-right: 10rpx;
+  color: #000;
+}
+.top-box .weather-num,.top-box .weather {
+  flex-shrink: 0;
+  color: #333;
+  /* color: #72674E; */
+}
+.top-box .weather-num {
+  font-size: 29rpx;
+  margin-bottom: 10rpx;
+  margin-left: 4rpx;
+}
+.top-box .weather {
+  font-size: 19rpx;
+  margin-top: 20rpx;
+  margin-left: -4rpx;
+  margin-right: 30rpx;
+}
+.top-icons {
+  /* background: #FFFFFF; */
+  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
+  border-radius: 0 0 27rpx 27rpx;
+  width: 697rpx;
+  margin: 0 auto;
+  position: relative;
+  z-index: 0;
+  display: flex;
+  padding: 34rpx 0;
+  padding-bottom: 7rpx;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  background: #FFFED6;
+  margin-top: -20rpx;
+  padding-top: 54rpx;
+}
+.top-icon-item {
+  margin-bottom: 20rpx;
+  line-height: 37rpx;
+  font-size: 25rpx;
+  color: #000;
+  text-align: center;
+  flex-shrink: 0;
+  width: 20%;
+}
+.top-icon-item:nth-child(5n){
+  margin-right: 0;
+}
+.top-icon-item image {
+  width: 113rpx;
+  display: block;
+  margin: 0 auto;
+  margin-bottom: 10rpx;
+}
+.content {
+  /* margin: 0 25rpx; */
+}
+.sale-road-boxes {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 40rpx;
+  position: relative;
+  align-items: flex-end;
+  margin-bottom: 28rpx;
+}
+.sale-box {
+  flex-shrink: 0;
+  width: 337rpx;
+}
+.sale-title {
+  color: #999999;
+  font-size: 20rpx;
+  margin-bottom: 20rpx;
+}
+.sale-title text {
+  color: #000000;
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-right: 8rpx;
+}
+.sale-product {
+  width: 337rpx;
+  position: relative;
+  height: 165rpx;
+  overflow: hidden;
+  border-radius: 8rpx;
+}
+.sale-product-bg {
+  width: 197rpx;
+  height: 165rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background: linear-gradient(90deg, #F78C56, #FB6044);
+  
+}
+.road-product-bg {
+  background: linear-gradient(90deg, #35CFB4, #00A6A0);
+}
+.sale-img {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 173rpx;
+  height: 165rpx;
+}
+.sale-info {
+  position: absolute;
+  left: 20rpx;
+  top: 20rpx;
+  bottom: 20rpx;
+  width: 140rpx;
+}
+.sale-product-title {
+  font-size: 28rpx;
+  color: #fff;
+  font-weight: 500;
+  line-height: 36rpx;
+}
+.sale-price {
+  padding: 0 10rpx;
+  color: #F44747;
+  font-size: 25rpx;
+  line-height: 39rpx;
+  background: #FFFFFF;
+  border-radius: 5rpx;
+  margin-top: 15rpx;
+  display: inline-block;
+}
+.sale-tip-img {
+  position: absolute;
+  width: 200rpx;
+  height: 165rpx;
+  left: 0;
+  top: 0;
+}
+.small-swiper {
+  height: 154rpx;
+}
+.small-swiper image {
+  display: block;
+  width: 100%;
+  height: 154rpx;
+}
+.small-swiper-box {
+  margin: 24rpx 26.67rpx 26.67rpx;
+  /* width: 100%; */
+  height: 154rpx;
+  border-radius: 20rpx;
+  overflow: hidden;
+  position: relative;
+}
+.product-tags {
+  display: flex;
+  margin-top: 40rpx;
+  margin-bottom: 50rpx;
+  overflow-x: auto;
+}
+.product-tag {
+  padding: 0 20rpx;
+  height: 43rpx;
+  background: #F4F4F4;
+  border-radius: 21rpx;
+  font-size: 27rpx;
+  color: #666;
+  margin-right: 20rpx;
+  flex-shrink: 0;
+}
+.product-tag.active {
+  background: #0B898E;
+  color: #fff;
+}
+.tag-product-list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.tag-product {
+  width: 337rpx;
+  background: #FFFFFF;
+  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 13rpx;
+  margin-bottom: 35rpx;
+}
+.tag-product image {
+  display: block;
+  width: 337rpx;
+  height: 213rpx;
+  border-radius: 13rpx 13rpx 0px 0px;
+}
+.tag-product .product-info {
+  padding: 20rpx;
+  padding-bottom: 0;
+}
+.tag-product .tag-product-title {
+  font-size: 33rpx;
+  color: #333333;
+  font-weight: 500;
+  margin-bottom: 10rpx;
+}
+.tag-product .tag-product-address {
+  color: #999;
+  font-size: 22rpx;
+  line-height: 40rpx;
+  padding-bottom: 10rpx;
+}
+.tag-product-price-box {
+  display: flex;
+  height: 70rpx;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+}
+.tag-product .tag-product-address .iconfont {
+  font-size: 26rpx;
+}
+.price {
+  color: #D62828;
+  font-size: 24rpx;
+}
+.price text:nth-child(2){
+  font-weight: 500;
+  font-size: 33rpx;
+}
+.price text:nth-child(3){
+  font-size: 20rpx;
+  color: #8D8D8D;
+  margin-left: 4rpx;
+}
+.sale-number {
+  font-size: 24rpx;
+  color: #666;
+}
+.sale-number text {
+  font-size: 21rpx;
+}
+.more-btn {
+  line-height: 77rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #0B898E;
+  font-size: 31rpx;
+  font-weight: 500;
+}
+/* .pic-list {
+  display: flex;
+  justify-content: space-between;
+  margin: 60rpx 0;
+}
+.pic-list image {
+  width: 155.33rpx;
+  height: 200rpx;
+  display: block;
+} */
+/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
+.pic-list {
+  width: 100%;
+  display: flex;
+  margin-right: 26rpx;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.title-more {
+  font-size: 24rpx;
+  /* color: #0B898E; */
+  /* 元旦修改 */
+  color: #54504D;
+  z-index: 9;
+  width: 173rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 20rpx;
+  text-align: center;
+}
+.title-more .iconfont {
+  font-size: 22rpx;
+}
+.slide-out-box {
+  /* margin-top: 20rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
+  border-radius: 27rpx;
+  padding-bottom: 1rpx;
+  /* margin-bottom: 40rpx; */
+}
+.pbservice {
+  width: calc(160rpx * 8);
+  display: flex;
+  margin-top: 5rpx;
+  /* flex-wrap: wrap; */
+  flex-wrap: nowrap;
+  /* padding-left: 12rpx; */
+  /* overflow-x: scroll; */
+}
+.pbservice-item {
+  width: 120rpx;
+  margin-bottom: 25rpx;
+  margin-right: 32.33rpx;
+  text-align: center;
+  font-size: 27rpx;
+  color: #000;
+  line-height: 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.text {
+  width: 200rpx;
+}
+.pbservice-item image {
+  /* width: 60rpx;
+  margin-bottom: 20rpx;
+  margin-top: 50rpx; */
+  /* 元旦修改 以上都是之前的*/
+  width: 80rpx;
+  margin-bottom: 10rpx;
+}
+.six-box {
+  margin-top: 43rpx;
+  display: flex;
+  margin-bottom: 50rpx;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.six-box image {
+  width: 128rpx;
+  height: 110rpx;
+  margin-bottom: 20rpx;
+}
+.hot-list {
+  display: flex;
+  margin-top: 47rpx;
+  justify-content: space-between;
+}
+.hot-list-item {
+  width: 337rpx;
+}
+.hot-item {
+  background: white;
+  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 15rpx;
+  margin-bottom: 35rpx;
+}
+.hot-item image:nth-child(1) {
+  display: block;
+  width: 100%;
+  border-radius: 15rpx 15rpx 0 0;
+}
+.hot-item .hot-info {
+  padding: 20rpx 25rpx;
+}
+.hot-item .hot-title {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 500;
+}
+.hot-info .tags {
+  display: flex;
+  align-items: center;
+  width: 286rpx;
+  margin: 15rpx 0;
+}
+.hot-info .tag {
+  margin-right: 16rpx;
+  line-height: 32rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 5rpx;
+  box-sizing: border-box;
+  padding: 0 10rpx;
+  color: #0B898E;
+  font-size: 20rpx;
+}
+.hot-info .tag:last-child {
+  margin-right: 0;
+}
+.hot-price {
+  color: #D62828;
+  font-size: 24rpx;
+  margin-top:28rpx;
+
+}
+.hot-price text:nth-child(2){
+  font-size: 33rpx;
+  font-weight: 500;
+}
+.hot-price text:nth-child(3){
+  font-size: 20rpx;
+  color: #8D8D8D;
+  margin-left: 4rpx;
+}
+.hot-location {
+  position: absolute;
+  color: #fff;
+  line-height: 32rpx;
+  font-size: 19rpx;
+  padding: 20rpx;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.hot-location .iconfont {
+  font-size: 22rpx;
+  margin-right: 10rpx;
+}
+.hot-info .tags .icon-box {
+  flex-shrink: 0;
+  width: 50%;
+  text-align: left;
+  color: #666666;
+  font-size: 21rpx;
+  display: flex;
+  align-items: center;
+}
+.hot-info .tags .icon-box .iconfont {
+  font-size: 30rpx;
+  margin-right: 5rpx;
+}
+.today-hot {
+  position: relative;
+  border-radius: 15rpx;
+  font-size: 0;
+  overflow: hidden;
+}
+.today-hot .today-main-img {
+  border-radius: 15rpx;
+  height: 615rpx;
+}
+.today-hot-box {
+  position: absolute;
+  left: 10rpx;
+  right: 10rpx;
+  bottom: 10rpx;
+}
+.today-hot-tag {
+  line-height: 34rpx;
+  max-width: 265rpx;
+  background: #FF2245;
+  border-radius: 15rpx 15rpx 0px 0px;
+  padding: 0 15rpx;
+  color: #fff;
+  font-size: 20rpx;
+  display: inline-block;
+  margin: 0 40rpx;
+}
+.today-hot-title {
+  background: rgba(255, 255, 255, 0.8);
+  padding: 20rpx 28rpx;
+  border-radius: 13rpx;
+  font-size: 33rpx;
+  color: #000;
+  font-weight: 500;
+
+}
+.today-hot .today-tip-img {
+  position: absolute;
+  width: 154rpx;
+  left: 11rpx;
+  top: 31rpx;
+}
+.today-date {
+  position: absolute;
+  top: 65rpx;
+  left: 11rpx;
+  width: 154rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #fff;
+  letter-spacing: 3rpx;
+  font-weight: 500;
+}
+.title-header .icon-fanhui1 {
+  display: none;
+}
+.more-btn-text {
+  text-align: center;
+  /* color: #0b898e;
+  font-size: 27rpx;
+  width: 200rpx;
+  line-height: 65rpx;
+  border: 1px solid #0b898e;
+  border-radius: 33rpx; */
+  margin: 20rpx auto;
+  width: 200rpx;
+  height: 67rpx;
+  line-height: 67rpx;
+  border: 1px solid #111;
+  border-radius: 35rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+}
+.scroll-line {
+  /* height: 6rpx;
+  border-radius: 3rpx;
+  background: #ccc;
+  overflow: hidden;
+  margin: 30rpx auto; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  width: 48rpx !important;
+  height: 8rpx;
+  /* background: #DDCEAC; */
+  background: #fff;
+  border-radius: 4rpx;
+  margin: 0 auto 25rpx;
+}
+.scroll-line-bg {
+  height: 8rpx;
+  background: #078565;
+  border-radius: 4rpx;
+}
+/* 元旦修改  新增样式 */
+.scroll-line-bg2 {
+  margin-left: 24rpx;
+  background: #078565;
+  height: 8rpx;
+  border-radius: 4rpx;
+}
+.nomore-tip-btn {
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 78rpx;
+  bottom: 0;
+}
+.prize-tip-text {
+  width: 267rpx;
+  display: block;
+  top: 39rpx;
+  left: 134rpx;
+  position: absolute;
+}
+.prize-name {
+  position: absolute;
+  text-align: center;
+  left: 132rpx;
+  right: 132rpx;
+  top: 169rpx;
+  font-size: 31rpx;
+  color: #333333;  
+}
+.prize-img {
+  width: 333rpx;
+  height: 240rpx;
+  border-radius: 13rpx;
+  overflow: hidden;
+  position: absolute;
+  left: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 269rpx;
+}
+.prize-img image {
+  display: block;
+  width: 333rpx;
+  height: 240rpx;
+}
+.btn-box {
+  position: absolute;
+  width: 400rpx;
+  height: 87rpx;
+  left: 67rpx;
+  bottom: 78rpx;
+  text-align: center;
+  line-height: 87rpx;
+}
+.btn-box image {
+  display: block;
+  width: 100%;
+}
+.btn-box navigator,.btn-box view {
+  color: #fff;
+  font-size: 35rpx;
+  font-weight: bold;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 1;
+  right: 0;
+}
+.prize-coupon {
+  width: 293rpx;
+  height: 227rpx;
+  position: absolute;
+  top: 274rpx;
+  left: 120rpx;
+  color: #fff;
+  font-size: 24rpx;
+  text-align: center;
+}
+.prize-coupon image {
+  display: block;
+  width: 100%;
+}
+.prize-coupon-money {
+  position: absolute;
+  left: 0;
+  right: 0;
+  font-size: 80rpx;
+  font-weight: bold;
+  line-height: 110rpx;
+  top: 12rpx;
+}
+.prize-coupon-money::before{
+  content: "￥";
+  font-size: 32rpx;
+}
+.prize-coupon-tip {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 120rpx;
+}
+.other-plats {
+  display: flex;
+  font-size: 25rpx;
+  text-align: center;
+  margin-bottom: 30rpx;
+  color: #333333;
+  line-height: 42rpx;
+  flex-wrap: wrap;
+  background: #FFFED6;
+  justify-content: space-around;
+  height: 187rpx;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  align-items: center;
+}
+.other-plats image {
+  width: 80rpx;
+  display: block;
+  height: 80rpx;
+  margin-bottom: 15rpx;
+}
+.other-plat {
+  /* 春节新增样式 */
+  color: #54504D;
+}
+.other-plat:nth-child(4n){
+  margin-right: 0;
+}
+.old-btn {
+  position: fixed;
+  left: 0;
+  top: 170rpx;
+  writing-mode:tb-rl;
+  margin-top: 142rpx;
+  color: #0B898E;
+  font-size: 29rpx;
+  width: 64rpx;
+  height: 140rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  letter-spacing: 3rpx;
+  background: rgba(255, 255, 255, 0.7);
+  box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3);
+  border-radius: 0 13rpx 13rpx 0;
+  font-weight: 500;
+  z-index: 1;
+}
+.top-bg-img {
+  display: block;
+  width: 100%;
+  position: absolute;
+  left: 0;
+}
+.dot-list {
+  display: flex;
+  position: absolute;
+  right: 43rpx;
+  bottom: 15rpx;
+}
+.dot {
+  width: 11rpx;
+  height: 11rpx;
+  background: #FFFFFF;
+  opacity: 0.4;
+  border-radius: 50%;
+  margin-left: 8rpx;
+}
+.dot.active {
+  opacity: 1;
+}
+.sm-dot-list {
+  left: 0;
+  justify-content: center;
+  bottom: 11rpx;
+}
+.sm-dot-list .dot {
+  width: 7rpx;
+  height: 7rpx;
+}
+.sm-dot-list .dot:nth-child(1){
+  margin-left: 0;
+}
+.sm-dot-list .dot.active {
+  width: 20rpx;
+  height: 7rpx;
+  border-radius: 3rpx;
+}
+/* 弹窗广告 */
+.zzc{
+  background: gray;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  width:100%;
+  height: 100%;
+  z-index: 998;
+  filter: alpha(opacity=80);
+  opacity: 0.8 !important;
+}
+.alertavd{
+  width: 500rpx;
+  height: 700rpx;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-250rpx,-300rpx);
+  z-index: 999;
+
+}
+.alertsp{
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+}
+.fullavd{
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  width:100%;
+  height: 100%;
+  z-index: 1001;
+  background-color: #fff;
+  opacity: 1;
+  transition: all 1s;
+  
+}
+.fullsp{
+  width: 100%;
+  height: 100%;
+}
+.time{
+  width: 150rpx;
+  height: 60rpx;
+  background-color: #fff;
+  color: #000;
+  position: absolute;
+  left: 20rpx;
+  top: 120rpx;
+  border-radius:6rpx ;
+  text-align: center;
+  line-height: 60rpx;
+  z-index: 1002;
+}
+
+/* 元旦修改新增样式 */
+.xpth {
+  /* width: 697rpx; */
+  /* height: 462rpx; */
+  /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
+  border-radius: 20rpx;
+  padding: 22.67rpx 0 15.33rpx 0;
+  position: relative;
+  flex-direction: column;
+}
+/* 元旦修改新增样式 */
+.time-box {
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  /* color: #54504D; */
+  color: #000000;
+  display: flex;
+  align-items: center;
+  height: 37px;
+  margin-left: -50rpx;
+  z-index: 9;
+  flex-wrap: nowrap;
+}
+/* 元旦修改新增样式 */
+.xsth-time {
+  /* margin: 0 5rpx; */
+  /* width: 50rpx; */
+  /* height: 33rpx; */
+  width: 43rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  background: #4AB648;
+  /* background: #F9F1DB; */
+  /* border-radius: 5rpx; */
+  border-radius: 13rpx;
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  /* color: #D62828; */
+  color: white;
+  text-align: center;
+  /* line-height: 33rpx; */
+}
+.time-box text {
+  width: 18rpx;
+  text-align: center;
+}
+/* 元旦修改新增样式 */
+.xpth-left {
+  width: 393rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+/* 元旦修改新增样式 */
+.xsth-title {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  align-items: flex-end;
+  margin-bottom: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xsth-more {
+  margin-top: 19.33rpx;
+  font-size: 27rpx;
+  font-family: HYZhongYuan;
+  font-weight: normal;
+  color: #FFE7C0;
+}
+/* 元旦修改新增样式 */
+.xsth-more image {
+  margin-left: 14.67rpx;
+  width: 12.67rpx;
+  height: 22.67rpx;
+  vertical-align: middle;
+}
+/* 元旦修改新增样式 */
+.yanhua {
+  height: 104rpx;
+  width: 104rpx;
+  position: absolute;
+  right: 120rpx;
+  z-index: 999;
+}
+/* 元旦修改新增样式 */
+.xpth-product {
+  /* position: absolute; */
+  width: 697rpx;
+  height: 373rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  padding: 25rpx 15rpx;
+  box-sizing: border-box;
+  /* left: 0;
+  bottom: 15.33rpx;
+  /* width: 710rpx; */
+  display: flex;
+  justify-content: space-between; 
+}
+/* 元旦修改新增样式 */
+.xpth-banner {
+  /* width: 270rpx; */
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
+  /* background-size: 100% 100%; */
+  border-radius: 20rpx;
+  flex: 1;
+  margin-left: 15rpx;
+  /* padding: 4rpx;
+  background: #72674e;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  height: 319rpx;
+}
+.xpth-banner image {
+  /* width: 270rpx; */
+  flex: 1;
+  height: 319rpx;
+  border-radius: 20rpx;
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  /* border-radius: 20rpx; */
+}
+/* 元旦修改新增样式 */
+.xpth-item {
+  /* width: 413rpx;
+  height: 160rpx; */
+  /* background: #FFFFFF; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%; */
+  border-radius: 20rpx;
+  height: 153rpx;
+  background: #FFFFFF;
+  display: flex;
+  margin-bottom: 13rpx;
+  /* margin-bottom: 10rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
+  /* padding: 5rpx; */
+}
+.xpth-item:last-child {
+  margin-bottom: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item image {
+  /* width: 160rpx;
+  height: 160rpx;
+  background: #FFE7C0;
+  border-radius: 15rpx 0 0 15rpx; */
+  width: 157rpx;
+  height: 154rpx;
+  background: #72707D;
+  border-radius: 20rpx;
+  /* margin-right: 15.33rpx; */
+  flex-shrink: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-content {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  /* background: #FBECDE; */
+  padding-left: 15.33rpx;
+  border-radius: 0 15rpx 15rpx 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-title {
+  width: 230rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  margin-right: 18rpx;
+  /* height: 80rpx; */
+}
+.xpth-tag {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #E5A54A;
+}
+/* 元旦修改新增样式 */
+.xpth-item-bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-right: 13.33rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price {
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #D62828;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price::before {
+  content: "￥";
+  font-size: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-buy {
+  width: 111rpx;
+  height: 36rpx;
+  background: linear-gradient(180deg, #FF9B6A, #E63100);
+  border-radius: 18rpx;
+  font-size: 21rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFE7C0;
+  text-align: center;
+  line-height: 36rpx;
+}
+/* 元旦修改新增样式 */
+.new-pic {
+  width: 150rpx !important;
+  height: 218.67rpx !important;
+  margin-bottom: 26.67rpx;
+}
+
+.ggfw-list {
+  justify-content: space-around !important;
+}
+.ggfw {
+  width: auto;
+}
+.ggfw image{
+  margin-bottom: 16.67rpx;
+  width: 113.33rpx !important;
+  height: 113.33rpx !important;
+}
+
+.six-box-new {
+  width: 697rpx;
+  /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
+  border-radius: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 13.33rpx;
+  overflow: scroll;
+  margin-bottom: 53.33rpx;
+  z-index: 1;
+  position: relative;
+}
+
+.six-box-new image {
+  width: 440rpx;
+  height: 213.33rpx !important;
+  /* background: #FFE7C0; */
+  border-radius: 20rpx;
+  flex-shrink: 0;
+  margin-right: 13.33rpx;
+}
+/* 春节金刚区字体颜色样式更换 */
+.top-icon-text {
+  color: #54504D;
+}
+
+.rmtj-right {
+  /* width: 313.33rpx;
+  height: 154rpx; */
+  width: 240rpx;
+  height: 66rpx;
+  position: absolute;
+  right: -22rpx;
+  right: 0;
+  z-index: 2;
+  /* top: -20rpx; */
+}
+
+.Qtop{
+  width: 100%;
+}
+.Qtop img{
+  width: 100%;
+}
+.miao{
+  position: fixed;
+  top: 100rpx;
+  background: antiquewhite;
+  margin: 18rpx;
+  width: 129rpx;
+  height: 63rpx;
+  background: rgba(17, 17, 17, 0.1);
+  text-align: center;
+  border-radius: 13rpx;
+  line-height: 63rpx;
+}
+.topBox {
+    /* display: flex;
+    padding-top: 120rpx;
+    padding-left: 20rpx; */
+}
+.jumpBox {
+    color: #000;
+    background: rgba(255,255,255, 0.911);
+    display: flex;
+    align-items: center;
+    border-radius: 10rpx;
+    padding: 10rpx 20rpx;
+    position: fixed;
+    top: 150rpx;
+    left: 20rpx;
+}
+.time{
+  padding-right: 10rpx;
+}
+
+.muteImg {
+	width: 62rpx;
+	height: 62rpx;
+	position: absolute;
+	top: 194rpx;
+	right: 38rpx;
+}
+.logoImg {
+	width: 464.67rpx;
+	height: 342.67rpx;
+	position: absolute;
+	top: 406rpx;
+	left: 142rpx;
+}
+.btnImg {
+	width: 296.67rpx;
+	height: 79.33rpx;
+	position: absolute;
+	left: 226rpx;
+	bottom: 208rpx;
+}
+.playImg {
+	position: absolute;
+	width: 31.33rpx;
+	height: 38rpx;
+	left: 56.67rpx;
+	bottom: 64rpx;
+}
+
+.right-more {
+  width: 120rpx;
+  height: 47rpx;
+  background-color: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #078565;
+  text-align: center;
+  line-height: 47rpx;
+}
+
+.hdrlNavList {
+  display: flex;
+  margin: 28rpx 26.67rpx 10rpx;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+}
+.hdrlNav {
+  flex-shrink: 0;
+  /* width: 160rpx; */
+  padding: 0 20rpx;
+  height: 53rpx;
+  background: #F8FFDB;
+  border-radius: 13rpx;
+  font-size: 32rpx;
+  color: #078565;
+  text-align: center;
+  line-height: 53rpx;
+  margin-right: 14rpx;
+}
+.hdrlNavActive {
+  background-color: #078565;
+  font-size: 32rpx;
+  color: #FFFFFF;
+}
+.hdrlItem {
+  flex-shrink: 0;
+  padding: 26.67rpx 32rpx 26.67rpx 20rpx;
+  width: 593.33rpx;
+  display: flex;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.hdrlItem-img {
+  width: 280rpx;
+  height: 213rpx;
+  background: #8C8C8C;
+  border-radius: 13rpx;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+}
+.hdrlItem-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 213rpx;
+}
+.hdrlItem-title {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 15.33rpx;
+}
+.hdrlItem-date {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #000000;
+  margin-bottom: 19.33rpx;
+}
+
+.main-box {
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20240603/8ddceea4612d2cfb46d1a0203f4b55ac.png");
+  background-size: 100% 100%;
+  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
+  margin: 0 8rpx;
+}
+.main-box-top {
+  display: flex;
+  margin-bottom: 5.33rpx;
+}
+.gfyj,.sslk {
+  width: 369.33rpx;
+  height: 146rpx;
+  flex-shrink: 0;
+}
+.sslk {
+  margin-left: -48rpx;
+}
+
+.movieItem {
+  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+  flex-shrink: 0;
+}
+.movieItem-img {
+  width: 230rpx;
+  height: 230rpx;
+  border-radius: 18rpx;
+  margin-right: 18rpx;
+  flex-shrink: 0;
+}
+.ysz-box {
+    margin: 0 8rpx 15.33rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png");
+    padding: 43.33rpx 59rpx 46.67rpx 58rpx;
+    background-size: 100% 100%;
+}
+.ysz-more {
+    width: 333rpx;
+    height: 53rpx;
+    background: #FFFFFF;
+    border-radius: 27rpx;
+    margin: 38rpx auto 0;
+    text-align: center;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #078565;
+}
+.ysz-box2 {
+  padding: 20rpx 35rpx;
+}
+.tjbd-title {
+  width: 286.67rpx;
+  height: 80rpx;
+}
+
+.bd-box {
+  position: relative;
+  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
+  margin-left: 26.67rpx;
+  width: 582rpx;
+  /* height: 1133rpx; */
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  border-radius: 20rpx 80rpx 20rpx 20rpx;
+}
+.bd-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+  position: relative;
+}
+.zz {
+    width: 236.67rpx;
+    height: 206.67rpx;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 2;
+}
+.bd-type {
+  width: 167.33rpx;
+  height: 38.67rpx;
+}
+.bd-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #078565;
+  z-index: 9;
+  text-align: center;
+  line-height: 47rpx;
+}
+.bd-index {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #000000;
+}
+.bd-item {
+  margin-left: 45.33rpx;
+  width: 453rpx;
+  height: 147rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  display: flex;
+}
+.bd-item-img {
+    width: 147rpx;
+    height: 147rpx;
+    background: #D9D9D9;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.bd-item-content {
+    padding: 14rpx 29.33rpx 13.33rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.bd-item-title {
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+}
+.bd-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    width: 260rpx;
+}
+.bd-price {
+    font-size: 29.33rpx;
+    color: #F93434;
+    font-weight: bold;
+}
+.bd-price:after {
+  content:'起';
+  color: #999999;
+  font-size: 23rpx;
+  font-weight: 700;
+}
+.bd-price::before {
+  content:'￥';
+  font-size: 23rpx;
+}
+.bd-distance {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #999999;
+}
+
+.buyMovie {
+    width: 160rpx;
+    height: 56rpx;
+    background: #078565;
+    color: #fff;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 56rpx;
+}
+
+.bg1 {
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+}
+.bg2 {
+  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
+}
+.bg3 {
+  background: linear-gradient(180deg, #E0F7DC, #A0F292);
+}
+.bg4 {
+  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
+}
+
+.hdrlNavList::-webkit-scrollbar{
+  display:none;
+}
+.hdrlList::-webkit-scrollbar{
+  display:none;
+}
+.bottom-box::-webkit-scrollbar{
+  display:none;
+}
+.slide-box::-webkit-scrollbar{
+  display:none;
+}
+.pbservice::-webkit-scrollbar{
+  display:none;
+}
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}
\ No newline at end of file

From c89fac54ac43f161c05cb05ce2000020a4890a4a Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 7 Jun 2024 17:00:16 +0800
Subject: [PATCH 158/471] =?UTF-8?q?ui=E8=B0=83=E6=95=B4=E5=83=8F=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/newCalendar/index.wxss |  5 +--
 pages/index/index.wxml                 | 23 +++++++-------
 pages/index/index.wxss                 | 42 ++++++++++++++++++--------
 pages/list/activitynew/index.wxml      |  4 +--
 pages/list/activitynew/index.wxss      |  3 +-
 pages/list/scene/index.wxss            |  3 ++
 subPackages/indexs/index.wxml          | 23 +++++++-------
 subPackages/indexs/index.wxss          | 42 ++++++++++++++++++--------
 9 files changed, 94 insertions(+), 53 deletions(-)

diff --git a/app.js b/app.js
index 7338f14..00d0e3f 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.isTest118? true : false;
+      data.isTest = data.isTest119? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index afc1141..58585ab 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -11,17 +11,18 @@
     /* 节假日花样 */
     /* background-color: #FFD6B2; */
     margin: 0 auto;
-    padding: 37rpx 22rpx 40rpx;
+    padding: 37rpx 0 40rpx;
     /* 节假日花样 */
     background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png");
     background-size: 100% 100%;
-    width: 90%;
+    width: 100%;
     height: 65.67rpx
 }
 .change-date{
     display: flex;
     justify-content: space-between;
     align-items: center;
+    margin: 0 22rpx;
 }
 .change-date image{
     width: 50rpx;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index bd08211..4af909c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -42,9 +42,9 @@
     </view>
   </view>
   <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
-        <view style="background: #fff;width: 630rpx;display: flex;border-radius: 13rpx;">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
+        <view style="background: #fff;display: flex;border-radius: 13rpx;">
           <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
@@ -55,11 +55,11 @@
     </view>
   </view>
   <view wx:else>
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;">
-      <view class="movieItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
         <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
           <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;">
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
             <view>{{item.title}}</view>
             <view style="display: flex;justify-content: flex-end;">
               <view class="buyMovie">去购票 ></view>
@@ -70,10 +70,11 @@
     </view>
   </view>
   <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box">
+  <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoPath" data-path="/pages/pbService/sceneComfort/index" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
       <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
@@ -145,8 +146,8 @@
     <image style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}">
-      <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;justify-content: space-between;">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;justify-content: space-between;">
         <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
           <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
           <view>安全服务</view>
@@ -190,7 +191,7 @@
   <!-- 推荐榜单 -->
   <image class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
   <!-- 4个产品榜单 -->
- <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box">
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
     <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
     <view class="bd-top">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 330a3d1..e25c5f0 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -105,6 +105,7 @@ page {
 }
 .content {
   /* margin: 0 25rpx; */
+  margin-top: 20.67rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -306,12 +307,15 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  width: 100%;
+  /* width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap;
+  flex-wrap: wrap; */
+    display: flex;
+    justify-content: space-between;
+    margin: 0 28rpx;
 }
 .title-more {
   font-size: 24rpx;
@@ -1030,9 +1034,9 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 150rpx !important;
-  height: 218.67rpx !important;
-  margin-bottom: 26.67rpx;
+  width: 160rpx !important;
+  height: 255rpx !important;
+  /* margin-bottom: 26.67rpx; */
 }
 
 .ggfw-list {
@@ -1191,8 +1195,8 @@ page {
 }
 .hdrlItem {
   flex-shrink: 0;
-  padding: 26.67rpx 32rpx 26.67rpx 20rpx;
-  width: 593.33rpx;
+  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
+  /* width: 593.33rpx; */
   display: flex;
   background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
   background-size: 100% 100%;
@@ -1248,10 +1252,11 @@ page {
   background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
   background-size: 100% 100%;
   flex-shrink: 0;
+  height: 206.67rpx;
 }
 .movieItem-img {
-  width: 230rpx;
-  height: 230rpx;
+  width: 213rpx;
+  height: 213rpx;
   border-radius: 18rpx;
   margin-right: 18rpx;
   flex-shrink: 0;
@@ -1259,15 +1264,18 @@ page {
 .ysz-box {
     margin: 0 8rpx 15.33rpx;
     background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png");
-    padding: 43.33rpx 59rpx 46.67rpx 58rpx;
+    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
     background-size: 100% 100%;
+    width: 733.33rpx;
+    height: 320rpx;
+    padding-top: 33.33rpx;
 }
 .ysz-more {
     width: 333rpx;
     height: 53rpx;
     background: #FFFFFF;
     border-radius: 27rpx;
-    margin: 38rpx auto 0;
+    margin: 23rpx auto 0;
     text-align: center;
     line-height: 53rpx;
     font-weight: 500;
@@ -1275,7 +1283,8 @@ page {
     color: #078565;
 }
 .ysz-box2 {
-  padding: 20rpx 35rpx;
+  /* padding: 20rpx 35rpx; */
+  padding-top: 23.33rpx;
 }
 .tjbd-title {
   width: 286.67rpx;
@@ -1424,4 +1433,13 @@ page {
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 3;
   overflow: hidden;
+}
+.public-box {
+  width: 593.33rpx;
+  height: 266.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.one::-webkit-scrollbar{
+  display:none;
 }
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 77950e4..75166f8 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -91,7 +91,7 @@
     <view bindtap="changeMovieType" data-type='2' class="movie-type {{movieType==2?'active':''}}">影院</view>
     <!-- <view bindtap="changeMovieType" data-type='3' class="movie-type {{movieType==3?'active':''}}">即将上映</view> -->
   </view>
-  <view class="sort-box" wx:if="{{type==4 && movieType==2}}">
+  <view class="sort-box" wx:if="{{type==4 && movieType==2}}" style="background: #0B898E;">
     <picker class="m-sort" mode="selector" value="{{movieArea}}" range="{{movieAreas}}" range-key="area_title" bindchange="setCity">
       <view class="m-picker">
         <view class="active">{{movieAreas[movieArea].area_title}}</view>
@@ -134,7 +134,7 @@
       </view>
     </view>
   </view>
-  <view wx:if="{{list.length>0 && type==4 && movieType==2}}">
+  <view wx:if="{{list.length>0 && type==4 && movieType==2}}" style="background: #0B898E;">
     <view bindtap="gotoDetail"  data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
       <view class="activity-info" style="height:160rpx;width:500rpx">
         <view class="activity-title textOver2">{{item.title}}</view>
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 45fe3b4..c8bd90f 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -132,8 +132,7 @@ background: rgba(11, 137, 142, .1);
 .activity-list {
   width: 697rpx;
   /* padding: 0 24rpx; */
-  /* background: #0B898E; */
-  background: #FFFFFF;
+  background: #0B898E;
   min-height:1300rpx;
   margin: 0 auto;
 }
diff --git a/pages/list/scene/index.wxss b/pages/list/scene/index.wxss
index 41ba0b2..d645bf1 100644
--- a/pages/list/scene/index.wxss
+++ b/pages/list/scene/index.wxss
@@ -141,6 +141,9 @@
     overflow-x: scroll;
     flex-wrap: nowrap;
 }
+.navBox::-webkit-scrollbar{
+  display:none;
+}
 
 .nav {
     display: flex;
diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml
index bd08211..4af909c 100644
--- a/subPackages/indexs/index.wxml
+++ b/subPackages/indexs/index.wxml
@@ -42,9 +42,9 @@
     </view>
   </view>
   <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
-        <view style="background: #fff;width: 630rpx;display: flex;border-radius: 13rpx;">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
+        <view style="background: #fff;display: flex;border-radius: 13rpx;">
           <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
@@ -55,11 +55,11 @@
     </view>
   </view>
   <view wx:else>
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;">
-      <view class="movieItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
         <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
           <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;">
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
             <view>{{item.title}}</view>
             <view style="display: flex;justify-content: flex-end;">
               <view class="buyMovie">去购票 ></view>
@@ -70,10 +70,11 @@
     </view>
   </view>
   <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box">
+  <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoPath" data-path="/pages/pbService/sceneComfort/index" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
       <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
@@ -145,8 +146,8 @@
     <image style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}">
-      <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;justify-content: space-between;">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;justify-content: space-between;">
         <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
           <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
           <view>安全服务</view>
@@ -190,7 +191,7 @@
   <!-- 推荐榜单 -->
   <image class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
   <!-- 4个产品榜单 -->
- <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box">
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
     <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
     <view class="bd-top">
diff --git a/subPackages/indexs/index.wxss b/subPackages/indexs/index.wxss
index 330a3d1..e25c5f0 100644
--- a/subPackages/indexs/index.wxss
+++ b/subPackages/indexs/index.wxss
@@ -105,6 +105,7 @@ page {
 }
 .content {
   /* margin: 0 25rpx; */
+  margin-top: 20.67rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -306,12 +307,15 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  width: 100%;
+  /* width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap;
+  flex-wrap: wrap; */
+    display: flex;
+    justify-content: space-between;
+    margin: 0 28rpx;
 }
 .title-more {
   font-size: 24rpx;
@@ -1030,9 +1034,9 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 150rpx !important;
-  height: 218.67rpx !important;
-  margin-bottom: 26.67rpx;
+  width: 160rpx !important;
+  height: 255rpx !important;
+  /* margin-bottom: 26.67rpx; */
 }
 
 .ggfw-list {
@@ -1191,8 +1195,8 @@ page {
 }
 .hdrlItem {
   flex-shrink: 0;
-  padding: 26.67rpx 32rpx 26.67rpx 20rpx;
-  width: 593.33rpx;
+  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
+  /* width: 593.33rpx; */
   display: flex;
   background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
   background-size: 100% 100%;
@@ -1248,10 +1252,11 @@ page {
   background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
   background-size: 100% 100%;
   flex-shrink: 0;
+  height: 206.67rpx;
 }
 .movieItem-img {
-  width: 230rpx;
-  height: 230rpx;
+  width: 213rpx;
+  height: 213rpx;
   border-radius: 18rpx;
   margin-right: 18rpx;
   flex-shrink: 0;
@@ -1259,15 +1264,18 @@ page {
 .ysz-box {
     margin: 0 8rpx 15.33rpx;
     background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png");
-    padding: 43.33rpx 59rpx 46.67rpx 58rpx;
+    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
     background-size: 100% 100%;
+    width: 733.33rpx;
+    height: 320rpx;
+    padding-top: 33.33rpx;
 }
 .ysz-more {
     width: 333rpx;
     height: 53rpx;
     background: #FFFFFF;
     border-radius: 27rpx;
-    margin: 38rpx auto 0;
+    margin: 23rpx auto 0;
     text-align: center;
     line-height: 53rpx;
     font-weight: 500;
@@ -1275,7 +1283,8 @@ page {
     color: #078565;
 }
 .ysz-box2 {
-  padding: 20rpx 35rpx;
+  /* padding: 20rpx 35rpx; */
+  padding-top: 23.33rpx;
 }
 .tjbd-title {
   width: 286.67rpx;
@@ -1424,4 +1433,13 @@ page {
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 3;
   overflow: hidden;
+}
+.public-box {
+  width: 593.33rpx;
+  height: 266.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.one::-webkit-scrollbar{
+  display:none;
 }
\ No newline at end of file

From 057dc3a56b3ccda5682025eda1a7181f62f40cb2 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 11 Jun 2024 15:11:41 +0800
Subject: [PATCH 159/471] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=87=BA=E8=A1=8C?=
 =?UTF-8?q?=E8=A7=84=E5=88=92=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=99=AF=E7=82=B9=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      | 2 +-
 pages/list/scene/index.js                   | 2 +-
 pages/user/order/list.wxml                  | 2 +-
 pages/user/order/museumOrderInfo/index.wxml | 2 +-
 pages/user/order/sceneOrderInfo/index.wxml  | 4 ++--
 pages/user/order/team/list.wxml             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 00d0e3f..aa78b14 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.isTest119? true : false;
+      data.isTest = data.isTest120? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 0938434..5c66ea3 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -16,7 +16,7 @@ Page({
     navList:[
       {
         id:4,
-        name:'全部',
+        name:'全部景点',
         icon:'/uploads/20240604/4ac6b939e112ff183aadb95efbf07761.png'
       }
     ],
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index ac9f677..172840c 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -39,7 +39,7 @@
   </view>
   <!-- <view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">￥{{item.total_money/100}}</text></view> -->
   <view class="btns">
-    <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view>
+    <!-- <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view> -->
     <view class="btn" wx:if="{{item.order_product_list.length==1}}" catchtap="order" data-item="{{item}}">再次购买</view>
     <!-- <view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view> -->
     <view catchtap="cancel" data-index="{{index}}" class="btn" wx:if="{{item.state=='UNPAID'}}">取消预订</view>
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 6fd5664..761d612 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -45,7 +45,7 @@
     <view class="price">{{info.paid_money/100}}</view>
   </view>
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view>
+    <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <navigator url="/pages/info/museumInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index f80ffa2..0642c0e 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -51,7 +51,7 @@
   <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
-    <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view>
+    <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
     <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
@@ -125,7 +125,7 @@
         </view>
         <rich-text wx:if="{{sysm2}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
       </view>
-      <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view>
+      <!-- <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view> -->
     </view>
   </view>
 </view>
diff --git a/pages/user/order/team/list.wxml b/pages/user/order/team/list.wxml
index 7a3f7ce..4d5100f 100644
--- a/pages/user/order/team/list.wxml
+++ b/pages/user/order/team/list.wxml
@@ -36,7 +36,7 @@
   </view>
   <!-- <view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">￥{{item.total_money/100}}</text></view> -->
   <view class="btns">
-    <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view>
+    <!-- <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view> -->
     <view class="btn" catchtap="order" data-item="{{item}}">再次购买</view>
     <view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view>
     <view catchtap="cancel" data-index="{{index}}" class="btn" wx:if="{{item.state=='UNPAID'}}">取消预订</view>

From c13a01f8ddeb2e26d16803e779a1021c8b5b5cab Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 17 Jun 2024 14:21:46 +0800
Subject: [PATCH 160/471] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=A4=8F=E5=AD=A3?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |   2 +-
 app.json               |   8 +-
 images/index-selds.png | Bin 13086 -> 0 bytes
 images/index_seld.png  | Bin 0 -> 15587 bytes
 images/map_seld.png    | Bin 0 -> 24650 bytes
 images/my-selds.png    | Bin 13301 -> 0 bytes
 images/tuyou-selds.png | Bin 19434 -> 0 bytes
 images/user_seld.png   | Bin 0 -> 17562 bytes
 pages/index/index.js   | 748 ++++++++++++++-------------------------
 pages/index/index.wxml | 772 ++++++++++++++++++++++++++++++-----------
 pages/index/index.wxss | 432 +++++------------------
 11 files changed, 928 insertions(+), 1034 deletions(-)
 delete mode 100644 images/index-selds.png
 create mode 100644 images/index_seld.png
 create mode 100644 images/map_seld.png
 delete mode 100644 images/my-selds.png
 delete mode 100644 images/tuyou-selds.png
 create mode 100644 images/user_seld.png

diff --git a/app.js b/app.js
index aa78b14..3034935 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.isTest120? true : false;
+      data.isTest = data.isTest121? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index e5d7717..fa14c57 100644
--- a/app.json
+++ b/app.json
@@ -219,26 +219,26 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999",
-    "selectedColor": "#3FB87F",
+    "selectedColor": "#4285F4",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/index-selds_1.png",
+        "selectedIconPath": "/images/index_seld.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/tuyou-selds_1.png",
+        "selectedIconPath": "/images/map_seld.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/my-selds_1.png",
+        "selectedIconPath": "/images/user_seld.png",
         "text": "我的"
       }
     ]
diff --git a/images/index-selds.png b/images/index-selds.png
deleted file mode 100644
index 496bc7e345d90815405bb42f3d1cfd647fee6909..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13086
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%0Dh2t)~OAVFiSK(sU
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
KiAphpfd2z5Q^+v@

diff --git a/images/index_seld.png b/images/index_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d23814bf67b118d963ceec7cdd209155caa250
GIT binary patch
literal 15587
zcmcIrWm6pA)7@QI+}+(>f;&NjLvVL@_r;yy7M$Sj4vPj05?lg{g#-x}EZCo4J)hxu
zF>|Y?W~S%P?LO6g?&&ynRe5w25)=RcfUc+@qxm*A{dXWCyqz064@}+$pr@w1G@xOY
z>^A^F1yGcc`sinJ*6*KTbQsL=^t2sVTO)9WL`RKEH#&fXMN~h(L5O80auIw)$B1mH
z7Nokz)%=x6Brf<}s1-x{q~MNUUyxP)+Wx+k#l<j9b$OP7!#qMP0z5%N3RZ%Cn-cqt
zruN;y+^@Usn&X<|W1Y?=2k*{fipTky9`EeC;6LZ$=hvI?hxMYM2tRl$EYrY;@6)sp
z9>_Em(GsmX!bNf6z|~kb&}bZ5OcBNdLA?2!$vJ=q<3T{ULCOG%R#i3zU0MUOxw)$3
zi_u_GV!?+AoN!%<VNzlsYe3QAU$G0p{s>EKrLS1EcJf=OyHOPI?2;@9hSpex$~0o4
z9gN;z6SNjtb>qdRwX#AB1^#;qOjaQ=z9yT!TS^yxVm|YZ+68aIZ+>NdIG&qPAq0u^
z509Kr@wc5H7yd#)1eI*BZFcZe0C7|WHlsOg$$uO30lZ)yrHSA046)qE2H{!GkY_+j
zHoTwC_g&Q8)cZf<F<+k9R1IJ3*Fi<>2u!?`^0IZpe9NC6JxBL2Bwgr)WFfm;<MRe7
zU$Eqn`e-wBfvxD_&K)?Ee6y?(_fED_p{5;BTdw%kGmD@n#;)kLYjb~2yM`z;G&V8F
zI65mad9M2GXLxtKgK3&8tGsQ`3gkx;-4AXEm7K3%oWkbF;8+XIwRw`6sUzqiY^4*n
zvNKFX5FpS1?CgT8A)4?VnX0V_<q|~YX!b4368BPd(K${0x|aF1#VIT>EX>+5$4;QS
zdi=f}?ZKZYmt#E9ZJZyim7sG!R-a0X+ez|=`~ef>8)RvS_v9=j=;P1P{+!4wnm=fW
z3GYxz+#<ds7;Lkr7*g3JmZ6}0jIj_dmcx@yav!JhU9*fW2R9cTu#V@nS3{lrIG`?~
zOu39Ow8nGLv;I2h&TP+C{Kec_``cJL_8sA{2RAjZWFodDl#2G`SV6AX8COA5gUyOQ
z%r6?%HjC^7<Hu5HC1?ONZ3`MLtZ#t!dQbm2pEBf>d-Ie<w3WZvM5Nw$S_OyTY&eh4
zvE6H7d^2~7>QcGzR-6+fkV`;dwVsi3F-vEY)_Z5sc?7%@ym)qtnGK?u=mWQ>hC0>1
zpnhxo(#IhWlMd{z?-2!<7a`Iv2weP1*dA>|eoazUS-zZMNz$jl6s!vy169OBmdq6t
z0zVWhC8Z&3fQqzub=JK)q~BGPsd`&wKdRSv9puY>hbcOH|B~9phESVf&JE3_8W-Lu
z&e9cXB#LE0GtYtV&ZaRmYtBRS9T{a!M0cfjBV_VL;nonv^+Xl=n(h6Icf|D!2ojNO
zWk8Ggwp=vsyDDZ>fh*?EHVxq5{xExmp{7bOrwe=DW?nyOg(L#K-F5J$%!rW=jX|5g
znmI6BuY1a`6wes`HK*q|IR_9V>7%f=0zweJ;7vOn|Aol%f<G&29TB$<@IhlXDKk0>
zmG`3h)QF+<HiJI6joe`ch*uPceGtLf&E0&e(Q7D`GO88j<k4ucRFLatRoVUDI5e>O
zdVM*c(4^9R=g7t(Bo}<;L0c#|Z&N_-Cd@7C1{hTZuK15PswE8@CS6a>CjX(B=Yd?y
z$%{D=QbOs{J5Z^OK&-8q*YVkv{E}M<MJotYcT)Cn%@lk6cC42n+%UXR^LcS<*>hFP
z<`gbZcrwf!8AQg}d1RJ;u1DY>c<lmMt3BCT>+{fD2D>{U69=522-laHomgh1#cP=v
zu{MtwB3{+O*=ltCV+Z22D`4biq#pVG_BBH?W^Y^87q)vohQ%+o@0-X7J}5GTvow2m
z6%@3-r{|xxgztoFnYHu?KD@*|m$*Jet|#Qt{&l=P4G`z!VO4BB6EY(BGQ6SHcrh2|
zAp&tf2F+?98n;%{V~hYYKEVeOTpUl{vLjdD|MepIGnM&nPHp5%hRR&ISsWHGpqs1|
zM{ebrtYGdEb%-0(2;E?0|DI&2^6d{BA2VFHB|L{8;KX7YH9g(#`GL!(S#Oq_OEoby
zKV8~BBEeSuVh;|$8DE1wzG)KA?*--(%NB~Bj@%^!T-$LQLKV3}`ra4Jo7&D2M#m@&
zz&Bx76j~dep0#XtyLoZ?0XU836s?X`hXW<4c$qw!1M6)I@RIojZ=~Re#Ul?BAiB0%
zc1}-Z+q!}4tO*KJd$w-=Jz{)XiELml!i?!9RC02r#~7gf%?JTXXHJTD;Y1I1$kQ|9
z)Uk}q1g9N<b8TLHEV@ER^p&DHU&<^f?5lF~iPugnKh_q_o^w<60Rfrf(;wyf5{DW2
zzJpP&j7_mA4-~Iv!S#ZfF*U0q<W8fHm^;+eK50JWVy!PU*R!A1ME!!-*WF73_C6ko
z38Q2iM7|+3eyWI+k)|Z+((y3?i_{n*s82HB1hn^{WYB!)^ib7PCExc687I<{{Ztxz
z2I$T_`q2xbM`J3F$K{0ut?jWxOAWXko&5Pj<uK|;6!H8YyNF0n;=D)TEY6PdeA9LK
z8UnbfotjMod;q51KITfQe@tIn&2HG<cwO}AjvKR~X`5D@#hRc4a96S9U;0%En;QeL
zKEe47#a4GVoj62~-HEkIbJ%(Bg_mO0z&m}8Q_?~@e}@xB2#w5F62K)Pmd)+v;su}U
z5H*S;yyF+xFB88@PUU$-4jQ+0=#cl;e{Z~^MTO%Dd~YS^?~|qXo_pD{Qwv_rpp=_<
z^Yu2W4%d_mFuQ;d?OUA)o-zg*v6z%>V6nrbtxGB2&(jgqqK(v-8SLAtkoFjzim9Hf
zwyDLh=ZLFcBh`BCd2oje_eegl#d<nSVB>I(C=^6GIVp{9pI#%@>as3gcV2_xU=Qeh
zABkq^E~u&~_;b~NQ6wL*&UcU8M%aPAY@>ebxlvh5@HC#2B4-{Pr$g8!$1%`m{Nsfx
z0_~zNI3B@ZB(5iNYKQs^uat=Ob5OXh>%PY98_ZH>%+BR<A_3&{2|ex4#3CE+g*41~
zr1&)CWMxRDSwY})eocOOv_h3n$%CE2I<N4{f(7^cw@S#o#xhy5IHVQv+=ZHPv8pmu
zKB2fV$d5g-owI}uYUSb^%lGpKs4Ui@c5pcvvM1byI4cGdnmE^O7qNbOha$}R+KaMj
z-x02?zv=S6Gu*~K-Cms2$7yH%ZRxNn$bG2~VuK$sIPxK=_QKA8!1=s?N+QbHsNqCz
z&%Y~kT0bt4o__R|;`UWP<{gA^xl_4`fg3gDQ6ZOgTnO#mHq}1OY+o9CJ<{^YGJFo-
zN}k+D%ejY{<f>;O#sGzCOKYJ~_EQeT)CoUrkIM;-y@Ge?b~v;r{qI&QYApjvDEqi1
zMXi8Fy>a_k7RmG5oEhC51iBggR%BrP4XjD67<hF|L$O%&!kD|0?1_iN^e;;<s2n#~
zvs9-RNH)ms^wgJ53<_4~WCiLA^~70&_*07v8A<q3r%AR0qJQZ-s1eOFr#fbbyCmOj
zOMZ0DafK@Gky<XUoBf?}W=(Aq1q`Xa*T*NhCd2i63^Le$%5Fj+c77mch;DX^))T>m
z6+n~;_O%H{Rjqj6*NMqFn&M9x5Un35Iq5!A79Js9lC{QDBf{t%g~YAhdSjo(I@1Wd
z*+$$&>>@lhyL`{h^?DcKj<N4_lY~){?n&H!pG}8s3v(l%`!pMUNHqXx6$sWj_88I0
zad>bbUx4RpTVV!h?!w$(0HT8>H=0!9s4IpDYrOzv(CA$D^p%ARCLBqQ<qByY!v6k`
zYgN*oCLNBk$q_$$%t|F9HgE>cE(<rq&v+!8<+xu%OZ307A-!zY{Y3h!K7Ow!n}huC
zBKBesAbe(hKtjW4PZ@hS87&wiae-MjBv-%A`tQfeYlFwUSbfrs3!#r=AtLH_?{!^`
zz?Zun9q!|PylmCnWHnXF;R=~rj2;z&v~9Ao;84^Sj1nj1sY`**5cktK&nLO_yAe#}
zH!y@M!FGKr&VuKmWH1&&P%bLoxjHEl8Q~SaUmaZcLiXAw-11eH^hjywUL+LL6*0V5
zO~}9|&I~0sz6xL%t!C#<Wt-=omXaN{1%P)<a|*Vt3iF$X^BZF@@k-0FuItav=moGG
zC3R2Ejq`W)Sdqv<$^f4eC;rXn{PV)Ubt#~Ym}O!ASDA&(UwB_<-K4ivYv<0FNat~v
zf3wEi-K4JKmmTJxM?o6BG3<f`m($`$K5h_^OW=bnLjcJ?b>Os`7PH=JAfEOj%Iak@
zvWCjdjcyYuXLUkJ(mm$pxJsg`i2+AIk8EHC^j@3ekNDhr39%AdgpCRw{g-6(E@o!~
zA9Q>rQ9EFtA2}yR&=%STVx$M*Bx@;7N_S76h6Bcr-Zo<BNo1Y;hG_pFy6dgAg4H1I
z;0*FIPE7Nt*P7&yS(JlnfM}(v)k6qFL+(n2b^+FqLG<=UM%>x<zp<gaTV{$ADP&ln
zz(tx)1aV3GG`uG2^d#0K-oo_9gpU-z`bGpXHnL^DY%@6vMpN&XYZmyO44NBZMRr0r
z=q>y!0jrYA(wT7>s$^ieFj0gFQab)vzLT2YgTiYC<PoUQFKnBM32F8-RP{Eu9P_d4
ztLZelcATV$f3DW@^SxM%?dp#n(5nS~FudAJI#-OOw(hlz*wUWr=4WEufOR$^Wfc*)
zw#Ps_Yw8Q4y5I<?0W~R(cIIIHBiw?(Qt=i7KIBOJYqJT;BKWqDsW5w0TE;ZD8*Iox
zr)gTsPGySgR!`VsVqB}XBXDn;Yh2=VIp^mtth|ko&^s18j%$isCA=H-Ew{+p^K=bm
zqSm53OiqW9#ljU`2Mdz~u<Ej>5Sc>_6_YmZQg0<-L4lqe(B2)3N^Pvd+w{AB+xUp$
zDiETYjQ#<4F(IMhd2-UdIP^0Xi3qnYq!w816%+gGBLn((`uGk&kd|2?waWYN*QS(-
z`F`pEzafNV?1)Y2gfS2Y$iJLO3tL-qt|%w=2>F0rse$^e;={kjWp>KG#t9Rc?z!>L
zmp<?OqFV{p41<#Ta@Ys%koJUv2~QuZrMPsGc;;|#b31+=oySIWekD;Dunq=xOOJXE
z2aq7TSxYHa82v!7)i#j&6Fw0T|A4-~#<wKsss<1{vF#Hq{IKl+DX(NP;lMf`Zcr#t
zFOhydYLRV@fC|qW?(ZHLk`9O(q{}0Y@fQQ@@>en4diBs5y@b#40W4)al@D2~{y#FV
z|17<u3e(4B+#WDvbH!eI*W<DK$(>t;D+wvP3$dtcw*2&{7B`n<3`D_rnMH7fFw>K9
zG$^X~YZL(HD)+%1N8&cFGxn+h9Soy6S6S#Okd}fLJBU*{;f=n|yAbhC?Oe)8lmpQ}
z@|IH#Tr)Cq#y4N_Q|SRLsN<MH#49DLGWlzYV_Dzu{I%Gd^)}5mSxg+Cj-jRkXbS%=
zp{%qru4A^8x5<@UmkqOQ)+&8GH8UQ%K{X+_x0FaoAT`@sz(3f`^AWD4WnC8-Ejxlk
z<1fqn&FRE)!Gw+)b}_z=i3I*+XI#nPRK=43f^aM%86>-Y_u>|13uEn&VKfM(BD}^v
zs~Ek+IpU&|rUhtksLMV4dUo91fNAJIO&T^PA?)tHk?;dlC0ufbk^iLkBTBd=N^_fF
z*MYP&Y%;z8j(8Lf1<I270Cd3^;{aJTW3&-zo%MZq;8Dl3_emS2z-~2&jc!73%wTt2
zoja?eEa(z6XK^L8JWB1*F%oSSVDkWY*D>Y`V}CKE_9KS|kc7fnzRZrtATSgVaRGEL
zG~Mc(Z$m7FC^Jr&s%D~)Z7c)G^Gc%5wrLj3>_c+7{G8_ze*WF>m0pgE?>P9zrH7Uf
z1!#=0gNB+g+32vZ2=W)lA>6cu80Wo^8oqeJ`hOt6Lynw&R{5cHrudXByo|t>siI}y
zvEy#0)aE+k_cc1|hoZKU;Ln@=r9S`i3pL+y0QOVKa6J02E1pHFT|nAll0~A@`X`b#
z85i5^W|_e7EZ32oB&?Oz`u^(6+A@SCy&_wHR#x3um5)Tu&o~K6BtqmvgIMB1RJlpL
z?J8)SGtlaj`U-LB0ACbgCx-c*n<=E@nwzQpQvuO_?v$Zj#KVW>Ha`@q5zmh_gXlzO
ziYPn6+TZN@BiB-{(i)u}7E|GD3fxVAeOB!9mCA0kLAu1jh3XYT8^w0sCLM_<yrt;W
zu>zwO{jvI)NX?!%VsPh~J}#20ck;$p`}<`PT;fSfJ-8l(Ugq*T^5wr;v4e9vEHe1R
zU6E!gxRk}%N22@1)des8;V$;P>o9P;GE0n0nVmr<aAsCgVfK@KQ+3M(4Xy=O8T_$k
z?S5<PP3jnT&uu1p@^!&=4>aaZd6ERcI`CltfNyp%b<i$3U#>p#G&<6et_?lY<Qr=(
zB7jkx6EI+j9;3_X_Ws}}TD#B44Hj{3x_3*P)JcloCc>UEmSelHzvyVPx038;YgVT?
zQ5bmVi0Fjg6?elQYoYkQR(1xdGn#ekv`K2dVz(NhWt+w+wsKf^CD?h?zaSw5@#2)7
zjKFbhxv=?8Qzj5==fG>*Vgu$NNsTw*qU3_d{fSY!FQB9+<`Gb9Okpu}_xWoqVQ=b8
z$8shqPjXqG`b?E>EP{I61%A1QIo66l_rUf==I+s%^I9Xo<W@AMvjD16SZP4FJnh2{
z!PelrN><I`;ALu?^55}Nflt!Mr!`?W-1daGWVgKe#5kVgb?D7CL_<vou*p+e_r3nE
zvA|SQi|v57>GEA1b<Nwp@!!}ree(?|gs|ZV$+4JB$<ja5QzarN)urU;hPn)DN8-jj
z#-14P7`b(Y$Z4}l0YN2lNho|>Na8e~l7ckTY|jSeCu(yB$wMUq!)6>!t*T5iopvPN
zC~0E*NwDFMwm*)~YG?nzP?YWY5kBeO*aHxDH~n}2c2+f$Yo|(CVTHkZRg~tR_N04<
z<M<xG^5;w*;9cPHM%_PmVGmm`3F5&5CN=v?XE4$f7dpR;wPsy?Osih)xZ`CMKLRxT
z7)4Pu&%4(VlQ^c)VHIVd`KZ5999HczltnN_kw%K#%hDFI`17#zhyRqJL^3pu($kA&
zIiyU`mE6nS7j6REEw05Mj6*BgiQ9rWz7p3?>NGsCb$__~Y~wb|3?V$X^8V-ckHp-G
z0?R?A(VmLK18!HRn|KfF21%#-G}xeKws&^Cx!>Jn{pyz11yxo15jQ#G=k4#kZo2RX
zsz%)XPhRbrt+?`Ge&R$G>39Ro1f*0x{VMC(q=VwhsIEsJFbiuR1#JN)mpHW>25wR9
zKHcgB-#vN&w7(o4d?5n71P1)Jlwof~8|Ma_$%aYR)a-Kp-F;X4D>QYWZAWs4jmCH<
z*}i-^&S_&H82un1#j$22Z?*8@U$=nd5j@nvf26ESbzjZ?ef_TYdn^BIy9k0W*JWvH
zR6Y@QRNcZ&+X>bi^OlJP*W^b}DP<PsZUt**sf%ac&omXnS1Z=63&(q#)wp>~J%~Ca
z_R3<5afGCE+_8^j(3<P<xLRcrUwu*zg4Ev-CO?t*v+5Z3?|6$;;)(Hdxx#*HMz>Ag
zNt4z)fsEM6`Nx4@Vdc2;U?Q;YpKs5dZ@25+Fm;f}$l`}@NXR*qD{RMiAFY|*cgoAH
z#ZTF<jEKUqAs&2y)KGb6Ni1K&4|u*+wQzPTk5WC=FDHD6+M<6Rhyw>~i$H$2T4Xx<
zQPp8<4;EeOOhw**cI!6O-B25{&P<e?!gDJ7d`|7U)Nb#dzH?@XsnG)(B4=LEYAlsa
zETnn2GI5*2&etVJ@9D#^tC)U=q2;_A@C{d>M1GF=%4?ix6c)Rk2x~ca_nU%WjqoA1
zJHqahirt;zJX%imD%R)eRm0a`&+oWp{ug9@Ju)&oY0)<asOt}nDNvsr%N#akdnW)~
z`ngW-@E(sMw_357JZz>Fug-#mlYg7N=+;Iu=4pV{o*-F5nC+rw9Oab0@Mc`Yii|iJ
zhdZ;$T=~QxAxFV)iQSc7krmH!tR=~+HI^(g_1UUPBIOva9$HetsnjE|U*%OwgKy+2
z_N{qeG-VN>0jFK1Dnpn7e`t)_fLkUz8c`8FSoPZzZkh4T(a>sDbu4+tR!AmrqWe@}
zdA6U!H_#W77{FJ+NxAo}97xUWXxq|6DxrzZ$HmV1l-aDZ2XabA%uqjIG;SRNJqIM4
zb;iU>rL~Av37<!{MFoP3wa{=!8Troj9_pC+#?5T6$Qj;ul2L1)3B<H*yeNeQiH(vP
zZ~4h3YB6d8c65YGjx}d=`rp-pV{~rK7bjW~nvVP2VONr^F=bT@<>-WQM4YR$ERIwk
zAxLN3di-I2GXmSKH%bSRu60oLolc*_0hG|Eu7urdpW!XV1flsp$=L90i&h_gUhfB)
z;^O<a34Rh!tm#S+rV#H4&yKSDl5<v#+x)|ja+zdU?5GN5uej#S0IrgQ9e;uyP{y@p
z1d_%R*<~?YcgvRKpWhJP-(MbR8?^<Sfg6u@S>SWtN8ed_ZM(ZD=8?Cb79RrwP|RxZ
z*Q6&xMP4X;{@(KOzilWybL*gIFCA#9hKb0uO_ppS>}e(`&KtEG#ac4o8UPOZLJwXN
z?Hb$74Ui7Y&LKe*DSY978@3S+1mnIr_C~L?d+ITz{Kg`t;A7&9FECp}nKA(ipz66w
z_x8V}ng?5S%@Vx@U7=tYv)ri>a`#&N43>ov-Sy99m)NZlY}o|13-d5147i8S<A-*_
zy0wc#2wp08_W3#aAh!-|wwO%fjW6T$`aNG(Xn-X|qm^K{7}-PvP6bq%Ym|}Y;-$(O
z1CtZyg_FQn)|mFuO_!z=1MF?MdcXl)s<N97o<<Jyrqd>Hz1Eo=Z}g(ZXGSbK!d8iK
z775BrX={B`wRE_0-`-;eXJrF)o+xF+?DGe#P~gvv+`TORqV;p9>S!0Hgbm&?V>k-s
z_azYAg|ldzlaU2n=ZilO>ck6M?F5LesVOT9Ik18ov9FZolva}{jIVuMk1TIP51VA_
z&J4IWrn0BvTs^Y%bbX?laZzjzN6)d=K(OED6rT&lr=yG;fpzHBQC%BIKe3EJ)4u@>
zJ*XT~q#l;JXNklc1W2YhbB{j1gnXM>#0md)>~ZU~Q+vz)TAu^jbf<L2Us^1Xl){?|
zDqRR$?!Dvp4LVc!H&cyv_!YOKrR2}<HlcLgb4(d+aN|D`(h5SX(o`n_IHCen;)xG*
z3;lG=ewbOLXiY<O7kmF2KL&eLxbB$%^@LopEHsBlw$S{}A!gyYv<dbRaGnU+QQVmI
zOVJyJcdOsZn(KdeY%2=A$NsHE;YdswyCutQ3Xv2^OvV+Q(>dBagS(K6mQzVatV&g*
z_mw<YMLQJ0XSg)^F_LzACdgVKi0#^|c*6g_OCgq&>St-b@NR=hd_j}BF#F0M^Nh2;
zZ8giU6O-DHfsW5*w6|`(E`<C0pUg^C%5>VQQMgFGG;>YYL`BXa`Y5S$VSLF;EpfoX
z#izKz`o37WpU?07#Xygb(Q=k<jo>QhR$;@P2I%MAya(6bw9q51-q=N<v#_?n;+n|R
z9eDm`%j*$a0$`Qb@SQ>9rC2LhdXpRLL`}YMDxbrL)B;=nd8Z?ltnEA*wuQDowO5Lm
zyE&Wn@_-PS`#5GY6c6_+8kZ5!*c}J=N1#Hd5rTWk82iP|ffiC0FkeFB`bEeak&Tj|
zMQ2nw*5pi9%bx-EEfkd?Lg3NB7xP1vYH~K)L3NkP(&}sX=?QyE%VX_kE`D6Cq=x)g
zn(tc}so1J;lX5NH>Y!DzYU7Duf)?ToZ@k|6OVZ`XK-%901W;8LRPH#O+2{$Hun#s}
zZS#uM8npNG4r(nUZtUwzQEVFHve93yH~QoV1lbH>zqD2LFFr}J(?2mlh{r#ncb4$u
zu>_=N!kcycl}z28kT=bS&IJN-8KoW>sMLyBCjWg_F(vLeQ3lox8b0mly>T9mmQ}%z
zZk!ND<V1IGt}+ysh5da=vI?f4yN{LCD$+|u@$G)i0$!zt05#*0(J$}}!)6Wh$0sU*
zoEgRFpi8jwra+WmYNXIuwF{0~MK`285gt#`i5Nu#q3N^CO;1wFfi%(p7)HPyf<Dsc
z?VO!;&o=bA5mUq)a1Pzj=KuL>xL-78Dn<&hmD+MKXuP6MU~W;ja|QFdb9W0UGtfn#
zQLVAk7$(7(;p;i;L%mMFigiaf0G0DZibn8FVsnXS17rAcyewR@_`4w35mn8_L3CNQ
z_1x%aXL>+gKW<m#h|^lyN;pUA;}-Dj%<Rm0h@QSs(5W=mr*Iw>(MC9^ZRt%`%hC^W
zMhApywHXs=L-_8X%hQLOX))m3?^_L3qqFix6l}I)bw|-1P%1Zw7Q0}g?~QG%ohH4P
zv?Cq$yIFxnC4I{*g1vJ&N(1=h`?4|olKw_ZfSXSbqa(td<K!aO098ty#vFRmJmHI;
z%ObncPR1xJi&Fvx4ODt{<vuF*qrqnW%5HalsrVE0J_Qk07{0oYLc`=OPbz$NQdg`x
zZ(`mRU-+bC3KVP^Ez&XMeUd{B%qB=CgfU=yx=T@tbQXH`cvY2;09<I!0)_*zoimI0
z8%_-z&fv|K{hd+vgDE{_iuc;4Xr}z1lV{KMXAk?XivTu=PWPz$odS_2H|CtgZ18=Y
z37mH)^D<{@o*S0LP=CMAFKb`5N37dG_t=syI;d#nSYnye@xU!ouHGGC03y|$^eIc^
zRU_%(h5&(J;OBN${e4Ww{;MSmXQ2H#|GQ3H|6`fkJP`ulK!8&?`bpiT?>ljWo8E@H
zU?7B&s$Y%7Ef+Irg(&cxS>nN#_gm|;!b+UZR}JL|Ey@tzDcsJagC4BkDs$}BTLRC`
z*%l*=Kl&zOA8;=Z2lBzQzmhe=2HqA`Rbdz3Ukv~tOZ`s^APxa{bsJ)AkyeiXh7`Q^
zd#IOVwbeog5St38{7=8!eBdUDuEtlm)DKJa!0652uD5__F{S}_M698msW$cS^@aj3
z%Q>HvghV_5A!da8h?s&KT<`4&QQKy)#Ayrt3hdthLa{w#wEnEuOTg{ApYz~%j-0Bl
zjao4*TR1i-!0j3Z*W`GKhkPW2Vm{3x(-wQu1T7_4^ZFW=Fyp9JEsbnzQWB+$n%K{E
zG!8nVSjnW+O{yYsM<41%n?V`grb^-FVA>W_&s{@~N#|mxIqz;VWIb^L&29didLHu{
z2I{e&@17BTeP=TwZJbN8?`D5sKHa#9HEGS?R1`bmGu$AD<<x%?H7c@RjFv68L%~4+
zQyRb1@hZjAM>Tqj%2p77w-ie?iV3-=4|9&BFBi^=c~qzas*lyEH(9fCoK@XqgKb8r
zaiF7XQzE!7@K1^=C77ynF`cnqmQk2mf0~tINvK(w&DK$#Dmx|Z^`n(N+*z0w=tc+N
zIO;byrsX&2;vaLe0PLbSVjB;d9Hnc4>SN@$LqAYY0XX2fE)^6}QkBf-EW`SDyMIi&
zfyo5Rr1NRtpx@jv6q=`}G`$4KVZ=IoB~jzm8RdQOqKO!U&`>(yk(!-M!emY5D9|?+
zN>}uLIv*@wxJT&qLcQTz@@WeB=Vo1PGnI&i4hj)y9f=W0zfyb}d>oA^C9!Zh0dNg0
z#YrF3VlipOf>2KZMl#f;#HRsLtE7d7eXb_Xi0xj<(vVuo+XosBO3L*?$IxLEp{)Qh
z5I%AnT&-QecR|7}7)1|S!G#5hNXdDeueJqTUlNu0h34+|zswN~g)@eb1v?4;5d#Aw
zYPmgdE*`ns1yFAQWr*{)|C~ls=SMnyAS6@Ti@q!qXrxR%Py!x66?D5r&ndXs*4uU&
zDtJ}*ny_p0$&`F4Z`6*}1gy*%;cYK0;p+^80oe%`7@Ci3_;18k4KDw4hk7C7j7X$$
z?{C9p6`nVW0c*O}2rEuuxL_vg()xs7kny&%GMv{0q7Xb`mVUYa*yFIfK@VwViHz2=
z@rEhBfGLx79@B&I6+W3V5$xbGgWQ^r=V|Xe5IDq=3Ygri{uY5}_4hLCQq9?QbLN-Q
zNDPxj07s{Q>l0O(V;PY!HE@t=;zP(tnf74D1L>Jaa_BuzxD=xE#3=hOE;73A_f(Fu
z;YpX%dx0knr@~tebZ@q0nrX|>U>LeBQRC8EEGFZbTUr-Br3kXgNuXL|8F{jJx_xlE
zZ-%tqMyTVH!#DljwBDAUa`D&wqNcsF2=-O@gMwmxY6yP^8ELu4!2)u2L1}5Y7y|ds
z_PyQmowZcN56q@$xtgm-&Df)G&s)@oG<^N{bE3W$MBC!VPc9hHG!5#Ww1syBrD$fN
z7x(+y&9tlz?<dM?dJ~R5nW;C`{VIejN=7^a7`=r=lqTztfTAdzW$5xfW%P500N^ws
z*fu0P6Tf;1k9HSyVrAs)!<<Lv<nckTp}Pv5`u^v*>&jEV0gRoBQSL!^9IRloM~Gp6
z{7J7m2AL!&X>c>$#0d<zjTdzLa^4P!HJY>r^mZ5BmHl;+x+esj<L#R&Z_0Ab+23rv
z!9MEt#6KHAP-Kd(DmzV4;`+gcw<&2!VUtTIB1Q44Xsf>r(@z{np?DN#)~{)2f<*G)
zQvYlX8k6gltvRjnj14c<j3VS28Vdm>8kVWdBQo;dJKGoI@4mY1cRGZypz=q*<~F=f
zs*tl}17Jonm<%X44Jkz>F&bL9x`wK6sQPOC>xXk|owD<1k&$AHtSwrW8S>3z%n)jV
zyLc_iL)ehOQCXmA^!SFTMmWDsI=zYiZ64y&Y0_eV@0Eb~Buvq`)$wz#hm%LEH%+|8
zfa6Lu=CdI%SNcTZB#`Ds^<Uhog!A~2fDQr6N3o%~771G#v635MRv(PI-1AbBF!zO4
zyU<GSzg61GV=pb2h9e~9KEXXJ*WZ@g@_~B+;2xcAelyEo{+u7%EY*JSd<n>FU80AG
zv}o}*SY@!g*~lHecAfD=>cLM1)A5zR(9C;xG3Q?wa_n8PyWS$vhn$d^HOLuX#Lw4R
z%mjXSP3Sj%jkPN@%H9lr-4d0vXeMPYAs8}&mke~M$_$#ei;jYK49ctERVfIC_11}I
zsH)<?x0+cKl#XWy)c2Z=FwEs(erI@)+b^>WVN~jH_u`3L7)QWmdeMud4i1QkI->;O
zBL+y5UY)lApbtC-{In6o_``c5-w>ynWrclOU*kqBe*ayL-X#Qd8;)-MvVecr)K3a1
zeCe(0WOt3e0@>zgcIu1}ogn#x%*T2PKc*Yq|40}3o@Wg&-iW`IL|D7P8!5%YK0m;4
zYaehmt@7GzW2;u@QXQOui;24VbsZ}^y2+9Tj*Nl_=ap{uFY?mTJI6mJ90by3^DK<R
zBO;Q9^uxU02xi^QvJ6HK!EK25s@DrVkRPLUUvh<-{jF$X*?C5vi|uqD7KrJqxC9z>
z4crJ-Q}P=~+R{rO+y<kM#NH~10<ql&)R(}|<C9O~#353nl)286)=%)m#m|wFE5KWM
zQcB{EOJ!jGbHVq_9rEaF6g9GlCM&kl^};XdU>)5S_T;Gf4_^L5qSgSy1-LW3jGhfW
z2gJ%i;P$S6oCd#X>Mw3TCB5w+ihR}<rgP!nGmBJ(f0dF#xv%`xs`j1+T}=_1F~j;+
z{Vrv0Nya?6`}24@l4xFcDqKG{{#J6z6kf6S+zSW<&dLfJoPa)a5}R65uL%(h(|c#J
zyIroWyuc(?*!Vphh}OF2ZMI<FyaKAKV-HG7g|X>@#wdLY?;MB3NGsl<-D1I?!)-|o
z@rI4DejYTqu~$oHK6*Bu_Ta_=u6_C{0w6<-@Ip1~#EzhV>Z1%LyG>Q)$Q{J7!gYOd
zo|h!t=}_({lpuw%NxFm|j#kyC>r9=L;z{eK<r+TOWqu&6tEwG-FTF0?ETSMf_wF-^
zVJ&7phd1M^#nEf<G>`fV5iEEXbn<?eB1O<{k#TIJ{_jDk(^G)Au`9Zn>z#xzfu2xP
z0wPBX^!S4h@XQ)@YuSqVywx%}bUb}c1xszQ+Xenm(~bZR3vO44>u3>VTwyDlfYi3|
zv!{TDF8_<Sf}<o-A7LV)IHe!^`Ma0jYgvW!(NB)X7rtjo%tP-XTeeSVQEqV<#DGPY
zlFW1Gr=L`aP50X<<UQeTQ}Z1uPT@6Jhq6Z52=c9&@+65En}!nms2uctN`T}N@3RIL
zz-L{`HLv2;<ugyI0j&03jgsH#cof(h5d=^0iO(2uqm@aa3<d}#tDE72BHbC`NKi1D
z9};LS%KGP5X(osUf}5H~nKo;u_IV?kW%iODo&0!^2oGL0Xw0@krzwGG!go6t3S5gG
z@cxEGFKS*dw3X)KI^KKU!T-GP++Q<e5>yW+@UsI6cI*8Lp1cnMM!9icbtfjafd4SZ
z@)|+g9jcz0aWWaP)FO`se+7sjK-I#fM24pp6jq=8=L$3`dmG3gxy^4Gji?pV=*58r
zw=BTt{2k_m=9`)`NVwSRQH(Zk{w#|cr*gBtbH^7IMis1S)#M3dgNTJjX~u^4U|9q1
z2sq(fUO9kuEHXLb%uR+9Lw&JYfRV?vxI>_zAt8<78vGmJe)_Yq^7pWH-xAKnhZBOz
zf()xe;a&nb@$%#~#FXWSCds|Wod!^}sh`8c5<BN7?NDIUQq)VJ#}|}ZJeno51t<Gz
zE=_8zkje);*>3R*s>n-w;M-Tr44~`+$iUZv<a$#8ipVwZ>{Gx@A}#F>ZgxBL&1;t@
z$M(E+sL3F$iUs^ns@HKXV2VVlKLpSk=_*E5gligAV1DKT58iOKoj#y<n86x=DR<%H
z7}m-%ngViz<(+ir=%k}pvcdT^S#&z0q&7;U5d&&5$kt|W!Vrlde17AUpB(bCP!Pr?
z7=ImW$e9b+Ho!ZPSb*j+N4#pv>)YK|*Z4)L=?#br(nTi7mo$(_Md6vTQB$?45!x~8
z@Mvn`2;l^$!?dFW=g9Q5{6#lIQq__fjg+cL0%D0j>%02=4g17!?o^!i>|AXrqy4K#
zY=HlQpCs((-UsEhaWcf27cL}>wk0x=t-q7^x7(32h3KOq?l22t=Xpa|yd5^<@x=Ts
z+yl75Gdb}Z)ht{8G57B`guLgeT!RRJ<gj*7@}3JHUNe_f-$#R9ni8hF?_p(?$T<%R
z$6ooRIO-(U1ZVrDGf3;~CC*pDz2wzd!8e~0Pxy(iog_cMZc+gCMwnk6n%;6T;OQf4
zN;~w;5?}GNsDT-}HW}_n7nd?egqaW!ovd-*;~ET`9$)s+uc$7A({c&#-Ru-GBMj9w
zTAC|>-n34<l&9Kk2tMOW>ySo7qlaodNSTJU_3j@q$%KeDp?bR$6Q`n-;901{306w4
z4TDzoQA&g_wDFJ1`3=t01ive|;eP+U6ET6auWNL8kyelQXG$1<Y|0B{!|z==!B&I~
z@dV59bTMnoGVava7V_4fp!TZ4*AiWYy8a9B)*6KC5~O`EbWx1h<N-4hwBDwf?M~xm
zmOa9TPKV6K{k94iXuk~!=arece<DBuQ~kn8`SGRBx2598GV2M{X|~TNyDzt2u=Chg
zG2^SGi<I4q`95u?Z2@>I9kCb+vIQE|NuxQSZs7uAc75|UXFt(eUcNefCX>uUaic8x
zHuX(b!+67DI=ek_Y;hwYum8b}W2^*KoYmaF7tl(390KD15kQu4({v>v5Ym6uT?n{v
zy6biWoDMT9P1rT`9Y4Tbgopmjm}kf)%^u*`=v5|k)0o~8Mb*9N<Tx>sKD1|Z^%d<j
z1l+;8qQ0&G(!ZqiVq2j9dM({e9d)!toh^KN83r_c>q=_{%o>h%>&0Fp!zeq{kS+CW
z;P1lw_>OA|S8;Splo|8vOOrvX-VrMyLEwZw-U^h5HtO>@A+b;&=N7)<e;*Aw*weZU
z>w*gjNO6Fs)sNHWh=Cwz>yJuYh|;88M4ogN3U#hsTU}ySlH7E~^4s>RA*B*Nl&(?)
zU^_&_4$A}nLA(&5#?a!4Lbn&u@hSh(Y9Z;{u0|l$eXg|ZF%h9}BY}V4RyA84smE$o
zyV4ZF-B?ca($QXXtiG6iSm*I00Ob?}_}tg_FE+gh&jYCn3&l)rgqap)0b4a!rB>n-
z-d@a^78ztH&^ViHYHgyU$G|+k;uHLu;)IW7`x?O~!$u}VcFwq#gVDRS->K`(OP4L;
zLo>eb0>UUpqyN?^($kBY)toUVh4P%bxoYhPqO52>9s;(Q8C{rwdfG_Yspe&RNH>&+
zU!~FDQPH-PU^?-M-k3Q$NZ!DiHFilj2qX3v6PNp`i;)`gqHkaBZd_x6LCO6XL3_Ze
zohDX7CDWo6a@V2I$w)05<4N=H!G()q+<0tm6cDA3brMNH^u$^fz6-n=j_Z5ne)W*$
zmE-fZm-fPCIdMiiVhEz~g{dkBeQI1(tZb$~ie`K?2}H@~m<$PzrUeSIGe0MTNUf`Q
zl;J<gZEX0w3-Qjdsm|`4LBcbDm0-aBlrGGsWAstI75ISsaxC@jgd_sLDO6374C#!8
zO>Pi5K<;Qtl%v`+R?lofFIJQoT@LkgBs<nwDmR3!>A$qp4G6&%AsL{t1{{eEk>i2x
zazXespLOQg-$e+~zPElCV2a~yWjEK27Nrj8W#DX5nb&EB8v|v7n#SamL=T(MV0)cv
z@Mb<sa?_17ymV|$MT*Q*ky<}dKIbS$`KZ*cW|RU^%?98Q&6wf3;C+SJA?#)OT~ee;
zE94Nq9C_wZN%$tmwz3}-ykvrGZ;1-VRsq;&H{(4Rnx|umg_>#`CM3zmmFj8LCFrvp
zR*nYyLr`yQ05j4&!UDcc01v7m7yWb8D!_^<iU<kN(UqMBY%(0p1a9HBm(xK|hnZur
zAlQ)w>B5=P`K|y`Z+ctco6hj(ZzwUU(N8G-<rXruAlyG13BpGpJ^cayW93qQ7Z7Z=
zjY2vmZ6)SzMhxvQ#d?ne?LN+kK!TDtW1UM*vB>CB72b6+W<#&2!?t#+$0Yeloabw?
zE(Q(+o33`kO(yd+tv*YJJo<U8-d<~%Ec@?eNT;N-b~6#sR7z(s%P6AB1IFKjwoJdL
zO1YFzyb^8k<bl>?%c97anRycg4K}TQJ$v5|4E8e?PzSa&{rV<e0LV{@a^uNMkYhE3
zxgfkdinAQgG=fbiv?IO2DiuQ00sbB8$n0)Ln~L;{_kGCN17g#ZokN%s`=0trn9{D_
z_D<UtJ9JQFnd$P+leqhM!U)3ebbx^2USQHrgZ?JzhzG-C;lP|U=ci*~?+;yi%J=6g
zY$0kc*sB__9_`0b;wzD|8rBZ6%i<H$l}5ubunwRW?DHV)Pp}5Q&H!%NTj+eBx!W87
ztVu+hmH0LLbuf2xyPv^tpd}qdJQZJV@{!Koj27YoNIAQaXiRZ9LpX;e9SOT0Cw@Uu
zU<Guq6{X$Qo<Bw`^X6_;e69|UJYg09dEgm#6cb#R+po8ms}z#q)`qVv-iK1>Fpqy)
zkYlFZz*yb5pn~_7JN-oZ;&K1eQ>-%>1NPQrp+JuD6Z<xSDx|S2FHxAsDA<fW?k@v&
z$WC_r4e1LK<!zh1t0}tNENF9vra?>8jTl-!-s3~hY7uhsR#1ac{$RsMxC<#KzvMNY
z5nw%{9oWyMht|KYbaS?SKl(q$zP;12zIlgmiV%>9!!51y1;6aj6{Hsen7{?K_OKiZ
zh+SK^-7v-yzH+LnR;EoSzWpQ8vL?U7xCA)UEI<orcpWevM^whlmOIS#71{p>QW4r%
zgUi$OuItUud)pS*A~-$IuW}#Tw-p@!AkG}Y=dg^|P6U3)M5knU0Lc_4uNS+>s2qM(
z6I~0nmL`0i>zK5s#fDrn%P^ErXdqdX@mXW!gO~qG_%rhd?eVR~4N(GeFjH&Gw!h{5
zE@Cx#0VX;j6N?j%&aBjb(g_V>C_eq>`i~5XDXMy|AnZ^4o&#`b0-cGRAhPmnaxB28
zh<w5ubs%}<#Q#Rw|MBi3Q^Uqg!bvG~$;Th1MS0>81(1I}!S!ZS0$=H+!a69gt{j#C
z+D5ZbZV1WGQAVu!>uAv(U-*zoDRJo&`f>Wy6JSZNa%N5B(g)Mg<A}Kc#^&N__s5y=
zElp6+VC~Vz`Wrx_)0@{eIiJE-ECufj&oEV!uVFt_VAt@jgxp}o0wG<Gbx@hlVHgRg
zco1kzRi0>8LfgSC4zN$X*Q;ri`j8af4nfCzkR_?F6?k2iExJWyKMe$&pjR(>2r;~=
z>Hsgy5Yn(2bX#0#JCa<Acu>v$11mtlVB^TSZ?9g4)gVFxX_1jiYC2WCS9~zwo%=7W
zXkC+x54#8WD}Jc52NXyyz_Ra}1y=7^)%>>~rYGh**M|hQ6VORRyM-<%hg<?_@0Kko
z8!1j~n98wPwb}U?tQm$P7Zr19q0RsfM7lz7V*+IfYlXXvOd;O>GYwhx+V}gEw!39M
zZ{K`zIE72aKleg0x)qzQeB)0-OrF$kIvjUPa<w|oGWCBr^ajv|I7-B9!1ncNs+W=c
zr~gRQbVcbN`;R^p$Nc=LVNqKzjK&DbN4W6OtU$8Pfoqy3nw+q!fh&>+yiQsso{25-
z<Z*Xr6cU4J@#h_<cT{~}#iZ2Tr82nyiH&>^92^8osvK$V&RAaQ92iEfFaE4QcEtu#
z9~IXiN{)%`aP}QvL%wg%cTTbHp2a_&vw$}_^*}JE&^qBmD1ZZeXaiVQjhndIRmhwN
z3SnFn6F4EvV<<2+thK@U{~;kq#g?J>5GGPI=kt1QkWpm(9-JoxssR(BhpotvA`IiR
zYmoDvd|+r+lqtkf>|5JWELg3#3VMn?kolr1pz$OEFao;4C!E(Y9x8v(4xSq>t=(ZI
zrNSG_#7c(u=a!L+BfPEx%vE9JBAUp%V1|7)w^CtSd2)EB&9+;wEj0RJ4-DubpCyLe
zjCzJlXvCRMZW84k(q*G?>nCPUMC-~S5OL+z*O{#hn?Ae=@8f?QzAhU3O<MR>GHcYB
z_VU!|m<H#j)hvXOL1<C?<P)9f7R~`W8y5?Yj9=;CJxB9oLEEwuA31f1Jy%J^mW<~d
zFLnRytlQ6u-^f~Khqj%bdwyNOPe{&0u(p<%$q-6pxUiJ$(BHEyu{B-WQUfEjW(TPP
z>vX#QS)w_jYPJ`P0vwNkHbyf4coDb-)cvzHQF8P*^>NzPktg9AYwtb_@X|9>+&@le
z<sh2vOIRBk`o0SZ?iwKeXZ`u%2PP}7b6Eqw`?WkMP=Go6z4FWt<;p;&q;FL#?ms<H
z3;($!YdE}ak=qW;Jjo}X9|U0`D!3rb<bBN9!b;bmyz_Ni5dyp2z8t+~=%)PcjWj~3
zmz7iIDI`pY{~bk~kR$M&zFq;D%co^nR^k-p)L8Ev4RW(7*0%PG_@O;p^;GYUPv|@6
zFR=O}+={~V<ZrndTKKF4zdae!JLnzMBdew2LGm<@-^(*WV}~^MXa$*HnO<rDb5C26
zU%{?(Tz>VmK2YzU3d$KFYQETH%Q-hTnv&{=#TlM(gEZdAC9ssWobIBwPS&*##e_?}
zi+EG7AJPXEgE&hYKwW#-4qnT)dI&i$e&e#(mc&)zb{uHURm}f$)B^&fe1Sw#KePm&
zjpz$SSWChHsj)boe;ciVMAs{-%woqK)|UCGBO3j)ruDa%;OFZ7qn*G(Ju|VAo*Ybp
z&QF9nhE(~oFa)fkFf+W^R6q?)wx^AZ8sY{S`AO+kDEHySt1m_7i5{9wkK=k%0hHi<
z0}q#DkYdn$QI_mJx|8g5=D-jo%7F_?1&ASQzrVbp-%rlFXzSkl+GcUb`nTMR`;SYW
zv0r@oSRSBo8>|oI;^Bv?MAtO)w^x-zIT5aPr?0WYA??uhbbD8RPsL68*h%~*4{}i>
z^ofr+*%7xmVd-zx@wIV?fg*+Ol!e#Vod5;ecNWR!!r&o9s#WP3lEv>m&Ld@Id5^6@
z_GeQnAw<3APHZ~HtT0WGFDS?A31#_Sm~*cM(`Kmafc@`>+ZU#Q$wN|K<0jdgd@cA*
zGj}qC<BWOtb=oG^A&bs)|8w*~kDD+?il8RW(LP=qyJwrQ>qfUR%Q^=|y01zbpK)mV
zrihd)4h7#6D@vhPagW9R)4i>TGpl}1c<U%5OC_KN%cDPVfDN5ewioW(u>)uQtmd9#
zG#_yp`bMgm(H0kFt@x>R!^x^yql1JEukgV8W3j>c9eF`k(beA3v@HcV3anwcU$kFd
znMeCDn*+;-H`6azF>j6xt9wgCIRQE*x{pP$U7q`@=uZUqg<;t!=6mJ|8r_1*?SD_&
z{eL@*qn{#E4l!X);ucXY@30;x$CWCFqP^t&e0INN!9`0dDji7s=jV79B<h`VTxpW0
z9L8UA+eL$xB*1ckgXAzy?YActO!rUzNbCps9jk(>FZbd3H0}H*_FFE~NvpFRDw!ln
l425$Lo+4cQ|G9WSm^^NEqC!QA_tv!xP?S}bX^=Jx{~r^iLh=9r

literal 0
HcmV?d00001

diff --git a/images/map_seld.png b/images/map_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c7632ca7906409f851e83209d65b1398ef51787
GIT binary patch
literal 24650
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%0DjL(-C0w
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
R)MWqw002ovPDHLkV1j-r&3pg=

literal 0
HcmV?d00001

diff --git a/images/my-selds.png b/images/my-selds.png
deleted file mode 100644
index 5b4f4c9aa30264d985bd0a98ff76ca552f9ab67a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13301
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

diff --git a/images/tuyou-selds.png b/images/tuyou-selds.png
deleted file mode 100644
index 4b4bddc0ccffd3d5d93655dc00ef6119d9a38ef3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19434
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
BnCk!l

diff --git a/images/user_seld.png b/images/user_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a87d317e443a6f37bc1b2d68a10be79e541018b
GIT binary patch
literal 17562
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
BSwa8+

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index 409e869..31c027a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -51,11 +51,11 @@ Page({
 		djsTime: null,
 		sqjNew: [
 			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240607/3acf736c1dc9c7af08d3363833669896.png',
 			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
 			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
 			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240607/56ccaab57aaf050bb6feccc3a70983bb.png',
 			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
 			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
 			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
@@ -63,68 +63,7 @@ Page({
 		],
 		viewHeight: "0px",
 		isMuted: true,
-    videoPlay: false,
-    hdrlNavList:[
-      {
-        type:null,
-        title:'全部'
-      },
-      {
-        type:'scene',
-        title:'景区活动'
-      },
-      {
-        type:'show',
-        title:'演出'
-      },
-      {
-        type:'exhibition',
-        title:'展览'
-      },
-      {
-        type:'movie',
-        title:'电影'
-      },
-      {
-        type:'other',
-        title:'其他'
-      }
-    ], //活动日历板块导航分类
-    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
-    today:null,
-    hdrlList:[],
-    yszNav:['公共服务','旅游助手'],
-    yszIndex:0,
-    bdList:[
-      {
-        bg: 'linear-gradient(-8deg, #B9E1F0, #F4F9FF)',
-        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feiwan.png', //非玩不可
-        path:'/pages/list/scene/index',
-        url:'',
-      },
-      {
-        bg: 'linear-gradient(-8deg, #F3FFC4, #F9FFE3)',
-        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feimai.png', //非买不可
-        path:'/pages/list/techan/index',
-        url:'',
-      },
-      {
-        bg: 'linear-gradient(-8deg, #A0F292, #E0F7DC)',
-        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feiyou.png', //非游不可
-        url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
-        path:'',
-      },
-      {
-        bg: 'linear-gradient(-8deg, #E3D9FF, #F6F2FF)',
-        icon:'https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/feikan.png', //非看不可
-        url:'',
-        path:'/pages/list/theatre/index',
-      },
-    ],
-    list1:[], //非玩-景点
-    list2:[], //非买-文创
-    list3:[], //非游-一日游
-    list4:[], //非看-剧场演出
+		videoPlay: false,
 	},
 	onLoad: function(options) {
 		this.getHeight()
@@ -185,21 +124,7 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-    }
-    // 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-    let d = new Date();
-    let month = d.getMonth() + 1,
-      day = d.getDate();
-    month = month > 10 ? month : ("0" + month);
-    day = day > 10 ? day : ("0" + day);
-    this.setData({
-      today: d.getFullYear() + "-" + month + "-" + day
-    })
+		}
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -210,12 +135,10 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-        this.getList()
-        this.getHdrlList()
+				this.getList()
 			},
 			fail: (err) => {
-        this.getList()
-        this.getHdrlList()
+				this.getList()
 			}
 		})
 		this.setData({
@@ -234,164 +157,16 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-    this.getWeather()
-  },
-  gobdDetail(e) {
-    console.log(e);
-    let url = e.currentTarget.dataset.url
-    wx.navigateTo({
-      url: url
-    })
-  },
-  getList() {
-    let bdList = this.data.bdList
-    // 非玩不可--景点
-    commonApi._post("scene/get_scene_by_tag",{
-      tag_id:"4",
-      limit:6,
-      lon:this.data.lon,
-      lat:this.data.lat,
-      offset:0,
-      sort:"weight",
-      title:'',
-      area_id:''
-    }).then(res=>{
-      res.data.list.map(item => {
-        if (item.distance || item.distance == 0) {
-          if (item.distance >= 1000) {
-            item.distance = (item.distance / 1000).toFixed(2) + 'km';
-          } else {
-            item.distance = (item.distance).toFixed(2) + 'm';
-          }
-        }
-      })
-      this.setData({
-        list1:res.data.list
-      })
-    })
-    // 非买不可--文创
-    commonApi._post('product/get_product_by_tag',{
-      tag_id: 326,
-      offset: 0,
-      limit: 6,
-    }).then(res=>{
-      this.setData({
-        list2:res.data.list
-      })
-    })
-    // 非游不可--线路一日游
-    commonApi._post('product/get_product_by_tag',{
-      type_id: 23,
-      tag_id:17,
-      offset: 0,
-      limit: 6,
-      sort: 'weight'
-    }).then(res=>{
-      this.setData({
-        list3:res.data.list
-      })
-    })
-    // 非看不可--剧场演出
-    commonApi._post("product/get_product_by_tag",{
-      tag_id:"6",
-      offset:0,
-      limit:6,
-      sort:'',
-      order:'',
-      lat:this.data.lat,
-      lon:this.data.lon,
-      title:''
-    }).then(res=>{
-      this.setData({
-        list4:res.data.list
-      })
-    })
-  },
-  goDetail(e) {
-    let item = e.currentTarget.dataset.item;
-    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
-    if (type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
-    }else {
-      wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id=' + item.id,
-      })
-    }
-  },
-  // 分类为电影时调这个接口
-  getMovieList() {
-    let service = "Cinema/getHotMovieList";
-		let data = {
-			page: 1,
-			pageSize: 5
-    };
-    commonApi._post(service, data).then(res => {
-      console.log(res.data);
-			this.setData({
-				hdrlList: res.data
-			})
-    })
-    console.log(this.data.hdrlList);
-  },
-  // 推荐榜单更多跳转
-  moreBtn(e) {
-    let item = e.currentTarget.dataset.item
-    if (item.path!='') {
-      wx.navigateTo({
-        url: item.path,
-      })
-    } else {
-      // if (e.currentTarget.dataset.event) {
-      //   this.pagePoint({
-      //     event: e.currentTarget.dataset.event
-      //   }, 1)
-      // }
-      let url = item.url;
-      app.globalData.weburl = url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-      })
-    }
-  },
-  // 活动日历下的列表
-  getHdrlList() {
-    commonApi._post('pbservice/Actcalendar/getActList', {
-      page_no: 1,
-      date: this.data.today,
-      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
-      keywords: '',
-      area_key: '',
-      lat: this.data.lat,
-      lon: this.data.lon,
-      page_num: 5
-    }).then(res => {
-      this.setData({
-        hdrlList:res.data.rows
-      })
-    })
-  },
-  // 切换活动日历分类
-  changeHdrlNav(e) {
-    console.log(e.currentTarget.dataset);
-    this.setData({
-      hdrlList:[],
-      hdrlNavIndex:e.currentTarget.dataset.index,
-    })
-    if (this.data.hdrlNavIndex == 4) {
-      this.getMovieList()
-    } else {
-      this.getHdrlList() //切换分类重新获取活动日历列表
-    }
-  },
-  // 游苏州下的公共服务和旅游助手切换
-  changeType(e) {
-    this.setData({
-      yszIndex:e.currentTarget.dataset.index,
-    })
-  },
-  // 获取导航栏项目标题高度
+		this.getWeather()
+		// 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+		this.getVideoPrize()
+		this.getXpthList()
+	},
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
@@ -404,62 +179,59 @@ Page({
 			}
 		})
 	},
-	// getXpthList: function() {
-	// 	// 元旦新增 新品特惠
-	// 	commonApi._post("product/get_product_indulgence", {
-	// 		tag_id: 275,
-	// 		typeId: 3,
-	// 	}).then(res => {
-	// 		console.log('data', res.data);
-	// 		this.setData({
-	// 			xpth: res.data,
-	// 			djsTime: res.data.time
-	// 		})
-	// 		let time = setInterval(() => {
-	// 			this.setData({
-	// 				djsTime: this.data.djsTime - 1
-	// 			})
-	// 			this.formatDate(this.data.djsTime)
-	// 		}, 1000)
-	// 		if (this.data.djsTime == 0) {
-	// 			clearInterval(time)
-	// 		}
-	// 	})
-	// },
+	getXpthList: function() {
+		// 元旦新增 新品特惠
+		commonApi._post("product/get_product_indulgence", {
+			tag_id: 275,
+			typeId: 3,
+		}).then(res => {
+			console.log('data', res.data);
+			this.setData({
+				xpth: res.data,
+				djsTime: res.data.time
+			})
+			let time = setInterval(() => {
+				this.setData({
+					djsTime: this.data.djsTime - 1
+				})
+				this.formatDate(this.data.djsTime)
+			}, 1000)
+			if (this.data.djsTime == 0) {
+				clearInterval(time)
+			}
+		})
+	},
 	// 元旦新品特惠 倒计时 
-	// formatDate: function(oTime) {
-	// 	let h = parseInt(oTime / 3600)
-	// 	let m = parseInt((oTime % 3600) / 60)
-	// 	let s = parseInt(oTime % 60)
-	// 	h = h < 10 ? "0" + h : h;
-	// 	m = m < 10 ? "0" + m : m;
-	// 	s = s < 10 ? "0" + s : s;
-	// 	this.setData({
-	// 		djs: {
-	// 			h: h,
-	// 			m: m,
-	// 			s: s
-	// 		}
-	// 	})
-	// 	return
-	// },
-  // 非遗跳转
-  // goFeiyi: function() {
-	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-	// 	wx.navigateTo({
-	// 		url: "/pages/pbService/web/index"
-	// 	})
-	// },
-	// onTabItemTap: function(e) {
-	// 	console.log(e, 99999999)
-  // },
-  // 大轮播的监听方法
+	formatDate: function(oTime) {
+		let h = parseInt(oTime / 3600)
+		let m = parseInt((oTime % 3600) / 60)
+		let s = parseInt(oTime % 60)
+		h = h < 10 ? "0" + h : h;
+		m = m < 10 ? "0" + m : m;
+		s = s < 10 ? "0" + s : s;
+		this.setData({
+			djs: {
+				h: h,
+				m: m,
+				s: s
+			}
+		})
+		return
+	},
+	goFeiyi: function() {
+		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+		wx.navigateTo({
+			url: "/pages/pbService/web/index"
+		})
+	},
+	onTabItemTap: function(e) {
+		console.log(e, 99999999)
+	},
 	changeBannerIndex: function(e) {
 		this.setData({
 			activeBannerIndex: e.detail.current
 		})
-  },
-  // 小轮播监听方法
+	},
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
@@ -689,7 +461,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-    console.log(e)
+		console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -826,33 +598,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	// getList: function() {
-	// 	if (!this.data.listMore) return;
-	// 	commonApi._post("search/recommend", {
-	// 		offset: this.data.list.length,
-	// 		limit: 16
-	// 	}).then(res => {
-	// 		res.data.map(item => {
-	// 			if (item.ext.display_tags) {
-	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-	// 			} else {
-	// 				item.ext.display_tags = []
-	// 			}
-	// 		})
-	// 		if (res.data.length < 15) {
-	// 			this.setData({
-	// 				listMore: false
-	// 			})
-	// 		}
-	// 		this.setData({
-	// 			list: this.data.list.concat(res.data)
-	// 		})
-	// 	})
-	// },
+	getList: function() {
+		if (!this.data.listMore) return;
+		commonApi._post("search/recommend", {
+			offset: this.data.list.length,
+			limit: 16
+		}).then(res => {
+			res.data.map(item => {
+				if (item.ext.display_tags) {
+					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+				} else {
+					item.ext.display_tags = []
+				}
+			})
+			if (res.data.length < 15) {
+				this.setData({
+					listMore: false
+				})
+			}
+			this.setData({
+				list: this.data.list.concat(res.data)
+			})
+		})
+	},
 	onReachBottom: function() {
-		// if (this.data.list.length < 30) {
-		// 	this.getList()
-		// }
+		if (this.data.list.length < 30) {
+			this.getList()
+		}
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -980,186 +752,186 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	// bannerClick2: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.action == 'href') {
-	// 		if (item.href.indexOf(",") != -1) {
-	// 			let info = item.href.split(",");
-	// 			wx.navigateToMiniProgram({
-	// 				appId: info[0],
-	// 				path: info[1]
-	// 			})
-	// 		} else if (item.href.indexOf('map/index') != -1) {
-	// 			wx.reLaunch({
-	// 				url: item.href
-	// 			})
-	// 		} else {
-	// 			wx.navigateTo({
-	// 				url: item.href,
-	// 			})
-	// 		}
-	// 	} else if (item.action == "web") {
-	// 		app.globalData.weburl = item.href;
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-	// 		})
-	// 	}
-	// },
+	bannerClick2: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.action == 'href') {
+			if (item.href.indexOf(",") != -1) {
+				let info = item.href.split(",");
+				wx.navigateToMiniProgram({
+					appId: info[0],
+					path: info[1]
+				})
+			} else if (item.href.indexOf('map/index') != -1) {
+				wx.reLaunch({
+					url: item.href
+				})
+			} else {
+				wx.navigateTo({
+					url: item.href,
+				})
+			}
+		} else if (item.action == "web") {
+			app.globalData.weburl = item.href;
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+			})
+		}
+	},
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// // 获取短视频大赛是否中奖 中奖详情
-	// getVideoPrize() {
-	// 	let user_id = wx.getStorageSync('jstrip_userid');
-	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-	// 	commonApi.user_post('actonline/video_act/getRaffle', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			videoPrize: res.data
-	// 		})
-	// 	})
-	// },
-	// noMoreTip() {
-	// 	wx.setStorageSync('indexPriceNoTip', true)
-	// 	this.closePrice()
-	// },
-	// closePrice() {
-	// 	this.setData({
-	// 		videoPrize: false,
-	// 		prizeInfo: null
-	// 	})
-	// },
+	// 获取短视频大赛是否中奖 中奖详情
+	getVideoPrize() {
+		let user_id = wx.getStorageSync('jstrip_userid');
+		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+		commonApi.user_post('actonline/video_act/getRaffle', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				videoPrize: res.data
+			})
+		})
+	},
+	noMoreTip() {
+		wx.setStorageSync('indexPriceNoTip', true)
+		this.closePrice()
+	},
+	closePrice() {
+		this.setData({
+			videoPrize: false,
+			prizeInfo: null
+		})
+	},
 	// 抽奖
-	// choosePrize() {
-	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			prizeInfo: res.data
-	// 		})
-	// 		if (res.data.type != 'none') {
-	// 			// 抽奖成功的话 弹框
-	// 			wx.showModal({
-	// 				title: "提示",
-	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-	// 				showCancel: false
-	// 			})
-	// 		}
-	// 	})
-	// },
-	// bannerJumpNew(item) {
-	// 	let that = this
-	// 	item = item.currentTarget.dataset.item
-	// 	if (item.tdata == '') return
-	// 	that.pagePoint({
-	// 		event: "banner_click",
-	// 		type: 'banner'
-	// 	}, 1)
-	// 	switch (item.jump_type) {
-	// 		case 0:
-	// 			break;
-	// 		case 1:
-	// 			util.gotoDetail(item.product_model)
-	// 			break;
-	// 		case 2:
-	// 			if (item.front_model && item.front_model.mini) {
-	// 				wx.navigateTo({
-	// 					url: "/" + item.front_model.mini
-	// 				})
-	// 			}
-	// 			break;
-	// 		case 3:
-	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-	// 				// 外部h5
-	// 				console.log(item.tdata)
-	// 				app.globalData.weburl = item.tdata.url;
-	// 				wx.navigateTo({
-	// 					url: "/pages/pbService/web/index"
-	// 				})
-	// 			} else {
-	// 				let page = item.tdata.url.split("/");
-	// 				page = page[page.length - 1].split("?")
-	// 				console.log(page[0])
-	// 				let url = this.data.urltopage[page[0]];
-	// 				if (url && url.indexOf('map') != -1) {
-	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-	// 							'cinema', 'academes'
-	// 						],
-	// 						type = page[1] ? page[1].split("=") : [];
-	// 					wx.reLaunch({
-	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-	// 					})
-	// 				} else if (url) {
-	// 					wx.navigateTo({
-	// 						url: url,
-	// 					})
-	// 				} else {
-	// 					app.globalData.weburl = item.tdata.url;
-	// 					wx.navigateTo({
-	// 						url: "/pages/pbService/web/index"
-	// 					})
-	// 				}
-	// 			}
-	// 			break;
-	// 		case 4:
-	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-	// 				// 如果是苏心游的小程序 直接把authCode带过去
-	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-	// 					let weburl = item.tdata.page
-	// 					if (weburl.indexOf('?') != -1) {
-	// 						weburl += '&authCode=' + res.data;
-	// 					} else {
-	// 						weburl += '?authCode=' + res.data
-	// 					}
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: weburl
-	// 					})
-	// 				}).catch(err => {
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: item.tdata.page
-	// 					})
-	// 				})
-	// 			} else {
-	// 				wx.navigateToMiniProgram({
-	// 					appId: item.tdata.appid,
-	// 					path: item.tdata.page
-	// 				})
-	// 			}
-	// 			break;
-	// 		default:
-	// 			break;
-	// 	}
-	// 	return
-	// },
+	choosePrize() {
+		commonApi.user_post('actonline/video_act/luckyDraw', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				prizeInfo: res.data
+			})
+			if (res.data.type != 'none') {
+				// 抽奖成功的话 弹框
+				wx.showModal({
+					title: "提示",
+					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+					showCancel: false
+				})
+			}
+		})
+	},
+	bannerJumpNew(item) {
+		let that = this
+		item = item.currentTarget.dataset.item
+		if (item.tdata == '') return
+		that.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index"
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index"
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return
+	},
 	onReady: function() {
 
 
 	},
-	// gotoOther: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.type == 'h5') {
-	// 		app.globalData.weburl = item.url
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-	// 		})
-	// 	} else if (item.type == 'mini') {
-	// 		wx.navigateToMiniProgram({
-	// 			appId: item.appid,
-	// 			path: item.path
-	// 		})
-	// 	} else if (item.type == 'page') {
-	// 		wx.navigateTo({
-	// 			url: item.page,
-	// 		})
-	// 	}
-	// },
+	gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
+	},
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4af909c..59e3171 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,10 @@
-<!--pages/indexs/index.wxml-->
+<!--index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
+<!-- <view class="old-btn">关怀模式</view> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/topImg.gif" mode="widthFix"></image>
+<image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
@@ -11,6 +14,11 @@
     mode="aspectFill"></image>
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
     src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
@@ -20,7 +28,7 @@
 </view>
 <view style="position:relative;z-index: 1;" >
   <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
-    <block wx:for="{{banner}}" wx:key="this">
+    <block wx:for="{{banner}}" wx:key="*this">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
@@ -30,103 +38,144 @@
     <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
   </view>
 </view>
-<view class="content">
-  <!-- 活动日历 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendar.png"></image>
-    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+
+<!-- <swiper class="swiper" indicator-dots="{{true}}"
+  autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
+  <block wx:for="{{banner}}" wx:key="*this">
+    <swiper-item bindtap="bannerClick2" data-item="{{item}}">
+      <image src="{{item.img}}" mode="aspectFill"></image>
+    </swiper-item>
+  </block>
+</swiper> -->
+<view class="top-icons" wx:if="{{!isTest}}">
+  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">活动日历</view>
   </view>
-  <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
-      {{item.title}}
-    </view>
+  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
+    data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">场馆预约</view>
   </view>
-  <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
-        <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
-          <view class="hdrlItem-content">
-            <view class="hdrlItem-title textOver3">{{item.name}}</view>
-            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
+  <!-- 非遗跳专题 -->
+  <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
+    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
+  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">非遗专卖</view>
   </view>
-  <view wx:else>
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
-        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
-            <view>{{item.title}}</view>
-            <view style="display: flex;justify-content: flex-end;">
-              <view class="buyMovie">去购票 ></view>
-            </view>
+  <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
+    data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">剧场演出</view>
+  </view>
+  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">文创特产</view>
+  </view>
+  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">景点门票</view>
+  </view>
+  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">酒店住宿</view>
+  </view>
+  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">夜游苏州</view>
+  </view>
+  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">一日游</view>
+  </view>
+  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
+    class="top-icon-item">
+    <!-- 夏季修改 -->
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
+    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
+    <view class="top-icon-text">研学游</view>
+  </view>
+</view>
+<view class="content">
+  <view class="sale-road-boxes" wx:if="{{false}}">
+    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品"
+      data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+      <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+      <view class="sale-product">
+        <view class="sale-product-bg"></view>
+        <image mode="aspectFill" class="sale-img"
+          src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png"
+          mode="aspectFill">
+        </image>
+        <view class="sale-info">
+          <view class="sale-product-title textOver2">
+            <view>限时特惠</view>
+            <view>新品推荐</view>
           </view>
+          <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
+            ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
         </view>
       </view>
     </view>
-  </view>
-  <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" wx:if="{{!isTest}}">
-    <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
-      <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
-    </view>
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
-            <view class="text">文创特产</view>
-          </view>
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
-            <view class="text">一日游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
-            <view class="text">一卡游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
-            <view class="text">非遗专卖</view>
+    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路"
+      data-path="/pages/list/road/index">
+      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+      <view class="sale-product">
+        <view class="sale-product-bg road-product-bg"></view>
+        <common-image class="sale-img" width="173rpx" height="165rpx"
+          src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg"
+          mode="aspectFill"></common-image>
+        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png"
+          mode="aspectFill">
+        </image>
+        <view class="sale-info">
+          <view class="sale-product-title textOver2">
+            <view>四季苏州</view>
+            <view>最是江南</view>
           </view>
+          <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+            ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
         </view>
-      </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
       </view>
     </view>
   </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
+  <!-- 五一修改 一张banner不滚动 -->
+  <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+    <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+  </view>
+  <view class="small-swiper-box" wx:else>
     <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <!-- 原 圆角77rpx，现改为13rpx -->
           <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
@@ -135,145 +184,464 @@
       <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
     </view>
   </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image style="width: 286.67rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/ysz.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+  <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+  <view style="display: flex;">
+    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort"  class="jqssd" ></view>
+    <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
+  </view>
+  <!-- 元旦修改  限时特惠--新版-->
+  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+    <!-- 上方标题部分 -->
+    <view class="xsth-title">
+      <view class="xsth-left" style="display: flex;">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+      </view>
+      <view class="time-box" style="z-index: 9;">
+      倒计时
+        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+        <text>:</text>
+        <view class="xsth-time">{{djs.m}}</view>
+        <text>:</text>
+        <view class="xsth-time">{{djs.s}}</view>
+      </view>
+      <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
+      <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+      </view> -->
+    </view>
+    <!-- 商品部分 -->
+    <view class="xpth-product">
+      <!-- 左边的2个产品 -->
+      <view class="xpth-left">
+        <view  class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+          <image src="{{item.headimg}}" mode=""/>
+          <view class="xpth-item-content">
+            <view class="xpth-item-title textOver2">{{item.title}}</view>
+            <!-- <view class="xpth-tag">唇齿留香</view> -->
+            <view class="xpth-item-bottom">
+              <view class="xpth-item-price">{{item.price/100}}</view>
+              <!-- <view class="xpth-item-buy">立即抢购</view> -->
+            </view>
+          </view>
+        </view>
       </view>
+      <!-- 右边的banner -->
+      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill"/>
     </view>
-    <image style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
   </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;justify-content: space-between;">
-        <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
-          <view>安全服务</view>
+  <view class="sale-road-boxes" style="margin-top:0">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode=""/>
+  </view>
+  <!-- 五一修改 .slide-out-box 增加背景色-->
+  <view class="slide-out-box">
+    <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+    <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+      <view class="pbservice" style="margin-bottom:30rpx">
+        <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
+          <view>非遗鉴赏</view> -->
+          <!-- 元旦修改 第一个pbservice-item新增margin-left -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+          <view class="text">非遗鉴赏</view>
         </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gaofeng.png" mode="widthFix"></image>
-          <view>高峰预警</view>
+        <view bindtap="goH5" data-title="数字博物馆"
+          data-path="BwsInfo" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
+          <view>数字博物馆</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+          <view class="text">数字博物馆</view>
         </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/xingli.png" mode="widthFix"></image>
-          <view>行李寄存</view>
+        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
+        class="pbservice-item">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
+        <view>公共文化资源库</view> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+        <view class="text">公共文化资源库</view>
+      </view>
+      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+          <view>云上文博会</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+          <view class="text">云上文博会</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+          data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
+          <view>云上观展</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+          <view>云上观展</view>
+        </view>
+        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
+          <view>精彩回顾</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
+          <view class="text">精彩回顾</view>
         </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/shishi.png" mode="widthFix"></image>
-          <view>实时路况</view>
+        <view bindtap="gotoPath" data-event="institution_click" 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> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+          <view class="text">文旅单位</view>
         </view>
+        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+          <view>书香借阅</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+          <view class="text">书仓</view>
+        </view>
+        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
+          <view>苏影通</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
+          <view class="text">苏影通</view>
+        </view>
+        <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
+          data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
+          <view>视觉中心</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+          <view class="text">视觉中心</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+          data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+          <view>文物查询</view>
+        </view> -->
+        <view bindtap="goH5"  data-title="文化场馆查询"
+          data-path="Museum" class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
+          <view>文化场馆查询</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+          <view class="text">文化场馆查询</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+          data-path="/pages/pbService/museum/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+          <view>博物馆查询</view>
+        </view> -->
+        <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+          <view>云上文博会</view>
+        </view> -->
+        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+          class="pbservice-item">
+          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
+          <view>投资导引图</view> -->
+          <!-- 元旦修改 -->
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+          <view class="text">投资导引图</view>
+        </view>
+        <!-- <view bindtap="gotoUrl" data-title="数字文物"
+          data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+          <view>数字文物</view>
+        </view> -->
+        <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+          <view>团体预约</view>
+        </view> -->
+
+        <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+          data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+          <view>廉洁地图</view>
+        </view> -->
+
+        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+          <view>文化配送</view>
+        </view> -->
       </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
+    </scroll-view>
+    <view class="scroll-line">
+      <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+      <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+      <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+      <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
     </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-          data-path="/pages/list/{{isTest?'road':'food'}}/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode=""/>
+  </view>
+  <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+      <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+      <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
+    </image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+    <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
+    <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
+    <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
+    </image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
+      <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
+    <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+      data-path="/pages/list/{{isTest?'road':'food'}}/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
+    <image bindtap="audioGuide" data-event="voice_click"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
+    </image>
+    <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
+    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
+      mode="aspectFill"></image> -->
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0;">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">查看全部 <text
+        class="iconfont icon-you"></text> </navigator>
+    <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
+  </view>
+  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240606/ec3159a8e5b6bb0ccce8aef14ca70f14.png');background-size: 100% 100%;">
+    <!-- 元旦修改 ggfw为新增类名 -->
+    <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;">
+      <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
+        data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+        <view>景区舒适度</view>
+      </view> -->
+        <!-- 元旦修改 ggfw为新增类名 -->
+            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
+        <view>安全服务</view>
       </view>
+      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+        <view>景区舒适度</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+        <view>行李寄存</view>
+      </view>
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+        <view>实时路况</view>
+      </view>
+      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
+        data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
+        <view>找厕所</view>
+      </view> -->
+      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
+        data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
+        <view>停车场</view>
+      </view> -->
+      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
+        <view>12348</view>
+      </view> -->
     </view>
   </view>
-  <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
-  <!-- 4个产品榜单 -->
- <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
-    <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
-    <view class="bd-top">
-      <image class="bd-type" src="{{item.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
+  <view class="sale-road-boxes">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode=""/>
+  </view>
+  <!-- <view class="six-box">
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
+      src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
+    </image>
+  </view> -->
+  <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+  <view class="six-box-new" wx:if="{{!isTest}}">
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
+      src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+    </image>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
+  </view>
+  <view class="other-plats" wx:if="{{otherPlat}}">
+    <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
+      <image src="{{item.icon}}" mode="widthFix"></image>
+      <view>{{item.name}}</view>
     </view>
-    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
-      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
-            </view>
+  </view>
+  <view class="sale-road-boxes" style="margin-top:0">
+    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode=""/>
+  </view>
+  <view class="hot-list" wx:if="{{isTest==false}}">
+    <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+      <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+        <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}"
+            mode="aspectFill"></common-image>
+          <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png"
+            mode="widthFix"></image>
+          <view class="today-date">{{date}} {{month}}</view>
+          <view class="today-hot-box">
+            <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
+              {{item.ext.display_tags[0]}}</view>
+            <view class="today-hot-title">{{item.title}}</view>
           </view>
         </view>
-      </view>
-    </view>
-    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+        <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+          <view style="position:relative">
+            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+            <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+          </view>
+          <view class="hot-info">
+            <view class="hot-title">{{item.title}}</view>
+            <view class="tags textOver" style="margin-bottom:0">
+              <view class="icon-box">
+                <text class="iconfont icon-xin"></text>
+                <text>{{item.ext.like_number}}</text>
+              </view>
+              <view class="icon-box">
+                <text class="iconfont icon-eye"></text>
+                <text>{{item.ext.view_number}}</text>
+              </view>
             </view>
           </view>
         </view>
-      </view>
-    </view>
-    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
-            </view>
+        <view wx:else class="hot-item">
+          <view style="position:relative">
+            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+            <!-- <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' && item.ext.price}}" class="hot-price">
+              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
           </view>
         </view>
       </view>
     </view>
-    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
-            </view>
-          </view>
-        </view>
+  </view>
+  <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+  <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+</view>
+<view class="mask prizeMask" wx:if="{{videoPrize}}">
+  <view class="mask-bg"></view>
+  <view class="mask-content"
+    style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+    <!-- 中奖的卡券 -->
+    <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
+        class="prize-tip-text"></image>
+      <view class="prize-name">{{prizeInfo.prize_name}}</view>
+      <view class="prize-img">
+        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+      </view>
+      <!-- <view class="btn-box">
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+      </view> -->
+    </view>
+    <!-- 中奖的产品 -->
+    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
+        class="prize-tip-text"></image>
+      <view class="prize-name">{{prizeInfo.prize_name}}</view>
+      <view class="prize-img">
+        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+      </view>
+      <!-- <view class="btn-box">
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+      </view> -->
+    </view>
+    <!-- 未中奖 -->
+    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix"
+        class="prize-tip-text"></image>
+      <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
+      <view class="prize-img">
+        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
       </view>
+      <view class="btn-box">
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+        <view bindtap="closePrice">我知道了</view>
+      </view>
+    </view>
+    <!-- 未抽奖状态 -->
+    <view style="position:relative" wx:else>
+      <image bindtap="choosePrize" style="display:block;width:533rpx"
+        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+      <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
     </view>
+    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx"
+      src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
   </view>
- </view>
-
-
-
 </view>
-
-<!-- 开屏页 -->
+<!-- 广告弹窗 -->
+<view class="zzc" bindtap="closeAdv"  wx:if="{{showAdv}}"  ></view>
+<view class="alertavd" wx:if="{{showAdv}}">
+  <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+    <block wx:for="{{alertSwipeList}}" wx:key="*this">
+    <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
+      <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+    </swiper-item>
+    </block>
+  </swiper>
+  <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+</view>
+<!-- 广告弹窗结束 -->
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
@@ -304,4 +672,12 @@
 		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
 	</view>
 </view>
-
+<!-- <view class="topBox">
+    <view class="Qtop" :style="{height:height}">
+      <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+    </view>
+    <view class="jumpBox">
+      <view class="time">{{time}}s</view>
+      <view bind:tap="gotoIndex">跳过</view>
+    </view>
+</view> -->
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index e25c5f0..6195ca8 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,11 +1,12 @@
-/* pages/indexs/index.wxss */
+/**index.wxss**/
 /* 元旦修改 */
 page {
-  background: #f5f2ed;
+  /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/bg.png");
-  background-size: 100% 100%;
-  background-repeat: round;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
+  background: #9DDCF5 url('https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png');
+  background-repeat: repeat-y;
+  background-size: contain;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -38,10 +39,18 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
+  /* height: 64rpx; */
+  /* background: rgba(255, 255, 255, 0.6); */
+  /* border-radius: 32rpx; */
+  /* color: #666; */
+  /* height: 70.67rpx; */
   height: 64rpx;
   background: rgba(255,255,255,0.7);
   border-radius: 32rpx;
-  color: #000;
+  /* color: #72674E; */
+  color: #333333;
+  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
+  background-size: 100% 100%; */
   display: flex;
   align-items: center;
   font-size: 25rpx;
@@ -50,7 +59,7 @@ page {
   font-size: 30rpx;
   margin-left: 20rpx;
   margin-right: 10rpx;
-  color: #000;
+  /* color: #72674E; */
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -72,18 +81,20 @@ page {
   /* background: #FFFFFF; */
   /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
-  width: 697rpx;
+  width: 710rpx;
   margin: 0 auto;
   position: relative;
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 7rpx;
+  padding-bottom: 29.33rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  background: #FFFED6;
-  margin-top: -20rpx;
-  padding-top: 54rpx;
+  /* background: #FFFED6; */
+  margin-top: -50rpx;
+  padding-top: 84rpx;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240606/80bc185bf83b276b114415d670eaa57f.png');
+  background-size: 100% 100%;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -104,8 +115,7 @@ page {
   margin-bottom: 10rpx;
 }
 .content {
-  /* margin: 0 25rpx; */
-  margin-top: 20.67rpx;
+  margin: 0 25rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -195,11 +205,13 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 24rpx 26.67rpx 26.67rpx;
-  /* width: 100%; */
+  margin: 50rpx 0;
+  width: 100%;
   height: 154rpx;
   border-radius: 20rpx;
+  /* border-radius: 77rpx; */
   overflow: hidden;
+  margin-bottom: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -307,15 +319,12 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  /* width: 100%;
+  width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap; */
-    display: flex;
-    justify-content: space-between;
-    margin: 0 28rpx;
+  flex-wrap: wrap;
 }
 .title-more {
   font-size: 24rpx;
@@ -334,29 +343,36 @@ page {
   font-size: 22rpx;
 }
 .slide-out-box {
-  /* margin-top: 20rpx;
+  margin-top: 20rpx;
   background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  /* margin-bottom: 40rpx; */
+  margin-bottom: 40rpx;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
+  background-size: 100% 100%;
 }
 .pbservice {
-  width: calc(160rpx * 8);
+  /* width: calc(175rpx * 6); */
+  /* 元旦修改 */
+  width: calc(190rpx * 8);
   display: flex;
-  margin-top: 5rpx;
-  /* flex-wrap: wrap; */
-  flex-wrap: nowrap;
-  /* padding-left: 12rpx; */
-  /* overflow-x: scroll; */
+  margin-top: 20rpx;
+  flex-wrap: wrap;
+  /* margin-bottom: 60rpx; */
+  /* 元旦修改 注释margin-bottom */
 }
 .pbservice-item {
+  /* 元旦修改 截止到注释的width*/
   width: 120rpx;
-  margin-bottom: 25rpx;
-  margin-right: 32.33rpx;
+  margin-bottom: 33.33rpx;
+  margin-right: 62.33rpx;
+  /* width: 175rpx; */
   text-align: center;
-  font-size: 27rpx;
-  color: #000;
+  font-size: 25rpx;
+  /* color: #333; */
+  /* 春节调整颜色改版 */
+  color: #54504D;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -371,7 +387,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 80rpx;
+  width: 106rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -555,24 +571,29 @@ page {
   overflow: hidden;
   margin: 30rpx auto; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
-  width: 48rpx !important;
-  height: 8rpx;
+  width: 73rpx !important;
+  height: 7rpx;
   /* background: #DDCEAC; */
   background: #fff;
-  border-radius: 4rpx;
-  margin: 0 auto 25rpx;
+  border-radius: 3rpx;
+  margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  height: 8rpx;
-  background: #078565;
-  border-radius: 4rpx;
+  /* width: 300rpx;
+  height: 6rpx;
+  border-radius: 3rpx;
+  background: #0B898E; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  height: 7rpx;
+  background: #56A5EA;
+  border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 24rpx;
-  background: #078565;
-  height: 8rpx;
-  border-radius: 4rpx;
+  margin-left: 37.33rpx;
+  background: #56A5EA;
+  height: 7rpx;
+  border-radius: 3rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -684,6 +705,8 @@ page {
   box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240606/e1c3f60baf65787d593c6a7c79f881c7.png');
+  background-size: 100% 100%;
 }
 .other-plats image {
   width: 80rpx;
@@ -841,23 +864,16 @@ page {
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  /* margin: 0 5rpx; */
-  /* width: 50rpx; */
-  /* height: 33rpx; */
   width: 43rpx;
   height: 43rpx;
   line-height: 43rpx;
-  background: #4AB648;
-  /* background: #F9F1DB; */
-  /* border-radius: 5rpx; */
+  background: #FFEF47;
   border-radius: 13rpx;
   font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  /* color: #D62828; */
-  color: white;
+  color: #000;
   text-align: center;
-  /* line-height: 33rpx; */
 }
 .time-box text {
   width: 18rpx;
@@ -904,18 +920,20 @@ page {
 /* 元旦修改新增样式 */
 .xpth-product {
   /* position: absolute; */
-  width: 697rpx;
+  width: 700rpx;
   height: 373rpx;
-  background: #FFFED6;
+  /* background: #FFFED6; */
   box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx 15rpx;
+  padding: 25rpx;
   box-sizing: border-box;
   /* left: 0;
   bottom: 15.33rpx;
   /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
+  background-size: 100% 100%;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
@@ -1034,9 +1052,9 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 160rpx !important;
-  height: 255rpx !important;
-  /* margin-bottom: 26.67rpx; */
+  width: 158.67rpx !important;
+  height: 218.67rpx !important;
+  margin-bottom: 26.67rpx;
 }
 
 .ggfw-list {
@@ -1047,8 +1065,8 @@ page {
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 113.33rpx !important;
-  height: 113.33rpx !important;
+  width: 70rpx !important;
+  height: 70rpx !important;
 }
 
 .six-box-new {
@@ -1156,290 +1174,18 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-
-.right-more {
-  width: 120rpx;
-  height: 47rpx;
-  background-color: rgba(255,255,255,.7);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #078565;
-  text-align: center;
-  line-height: 47rpx;
-}
-
-.hdrlNavList {
-  display: flex;
-  margin: 28rpx 26.67rpx 10rpx;
-  overflow-x: scroll;
-  flex-wrap: nowrap;
-}
-.hdrlNav {
-  flex-shrink: 0;
-  /* width: 160rpx; */
-  padding: 0 20rpx;
-  height: 53rpx;
-  background: #F8FFDB;
-  border-radius: 13rpx;
-  font-size: 32rpx;
-  color: #078565;
-  text-align: center;
-  line-height: 53rpx;
-  margin-right: 14rpx;
-}
-.hdrlNavActive {
-  background-color: #078565;
-  font-size: 32rpx;
-  color: #FFFFFF;
-}
-.hdrlItem {
-  flex-shrink: 0;
-  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
-  /* width: 593.33rpx; */
-  display: flex;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+.jqssd {
+  background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
   background-size: 100% 100%;
-}
-.hdrlItem-img {
-  width: 280rpx;
-  height: 213rpx;
-  background: #8C8C8C;
-  border-radius: 13rpx;
-  flex-shrink: 0;
-  margin-right: 12rpx;
-}
-.hdrlItem-content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 213rpx;
-}
-.hdrlItem-title {
-  font-weight: bold;
-  font-size: 28rpx;
-  color: #000000;
-  margin-top: 15.33rpx;
-}
-.hdrlItem-date {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #000000;
-  margin-bottom: 19.33rpx;
-}
-
-.main-box {
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20240603/8ddceea4612d2cfb46d1a0203f4b55ac.png");
-  background-size: 100% 100%;
-  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
-  margin: 0 8rpx;
-}
-.main-box-top {
-  display: flex;
-  margin-bottom: 5.33rpx;
-}
-.gfyj,.sslk {
-  width: 369.33rpx;
-  height: 146rpx;
+  width: 365.33rpx;
+  height: 166rpx;
   flex-shrink: 0;
 }
 .sslk {
-  margin-left: -48rpx;
-}
-
-.movieItem {
-  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20240606/eec4af8edf598dc7c440cff8a5fdbe98.png");
   background-size: 100% 100%;
+  width: 365.33rpx;
+  height: 166rpx;
   flex-shrink: 0;
-  height: 206.67rpx;
-}
-.movieItem-img {
-  width: 213rpx;
-  height: 213rpx;
-  border-radius: 18rpx;
-  margin-right: 18rpx;
-  flex-shrink: 0;
-}
-.ysz-box {
-    margin: 0 8rpx 15.33rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png");
-    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
-    background-size: 100% 100%;
-    width: 733.33rpx;
-    height: 320rpx;
-    padding-top: 33.33rpx;
-}
-.ysz-more {
-    width: 333rpx;
-    height: 53rpx;
-    background: #FFFFFF;
-    border-radius: 27rpx;
-    margin: 23rpx auto 0;
-    text-align: center;
-    line-height: 53rpx;
-    font-weight: 500;
-    font-size: 27rpx;
-    color: #078565;
-}
-.ysz-box2 {
-  /* padding: 20rpx 35rpx; */
-  padding-top: 23.33rpx;
-}
-.tjbd-title {
-  width: 286.67rpx;
-  height: 80rpx;
-}
-
-.bd-box {
-  position: relative;
-  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
-  margin-left: 26.67rpx;
-  width: 582rpx;
-  /* height: 1133rpx; */
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
-  border-radius: 20rpx 80rpx 20rpx 20rpx;
-}
-.bd-top {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 30rpx;
-  position: relative;
-}
-.zz {
-    width: 236.67rpx;
-    height: 206.67rpx;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 2;
-}
-.bd-type {
-  width: 167.33rpx;
-  height: 38.67rpx;
-}
-.bd-more {
-  width: 120rpx;
-  height: 47rpx;
-  background: rgba(255,255,255,.7);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #078565;
-  z-index: 9;
-  text-align: center;
-  line-height: 47rpx;
-}
-.bd-index {
-  font-weight: bold;
-  font-size: 40rpx;
-  color: #000000;
-}
-.bd-item {
-  margin-left: 45.33rpx;
-  width: 453rpx;
-  height: 147rpx;
-  background: #FFFFFF;
-  border-radius: 13rpx;
-  display: flex;
-}
-.bd-item-img {
-    width: 147rpx;
-    height: 147rpx;
-    background: #D9D9D9;
-    border-radius: 13rpx;
-    flex-shrink: 0;
-    margin-right: 12.67rpx;
-}
-.bd-item-content {
-    padding: 14rpx 29.33rpx 13.33rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-.bd-item-title {
-    font-weight: bold;
-    font-size: 27rpx;
-    color: #333333;
-}
-.bd-item-bottom {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    width: 260rpx;
-}
-.bd-price {
-    font-size: 29.33rpx;
-    color: #F93434;
-    font-weight: bold;
-}
-.bd-price:after {
-  content:'起';
-  color: #999999;
-  font-size: 23rpx;
-  font-weight: 700;
-}
-.bd-price::before {
-  content:'￥';
-  font-size: 23rpx;
-}
-.bd-distance {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #999999;
-}
-
-.buyMovie {
-    width: 160rpx;
-    height: 56rpx;
-    background: #078565;
-    color: #fff;
-    border-radius: 20rpx;
-    text-align: center;
-    line-height: 56rpx;
-}
-
-.bg1 {
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-}
-.bg2 {
-  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
-}
-.bg3 {
-  background: linear-gradient(180deg, #E0F7DC, #A0F292);
-}
-.bg4 {
-  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
-}
-
-.hdrlNavList::-webkit-scrollbar{
-  display:none;
-}
-.hdrlList::-webkit-scrollbar{
-  display:none;
-}
-.bottom-box::-webkit-scrollbar{
-  display:none;
-}
-.slide-box::-webkit-scrollbar{
-  display:none;
-}
-.pbservice::-webkit-scrollbar{
-  display:none;
-}
-.textOver3 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
-.public-box {
-  width: 593.33rpx;
-  height: 266.67rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-}
-.one::-webkit-scrollbar{
-  display:none;
+  margin-left: -20rpx;
 }
\ No newline at end of file

From 03e6c44de8eaab26231ee6d2cef22c35407a1f2c Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 17 Jun 2024 16:56:13 +0800
Subject: [PATCH 161/471] =?UTF-8?q?=E5=8D=81=E5=85=A8=E5=8D=81=E7=BE=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/index/index.js         | 20 ++++++++++----------
 subPackages/index/index.js   | 20 ++++++++++----------
 subPackages/index/index.wxss |  8 ++++----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app.js b/app.js
index 3034935..545905f 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.isTest121? true : false;
+      data.isTest = data.isTest122? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 31c027a..cb95008 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -50,16 +50,16 @@ Page({
 		djs: null, // 元旦新增 新品特惠倒计时
 		djsTime: null,
 		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240607/3acf736c1dc9c7af08d3363833669896.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240607/56ccaab57aaf050bb6feccc3a70983bb.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
+			'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
+			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
+			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
+			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
+			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
+			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
+			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
+			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
+			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
 		],
 		viewHeight: "0px",
 		isMuted: true,
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 31c027a..cb95008 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -50,16 +50,16 @@ Page({
 		djs: null, // 元旦新增 新品特惠倒计时
 		djsTime: null,
 		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240607/3acf736c1dc9c7af08d3363833669896.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240607/56ccaab57aaf050bb6feccc3a70983bb.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
+			'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
+			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
+			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
+			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
+			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
+			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
+			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
+			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
+			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
 		],
 		viewHeight: "0px",
 		isMuted: true,
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 1b3ab46..6195ca8 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -81,18 +81,18 @@ page {
   /* background: #FFFFFF; */
   /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
-  width: 697rpx;
+  width: 710rpx;
   margin: 0 auto;
   position: relative;
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 7rpx;
+  padding-bottom: 29.33rpx;
   justify-content: space-between;
   flex-wrap: wrap;
   /* background: #FFFED6; */
-  margin-top: -20rpx;
-  padding-top: 54rpx;
+  margin-top: -50rpx;
+  padding-top: 84rpx;
   background: url('https://static.ticket.sz-trip.com/uploads/20240606/80bc185bf83b276b114415d670eaa57f.png');
   background-size: 100% 100%;
 }

From 67e9b6056c442520e50230d5e75c9d175cf43032 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 17 Jun 2024 18:16:44 +0800
Subject: [PATCH 162/471] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 12 ++++++------
 pages/index/index.wxml | 13 +++++++++----
 pages/index/index.wxss |  7 +++++--
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index cb95008..0cea4a7 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -487,12 +487,12 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wxdd39069b9a91dbfe',
-				path: 'pages/index/index'
-			})
-			return;
+		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// 	wx.navigateToMiniProgram({
+		// 		appId: 'wxdd39069b9a91dbfe',
+		// 		path: 'pages/index/index'
+		// 	})
+		// 	return;
 		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 59e3171..a0aa6c7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -426,13 +426,18 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0;">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">查看全部 <text
-        class="iconfont icon-you"></text> </navigator>
+    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+      <view>
+        查看全部
+      </view>
+      <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode=""/>
+      <!-- <text class="iconfont icon-you"></text>  -->
+    </navigator>
     <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
   </view>
-  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240606/ec3159a8e5b6bb0ccce8aef14ca70f14.png');background-size: 100% 100%;">
+  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
     <!-- 元旦修改 ggfw为新增类名 -->
-    <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;">
+    <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
       <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
         data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 6195ca8..c31ae1d 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -334,10 +334,13 @@ page {
   z-index: 9;
   width: 173rpx;
   height: 40rpx;
-  line-height: 40rpx;
+  /* line-height: 40rpx; */
   background: rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
@@ -1004,7 +1007,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 230rpx;
+  width: 210rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;

From c3ed122bb40216bb82c73cd8b6d761e01f341c8c Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 24 Jun 2024 09:52:19 +0800
Subject: [PATCH 163/471] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |  2 +-
 pages/index/index.wxml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 545905f..c779918 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.isTest122? true : false;
+      data.isTest = data.isTest123? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index a0aa6c7..7c1803d 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -444,16 +444,17 @@
         <view>景区舒适度</view>
       </view> -->
         <!-- 元旦修改 ggfw为新增类名 -->
-            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
+      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
         <view>安全服务</view>
+      </view> -->
+      <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡"
+      data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
+        <view>电子社保卡</view>
       </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>

From bb30f9b4749f36a20f8b6726fa08d53597f54576 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 27 Jun 2024 16:57:27 +0800
Subject: [PATCH 164/471] =?UTF-8?q?=E4=B9=A6=E5=88=B8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=A6=96=E9=A1=B5=E4=B9=A6=E4=BB=93=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=8A=95=E8=B5=84=E5=AF=BC=E5=BC=95=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     |  2 +-
 pages/index/index.wxml     | 19 +++++++++----------
 pages/index/index.wxss     |  2 +-
 pages/order/pay/index.js   |  7 ++++---
 pages/order/scene/index.js |  3 ++-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index c779918..e829353 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.isTest123? true : false;
+      data.isTest = data.isTest124? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7c1803d..8f1cae7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -295,14 +295,11 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
           <view class="text">文旅单位</view>
         </view>
-        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-          <view>书香借阅</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
           <view class="text">书仓</view>
-        </view>
+        </view> -->
         <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
           class="pbservice-item">
           <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
@@ -342,14 +339,16 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
           <view>云上文博会</view>
         </view> -->
-        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+          <view class="text">书仓</view>
+        </view>
+        <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-          <view>投资导引图</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
           <view class="text">投资导引图</view>
-        </view>
+        </view> -->
         <!-- <view bindtap="gotoUrl" data-title="数字文物"
           data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c31ae1d..0206548 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -358,7 +358,7 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 8);
+  width: calc(190rpx * 7);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index c1e6dd1..b39ef3a 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -84,9 +84,10 @@ Page({
       order_id:this.data.id
     }).then(res=>{
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265){
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929){
 		  this.setData({
-		    isBook:true
+        isBook:true,
+        payIndex:1
 		  })
 	  }
       if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
@@ -227,7 +228,7 @@ Page({
             })
             setTimeout(()=>{
               wx.redirectTo({
-                url: '../payresult/index?tid='+this.data.id+'&ids='+_this.data.ids.join(',')
+                url: '../payresult/index?tid='+this.data.id+'&ids='+this.data.ids.join(',')
               })
             },1000)
           }
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 81be03d..82b8e39 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -78,8 +78,9 @@ Page({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
+    console.log(this.data.singlePrice);
+    this.showAllPrice()
     this.getNewCoupon()
-    // this.showAllPrice()
   //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];

From 6939efc2a8133fff326caf218f2de1c2190ddd0d Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 28 Jun 2024 17:18:45 +0800
Subject: [PATCH 165/471] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=E8=A5=BF?=
 =?UTF-8?q?=E9=A6=86=E8=B7=B3=E5=9B=9E=E6=9C=AC=E5=B9=B3=E5=8F=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       | 2 +-
 pages/list/museum/index.wxml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index e829353..74dadae 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.isTest124? true : false;
+      data.isTest = data.isTest125? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 3a39036..56b57e9 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -19,11 +19,11 @@
         <view class="btn-yy">预约</view>
       </view>
       <view class="tip-box">
-        <view class="com-flex" catchtap="gotoDetailOther" data-id='44703'>
+        <view class="com-flex" catchtap="gotoDetail" data-item="{{list[1]}}">
           <view>
             <text>博物馆西馆</text>
           </view>
-          <view class="btn-yy">预约</view>
+          <view class="btn-yy">查看</view>
         </view>
       </view>
     </view>

From f7c973ec87a7c7d12a3ee20ea7ac5e22ade2fc04 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 2 Jul 2024 16:57:00 +0800
Subject: [PATCH 166/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=89=88=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4,=E5=8D=81=E5=85=A8=E8=A1=97=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=8B=E6=9E=B6=E6=96=87?=
 =?UTF-8?q?=E6=97=85=E5=8D=95=E4=BD=8D=EF=BC=8C=E8=A7=86=E8=A7=89=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=9B=B4=E5=90=8D=E4=B8=BA=E7=BE=8E=E5=9B=BE=E9=89=B4?=
 =?UTF-8?q?=E8=B5=8F=EF=BC=8C=E4=BA=91=E4=B8=8A=E6=96=87=E5=8D=9A=E4=BC=9A?=
 =?UTF-8?q?=E5=92=8C=E4=BA=91=E4=B8=8A=E8=A7=82=E5=B1=95=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=B9=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/index/index.js                  | 15 +++++----
 pages/index/index.wxml                | 45 +++++++--------------------
 pages/index/index.wxss                |  2 +-
 pages/pbService/appreciate/index.wxml |  2 +-
 5 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/app.js b/app.js
index 74dadae..4194903 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.isTest125? true : false;
+      data.isTest = data.isTest126? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 0cea4a7..17d2100 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -17,8 +17,7 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
-			"gongyeyuanqu", "gaoxin"
+		area_ids: [ "changshu", "gongyeyuanqu", "kunshan", "taicang", "wujiang", "gusu", "gaoxin", "wuzhong", "xiangcheng", "zhangjiagang"
 		],
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
@@ -50,16 +49,16 @@ Page({
 		djs: null, // 元旦新增 新品特惠倒计时
 		djsTime: null,
 		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
-			'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
+      'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
+			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
 			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
+			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
 			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
-			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
-			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
 			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
 			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
+			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
+			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
+			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
 		],
 		viewHeight: "0px",
 		isMuted: true,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8f1cae7..4a1cd86 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -263,38 +263,26 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
         <view class="text">公共文化资源库</view>
       </view>
+      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
+        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+        <view>云上观展</view>
+      </view>
       <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-          <view>云上文博会</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-          <view class="text">云上文博会</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-          data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
-          <view>云上观展</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-          <view>云上观展</view>
-        </view>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+        <view class="text">云上文博会</view>
+      </view>
         <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
-          <view>精彩回顾</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
           <view class="text">精彩回顾</view>
         </view>
-        <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+        <!-- <view bindtap="gotoPath" data-event="institution_click" 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> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
           <view class="text">文旅单位</view>
-        </view>
+        </view> -->
         <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
           class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
@@ -302,19 +290,13 @@
         </view> -->
         <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
-          <view>苏影通</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
           <view class="text">苏影通</view>
         </view>
-        <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
+        <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏"
           data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
-          <view>视觉中心</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-          <view class="text">视觉中心</view>
+          <view class="text">美图鉴赏</view>
         </view>
         <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
           data-path="/pages/pbService/wwcx/index" class="pbservice-item">
@@ -323,9 +305,6 @@
         </view> -->
         <view bindtap="goH5"  data-title="文化场馆查询"
           data-path="Museum" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
-          <view>文化场馆查询</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
           <view class="text">文化场馆查询</view>
         </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 0206548..2b646a1 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -358,7 +358,7 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 7);
+  width: calc(190rpx * 6);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index 6f45fad..e25de35 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/pbService/appreciate/index.wxml-->
-<title title="视觉中心"></title>
+<title title="美图鉴赏"></title>
 <view class="top-menus">
   <view class="appreciate-types">
     <view class="appreciate-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">图片鉴赏</view>

From b90e7367959bc69a4b73a2881af6a07ce2d294c0 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 8 Jul 2024 10:58:39 +0800
Subject: [PATCH 167/471] =?UTF-8?q?=E6=9C=9F=E7=A5=A8=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/order/scene/index.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 4194903..5127000 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.isTest126? true : false;
+      data.isTest = data.isTest127? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 82b8e39..7690c0c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -97,9 +97,9 @@ Page({
     // console.log('productNum',this.data.productNum);
     console.log('couponInfo',app.globalData.couponInfo);
     if (this.data.ticket_type != 1) {
-      this.setData({
-        singlePrice:app.globalData.product.product.price
-      })
+      // this.setData({
+      //   singlePrice:app.globalData.product.product.price
+      // })
       let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
       if (price >0) {
         this.setData({

From e833b512f2a175462ff4c39901c3763e0e8303af Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 8 Jul 2024 18:03:57 +0800
Subject: [PATCH 168/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=9C=BA=E5=92=8C=E5=9B=BE=E4=B9=A6=E9=A6=86?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              | 2 +-
 pages/pbService/appreciate/index.js | 3 ++-
 pages/pbService/index.js            | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 5127000..0975e40 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.isTest127? true : false;
+      data.isTest = data.isTest128? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/pbService/appreciate/index.js b/pages/pbService/appreciate/index.js
index 5703e2d..b3c1743 100644
--- a/pages/pbService/appreciate/index.js
+++ b/pages/pbService/appreciate/index.js
@@ -40,7 +40,7 @@ Page({
         videoTags:res.data,
         videoTagId:res.data[0].CatalogId
       })
-      this.getList();
+      // this.getList();
     })
     // 获取图片的标签
     commonApi._post("pbservice/Artpopulate/imgTags").then(res=>{
@@ -53,6 +53,7 @@ Page({
         picTagId:res.data[0].TagId
       })
     })
+    this.getList();
   },
   changeType:function(e){
     let type = e.currentTarget.dataset.type;
diff --git a/pages/pbService/index.js b/pages/pbService/index.js
index 4d995c5..74d2f9b 100644
--- a/pages/pbService/index.js
+++ b/pages/pbService/index.js
@@ -71,8 +71,8 @@ Page({
     let url = e.currentTarget.dataset.url;
     app.globalData.weburl = url;
     wx.navigateTo({
-      url: "/pages/pbService/web/index"
-    })
+			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
+		})
   },
   gotoSku: function () {
     commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {

From a5f26413bcc60c77486212c04c92a90f418716fb Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 11 Jul 2024 18:38:55 +0800
Subject: [PATCH 169/471] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |   2 +-
 pages/index/index.js                        |  13 +-
 pages/list/six/index.js                     |   5 +
 pages/order/components/contact/index.js     | 451 +++++++++++++++++---
 pages/order/components/contact/index.wxml   |  30 +-
 pages/order/components/contact/index.wxss   |  22 +-
 pages/order/components/date/index.wxss      |   1 +
 pages/order/scene/index.js                  |  10 +-
 pages/user/order/museumOrderInfo/index.js   |  15 +
 pages/user/order/museumOrderInfo/index.wxml |  17 +-
 pages/user/order/museumOrderInfo/index.wxss |   8 +
 pages/user/order/sceneOrderInfo/index.wxml  |   2 +-
 12 files changed, 480 insertions(+), 96 deletions(-)

diff --git a/app.js b/app.js
index 0975e40..7ca0819 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.isTest128? true : false;
+      data.isTest = data.isTest129? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 17d2100..2575eb1 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -17,8 +17,7 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: [ "changshu", "gongyeyuanqu", "kunshan", "taicang", "wujiang", "gusu", "gaoxin", "wuzhong", "xiangcheng", "zhangjiagang"
-		],
+		area_ids: [ "changshu", "taicang", "kunshan", "wujiang", "gongyeyuanqu", "zhangjiagang", "wuzhong", "xiangcheng", "gusu", "gaoxin"],
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -50,15 +49,15 @@ Page({
 		djsTime: null,
 		sqjNew: [
       'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
-			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
 			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
+			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
 			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
-			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
+			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
+			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
 			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
 			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
-			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
+			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
+			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
 		],
 		viewHeight: "0px",
 		isMuted: true,
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index b2c94be..574d584 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -54,6 +54,11 @@ Page({
 		  appId: 'wx8888a3fd0862b4c8',
 		  path: 'pages/index/index'
 		})
+  }else if (e.currentTarget.dataset.event.area_key == 'changshu') {
+    wx.navigateToMiniProgram({
+		  appId: 'wx4df5fd9a6a5ea123',
+			path: 'pages/index'
+		})
   }
   },
   goH5(e){
diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js
index d51a4be..5871ac1 100644
--- a/pages/order/components/contact/index.js
+++ b/pages/order/components/contact/index.js
@@ -24,11 +24,14 @@ Component({
       type:Number,
       value:1,
       observer(nv, ov, path) {
-        if (nv) { 
+        if (nv) {
           let num = nv-this.data.selectLinkman.length
           this.setData({
             showNum:num
           })
+          if (nv<ov) {
+            this.delMan()
+          }
         }
       }
     },
@@ -52,6 +55,7 @@ Component({
     editId:null,
     isGroup:null,
     showManList:[],
+    stagingManList:[], // 暂存用户信息 
     showNum:0,
     showAdd:false,
     formData:{},
@@ -61,9 +65,23 @@ Component({
     personId:null,
     r:[],
     phone:null,//非实名时需要传的电话
+    manList:[],
+    seldManList:[],
+    keyboardHeight: 0
   },
   lifetimes: {
     attached: function() {
+      wx.onKeyboardHeightChange(res => {
+        if (res.height > 0) {
+          this.setData({
+            keyboardHeight: res.height
+          });
+        } else {
+          this.setData({
+            keyboardHeight: 0
+          });
+        }
+      });
       // 在组件实例进入页面节点树时执行
       console.log(this.properties.productNum);
       console.log(this.properties.is_real_name);
@@ -84,27 +102,28 @@ Component({
         })
       }
       // 获取默认联系人
-      commonApi.user_post("token/check").then(res=>{
-        this.setData({
-          isGroup:app.globalData.product.isGroup
-        })
-        if(res.code==1){
-          userApi.user_post("user/getDefaultContact",{
-            contactType:"CONTACT"
-          }).then(res=>{
-            if(res.data){
-              let length =[res.data].length
-              this.setData({
-                selectLinkman:[res.data],
-                showNum:this.data.showNum-length,
-                showManList:[res.data]
-              })
-              this.triggerEvent("setLinkman",[res.data])
-            }
-            this.getLinkmanList()
-          })
-        }
-      })
+      // commonApi.user_post("token/check").then(res=>{
+      //   this.setData({
+      //     isGroup:app.globalData.product.isGroup
+      //   })
+      //   if(res.code==1){
+      //     userApi.user_post("user/getDefaultContact",{
+      //       contactType:"CONTACT"
+      //     }).then(res=>{
+      //       if(res.data){
+      //         let length =[res.data].length
+      //         this.setData({
+      //           selectLinkman:[res.data],
+      //           showNum:this.data.showNum-length,
+      //           showManList:[res.data]
+      //         })
+      //         this.triggerEvent("setLinkman",[res.data])
+      //       }
+      //       this.getLinkmanList()
+      //     })
+      //   }
+      // })
+      this.getLinkmanList()
       // 获取证件列表
       userApi.user_post("user/getCardTypeList", {}).then(r => {
         console.log(r)
@@ -205,8 +224,20 @@ Component({
       this.showAddMask()
     },
     showLinkman:function(){
+      // console.log(this.data.linkmanList);
+      let linkmanList = this.data.linkmanList,seldManList = this.data.seldManList
+      linkmanList.map(linkman=>{
+        linkman.selected = 0;
+        seldManList.map(item=>{
+          if(item.id==linkman.id){
+            linkman.selected = 1;
+          }
+        })
+      })
       this.setData({
-        showMask:!this.data.showMask
+        showMask:!this.data.showMask,
+        linkmanList,
+        seldManList
       })
     },
     showAddMask:function(){
@@ -215,6 +246,11 @@ Component({
         showMask:!this.data.showMask
       })
     },
+    addMask:function(){
+      this.setData({
+        showAdd:!this.data.showAdd
+      })
+    },
     cancel:function(){
       let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
       linkmanList.map(linkman=>{
@@ -292,7 +328,9 @@ Component({
           }
         })
         this.setData({
-          showAdd:!this.data.showAdd
+          showAdd:!this.data.showAdd,
+          formData:{},
+          editId:null
         })
         this.getLinkmanList()
       }
@@ -301,6 +339,7 @@ Component({
   //取消添加出行人
   del:function(){
     this.setData({
+      editId:null,
       formData:{},
       showAdd:!this.data.showAdd
     })
@@ -343,11 +382,28 @@ Component({
   },
     confirm:function(){
       let linkmanList = this.data.linkmanList,selectLinkman = [];
-      linkmanList.map(linkman=>{
-        if(linkman.selected==1){
-          selectLinkman.push(linkman);
+      console.log(linkmanList);
+      //  2. 将选中的出行人展示到页面中
+      let newManlist = []  
+      let manList = this.data.manList
+      let newSeldManList = []
+      linkmanList.map((item,index) => {
+        if (item.selected === 1) {
+          newManlist.push(item)
+          newSeldManList.push(item)
+        }
+      })
+      manList.map(item => {
+        if (!newManlist.some(s => s.id === item.id)) {
+          if (newManlist.length < 3) {
+            newManlist.push({...item, selected: 0})
+          } 
         }
       })
+
+    console.log('-----',newManlist);
+     
+
       // 需要 改成 根据父组件的购买数量
       let showNum = this.properties.productNum
       // let showNum = this.data.showNum
@@ -361,12 +417,14 @@ Component({
       //   })
       //   return;
       // }
+      this.triggerEvent("setLinkman",newSeldManList)
       this.setData({
         selectLinkman:selectLinkman,
+        manList:newManlist,
+        seldManList:newSeldManList,
         showManList:showManList,
         showNum:showNum
       })
-      this.triggerEvent("setLinkman",selectLinkman)
       this.showLinkman()
     },
     getLinkmanList:function(){
@@ -377,68 +435,225 @@ Component({
         limit:1000
       }).then(res=>{
         let list = res.data;
-        list.map(item=>{
-          this.data.selectLinkman.map(linkman=>{
-            if(linkman.id==item.id){
-              item.selected = 1;
-            }
-          })
+        // list.map(item=>{
+        //   this.data.selectLinkman.map(linkman=>{
+        //     if(linkman.id==item.id){
+        //       item.selected = 1;
+        //     }
+        //   })
+        // })
+        // 这里不和默认出行人匹配，直接截取前三个
+        list.map((item,index)=> {
+          if (index== 0) {
+            item.selected = 1
+          }else {
+            item.selected = 0
+          }
+        })
+        let manList = list.slice(0,3)
+        let seldManList = []
+        
+        list.map((item,index)=> {
+          if (item.selected == 1) {
+            seldManList.push(item)
+          }
         })
+        this.triggerEvent("setLinkman",seldManList)
         this.setData({
-          linkmanList:list
+          linkmanList:list,
+          manList,
+          selectLinkman:list,
+          seldManList:seldManList
         })
       })
     },
-    setDefault:function(e){
-      let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList;
-      userApi.user_post("user/setDefaultContact",{
-        contactId:item.id
-      }).then(res=>{
-        if(res.code==1){
-          wx.showToast({
-            title: '设置成功',
-            icon: 'success'
-          })
-          linkmanList.map(linkman=>{
-            if(linkman.id==item.id){
-              linkman.is_default=1;
-            }
-            else {
-              linkman.is_default = 0;
-            }
-          })
-          this.setData({
-            linkmanList:linkmanList
-          })
-        }
+    delMan() {
+      let seldManList = this.data.seldManList,selectLinkman = this.data.selectLinkman,manList=this.data.manList,linkmanList=this.data.linkmanList
+      let newManlist = JSON.parse(JSON.stringify(manList)) 
+      let newSeldManList =JSON.parse(JSON.stringify(seldManList))   
+      // 3.减少时 选择的用户信息跟着修改
+      if (seldManList.length === this.properties.productNum +1)  {
+        newSeldManList.pop()
+        newManlist.forEach(f => { 
+          if(newSeldManList.some(s => s.id === f.id)) {
+            f.selected = 1
+          } else {
+            f.selected = 0
+          }
+        })
+
+      }
+      this.triggerEvent("setLinkman",newSeldManList)
+       this.setData({
+        // seldManList,
+        selectLinkman,
+        manList: newManlist,
+        seldManList: newSeldManList
       })
     },
+    // setDefault:function(e){
+    //   let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList;
+    //   userApi.user_post("user/setDefaultContact",{
+    //     contactId:item.id
+    //   }).then(res=>{
+    //     if(res.code==1){
+    //       wx.showToast({
+    //         title: '设置成功',
+    //         icon: 'success'
+    //       })
+    //       linkmanList.map(linkman=>{
+    //         if(linkman.id==item.id){
+    //           linkman.is_default=1;
+    //         }
+    //         else {
+    //           linkman.is_default = 0;
+    //         }
+    //       })
+    //       this.setData({
+    //         linkmanList:linkmanList
+    //       })
+    //     }
+    //   })
+    // },
     delLinkman:function(e){
+      // if (seldManList.length === 1) return
       wx.showLoading({
         title: '加载中',
       })
-      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman,showManList = this.data.showManList;
+      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman,showManList = this.data.showManList,linkmanList=JSON.parse(JSON.stringify(this.data.linkmanList)),manList = this.data.manList,seldManList= this.data.seldManList;
       selectLinkman.splice(index,1);
+      let item = e.currentTarget.dataset.item
+      seldManList = seldManList.filter(f => f.id !== item.id)
+      manList.forEach(f => {
+        if(f.id === item.id) {
+           f.selected = 0
+        }
+      })
+      //  debugger
+      linkmanList.forEach(linkman=> {
+        if (linkman.id === item.id) {
+          linkman.selected =0
+        }
+      })
       showManList.splice(index,1);
       this.triggerEvent("setLinkman",selectLinkman)
       this.setData({
         selectLinkman:selectLinkman,
         showManList:showManList,
-        showNum:selectLinkman.length>0?this.data.showNum+1:1
+        showNum:selectLinkman.length>0?this.data.showNum+1:1,
+        linkmanList,
+        seldManList,
+        manList
       })
       wx.hideLoading()
     },
-    select:function(e) {
-      console.log(e);
-      let item = e.target.dataset.item
-      if (this.properties.is_real_name == '1') { // 一证一票
-        this.selectIt(item)
-      } else {
-        this.selectOne(item)
+    select:function(e) {  
+      // debugger
+      let item = e.target.dataset.item,seldManList = [],manList = this.data.manList,linkmanList = this.data.linkmanList,list = []
+      if (this.properties.productNum > linkmanList.filter(f=> f.selected === 1).length ) {
+        // 票数大于信息数 继续勾选
+        if (this.properties.is_real_name == '1' && this.properties.productNum != 1) { // 一证一票
+          // this.selectIt(item)   
+          // 一证一票 且 票数大于1
+         // 1. 当选择的出行人小于购票数量时，才能继续添加出行人
+          if (linkmanList.filter(f => f.selected === 1).length < this.properties.productNum || item.selected === 1) {
+            linkmanList.forEach(linkman=> {
+              if (linkman.id == item.id) {
+                linkman.selected =  linkman.selected === 1 ? 0 : 1
+              }
+            }) 
+          } 
+        } else {
+          // let flag = manList.some(obj => obj.id === item.id) 
+          // if (flag) {
+            manList.map(man=> {
+              if (man.id == item.id) {
+                man.selected =1
+              }else {
+                man.selected =0
+              }
+            })
+            linkmanList.map(linkman=> {
+              if (linkman.id == item.id) {
+                linkman.selected =1
+              }else {
+                linkman.selected =0
+              }
+            })
+        // }
+      }
+      }else if( (this.properties.productNum == 1 && this.properties.productNum == linkmanList.filter(f=> f.selected === 1).length)) {
+        // debugger
+        // 票数为1，切换选择：如果在manList内，就直接切换，不在则将出行人放入manList内
+        let flag = manList.some(obj => obj.id === item.id) 
+        if (flag) {
+          manList.map(man=> {
+            if (man.id == item.id) {
+              man.selected =1
+            }else {
+              man.selected =0
+            }
+          })
+          linkmanList.map(linkman=> {
+            if (linkman.id == item.id) {
+              linkman.selected =1
+            }else {
+              linkman.selected =0
+            }
+          })
+          console.log(manList,linkmanList);
+        }else {
+          item.selected = 1
+          manList.unshift(item)
+          manList = manList.slice(0,3)
+          manList.map(man=> {
+            if (man.id == item.id) {
+              man.selected =1
+            }else {
+              man.selected =0
+            }
+          })
+          linkmanList.map(linkman=> {
+            if (linkman.id == item.id) {
+              linkman.selected =1
+            }else {
+              linkman.selected =0
+            }
+          })
+        }
+      }else {
+        // debugger
+        if (item.selected === 1) {
+          linkmanList.forEach(f => {
+            if(f.id === item.id) {
+              f.selected = 0
+            }
+          })
+        } else {
+          wx.showToast({
+            title: '您只需选择'+this.properties.productNum+'位游客',
+            icon: "none"
+          });
+          return
+        }
+        
       }
+      // this.triggerEvent("setLinkman",seldManList)
+      this.setData({
+        // manList,
+        linkmanList,
+        // seldManList,
+        selectLinkman:manList
+      })
+      // if (this.properties.is_real_name == '1') { // 一证一票
+      //   this.selectIt(item)
+      // } else {
+      //   this.selectOne(item)
+      // }
     },
     // 一证一票不让他多选
     selectOne:function(e) {
+      // debugger
       console.log(e);
       let item = e,linkmanList = this.data.linkmanList,num = 0
       linkmanList.map(linkman=>{
@@ -462,12 +677,12 @@ Component({
     },
     // 可多选
     selectIt:function(e){
+      
     console.log(e,app.globalData.product)
     console.log(e);
       // let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1);
       let item = e,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1);
       // 先计算出全部选中的出行人
-	  console.log(111)
       linkmanList.map(linkman=>{
         if(linkman.selected==1){
           num++;
@@ -508,8 +723,108 @@ Component({
           linkman.selected = linkman.selected==1?0:1;
         }
       })
+      // let manList = linkmanList.slice(0,3)
       this.setData({
-        linkmanList:linkmanList
+        linkmanList:linkmanList,
+        // manList,
+      })
+    },
+    // 勾选展示
+    selcetFrame(e) {
+      let item = e.currentTarget.dataset.item
+      let index = e.currentTarget.dataset.index
+      let manList = this.data.manList,seldManList = this.data.seldManList,linkmanList = this.data.linkmanList
+      if (this.properties.productNum !== 1 && this.properties.productNum === seldManList) {
+        wx.showToast({
+          title: '您只需选择'+this.properties.productNum+'位游客',
+          icon: "none"
+        });
+        return  // 出行人和购票数量相同的情况就return
+      } 
+      if (this.properties.is_real_name == '1') { // 一证一票
+        // this.selectIt(item)
+        let count = 0
+        manList.forEach(people=> {
+          if (people.selected == 1) {
+            count++
+          }
+        })
+        if (count< this.properties.productNum) { // 选中的出行人数量小于票数
+            manList.map(man=>{
+              if(item.id==man.id){
+                man.selected = man.selected==1?0:1;
+              }
+            })
+           if(seldManList.length < this.properties.productNum && item.selected === 0) {
+             seldManList.push(item)
+           } else {
+             seldManList = seldManList.filter(f => f.id !== item.id)
+           }
+          
+        }else { // 否则换掉
+          if ( this.properties.productNum == 1) {
+            if (item.selected == 1) {
+              manList.forEach(man=>{
+                if (man.id === item.id) {
+                  man.selected = 0
+                } 
+              })
+              seldManList = []
+            } else {
+              manList.forEach(man=>{ 
+                if (man.id === item.id) {
+                  man.selected = 1  
+                }else {
+                  man.selected = 0 
+                  
+                }
+              }) 
+              seldManList = [item]
+
+            }
+            // manList.map((item)=> {
+            //   if (item.selected == 1) {
+            //     seldManList.push(item)
+            //   }
+            // })
+          }else {
+            // return
+            if(item.selected === 1) {
+              manList.forEach(f => {
+                if(f.id === item.id) {
+                  f.selected = 0
+                }
+              })
+            seldManList = seldManList.filter(f => f.id !== item.id)
+             }
+          }
+          
+        }
+      }else {
+        if (item.selected == 1) {
+          manList.forEach(man=>{
+            if (man.id === item.id) {
+              man.selected = 0
+            } 
+          })
+          seldManList = []
+        } else {
+          manList.forEach(man=>{ 
+            if (man.id === item.id) {
+              man.selected = 1  
+            }else {
+              man.selected = 0 
+              
+            }
+          }) 
+          seldManList = [item]
+        }
+      }
+      this.triggerEvent("setLinkman",seldManList)
+      this.setData({
+        manList,
+        seldManList,
+        linkmanList
       })
     }
   }
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index 25e85ae..c7a5246 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -4,6 +4,7 @@
       <!-- <view wx:if="{{isGroup==1}}">{{isGroup==1?'发起人信息':'添加出行人'}}</view> -->
       <view wx:if="{{isGroup==1}}">发起人信息</view>
       <view wx:elif="{{is_authentication == '0'}}">出行人信息</view>
+      <view wx:elif="{{is_real_name == '0'}}">仅需填1位出行人</view>
       <view wx:else>需填{{productNum}}位出行人</view>
       <view wx:if="{{isGroup==1}}" class="group-tip-text">（*预约发起后前往个人中心-团体预约订单中查看详情）</view>
     </view>
@@ -37,19 +38,24 @@
       <view bindtap="showLinkman" class="add-btn1"><text class="iconfont icon-add-select"></text>添加</view>
       <view style="height:25rpx"></view> -->
     <view class="contacts-list" wx:else>
-      <view wx:if="{{showManList.length>0}}" style="display: flex;position: relative;">
-        <view style="width: 550rpx;display: flex;overflow-x: scroll;">
-          <view class="name-box"  wx:for="{{showManList}}">
+       <!-- <view> <text>manList</text></view> -->
+
+      <view wx:if="{{manList.length>0}}" style="display: flex;position: relative;margin-bottom: 40rpx;">
+        <view style="width: 550rpx;display: flex;">
+          <view class="{{item.selected == 1 ?'name-box':'frame'}}"  wx:for="{{manList}}" bindtap="selcetFrame" data-index="{{index}}" wx-if="{{index < 3}}" data-item="{{item}}">
             <text>{{item.name}}</text>
-            <image class="name-selected-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/dui.png" mode=""/>
+            <image wx:if="{{item.selected == 1}}" class="name-selected-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/dui.png" mode=""/>
           </view>
         </view>
         <view class="more" bindtap="showLinkman">
           更多>
         </view>
       </view>
-      <view class="contact-item" wx:for="{{selectLinkman}}" wx:if="{{selectLinkman.length>0}}">
-        <view class="iconfont icon-jian" bindtap="delLinkman" data-index="{{index}}"></view>
+      <!-- <text>seldManList</text>
+      <text>{{seldManList.length}}</text> -->
+
+      <view class="contact-item" wx:for="{{seldManList}}" wx:if="{{seldManList.length>0}}">
+        <view class="iconfont icon-jian" bindtap="delLinkman" data-index="{{index}}" data-item="{{item}}"></view>
         <view class="contact-info">
           <view class="contact-name">{{item.name}}</view>
           <view class="contact-other" style="margin-bottom:10rpx"><text>手机号</text>{{item.tel}}</view>
@@ -59,7 +65,8 @@
         <!-- <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator> -->
       </view>
       <view wx:if="{{is_real_name=='1'}}">
-        <view class="text1" bindtap="showLinkman" wx:for="{{selectLinkman.length?(productNum-selectLinkman.length+1) :showNum}}" wx:for-index="index" wx:if="{{showNum>0 &&index+1>selectLinkman.length}}">
+      
+        <view class="text1" bindtap="addMask" wx:for="{{productNum}}" wx:for-index="index" wx:if="{{index > (seldManList.length -1)}}">
           <view style="display: flex;align-items: center;">
             <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
             <!-- <view style="margin-right: 36rpx;" wx:if="{{selectLinkman.length>0}}">出行人{{selectLinkman.length+1}}</view> -->
@@ -69,8 +76,8 @@
           <image style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
         </view>
       </view>
-      <view wx:if="{{is_real_name=='0' && selectLinkman.length==0}}">
-        <view class="text1" bindtap="showLinkman">
+      <view wx:if="{{is_real_name=='0' && seldManList.length==0}}">
+        <view class="text1" bindtap="addMask">
           <view style="display: flex;align-items: center;">
             <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
             <view style="margin-right: 36rpx;">出行人1</view>
@@ -101,6 +108,7 @@
     </view>
     <!-- <navigator url="/pages/user/linkman/add/index" class="add-btn">添加出行人</navigator> -->
     <view class="add-btn" bindtap="showAddMask">添加出行人</view>
+    <!-- <text>linkmanList</text> -->
     <view class="linkmanlist-item" wx:for="{{linkmanList}}">
       <view class="linkmanlist-item-top">
         <!-- <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator> -->
@@ -119,7 +127,7 @@
 <view wx:if="{{showAdd}}" class="mask">
   <view class="mask-bg"></view>
   <view style="position: fixed;bottom: 0;">
-    <view class="mask-content1">
+    <view class="mask-content1" style="padding-bottom: {{keyboardHeight+20}}px;">
     <view class="btns1">
       <view bindtap="del">取消</view>
       <view>{{editId?'编辑':'添加'}}出行人</view>
@@ -128,7 +136,7 @@
     <view class="input-box" style="margin:0;padding: 0 24.67rpx;">
     <view class="input-item">
       <text class="input-label">姓名</text>
-      <input bindinput="nameInput" value="{{formData.username}}" class="weui-input" auto-focus placeholder="请输入姓名" />
+      <input bindinput="nameInput" value="{{formData.username}}" class="weui-input" auto-focus placeholder="请输入姓名" focus="inputFocus"/>
     </view>
     <view class="input-item">
       <text class="input-label">证件类型</text>
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index a17cb17..bbe7d69 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -92,14 +92,17 @@
   padding: 0 25rpx;
   overflow-y: auto;
   background: #F7F7F7;
-  max-height: 50%;
+  min-height: 800rpx;
+  /* max-height: 50%; */
 }
 .mask-content1 {
     width: 700rpx;
     padding: 50rpx 20rpx 112rpx;
     overflow-y: auto;
     background: #F7F7F7;
-    max-height: 50%;
+    padding-bottom: 100rpx;
+    /* min-height: 500rpx; */
+    /* max-height: 50%; */
 }
 .linkmanlist-item {
   background: white;
@@ -259,4 +262,19 @@
     align-items: center;
     border-top: 1rpx solid #ccc;
     padding-right: 50rpx;
+}
+
+.frame {
+  position: relative;
+  width: 167rpx;
+  height: 73rpx;
+  background: #F1F1F1;
+  border-radius: 11rpx;
+  text-align: center;
+  line-height: 73rpx;
+  margin-right: 16.67rpx;
+  font-weight: 400;
+  font-size: 29rpx;
+  color: #000000;
+  flex-shrink: 0;
 }
\ No newline at end of file
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index 2c9de38..3ce5048 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -92,4 +92,5 @@
   left: 0;
   right: 0;
   bottom: 0;
+  padding-bottom: 50rpx;
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 7690c0c..ede777c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -154,12 +154,12 @@ Page({
         //   coupon: null
         // })
       }
-      let productNum = linkmanList.length == 0 ? 1 : this.data.productNum < linkmanList.length ? linkmanList.length : this.data.productNum;
-    if (this.data.gp_id) {
-      productNum = app.globalData.product.maxNum;
-    }
+      // let productNum = linkmanList.length == 0 ? 1 : this.data.productNum < linkmanList.length ? linkmanList.length : this.data.productNum;
+    // if (this.data.gp_id) {
+    //   productNum = app.globalData.product.maxNum;
+    // }
     this.setData({
-      productNum: productNum,
+      // productNum: productNum,
       linkmanList: linkmanList
     })
     // this.changePrice()
diff --git a/pages/user/order/museumOrderInfo/index.js b/pages/user/order/museumOrderInfo/index.js
index a1c91a7..87a0d49 100644
--- a/pages/user/order/museumOrderInfo/index.js
+++ b/pages/user/order/museumOrderInfo/index.js
@@ -34,6 +34,21 @@ Page({
     })
     
   },
+  openMap(e) {
+    let title = this.data.info.order_product_list[0].scene_detail.title,lon=this.data.info.order_product_list[0].scene_detail.lon,lat=this.data.info.order_product_list[0].scene_detail.lat,address=this.data.info.order_product_list[0].address;
+    wx.getLocation({
+      type: 'gcj02', // 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于 wx.openLocation 的坐标
+      success: function (res) {
+        wx.openLocation({
+          latitude:Number(lat),
+          longitude:Number(lon), // 经度
+          name:title,
+          address:address,
+          scale: 18, // 缩放比例          
+        })
+      }
+    })
+  },
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
     qrcode.map((item,index)=>{
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 761d612..bf8eaf7 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -66,7 +66,13 @@
     <text>时段：{{info.order_product_list[0].start_time}} ~ {{info.order_product_list[0].end_time}}</text>
   </view>
   <view class="detail-item">
-    <text>地址：{{info.order_product_list[0].scene_detail.address}}</text>
+    <view>
+      <text>地址：{{info.order_product_list[0].scene_detail.address}}</text>
+    </view>
+    <view style="display: flex;align-items: center;" bindtap="openMap">
+      <image style="width: 36rpx;height: 36rpx;margin-right: 13.33rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/c915f86073571a724afdb03524d05887.png" mode=""/>
+      <text style="font-weight: 500;font-size: 24rpx;color: #0B898E;">导航</text>
+    </view>
   </view>
 </view>
 <view class="box" wx:if="{{info}}">
@@ -105,6 +111,15 @@
     <text>支付方式：{{pay_methods[info.pay_method]}}</text>
   </view>
 </view>
+<view class="box">
+  <view class="box-title">交通推荐</view>
+  <view class="box-bg" bindtap="openMap">
+    <image style="width:37.33rpx;height:52.67rpx;margin-left: 37.33rpx;margin-right: 30rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/a04ab4996e17d5d801afee00547d08d4.png" mode=""/>
+    <view style="font-family: PingFang SC;font-weight: 500;font-size: 32rpx;color: #111111;">
+      {{info.order_product_list[0].product_title}}>
+    </view>
+  </view>
+</view>
 <navigator url="/pages/user/service/index" class="bottom-btn">
   <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
diff --git a/pages/user/order/museumOrderInfo/index.wxss b/pages/user/order/museumOrderInfo/index.wxss
index c20a26f..e4d8a32 100644
--- a/pages/user/order/museumOrderInfo/index.wxss
+++ b/pages/user/order/museumOrderInfo/index.wxss
@@ -281,4 +281,12 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
+}
+.box-bg {
+  width: 646.67rpx;
+  height: 200rpx;
+  background: url('https://static.ticket.sz-trip.com/uploads/20240710/950358218f65d01ee9d0f4e055b6cbd7.png');
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
 }
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 0642c0e..8d02f7e 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -76,7 +76,7 @@
       </view>
       <view class="row" wx:if="{{item.product_model == 'ticket' && !item.order_advance.id}}">
         <view>出行日期：</view>
-        <view>{{item.use_date}} {{ item.start_time }}-{{ item.end_time }}</view>
+        <view>{{item.use_date}} <text wx:if="{{item.start_time && item.end_time}}">{{ item.start_time }}-{{ item.end_time }}</text> </view>
       </view>
 
       <view class="row" wx:if="{{item.product_model == 'ticket' && item.order_advance.id}}">

From 2c268b5706928d45a0b74cca8392a14bac0263c4 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 12 Jul 2024 12:01:08 +0800
Subject: [PATCH 170/471] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E9=BB=98=E8=AE=A4=E5=87=BA=E8=A1=8C?=
 =?UTF-8?q?=E4=BA=BA=E9=82=A3=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                    | 2 +-
 pages/order/components/contact/index.wxml | 2 +-
 pages/order/components/contact/index.wxss | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 7ca0819..e64d02e 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.isTest129? true : false;
+      data.isTest = data.isTest130? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index c7a5246..54bbe86 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -120,7 +120,7 @@
         </view>
         <view class="iconfont {{item.selected==1?'icon-gou':'icon-quan'}}" bindtap="select" data-item="{{item}}"></view>
       </view>
-      <view class="linkmanlist-tip" bindtap="setDefault" data-item="{{item}}"><text class="iconfont {{item.is_default==1?'icon-iconfontoptionbutton':'icon-quan'}}"></text> 设为默认出行人</view>
+      <!-- <view class="linkmanlist-tip" bindtap="setDefault" data-item="{{item}}"><text class="iconfont {{item.is_default==1?'icon-iconfontoptionbutton':'icon-quan'}}"></text> 设为默认出行人</view> -->
     </view>
   </view>
 </view>
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index bbe7d69..9687713 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -113,7 +113,7 @@
   display: flex;
   margin: 0 20rpx;
   padding: 30rpx 13rpx;
-  border-bottom: 1rpx dashed #ccc;
+  /* border-bottom: 1rpx dashed #ccc; */
   display: flex;
   justify-content: space-between;
   align-items: center;

From ca3e194f9b5078207db5c7c4692f66daf54608f6 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 16 Jul 2024 17:12:49 +0800
Subject: [PATCH 171/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=9B=A2=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/scene/index.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index ede777c..c4440a9 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -407,15 +407,15 @@ Page({
 	  console.log(this.data)
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
-    if (this.data.is_need_idcard == 1) {
-      if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-        wx.showToast({
-          title: '请添加出行人',
-          icon: "none"
-        })
-        return;
-      }
-    }
+    // if (this.data.is_need_idcard == 1) {
+    //   if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+    //     wx.showToast({
+    //       title: '请添加出行人',
+    //       icon: "none"
+    //     })
+    //     return;
+    //   }
+    // }
     if (!date && this.data.ticket_type == 1) {
       wx.showToast({
         title: '请选择使用日期',

From e33d009e64465e627c22dc0d91489d3627f7e618 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Jul 2024 17:16:59 +0800
Subject: [PATCH 172/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                           |   5 +-
 pages/component/SearchHeader.js    |   9 +
 pages/component/SearchHeader.wxml  |  13 +-
 pages/index/index.js               |   8 +-
 pages/index/index.wxml             | 317 ++++++-------
 pages/index/index.wxss             |   4 +-
 pages/list/night/index.js          |   2 +-
 pages/order/pay/index.js           |  11 +-
 pages/order/scene/index.js         |   7 +-
 pages/user/address/add/index.js    |   7 +
 pages/user/service/list/index.wxml |   4 +-
 pages/user/user.wxml               |   4 +-
 subPackages/feiyiNew/index.js      | 657 ++++++++++++++++++++++++++
 subPackages/feiyiNew/index.json    |   7 +
 subPackages/feiyiNew/index.wxml    | 232 ++++++++++
 subPackages/feiyiNew/index.wxss    | 721 +++++++++++++++++++++++++++++
 subPackages/techanCart/index.js    | 404 ++++++++++++++++
 subPackages/techanCart/index.json  |   6 +
 subPackages/techanCart/index.wxml  |  65 +++
 subPackages/techanCart/index.wxss  | 242 ++++++++++
 subPackages/techanNew/index.js     | 690 +++++++++++++++++++++++++++
 subPackages/techanNew/index.json   |   7 +
 subPackages/techanNew/index.wxml   | 213 +++++++++
 subPackages/techanNew/index.wxss   | 685 +++++++++++++++++++++++++++
 24 files changed, 4121 insertions(+), 199 deletions(-)
 create mode 100644 subPackages/feiyiNew/index.js
 create mode 100644 subPackages/feiyiNew/index.json
 create mode 100644 subPackages/feiyiNew/index.wxml
 create mode 100644 subPackages/feiyiNew/index.wxss
 create mode 100644 subPackages/techanCart/index.js
 create mode 100644 subPackages/techanCart/index.json
 create mode 100644 subPackages/techanCart/index.wxml
 create mode 100644 subPackages/techanCart/index.wxss
 create mode 100644 subPackages/techanNew/index.js
 create mode 100644 subPackages/techanNew/index.json
 create mode 100644 subPackages/techanNew/index.wxml
 create mode 100644 subPackages/techanNew/index.wxss

diff --git a/app.json b/app.json
index fa14c57..1326c78 100644
--- a/app.json
+++ b/app.json
@@ -189,7 +189,10 @@
         "root": "subPackages",
         "pages": [
             "indexs/index",
-            "index/index"
+            "index/index",
+            "techanNew/index",
+            "techanCart/index",
+            "feiyiNew/index"
         ]
     }],
   "plugins": {
diff --git a/pages/component/SearchHeader.js b/pages/component/SearchHeader.js
index ad07287..642f934 100644
--- a/pages/component/SearchHeader.js
+++ b/pages/component/SearchHeader.js
@@ -36,6 +36,10 @@ Component({
     focusclickid:{
       type:String,
       value:""
+    },
+    name:{
+      type:String,
+      value:""
     }
   },
 
@@ -65,6 +69,11 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    getVal(e) {
+      console.log(e.detail.value);
+      let keywords = e.detail.value == ''?'': e.detail.value
+      this.triggerEvent("onload",{keywords:keywords})
+    },
     inputFocus:function(){
       // if(this.properties.focusclickid){
       //   wx.uma.trackEvent(this.properties.focusclickid);
diff --git a/pages/component/SearchHeader.wxml b/pages/component/SearchHeader.wxml
index 3ffcdf9..8d84ec0 100644
--- a/pages/component/SearchHeader.wxml
+++ b/pages/component/SearchHeader.wxml
@@ -1,5 +1,16 @@
 <view class="title-box{{transparent==1?' bg-box':''}}" style="height:{{isScene==1?'0':(height+padHeight)}}px;">
-  <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px">
+  <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px" wx:if="{{name!=''}}">
+    <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
+    <view bindtap="indexFocus" class="search-box" style="margin-right:{{right + 5}}px;">
+      <icon class="iconfont icon-sousuo"></icon>
+      <input bindfocus="inputFocus" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="getVal" class="weui-input" placeholder="搜索" />
+      <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
+        <view style="color: #ccc;">|</view>
+        <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;">搜索</view>
+      </view>
+    </view>
+  </view>
+  <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px" wx:else>
     <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
     <view bindtap="indexFocus" class="search-box" style="margin-right:{{right + 5}}px;">
       <icon class="iconfont icon-sousuo"></icon>
diff --git a/pages/index/index.js b/pages/index/index.js
index 2575eb1..9c09033 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -491,7 +491,13 @@ Page({
 		// 		path: 'pages/index/index'
 		// 	})
 		// 	return;
-		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		} else if (e.currentTarget.dataset.title == 'e读书') {
+			wx.navigateToMiniProgram({
+				appId: 'wx26e6f4c0baba005b',
+				path: 'pages/index/index'
+			})
+			return;
+		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4a1cd86..1de875d 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -9,11 +9,8 @@
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
   <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
     mode="aspectFill"></image>
@@ -26,8 +23,8 @@
     <view class="textOver">搜索想要的旅游产品或服务</view>
   </navigator>
 </view>
-<view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+<view style="position:relative;z-index: 1;">
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
     <block wx:for="{{banner}}" wx:key="*this">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -48,15 +45,13 @@
   </block>
 </swiper> -->
 <view class="top-icons" wx:if="{{!isTest}}">
-  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
-    class="top-icon-item">
+  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">活动日历</view>
   </view>
-  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
-    data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
@@ -65,57 +60,56 @@
   <!-- 非遗跳专题 -->
   <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
+  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="{{isTest?'/pages/list/scene/index':'/subPackages/feiyiNew/index'}}" class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">非遗专卖</view>
   </view>
-  <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
-    data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+  <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+    <view class="top-icon-text">非遗专卖</view>
+  </view> -->
+  <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">剧场演出</view>
   </view>
-  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
+  <!-- 2024年7月新版文创特产 -->
+  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="{{isTest?'/pages/list/road/index':'/subPackages/techanNew/index'}}" class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">文创特产</view>
   </view>
-  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
-    class="top-icon-item">
+  <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+    <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+    <view class="top-icon-text">文创特产</view>
+  </view> -->
+  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">景点门票</view>
   </view>
-  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
-    class="top-icon-item">
+  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">酒店住宿</view>
   </view>
-  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
-    class="top-icon-item">
+  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">夜游苏州</view>
   </view>
-  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
-    class="top-icon-item">
+  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
     <view class="top-icon-text">一日游</view>
   </view>
-  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
-    class="top-icon-item">
+  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
     <!-- 夏季修改 -->
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
     <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
@@ -124,15 +118,12 @@
 </view>
 <view class="content">
   <view class="sale-road-boxes" wx:if="{{false}}">
-    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品"
-      data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
       <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
       <view class="sale-product">
         <view class="sale-product-bg"></view>
-        <image mode="aspectFill" class="sale-img"
-          src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png"
-          mode="aspectFill">
+        <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
         </image>
         <view class="sale-info">
           <view class="sale-product-title textOver2">
@@ -144,16 +135,12 @@
         </view>
       </view>
     </view>
-    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路"
-      data-path="/pages/list/road/index">
+    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
       <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
       <view class="sale-product">
         <view class="sale-product-bg road-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx"
-          src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg"
-          mode="aspectFill"></common-image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png"
-          mode="aspectFill">
+        <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
+        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
         </image>
         <view class="sale-info">
           <view class="sale-product-title textOver2">
@@ -171,11 +158,10 @@
     <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
   </view>
   <view class="small-swiper-box" wx:else>
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <!-- 原 圆角77rpx，现改为13rpx -->
+          <!-- 原 圆角77rpx，现改为13rpx -->
           <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
@@ -186,10 +172,8 @@
   </view>
   <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
   <view style="display: flex;">
-    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort"  class="jqssd" ></view>
-    <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
+    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"></view>
+    <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
   <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
@@ -199,7 +183,7 @@
         <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
       </view>
       <view class="time-box" style="z-index: 9;">
-      倒计时
+        倒计时
         <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
         <text>:</text>
         <view class="xsth-time">{{djs.m}}</view>
@@ -215,8 +199,8 @@
     <view class="xpth-product">
       <!-- 左边的2个产品 -->
       <view class="xpth-left">
-        <view  class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-          <image src="{{item.headimg}}" mode=""/>
+        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+          <image src="{{item.headimg}}" mode="" />
           <view class="xpth-item-content">
             <view class="xpth-item-title textOver2">{{item.title}}</view>
             <!-- <view class="xpth-tag">唇齿留香</view> -->
@@ -228,12 +212,12 @@
         </view>
       </view>
       <!-- 右边的banner -->
-      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill"/>
+      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" />
     </view>
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
   </view>
   <!-- 五一修改 .slide-out-box 增加背景色-->
   <view class="slide-out-box">
@@ -241,43 +225,50 @@
     <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
       <view class="pbservice" style="margin-bottom:30rpx">
         <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
-          <view>非遗鉴赏</view> -->
-          <!-- 元旦修改 第一个pbservice-item新增margin-left -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
           <view class="text">非遗鉴赏</view>
         </view>
-        <view bindtap="goH5" data-title="数字博物馆"
-          data-path="BwsInfo" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
-          <view>数字博物馆</view> -->
-          <!-- 元旦修改 -->
+        <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
           <view class="text">数字博物馆</view>
         </view>
-        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-        <view>公共文化资源库</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-        <view class="text">公共文化资源库</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-        data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-        <view>云上观展</view>
-      </view>
-      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
-          class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-        <view class="text">云上文博会</view>
-      </view>
-        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
-          class="pbservice-item">
+        <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+          <view class="text">数字名人馆</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+          <view>云上观展</view>
+        </view>
+        <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+          <view class="text">云上文博会</view>
+        </view>
+        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
           <view class="text">精彩回顾</view>
         </view>
+        <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+          <view class="text">文化场馆查询</view>
+        </view>
+        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
+          <view class="text">苏影通</view>
+        </view>
+        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+          <view class="text">书仓</view>
+        </view>
+        <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240716/1b3895b680bc447b84829623d43cee02.png" mode="widthFix"></image>
+          <view class="text">e读书</view>
+        </view>
+
+        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+          <view class="text">数字公共文化</view>
+        </view>
         <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
           data-path="/pages/list/culturalUnit/index" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
@@ -288,13 +279,11 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
           <view class="text">书仓</view>
         </view> -->
-        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
-          <view class="text">苏影通</view>
+        <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+          <view class="text">云游苏州</view>
         </view>
-        <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏"
-          data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+        <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
           <view class="text">美图鉴赏</view>
         </view>
@@ -303,11 +292,6 @@
           <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
           <view>文物查询</view>
         </view> -->
-        <view bindtap="goH5"  data-title="文化场馆查询"
-          data-path="Museum" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-          <view class="text">文化场馆查询</view>
-        </view>
         <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
           data-path="/pages/pbService/museum/index" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
@@ -318,11 +302,6 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
           <view>云上文博会</view>
         </view> -->
-        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-          <view class="text">书仓</view>
-        </view>
         <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
           class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
@@ -338,14 +317,12 @@
           <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
           <view>团体预约</view>
         </view> -->
-
         <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
           data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
           class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
           <view>廉洁地图</view>
         </view> -->
-
         <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
           class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
@@ -362,20 +339,14 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
   </view>
   <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-      <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-      <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
+    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+    <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+    <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
     </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
     <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
@@ -387,7 +358,7 @@
     </image>
     <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
-      <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
+    <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
     <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
@@ -408,7 +379,7 @@
       <view>
         查看全部
       </view>
-      <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode=""/>
+      <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode="" />
       <!-- <text class="iconfont icon-you"></text>  -->
     </navigator>
     <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
@@ -421,30 +392,26 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view> -->
-        <!-- 元旦修改 ggfw为新增类名 -->
+      <!-- 元旦修改 ggfw为新增类名 -->
       <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
         <view>安全服务</view>
       </view> -->
-      <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡"
-      data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+      <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
         <view>电子社保卡</view>
       </view>
-      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view>
-      <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+      <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
-      <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+      <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
         <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
@@ -469,7 +436,7 @@
   </view>
   <view class="sale-road-boxes">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
   </view>
   <!-- <view class="six-box">
     <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
@@ -479,14 +446,12 @@
   </view> -->
   <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
   <view class="six-box-new" wx:if="{{!isTest}}">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
-      src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
     </image>
   </view>
   <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
   </view>
   <view class="other-plats" wx:if="{{otherPlat}}">
     <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
@@ -496,17 +461,15 @@
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode=""/>
+    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
   </view>
   <view class="hot-list" wx:if="{{isTest==false}}">
     <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
       <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
         <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}"
-            mode="aspectFill"></common-image>
+          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
           <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png"
-            mode="widthFix"></image>
+          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
           <view class="today-date">{{date}} {{month}}</view>
           <view class="today-hot-box">
             <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
@@ -545,7 +508,8 @@
               <view wx:for="{{item.ext.display_tags}}" class="tag textOver">{{item}}</view>
             </view> -->
             <view wx:if="{{item.ext.type!='tenscenic' && item.ext.price}}" class="hot-price">
-              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+            </view>
           </view>
         </view>
       </view>
@@ -556,14 +520,11 @@
 </view>
 <view class="mask prizeMask" wx:if="{{videoPrize}}">
   <view class="mask-bg"></view>
-  <view class="mask-content"
-    style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+  <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
     <!-- 中奖的卡券 -->
     <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
-        class="prize-tip-text"></image>
+      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
       <view class="prize-name">{{prizeInfo.prize_name}}</view>
       <view class="prize-img">
         <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
@@ -575,10 +536,8 @@
     </view>
     <!-- 中奖的产品 -->
     <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
-        class="prize-tip-text"></image>
+      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
       <view class="prize-name">{{prizeInfo.prize_name}}</view>
       <view class="prize-img">
         <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
@@ -590,10 +549,8 @@
     </view>
     <!-- 未中奖 -->
     <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix"
-        class="prize-tip-text"></image>
+      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
       <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
       <view class="prize-img">
         <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
@@ -605,56 +562,42 @@
     </view>
     <!-- 未抽奖状态 -->
     <view style="position:relative" wx:else>
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
       <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
     </view>
-    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx"
-      src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
+    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
   </view>
 </view>
 <!-- 广告弹窗 -->
-<view class="zzc" bindtap="closeAdv"  wx:if="{{showAdv}}"  ></view>
+<view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
 <view class="alertavd" wx:if="{{showAdv}}">
   <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
     <block wx:for="{{alertSwipeList}}" wx:key="*this">
-    <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
-      <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-    </swiper-item>
+      <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
+        <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+      </swiper-item>
     </block>
   </swiper>
   <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
 </view>
 <!-- 广告弹窗结束 -->
-<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
-	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
-    </view>
-	
-	<!-- 视频 -->
-	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-		<video
-			style="width:100vw;height:100vh;display:block;"
-			id="myVideo" 
-			src="{{startList.head_img}}" 
-			show-center-play-btn="{{false}}"
-			show-play-btn="{{true}}" 
-			autoplay
-			controls="{{false}}"
-			bindended="videoend"
-			loop="{{true}}"
-			muted="{{isMuted}}"
-			object-fit="fill"
-		></video>
-		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-	</view>
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
+  <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+  <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+    <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+  </view>
+
+  <!-- 视频 -->
+  <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+    <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
+
+    <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+    <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+  </view>
 </view>
 <!-- <view class="topBox">
     <view class="Qtop" :style="{height:height}">
@@ -664,4 +607,4 @@
       <view class="time">{{time}}s</view>
       <view bind:tap="gotoIndex">跳过</view>
     </view>
-</view> -->
+</view> -->
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 2b646a1..9f28cb3 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -358,9 +358,9 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 6);
+  width: calc(190rpx * 7);
   display: flex;
-  margin-top: 20rpx;
+  margin-top: 30rpx;
   flex-wrap: wrap;
   /* margin-bottom: 60rpx; */
   /* 元旦修改 注释margin-bottom */
diff --git a/pages/list/night/index.js b/pages/list/night/index.js
index 422ab83..6ac9fa9 100644
--- a/pages/list/night/index.js
+++ b/pages/list/night/index.js
@@ -23,7 +23,7 @@ Page({
       })
     this.getList()
   },
-  search:function(){
+  search:function(e){
     this.setData(e.detail);
     this.setData({
       list:[],
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index b39ef3a..9c33ef7 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -20,6 +20,7 @@ Page({
     wxPay:false,
     isBook:false,
     ids:[], // 多产品id
+    status:false
   },
 
   /**
@@ -128,6 +129,9 @@ Page({
           title: '订单已支付',
           icon:'success'
         })
+        this.setData({
+          status:true
+        })
         setTimeout(()=>{
           wx.reLaunch({
             url: '/pages/user/order/list',
@@ -255,7 +259,12 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-
+    if (!this.data.status) {
+      wx.reLaunch({
+        url: '/pages/user/order/list',
+      })
+    }
+    
   },
 
   /**
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index ede777c..046076e 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -36,6 +36,7 @@ Page({
     is_authentication:1, // 是否实名，0否1是，默认实名
     phone:'', //不实名时传的手机号
     is_real_name:1, // 是否是一证一票，0否1是，
+    status:false
   },
 
   /**
@@ -162,6 +163,7 @@ Page({
       // productNum: productNum,
       linkmanList: linkmanList
     })
+    console.log(this.data.linkmanList);
     // this.changePrice()
     this.totalPrice(this.data.singlePrice)
     }
@@ -615,6 +617,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    // this.setData({
+    //   productNum:1
+    // })
+    // app.globalData.productNum =1
 	if(app.globalData.list && app.globalData.list.length != 0 && this.data.type!='museum'){
 		app.globalData.product = app.globalData.list[app.globalData.index]
 	}
@@ -669,7 +675,6 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-
   },
 
   /**
diff --git a/pages/user/address/add/index.js b/pages/user/address/add/index.js
index 647d084..73b4b2f 100644
--- a/pages/user/address/add/index.js
+++ b/pages/user/address/add/index.js
@@ -275,12 +275,19 @@ Page({
       data.id = this.data.id;
       service ="editConsignee";
     }
+    let address = province+city+area+" "+data.address
+    let name = data.username
+    let tel = data.mobile
     user.user_post("user/" + service,data).then(res=>{
       if(res.data){
         wx.showToast({
           title: '保存成功',
           icon:'success'
         })
+        wx.setStorageSync('linkMan',{
+          ...data,address:address,name:name,tel:tel
+          // ...data,address:data.seldAdd+data.address
+        })
         util.back()
       }
     })
diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml
index dc1785c..43455a0 100644
--- a/pages/user/service/list/index.wxml
+++ b/pages/user/service/list/index.wxml
@@ -22,8 +22,8 @@
     <!-- 成功 -->
     <view class="modal-dialog" wx:if="{{showModal && ses}}">
       <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
- <view>客服服务时间：8：30-11:30,</view>
- <view>13:00-17:30</view>
+ <view>客服服务时间:9:00-12:00,</view>
+ <view>13:00-18:00</view>
 如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view></view></view>
       <view class="modal-footer">
         <view
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index c8a04cf..37be7b7 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -126,8 +126,8 @@
 
     <view class="model-content">
       <view>即将跳转人工客服</view>
-      <view style="margin-top: 40rpx;">客服服务时间：08：30-17：30，</view>
-      <view style="margin-top: 30rpx;margin-left: 110rpx;">13:00-17:30</view>
+      <view style="margin-top: 40rpx;">客服服务时间:09:00-12:00,</view>
+      <view style="margin-top: 30rpx;">13:00-18:00</view>
     </view>
     <view class="btn-list">
         <button class="model-btn" bindtap="closeModel">
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
new file mode 100644
index 0000000..63e22d3
--- /dev/null
+++ b/subPackages/feiyiNew/index.js
@@ -0,0 +1,657 @@
+// pages/list/store/index.js
+// import commonApi from "../../../utils/https/common"
+// import util from "../../../utils/util"
+import commonApi from "../../utils/https/common"
+import util from "../../utils/util"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[], //获取的产品列表
+    total:1, //总数
+    keywords:"", //搜索关键字
+    navIndex:0, //一级分类选中下标
+    navList:['列表样式','宫格样式'],
+    flag:true, //切换样式，true按分类，false按店铺展示
+    typeList:[], //左侧的二级分类
+    typeIndex:0, //二级分类选中下标
+    id:'1',
+    cartCount:0,
+    skuFlag:null, //规格弹窗
+    info: null, //规格信息
+    skuIndex: 0, //默认选中第一个规格
+    producNum: 1,
+    showPopup:false, //购物车的弹窗
+    gwcList:[], //gwc里的产品数据
+    allSelectedBtn:false, //全选按钮
+    seachFlag:false, //搜索模式
+    totalPrice:0, //获取购物车总价
+    name:'非遗专卖'
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
+    this.getCount()
+    this.getType()
+  },
+  // 清空
+  delAll() {
+    let ids = []
+    this.data.gwcList.forEach(item => {
+      ids.push(item.sku_id)
+    })
+    commonApi.user_post("cart_within/del_sku", {
+      sku_id: ids+'',
+      type:'2'
+    }).then(res => {
+        if (res.code == 1) {
+          wx.showToast({
+              title: '清空成功',
+              icon: "success"
+          })
+          this.setData({
+            allSelectedBtn:false
+          })
+            this.getCount()
+        }
+    })
+  },
+  // 减少一个
+  del(e) {
+    let item = e.currentTarget.dataset.item
+    let gwcList = this.data.gwcList
+    commonApi.user_post("cart_within/update_sku", {
+      num:item.num-1,
+      sku_id: item.sku_id,
+      type:'2'
+    }).then(res => {
+        if (res.code == 1) {
+            // this.getCount()
+            commonApi.user_post('cart_within/get_list', {
+              type:'2'
+            }).then(res => {
+              let arr = res.data,totalPrice = 0,cartCount=0
+              if (res.data.length>0) {
+                res.data.forEach(item=> {
+                  // totalPrice += item.num*item.sku.price
+                  cartCount += item.num
+                  gwcList.forEach(el=> {
+                    if (el.id == item.id) {
+                      item.selected = el.selected
+                    }
+                  })
+                })
+                res.data.forEach(item=> {
+                  if (item.selected ==1) {
+                    totalPrice += item.num*item.sku.price
+                  }
+                })
+              }
+              let status = res.data.every(el => el.selected === 1)
+              this.setData({
+                  cartCount: cartCount, //1
+                  gwcList:res.data,
+                  allSelectedBtn:status?true:false,
+                  totalPrice
+              })
+            })
+        }
+    })
+  },
+  // 添加产品到购物车
+  addCart: function (e) {
+    let item = e.currentTarget.dataset.item
+    app.globalData.postProduct = []
+    app.globalData.list = []
+    commonApi.user_post("/product/checkStock", {
+        sku_id: this.data.showPopup ? item.sku.id : this.data.info.sku[this.data.skuIndex].id,
+    }).then(res => {
+        if (res && res.code != 1) {
+            return;
+        } else {
+          commonApi.user_post("cart_within/add_sku", {
+            sku_id: this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id,
+            num: this.data.producNum,
+            type:"2"
+        }).then(res => {
+            if (res.code == 1) {
+                commonApi.user_post('cart_within/get_list', {
+                  type:'2'
+                }).then(res => {
+                  let cartCount = 0,totalPrice = 0,gwcList=this.data.gwcList
+                  res.data.forEach(val=> {
+                    cartCount+=val.num
+                    console.log(this.data.skuFlag);
+                    // debugger
+                    if (!this.data.skuFlag && !this.data.showPopup) {
+                      // debugger
+                      if (val.sku.id == this.data.info.sku[this.data.skuIndex].id) {
+                        val.selected = 1
+                      }
+                    }else {
+                      // debugger
+                      gwcList.forEach(el=> {
+                        if (el.id == val.id) {
+                          val.selected = el.selected
+                        }
+                      })
+                    }
+                    // if (this.data.showPopup) {
+                    //   totalPrice += Number(val.num*val.sku.price)
+                    //   gwcList.forEach(el=> {
+                    //     if (el.id == val.id) {
+                    //       val.selected = el.selected
+                    //     }
+                    //   })
+                    // }
+                  })
+                  res.data.forEach(element=> {
+                    if (element.selected == 1) {
+                      totalPrice += Number(element.num*element.sku.price)
+                    }
+                  })
+                  let status = res.data.every(el => el.selected === 1)
+                    this.setData({
+                        cartCount: cartCount,
+                        totalPrice,
+                        producNum:1,
+                        gwcList:res.data,
+                        allSelectedBtn:status?true:false,
+                    })
+                })
+                // 加动效
+                this.setData({
+                    skuFlag: null,
+                    aniSkuIndex: this.data.skuIndex,
+                    cartImgInfo: null
+                })
+                setTimeout(() => {
+                    this.setData({
+                        aniSkuIndex: -1
+                    })
+                    // wx.showModal({
+                    //     title: "提示",
+                    //     content: "去购物车结算？",
+                    //     success: function (res) {
+                    //         if (res.confirm) {
+                    //             wx.navigateTo({
+                    //                 url: '/pages/user/cartlist/list',
+                    //             })
+                    //         }
+                    //     }
+                    // })
+                }, 650)
+            }
+        })
+        }
+    })
+
+},
+  // 去结算
+  order: function () {
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/user/cartlist/list',
+        title: '购物车',
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            app.globalData.couponInfo = null;
+            util.pagePoint({
+                event: 'cart_order'
+            }, 1)
+            let list = this.data.gwcList,
+                price = 0,
+                product = [],
+                product1 = []
+            list.map(item => {
+                if (item.selected == 1) {
+                    // item.product.type="post";
+                    if (item.product.type == 'post') {
+                        product.push({
+                            product: item.product,
+                            sku: item.sku,
+                            productNum: item.num
+                        })
+                    } else {
+                        product1.push(item)
+                        app.globalData.list = product1
+                    }
+                    if (item.product.type.includes('post')) {
+                        this.data.productType = 'post'
+                    }
+                }
+            })
+            if (product.length == 0 && product1.length == 0) {
+                wx.showToast({
+                    title: '请先选择产品',
+                    icon: 'none'
+                })
+                return;
+            }
+            if (product.length > 0 && product1.length > 0) {
+                this.setData({
+                    flag: 'mix',
+                    isCar: 'multiple'
+                })
+            }
+            if (product1.length > 1) {
+                this.setData({
+                    isCar: 'multiple'
+                })
+            } else {
+                this.setData({
+                    isCar: 'single'
+                })
+            }
+            console.log(product1);
+            app.globalData.postProduct = product;
+            if (app.globalData.list) {
+                app.globalData.product = app.globalData.list[app.globalData.index]
+            }
+            wx.navigateTo({
+              url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
+          })
+        }
+    })
+},
+  // 全选
+  allSelected() {
+    let gwcList = this.data.gwcList
+    let totalPrice = 0
+    if (this.data.allSelectedBtn) {
+      gwcList.forEach(item=> {
+        item.selected =0
+      })
+    } else {
+      gwcList.forEach(item=> {
+        item.selected =1
+      })
+      gwcList.forEach(item=> {
+        totalPrice += Number(item.num*item.sku.price)
+      })
+    }
+    this.setData({
+      gwcList,
+      allSelectedBtn:!this.data.allSelectedBtn,
+      totalPrice
+    })
+  },
+  // 单选一个
+  selectedIt(e) {
+    let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0
+    gwcList.forEach(el=> {
+      if (el.id == item.id) {
+        el.selected == 1 ? el.selected =0 : el.selected = 1
+      }
+    })
+    gwcList.forEach(el=> {
+      if (el.selected == 1) {
+        totalPrice += Number(el.num*el.sku.price)
+      }
+    })
+    let status = gwcList.every(el => el.selected === 1)
+    this.setData({
+      gwcList,
+      allSelectedBtn:status?true:false,
+      totalPrice
+    })
+  },
+  // 左侧购物车打开弹窗
+  openPopup() {
+    // this.getCount()
+    let gwcList = this.data.gwcList
+    let status = gwcList.every(el => el.selected === 1)
+    this.setData({
+      showPopup:!this.data.showPopup,
+      allSelectedBtn:status?true:false,
+    })
+  },
+  // 获取商户标签列表
+  getSupplierTag() {
+    let list = this.data.list;
+    if(list.length>=this.data.total) return;
+    commonApi.user_post('supplier/get_supplier_by_title_tag_id', {
+      tag_id:5, //标签的ID
+      offset:list.length, //起始查询
+      limit:10, //查询数量
+      title:this.data.keywords //搜索产品名称
+    }).then(res => {
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags?item.display_tags.split(","):[];
+        item.display_tags = item.display_tags.splice(0,2);
+      })
+      this.setData({
+        list:list.concat(res.data.list),
+        total:res.data.total
+      })
+    })
+  },
+  // 获取左侧二级分类
+  getType() {
+    commonApi._post("product/tag_list",{
+      pid:5, //父标签的ID
+    }).then(res=>{
+      this.setData({
+        typeList:res.data
+      })
+      this.getList()
+    })
+  },
+  // 获取历史购物车详情
+  getCount() {
+    commonApi.user_post('cart_within/get_list', {
+      type:'2'
+    }).then(res => {
+      let arr = res.data,cartCount=0
+      // let arr = res.data,totalPrice = 0,cartCount=0
+      if (arr.length>0) {
+        arr.forEach(item=> {
+          // totalPrice += item.num*item.sku.price
+          cartCount += item.num
+        })
+      }
+      // console.log(totalPrice);
+      this.setData({
+          cartCount: cartCount, //1
+          gwcList:res.data,
+          // totalPrice,
+          allSelectedBtn:false
+      })
+    })
+  },
+  // 重置
+  onReload() {
+    this.setData({
+      list:[],
+      total:1,
+      navIndex:0,
+      typeIndex:0,
+      flag:true,
+      seachFlag:false
+    })
+    this.getList()
+  },
+  // 搜索
+  search:function(e){
+    if (e.detail.keywords == '') {
+      this.setData({
+        seachFlag:false,
+        keywords:'',
+        list:[],
+        total:1
+      })
+      this.onReload()
+    }else {
+      this.setData({
+        seachFlag:true,
+        keywords:e.detail.keywords,
+        list:[],
+        total:1
+      })
+      this.getList();
+    }
+  },
+  // 去产品详情页
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  // 去店铺
+  goShop(e){
+    let id = e.currentTarget.dataset.id;
+    util.pagePoint({
+      event: 'legacy_shop',
+      param:{
+        id:id
+      },
+      type:'supplier'
+    },1)
+    wx.navigateTo({
+      url: '/pages/list/store/index?id='+id,
+    })
+  },
+  gotoProduct:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.gotoDetail(item)
+  },
+  // 切换样式
+  changeStyle() {
+    this.setData({
+      navIndex:this.data.navIndex == 0? 1: 0,
+      flag:!this.data.flag,
+      total:1,
+      list:[],
+      typeIndex:0
+    })
+    if (this.data.flag) {
+      this.getType()
+    }else {
+      this.getSupplierTag()
+    }
+  },
+  // 切换一级分类
+  changeNav:function(e){
+    let index = e.currentTarget.dataset.index,navList=this.data.navList;
+    this.setData({
+      navIndex:index,
+      list:[],
+      total:1
+    })
+    if (this.data.navIndex == 0) {
+      this.getType()
+    } else {
+      this.getSupplierTag()
+    }
+  },
+  // 切换左侧二级分类
+  changeType(e) {
+    let index = e.currentTarget.dataset.index,typeList=this.data.typeList;
+    this.setData({
+      typeIndex:index,
+      type:typeList[index].id,
+      list:[],
+      total:1
+    })
+    this.getList()
+  },
+  // 获取产品列表
+  getList:function(){
+    let list = this.data.list;
+    if(list.length>=this.data.total) return;
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:this.data.seachFlag? '5':this.data.typeList[this.data.typeIndex].id, //标签的ID
+      offset:list.length, //起始查询
+      limit: 10, //查询数量
+      title:this.data.keywords, //搜索产品名称
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags?item.display_tags.split(","):[];
+        item.display_tags = item.display_tags.splice(0,2);
+      })
+      this.setData({
+        list:list.concat(res.data.list),
+        total:res.data.total
+      })
+      console.log(this.data.list);
+    })
+    // commonApi._post("supplier/get_supplier_by_tag_id",{
+    //   tag_id:this.data.flag ? this.data.navList[this.data.navIndex].type :this.data.navList2[this.data.navIndex].type,
+    //   limit:10,
+    //   offset:list.length,
+    //   sort:"weight",
+    //   title:this.data.keywords
+    // }).then(res=>{
+    //   res.data.list.map(item=>{
+    //     item.display_tags = item.display_tags?item.display_tags.split(","):[];
+    //     item.display_tags = item.display_tags.splice(0,2);
+    //   })
+    //   this.setData({
+    //     list:list.concat(res.data.list),
+    //     total:res.data.total
+    //   })
+    // })
+  },
+  // 添加产品弹窗 1.首先获取到该产品下的规格
+  addBuyCart(e) {
+    let item = e.currentTarget.dataset.item
+    console.log(item);
+    commonApi._post("product/get_product_detail", {
+      id: item.id
+    }).then(res => {
+        if (item.skuid) {
+            let sku = res.data.sku.find(skuItem => item.id == skuItem.skuid);
+            res.data.sku = [sku];
+        }
+        res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+        this.setData({
+            info: res.data,
+            // skuFlag: "cart"
+        })
+        this.showCart()
+        this.BroswerRecord()
+    })
+  },
+  // 添加产品弹窗 2.渲染规格，未登录去登录
+  showCart: function () {
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+        title: this.data.info.title,
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            if (this.data.info.sku.length == 0) {
+                wx.showToast({
+                    title: '该产品未设置规格，不能加购',
+                    icon: 'none'
+                })
+                return;
+            }
+            this.setData({
+                skuFlag: "cart"
+            })
+            let that = this
+            wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                console.log(res)
+                that.setData({
+                    cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                })
+            }).exec()
+        }
+        this.getCount()
+    })
+  },
+  // 规格弹窗切换其他规格
+  selectSku: function (e) {
+      let index = e.currentTarget.dataset.index;
+      this.setData({
+          skuIndex: index
+      })
+  },
+  // 关闭弹窗
+  hideSku: function () {
+    this.setData({
+        skuFlag: null,
+        cartImgInfo: null
+    })
+  },
+  // 减少数量
+  minus: function () {
+    if (this.data.producNum == 1) return;
+    this.setData({
+        producNum: this.data.producNum - 1
+    })
+  },
+  // 加数量
+  add: function () {
+      this.setData({
+          producNum: this.data.producNum + 1
+      })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.onReload()
+    // this.setData({
+    //   list:[],
+    //   total:1,
+    //   navIndex:0,
+    //   typeIndex:0,
+    //   flag:true
+    // })
+    // this.getList()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (this.data.flag) {
+      this.getList()
+    } else {
+      this.getSupplierTag()
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-文创特产',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png'
+    }
+  }
+})
\ No newline at end of file
diff --git a/subPackages/feiyiNew/index.json b/subPackages/feiyiNew/index.json
new file mode 100644
index 0000000..0861abd
--- /dev/null
+++ b/subPackages/feiyiNew/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "common-image":"/pages/component/commonImage/index",
+    "search":"/pages/component/SearchHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/feiyiNew/index.wxml b/subPackages/feiyiNew/index.wxml
new file mode 100644
index 0000000..4aeb1af
--- /dev/null
+++ b/subPackages/feiyiNew/index.wxml
@@ -0,0 +1,232 @@
+<!--pages/feiyi/list/index.wxml-->
+<!-- 非遗专卖页面 -->
+<view class="fiyi-main" >
+  <view style="{{seachFlag?'':'height: 500rpx;'}}">
+  <search bind:onload="search" name="{{name}}"></search>
+  <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240715/590b8c17b06ccadd09f43ee9260d2a36.png" mode="widthFix"></image>
+</view>
+<view wx:if="{{!seachFlag}}" class="feiyi-centent">
+  <!-- <view class="type-box">
+    <view style="display: flex;">
+      <view wx:for="{{flag?navList:navList2}}" wx:key="*this" bindtap="changeNav" data-index="{{index}}" class="{{index == navIndex ? 'seld-nav':'nav'}}">{{item.title}}</view>
+    </view>
+    <image bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+  </view> -->
+  <!-- 产品部分 -->
+  <view wx:if="{{navIndex == 0}}" style="height: 100%; overflow: hidden;">
+    <view style="display: flex;height: 100%; overflow: hidden;">
+      <!-- 左侧二级分类 -->
+      <view class="left">
+        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+
+          <view wx:for="{{typeList}}" wx:key="*this" class="{{index == typeIndex ? 'seld-type':'type-two-box'}}" bindtap="changeType" data-index="{{index}}">
+            <view class="line" wx:if="{{index == typeIndex}}"></view>
+            <view>
+              {{item.name}}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <!-- 右侧产品列表 -->
+      <view style="display：flex">
+        <view style="width: 550rpx;display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
+          <view class="nav-box">
+            <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
+              <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
+              <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+              <text>{{item}}</text>
+            </view>
+          </view>
+        </view>
+        <view class="list" style="width: 100%;flex：1; overflow: hidden;">
+          <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+            <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
+              <image class="img" src="{{item.headimg}}" mode="" />
+              <view class="content">
+                <view class="title">
+                  {{item.title}}
+                </view>
+                <view class="item-bottom">
+                  <view class="price">
+                    <text class="current-price">{{item.price/100}}</text>
+                    <text class="original-price">¥{{item.market_price/100}}</text>
+                  </view>
+                  <view class="add" catchtap="addBuyCart" data-item="{{item}}">+</view>
+                </view>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 店铺展示 -->
+  <view wx:else style="padding: 0 26.67rpx; display: flex; flex-direction: column;  overflow: hidden;">
+    <view style="width: 700rpx;display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
+      <view class="nav-box">
+        <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
+          <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
+          <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+          <text>{{item}}</text>
+        </view>
+      </view>
+    </view>
+    <view style="flex:1; overflow: hidden;">
+      <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getSupplierTag" bindscroll="scroll">
+      <view wx:for="{{list}}" class="list1" wx:key="*this">
+        <view class="top-info" bindtap="goShop" data-id="{{item.id}}">
+          <common-image mode="aspectFill" src="{{item.headimg}}" style="border-radius: 13rpx;"></common-image>
+          <view class="supplier-info">
+            <view class="supplier-name textOver">{{item.shop_name}}</view>
+            <view class="mid-box">
+              <view class="supplier-tags">
+                <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
+              </view>
+              <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
+            </view>
+            <view class="bottom-box">
+              <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text style="max-width: 300rpx;" class="textOver">{{item.address}}</text></view>
+              <view class="btn">
+                进店看看
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="product-list">
+          <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}" wx:key="*this">
+            <image src="{{item.headimg}}" mode="aspectFill"></image>
+            <view class="product-title textOver2">{{item.title}}</view>
+            <view class="supplier-price"><text>￥</text><text style="font-size:32rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    </view>
+  </view>
+</view>
+</view>
+<!-- 搜索到的产品列表 -->
+<view wx:if="{{seachFlag}}" style="overflow-y: scroll;margin-top: -650rpx;padding-bottom: 50rpx;">
+  <view class="hot-list" wx:if="{{list.length>0}}">
+    <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+      <view class="hot-item" wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
+      <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+      <view class="hot-item-main">
+        <view class="hot-item-title textOver2">
+          {{item.title}}
+        </view>
+        <view style="display: flex;justify-content: space-between;align-items: center; ">
+          <view>
+            <text class="hot-item-price">{{item.price/100}}</text>
+            <text class="hot-item-market_price">{{item.market_price/100}}</text>
+          </view>
+          <image class="add" bindtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+        </view>
+      </view>
+    </view>
+    </view>
+  </view>
+  <view wx:if="{{list.length==0}}" style="display: flex;flex-direction: column;align-items: center;position: absolute;left: 211rpx;top: 286.67rpx;">
+    <image style="width:328rpx;height:450.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
+    <view style="font-family: PingFang SC;font-weight: 500;font-size: 28rpx;color: #666666;margin-top: 67rpx;">
+      暂无搜索结果
+    </view>
+  </view>
+</view>
+<!-- 底部购物车 -->
+<view style="width:100%;height:167rpx;" wx:if="{{navIndex == 0}}">
+</view>
+<view class="bottom" wx:if="{{(navIndex == 0 &&skuFlag != 'cart') || showPopup}}">
+  <!-- 左边购物车图标及价格 -->
+  <view class="gwc-left">
+    <view class="gwc" bindtap="openPopup">
+      <image wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
+      <image wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
+      <view class="cartCount">{{cartCount}}</view>
+    </view>
+    <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
+      总计：<text class="money">{{totalPrice/100}}</text>
+    </view>
+    <!-- <view style="margin-left: 16.67rpx;font-family: PingFang SC;font-weight: 500;font-size: 27rpx;color: #0B898E;" bindtap="openPopup">
+      <text>明细</text>
+      <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode="" />
+      <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode="" />
+    </view> -->
+  </view>
+  <!-- 去结算按钮 -->
+  <view class="{{cartCount == 0?'no-buy':'buy'}}" bindtap="order">去结算</view>
+</view>
+<!-- 规格弹窗 -->
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku" style="z-index: 9999;"></view>
+  <view class="mask-content" style="z-index: 99999;">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view class="sku-price">{{info.sku[skuIndex].price/100}}
+          <view class="allowance" wx:if="{{allowance_data}}">
+            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+        </view>
+        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+      </view>
+    </view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{info.sku}}" wx:key="*this">{{item.sku_name}}</view>
+    </view>
+    <view class="number-box">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select" bindtap="add"></view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <!-- <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'加入购物车':'立即购买'}}
+      </view> -->
+      <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">加入购物车</view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
+<!-- 购物车的弹窗 -->
+<view class="mask" wx:if="{{showPopup}}">
+  <view bindtap="openPopup" class="mask-bg"></view>
+  <view class="mask-content" style="padding: 40rpx 0 180rpx;min-height: 600rpx;">
+    <view style="margin: 0 26.67rpx;">
+      <!-- 顶部操作按钮 -->
+      <view class="flex" style="margin-bottom: 56.67rpx;">
+        <view class="flex">
+          <image bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <view bindtap="allSelected" wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
+          <text class="all">全选</text>
+        </view>
+        <view class="flex" bindtap="delAll">
+          <image style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
+          <text class="del-all">清空</text>
+        </view>
+      </view>
+      <view class="gwc-item" wx:for="{{gwcList}}" wx:key="*this" bindtap="selectedIt" data-item="{{item}}">
+        <view style="margin-right: 26.67rpx;">
+          <image wx:if="{{item.selected ==1}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
+        </view>
+        <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <view class="main">
+          <view>
+            <view class="title">{{item.product.title}}</view>
+            <view class="sku-title">{{item.sku.sku_name}}</view>
+          </view>
+          <view class="main-bottom">
+            <view class="price">{{item.sku.price/100}}</view>
+            <view class="num-box">
+              <image class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <view style="margin: 0 25.33rpx;">{{item.num}}</view>
+              <image class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/subPackages/feiyiNew/index.wxss b/subPackages/feiyiNew/index.wxss
new file mode 100644
index 0000000..6004c32
--- /dev/null
+++ b/subPackages/feiyiNew/index.wxss
@@ -0,0 +1,721 @@
+/* pages/feiyi/list/index.wxss */
+.heaimg {
+  display: block;
+  width: 100%;
+}
+.fiyi-main{
+  height: 100%;
+  display: flex; 
+  flex-direction: column;
+  overflow:hidden;
+}
+page {
+  /* background: #FFD99E; */
+  /* padding-bottom: 170rpx; */
+  height: 100%;
+  display: flex; 
+  flex-direction: column;
+  overflow:hidden;
+}
+.changeStyle {
+  width: 40rpx;
+  height: 40rpx;
+}
+.type-box {
+    padding: 33.33rpx 26.67rpx 26.67rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.nav {
+    width: 145rpx;
+    height: 53rpx;
+    border-radius: 8rpx;
+    border: 1px solid #0B898E;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #0B898E;
+    text-align: center;
+    line-height: 53rpx;
+    margin-right: 12.67rpx;
+}
+.seld-nav {
+  width: 145rpx;
+  height: 57rpx;
+  background: #0B898E;
+  border-radius: 8rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 57rpx;
+  margin-right: 12.67rpx;
+}
+.feiyi-centent {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+.left {
+    width: 200rpx;
+    /* min-height: 100vh; */
+    /* min-height: 950rpx; */
+    background-color: #F3F3F3;
+}
+.type-two-box {
+    width: 200rpx;
+    height: 107rpx;
+    text-align: center;
+    line-height: 107rpx;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+}
+.seld-type {
+    background: #fff;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #000000;
+    text-align: center;
+    line-height: 107rpx;
+    position: relative;
+}
+.line {
+    width: 7rpx;
+    height: 53rpx;
+    background: #0B898E;
+    position: absolute;
+    top: 26.67rpx;
+    left: 0;
+}
+.item {
+    padding: 0 26.67rpx;
+    display: flex;
+    margin-bottom: 26.67rpx;
+}
+.img {
+    width: 161rpx;
+    height: 161rpx;
+    background: #999999;
+    border-radius: 11rpx;
+    flex-shrink: 0;
+    margin-right: 14.67rpx;
+}
+.content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 100%;
+}
+.title {
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+}
+.item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.current-price {
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #D70000;
+    margin-right: 13.33rpx;
+}
+.current-price::before {
+  content: "￥";
+  font-size: 23rpx;
+  font-weight: 500;
+}
+.original-price {
+    font-weight: 400;
+    font-size: 21rpx;
+    color: #999999;
+    text-decoration-line: line-through;
+}
+.add {
+    width: 40rpx;
+    height: 40rpx;
+    background: #0B898E;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 40rpx;
+    font-weight: 500;
+    font-size: 31rpx;
+    color: #FFFFFF;
+}
+.bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 167rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 2rpx 13rpx 0rpx rgba(136,136,136,0.25);
+    padding: 0 27.33rpx 0 26.67rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    z-index: 666;
+}
+.gwc {
+  margin-right: 14rpx;
+  width: 84rpx;
+  height: 84rpx;
+  position: relative;
+}
+.cartCount {
+    width: 40rpx;
+    height: 40rpx;
+    background: #D90F01;
+    border-radius: 50%;
+    border: 1rpx solid #FFFFFF;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 40rpx;
+    position: absolute;
+    right: -10rpx;
+    top: -10rpx;
+}
+.gwc-left {
+    display: flex;
+    align-items: center;
+}
+.money {
+  font-weight: bold;
+  font-size: 47rpx;
+  color: #D70000;
+}
+.money::before {
+  content: "￥";
+  font-size: 23rpx;
+  font-weight: 500;
+}
+
+.buy {
+  width: 240rpx;
+  height: 83rpx;
+  background: #D70000;
+  border-radius: 42rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 83rpx;
+}
+
+.no-buy {
+  width: 240rpx;
+  height: 83rpx;
+  background: #BDBDBD;
+  border-radius: 42rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 83rpx;
+}
+
+
+
+
+
+/* .classimg {
+  margin-left: 13rpx;
+  width: 710rpx;
+  display: block;
+} */
+/* .type-text {
+  position: absolute;
+  left: 130rpx;
+  padding: 30rpx 30rpx;
+  bottom: 0;
+  line-height: 60rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+  z-index: 1;
+  color: #FFE1A2;
+  width: 120rpx;
+  display: flex;
+  justify-content: space-between;
+} */
+/* .item {
+  background: url(https://static.ticket.sz-trip.com/xcxImages/techan/bg.png);
+  background-size: 100% 100%;
+  width: 694rpx;
+  height: 571rpx;
+  margin: 0 auto;
+  margin-bottom: 15rpx;
+  color: #704436;
+  box-sizing: border-box;
+  
+} */
+.list1 {
+  background-color: #FAF6F0;
+  border-radius: 13rpx;
+  margin-bottom: 30rpx;
+  padding: 20rpx 0 28rpx 20rpx;
+}
+.top-info {
+  display: flex;
+  /* padding: 30rpx; */
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+.top-info image {
+  width: 136rpx;
+  height: 136rpx;
+  display: block;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+}
+.supplier-info {
+  display: flex;
+  flex-direction: column;
+  height: 136rpx;
+  justify-content:space-between;
+  flex: 1;
+  margin-right: 20.67rpx;
+  /* width: 300rpx; */
+}
+.supplier-name {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #000000;
+}
+.supplier-tags {
+  display: flex;
+}
+.supplier-tag {
+  padding: 0 20rpx;
+  font-size: 22rpx;
+  border: 1rpx solid #877350;
+  border-radius: 15rpx;
+  line-height: 28rpx;
+  margin-right: 20rpx;
+  color: #877350;
+}
+.supplier-address {
+  font-size: 20rpx;
+  margin-top: 10rpx;
+  color: #877350;
+  font-weight: 500;
+  font-size: 23rpx;
+}
+.supplier-address .iconfont {
+  margin-right: 8rpx;
+  font-size: 20rpx;
+}
+.supplier-price {
+  color: #CC3320;
+  font-size: 20rpx;
+}
+.supplier-price text:nth-child(2){
+  font-size: 40rpx;
+  font-weight: bold;
+}
+.product-list {
+  display: flex;
+  /* margin: 0 20rpx 0 30rpx; */
+  overflow-x:scroll ;
+  box-sizing: border-box;
+  /* padding-right:30rpx ; */
+}
+.product-list::-webkit-scrollbar {
+  display: none;
+}
+.product-item {
+  width: 212rpx;
+  font-size: 28rpx;
+  margin-right: 19rpx;
+}
+.product-item:nth-child(3){
+}
+.product-item image {
+  width: 212rpx;
+  height: 209rpx;
+  border-radius: 13rpx;
+}
+.market_price {
+  color: #999999;
+  font-weight: 400;
+  font-size: 20rpx;
+  margin-left: 10rpx;
+  text-decoration: line-through;
+}
+.mid-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-right: 10rpx;
+}
+.bottom-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.btn{
+  flex-shrink: 0;
+  background: #C6937F;
+  border-radius: 24rpx;
+  width: 147rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  text-align: center;
+  font-size: 25rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+.sku-info-box {
+  margin: 50rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.sku-info-box image {
+  width: 218rpx;
+  height: 180rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 40rpx;
+  flex-shrink: 0;
+}
+.sku-info {
+  flex: 1;
+}
+.sku-price {
+  font-size: 40rpx;
+  font-weight: 500;
+  color: #D62828;
+  margin: 20rpx 0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.sku-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 27rpx;
+  vertical-align: baseline;
+}
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+.sku-names {
+  display: flex;
+  font-size: 29rpx;
+  color: #333;
+  margin: 0 40rpx;
+  text-align: center;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+}
+.sku-name-item {
+  background: #EFEFEF;
+  border: 1rpx solid #EFEFEF;
+  width: 318rpx;
+  line-height: 77rpx;
+  border-radius: 14rpx;
+  margin-bottom: 25rpx;
+  margin-right: 30rpx;
+}
+.sku-name-item:nth-child(2n) {
+  margin-right: 0;
+}
+.sku-name-item.active {
+  color: #0B898E;
+  border-color: #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+.number-box {
+  display: flex;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+  margin: 0 40rpx;
+  padding: 40rpx 0;
+}
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+.number-box view {
+  border: 1rpx solid #666;
+  border-radius: 7rpx;
+  text-align: center;
+  width: 67rpx;
+  line-height: 67rpx;
+  font-size: 33rpx;
+  color: #000;
+}
+.number-box view.disable {
+  border-color: #ccc;
+  color: #999;
+}
+.number-box view.number {
+  width: 94rpx;
+  margin: 0 15rpx;
+}
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 33rpx;
+  font-weight: 500;
+}
+.mask-btn.disable {
+  background: #ccc;
+}
+
+.flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.all {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 37rpx;
+  color: #000000;
+  margin-left: 26rpx;
+}
+
+.del-all {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #999999;
+  margin-left: 7.33rpx;
+}
+
+.gwc-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 48rpx;
+}
+
+.main {
+    height: 179rpx;
+    padding: 8.67rpx 0 6.67rpx;
+    width: 425rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.main .title {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 31rpx;
+  color: #2C2C2C;
+  margin-bottom: 18rpx;
+}
+.main .sku-title {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #999999;
+}
+
+.main-bottom {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.num-box {
+  display: flex;
+}
+
+.reduce, .grow {
+  width: 49rpx;
+  height: 49rpx;
+}
+
+.main-bottom .price {
+  font-family: PingFangSC;
+  font-size: 35rpx;
+  color: #F84A56;
+}
+.main-bottom .price::before {
+  content: "￥";
+  font-size: 24rpx;
+  font-weight: 500;
+}
+
+.hot-list {
+    padding: 26.67rpx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
+.hot-item {
+  margin-bottom: 20rpx;
+  width: 337rpx;
+  height: 513rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153,153,153,0.33);
+  border-radius: 13rpx;
+}
+.hot-item-img {
+  width: 337rpx;
+  height: 337rpx;
+  background: #0B898E;
+  border-radius: 13rpx;
+}
+.hot-item-title {
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+    /* margin-bottom: 25.33rpx; */
+}
+.hot-item-price {
+  font-family: Arial;
+  font-weight: bold;
+  font-size: 33rpx;
+  color: #D70000;
+  margin-right: 12.67rpx;
+}
+.hot-item-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 23rpx;
+}
+.hot-item-market_price {
+  font-family: Arial;
+  font-weight: 400;
+  font-size: 21rpx;
+  color: #999999;
+  text-decoration-line: line-through;
+ }
+ .hot-item-main {
+    padding: 20rpx 19rpx 26.67rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    min-height: 140rpx;
+    justify-content: space-between;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child {
+    width: 337rpx;
+    height: 373rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153,153,153,0.33);
+    border-radius: 13rpx;
+    padding-bottom: 20rpx;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child  .hot-item-img{
+    width: 337rpx;
+    height: 238rpx;
+    background: #71B580;
+    border-radius: 13rpx;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child  .main{
+    width: 337rpx;
+    height: 238rpx;
+    background: #71B580;
+    border-radius: 13rpx;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child .hot-item-main {
+  padding: 5rpx 19rpx 26.67rpx 15rpx;
+  display: flex;
+  flex-direction: column;
+  min-height: 90rpx;
+  justify-content: space-between;
+}
+.hot-list-item:nth-child(2) .hot-item:first-child .hot-item-main .hot-item-title {
+  margin-bottom: 20rpx;
+}
+
+.nav-box {
+  width: 377rpx;
+  height: 53rpx;
+  background: #E5F3F3;
+  border-radius: 13rpx;
+  display: flex;
+  justify-content: space-around;
+}
+.styleBtn-seld {
+    width: 187rpx;
+    height: 48rpx;
+    background: #0B898E;
+    border-radius: 11rpx;
+    display: flex;
+    align-items: center;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #E5F3F3;
+    justify-content: center;
+}
+.style-icon {
+    width:29rpx;
+    height:29rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.styleBtn {
+  width: 187rpx;
+  height: 48rpx;
+  display: flex;
+  align-items: center;
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 24rpx;
+  color: #0B898E;
+  justify-content: center;
+}
+.hot-list-item {
+  width: 337rpx;
+}
diff --git a/subPackages/techanCart/index.js b/subPackages/techanCart/index.js
new file mode 100644
index 0000000..203f68d
--- /dev/null
+++ b/subPackages/techanCart/index.js
@@ -0,0 +1,404 @@
+// pages/user/cartlist/list.js
+const device = wx.getSystemInfoSync(),
+    rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
+const ratio = 750 / device.windowWidth;
+console.log(rect)
+const width = device.windowWidth // 示例为一个与屏幕等宽的正方形裁剪框
+let height = device.windowHeight;
+import commonApi from "../../utils/https/common"
+import util from '../../utils/util'
+let app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        menuWidth: width - rect.right + rect.width + 6,
+        list: [],
+        allChecked: false,
+        allPrice: 0,
+        productType: '',
+        manageFlag: false,
+        flag: false, //判断订单是否同时有商品和票
+        isCar: 'single', //判断是否购物车
+        showQrCode: false,
+        wxqrcode: null,
+        showModel:false
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        wx.removeStorageSync('linkMan')
+        this.getList();
+    },
+    manage: function () {
+        let list = this.data.list;
+        list.map(item => {
+            item.checked = 0;
+        })
+        this.setData({
+            manageFlag: !this.data.manageFlag,
+            allChecked: 0,
+            list: list,
+            allPrice: 0
+        })
+    },
+    gotoDetail: function (e) {
+        console.log(e)
+        let item = e.currentTarget.dataset.item.product;
+        util.gotoDetail(item, 1);
+    },
+    getList: function () {
+        commonApi.user_post("cart/get_list", {
+            // type: '1'
+        }).then(res => {
+            this.setData({
+                list: res.data
+            })
+        })
+    },
+    minus: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        let num = list[index].num;
+        if (num <= 1) return;
+        num = num - 1;
+        list[index].num = num;
+        this.setData({
+            list: list
+        })
+        this.changeNumber(list[index])
+        this.updatePrice()
+    },
+    add: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        let num = list[index].num + 1;
+        list[index].num = num;
+        this.setData({
+            list: list
+        })
+        this.changeNumber(list[index])
+        this.updatePrice()
+    },
+    select: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        if (list[index].product.flag != 1 || list[index].sku.flag != 'on') {
+            if (!this.data.manageFlag) {
+                wx.showToast({
+                    title: '产品已下架',
+                    icon: 'none'
+                })
+                return;
+            }
+        }
+        list[index].checked = list[index].checked ? false : true;
+        this.setData({
+            list: list
+        })
+        let flag = true
+        list.forEach(item => {
+            if (!item.checked) {
+                flag = false
+                return
+            }
+        });
+        this.setData({
+            allChecked: flag
+        })
+        this.updatePrice()
+    },
+    selectAll: function () {
+        let list = this.data.list,
+            allChecked = this.data.allChecked ? false : true;
+        list.map(item => {
+            if (item.sku.flag == 'on' && item.product.flag == 1) {
+                item.checked = allChecked;
+            }
+        })
+        this.setData({
+            allChecked: allChecked,
+            list: list
+        })
+        this.updatePrice()
+    },
+    changeNumber(item) {
+        commonApi.user_post("cart/update_sku", {
+            sku_id: item.sku.id,
+            num: item.num
+        }).then(res => { })
+    },
+    updatePrice: function () {
+        let list = this.data.list,
+            price = 0;
+        list.map(item => {
+            if (item.checked) {
+                price = price + item.sku.price * item.num;
+            }
+        })
+        this.setData({
+            allPrice: price
+        })
+    },
+    order: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/user/cartlist/list',
+            title: '购物车',
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                app.globalData.couponInfo = null;
+                util.pagePoint({
+                    event: 'cart_order'
+                }, 1)
+                let list = this.data.list,
+                    price = 0,
+                    product = [],
+                    product1 = []
+                list.map(item => {
+                    if (item.checked) {
+                        // item.product.type="post";
+                        if (item.product.type == 'post') {
+                            product.push({
+                                product: item.product,
+                                sku: item.sku,
+                                productNum: item.num
+                            })
+                        } else {
+                            product1.push(item)
+                            app.globalData.list = product1
+                        }
+                        if (item.product.type.includes('post')) {
+                            this.data.productType = 'post'
+                        }
+                    }
+                })
+                if (product.length == 0 && product1.length == 0) {
+                    wx.showToast({
+                        title: '请先选择产品',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                if (product.length > 0 && product1.length > 0) {
+                    this.setData({
+                        flag: 'mix',
+                        isCar: 'multiple'
+                    })
+                }
+                if (product1.length > 1) {
+                    this.setData({
+                        isCar: 'multiple'
+                    })
+                } else {
+                    this.setData({
+                        isCar: 'single'
+                    })
+                }
+                console.log(product1);
+                app.globalData.postProduct = product;
+                if (app.globalData.list) {
+                    app.globalData.product = app.globalData.list[app.globalData.index]
+                }
+                if (this.data.productType == 'post') {
+                    console.log(this.data.flag);
+                    wx.navigateTo({
+                        url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
+                    })
+                } else {
+                    wx.navigateTo({
+                        url: '/pages/order/scene/index?isCar=' + this.data.isCar,
+                    })
+                }
+            }
+        })
+
+    },
+  checkOrder(){
+        console.log(this.data.list);
+        let list = this.data.list,product = []
+        list.map(item => {
+          if (item.checked) {
+            product.push(item)
+          }
+      })
+      if (product.length>1) {
+        this.setData({
+          showModel:true
+        })
+      }else{
+        this.order()
+      }
+    },
+    closeModel(){
+      this.setData({
+        showModel:false
+      })
+    },
+    touchStart(e) { //移动前点击的位置
+        console.log(e)
+        // 在开始触摸时将所有startTouchMove设置为flase,对当前的为true
+        this.data.list.forEach(cart => {
+            if (cart.isTouchMove) //当istouchMove为true
+                cart.isTouchMove = false; //其它的对象都为false
+        })
+        this.setData({
+            startX: e.changedTouches[0].clientX,
+            startY: e.changedTouches[0].clientY,
+            list: this.data.list
+        })
+    },
+    touchmove(e) { //移动的位置,用于计算用户滑动的弧度向左还是向右,移动了多少,可以确定删除功能的显示和隐藏
+        let index = e.currentTarget.dataset.index;
+        // 获取开始的x,y坐标
+        let startX = this.data.startX,
+            startY = this.data.startY;
+        // 获取移动的x,x坐标
+        let touchMoveX = e.changedTouches[0].clientX,
+            touchMoveY = e.changedTouches[0].clientY;
+        // 调用计算角度的方法,获取角度
+        var angel = this.angel({
+            X: startX,
+            Y: startY
+        }, {
+            X: touchMoveX,
+            Y: touchMoveY
+        })
+        // 遍历cartArray
+        this.data.list.forEach((cart, i) => {
+            cart.isTouchMove = false;
+            // 滑动角度大于30,直接return 视为非滑动意思
+            if (Math.abs(angel) > 30) return;
+            // 匹配当前所点击的list和滑动的list
+            if (i == index) {
+                // 匹配上后判断滑动方向
+                if (touchMoveX > startX) { //左滑动隐藏删除
+                    cart.isTouchMove = false;
+                } else {
+                    cart.isTouchMove = true;
+                }
+            }
+        })
+        // 更新数据
+        this.setData({
+            list: this.data.list
+        })
+    },
+    angel(start, end) { //计算滑动的角度 
+        // console.log(start,end)
+        // 移动坐标减去对应的开始坐标
+        var _X = end.X - start.X,
+            _Y = end.Y - start.Y;
+        // 返回角度 Math.atan() 返回数字的正切值
+        return 360 * Math.atan(_Y / _X) / (2 * Math.PI)
+    },
+    del: function (e) {
+        let index = e.currentTarget.dataset.index,
+            list = this.data.list;
+        commonApi.user_post("cart/del_sku", {
+            sku_id: list[index].sku_id
+        }).then(res => {
+            if (res.code == 1) {
+                wx.showToast({
+                    title: '删除成功',
+                    icon: "success"
+                })
+                list.splice(index, 1);
+                this.setData({
+                    list: list
+                })
+            }
+        })
+    },
+    delM() {
+        let that = this
+        let arr = this.data.list
+        let suid = []
+        arr.forEach(item => {
+            if (item.checked) {
+                suid.push(item.sku_id)
+            }
+        });
+        let skuids = suid.join(',')
+        wx.showModal({
+            title: '提示',
+            content: '确定要删除选定的产品？',
+            success: function (res) {
+                if (res.confirm) {
+                    commonApi.user_post("cart/del_sku", {
+                        sku_id: skuids
+                    }).then(res => {
+                        if (res.code == 1) {
+                            wx.showToast({
+                                title: '删除成功',
+                                icon: "success"
+                            })
+                            that.getList();
+                        }
+                    })
+
+                } else {
+                    console.log('取消')
+                }
+            }
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        util.pagePoint({
+            event: 'cart_view'
+        }, 1)
+        app.globalData.list = null
+        app.globalData.createDate = null
+        app.globalData.index = 0
+        app.globalData.productPrice = 0
+        app.globalData.ticketPrice = 0
+        this.data.productType = ''
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/subPackages/techanCart/index.json b/subPackages/techanCart/index.json
new file mode 100644
index 0000000..65bceb3
--- /dev/null
+++ b/subPackages/techanCart/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "title": "/pages/component/TitleHeader",
+    "code":"../../pages/order/components/wxqrCode/index"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/techanCart/index.wxml b/subPackages/techanCart/index.wxml
new file mode 100644
index 0000000..66130c7
--- /dev/null
+++ b/subPackages/techanCart/index.wxml
@@ -0,0 +1,65 @@
+<!--pages/user/cartlist/list.wxml-->
+<title title="购物车">
+  <view class="edit-btn" style="right:{{menuWidth}}px" wx:if="{{list.length>0}}" bindtap="manage">{{manageFlag?'关闭':'管理'}}</view>
+</title>
+<view wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
+  <view class="item{{(item.product.flag!=1 || item.sku.flag!='on')?' disable':''}}">
+    <view class="iconfont{{item.checked?' icon-gou':' icon-quan'}}" bindtap="select" data-index="{{index}}"></view>
+    <image src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
+    <view class="item-info textOver">
+      <view class="title textOver">{{item.product.title}}</view>
+      <view class="sku-title textOver">
+        <view class="sku-name textOver">{{item.sku.sku_name}}</view>
+        <view class="sku-number">x{{item.num}}</view>
+      </view>
+      <view class="item-bottom" wx:if="{{item.product.flag==1 && item.sku.flag=='on'}}">
+        <view class="price">{{item.sku.price/100}}</view>
+        <view class="iconfont icon-sami-select" bindtap="minus" data-index="{{index}}"></view>
+        <view class="number">{{item.num}}</view>
+        <view class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
+      </view>
+      <view class="item-bottom" wx:else>已下架</view>
+    </view>
+  </view>
+  <view class='del' catchtap="del" data-index="{{index}}">删除</view>
+</view>
+<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
+  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <view>暂无内容</view>
+</view>
+<view style="height:113rpx"></view>
+<view class="fixed-bottom" wx:if="{{list.length>0&&manageFlag===false}}">
+  <view bindtap="selectAll" class="iconfont{{allChecked?' icon-gou':' icon-quan'}}"><text style="color:#666;font-size:32rpx;flex-shrink:0;margin-left:10rpx;flex:1">全选</text></view>
+  <view class="tip"> <text style="color:#666;font-size:20rpx;flex-shrink:0;margin-left:10rpx;flex:1">不含运费</text> 合计：</view>
+  <view class="bottom-price">¥{{allPrice/100}} </view>
+  <!-- <view style="margin-right: 10rpx; font-size: 29rpx;color: #000;">起</view> -->
+  <view style="flex:1"></view>
+  <view class="btn" bindtap="checkOrder">去下单</view>
+</view>
+
+<view class="fixed-bottom" wx:if="{{list.length>0&&manageFlag===true}}">
+  <view class="iconfont{{allChecked?' icon-gou':' icon-quan'}}" bindtap="selectAll"></view>
+  <text style="color:#666;font-size:26rpx;flex-shrink:0;margin-left:10rpx;flex:1">全选</text>
+  <view class="fixed-btn del-btn" bindtap="delM">删除</view>
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
+<view class="mask" wx:if="{{showModel}}"> 
+  <view class="model">
+    <view class="model-title">
+      购买须知
+    </view>
+    <view class="model-content">
+      <view>多产品订单一经购买</view>
+      <view style="color:rgba(196, 0, 0, 1);margin-top: 10rpx;">不支持部分退改</view>
+    </view>
+    <view class="btn-list">
+        <view class="model-btn" bindtap="closeModel">
+          取消
+        </view>
+        <view class="model-btn" style="color:#0B898E;border-left:#D8D8D8 solid 1rpx;" bindtap="order">
+          确定
+        </view>
+    </view>
+  </view>
+</view>
diff --git a/subPackages/techanCart/index.wxss b/subPackages/techanCart/index.wxss
new file mode 100644
index 0000000..c5c40fd
--- /dev/null
+++ b/subPackages/techanCart/index.wxss
@@ -0,0 +1,242 @@
+/* pages/user/cartlist/list.wxss */
+.edit-btn {
+  font-size: 29rpx;
+  color: #000;
+  position: absolute;
+}
+page {
+  background: #f6f6f6;
+}
+.item {
+  display: flex;
+  padding: 40rpx 20rpx;
+  justify-content: space-between;
+  align-items: center;
+  transition: all 0.4s;
+  transform: translateX(180rpx);
+  margin-left: -180rpx;
+  flex-shrink: 0;
+  width: 660rpx;
+}
+.item.disable {
+  color: #999 !important;
+  opacity: 0.5;
+}
+.del {
+  background-color: #e4393c;
+  width: 180rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 260rpx;
+  justify-content: center;
+  color: #fff;
+  transform: translateX(180rpx);
+  transition: all 0.4s;
+  flex-shrink: 0;
+  opacity: 0;
+  margin-left: 30rpx;
+  text-align: center;
+}
+.goods-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 30rpx 25rpx;
+  background: white;
+  border-radius: 10rpx;
+  overflow: hidden;
+}
+.touch-move-active .del,.touch-move-active .item {
+  -webkit-transform: translateX(0);
+  transform: translateX(0);
+  opacity: 1;
+}
+
+.icon-gou,.icon-quan {
+  color: #999999;
+  flex-shrink: 0;
+  font-size: 40rpx;
+}
+.item image {
+  margin: 0 25rpx;
+  flex-shrink: 0;
+  width: 173rpx;
+  height: 173rpx;
+  border-radius: 7rpx;
+}
+.item-info {
+  flex: 1;
+}
+.item-info .title {
+  font-size: 31rpx;
+  font-weight: 500;
+  color: #000;
+}
+.item-info .sku-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #666;
+  font-size: 27rpx;
+  margin-top: 10rpx;
+  margin-bottom: 20rpx;
+} 
+.item-bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+}
+.item-bottom .price {
+  color: #D62828;
+  font-size: 40rpx;
+  font-weight: 500;
+  flex: 1;
+  margin-right: 10rpx;
+}
+.item-bottom .price::before {
+  content: "￥";
+  font-size: 27rpx;
+  font-weight: 400;
+}
+.item-bottom .iconfont {
+  flex-shrink: 0;
+  font-size: 32rpx;
+  line-height: 50rpx;
+}
+.item-bottom .number {
+  flex-shrink: 0;
+  width: 67rpx;
+  line-height: 50rpx;
+  background: #F0F0F0;
+  border-radius: 7rpx;
+  text-align: center;
+  margin: 0 20rpx;
+}
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  height: 113rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  bottom: 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 27rpx;
+  color: #999;
+  padding-left: 40rpx;
+}
+.fixed-bottom .tip {
+  font-size: 29rpx;
+  color: #000;
+  font-weight: 500;
+  margin-left: 20rpx;
+  flex-shrink: 0;
+}
+.bottom-price {
+  color: #D62828;
+  font-size: 36rpx;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-right: 20rpx;
+}
+.fixed-bottom .btn {
+  width: 267rpx;
+  line-height: 113rpx;
+  text-align: center;
+  background: #D62828;
+  color: #fff;
+  font-size: 36rpx;
+  flex-shrink: 0;
+  font-weight: 500;
+}
+.fixed-bottom .iconfont {
+  font-size: 42rpx;
+}
+.icon-gou {
+  color: #D62828;
+}
+.fixed-btn {
+  width: 202rpx;
+  line-height: 84rpx;
+  background: #FB6E4D;
+  border-radius: 42rpx;
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #fff;
+  text-align: center;
+}
+.del-btn {
+  box-sizing: border-box;
+  border: 1rpx solid #FB6E4D;
+  color: #FB6E4D;
+  background: white;
+  margin-right:40rpx ;
+}
+  .mask {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 999;
+    }
+    .model{
+      width: 561rpx;
+      min-height: 449rpx;
+      background: #FFFFFF;
+      border-radius: 13rpx;
+      position: absolute;
+      box-sizing: border-box;
+
+    }
+    .model-title{
+      text-align: center;
+      font-size: 34rpx;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #333333;
+      margin-top: 32rpx;
+      box-sizing: border-box;
+
+    }
+    .model-content{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      flex-wrap: wrap;
+      margin-top: 100rpx;
+      font-size: 34rpx;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #333333;
+    }
+    .btn-list{
+      height: 106rpx;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      border-top: 1rpx solid rgba(216, 216, 216, .99);
+      padding: 10rpx;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+    }
+    .model-btn{
+      width: 50%;
+      text-align: center;
+      height: 86rpx;
+      line-height: 86rpx;
+
+    font-size: 34rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    }
+
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
new file mode 100644
index 0000000..0fcfddc
--- /dev/null
+++ b/subPackages/techanNew/index.js
@@ -0,0 +1,690 @@
+// pages/list/store/index.js
+// import commonApi from "../../../utils/https/common"
+// import util from "../../../utils/util"
+import commonApi from "../../utils/https/common"
+import util from "../../utils/util"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[], //获取的产品列表
+    total:1, //总数
+    keywords:"", //搜索关键字
+    navIndex:0, //一级分类选中下标
+    navList:[
+      {
+        type:'20',
+        title:'特产'
+      },
+      {
+        type:'19',
+        title:'文创'
+      }
+    ], //产品 一级分类：特产、文创
+    navList2:[
+      {
+        type:'3',
+        title:'特产'
+      },
+      {
+        type:'2',
+        title:'文创'
+      }
+    ], //按商户 一级分类：特产、文创
+    flag:true, //切换样式，true按分类，false按店铺展示
+    typeList:[], //左侧的二级分类
+    typeIndex:0, //二级分类选中下标
+    id:'1',
+    cartCount:0,
+    skuFlag:null, //规格弹窗
+    info: null, //规格信息
+    skuIndex: 0, //默认选中第一个规格
+    producNum: 1,
+    showPopup:false, //购物车的弹窗
+    gwcList:[], //gwc里的产品数据
+    allSelectedBtn:false, //全选按钮
+    seachFlag:false, //搜索模式
+    totalPrice:0, //获取购物车总价--打开购物车后勾选的产品价格
+    name:'文创特产'
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
+    this.getCount()
+    this.getType()
+  },
+  BroswerRecord: function () {
+    setTimeout(() => {
+        if (app.globalData.uuid) {
+            commonApi._post('browse/browse_record', {
+                type: "goods",
+                title: this.data.info.title,
+                drive: "mini",
+                source_id: this.data.info.id,
+                url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
+                uuid: app.globalData.uuid
+            }).then(res => {})
+          } else {
+              this.BroswerRecord();
+          }
+      }, 500)
+  },
+  // 清空
+  delAll() {
+    let ids = []
+    this.data.gwcList.forEach(item => {
+      ids.push(item.sku_id)
+    })
+    commonApi.user_post("cart_within/del_sku", {
+      sku_id: ids+'',
+      type:'1'
+    }).then(res => {
+        if (res.code == 1) {
+          wx.showToast({
+              title: '清空成功',
+              icon: "success"
+          })
+            this.getCount()
+        }
+    })
+  },
+  // 减少一个
+  del(e) {
+    let item = e.currentTarget.dataset.item
+    let gwcList = this.data.gwcList
+    commonApi.user_post("cart_within/update_sku", {
+      num:item.num-1,
+      sku_id: item.sku_id,
+      type:'1'
+    }).then(res => {
+        if (res.code == 1) {
+            // this.getCount()
+            commonApi.user_post('cart_within/get_list', {
+              type:'1'
+            }).then(res => {
+              let arr = res.data,totalPrice = 0,cartCount=0
+              if (res.data.length>0) {
+                res.data.forEach(item=> {
+                  // totalPrice += item.num*item.sku.price
+                  cartCount += item.num
+                  gwcList.forEach(el=> {
+                    if (el.id == item.id) {
+                      item.selected = el.selected
+                    }
+                  })
+                })
+                res.data.forEach(item=> {
+                  if (item.selected ==1) {
+                    totalPrice += item.num*item.sku.price
+                  }
+                })
+              }
+              let status = res.data.every(el => el.selected === 1)
+              this.setData({
+                  cartCount: cartCount, //1
+                  gwcList:res.data,
+                  allSelectedBtn:status?true:false,
+                  totalPrice
+              })
+            })
+        }
+    })
+  },
+  // 添加产品到购物车
+  addCart: function (e) {
+    let item = e.currentTarget.dataset.item
+    app.globalData.postProduct = []
+    app.globalData.list = []
+    commonApi.user_post("/product/checkStock", {
+        sku_id: this.data.showPopup ? item.sku.id : this.data.info.sku[this.data.skuIndex].id,
+    }).then(res => {
+        if (res && res.code != 1) {
+            return;
+        } else {
+          commonApi.user_post("cart_within/add_sku", {
+            sku_id: this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id,
+            num: this.data.producNum,
+            type:"1"
+        }).then(res => {
+            if (res.code == 1) {
+                commonApi.user_post('cart_within/get_list', {
+                  type:'1'
+                }).then(res => {
+                  let cartCount = 0,totalPrice = 0,gwcList=this.data.gwcList
+                  res.data.forEach(val=> {
+                    cartCount+=val.num
+                    console.log(this.data.skuFlag);
+                    // debugger
+                    if (!this.data.skuFlag && !this.data.showPopup) {
+                      // debugger
+                      if (val.sku.id == this.data.info.sku[this.data.skuIndex].id) {
+                        val.selected = 1
+                      }
+                    }else {
+                      // debugger
+                      gwcList.forEach(el=> {
+                        if (el.id == val.id) {
+                          val.selected = el.selected
+                        }
+                      })
+                    }
+                    // if (this.data.showPopup) {
+                    //   totalPrice += Number(val.num*val.sku.price)
+                    //   gwcList.forEach(el=> {
+                    //     if (el.id == val.id) {
+                    //       val.selected = el.selected
+                    //     }
+                    //   })
+                    // }
+                  })
+                  res.data.forEach(element=> {
+                    if (element.selected == 1) {
+                      totalPrice += Number(element.num*element.sku.price)
+                    }
+                  })
+                  console.log(res.data);
+                  let status = res.data.every(el => el.selected === 1)
+                    this.setData({
+                        cartCount: cartCount,
+                        totalPrice,
+                        producNum:1,
+                        gwcList:res.data,
+                        allSelectedBtn:status?true:false,
+                    })
+                })
+                // 加动效
+                this.setData({
+                    skuFlag: null,
+                    aniSkuIndex: this.data.skuIndex,
+                    cartImgInfo: null
+                })
+                setTimeout(() => {
+                    this.setData({
+                        aniSkuIndex: -1
+                    })
+                    // wx.showModal({
+                    //     title: "提示",
+                    //     content: "去购物车结算？",
+                    //     success: function (res) {
+                    //         if (res.confirm) {
+                    //             wx.navigateTo({
+                    //                 url: '/pages/user/cartlist/list',
+                    //             })
+                    //         }
+                    //     }
+                    // })
+                }, 650)
+            }
+        })
+        }
+    })
+
+},
+  // 去结算
+  order: function () {
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/user/cartlist/list',
+        title: '购物车',
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            app.globalData.couponInfo = null;
+            util.pagePoint({
+                event: 'cart_order'
+            }, 1)
+            let list = this.data.gwcList,
+                price = 0,
+                product = [],
+                product1 = []
+            list.map(item => {
+                if (item.selected == 1) {
+                    // item.product.type="post";
+                    if (item.product.type == 'post') {
+                        product.push({
+                            product: item.product,
+                            sku: item.sku,
+                            productNum: item.num
+                        })
+                    } else {
+                        product1.push(item)
+                        app.globalData.list = product1
+                    }
+                    if (item.product.type.includes('post')) {
+                        this.data.productType = 'post'
+                    }
+                }
+            })
+            if (product.length == 0 && product1.length == 0) {
+                wx.showToast({
+                    title: '请先选择产品',
+                    icon: 'none'
+                })
+                return;
+            }
+            if (product.length > 0 && product1.length > 0) {
+                this.setData({
+                    flag: 'mix',
+                    isCar: 'multiple'
+                })
+            }
+            if (product1.length > 1) {
+                this.setData({
+                    isCar: 'multiple'
+                })
+            } else {
+                this.setData({
+                    isCar: 'single'
+                })
+            }
+            console.log(product1);
+            app.globalData.postProduct = product;
+            if (app.globalData.list) {
+                app.globalData.product = app.globalData.list[app.globalData.index]
+            }
+            wx.navigateTo({
+              url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
+          })
+        }
+    })
+},
+  // 全选
+  allSelected() {
+    let gwcList = this.data.gwcList
+    let totalPrice = 0
+    if (this.data.allSelectedBtn) {
+      gwcList.forEach(item=> {
+        item.selected =0
+      })
+    } else {
+      gwcList.forEach(item=> {
+        item.selected =1
+      })
+      gwcList.forEach(item=> {
+        totalPrice += Number(item.num*item.sku.price)
+      })
+    }
+    this.setData({
+      gwcList,
+      allSelectedBtn:!this.data.allSelectedBtn,
+      totalPrice
+    })
+  },
+  // 单选一个
+  selectedIt(e) {
+    let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0
+    gwcList.forEach(el=> {
+      if (el.id == item.id) {
+        el.selected == 1 ? el.selected =0 : el.selected = 1
+      }
+    })
+    gwcList.forEach(el=> {
+      if (el.selected == 1) {
+        totalPrice += Number(el.num*el.sku.price)
+      }
+    })
+    let status = gwcList.every(el => el.selected === 1)
+    this.setData({
+      gwcList,
+      allSelectedBtn:status?true:false,
+      totalPrice
+    })
+  },
+  // 左侧购物车打开弹窗
+  openPopup() {
+    // this.getCount()
+    let gwcList = this.data.gwcList
+    let status = gwcList.every(el => el.selected === 1)
+    this.setData({
+      showPopup:!this.data.showPopup,
+      allSelectedBtn:status?true:false,
+    })
+  },
+  // 获取商户标签列表
+  getSupplierTag() {
+    let list = this.data.list;
+    if(list.length>=this.data.total) return;
+    commonApi.user_post('supplier/get_supplier_by_title_tag_id', {
+      tag_id:this.data.navList2[this.data.navIndex].type, //标签的ID
+      offset:list.length, //起始查询
+      limit:10, //查询数量
+      title:this.data.keywords //搜索产品名称
+    }).then(res => {
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags?item.display_tags.split(","):[];
+        item.display_tags = item.display_tags.splice(0,2);
+      })
+      this.setData({
+        list:list.concat(res.data.list),
+        total:res.data.total
+      })
+    })
+  },
+  // 获取左侧二级分类
+  getType() {
+    commonApi._post("product/tag_list",{
+      pid:this.data.flag?this.data.navList[this.data.navIndex].type:this.data.navList2[this.data.navIndex].type, //父标签的ID
+    }).then(res=>{
+      this.setData({
+        typeList:res.data
+      })
+      this.getList()
+    })
+  },
+  // 获取历史购物车详情
+  getCount() {
+    commonApi.user_post('cart_within/get_list', {
+      type:'1'
+    }).then(res => {
+      let arr = res.data,totalPrice = 0,cartCount=0
+      if (arr.length>0) {
+        arr.forEach(item=> {
+          // totalPrice += item.num*item.sku.price
+          cartCount += item.num
+        })
+      }
+      this.setData({
+          cartCount: cartCount, //1
+          gwcList:res.data,
+          allSelectedBtn:false
+      })
+    })
+  },
+  // 重置
+  onReload() {
+    this.setData({
+      list:[],
+      total:1,
+      navIndex:0,
+      typeIndex:0,
+      flag:true
+    })
+    this.getList()
+  },
+  // 搜索
+  search:function(e){
+    if (e.detail.keywords == '') {
+      this.setData({
+        seachFlag:false,
+        keywords:'',
+        list:[],
+        total:1
+      })
+      this.onReload()
+    }else {
+      this.setData({
+        seachFlag:true,
+        keywords:e.detail.keywords,
+        list:[],
+        total:1
+      })
+      this.getList();
+    }
+  },
+  // 去产品详情页
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  // 去店铺
+  goShop(e){
+    let id = e.currentTarget.dataset.id;
+    util.pagePoint({
+      event: 'legacy_shop',
+      param:{
+        id:id
+      },
+      type:'supplier'
+    },1)
+    wx.navigateTo({
+      url: '/pages/list/store/index?id='+id,
+    })
+  },
+  gotoProduct:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.gotoDetail(item)
+  },
+  // 切换样式
+  changeStyle() {
+    this.setData({
+      navIndex:0,
+      flag:!this.data.flag,
+      total:1,
+      list:[],
+      typeIndex:0
+    })
+    if (this.data.flag) {
+      this.getType()
+    }else {
+      this.getSupplierTag()
+    }
+  },
+  // 切换一级分类
+  changeNav:function(e){
+    let index = e.currentTarget.dataset.index,navList=this.data.navList;
+    this.setData({
+      typeIndex:0,
+      navIndex:index,
+      typeList:[],
+      type:navList[index].type,
+      list:[],
+      total:1
+    })
+    if (this.data.flag) {
+      this.getType()
+    } else {
+      this.getSupplierTag()
+    }
+  },
+  // 切换左侧二级分类
+  changeType(e) {
+    let index = e.currentTarget.dataset.index,typeList=this.data.typeList;
+    this.setData({
+      typeIndex:index,
+      type:typeList[index].id,
+      list:[],
+      total:1
+    })
+    this.getList()
+  },
+  // 获取产品列表
+  getList:function(){
+    let list = this.data.list;
+    if(list.length>=this.data.total) return;
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:this.data.seachFlag? '20,19':this.data.typeList[this.data.typeIndex].id, //标签的ID
+      offset:list.length, //起始查询
+      limit: 10, //查询数量
+      title:this.data.keywords, //搜索产品名称
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags?item.display_tags.split(","):[];
+        item.display_tags = item.display_tags.splice(0,2);
+      })
+      this.setData({
+        list:list.concat(res.data.list),
+        total:res.data.total
+      })
+      console.log(this.data.list);
+    })
+    // commonApi._post("supplier/get_supplier_by_tag_id",{
+    //   tag_id:this.data.flag ? this.data.navList[this.data.navIndex].type :this.data.navList2[this.data.navIndex].type,
+    //   limit:10,
+    //   offset:list.length,
+    //   sort:"weight",
+    //   title:this.data.keywords
+    // }).then(res=>{
+    //   res.data.list.map(item=>{
+    //     item.display_tags = item.display_tags?item.display_tags.split(","):[];
+    //     item.display_tags = item.display_tags.splice(0,2);
+    //   })
+    //   this.setData({
+    //     list:list.concat(res.data.list),
+    //     total:res.data.total
+    //   })
+    // })
+  },
+  // 添加产品弹窗 1.首先获取到该产品下的规格
+  addBuyCart(e) {
+    let item = e.currentTarget.dataset.item
+    console.log(item);
+    commonApi._post("product/get_product_detail", {
+      id: item.id
+    }).then(res => {
+        if (item.skuid) {
+            let sku = res.data.sku.find(skuItem => item.id == skuItem.skuid);
+            res.data.sku = [sku];
+        }
+        res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+        this.setData({
+            info: res.data,
+            // skuFlag: "cart"
+        })
+        this.showCart()
+        this.BroswerRecord()
+    })
+  },
+  // 添加产品弹窗 2.渲染规格，未登录去登录
+  showCart: function () {
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+        title: this.data.info.title,
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            if (this.data.info.sku.length == 0) {
+                wx.showToast({
+                    title: '该产品未设置规格，不能加购',
+                    icon: 'none'
+                })
+                return;
+            }
+            this.setData({
+                skuFlag: "cart"
+            })
+            let that = this
+            wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                console.log(res)
+                that.setData({
+                    cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                })
+            }).exec()
+        }
+        this.getCount()
+    })
+  },
+  // 规格弹窗切换其他规格
+  selectSku: function (e) {
+      let index = e.currentTarget.dataset.index;
+      this.setData({
+          skuIndex: index
+      })
+  },
+  // 关闭弹窗
+  hideSku: function () {
+    this.setData({
+        skuFlag: null,
+        cartImgInfo: null
+    })
+  },
+  // 减少数量
+  minus: function () {
+    if (this.data.producNum == 1) return;
+    this.setData({
+        producNum: this.data.producNum - 1
+    })
+  },
+  // 加数量
+  add: function () {
+      this.setData({
+          producNum: this.data.producNum + 1
+      })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    // this.onReload()
+    // this.setData({
+    //   seachFlag:false
+    //   // list:[],
+    //   // total:1,
+    //   // navIndex:0,
+    //   // typeIndex:0,
+    //   // flag:true
+    // })
+    // this.getList()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (this.data.flag) {
+      this.getList()
+    } else {
+      this.getSupplierTag()
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-文创特产',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png'
+    }
+  }
+})
\ No newline at end of file
diff --git a/subPackages/techanNew/index.json b/subPackages/techanNew/index.json
new file mode 100644
index 0000000..0861abd
--- /dev/null
+++ b/subPackages/techanNew/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "common-image":"/pages/component/commonImage/index",
+    "search":"/pages/component/SearchHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/techanNew/index.wxml b/subPackages/techanNew/index.wxml
new file mode 100644
index 0000000..98904bd
--- /dev/null
+++ b/subPackages/techanNew/index.wxml
@@ -0,0 +1,213 @@
+<!--pages/feiyi/list/index.wxml-->
+<!-- 文创特产页面 -->
+<view class="techanMain">
+
+  <view style="{{seachFlag?'':'height: 500rpx;'}}">
+    <search bind:onload="search" name="{{name}}"></search>
+    <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240710/a39dd5504c4baa66dd239153d2d20787.png" mode="widthFix"></image>
+  </view>
+
+  <view wx:if="{{!seachFlag}}" class="techan-centent">
+    <!-- 切换分类 以及 切换样式 -->
+    <view class="type-box">
+      <view style="display: flex;">
+        <view wx:for="{{flag?navList:navList2}}" wx:key="*this" bindtap="changeNav" data-index="{{index}}" class="{{index == navIndex ? 'seld-nav':'nav'}}">{{item.title}}</view>
+      </view>
+      <!-- 店铺--产品 切换 -->
+      <image bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+    </view>
+    <!-- 产品部分 -->
+    <view wx:if="{{flag}}" style="flex: 1; display: flex; overflow: hidden;">
+      <!-- <view style="display: flex; pa/dding-bottom: 167rpx;"> -->
+      <!-- 左侧二级分类 -->
+      <view class="left">
+        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+          <view wx:for="{{typeList}}" wx:key="*this" class="{{index == typeIndex ? 'seld-type':'type-two-box'}}" bindtap="changeType" data-index="{{index}}">
+            <view class="line" wx:if="{{index == typeIndex}}"></view>
+            <view>
+              {{item.name}}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <!-- 右侧产品列表 -->
+      <view class="list" style="width: 100%;">
+        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+          <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
+            <image class="img" src="{{item.headimg}}" mode="" />
+            <view class="content">
+              <view class="title">
+                {{item.title}}
+              </view>
+              <view class="item-bottom">
+                <view class="price">
+                  <text class="current-price">{{item.price/100}}</text>
+                  <text class="original-price">¥{{item.market_price/100}}</text>
+                </view>
+                <view class="add" catchtap="addBuyCart" data-item="{{item}}">+</view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <!-- </view> -->
+    </view>
+    <!-- 店铺展示 -->
+    <view wx:else style="padding: 0 26.67rpx; overflow: hidden;">
+      <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getSupplierTag" bindscroll="scroll">
+        <view wx:for="{{list}}" class="list1" wx:key="*this">
+          <view class="top-info" bindtap="goShop" data-id="{{item.id}}">
+            <common-image mode="aspectFill" src="{{item.headimg}}" style="border-radius: 13rpx;"></common-image>
+            <view class="supplier-info">
+              <view class="supplier-name textOver">{{item.shop_name}}</view>
+              <view class="mid-box">
+                <view class="supplier-tags">
+                  <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
+                </view>
+                <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
+              </view>
+              <view class="bottom-box">
+                <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text style="max-width: 300rpx;" class="textOver">{{item.address}}</text></view>
+                <view class="btn">
+                  进店看看
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="product-list">
+            <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}" wx:key="*this">
+              <image src="{{item.headimg}}" mode="aspectFill"></image>
+              <view class="product-title textOver2">{{item.title}}</view>
+              <view class="supplier-price"><text>￥</text><text style="font-size:32rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+  <!-- 搜索到的产品列表 -->
+  <view wx:if="{{seachFlag}}" style="overflow-y: scroll;padding-bottom: 70rpx;">
+    <view class="hot-list" wx:if="{{list.length>0}}">
+      <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+        <view class="hot-item" wx:if="{{index%2==number}}" wx:for="{{list}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
+          <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+          <view class="hot-item-main">
+            <view class="hot-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view style="display: flex;justify-content: space-between;align-items: center; ">
+              <view>
+                <text class="hot-item-price">{{item.price/100}}</text>
+                <text class="hot-item-market_price">{{item.market_price/100}}</text>
+              </view>
+              <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:else style="display: flex;flex-direction: column;align-items: center;">
+      <image style="width:328rpx;height:450.67rpx;margin-top: 286.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
+      <view style="font-family: PingFang SC;font-weight: 500;font-size: 28rpx;color: #666666;margin-top: 67rpx;">
+        暂无搜索结果
+      </view>
+    </view>
+  </view>
+  <!-- 底部购物车 -->
+  <view style="width:100%;height:167rpx;" wx:if="{{flag}}">
+  </view>
+  <view class="bottom" wx:if="{{(flag &&skuFlag != 'cart') || showPopup}}">
+    <!-- 左边购物车图标及价格 -->
+    <view class="gwc-left">
+      <view class="gwc" bindtap="openPopup">
+        <image wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
+        <image wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
+        <view class="cartCount">{{cartCount}}</view>
+      </view>
+      <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
+        总计：<text class="money">{{totalPrice/100}}</text>
+      </view>
+      <!-- <view style="margin-left: 16.67rpx;font-family: PingFang SC;font-weight: 500;font-size: 27rpx;color: #0B898E;" bindtap="openPopup">
+      <text>明细</text>
+      <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode="" />
+      <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode="" />
+    </view> -->
+    </view>
+    <!-- 去结算按钮 -->
+    <view class="{{cartCount == 0?'no-buy':'buy'}}" bindtap="order">去结算</view>
+  </view>
+</view>
+<!-- 规格弹窗 -->
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku" style="z-index: 9999;"></view>
+  <view class="mask-content" style="z-index: 99999;">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view class="sku-price">{{info.sku[skuIndex].price/100}}
+          <view class="allowance" wx:if="{{allowance_data}}">
+            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+        </view>
+        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+      </view>
+    </view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{info.sku}}">{{item.sku_name}}</view>
+    </view>
+    <view class="number-box">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select" bindtap="add"></view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <!-- <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'加入购物车':'立即购买'}}
+      </view> -->
+      <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">加入购物车</view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
+<!-- 购物车的弹窗 -->
+<view class="mask" wx:if="{{showPopup}}">
+  <view bindtap="openPopup" class="mask-bg"></view>
+  <view class="mask-content" style="padding: 40rpx 0 180rpx;min-height: 600rpx;">
+    <view style="margin: 0 26.67rpx;">
+      <!-- 顶部操作按钮 -->
+      <view class="flex" style="margin-bottom: 56.67rpx;">
+        <view class="flex">
+          <image bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <view bindtap="allSelected" wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
+          <text class="all">全选</text>
+        </view>
+        <view class="flex" bindtap="delAll">
+          <image style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
+          <text class="del-all">清空</text>
+        </view>
+      </view>
+      <view class="gwc-item" wx:for="{{gwcList}}" wx:key="*this" bindtap="selectedIt" data-item="{{item}}">
+        <view style="margin-right: 26.67rpx;">
+          <image wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
+        </view>
+        <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <view class="main">
+          <view>
+            <view class="title">{{item.product.title}}</view>
+            <view class="sku-title">{{item.sku.sku_name}}</view>
+          </view>
+          <view class="main-bottom">
+            <view class="price">{{item.sku.price/100}}</view>
+            <view class="num-box">
+              <image class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <view style="margin: 0 25.33rpx;">{{item.num}}</view>
+              <image class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/subPackages/techanNew/index.wxss b/subPackages/techanNew/index.wxss
new file mode 100644
index 0000000..69bccdf
--- /dev/null
+++ b/subPackages/techanNew/index.wxss
@@ -0,0 +1,685 @@
+/* pages/feiyi/list/index.wxss */
+.techanMain {
+  height: 100%;
+  display: flex; 
+  flex-direction: column;
+  overflow:hidden;
+}
+.heaimg {
+  display: block;
+  width: 100%; 
+}
+
+.techan-centent {
+ flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  /* height: 500rpx; */
+}
+page {
+  /* background: #FFD99E; */
+  /* padding-bottom: 170rpx; */
+  height: 100%;
+  display: flex; 
+  flex-direction: column;
+  overflow:hidden;
+}
+.changeStyle {
+  width: 40rpx;
+  height: 40rpx;
+}
+.type-box {
+    padding: 33.33rpx 26.67rpx 26.67rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.nav {
+    width: 145rpx;
+    height: 53rpx;
+    border-radius: 8rpx;
+    border: 1px solid #0B898E;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #0B898E;
+    text-align: center;
+    line-height: 53rpx;
+    margin-right: 12.67rpx;
+}
+.seld-nav {
+  width: 145rpx;
+  height: 57rpx;
+  background: #0B898E;
+  border-radius: 8rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 57rpx;
+  margin-right: 12.67rpx;
+}
+.left {
+    width: 200rpx;
+    /* min-height: 100vh; */
+    /* min-height: 850rpx; */
+    height: 100%;
+    background-color: #F3F3F3;
+}
+.type-two-box {
+    width: 200rpx;
+    height: 107rpx;
+    text-align: center;
+    line-height: 107rpx;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+}
+.seld-type {
+    background: #fff;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #000000;
+    text-align: center;
+    line-height: 107rpx;
+    position: relative;
+}
+.line {
+    width: 7rpx;
+    height: 53rpx;
+    background: #0B898E;
+    position: absolute;
+    top: 26.67rpx;
+    left: 0;
+}
+.item {
+    padding: 0 26.67rpx;
+    display: flex;
+    margin-bottom: 26.67rpx;
+}
+.img {
+    width: 161rpx;
+    height: 161rpx;
+    background: #999999;
+    border-radius: 11rpx;
+    flex-shrink: 0;
+    margin-right: 14.67rpx;
+}
+.content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 100%;
+}
+.title {
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+}
+.item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.current-price {
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #D70000;
+    margin-right: 13.33rpx;
+}
+.current-price::before {
+  content: "￥";
+  font-size: 23rpx;
+  font-weight: 500;
+}
+.original-price {
+    font-weight: 400;
+    font-size: 21rpx;
+    color: #999999;
+    text-decoration-line: line-through;
+}
+.add {
+    width: 40rpx;
+    height: 40rpx;
+    background: #0B898E;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 40rpx;
+    font-weight: 500;
+    font-size: 31rpx;
+    color: #FFFFFF;
+}
+.bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 167rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 2rpx 13rpx 0rpx rgba(136,136,136,0.25);
+    padding: 0 27.33rpx 0 26.67rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    z-index: 666;
+}
+.gwc {
+  margin-right: 14rpx;
+  width: 84rpx;
+  height: 84rpx;
+  position: relative;
+}
+.cartCount {
+    width: 40rpx;
+    height: 40rpx;
+    background: #D90F01;
+    border-radius: 50%;
+    border: 1rpx solid #FFFFFF;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 40rpx;
+    position: absolute;
+    right: -10rpx;
+    top: -10rpx;
+}
+.gwc-left {
+    display: flex;
+    align-items: center;
+}
+.money {
+  font-weight: bold;
+  font-size: 47rpx;
+  color: #D70000;
+}
+.money::before {
+  content: "￥";
+  font-size: 23rpx;
+  font-weight: 500;
+}
+
+.buy {
+  width: 240rpx;
+  height: 83rpx;
+  background: #D70000;
+  border-radius: 42rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 83rpx;
+}
+
+.no-buy {
+  width: 240rpx;
+  height: 83rpx;
+  background: #BDBDBD;
+  border-radius: 42rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 83rpx;
+}
+
+
+
+
+
+/* .classimg {
+  margin-left: 13rpx;
+  width: 710rpx;
+  display: block;
+} */
+/* .type-text {
+  position: absolute;
+  left: 130rpx;
+  padding: 30rpx 30rpx;
+  bottom: 0;
+  line-height: 60rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+  z-index: 1;
+  color: #FFE1A2;
+  width: 120rpx;
+  display: flex;
+  justify-content: space-between;
+} */
+/* .item {
+  background: url(https://static.ticket.sz-trip.com/xcxImages/techan/bg.png);
+  background-size: 100% 100%;
+  width: 694rpx;
+  height: 571rpx;
+  margin: 0 auto;
+  margin-bottom: 15rpx;
+  color: #704436;
+  box-sizing: border-box;
+  
+} */
+.list1 {
+  background-color: #FAF6F0;
+  border-radius: 13rpx;
+  margin-bottom: 30rpx;
+  padding: 20rpx 0 28rpx 20rpx;
+}
+.top-info {
+  display: flex;
+  /* padding: 30rpx; */
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+.top-info image {
+  width: 136rpx;
+  height: 136rpx;
+  display: block;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+}
+.supplier-info {
+  display: flex;
+  flex-direction: column;
+  /* height: 136rpx; */
+  justify-content:space-between;
+  flex: 1;
+  margin-right: 20.67rpx;
+  /* width: 300rpx; */
+}
+.supplier-name {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #000000;
+}
+.supplier-tags {
+  display: flex;
+}
+.supplier-tag {
+  padding: 0 20rpx;
+  font-size: 22rpx;
+  border: 1rpx solid #877350;
+  border-radius: 15rpx;
+  line-height: 28rpx;
+  margin-right: 20rpx;
+  color: #877350;
+}
+.supplier-address {
+  font-size: 20rpx;
+  margin-top: 10rpx;
+  color: #877350;
+  font-weight: 500;
+  font-size: 23rpx;
+}
+.supplier-address .iconfont {
+  margin-right: 8rpx;
+  font-size: 20rpx;
+}
+.supplier-price {
+  color: #CC3320;
+  font-size: 20rpx;
+}
+.supplier-price text:nth-child(2){
+  font-size: 40rpx;
+  font-weight: bold;
+}
+.product-list {
+  display: flex;
+  /* margin: 0 20rpx 0 30rpx; */
+  overflow-x:scroll ;
+  box-sizing: border-box;
+  /* padding-right:30rpx ; */
+}
+.product-list::-webkit-scrollbar {
+  display: none;
+}
+.product-item {
+  width: 212rpx;
+  font-size: 28rpx;
+  margin-right: 19rpx;
+}
+.product-item:nth-child(3){
+}
+.product-item image {
+  width: 212rpx;
+  height: 209rpx;
+  border-radius: 13rpx;
+}
+.market_price {
+  color: #999999;
+  font-weight: 400;
+  font-size: 20rpx;
+  margin-left: 10rpx;
+  text-decoration: line-through;
+}
+.mid-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-right: 10rpx;
+}
+.bottom-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.btn{
+  flex-shrink: 0;
+  background: #C6937F;
+  border-radius: 24rpx;
+  width: 147rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  text-align: center;
+  font-size: 25rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+.sku-info-box {
+  margin: 50rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.sku-info-box image {
+  width: 218rpx;
+  height: 180rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 40rpx;
+  flex-shrink: 0;
+}
+.sku-info {
+  flex: 1;
+}
+.sku-price {
+  font-size: 40rpx;
+  font-weight: 500;
+  color: #D62828;
+  margin: 20rpx 0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.sku-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 27rpx;
+  vertical-align: baseline;
+}
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+.sku-names {
+  display: flex;
+  font-size: 29rpx;
+  color: #333;
+  margin: 0 40rpx;
+  text-align: center;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+}
+.sku-name-item {
+  background: #EFEFEF;
+  border: 1rpx solid #EFEFEF;
+  width: 318rpx;
+  line-height: 77rpx;
+  border-radius: 14rpx;
+  margin-bottom: 25rpx;
+  margin-right: 30rpx;
+}
+.sku-name-item:nth-child(2n) {
+  margin-right: 0;
+}
+.sku-name-item.active {
+  color: #0B898E;
+  border-color: #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+.number-box {
+  display: flex;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+  margin: 0 40rpx;
+  padding: 40rpx 0;
+}
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+.number-box view {
+  border: 1rpx solid #666;
+  border-radius: 7rpx;
+  text-align: center;
+  width: 67rpx;
+  line-height: 67rpx;
+  font-size: 33rpx;
+  color: #000;
+}
+.number-box view.disable {
+  border-color: #ccc;
+  color: #999;
+}
+.number-box view.number {
+  width: 94rpx;
+  margin: 0 15rpx;
+}
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 33rpx;
+  font-weight: 500;
+}
+.mask-btn.disable {
+  background: #ccc;
+}
+
+.flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.all {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 37rpx;
+  color: #000000;
+  margin-left: 26rpx;
+}
+
+.del-all {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #999999;
+  margin-left: 7.33rpx;
+}
+
+.gwc-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 48rpx;
+}
+
+.main {
+    height: 179rpx;
+    padding: 8.67rpx 0 6.67rpx;
+    width: 425rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.main .title {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 31rpx;
+  color: #2C2C2C;
+  margin-bottom: 18rpx;
+}
+.main .sku-title {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #999999;
+}
+
+.main-bottom {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.num-box {
+  display: flex;
+}
+
+.reduce, .grow {
+  width: 49rpx;
+  height: 49rpx;
+}
+
+.main-bottom .price {
+  font-family: PingFangSC;
+  font-size: 35rpx;
+  color: #F84A56;
+}
+.main-bottom .price::before {
+  content: "￥";
+  font-size: 24rpx;
+  font-weight: 500;
+}
+
+.hot-list {
+    padding: 26.67rpx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
+.hot-item {
+  margin-bottom: 20rpx;
+  width: 337rpx;
+  height: 513rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153,153,153,0.33);
+  border-radius: 13rpx;
+}
+.hot-item-img {
+  width: 337rpx;
+  height: 337rpx;
+  background: #0B898E;
+  border-radius: 13rpx;
+}
+.hot-item-title {
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+    /* margin-bottom: 25.33rpx; */
+}
+.hot-item-price {
+  font-family: Arial;
+  font-weight: bold;
+  font-size: 33rpx;
+  color: #D70000;
+  margin-right: 12.67rpx;
+}
+.hot-item-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 23rpx;
+}
+.hot-item-market_price {
+  font-family: Arial;
+  font-weight: 400;
+  font-size: 21rpx;
+  color: #999999;
+  text-decoration-line: line-through;
+ }
+ .hot-item-main {
+    padding: 20rpx 19rpx 26.67rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    min-height: 140rpx;
+    justify-content: space-between;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child {
+    width: 337rpx;
+    height: 373rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153,153,153,0.33);
+    border-radius: 13rpx;
+    padding-bottom: 20rpx;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child  .hot-item-img{
+    width: 337rpx;
+    height: 238rpx;
+    background: #71B580;
+    border-radius: 13rpx;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child  .main{
+    width: 337rpx;
+    height: 238rpx;
+    background: #71B580;
+    border-radius: 13rpx;
+ }
+ .hot-list-item:nth-child(2) .hot-item:first-child .hot-item-main {
+  padding: 5rpx 19rpx 26.67rpx 15rpx;
+  display: flex;
+  flex-direction: column;
+  min-height: 90rpx;
+  justify-content: space-between;
+}
+.hot-list-item:nth-child(2) .hot-item:first-child .hot-item-main .hot-item-title {
+  margin-bottom: 20rpx;
+}
+.hot-list-item {
+  width: 337rpx;
+}

From f0d900b22786fba727c3eae3087e22c3dd5cd17b Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Jul 2024 17:34:29 +0800
Subject: [PATCH 173/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index e64d02e..501454a 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.isTest130? true : false;
+      data.isTest = data.isTest131? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 572538733920be2589103ef938334ff840d19a90 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 16 Jul 2024 18:14:56 +0800
Subject: [PATCH 174/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4a1cd86..ff359e1 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -488,7 +488,7 @@
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
     <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
   </view>
-  <view class="other-plats" wx:if="{{otherPlat}}">
+  <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
     <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
       <image src="{{item.icon}}" mode="widthFix"></image>
       <view>{{item.name}}</view>

From 36e7e324d3ecefa807f6b9f1282bc88b17ee00ae Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 19 Jul 2024 17:10:55 +0800
Subject: [PATCH 175/471] =?UTF-8?q?=E6=96=87=E5=88=9B=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              |   2 +-
 app.json                            |   3 +-
 pages/component/SearchHeader.js     |   5 +
 pages/component/SearchHeader.wxml   |   3 +-
 pages/index/index.wxml              |  11 +-
 pages/info/postProductInfo/index.js |  11 +-
 subPackages/feiyiNew/index.js       | 157 ++++++--
 subPackages/feiyiNew/index.wxml     | 207 +++++-----
 subPackages/feiyiNew/index.wxss     |  66 +++-
 subPackages/postSearch/index.js     | 582 ++++++++++++++++++++++++++++
 subPackages/postSearch/index.json   |   5 +
 subPackages/postSearch/index.wxml   | 135 +++++++
 subPackages/postSearch/index.wxss   | 474 ++++++++++++++++++++++
 subPackages/techanNew/index.js      | 175 +++++++--
 subPackages/techanNew/index.wxml    |  44 ++-
 subPackages/techanNew/index.wxss    |  57 +++
 16 files changed, 1757 insertions(+), 180 deletions(-)
 create mode 100644 subPackages/postSearch/index.js
 create mode 100644 subPackages/postSearch/index.json
 create mode 100644 subPackages/postSearch/index.wxml
 create mode 100644 subPackages/postSearch/index.wxss

diff --git a/app.js b/app.js
index 501454a..08e0a74 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.isTest131? true : false;
+      data.isTest = data.isTest132? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 1326c78..340cb02 100644
--- a/app.json
+++ b/app.json
@@ -192,7 +192,8 @@
             "index/index",
             "techanNew/index",
             "techanCart/index",
-            "feiyiNew/index"
+            "feiyiNew/index",
+            "postSearch/index"
         ]
     }],
   "plugins": {
diff --git a/pages/component/SearchHeader.js b/pages/component/SearchHeader.js
index 642f934..de84749 100644
--- a/pages/component/SearchHeader.js
+++ b/pages/component/SearchHeader.js
@@ -79,6 +79,11 @@ Component({
       //   wx.uma.trackEvent(this.properties.focusclickid);
       // }
     },
+    // inputFocus1:function(){
+    //   wx.navigateTo({
+    //     url: '/subPackages/postSearch/index',
+    //   })
+    // },
     searchInput:function(e){
       this.setData({
         keywords:e.detail.value
diff --git a/pages/component/SearchHeader.wxml b/pages/component/SearchHeader.wxml
index 8d84ec0..53f0f6e 100644
--- a/pages/component/SearchHeader.wxml
+++ b/pages/component/SearchHeader.wxml
@@ -3,7 +3,8 @@
     <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
     <view bindtap="indexFocus" class="search-box" style="margin-right:{{right + 5}}px;">
       <icon class="iconfont icon-sousuo"></icon>
-      <input bindfocus="inputFocus" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="getVal" class="weui-input" placeholder="搜索" />
+      <input bindfocus="inputFocus1" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="inputFocus1" class="weui-input" placeholder="搜索" />
+      <!-- <input bindfocus="inputFocus" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="getVal" class="weui-input" placeholder="搜索" /> -->
       <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
         <view style="color: #ccc;">|</view>
         <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;">搜索</view>
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3c8263c..4ae93c2 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -60,7 +60,7 @@
   <!-- 非遗跳专题 -->
   <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
     data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="{{isTest?'/pages/list/scene/index':'/subPackages/feiyiNew/index'}}" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
     <view class="top-icon-text">非遗专卖</view>
   </view>
@@ -76,7 +76,7 @@
     <view class="top-icon-text">剧场演出</view>
   </view>
   <!-- 2024年7月新版文创特产 -->
-  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="{{isTest?'/pages/list/road/index':'/subPackages/techanNew/index'}}" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
     <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
     <view class="top-icon-text">文创特产</view>
   </view>
@@ -173,6 +173,7 @@
   <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
   <view style="display: flex;">
     <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"></view>
+    <!-- <view bindtap="gotoUrl" data-event="xlqc" data-url="https://wlsjzx.wglj.suzhou.com.cn:8096/kt_h5/index.html#/home" class="sslk"></view> -->
     <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
@@ -233,7 +234,7 @@
           <view class="text">数字博物馆</view>
         </view>
         <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/uploads/20240717/df0683bb40ec2615a932ef2379779374.png" mode="widthFix"></image>
           <view class="text">数字名人馆</view>
         </view>
         <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
@@ -261,7 +262,7 @@
           <view class="text">书仓</view>
         </view>
         <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240716/1b3895b680bc447b84829623d43cee02.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/uploads/20240717/1a5fc26d419e589c5649273f8105b723.png" mode="widthFix"></image>
           <view class="text">e读书</view>
         </view>
 
@@ -280,7 +281,7 @@
           <view class="text">书仓</view>
         </view> -->
         <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
           <view class="text">云游苏州</view>
         </view>
         <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 45b358c..2ce7d62 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -340,9 +340,18 @@ Page({
                         url: '/pages/order/postOrder/index',
                     })
                 } else {
+                    let tag_id = this.data.info.tag_id,type = ''
+                    if (tag_id.includes(20) || tag_id.includes(19)) {  //文创
+                      type = '1'
+                    }else if (tag_id.includes(5)) { //非遗
+                      type = '2'
+                    }else {
+                      type = ''
+                    }
                     commonApi.user_post("cart/add_sku", {
                         sku_id: this.data.info.sku[this.data.skuIndex].id,
-                        num: this.data.producNum
+                        num: this.data.producNum,
+                        type:type
                     }).then(res => {
                         if (res.code == 1) {
                             commonApi.user_post('cart/get_list', {}).then(res => {
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index 63e22d3..d7c40cb 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -10,11 +10,25 @@ Page({
    * 页面的初始数据
    */
   data: {
+    height: 90,
+    padHeight:0,
+    right:0,
     list:[], //获取的产品列表
     total:1, //总数
     keywords:"", //搜索关键字
     navIndex:0, //一级分类选中下标
-    navList:['列表样式','宫格样式'],
+    navList:[
+      {
+        title:'列表样式',
+        icon:'https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png',
+        seldIcon:'https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png'
+      },
+      {
+        title:'宫格样式',
+        icon:'https://static.ticket.sz-trip.com/uploads/20240717/eebe3e2345a8adb2668bc34cb28cee74.png',
+        seldIcon:'https://static.ticket.sz-trip.com/uploads/20240717/b3e9136ecb05bedcd9d3f59ee4399b62.png'
+      }
+    ],
     flag:true, //切换样式，true按分类，false按店铺展示
     typeList:[], //左侧的二级分类
     typeIndex:0, //二级分类选中下标
@@ -29,13 +43,15 @@ Page({
     allSelectedBtn:false, //全选按钮
     seachFlag:false, //搜索模式
     totalPrice:0, //获取购物车总价
-    name:'非遗专卖'
+    name:'非遗专卖',
+    nowAddListId:[]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    app.globalData.nowAddListId = []
     wx.showShareMenu({
         withShareTicket: true,
         menus: ['shareAppMessage', 'shareTimeline']
@@ -59,7 +75,8 @@ Page({
               icon: "success"
           })
           this.setData({
-            allSelectedBtn:false
+            allSelectedBtn:false,
+            totalPrice:0
           })
             this.getCount()
         }
@@ -124,6 +141,12 @@ Page({
             type:"2"
         }).then(res => {
             if (res.code == 1) {
+              let sku_id = this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id
+              let _nowAddListId = this.data.nowAddListId
+              _nowAddListId.push(sku_id)
+              this.setData({
+                nowAddListId: _nowAddListId
+              })
                 commonApi.user_post('cart_within/get_list', {
                   type:'2'
                 }).then(res => {
@@ -134,7 +157,7 @@ Page({
                     // debugger
                     if (!this.data.skuFlag && !this.data.showPopup) {
                       // debugger
-                      if (val.sku.id == this.data.info.sku[this.data.skuIndex].id) {
+                      if (this.data.nowAddListId.includes(val.sku.id)) {
                         val.selected = 1
                       }
                     }else {
@@ -236,10 +259,10 @@ Page({
                 }
             })
             if (product.length == 0 && product1.length == 0) {
-                wx.showToast({
-                    title: '请先选择产品',
-                    icon: 'none'
-                })
+                // wx.showToast({
+                //     title: '请先选择产品',
+                //     icon: 'none'
+                // })
                 return;
             }
             if (product.length > 0 && product1.length > 0) {
@@ -272,10 +295,12 @@ Page({
   allSelected() {
     let gwcList = this.data.gwcList
     let totalPrice = 0
+    let nowAddListId = []
     if (this.data.allSelectedBtn) {
       gwcList.forEach(item=> {
         item.selected =0
       })
+      nowAddListId = []
     } else {
       gwcList.forEach(item=> {
         item.selected =1
@@ -283,16 +308,20 @@ Page({
       gwcList.forEach(item=> {
         totalPrice += Number(item.num*item.sku.price)
       })
+      gwcList.forEach(item=> {
+        nowAddListId.push(item.sku_id)
+      })
     }
     this.setData({
       gwcList,
       allSelectedBtn:!this.data.allSelectedBtn,
-      totalPrice
+      totalPrice,
+      nowAddListId
     })
   },
   // 单选一个
   selectedIt(e) {
-    let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0
+    let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0,nowAddListId=[]
     gwcList.forEach(el=> {
       if (el.id == item.id) {
         el.selected == 1 ? el.selected =0 : el.selected = 1
@@ -303,18 +332,27 @@ Page({
         totalPrice += Number(el.num*el.sku.price)
       }
     })
+    gwcList.forEach(item=> {
+      if (item.selected == 1) {
+        nowAddListId.push(item.sku_id)
+      }
+    })
     let status = gwcList.every(el => el.selected === 1)
     this.setData({
       gwcList,
       allSelectedBtn:status?true:false,
-      totalPrice
+      totalPrice,
+      nowAddListId
     })
   },
   // 左侧购物车打开弹窗
   openPopup() {
     // this.getCount()
     let gwcList = this.data.gwcList
-    let status = gwcList.every(el => el.selected === 1)
+    let status = false
+    if (gwcList.length>0) {
+      status = gwcList.every(el => el.selected === 1)
+    }
     this.setData({
       showPopup:!this.data.showPopup,
       allSelectedBtn:status?true:false,
@@ -328,14 +366,20 @@ Page({
       tag_id:5, //标签的ID
       offset:list.length, //起始查询
       limit:10, //查询数量
-      title:this.data.keywords //搜索产品名称
+      title: this.data.seachFlag ? this.data.keywords : '' //搜索产品名称
     }).then(res => {
+      let arr = []
+      if (this.data.seachFlag) {
+        res.data.list.map(obj => {
+          arr = [...arr, ...obj.product]
+        })
+      }
       res.data.list.map(item=>{
         item.display_tags = item.display_tags?item.display_tags.split(","):[];
         item.display_tags = item.display_tags.splice(0,2);
       })
       this.setData({
-        list:list.concat(res.data.list),
+        list:this.data.seachFlag?arr:list.concat(res.data.list),
         total:res.data.total
       })
     })
@@ -356,20 +400,33 @@ Page({
     commonApi.user_post('cart_within/get_list', {
       type:'2'
     }).then(res => {
-      let arr = res.data,cartCount=0
-      // let arr = res.data,totalPrice = 0,cartCount=0
+      let arr = res.data,totalPrice = 0,cartCount=0
       if (arr.length>0) {
         arr.forEach(item=> {
           // totalPrice += item.num*item.sku.price
           cartCount += item.num
         })
       }
-      // console.log(totalPrice);
+      if (app.globalData.nowAddListId.length>0) {
+        arr.map(item=> {
+          app.globalData.nowAddListId.forEach(val=> {
+            if (val == item.sku_id) {
+              item.selected = 1
+            }
+          })
+        })
+        // debugger
+        arr.forEach(item=> {
+          if(item.selected == 1) {
+            totalPrice += item.num*item.sku.price
+          }
+        })
+      }
       this.setData({
           cartCount: cartCount, //1
           gwcList:res.data,
-          // totalPrice,
-          allSelectedBtn:false
+          allSelectedBtn:false,
+          totalPrice:app.globalData.nowAddListId.length>0?totalPrice:0
       })
     })
   },
@@ -384,6 +441,7 @@ Page({
       seachFlag:false
     })
     this.getList()
+    this.getCount()
   },
   // 搜索
   search:function(e){
@@ -394,7 +452,7 @@ Page({
         list:[],
         total:1
       })
-      this.onReload()
+      // this.onReload()
     }else {
       this.setData({
         seachFlag:true,
@@ -402,7 +460,12 @@ Page({
         list:[],
         total:1
       })
-      this.getList();
+      // this.getList();
+    }
+    if (!this.data.navIndex == 0) {
+      this.getSupplierTag()
+    } else {
+      this.getList()
     }
   },
   // 去产品详情页
@@ -477,7 +540,7 @@ Page({
       tag_id:this.data.seachFlag? '5':this.data.typeList[this.data.typeIndex].id, //标签的ID
       offset:list.length, //起始查询
       limit: 10, //查询数量
-      title:this.data.keywords, //搜索产品名称
+      title:this.data.seachFlag ? this.data.keywords : '', //搜索产品名称
     }).then(res=>{
       res.data.list.map(item=>{
         item.display_tags = item.display_tags?item.display_tags.split(","):[];
@@ -587,18 +650,64 @@ Page({
           producNum: this.data.producNum + 1
       })
   },
+  getHeight() {
+    let systemInfo = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect();
+      let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+      this.setData({
+        height:height,
+        padHeight:systemInfo.statusBarHeight,
+        right:(systemInfo.screenWidth - rect.right) + rect.width
+      })
+      console.log(systemInfo,rect)
+  },
+  back: function () {
+    if(this.properties.clickid){
+      wx.uma.trackEvent(this.properties.clickid);
+    }
+    const pages = getCurrentPages();
+    // wx.showTabBar({})
+    console.log(this.properties.isIndex)
+    if (pages.length<=1){
+      wx.switchTab({
+        url: app.globalData.menuRoute
+      })
+    }
+    else {
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+  },
+  goNewSearch() {
+    wx.navigateTo({
+      // url: "/subPackages/postSearch/index?type_id=2",
+      url: '/subPackages/postSearch/index?type_id=2&ids='+this.data.nowAddListId,
+    })
+  },
+  // lower() {
+  //   if (this.data.flag) {
+  //     this.getList()
+  //   } else {
+  //     this.getSupplierTag()
+  //   }
+  // },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
+    this.getHeight()
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.onReload()
+    if (app.globalData.nowAddListId.length>0) {
+      this.getCount()
+    }else {
+      this.onReload()
+    }
+    this.getHeight()
     // this.setData({
     //   list:[],
     //   total:1,
diff --git a/subPackages/feiyiNew/index.wxml b/subPackages/feiyiNew/index.wxml
index 4aeb1af..b0ca7c2 100644
--- a/subPackages/feiyiNew/index.wxml
+++ b/subPackages/feiyiNew/index.wxml
@@ -1,130 +1,146 @@
 <!--pages/feiyi/list/index.wxml-->
 <!-- 非遗专卖页面 -->
-<view class="fiyi-main" >
+<view class="fiyi-main">
   <view style="{{seachFlag?'':'height: 500rpx;'}}">
-  <search bind:onload="search" name="{{name}}"></search>
-  <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240715/590b8c17b06ccadd09f43ee9260d2a36.png" mode="widthFix"></image>
-</view>
-<view wx:if="{{!seachFlag}}" class="feiyi-centent">
-  <!-- <view class="type-box">
+    <!-- <search bind:onload="search" name="{{name}}"></search> -->
+    <view class="title-box{{transparent==1?' bg-box':''}}" style="height:{{isScene==1?'0':(height+padHeight)}}px;">
+      <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px">
+        <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
+        <view bindtap="goNewSearch" class="search-box" style="margin-right:{{right + 5}}px;">
+          <icon class="iconfont icon-sousuo"></icon>
+          <view class="weui-input" style="color: #999;font-weight: 400;font-size: 27rpx;">请输入商品名称</view>
+          <!-- <input placeholder-class="{{transparent==1?'phcolor':''}}" class="weui-input" placeholder="搜索" /> -->
+          <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
+            <view style="color: #ccc;">|</view>
+            <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;">搜索</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240715/590b8c17b06ccadd09f43ee9260d2a36.png" mode="widthFix"></image>
+  </view>
+  <view wx:if="{{!seachFlag}}" class="feiyi-centent">
+    <!-- <view class="type-box">
     <view style="display: flex;">
       <view wx:for="{{flag?navList:navList2}}" wx:key="*this" bindtap="changeNav" data-index="{{index}}" class="{{index == navIndex ? 'seld-nav':'nav'}}">{{item.title}}</view>
     </view>
     <image bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
   </view> -->
-  <!-- 产品部分 -->
-  <view wx:if="{{navIndex == 0}}" style="height: 100%; overflow: hidden;">
-    <view style="display: flex;height: 100%; overflow: hidden;">
-      <!-- 左侧二级分类 -->
-      <view class="left">
-        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+    <!-- 产品部分 -->
+    <view wx:if="{{navIndex == 0}}" style="height: 100%; overflow: hidden;">
+      <view style="display: flex;height: 100%; overflow: hidden;">
+        <!-- 左侧二级分类 -->
+        <view class="left">
+          <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
 
-          <view wx:for="{{typeList}}" wx:key="*this" class="{{index == typeIndex ? 'seld-type':'type-two-box'}}" bindtap="changeType" data-index="{{index}}">
-            <view class="line" wx:if="{{index == typeIndex}}"></view>
-            <view>
-              {{item.name}}
+            <view wx:for="{{typeList}}" wx:key="*this" class="{{index == typeIndex ? 'seld-type':'type-two-box'}}" bindtap="changeType" data-index="{{index}}">
+              <view class="line" wx:if="{{index == typeIndex}}"></view>
+              <view>
+                {{item.name}}
+              </view>
             </view>
-          </view>
-        </scroll-view>
-      </view>
-      <!-- 右侧产品列表 -->
-      <view style="display：flex">
-        <view style="width: 550rpx;display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
-          <view class="nav-box">
-            <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
-              <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
-              <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
-              <text>{{item}}</text>
+          </scroll-view>
+        </view>
+        <!-- 右侧产品列表 -->
+        <view style="display:flex;height:100%;flex-direction: column; ">
+          <view style="width: 550rpx; display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
+            <view class="nav-box">
+              <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
+                <image src="{{navIndex == index ?item.icon :item.seldIcon}}" mode="" class="style-icon" style="width:29rpx;height:29rpx;" />
+                <!-- <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" /> -->
+                <!-- <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" /> -->
+                <text>{{item.title}}</text>
+              </view>
             </view>
           </view>
-        </view>
-        <view class="list" style="width: 100%;flex：1; overflow: hidden;">
-          <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
-            <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
-              <image class="img" src="{{item.headimg}}" mode="" />
-              <view class="content">
-                <view class="title">
-                  {{item.title}}
-                </view>
-                <view class="item-bottom">
-                  <view class="price">
-                    <text class="current-price">{{item.price/100}}</text>
-                    <text class="original-price">¥{{item.market_price/100}}</text>
+          <view class="list" style="width:550rpx; height:100%; flex:1; overflow: hidden;padding-bottom: 30rpx;">
+            <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getList" bindscroll="scroll">
+              <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
+                <image class="img" src="{{item.headimg}}" mode="" />
+                <view class="content">
+                  <view class="title">
+                    {{item.title}}
+                  </view>
+                  <view class="item-bottom">
+                    <view class="price">
+                      <text class="current-price">{{item.price/100}}</text>
+                      <text class="original-price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">¥{{item.market_price/100}}</text>
+                    </view>
+                    <view class="add" catchtap="addBuyCart" data-item="{{item}}">+</view>
                   </view>
-                  <view class="add" catchtap="addBuyCart" data-item="{{item}}">+</view>
                 </view>
               </view>
-            </view>
-          </scroll-view>
+            </scroll-view>
+          </view>
         </view>
       </view>
     </view>
-  </view>
-  <!-- 店铺展示 -->
-  <view wx:else style="padding: 0 26.67rpx; display: flex; flex-direction: column;  overflow: hidden;">
-    <view style="width: 700rpx;display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
-      <view class="nav-box">
-        <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
-          <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
-          <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
-          <text>{{item}}</text>
+    <!-- 店铺展示 -->
+    <view wx:else style="padding: 0 26.67rpx; display: flex; flex-direction: column;  overflow: hidden;">
+      <view style="width: 700rpx;display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
+        <view class="nav-box">
+          <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
+            <image src="{{navIndex == index ?item.icon :item.seldIcon}}" mode="" class="style-icon" style="width:29rpx;height:29rpx;" />
+            <!-- <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
+          <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" /> -->
+            <text>{{item.title}}</text>
+          </view>
         </view>
       </view>
-    </view>
-    <view style="flex:1; overflow: hidden;">
-      <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getSupplierTag" bindscroll="scroll">
-      <view wx:for="{{list}}" class="list1" wx:key="*this">
-        <view class="top-info" bindtap="goShop" data-id="{{item.id}}">
-          <common-image mode="aspectFill" src="{{item.headimg}}" style="border-radius: 13rpx;"></common-image>
-          <view class="supplier-info">
-            <view class="supplier-name textOver">{{item.shop_name}}</view>
-            <view class="mid-box">
-              <view class="supplier-tags">
-                <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
+      <view style="flex:1; overflow: hidden;">
+        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getSupplierTag" bindscroll="scroll">
+          <view wx:for="{{list}}" class="list1" wx:key="*this">
+            <view class="top-info" bindtap="goShop" data-id="{{item.id}}">
+              <common-image mode="aspectFill" src="{{item.headimg}}" style="border-radius: 13rpx;"></common-image>
+              <view class="supplier-info">
+                <view class="supplier-name textOver">{{item.shop_name}}</view>
+                <view class="mid-box">
+                  <view class="supplier-tags">
+                    <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
+                  </view>
+                  <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
+                </view>
+                <view class="bottom-box">
+                  <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text style="max-width: 300rpx;" class="textOver">{{item.address}}</text></view>
+                  <view class="btn">
+                    进店看看
+                  </view>
+                </view>
               </view>
-              <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
             </view>
-            <view class="bottom-box">
-              <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text style="max-width: 300rpx;" class="textOver">{{item.address}}</text></view>
-              <view class="btn">
-                进店看看
+            <view class="product-list">
+              <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}" wx:key="*this">
+                <image src="{{item.headimg}}" mode="aspectFill"></image>
+                <view class="product-title textOver2">{{item.title}}</view>
+                <view class="supplier-price"><text>￥</text><text style="font-size:32rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
               </view>
             </view>
           </view>
-        </view>
-        <view class="product-list">
-          <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}" wx:key="*this">
-            <image src="{{item.headimg}}" mode="aspectFill"></image>
-            <view class="product-title textOver2">{{item.title}}</view>
-            <view class="supplier-price"><text>￥</text><text style="font-size:32rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
-          </view>
-        </view>
+        </scroll-view>
       </view>
-    </scroll-view>
     </view>
   </view>
 </view>
-</view>
 <!-- 搜索到的产品列表 -->
-<view wx:if="{{seachFlag}}" style="overflow-y: scroll;margin-top: -650rpx;padding-bottom: 50rpx;">
+<view wx:if="{{seachFlag}}" style="overflow-y: scroll;margin-top: -700rpx;padding-bottom: 50rpx;">
   <view class="hot-list" wx:if="{{list.length>0}}">
     <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
       <view class="hot-item" wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
-      <image class="hot-item-img" src="{{item.headimg}}" mode="" />
-      <view class="hot-item-main">
-        <view class="hot-item-title textOver2">
-          {{item.title}}
-        </view>
-        <view style="display: flex;justify-content: space-between;align-items: center; ">
-          <view>
-            <text class="hot-item-price">{{item.price/100}}</text>
-            <text class="hot-item-market_price">{{item.market_price/100}}</text>
+        <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+        <view class="hot-item-main">
+          <view class="hot-item-title textOver2">
+            {{item.title}}
+          </view>
+          <view style="display: flex;justify-content: space-between;align-items: center; ">
+            <view>
+              <text class="hot-item-price">{{item.price/100}}</text>
+              <text class="hot-item-market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text>
+            </view>
+            <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
           </view>
-          <image class="add" bindtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
         </view>
       </view>
     </view>
-    </view>
   </view>
   <view wx:if="{{list.length==0}}" style="display: flex;flex-direction: column;align-items: center;position: absolute;left: 211rpx;top: 286.67rpx;">
     <image style="width:328rpx;height:450.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
@@ -147,14 +163,15 @@
     <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
       总计：<text class="money">{{totalPrice/100}}</text>
     </view>
-    <!-- <view style="margin-left: 16.67rpx;font-family: PingFang SC;font-weight: 500;font-size: 27rpx;color: #0B898E;" bindtap="openPopup">
+    <view wx:if="{{totalPrice>0}}" style="margin-left: 16.67rpx;font-family: PingFang SC;font-weight: 500;font-size: 27rpx;color: #0B898E;" bindtap="openPopup">
       <text>明细</text>
       <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode="" />
       <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode="" />
-    </view> -->
+    </view>
   </view>
   <!-- 去结算按钮 -->
-  <view class="{{cartCount == 0?'no-buy':'buy'}}" bindtap="order">去结算</view>
+  <view wx:if="{{totalPrice==0}}" class="no-buy">去结算</view>
+  <view wx:else class="buy" bindtap="order">去结算</view>
 </view>
 <!-- 规格弹窗 -->
 <view class="mask" wx:if="{{skuFlag}}">
@@ -214,8 +231,8 @@
         <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
         <view class="main">
           <view>
-            <view class="title">{{item.product.title}}</view>
-            <view class="sku-title">{{item.sku.sku_name}}</view>
+            <view class="title textOver">{{item.product.title}}</view>
+            <view class="sku-title textOver">{{item.sku.sku_name}}</view>
           </view>
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
diff --git a/subPackages/feiyiNew/index.wxss b/subPackages/feiyiNew/index.wxss
index 6004c32..2a0bd5b 100644
--- a/subPackages/feiyiNew/index.wxss
+++ b/subPackages/feiyiNew/index.wxss
@@ -64,6 +64,7 @@ page {
     /* min-height: 100vh; */
     /* min-height: 950rpx; */
     background-color: #F3F3F3;
+    margin-top: 20rpx;
 }
 .type-two-box {
     width: 200rpx;
@@ -138,14 +139,14 @@ page {
     text-decoration-line: line-through;
 }
 .add {
-    width: 40rpx;
-    height: 40rpx;
+    width: 43rpx;
+    height: 43rpx;
     background: #0B898E;
     border-radius: 50%;
     text-align: center;
     line-height: 40rpx;
     font-weight: 500;
-    font-size: 31rpx;
+    font-size: 34rpx;
     color: #FFFFFF;
 }
 .bottom {
@@ -281,7 +282,7 @@ page {
 .supplier-info {
   display: flex;
   flex-direction: column;
-  height: 136rpx;
+  /* height: 136rpx; */
   justify-content:space-between;
   flex: 1;
   margin-right: 20.67rpx;
@@ -719,3 +720,60 @@ page {
 .hot-list-item {
   width: 337rpx;
 }
+
+
+
+.title-box,.title-header{
+  background: #ffff;
+}
+.bg-box,.bg-box .title-header {
+  background: transparent;
+  color: #ccc;
+}
+
+.title-header {
+  position: fixed;
+  left: 0;
+  right: 0;
+  display: flex;
+  top: 0;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 32rpx;
+  line-height: 90rpx;
+  z-index: 2;
+}
+.title-header .icon-fanhui1 {
+  padding: 0 20rpx;
+  font-size: 44rpx;
+  color: #333;
+}
+.right {
+  position: absolute;
+  right: 20rpx;
+}
+.search-box {
+  display: flex;
+  align-items: center;
+  margin-left: 60rpx;
+  width: 560rpx;
+  border-radius: 30rpx;
+  height: 60rpx;
+  padding: 0 20rpx;
+  font-size: 26rpx;
+  background: #F0F0F0;
+}
+.bg-box .search-box {
+  background: #F0F0F0;
+}
+.search-box .weui-input {
+  margin-left: 10rpx;
+  flex: 1;
+  width: 100%;
+}
+.bg-box.title-box .icon-fanhui1 {
+  color: white;
+}
+.phcolor {
+  color: #ccc;
+}
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
new file mode 100644
index 0000000..55ce67b
--- /dev/null
+++ b/subPackages/postSearch/index.js
@@ -0,0 +1,582 @@
+// subPackages/xx/index.js
+import commonApi from "../../utils/https/common"
+import util from "../../utils/util"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    height: 90,
+    padHeight:0,
+    right:0,
+    type_id:'', //用来区别文创特产、非遗
+    tag_id:'',
+    list:[],
+    keywords:'',
+    skuFlag:null, //规格弹窗
+    info: null, //规格信息
+    skuIndex: 0, //默认选中第一个规格
+    producNum: 1,
+    cartCount:0,
+    showPopup:false, //购物车的弹窗
+    gwcList:[], //gwc里的产品数据
+    allSelectedBtn:false, //全选按钮
+    totalPrice:0, //获取购物车总价--打开购物车后勾选的产品价格
+    nowAddListId:[],
+    type:'', //购物车分类1文创，2非遗
+    show:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options);
+    let id = '',type=''
+    if (options.type_id == '1') {
+      id = '20,19'
+      type='1'
+    } else {
+      id = '5'
+      type='2'
+    } 
+    this.setData({
+      tag_id:id,
+      type,
+      nowAddListId:options.ids.split(',')
+    })
+    // this.getList()
+    this.getCount()
+  },
+
+  // 去产品详情页
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  // 添加产品到购物车
+  addCart: function (e) {
+    let item = e.currentTarget.dataset.item
+    app.globalData.postProduct = []
+    app.globalData.list = []
+    commonApi.user_post("/product/checkStock", {
+        sku_id: this.data.showPopup ? item.sku.id : this.data.info.sku[this.data.skuIndex].id,
+    }).then(res => {
+        if (res && res.code != 1) {
+            return;
+        } else {
+          commonApi.user_post("cart_within/add_sku", {
+            sku_id: this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id,
+            num: this.data.producNum,
+            type:this.data.type
+        }).then(res => {
+          if (res.code == 1) {
+              let sku_id = this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id
+              let _nowAddListId = this.data.nowAddListId
+              // debugger
+              _nowAddListId.push(sku_id)
+              this.setData({
+                nowAddListId: _nowAddListId
+              })
+                commonApi.user_post('cart_within/get_list', {
+                  type:this.data.type
+                }).then(res => {
+                  // debugger
+                  let cartCount = 0,totalPrice = 0,gwcList=this.data.gwcList
+                  res.data.forEach(val=> {
+                    cartCount+=val.num
+                    console.log(this.data.skuFlag);
+                    if (!this.data.skuFlag && !this.data.showPopup) {
+                      console.log(this.data.nowAddListId)
+                      if (this.data.nowAddListId.some(s => +s === +val.sku_id)  ) {
+                        val.selected = 1
+                      }
+                    }else {
+                      gwcList.forEach(el=> {
+                        if (el.id == val.id) {
+                          val.selected = el.selected
+                        }
+                      })
+                    }
+                  })
+                  res.data.forEach(element=> {
+                    if (element.selected == 1) {
+                      totalPrice += Number(element.num*element.sku.price)
+                    }
+                  })
+                  console.log(res.data);
+                  let status = res.data.every(el => el.selected === 1)
+                    this.setData({
+                        cartCount: cartCount,
+                        totalPrice,
+                        producNum:1,
+                        gwcList:res.data,
+                        allSelectedBtn:status?true:false,
+                    })
+                })
+                // 加动效
+                this.setData({
+                    skuFlag: null,
+                    aniSkuIndex: this.data.skuIndex,
+                    cartImgInfo: null
+                })
+                setTimeout(() => {
+                    this.setData({
+                        aniSkuIndex: -1
+                    })
+                    // wx.showModal({
+                    //     title: "提示",
+                    //     content: "去购物车结算？",
+                    //     success: function (res) {
+                    //         if (res.confirm) {
+                    //             wx.navigateTo({
+                    //                 url: '/pages/user/cartlist/list',
+                    //             })
+                    //         }
+                    //     }
+                    // })
+                }, 650)
+            }
+        })
+        }
+    })
+
+},
+ // 去结算
+ order: function () {
+  commonApi.user_post('wx/get_user_keep', {
+      jumpurl: '/pages/user/cartlist/list',
+      title: '购物车',
+      type: 'mini'
+  }).then(res => {
+      if (res.data.subscribe == 0) {
+          this.setData({
+              wxqrcode: res.data.qrcode,
+              showQrCode: true
+          })
+      } else {
+          app.globalData.couponInfo = null;
+          util.pagePoint({
+              event: 'cart_order'
+          }, 1)
+          let list = this.data.gwcList,
+              price = 0,
+              product = [],
+              product1 = []
+          list.map(item => {
+              if (item.selected == 1) {
+                  // item.product.type="post";
+                  if (item.product.type == 'post') {
+                      product.push({
+                          product: item.product,
+                          sku: item.sku,
+                          productNum: item.num
+                      })
+                  } else {
+                      product1.push(item)
+                      app.globalData.list = product1
+                  }
+                  if (item.product.type.includes('post')) {
+                      this.data.productType = 'post'
+                  }
+              }
+          })
+          if (product.length == 0 && product1.length == 0) {
+              // wx.showToast({
+              //     title: '请先选择产品',
+              //     icon: 'none'
+              // })
+              return;
+          }
+          if (product.length > 0 && product1.length > 0) {
+              this.setData({
+                  flag: 'mix',
+                  isCar: 'multiple'
+              })
+          }
+          if (product1.length > 1) {
+              this.setData({
+                  isCar: 'multiple'
+              })
+          } else {
+              this.setData({
+                  isCar: 'single'
+              })
+          }
+          console.log(product1);
+          app.globalData.postProduct = product;
+          if (app.globalData.list) {
+              app.globalData.product = app.globalData.list[app.globalData.index]
+          }
+          wx.navigateTo({
+            url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
+        })
+      }
+  })
+},
+// 单选一个
+selectedIt(e) {
+  let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0,nowAddListId=[]
+  gwcList.forEach(el=> {
+    if (el.id == item.id) {
+      el.selected == 1 ? el.selected =0 : el.selected = 1
+    }
+  })
+  gwcList.forEach(el=> {
+    if (el.selected == 1) {
+      totalPrice += Number(el.num*el.sku.price)
+    }
+  })
+  gwcList.forEach(item=> {
+    if (item.selected == 1) {
+      nowAddListId.push(item.sku_id)
+    }
+  })
+  let status = gwcList.every(el => el.selected === 1)
+  this.setData({
+    gwcList,
+    allSelectedBtn:status?true:false,
+    totalPrice,
+    nowAddListId
+  })
+},
+// 清空
+delAll() {
+  let ids = []
+  this.data.gwcList.forEach(item => {
+    ids.push(item.sku_id)
+  })
+  commonApi.user_post("cart_within/del_sku", {
+    sku_id: ids+'',
+    type:this.data.type
+  }).then(res => {
+      if (res.code == 1) {
+        wx.showToast({
+            title: '清空成功',
+            icon: "success"
+        })
+        this.setData({
+          totalPrice:0
+        })
+          this.getCount()
+      }
+  })
+},
+// 减少一个
+del(e) {
+  let item = e.currentTarget.dataset.item
+  let gwcList = this.data.gwcList
+  commonApi.user_post("cart_within/update_sku", {
+    num:item.num-1,
+    sku_id: item.sku_id,
+    type:this.data.type
+  }).then(res => {
+      if (res.code == 1) {
+          // this.getCount()
+          commonApi.user_post('cart_within/get_list', {
+            type:this.data.type
+          }).then(res => {
+            let arr = res.data,totalPrice = 0,cartCount=0
+            if (res.data.length>0) {
+              res.data.forEach(item=> {
+                // totalPrice += item.num*item.sku.price
+                cartCount += item.num
+                gwcList.forEach(el=> {
+                  if (el.id == item.id) {
+                    item.selected = el.selected
+                  }
+                })
+              })
+              res.data.forEach(item=> {
+                if (item.selected ==1) {
+                  totalPrice += item.num*item.sku.price
+                }
+              })
+            }
+            let status = res.data.every(el => el.selected === 1)
+            this.setData({
+                cartCount: cartCount, //1
+                gwcList:res.data,
+                allSelectedBtn:status?true:false,
+                totalPrice
+            })
+          })
+      }
+  })
+},
+// 全选
+allSelected() {
+  let gwcList = this.data.gwcList
+  let totalPrice = 0
+  let nowAddListId = []
+  if (this.data.allSelectedBtn) {
+    gwcList.forEach(item=> {
+      item.selected =0
+    })
+    nowAddListId = []
+  } else {
+    gwcList.forEach(item=> {
+      item.selected =1
+    })
+    gwcList.forEach(item=> {
+      totalPrice += Number(item.num*item.sku.price)
+    })
+    gwcList.forEach(item=> {
+      nowAddListId.push(item.sku_id)
+    })
+  }
+  this.setData({
+    gwcList,
+    allSelectedBtn:!this.data.allSelectedBtn,
+    totalPrice,
+    nowAddListId
+  })
+},
+// 左侧购物车打开弹窗
+openPopup() {
+  // this.getCount()
+  let gwcList = this.data.gwcList
+  let status = gwcList.every(el => el.selected === 1)
+  this.setData({
+    showPopup:!this.data.showPopup,
+    allSelectedBtn:status?true:false,
+  })
+},
+  // 获取历史购物车详情
+  getCount() {
+    commonApi.user_post('cart_within/get_list', {
+      type:this.data.type
+    }).then(res => {
+      let arr = res.data,totalPrice = 0,cartCount=0
+      if (arr.length>0) {
+        arr.forEach(item=> {
+          // totalPrice += item.num*item.sku.price
+          cartCount += item.num
+        })
+      }
+      arr.forEach(item=> {
+        if (this.data.nowAddListId.some(s => +s === +item.sku_id)  ) {
+          item.selected = 1
+        }
+      })
+      arr.forEach(item=> {
+        if (item.selected == 1) {
+          totalPrice += item.num*item.sku.price
+        }
+      })
+      // console.log(arr);
+      // debugger
+      this.setData({
+          cartCount: cartCount, //1
+          gwcList:arr,
+          allSelectedBtn:false,
+          totalPrice
+      })
+    })
+  },
+  search() {
+    this.setData({
+      list:[]
+    })
+    this.getList()
+  },
+  searchInput(e) {
+    this.setData({
+      keywords:e.detail.value
+    })
+  },
+  getList() {
+    this.setData({
+      show:false
+    })
+    let list= this.data.list;
+    if (this.data.keywords == '' || this.data.keywords.indexOf(' ')!==-1) {
+      return
+    }
+    if(list.length>=this.data.total) return;
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:this.data.tag_id, //标签的ID
+      offset:this.data.list.length, //起始查询
+      limit: 10, //查询数量
+      title:this.data.keywords.length>0 ? this.data.keywords : '', //搜索产品名称
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags?item.display_tags.split(","):[];
+        item.display_tags = item.display_tags.splice(0,2);
+      })
+      this.setData({
+        list:list.concat(res.data.list),
+        show:true
+      })
+      console.log(this.data.list);
+    })
+  },
+  getHeight() {
+    let systemInfo = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect();
+      let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+      this.setData({
+        height:height,
+        padHeight:systemInfo.statusBarHeight,
+        right:(systemInfo.screenWidth - rect.right) + rect.width
+      })
+      console.log(systemInfo,rect)
+  },
+  back: function () {
+    if(this.properties.clickid){
+      wx.uma.trackEvent(this.properties.clickid);
+    }
+    const pages = getCurrentPages();
+    // wx.showTabBar({})
+    console.log(this.properties.isIndex)
+    if (pages.length<=1){
+      wx.switchTab({
+        url: app.globalData.menuRoute
+      })
+    }
+    else {
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+  },
+  // 添加产品弹窗 1.首先获取到该产品下的规格
+  addBuyCart(e) {
+    let item = e.currentTarget.dataset.item
+    console.log(item);
+    commonApi._post("product/get_product_detail", {
+      id: item.id
+    }).then(res => {
+        if (item.skuid) {
+            let sku = res.data.sku.find(skuItem => item.id == skuItem.skuid);
+            res.data.sku = [sku];
+        }
+        res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+        this.setData({
+            info: res.data,
+            // skuFlag: "cart"
+        })
+        this.showCart()
+        this.BroswerRecord()
+    })
+  },
+  // 添加产品弹窗 2.渲染规格，未登录去登录
+  showCart: function () {
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+        title: this.data.info.title,
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            if (this.data.info.sku.length == 0) {
+                wx.showToast({
+                    title: '该产品未设置规格，不能加购',
+                    icon: 'none'
+                })
+                return;
+            }
+            this.setData({
+                skuFlag: "cart"
+            })
+            let that = this
+            wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                console.log(res)
+                that.setData({
+                    cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                })
+            }).exec()
+        }
+        this.getCount()
+    })
+  },
+  // 规格弹窗切换其他规格
+  selectSku: function (e) {
+      let index = e.currentTarget.dataset.index;
+      this.setData({
+          skuIndex: index
+      })
+  },
+  // 关闭弹窗
+  hideSku: function () {
+    this.setData({
+        skuFlag: null,
+        cartImgInfo: null
+    })
+  },
+  // 减少数量
+  minus: function () {
+    if (this.data.producNum == 1) return;
+    this.setData({
+        producNum: this.data.producNum - 1
+    })
+  },
+  // 加数量
+  add: function () {
+      this.setData({
+          producNum: this.data.producNum + 1
+      })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+    this.getHeight()
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    this.setData({
+      show:false
+    })
+    this.getHeight()
+    this.getCount()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+    let ids = this.data.nowAddListId
+    ids = ids.map(item => Number(item));
+    app.globalData.nowAddListId = ids
+    // debugger
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    this.getList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/postSearch/index.json b/subPackages/postSearch/index.json
new file mode 100644
index 0000000..79be446
--- /dev/null
+++ b/subPackages/postSearch/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    
+  }
+}
\ No newline at end of file
diff --git a/subPackages/postSearch/index.wxml b/subPackages/postSearch/index.wxml
new file mode 100644
index 0000000..9408dc4
--- /dev/null
+++ b/subPackages/postSearch/index.wxml
@@ -0,0 +1,135 @@
+<view class="title-box{{transparent==1?' bg-box':''}}" style="height:{{isScene==1?'0':(height+padHeight)}}px;">
+  <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px">
+    <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
+    <view bindtap="indexFocus" class="search-box" style="margin-right:{{right + 5}}px;">
+      <icon class="iconfont icon-sousuo"></icon>
+      <input placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="searchInput" class="weui-input" placeholder="请输入商品名称" />
+      <!-- <input bindfocus="inputFocus" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="getVal" class="weui-input" placeholder="搜索" /> -->
+      <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
+        <view style="color: #ccc;">|</view>
+        <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;" bindtap="getList">搜索</view>
+      </view>
+    </view>
+  </view>
+</view>
+<view wx:if="{{show}}">
+    <view class="hot-list" wx:if="{{list.length>0}}">
+      <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+        <view class="hot-item" wx:if="{{index%2==number}}" wx:for="{{list}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
+          <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+          <view class="hot-item-main">
+            <view class="hot-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view style="display: flex;justify-content: space-between;align-items: center; ">
+              <view>
+                <text class="hot-item-price">{{item.price/100}}</text>
+                <text class="hot-item-market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text>
+              </view>
+              <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:else style="display: flex;flex-direction: column;align-items: center;">
+      <image style="width:328rpx;height:450.67rpx;margin-top: 286.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
+      <view style="font-family: PingFang SC;font-weight: 500;font-size: 28rpx;color: #666666;margin-top: 67rpx;">
+        暂无搜索结果
+      </view>
+    </view>
+  </view>
+  <view class="bottom" wx:if="{{(skuFlag != 'cart') || showPopup}}">
+    <!-- 左边购物车图标及价格 -->
+    <view class="gwc-left">
+      <view class="gwc" bindtap="openPopup">
+        <image wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
+        <image wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
+        <view class="cartCount">{{cartCount}}</view>
+      </view>
+      <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
+        总计：<text class="money">{{totalPrice/100}}</text>
+      </view>
+      <view wx:if="{{totalPrice>0}}" bindtap="openPopup">
+        <text style="margin-left: 16.67rpx;font-weight: 500;font-size: 27rpx;color: #0B898E;">明细</text>
+        <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left:10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode=""/>
+        <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode=""/>
+      </view>
+    </view>
+    <!-- 去结算按钮 -->
+    <view class="{{totalPrice == 0?'no-buy':'buy'}}" bindtap="order">去结算</view>
+  </view>
+  <!-- 规格弹窗 -->
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku" style="z-index: 9999;"></view>
+  <view class="mask-content" style="z-index: 99999;">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view class="sku-price">{{info.sku[skuIndex].price/100}}
+          <view class="allowance" wx:if="{{allowance_data}}">
+            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+        </view>
+        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+      </view>
+    </view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{info.sku}}">{{item.sku_name}}</view>
+    </view>
+    <view class="number-box">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select" bindtap="add"></view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <!-- <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'加入购物车':'立即购买'}}
+      </view> -->
+      <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">加入购物车</view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
+<!-- 购物车的弹窗 -->
+<view class="mask" wx:if="{{showPopup}}">
+  <view bindtap="openPopup" class="mask-bg"></view>
+  <view class="mask-content" style="padding: 40rpx 0 180rpx;min-height: 600rpx;">
+    <view style="margin: 0 26.67rpx;">
+      <!-- 顶部操作按钮 -->
+      <view class="flex" style="margin-bottom: 56.67rpx;">
+        <view class="flex">
+          <image bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <view bindtap="allSelected" wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
+          <text class="all">全选</text>
+        </view>
+        <view class="flex" bindtap="delAll">
+          <image style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
+          <text class="del-all">清空</text>
+        </view>
+      </view>
+      <view class="gwc-item" wx:for="{{gwcList}}" wx:key="*this" bindtap="selectedIt" data-item="{{item}}">
+        <view style="margin-right: 26.67rpx;">
+          <image wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
+        </view>
+        <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <view class="main">
+          <view>
+            <view class="title textOver">{{item.product.title}}</view>
+            <view class="sku-title textOver">{{item.sku.sku_name}}</view>
+          </view>
+          <view class="main-bottom">
+            <view class="price">{{item.sku.price/100}}</view>
+            <view class="num-box">
+              <image class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <view style="margin: 0 25.33rpx;">{{item.num}}</view>
+              <image class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
diff --git a/subPackages/postSearch/index.wxss b/subPackages/postSearch/index.wxss
new file mode 100644
index 0000000..b6f55f5
--- /dev/null
+++ b/subPackages/postSearch/index.wxss
@@ -0,0 +1,474 @@
+.title-box,
+.title-header {
+  background: #ffff;
+}
+
+.bg-box,
+.bg-box .title-header {
+  background: transparent;
+  color: #ccc;
+}
+
+.title-header {
+  position: fixed;
+  left: 0;
+  right: 0;
+  display: flex;
+  top: 0;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 32rpx;
+  line-height: 90rpx;
+  z-index: 2;
+}
+
+.title-header .icon-fanhui1 {
+  padding: 0 20rpx;
+  font-size: 44rpx;
+  color: #333;
+}
+
+.right {
+  position: absolute;
+  right: 20rpx;
+}
+
+.search-box {
+  display: flex;
+  align-items: center;
+  margin-left: 60rpx;
+  width: 560rpx;
+  border-radius: 30rpx;
+  height: 60rpx;
+  padding: 0 20rpx;
+  font-size: 26rpx;
+  background: #F0F0F0;
+}
+
+.bg-box .search-box {
+  background: #F0F0F0;
+}
+
+.search-box .weui-input {
+  margin-left: 10rpx;
+  flex: 1;
+  width: 100%;
+}
+
+.bg-box.title-box .icon-fanhui1 {
+  color: white;
+}
+
+.phcolor {
+  color: #ccc;
+}
+
+.hot-list {
+  padding: 26.67rpx;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding-bottom: 170rpx;
+}
+
+.hot-item {
+  margin-bottom: 20rpx;
+  width: 337rpx;
+  height: 513rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153, 153, 153, 0.33);
+  border-radius: 13rpx;
+}
+
+.hot-item-img {
+  width: 337rpx;
+  height: 337rpx;
+  background: #0B898E;
+  border-radius: 13rpx;
+}
+
+.hot-item-title {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #000000;
+  /* margin-bottom: 25.33rpx; */
+}
+
+.hot-item-price {
+  font-family: Arial;
+  font-weight: bold;
+  font-size: 33rpx;
+  color: #D70000;
+  margin-right: 12.67rpx;
+}
+
+.hot-item-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 23rpx;
+}
+
+.hot-item-market_price {
+  font-family: Arial;
+  font-weight: 400;
+  font-size: 21rpx;
+  color: #999999;
+  text-decoration-line: line-through;
+}
+
+.hot-item-main {
+  padding: 20rpx 19rpx 26.67rpx 20rpx;
+  display: flex;
+  flex-direction: column;
+  min-height: 140rpx;
+  justify-content: space-between;
+}
+
+.hot-list-item:nth-child(2) .hot-item:first-child {
+  width: 337rpx;
+  height: 373rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153, 153, 153, 0.33);
+  border-radius: 13rpx;
+  padding-bottom: 20rpx;
+}
+
+.hot-list-item:nth-child(2) .hot-item:first-child .hot-item-img {
+  width: 337rpx;
+  height: 238rpx;
+  background: #71B580;
+  border-radius: 13rpx;
+}
+
+.hot-list-item:nth-child(2) .hot-item:first-child .main {
+  width: 337rpx;
+  height: 238rpx;
+  background: #71B580;
+  border-radius: 13rpx;
+}
+
+.hot-list-item:nth-child(2) .hot-item:first-child .hot-item-main {
+  padding: 5rpx 19rpx 26.67rpx 15rpx;
+  display: flex;
+  flex-direction: column;
+  min-height: 90rpx;
+  justify-content: space-between;
+}
+
+.hot-list-item:nth-child(2) .hot-item:first-child .hot-item-main .hot-item-title {
+  margin-bottom: 20rpx;
+}
+
+.hot-list-item {
+  width: 337rpx;
+}
+
+.add {
+  width: 40rpx;
+  height: 40rpx;
+  background: #0B898E;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 40rpx;
+  font-weight: 500;
+  font-size: 31rpx;
+  color: #FFFFFF;
+}
+
+.bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 167rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 2rpx 13rpx 0rpx rgba(136, 136, 136, 0.25);
+  padding: 0 27.33rpx 0 26.67rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  z-index: 666;
+}
+
+.gwc {
+  margin-right: 14rpx;
+  width: 84rpx;
+  height: 84rpx;
+  position: relative;
+}
+
+.cartCount {
+  width: 40rpx;
+  height: 40rpx;
+  background: #D90F01;
+  border-radius: 50%;
+  border: 1rpx solid #FFFFFF;
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 40rpx;
+  position: absolute;
+  right: -10rpx;
+  top: -10rpx;
+}
+
+.gwc-left {
+  display: flex;
+  align-items: center;
+}
+
+.money {
+  font-weight: bold;
+  font-size: 47rpx;
+  color: #D70000;
+}
+
+.money::before {
+  content: "￥";
+  font-size: 23rpx;
+  font-weight: 500;
+}
+
+.buy {
+  width: 240rpx;
+  height: 83rpx;
+  background: #D70000;
+  border-radius: 42rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 83rpx;
+}
+
+.no-buy {
+  width: 240rpx;
+  height: 83rpx;
+  background: #BDBDBD;
+  border-radius: 42rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 83rpx;
+}
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+.sku-info-box {
+  margin: 50rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.sku-info-box image {
+  width: 218rpx;
+  height: 180rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 40rpx;
+  flex-shrink: 0;
+}
+.sku-info {
+  flex: 1;
+}
+.sku-price {
+  font-size: 40rpx;
+  font-weight: 500;
+  color: #D62828;
+  margin: 20rpx 0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.sku-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 27rpx;
+  vertical-align: baseline;
+}
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+.sku-names {
+  display: flex;
+  font-size: 29rpx;
+  color: #333;
+  margin: 0 40rpx;
+  text-align: center;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+}
+.sku-name-item {
+  background: #EFEFEF;
+  border: 1rpx solid #EFEFEF;
+  width: 318rpx;
+  line-height: 77rpx;
+  border-radius: 14rpx;
+  margin-bottom: 25rpx;
+  margin-right: 30rpx;
+}
+.sku-name-item:nth-child(2n) {
+  margin-right: 0;
+}
+.sku-name-item.active {
+  color: #0B898E;
+  border-color: #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+.number-box {
+  display: flex;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+  margin: 0 40rpx;
+  padding: 40rpx 0;
+}
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+.number-box view {
+  border: 1rpx solid #666;
+  border-radius: 7rpx;
+  text-align: center;
+  width: 67rpx;
+  line-height: 67rpx;
+  font-size: 33rpx;
+  color: #000;
+}
+.number-box view.disable {
+  border-color: #ccc;
+  color: #999;
+}
+.number-box view.number {
+  width: 94rpx;
+  margin: 0 15rpx;
+}
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 33rpx;
+  font-weight: 500;
+}
+.mask-btn.disable {
+  background: #ccc;
+}
+
+.flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.all {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 37rpx;
+  color: #000000;
+  margin-left: 26rpx;
+}
+
+.del-all {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #999999;
+  margin-left: 7.33rpx;
+}
+
+.gwc-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 48rpx;
+}
+
+.main {
+    height: 179rpx;
+    padding: 8.67rpx 0 6.67rpx;
+    width: 425rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.main .title {
+  font-family: PingFang SC;
+  font-weight: bold;
+  font-size: 31rpx;
+  color: #2C2C2C;
+  margin-bottom: 18rpx;
+}
+.main .sku-title {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #999999;
+}
+
+.main-bottom {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.num-box {
+  display: flex;
+}
+
+.reduce, .grow {
+  width: 49rpx;
+  height: 49rpx;
+}
+
+.main-bottom .price {
+  font-family: PingFangSC;
+  font-size: 35rpx;
+  color: #F84A56;
+}
+.main-bottom .price::before {
+  content: "￥";
+  font-size: 24rpx;
+  font-weight: 500;
+}
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index 0fcfddc..88546b1 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -10,6 +10,9 @@ Page({
    * 页面的初始数据
    */
   data: {
+    height: 90,
+    padHeight:0,
+    right:0,
     list:[], //获取的产品列表
     total:1, //总数
     keywords:"", //搜索关键字
@@ -48,13 +51,15 @@ Page({
     allSelectedBtn:false, //全选按钮
     seachFlag:false, //搜索模式
     totalPrice:0, //获取购物车总价--打开购物车后勾选的产品价格
-    name:'文创特产'
+    name:'文创特产',
+    nowAddListId:[]
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    app.globalData.nowAddListId = []
     wx.showShareMenu({
         withShareTicket: true,
         menus: ['shareAppMessage', 'shareTimeline']
@@ -92,6 +97,9 @@ Page({
           wx.showToast({
               title: '清空成功',
               icon: "success"
+          })
+          this.setData({
+            totalPrice:0
           })
             this.getCount()
         }
@@ -155,36 +163,33 @@ Page({
             num: this.data.producNum,
             type:"1"
         }).then(res => {
-            if (res.code == 1) {
+          if (res.code == 1) {
+              let sku_id = this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id
+              let _nowAddListId = this.data.nowAddListId
+              _nowAddListId.push(sku_id)
+              this.setData({
+                nowAddListId: _nowAddListId
+              })
                 commonApi.user_post('cart_within/get_list', {
                   type:'1'
                 }).then(res => {
+                  // debugger
                   let cartCount = 0,totalPrice = 0,gwcList=this.data.gwcList
                   res.data.forEach(val=> {
                     cartCount+=val.num
                     console.log(this.data.skuFlag);
-                    // debugger
                     if (!this.data.skuFlag && !this.data.showPopup) {
-                      // debugger
-                      if (val.sku.id == this.data.info.sku[this.data.skuIndex].id) {
+                      console.log(this.data.nowAddListId)
+                      if (this.data.nowAddListId.includes(val.sku.id)  ) {
                         val.selected = 1
                       }
                     }else {
-                      // debugger
                       gwcList.forEach(el=> {
                         if (el.id == val.id) {
                           val.selected = el.selected
                         }
                       })
                     }
-                    // if (this.data.showPopup) {
-                    //   totalPrice += Number(val.num*val.sku.price)
-                    //   gwcList.forEach(el=> {
-                    //     if (el.id == val.id) {
-                    //       val.selected = el.selected
-                    //     }
-                    //   })
-                    // }
                   })
                   res.data.forEach(element=> {
                     if (element.selected == 1) {
@@ -269,10 +274,10 @@ Page({
                 }
             })
             if (product.length == 0 && product1.length == 0) {
-                wx.showToast({
-                    title: '请先选择产品',
-                    icon: 'none'
-                })
+                // wx.showToast({
+                //     title: '请先选择产品',
+                //     icon: 'none'
+                // })
                 return;
             }
             if (product.length > 0 && product1.length > 0) {
@@ -305,10 +310,12 @@ Page({
   allSelected() {
     let gwcList = this.data.gwcList
     let totalPrice = 0
+    let nowAddListId = []
     if (this.data.allSelectedBtn) {
       gwcList.forEach(item=> {
         item.selected =0
       })
+      nowAddListId = []
     } else {
       gwcList.forEach(item=> {
         item.selected =1
@@ -316,16 +323,22 @@ Page({
       gwcList.forEach(item=> {
         totalPrice += Number(item.num*item.sku.price)
       })
+      gwcList.forEach(item=> {
+        nowAddListId.push(item.sku_id)
+      })
     }
+    console.log(nowAddListId);
+    // debugger
     this.setData({
       gwcList,
       allSelectedBtn:!this.data.allSelectedBtn,
-      totalPrice
+      totalPrice,
+      nowAddListId
     })
   },
   // 单选一个
   selectedIt(e) {
-    let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0
+    let item = e.currentTarget.dataset.item,gwcList= this.data.gwcList,totalPrice=0,nowAddListId=[]
     gwcList.forEach(el=> {
       if (el.id == item.id) {
         el.selected == 1 ? el.selected =0 : el.selected = 1
@@ -336,18 +349,27 @@ Page({
         totalPrice += Number(el.num*el.sku.price)
       }
     })
+    gwcList.forEach(item=> {
+      if (item.selected == 1) {
+        nowAddListId.push(item.sku_id)
+      }
+    })
+    console.log(nowAddListId);
     let status = gwcList.every(el => el.selected === 1)
     this.setData({
       gwcList,
       allSelectedBtn:status?true:false,
-      totalPrice
+      totalPrice,
+      nowAddListId
     })
   },
   // 左侧购物车打开弹窗
   openPopup() {
-    // this.getCount()
     let gwcList = this.data.gwcList
-    let status = gwcList.every(el => el.selected === 1)
+    let status = false
+    if (gwcList.length>0) {
+      status = gwcList.every(el => el.selected === 1)
+    }
     this.setData({
       showPopup:!this.data.showPopup,
       allSelectedBtn:status?true:false,
@@ -361,14 +383,20 @@ Page({
       tag_id:this.data.navList2[this.data.navIndex].type, //标签的ID
       offset:list.length, //起始查询
       limit:10, //查询数量
-      title:this.data.keywords //搜索产品名称
+      title:this.data.seachFlag ? this.data.keywords : '' //搜索产品名称
     }).then(res => {
+      let arr = []
+      if (this.data.seachFlag) {
+        res.data.list.map(obj => {
+          arr = [...arr, ...obj.product]
+        })
+      }
       res.data.list.map(item=>{
         item.display_tags = item.display_tags?item.display_tags.split(","):[];
         item.display_tags = item.display_tags.splice(0,2);
       })
       this.setData({
-        list:list.concat(res.data.list),
+        list:this.data.seachFlag?arr:list.concat(res.data.list),
         total:res.data.total
       })
     })
@@ -386,6 +414,7 @@ Page({
   },
   // 获取历史购物车详情
   getCount() {
+    // debugger
     commonApi.user_post('cart_within/get_list', {
       type:'1'
     }).then(res => {
@@ -396,10 +425,28 @@ Page({
           cartCount += item.num
         })
       }
+      if (app.globalData.nowAddListId.length>0) {
+        arr.map(item=> {
+          app.globalData.nowAddListId.forEach(val=> {
+            if (val == item.sku_id) {
+              item.selected = 1
+            }
+          })
+        })
+        // debugger
+        arr.forEach(item=> {
+          if(item.selected == 1) {
+            totalPrice += item.num*item.sku.price
+          }
+        })
+      }
+      // console.log(arr);
+      // debugger
       this.setData({
           cartCount: cartCount, //1
-          gwcList:res.data,
-          allSelectedBtn:false
+          gwcList:arr,
+          allSelectedBtn:false,
+          totalPrice:app.globalData.nowAddListId.length>0?totalPrice:0
       })
     })
   },
@@ -408,11 +455,20 @@ Page({
     this.setData({
       list:[],
       total:1,
-      navIndex:0,
-      typeIndex:0,
+      // navIndex:0,
+      // typeIndex:0,
       flag:true
     })
     this.getList()
+    this.getCount()
+  },
+  goNewSearch() {
+    console.log(this.data.nowAddListId);
+    // debugger
+    wx.navigateTo({
+      // url: "/subPackages/postSearch/index?type_id=1",
+      url: "/subPackages/postSearch/index?type_id=1&ids="+this.data.nowAddListId,
+    })
   },
   // 搜索
   search:function(e){
@@ -423,7 +479,7 @@ Page({
         list:[],
         total:1
       })
-      this.onReload()
+      // this.onReload()
     }else {
       this.setData({
         seachFlag:true,
@@ -431,7 +487,16 @@ Page({
         list:[],
         total:1
       })
-      this.getList();
+      // if (!this.data.flag) {
+      //   this.getSupplierTag()
+      // } else {
+      //   this.getList()
+      // }
+    }
+    if (!this.data.flag) {
+      this.getSupplierTag()
+    } else {
+      this.getList()
     }
   },
   // 去产品详情页
@@ -509,7 +574,7 @@ Page({
       tag_id:this.data.seachFlag? '20,19':this.data.typeList[this.data.typeIndex].id, //标签的ID
       offset:list.length, //起始查询
       limit: 10, //查询数量
-      title:this.data.keywords, //搜索产品名称
+      title:this.data.seachFlag ? this.data.keywords : '', //搜索产品名称
     }).then(res=>{
       res.data.list.map(item=>{
         item.display_tags = item.display_tags?item.display_tags.split(","):[];
@@ -619,18 +684,53 @@ Page({
           producNum: this.data.producNum + 1
       })
   },
+  getHeight() {
+    let systemInfo = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect();
+      let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+      this.setData({
+        height:height,
+        padHeight:systemInfo.statusBarHeight,
+        right:(systemInfo.screenWidth - rect.right) + rect.width
+      })
+      console.log(systemInfo,rect)
+  },
+  back: function () {
+    if(this.properties.clickid){
+      wx.uma.trackEvent(this.properties.clickid);
+    }
+    const pages = getCurrentPages();
+    // wx.showTabBar({})
+    console.log(this.properties.isIndex)
+    if (pages.length<=1){
+      wx.switchTab({
+        url: app.globalData.menuRoute
+      })
+    }
+    else {
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+  },
+  // lower() {
+  //   if (this.data.flag) {
+  //     this.getList()
+  //   } else {
+  //     this.getSupplierTag()
+  //   }
+  // },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
+    this.getHeight()
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    // this.onReload()
+    this.onReload()
     // this.setData({
     //   seachFlag:false
     //   // list:[],
@@ -640,6 +740,13 @@ Page({
     //   // flag:true
     // })
     // this.getList()
+    this.getHeight()
+    console.log(app.globalData.nowAddListId );
+    if (app.globalData.nowAddListId.length>0) {
+      // debugger
+      this.getCount()
+    }
+    // debugger
   },
 
   /**
diff --git a/subPackages/techanNew/index.wxml b/subPackages/techanNew/index.wxml
index 98904bd..3b06131 100644
--- a/subPackages/techanNew/index.wxml
+++ b/subPackages/techanNew/index.wxml
@@ -3,7 +3,21 @@
 <view class="techanMain">
 
   <view style="{{seachFlag?'':'height: 500rpx;'}}">
-    <search bind:onload="search" name="{{name}}"></search>
+    <!-- <search name="{{name}}" bindtap="goNewSearch"></search> -->
+    <view class="title-box{{transparent==1?' bg-box':''}}" style="height:{{isScene==1?'0':(height+padHeight)}}px;">
+      <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px">
+        <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
+        <view bindtap="goNewSearch" class="search-box" style="margin-right:{{right + 5}}px;">
+          <icon class="iconfont icon-sousuo"></icon>
+          <view class="weui-input" style="color: #999;font-weight: 400;font-size: 27rpx;">请输入商品名称</view>
+          <!-- <input placeholder-class="{{transparent==1?'phcolor':''}}" class="weui-input" placeholder="搜索" /> -->
+          <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
+            <view style="color: #ccc;">|</view>
+            <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;">搜索</view>
+          </view>
+        </view>
+      </view>
+    </view>
     <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240710/a39dd5504c4baa66dd239153d2d20787.png" mode="widthFix"></image>
   </view>
 
@@ -14,7 +28,8 @@
         <view wx:for="{{flag?navList:navList2}}" wx:key="*this" bindtap="changeNav" data-index="{{index}}" class="{{index == navIndex ? 'seld-nav':'nav'}}">{{item.title}}</view>
       </view>
       <!-- 店铺--产品 切换 -->
-      <image bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+      <image wx:if="{{flag}}" bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+      <image wx:else bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240717/a092bdcdbac0bb26573f8997f3d4ba38.png" mode="" />
     </view>
     <!-- 产品部分 -->
     <view wx:if="{{flag}}" style="flex: 1; display: flex; overflow: hidden;">
@@ -31,8 +46,8 @@
         </scroll-view>
       </view>
       <!-- 右侧产品列表 -->
-      <view class="list" style="width: 100%;">
-        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+      <view class="list" style="width: 100%;height:100%; overflow: hidden;padding-bottom: 30rpx;">
+        <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getList" bindscroll="scroll">
           <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
             <image class="img" src="{{item.headimg}}" mode="" />
             <view class="content">
@@ -42,7 +57,7 @@
               <view class="item-bottom">
                 <view class="price">
                   <text class="current-price">{{item.price/100}}</text>
-                  <text class="original-price">¥{{item.market_price/100}}</text>
+                  <text class="original-price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">¥{{item.market_price/100}}</text>
                 </view>
                 <view class="add" catchtap="addBuyCart" data-item="{{item}}">+</view>
               </view>
@@ -98,7 +113,7 @@
             <view style="display: flex;justify-content: space-between;align-items: center; ">
               <view>
                 <text class="hot-item-price">{{item.price/100}}</text>
-                <text class="hot-item-market_price">{{item.market_price/100}}</text>
+                <text class="hot-item-market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text>
               </view>
               <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
@@ -127,14 +142,15 @@
       <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
         总计：<text class="money">{{totalPrice/100}}</text>
       </view>
-      <!-- <view style="margin-left: 16.67rpx;font-family: PingFang SC;font-weight: 500;font-size: 27rpx;color: #0B898E;" bindtap="openPopup">
-      <text>明细</text>
-      <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode="" />
-      <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode="" />
-    </view> -->
+      <view wx:if="{{totalPrice>0}}" bindtap="openPopup">
+        <text style="margin-left: 16.67rpx;font-weight: 500;font-size: 27rpx;color: #0B898E;">明细</text>
+        <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left:10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode=""/>
+        <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode=""/>
+      </view>
     </view>
     <!-- 去结算按钮 -->
-    <view class="{{cartCount == 0?'no-buy':'buy'}}" bindtap="order">去结算</view>
+    <view wx:if="{{totalPrice==0}}" class="no-buy">去结算</view>
+    <view wx:else class="buy" bindtap="order">去结算</view>
   </view>
 </view>
 <!-- 规格弹窗 -->
@@ -195,8 +211,8 @@
         <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
         <view class="main">
           <view>
-            <view class="title">{{item.product.title}}</view>
-            <view class="sku-title">{{item.sku.sku_name}}</view>
+            <view class="title textOver">{{item.product.title}}</view>
+            <view class="sku-title textOver">{{item.sku.sku_name}}</view>
           </view>
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
diff --git a/subPackages/techanNew/index.wxss b/subPackages/techanNew/index.wxss
index 69bccdf..3c7b928 100644
--- a/subPackages/techanNew/index.wxss
+++ b/subPackages/techanNew/index.wxss
@@ -683,3 +683,60 @@ page {
 .hot-list-item {
   width: 337rpx;
 }
+
+
+
+.title-box,.title-header{
+  background: #ffff;
+}
+.bg-box,.bg-box .title-header {
+  background: transparent;
+  color: #ccc;
+}
+
+.title-header {
+  position: fixed;
+  left: 0;
+  right: 0;
+  display: flex;
+  top: 0;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 32rpx;
+  line-height: 90rpx;
+  z-index: 2;
+}
+.title-header .icon-fanhui1 {
+  padding: 0 20rpx;
+  font-size: 44rpx;
+  color: #333;
+}
+.right {
+  position: absolute;
+  right: 20rpx;
+}
+.search-box {
+  display: flex;
+  align-items: center;
+  margin-left: 60rpx;
+  width: 560rpx;
+  border-radius: 30rpx;
+  height: 60rpx;
+  padding: 0 20rpx;
+  font-size: 26rpx;
+  background: #F0F0F0;
+}
+.bg-box .search-box {
+  background: #F0F0F0;
+}
+.search-box .weui-input {
+  margin-left: 10rpx;
+  flex: 1;
+  width: 100%;
+}
+.bg-box.title-box .icon-fanhui1 {
+  color: white;
+}
+.phcolor {
+  color: #ccc;
+}

From 06a41d3ac554a3dee7f0df6f45192a3c9a3b8f21 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 24 Jul 2024 15:41:23 +0800
Subject: [PATCH 176/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=97=A5=E5=B8=B8=E7=89=88=E3=80=81=E4=B8=8B=E5=8D=95=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E6=A1=86=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/newCalendar/index.wxml |  2 +-
 pages/component/newCalendar/index.wxss |  2 +-
 pages/list/activitynew/index.wxml      |  2 +-
 pages/list/activitynew/index.wxss      | 19 ++++++++++---------
 pages/order/scene/index.wxml           |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index 08e0a74..5322ea9 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.isTest132? true : false;
+      data.isTest = data.isTest133? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 96240dc..6e81ebf 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -58,7 +58,7 @@
         <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
     </view>
     <!-- 节假日花样 -->
-    <image wx:if="{{currentViewType==='month'}}" style="width: 250rpx;height: 144.67rpx;position: absolute;right: 0;bottom: 30.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240605/1dda9e2e0fbc5d64aef702b5e692b2e5.png" mode=""/>
+    <!-- <image wx:if="{{currentViewType==='month'}}" style="width: 250rpx;height: 144.67rpx;position: absolute;right: 0;bottom: 30.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240605/1dda9e2e0fbc5d64aef702b5e692b2e5.png" mode=""/> -->
 </view> 
 
  
\ No newline at end of file
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index 58585ab..6e957c1 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -13,7 +13,7 @@
     margin: 0 auto;
     padding: 37rpx 0 40rpx;
     /* 节假日花样 */
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png");
+    /* background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png"); */
     background-size: 100% 100%;
     width: 100%;
     height: 65.67rpx
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 75166f8..6adcbd1 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -4,7 +4,7 @@
 <new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
   <!-- 节假日花样 -->
-  <image class="bg-pic" src="https://static.ticket.sz-trip.com/uploads/20240605/ffe34fccbb11173e96b2bd8feacef6a3.png" mode="widthFix"/>
+  <!-- <image class="bg-pic" src="https://static.ticket.sz-trip.com/uploads/20240605/ffe34fccbb11173e96b2bd8feacef6a3.png" mode="widthFix"/> -->
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index c8bd90f..155d0d1 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -1,9 +1,9 @@
 /* pages/activity/index.wxss */
 
 page {
-  /* background: #F2F2F2; */
+  background: #F2F2F2;
   /* 节假日花样 */
-  background: #CEEDDB;
+  /* background: #CEEDDB; */
 }
 .types {
   /* justify-content: space-between; */
@@ -362,21 +362,22 @@ flex-shrink: 0;
     flex-shrink: 0;
 }
 .types-item-active {
-  padding: 0 79rpx;
-  /* height: 57rpx; */
+  /* padding: 0 79rpx; */
+  padding: 0 25rpx;
+  height: 57rpx;
   /* 节假日花样 */
-  height: 91.33rpx;
-  line-height: 91.33rpx;
+  /* height: 91.33rpx; */
+  line-height: 57rpx;
   display: inline-block;
-  /* background: #0B898E; */
+  background: #0B898E;
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
   flex-shrink: 0;
   /* 节假日花样 */
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20240606/f4ff3a7f81b4be3508592f656e207497.png");
+  /* background-image: url("https://static.ticket.sz-trip.com/uploads/20240606/f4ff3a7f81b4be3508592f656e207497.png"); */
   background-size: 100% 100%;
-  margin-top: -15rpx;
+  /* margin-top: -15rpx; */
     text-align: center;
 }
 /* 不显示滚动条 */
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index ac543a2..047e151 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -52,7 +52,7 @@
     <view class="fixed-price-box" wx:else><text>合计：</text>
       <text class="price">¥{{price}}</text>
     </view>
-    <view class="fixed-btn" bindtap="next">下一步</view>
+    <view class="fixed-btn" bindtap="order">下一步</view>
   </view>
   <view class="fixed-bottom yuyue-box" wx:else>
     <view class="fixed-btn yuyue-btn" bindtap="order" wx:if="{{type=='museum'}}">立即预约</view>

From ab319c746f7424f00bf2ace342bda89b01453d57 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 26 Jul 2024 16:28:10 +0800
Subject: [PATCH 177/471] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/museumInfo/index.js            |   20 +-
 pages/info/sceneProductInfo/index.js      | 1659 +++++++++++----------
 pages/info/sceneProductInfo/index.json    |    4 +-
 pages/info/sceneProductInfo/index.wxml    |   37 +-
 pages/info/sceneProductInfo/index.wxss    |  108 +-
 pages/order/components/contact/index.wxml |    5 +-
 pages/order/components/contact/index.wxss |    4 +-
 pages/order/components/date/index.js      |   57 +-
 pages/order/components/date/index.wxml    |   45 +-
 pages/order/components/date/index.wxss    |   54 +-
 pages/order/scene/index.js                |   51 +-
 pages/order/scene/index.json              |    6 +-
 pages/order/scene/index.wxml              |   66 +-
 pages/order/scene/index.wxss              |  133 +-
 14 files changed, 1362 insertions(+), 887 deletions(-)

diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index a4f8e8a..a4c3859 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -28,7 +28,9 @@ Page({
     shareImg: null,
     showShareFlag: false,
     showQrCode:false,
-    wxqrcode:null
+    wxqrcode:null,
+    date: "",
+    time: "",
   },
 
   /**
@@ -77,6 +79,20 @@ Page({
     })
     this.getAct()
   },
+  // 获取日期
+  changeDate: function (e) {
+    this.setData({
+      date: e.detail
+    })
+    console.log(this.data.date);
+  },
+  // 获取分时
+  changeTime: function (e) {
+    this.setData({
+      time: e.detail
+    })
+    console.log(this.data.time);
+  },
   getAct: function () {
     if (this.data.actList.length >= this.data.actTotal || this.data.isGroup == 1) return;
     commonApi._post('scene/get_scene_act_list', {
@@ -464,6 +480,8 @@ Page({
       isGroup: this.data.isGroup,
       isTeam: this.data.info.team_order && this.data.isGroup?1:0
     }
+    app.globalData.product.date = this.data.date
+    app.globalData.product.time = this.data.time
     app.globalData.index = 0
     wx.navigateTo({
       url: '/pages/order/scene/index?type=museum'
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 2abd7b0..e9d5b05 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -6,867 +6,916 @@ import util from "../../../utils/util"
 import QRCode from '../../../utils/weapp-qrcode.js'
 let app = getApp()
 Page({
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        info: null,
-        bookingInfo: null,
-        bookingInfoTitle: "",
-        safeBottom: app.globalData.safeBottom,
-        isLike: 0,
-        comment: [],
-        commentTotal: 0,
-        isTest: true,
-        retailId: "",
-        shareImg: null,
-        showShareFlag: false,
-        showAllowance: false,
-        allowance_data: null,
-        //购物车数量
-        productNum: 1,
-        skuIndex: 0,
-        aniSkuIndex: -1,
-        cartCount: 0,
-        cartImgInfo: null,
-        cartTop: 0,
-        top: 0,
-        skuList: [], //立即预定的列表
-        sku_ids: [],
-        showQrCode: false,
-        wxqrcode: null
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    info: null,
+    bookingInfo: null,
+    bookingInfoTitle: "",
+    safeBottom: app.globalData.safeBottom,
+    isLike: 0,
+    comment: [],
+    commentTotal: 0,
+    isTest: true,
+    retailId: "",
+    shareImg: null,
+    showShareFlag: false,
+    showAllowance: false,
+    allowance_data: null,
+    //购物车数量
+    productNum: 1,
+    skuIndex: 0,
+    aniSkuIndex: -1,
+    cartCount: 0,
+    cartImgInfo: null,
+    cartTop: 0,
+    top: 0,
+    skuList: [], //立即预定的列表
+    sku_ids: [],
+    showQrCode: false,
+    wxqrcode: null,
+    product: {},
+    date: "",
+    time: "",
+    showDate:false,
+    showPrice:0
+  },
 
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        console.log(options);
-        if (!options.id) {
-            util.back()
-            return;
-        }
-        if (options.retailId) {
-            this.setData({
-                retailId: options.retailId
-            })
-        }
-        this.setData({
-            id: options.id
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options);
+    if (!options.id) {
+      util.back()
+      return;
+    }
+    if (options.retailId) {
+      this.setData({
+        retailId: options.retailId
+      })
+    }
+    this.setData({
+      id: options.id
+    })
+    commonApi._post("scene/detail", {
+      id: options.id
+    }).then(res => {
+      let flag = false
+      if (!res.data) {
+        wx.showToast({
+          title: '产品已下架',
+          icon: 'none'
         })
-        commonApi._post("scene/detail", {
-            id: options.id
-        }).then(res => {
-            let flag = false
-            if (!res.data) {
-                wx.showToast({
-                    title: '产品已下架',
-                    icon: 'none'
-                })
-                setTimeout(() => {
-                    util.back();
-                }, 1000)
-                return;
-            }
-            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
-            // 如果是带有指定good_id的 那么取指定的
-            if (options.gid) {
-                let pItem = res.data.product.find(item => item.id == options.gid);
-                if (pItem) {
-                    res.data.product = [pItem];
-                }
+        setTimeout(() => {
+          util.back();
+        }, 1000)
+        return;
+      }
+      res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+      // 如果是带有指定good_id的 那么取指定的
+      if (options.gid) {
+        let pItem = res.data.product.find(item => item.id == options.gid);
+        if (pItem) {
+          res.data.product = [pItem];
+        }
+      }
+      // 如果带有指定skuid的话 那么取指定的sku展示
+      if (options.skuid) {
+        let pItem = null;
+        for (let i = 0; i < res.data.product.length; i++) { //3
+          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+            if (res.data.product[i].sku[j].id == options.skuid) {
+              res.data.product[i].sku = [res.data.product[i].sku[j]];
+              pItem = res.data.product[i];
+              break;
             }
-            // 如果带有指定skuid的话 那么取指定的sku展示
-            if (options.skuid) {
-                let pItem = null;
-                for (let i = 0; i < res.data.product.length; i++) { //3
-                    for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
-                        if (res.data.product[i].sku[j].id == options.skuid) {
-                            res.data.product[i].sku = [res.data.product[i].sku[j]];
-                            pItem = res.data.product[i];
-                            break;
-                        }
-                    }
-                }
-                if (pItem) {
-                    res.data.product = [pItem];
+          }
+        }
+        if (pItem) {
+          res.data.product = [pItem];
+        }
+      } else if (options.zhuanti_type) {
+        flag = true
+        commonApi._post("theme/getYihuFreeList", {
+          zhuanti_type: options.zhuanti_type
+        }).then(res1 => {
+          let skuArr = res1.data.sku_ids
+          let newArr = []
+          for (let i = 0; i < res.data.product.length; i++) { //3
+            for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+              for (let k = 0; k < skuArr.length; k++) {
+                if (res.data.product[i].sku[j].id == skuArr[k]) {
+                  newArr.push(res.data.product[i].sku[j])
                 }
-            } else if (options.zhuanti_type) {
-                flag = true
-                commonApi._post("theme/getYihuFreeList", {
-                    zhuanti_type: options.zhuanti_type
-                }).then(res1 => {
-                    let skuArr = res1.data.sku_ids
-                    let newArr = []
-                    for (let i = 0; i < res.data.product.length; i++) { //3
-                        for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
-                            for (let k = 0; k < skuArr.length; k++) {
-                                if (res.data.product[i].sku[j].id == skuArr[k]) {
-                                    newArr.push(res.data.product[i].sku[j])
-                                }
-                            }
-                        }
-                        res.data.product[i].sku = newArr;
-                    }
-                    res.data.product.map(product => {
-                        product.sku.map(sku => {
-                            sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
-                        })
-                    })
-                    this.setData({
-                        info: res.data
-                    })
-                    var arr = []
-                    res.data.product.forEach((item, index) => {
-                        item.sku.forEach(itemB => {
-                            itemB.proIndex = index
-                            arr.push(itemB)
-                        })
-                    });
-                    this.setData({
-                        skuList: arr
-                    })
-                    util.pagePoint({
-                        event: 'scene_view',
-                        param: {
-                            type: res.data.type,
-                            id: res.data.id
-                        }
-                    }, 1)
-                    this.BroswerRecord()
-                })
-
+              }
             }
-            console.log(res.data.product);
-            if (flag) {
-                return
+            res.data.product[i].sku = newArr;
+          }
+          res.data.product.map(product => {
+            product.sku.map(sku => {
+              sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+            })
+          })
+          this.setData({
+            info: res.data
+          })
+          var arr = []
+          res.data.product.forEach((item, index) => {
+            item.sku.forEach(itemB => {
+              itemB.proIndex = index
+              arr.push(itemB)
+            })
+          });
+          this.setData({
+            skuList: arr
+          })
+          util.pagePoint({
+            event: 'scene_view',
+            param: {
+              type: res.data.type,
+              id: res.data.id
             }
+          }, 1)
+          this.BroswerRecord()
+        })
 
+      }
+      console.log(res.data.product);
+      if (flag) {
+        return
+      }
 
-            // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
-            res.data.product.map(product => {
-                product.sku.map(sku => {
-                    sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
-                })
-            })
-            this.setData({
-                info: res.data
-            })
-            var arr = []
-            res.data.product.forEach((item, index) => {
-                item.sku.forEach(itemB => {
-                    itemB.proIndex = index
-                    arr.push(itemB)
-                })
-            });
-            this.setData({
-                skuList: arr
-            })
-            util.pagePoint({
-                event: 'scene_view',
-                param: {
-                    type: res.data.type,
-                    id: res.data.id
-                }
-            }, 1)
-            this.BroswerRecord()
+
+      // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
+      res.data.product.map(product => {
+        product.sku.map(sku => {
+          sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
         })
-        // 获取收藏的状态
-        if (wx.getStorageSync("jstrip_token")) {
-            commonApi.user_post("scene/is_scene_collection", {
-                scene_id: options.id
-            }).then(res => {
-                this.setData({
-                    isLike: res.data
-                })
-            })
+      })
+      this.setData({
+        info: res.data
+      })
+      var arr = []
+      res.data.product.forEach((item, index) => {
+        item.sku.forEach(itemB => {
+          itemB.proIndex = index
+          arr.push(itemB)
+        })
+      });
+      this.setData({
+        skuList: arr
+      })
+      util.pagePoint({
+        event: 'scene_view',
+        param: {
+          type: res.data.type,
+          id: res.data.id
         }
-        commonApi._post("ask/getQuestionList", {
-            scene_id: options.id,
-            page_no: 1,
-            page_num: 3
-        }).then(res => {
-            this.setData({
-                ask: res.data.rows
-            })
+      }, 1)
+      this.BroswerRecord()
+    })
+    // 获取收藏的状态
+    if (wx.getStorageSync("jstrip_token")) {
+      commonApi.user_post("scene/is_scene_collection", {
+        scene_id: options.id
+      }).then(res => {
+        this.setData({
+          isLike: res.data
         })
-        // 获取评价列表
-        commonApi._post("scene/get_comment", {
-            scene_id: options.id
-        }).then(res => {
-            res.data.list.map(item => {
-                item.rate = Number(item.rate)
-            })
-            this.setData({
-                comment: res.data.list.splice(0, 2),
-                commentTotal: res.data.total
-            })
-            let arr = this.data.comment
-            arr.map((item) => {
-                if (item.img_list) {
-                    let arr = item.img_list.split(',')
-                    item.img_list = arr
+      })
+    }
+    commonApi._post("ask/getQuestionList", {
+      scene_id: options.id,
+      page_no: 1,
+      page_num: 3
+    }).then(res => {
+      this.setData({
+        ask: res.data.rows
+      })
+    })
+    // 获取评价列表
+    commonApi._post("scene/get_comment", {
+      scene_id: options.id
+    }).then(res => {
+      res.data.list.map(item => {
+        item.rate = Number(item.rate)
+      })
+      this.setData({
+        comment: res.data.list.splice(0, 2),
+        commentTotal: res.data.total
+      })
+      let arr = this.data.comment
+      arr.map((item) => {
+        if (item.img_list) {
+          let arr = item.img_list.split(',')
+          item.img_list = arr
 
-                } else {
-                    item.img_list = []
-                }
-            })
-            this.setData({
-                comment: arr
-            })
+        } else {
+          item.img_list = []
+        }
+      })
+      this.setData({
+        comment: arr
+      })
+    })
+  },
+  // 获取日期
+  changeDate: function (e) {
+    this.setData({
+      date: e.detail
+    })
+    console.log(this.data.date);
+  },
+  // 获取分时
+  changeTime: function (e) {
+    console.log(e);
+    this.setData({
+      time: e.detail
+    })
+    console.log(this.data.time);
+  },
+  changeAllowance: function () {
+    this.setData({
+      showAllowance: !this.data.showAllowance
+    })
+  },
+  BroswerRecord: function () {
+    setTimeout(() => {
+      if (app.globalData.uuid) {
+        commonApi._post('browse/browse_record', {
+          type: "scene",
+          title: this.data.info.title,
+          drive: "mini",
+          source_id: this.data.info.id,
+          url: "/pages/info/sceneProductInfo/index?id=" + this.data.info.id,
+          uuid: app.globalData.uuid
+        }).then(res => {})
+      } else {
+        this.BroswerRecord();
+      }
+    }, 500)
+  },
+  like: function () {
+    let id = this.data.id,
+      isLike = Number(this.data.isLike);
+    commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
+      scene_id: id
+    }).then(res => {
+      if (res.code == 1) {
+        wx.showToast({
+          title: '操作成功',
         })
-    },
-    changeAllowance: function () {
         this.setData({
-            showAllowance: !this.data.showAllowance
+          isLike: isLike == 1 ? 0 : 1
         })
-    },
-    BroswerRecord: function () {
-        setTimeout(() => {
-            if (app.globalData.uuid) {
-                commonApi._post('browse/browse_record', {
-                    type: "scene",
-                    title: this.data.info.title,
-                    drive: "mini",
-                    source_id: this.data.info.id,
-                    url: "/pages/info/sceneProductInfo/index?id=" + this.data.info.id,
-                    uuid: app.globalData.uuid
-                }).then(res => {})
-            } else {
-                this.BroswerRecord();
+      }
+    })
+  },
+  gotolocation: function () {
+    let info = this.data.info;
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon)
+    })
+  },
+  audioGuide: function () {
+    wx.navigateToMiniProgram({
+      appId: 'wx74f380bc721a0379',
+      path: '/pages/listen/listen?title=君到苏州'
+    })
+  },
+  showBookingInfo: function (e) {
+    this.setData({
+      bookingInfo: e.currentTarget.dataset.item.sku_model,
+      bookingInfoTitle: e.currentTarget.dataset.item.sku_name
+    })
+    util.pagePoint({
+      event: "scene_notice",
+      param: {
+        type: this.data.info.type,
+        id: this.data.info.id
+      }
+    }, 1)
+  },
+  closeMask: function () {
+    this.setData({
+      bookingInfo: null
+    })
+  },
+  // order: function (e) {
+  //   console.log(e)
+  //   if (e.currentTarget.dataset.disable == 1) return;
+  //   util.pagePoint({
+  //     event: 'scene_order',
+  //     param: {
+  //       type: this.data.info.type,
+  //       id: this.data.info.id
+  //     }
+  //   }, 1)
+  //   wx.setStorageSync('login_from', 'scene_order_login')
+  //   wx.setStorageSync('order_from', 'scene_order_submit')
+  //   app.globalData.couponInfo = null;
+  //   app.globalData.retailId = this.data.retailId;
+  //   // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+  //   app.globalData.product = e.currentTarget.dataset;
+  //   wx.navigateTo({
+  //     url: '/pages/order/scene/index',
+  //   })
+  // },
+  selectSku: function (e) {
+    console.log(e.currentTarget.dataset.item);
+    if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock != 1) {
+      wx.showToast({
+        title: "该商品暂无库存",
+        icon: 'none'
+      })
+      return
+    }
+    let index = e.currentTarget.dataset.index;
+    this.setData({
+      skuIndex: index,
+      productNum: 1
+    })
+
+  },
+  order: function (e) {
+    commonApi.user_post("/product/checkStock", {
+      sku_id: this.data.skuList[this.data.skuIndex].id,
+    }).then(res => {
+      if (res && res.code != 1) {
+        wx.showModal({
+          title: "温馨提示",
+          content: '商品已经被抢光啦~要不要瞧瞧别的~',
+          showCancel: false
+        })
+        return;
+      } else {
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        if (this.data.skuFlag == 'order') {
+          if (e.currentTarget.dataset.disable === 1) return;
+          util.pagePoint({
+            event: 'scene_order',
+            param: {
+              type: this.data.info.type,
+              id: this.data.info.id
             }
-        }, 500)
-    },
-    like: function () {
-        let id = this.data.id,
-            isLike = Number(this.data.isLike);
-        commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
-            scene_id: id
-        }).then(res => {
+          }, 1)
+          wx.setStorageSync('login_from', 'scene_order_login')
+          wx.setStorageSync('order_from', 'scene_order_submit')
+          app.globalData.couponInfo = null;
+          app.globalData.retailId = this.data.retailId;
+          // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+          // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+          // let sku = {
+          //     sku: this.data.skuList[this.data.skuIndex]
+          //   },
+          //   product = {
+          //     product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
+          //   }
+          // product.productNum = this.data.productNum
+          app.globalData.product.date = this.data.date
+          app.globalData.product.time = this.data.time
+          // app.globalData.product = {
+          //   ...sku,
+          //   ...product
+          // }
+          app.globalData.index = 0
+          wx.navigateTo({
+            url: '/pages/order/scene/index',
+          })
+        } else {
+          commonApi.user_post("cart/add_sku", {
+            sku_id: this.data.skuList[this.data.skuIndex].id,
+            num: this.data.productNum
+          }).then(res => {
             if (res.code == 1) {
-                wx.showToast({
-                    title: '操作成功',
+              commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                  cartCount: res.data.length //5
                 })
+              })
+              // 加动效
+              this.setData({
+                skuFlag: null,
+                aniSkuIndex: this.data.skuIndex,
+                cartImgInfo: null
+              })
+              setTimeout(() => {
                 this.setData({
-                    isLike: isLike == 1 ? 0 : 1
+                  aniSkuIndex: -1
                 })
-            }
-        })
-    },
-    gotolocation: function () {
-        let info = this.data.info;
-        wx.openLocation({
-            latitude: Number(info.lat),
-            longitude: Number(info.lon)
-        })
-    },
-    audioGuide: function () {
-        wx.navigateToMiniProgram({
-            appId: 'wx74f380bc721a0379',
-            path: '/pages/listen/listen?title=君到苏州'
-        })
-    },
-    showBookingInfo: function (e) {
-        this.setData({
-            bookingInfo: e.currentTarget.dataset.item.sku_model,
-            bookingInfoTitle: e.currentTarget.dataset.item.sku_name
-        })
-        util.pagePoint({
-            event: "scene_notice",
-            param: {
-                type: this.data.info.type,
-                id: this.data.info.id
-            }
-        }, 1)
-    },
-    closeMask: function () {
-        this.setData({
-            bookingInfo: null
-        })
-    },
-    // order: function(e){
-    //  console.log(e)
-    //  	if (e.currentTarget.dataset.disable == 1) return;
-    //  	util.pagePoint({
-    //  	  event: 'scene_order',
-    //  	  param: {
-    //  	    type: this.data.info.type,
-    //  	    id: this.data.info.id
-    //  	  }
-    //  	}, 1)
-    //  	wx.setStorageSync('login_from', 'scene_order_login')
-    //  	wx.setStorageSync('order_from', 'scene_order_submit')
-    //  	app.globalData.couponInfo = null;
-    //  	app.globalData.retailId = this.data.retailId;
-    //  	// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-    //  	app.globalData.product = e.currentTarget.dataset;
-    //  	wx.navigateTo({
-    //  	  url: '/pages/order/scene/index',
-    //  	})
-    // },
-    selectSku: function (e) {
-        console.log(e.currentTarget.dataset.item);
-        if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock != 1) {
-            wx.showToast({
-                title: "该商品暂无库存",
-                icon: 'none'
-            })
-            return
-        }
-        let index = e.currentTarget.dataset.index;
-        this.setData({
-            skuIndex: index,
-            productNum:1
-        })
-        
-    },
-    order: function (e) {
-        commonApi.user_post("/product/checkStock", {
-            sku_id: this.data.skuList[this.data.skuIndex].id,
-        }).then(res => {
-            if (res && res.code != 1) {
                 wx.showModal({
-                    title: "温馨提示",
-                    content: '商品已经被抢光啦~要不要瞧瞧别的~',
-                    showCancel: false
-                })
-                return;
-            } else {
-                app.globalData.postProduct = []
-                app.globalData.list = []
-                if (this.data.skuFlag == 'order') {
-                    if (e.currentTarget.dataset.disable === 1) return;
-                    util.pagePoint({
-                        event: 'scene_order',
-                        param: {
-                            type: this.data.info.type,
-                            id: this.data.info.id
-                        }
-                    }, 1)
-                    wx.setStorageSync('login_from', 'scene_order_login')
-                    wx.setStorageSync('order_from', 'scene_order_submit')
-                    app.globalData.couponInfo = null;
-                    app.globalData.retailId = this.data.retailId;
-                    // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
-                    // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
-                    let sku = {
-                            sku: this.data.skuList[this.data.skuIndex]
-                        },
-                        product = {
-                            product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
-                        }
-                        product.productNum = this.data.productNum
-                    app.globalData.product = {
-                        ...sku,
-                        ...product
+                  title: "提示",
+                  content: "去购物车结算？",
+                  success: function (res) {
+                    if (res.confirm) {
+                      wx.navigateTo({
+                        url: '/pages/user/cartlist/list',
+                      })
                     }
-                    app.globalData.index = 0
-                    wx.navigateTo({
-                        url: '/pages/order/scene/index',
-                    })
-                } else {
-                    commonApi.user_post("cart/add_sku", {
-                        sku_id: this.data.skuList[this.data.skuIndex].id,
-                        num: this.data.productNum
-                    }).then(res => {
-                        if (res.code == 1) {
-                            commonApi.user_post('cart/get_list', {}).then(res => {
-                                this.setData({
-                                    cartCount: res.data.length //5
-                                })
-                            })
-                            // 加动效
-                            this.setData({
-                                skuFlag: null,
-                                aniSkuIndex: this.data.skuIndex,
-                                cartImgInfo: null
-                            })
-                            setTimeout(() => {
-                                this.setData({
-                                    aniSkuIndex: -1
-                                })
-                                wx.showModal({
-                                    title: "提示",
-                                    content: "去购物车结算？",
-                                    success: function (res) {
-                                        if (res.confirm) {
-                                            wx.navigateTo({
-                                                url: '/pages/user/cartlist/list',
-                                            })
-                                        }
-                                    }
-                                })
-                            }, 650)
-                        }
-                    })
-                }
-            }
-        })
-    },
-    pagePoint: function (e) {
-        util.pagePoint({
-            event: e.currentTarget.dataset.event,
-            param: {
-                type: this.data.info.type,
-                id: this.data.info.id
+                  }
+                })
+              }, 650)
             }
-        }, 1)
-    },
-    // 分享
-    share: function () {
-        if (!wx.getStorageSync("jstrip_token")) {
-            wx.setStorageSync('login_from', 'scene_share_login')
-            commonApi.user_post("user/getMyInfo", {}).then(res => {}).catch(err => {})
-            return;
+          })
         }
-        if (!this.data.shareImg) {
+      }
+    })
+  },
+  pagePoint: function (e) {
+    util.pagePoint({
+      event: e.currentTarget.dataset.event,
+      param: {
+        type: this.data.info.type,
+        id: this.data.info.id
+      }
+    }, 1)
+  },
+  // 分享
+  share: function () {
+    if (!wx.getStorageSync("jstrip_token")) {
+      wx.setStorageSync('login_from', 'scene_share_login')
+      commonApi.user_post("user/getMyInfo", {}).then(res => {}).catch(err => {})
+      return;
+    }
+    if (!this.data.shareImg) {
+      wx.showToast({
+        title: '图片生成中，稍后再试',
+        icon: 'none'
+      })
+      return;
+    }
+    this.setData({
+      showShareFlag: !this.data.showShareFlag
+    })
+  },
+  // 保存
+  save() {
+    let url = this.data.shareImg,
+      that = this;
+    wx.authorize({
+      /* 这个就是保存相册的 */
+      scope: 'scope.writePhotosAlbum',
+      success() {
+        wx.saveImageToPhotosAlbum({
+          filePath: url,
+          success(res) {
             wx.showToast({
-                title: '图片生成中，稍后再试',
-                icon: 'none'
+              title: '保存成功',
+              icon: "success"
             })
-            return;
-        }
-        this.setData({
-            showShareFlag: !this.data.showShareFlag
+            that.setData({
+              showShareFlag: !that.data.showShareFlag
+            })
+            util.pagePoint({
+              event: 'scene_share_save',
+              param: {
+                type: that.data.info.type,
+                id: that.data.info.id
+              }
+            }, 1)
+          },
+          fail(res) {
+            wx.showToast({
+              title: '保存失败',
+              icon: 'none'
+            })
+          }
         })
-    },
-    // 保存
-    save() {
-        let url = this.data.shareImg,
-            that = this;
-        wx.authorize({
-            /* 这个就是保存相册的 */
-            scope: 'scope.writePhotosAlbum',
-            success() {
-                wx.saveImageToPhotosAlbum({
-                    filePath: url,
-                    success(res) {
-                        wx.showToast({
-                            title: '保存成功',
-                            icon: "success"
-                        })
-                        that.setData({
-                            showShareFlag: !that.data.showShareFlag
-                        })
-                        util.pagePoint({
-                            event: 'scene_share_save',
-                            param: {
-                                type: that.data.info.type,
-                                id: that.data.info.id
-                            }
-                        }, 1)
-                    },
-                    fail(res) {
-                        wx.showToast({
-                            title: '保存失败',
-                            icon: 'none'
-                        })
-                    }
-                })
-            },
-            complete(res) {
-                /* 这里判断一下如果没有授权重新打开设置选项 */
-                wx.getSetting({
-                    success(res) {
-                        if (!res.authSetting['scope.writePhotosAlbum']) {
-                            /* 打开设置的方法 */
-                            // opensit();
-                            wx.showToast({
-                                title: '请打开权限后再试',
-                                icon: 'none'
-                            })
-                        }
-                    }
-                });
+      },
+      complete(res) {
+        /* 这里判断一下如果没有授权重新打开设置选项 */
+        wx.getSetting({
+          success(res) {
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+              /* 打开设置的方法 */
+              // opensit();
+              wx.showToast({
+                title: '请打开权限后再试',
+                icon: 'none'
+              })
             }
+          }
         });
+      }
+    });
 
-    },
-    // 绘制海报
-    drawImg: function () {
-        var that = this,
-            userinfo = wx.getStorageSync('jstrip_userInfo');
-        if (!userinfo) {
-            // 去登录
-            return false;
+  },
+  // 绘制海报
+  drawImg: function () {
+    var that = this,
+      userinfo = wx.getStorageSync('jstrip_userInfo');
+    if (!userinfo) {
+      // 去登录
+      return false;
+    }
+    const ctx = wx.createCanvasContext('imageCanvas');
+    // const device = wx.getSystemInfoSync();
+    // const ratio = device.screenWidth / 750;
+    // 先获取到图片信息
+    let promise2 = new Promise(function (resolve, reject) {
+      wx.getImageInfo({
+        src: that.data.info.headimg,
+        success: function (res) {
+          resolve(res);
+        },
+        fail: function (res) {
+          reject(res);
         }
-        const ctx = wx.createCanvasContext('imageCanvas');
-        // const device = wx.getSystemInfoSync();
-        // const ratio = device.screenWidth / 750;
-        // 先获取到图片信息
-        let promise2 = new Promise(function (resolve, reject) {
-            wx.getImageInfo({
-                src: that.data.info.headimg,
-                success: function (res) {
-                    resolve(res);
-                },
-                fail: function (res) {
-                    reject(res);
-                }
-            })
-        })
-        let promise3 = new Promise(function (resolve, reject) {
-            let userid = wx.getStorageSync('jstrip_userid')
-            new QRCode('myQrcode', {
-                text: 'https://m.cloud.sz-trip.com/ScenicDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
-                width: 500,
-                height: 500,
-                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
-                callback: (res) => {
-                    resolve(res);
-                }
-            })
-        })
-        //成功得到图片信息后，开始绘图
-        Promise.all([promise2, promise3]).then(imgs => {
-            ctx.save();
-            ctx.beginPath(); //开始绘制
-            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
-            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
-            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
-            ctx.restore();
-            ctx.save();
-            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
-            ctx.restore();
-            // 绘制二维码
-            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
-            // 开始文字绘制
-            ctx.setFillStyle("#000");
-            ctx.setFontSize(30 * ratio); //字大小
-            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
-            // 售价
-            ctx.setFillStyle("#D62828");
-            ctx.setFontSize(40 * ratio); //字大小
-            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-            let price = "￥" + (that.data.info.price / 100);
-            let width = ctx.measureText(price).width;
-            ctx.fillText(price, 25 * ratio, 620 * ratio);
-            // 副标题
-            ctx.setFillStyle("#999999");
-            ctx.setFontSize(28 * ratio); //字大小
-            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-            let subtitle = that.data.info.sub_title
-            if (subtitle && subtitle.length > 10) {
-                subtitle = subtitle.substr(0, 10) + '...'
-            }
-            if (subtitle) {
-                ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
-            }
+      })
+    })
+    let promise3 = new Promise(function (resolve, reject) {
+      let userid = wx.getStorageSync('jstrip_userid')
+      new QRCode('myQrcode', {
+        text: 'https://m.cloud.sz-trip.com/ScenicDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+        width: 500,
+        height: 500,
+        padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+        correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+        callback: (res) => {
+          resolve(res);
+        }
+      })
+    })
+    //成功得到图片信息后，开始绘图
+    Promise.all([promise2, promise3]).then(imgs => {
+      ctx.save();
+      ctx.beginPath(); //开始绘制
+      that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+      ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+      ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+      ctx.restore();
+      ctx.save();
+      that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+      ctx.restore();
+      // 绘制二维码
+      ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+      // 开始文字绘制
+      ctx.setFillStyle("#000");
+      ctx.setFontSize(30 * ratio); //字大小
+      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+      // 售价
+      ctx.setFillStyle("#D62828");
+      ctx.setFontSize(40 * ratio); //字大小
+      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      let price = "￥" + (that.data.info.price / 100);
+      let width = ctx.measureText(price).width;
+      ctx.fillText(price, 25 * ratio, 620 * ratio);
+      // 副标题
+      ctx.setFillStyle("#999999");
+      ctx.setFontSize(28 * ratio); //字大小
+      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      let subtitle = that.data.info.sub_title
+      if (subtitle && subtitle.length > 10) {
+        subtitle = subtitle.substr(0, 10) + '...'
+      }
+      if (subtitle) {
+        ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+      }
 
-            // ctx.draw();
-            // 划线价
-            // ctx.setFillStyle("#999999");
-            // ctx.setFontSize(32 * ratio); //字大小
-            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-            // let market_price = "￥"+(Number(that.data.info.market_price)/100)
-            // ctx.fillText(market_price, 40*ratio + width, 620*ratio);
-            // let market_price_width = ctx.measureText(market_price).width;
-            // 划线
-            // ctx.beginPath()
-            // ctx.setLineWidth(1)
-            // ctx.moveTo(40*ratio + width, 608*ratio)
-            // ctx.lineTo(45*ratio + width, 608*ratio)
-            // ctx.stroke();
-            // 长按识别二维码
-            // ctx.setFillStyle("#666");
-            // ctx.setFontSize(22 * ratio); //字大小
-            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
-            // 长按图片转发或保存
-            // ctx.setFillStyle("#000");
-            // ctx.setFontSize(24 * ratio); //字大小
-            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
-            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
-            ctx.draw();
-            // 转为图片
-            setTimeout(() => {
-                wx.canvasToTempFilePath({
-                    x: 0,
-                    y: 0,
-                    canvasId: 'imageCanvas',
-                    success: function (res) {
-                        that.setData({
-                            shareImg: res.tempFilePath
-                        })
-                    },
-                    fail(err) {
-                        console.log('agdgjgdajhg', err)
-                    }
-                })
-            }, 500)
-            return false;
-        }).catch(err => {
-            console.log("this err", err)
+      // ctx.draw();
+      // 划线价
+      // ctx.setFillStyle("#999999");
+      // ctx.setFontSize(32 * ratio); //字大小
+      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      // let market_price = "￥"+(Number(that.data.info.market_price)/100)
+      // ctx.fillText(market_price, 40*ratio + width, 620*ratio);
+      // let market_price_width = ctx.measureText(market_price).width;
+      // 划线
+      // ctx.beginPath()
+      // ctx.setLineWidth(1)
+      // ctx.moveTo(40*ratio + width, 608*ratio)
+      // ctx.lineTo(45*ratio + width, 608*ratio)
+      // ctx.stroke();
+      // 长按识别二维码
+      // ctx.setFillStyle("#666");
+      // ctx.setFontSize(22 * ratio); //字大小
+      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+      // 长按图片转发或保存
+      // ctx.setFillStyle("#000");
+      // ctx.setFontSize(24 * ratio); //字大小
+      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+      ctx.draw();
+      // 转为图片
+      setTimeout(() => {
+        wx.canvasToTempFilePath({
+          x: 0,
+          y: 0,
+          canvasId: 'imageCanvas',
+          success: function (res) {
+            that.setData({
+              shareImg: res.tempFilePath
+            })
+          },
+          fail(err) {
+            console.log('agdgjgdajhg', err)
+          }
         })
-    },
-    // 圆角矩形
-    handleBorderRect(ctx, x, y, w, h, r, color) {
-        ctx.beginPath();
-        ctx.moveTo(x + w, y + h);
-        ctx.lineTo(x, y + h)
-        // 左上角
-        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
-        ctx.moveTo(x + r, y);
-        ctx.lineTo(x + w - r, y);
-        ctx.lineTo(x + w, y + r);
-        // 右上角
-        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
-        ctx.lineTo(x + w, y + h);
-        ctx.lineTo(x + w - r, y + h);
-        ctx.fillStyle = color;
-        ctx.fill();
-        ctx.closePath();
-    },
-    handleBorderRect2(ctx, x, y, w, h, r, color) {
-        ctx.beginPath();
-        ctx.moveTo(x, y);
-        ctx.lineTo(x + w, y)
-        // 右下角
-        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
-        ctx.lineTo(x + r, y + h);
-        ctx.lineTo(x, y + h - r);
-        // 左下角
-        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
-        ctx.lineTo(x, y);
-        ctx.lineTo(x, y);
-        ctx.fillStyle = color;
-        ctx.fill();
-        ctx.closePath();
-    },
-    // 绘制两行文字
-    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
-        let row = [],
-            temp = "",
-            chr = str.split("");
-        for (var a = 0; a < chr.length; a++) {
-            if (ctx.measureText(temp).width < canvasWidth) {
-                temp += chr[a];
-            } else {
-                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
-                row.push(temp);
-                temp = "";
-            }
-        }
+      }, 500)
+      return false;
+    }).catch(err => {
+      console.log("this err", err)
+    })
+  },
+  // 圆角矩形
+  handleBorderRect(ctx, x, y, w, h, r, color) {
+    ctx.beginPath();
+    ctx.moveTo(x + w, y + h);
+    ctx.lineTo(x, y + h)
+    // 左上角
+    ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+    ctx.moveTo(x + r, y);
+    ctx.lineTo(x + w - r, y);
+    ctx.lineTo(x + w, y + r);
+    // 右上角
+    ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+    ctx.lineTo(x + w, y + h);
+    ctx.lineTo(x + w - r, y + h);
+    ctx.fillStyle = color;
+    ctx.fill();
+    ctx.closePath();
+  },
+  handleBorderRect2(ctx, x, y, w, h, r, color) {
+    ctx.beginPath();
+    ctx.moveTo(x, y);
+    ctx.lineTo(x + w, y)
+    // 右下角
+    ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+    ctx.lineTo(x + r, y + h);
+    ctx.lineTo(x, y + h - r);
+    // 左下角
+    ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+    ctx.lineTo(x, y);
+    ctx.lineTo(x, y);
+    ctx.fillStyle = color;
+    ctx.fill();
+    ctx.closePath();
+  },
+  // 绘制两行文字
+  drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+    let row = [],
+      temp = "",
+      chr = str.split("");
+    for (var a = 0; a < chr.length; a++) {
+      if (ctx.measureText(temp).width < canvasWidth) {
+        temp += chr[a];
+      } else {
+        a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
         row.push(temp);
+        temp = "";
+      }
+    }
+    row.push(temp);
 
-        //如果数组长度大于2 则截取前两个
-        if (row.length > 2) {
-            var rowCut = row.slice(0, 2);
-            var rowPart = rowCut[1];
-            var test = "";
-            var empty = [];
-            for (var a = 0; a < rowPart.length; a++) {
-                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
-                    test += rowPart[a];
-                } else {
-                    break;
-                }
-            }
-            empty.push(test);
-            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
-            rowCut.splice(1, 1, group);
-            row = rowCut;
-        }
-        for (var b = 0; b < row.length; b++) {
-            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+    //如果数组长度大于2 则截取前两个
+    if (row.length > 2) {
+      var rowCut = row.slice(0, 2);
+      var rowPart = rowCut[1];
+      var test = "";
+      var empty = [];
+      for (var a = 0; a < rowPart.length; a++) {
+        if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+          test += rowPart[a];
+        } else {
+          break;
         }
-    },
-    //加入购物车
-    showCart: function () {
-        commonApi.user_post('wx/get_user_keep', {
-            jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
-            title: this.data.info.title,
-            type: 'mini'
-        }).then(res => {
-            if (res.data.subscribe == 0) {
-                this.setData({
-                    wxqrcode: res.data.qrcode,
-                    showQrCode: true
-                })
-            } else {
-                if (this.data.info.product[0].sku.length == 0) {
-                    wx.showToast({
-                        title: '该产品未设置规格，不能加购',
-                        icon: 'none'
-                    })
-                    return;
-                }
-                this.setData({
-                    skuFlag: "cart"
-                })
-                let that = this
-                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
-                    that.setData({
-                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
-                    })
-                }).exec()
-            }
+      }
+      empty.push(test);
+      var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+      rowCut.splice(1, 1, group);
+      row = rowCut;
+    }
+    for (var b = 0; b < row.length; b++) {
+      ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+    }
+  },
+  //加入购物车
+  showCart: function () {
+    commonApi.user_post('wx/get_user_keep', {
+      jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
+      title: this.data.info.title,
+      type: 'mini'
+    }).then(res => {
+      if (res.data.subscribe == 0) {
+        this.setData({
+          wxqrcode: res.data.qrcode,
+          showQrCode: true
         })
-    },
-    hideSku: function () {
+      } else {
+        if (this.data.info.product[0].sku.length == 0) {
+          wx.showToast({
+            title: '该产品未设置规格，不能加购',
+            icon: 'none'
+          })
+          return;
+        }
         this.setData({
-            skuFlag: null,
-            cartImgInfo: null
+          skuFlag: "cart"
         })
-    },
-    //加减数量
-    minus: function () {
-        if (this.data.productNum == 1) return;
+        let that = this
+        wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+          that.setData({
+            cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+          })
+        }).exec()
+      }
+    })
+  },
+  hideSku: function () {
+    this.setData({
+      skuFlag: null,
+      cartImgInfo: null
+    })
+  },
+  hideDate: function () {
+    this.setData({
+      showDate: false
+    })
+  },
+  //加减数量
+  minus: function () {
+    if (this.data.productNum == 1) return;
+    this.setData({
+      productNum: this.data.productNum - 1
+    })
+  },
+  add: function () {
+    if (this.data.productNum == this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num) {
+      wx.showToast({
+        title: '本产品单笔限购' + this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num,
+        icon: 'none'
+      });
+    } else {
+      this.setData({
+        productNum: this.data.productNum + 1
+      })
+    }
+  },
+  // 选择日期
+  selectDate(e) {
+    console.log(e.currentTarget.dataset);
+    let sku = {
+        sku: e.currentTarget.dataset.sku
+      },
+      product = {
+        product: e.currentTarget.dataset.product
+      }
+      console.log(sku,product);
+    product.productNum = 1
+    app.globalData.product = {
+      ...sku,
+      ...product
+    }
+    console.log(app.globalData.product);
+    this.setData({
+      product: product,
+      showDate: true,
+      skuFlag: 'order',
+      showPrice:e.currentTarget.dataset.sku.price
+    })
+  },
+  //立即预定
+  showOrder: function () {
+    console.log(this.data.id);
+    commonApi.user_post('wx/get_user_keep', {
+      jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
+      title: this.data.info.title,
+      type: 'mini'
+    }).then(res => {
+      if (res.data.subscribe == 0) {
         this.setData({
-            productNum: this.data.productNum - 1
+          wxqrcode: res.data.qrcode,
+          showQrCode: true
         })
-    },
-    add: function () {
-      if (this.data.productNum == this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num){
-        wx.showToast({
-          title: '本产品单笔限购'+this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num,
-          icon:'none'
-        });
-      }else{
+      } else {
+        if (this.data.info.product[0].sku.length == 0) {
+          wx.showToast({
+            title: '该产品未设置规格，不能购买',
+            icon: 'none'
+          })
+          return;
+        }
+        if (this.data.info.product[0].type == 'line') {
+          wx.navigateTo({
+            url: '/pages/order/road/index?id=' + this.data.info.product[0].id
+          })
+          return
+        }
         this.setData({
-          productNum: this.data.productNum + 1
+          skuFlag: 'order'
         })
       }
-    },
-    //立即预定
-    showOrder: function () {
-        console.log(this.data.id);
-        commonApi.user_post('wx/get_user_keep', {
-            jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
-            title: this.data.info.title,
-            type: 'mini'
-        }).then(res => {
-            if (res.data.subscribe == 0) {
-                this.setData({
-                    wxqrcode: res.data.qrcode,
-                    showQrCode: true
-                })
-            } else {
-                if (this.data.info.product[0].sku.length == 0) {
-                    wx.showToast({
-                        title: '该产品未设置规格，不能购买',
-                        icon: 'none'
-                    })
-                    return;
-                }
-                if (this.data.info.product[0].type == 'line') {
-                    wx.navigateTo({
-                        url: '/pages/order/road/index?id=' + this.data.info.product[0].id
-                    })
-                    return
-                }
-                this.setData({
-                    skuFlag: 'order'
-                })
-            }
-        })
+    })
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-        if (app.globalData.configJson) {
-            this.setData({
-                isTest: app.globalData.configJson.isTest
-            })
-        } else {
-            setTimeout(() => {
-                this.onReady()
-            }, 300)
-        }
-    },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    if (app.globalData.configJson) {
+      this.setData({
+        isTest: app.globalData.configJson.isTest
+      })
+    } else {
+      setTimeout(() => {
+        this.onReady()
+      }, 300)
+    }
+  },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-        console.log(11111);
-        commonApi.user_post('cart/get_list', {}).then(res => {
-            this.setData({
-                cartCount: res.data.length //1
-            })
-        })
-        if (!wx.getStorageSync('jstrip_token')) {
-            return;
-        }
-        if (this.data.info && this.data.info.id) {
-            this.drawImg()
-            //// 获取补贴
-            // if (this.data.product.length == 1) {
-            //   commonApi.user_post("product/getProductAllowancePrice", {
-            //     product_code: this.data.product[0].product.product_code
-            //   }).then(resTwo => {
-            //     if (resTwo && resTwo.code == 1) {
-            //       this.setData({
-            //         allowance_data: resTwo.data
-            //       })
-            //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
-            //       let sInfo = this.data.product[0].sku
-            //       if (spread_price > 0) {
-            //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
-            //           this.setData({
-            //             allowance_price: spread_price
-            //           })
-            //         } else {
-            //           this.setData({
-            //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
-            //           })
-            //         }
-            //         this.changePrice()
-            //       } else {
-            //         this.setData({
-            //           allowance_price: 0
-            //         })
-            //       }
-            //     }
-            //   })
-            // }
-            //// 获取补贴结束
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    console.log(11111);
+    commonApi.user_post('cart/get_list', {}).then(res => {
+      this.setData({
+        cartCount: res.data.length //1
+      })
+    })
+    if (!wx.getStorageSync('jstrip_token')) {
+      return;
+    }
+    if (this.data.info && this.data.info.id) {
+      this.drawImg()
+      //// 获取补贴
+      // if (this.data.product.length == 1) {
+      //   commonApi.user_post("product/getProductAllowancePrice", {
+      //     product_code: this.data.product[0].product.product_code
+      //   }).then(resTwo => {
+      //     if (resTwo && resTwo.code == 1) {
+      //       this.setData({
+      //         allowance_data: resTwo.data
+      //       })
+      //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+      //       let sInfo = this.data.product[0].sku
+      //       if (spread_price > 0) {
+      //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+      //           this.setData({
+      //             allowance_price: spread_price
+      //           })
+      //         } else {
+      //           this.setData({
+      //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+      //           })
+      //         }
+      //         this.changePrice()
+      //       } else {
+      //         this.setData({
+      //           allowance_price: 0
+      //         })
+      //       }
+      //     }
+      //   })
+      // }
+      //// 获取补贴结束
 
-        } else {
-            console.log(2222);
-            setTimeout(() => {
-                // this.onShow()
-            }, 200)
-        }
+    } else {
+      console.log(2222);
+      setTimeout(() => {
+        // this.onShow()
+      }, 200)
+    }
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
 
-    },
+  },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
 
-    },
+  },
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
 
-    },
+  },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {}
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {}
 })
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.json b/pages/info/sceneProductInfo/index.json
index 58e1fcb..73f696a 100644
--- a/pages/info/sceneProductInfo/index.json
+++ b/pages/info/sceneProductInfo/index.json
@@ -2,8 +2,8 @@
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
 		"notice":"/pages/component/notice/notice",
-    "code":"../../order/components/wxqrCode/index"
-
+    "code":"/pages/order/components/wxqrCode/index",
+    "date":"/pages/order/components/date"
 		
   }
 }
\ No newline at end of file
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 11a7cae..a0aafb6 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -2,12 +2,7 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="景点详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<!-- <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}" bindtap="like"></view> -->
 <image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
-<!-- <view class="audio-box" bindtap="audioGuide">
-  <view>语音导览</view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/play-btn.png" mode="widthFix"></image>
-</view> -->
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
@@ -20,7 +15,6 @@
   <view class="tags-box textOver">
     <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
     </view>
-    <!-- <view class="tags-text">详情 <text class="iconfont icon-you"></text></view> -->
   </view>
   <view class="tags-box address-box" style="height:auto">
     <view class="info-address">开园时间：{{info.open_time}}</view>
@@ -51,10 +45,11 @@
         <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
       </view>
       <view class="product-right">
-        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text><text>起</text></view>
-        <!-- <view bindtap="order" data-sku="{{sku}}" data-product="{{item}}"
+        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>
+        <!-- showOrder    selectDate  -->
+        <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
           data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
-          class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">立即预订</view> -->
+          class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">预订</view>
       </view>
     </view>
   </view>
@@ -70,7 +65,7 @@
     <view style="flex:1"></view>
     <view class="btns">
       <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line'}}">加入购物车</view>
-      <view class="btn {{info.product[0].type=='line' ? 'btn-r':''}}" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view>
+      <!-- <view class="btn {{info.product[0].type=='line' ? 'btn-r':''}}" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view> -->
       <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
     </view>
   </view>
@@ -110,7 +105,25 @@
       </view>
     </view>
   </view> -->
-  <view class="mask" wx:if="{{skuFlag}}">
+  <!-- 日期弹框 -->
+  <!-- <date-popup wx:if="{{showDate}}"></date-popup> -->
+  <view class="mask" wx:if="{{showDate}}">
+    <view class="mask-bg" bindtap="hideDate"></view>
+    <view class="mask-content1">
+      <view class="iconfont icon-close" bindtap="hideDate"></view>
+      <date bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <view class="bottom-box">
+        <view>
+          合计: <text class="totalPrice">{{showPrice/100}}</text>
+        </view>
+        <view class="next" bindtap="order" data-sku="{{sku}}" data-product="{{item}}">
+          下一步
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 规格弹框 -->
+  <view class="mask" wx:if="{{skuFlag == 'cart'}}">
     <view class="mask-bg" bindtap="hideSku"></view>
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
@@ -137,6 +150,8 @@
       <view class="btn-box">
         <view class="mask-btn" bindtap="order"  data-product="{{item}}" wx:if="{{info && info.flag==1}}">{{skuFlag=='cart'?'确认':'立即购买'}}
         </view>
+        <!-- <view class="mask-btn" bindtap="order"  data-product="{{item}}" wx:if="{{info && info.flag==1}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+        </view> -->
         <view class="mask-btn disable" wx:else>该商品已下架</view>
       </view>
     </view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 6afe625..878fa34 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -89,13 +89,13 @@ page {
 
 .box {
   margin: 20rpx;
-  background: white;
+  /* background: white; */
   border-radius: 13rpx;
 }
 
 .box-top {
   line-height: 95rpx;
-  border-bottom: 1rpx solid #d9d9d9;
+  /* border-bottom: 1rpx solid #d9d9d9; */
   font-weight: 500;
   color: #000;
   font-size: 35rpx;
@@ -103,22 +103,27 @@ page {
 }
 
 .product-item {
-  margin: 0 20rpx;
-  padding: 27rpx 0;
-  border-bottom: 1rpx solid #ccc;
+  /* margin: 0 20rpx; */
+  padding: 33rpx 26rpx 30rpx;
+  /* border-bottom: 1rpx solid #ccc; */
+  background-color: rgba(11,137,142, .06);
+  border-radius: 13rpx;
+  margin-bottom: 18rpx;
 }
 
 .skutitle {
-  font-size: 29rpx;
-  color: #333;
+  font-family: PingFang SC;
   font-weight: 500;
+  font-size: 31rpx;
+  color: #000000;
 }
 
 .product-box {
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
-  margin-top: 20rpx;
+  margin-top: 13rpx;
+  /* margin-top: 20rpx; */
 }
 
 .product-left {
@@ -131,13 +136,17 @@ page {
 }
 
 .product-tag {
-  font-size: 20rpx;
+  /* font-size: 20rpx;
   color: #0B898E;
   border-radius: 16rpx;
   line-height: 30rpx;
-  border: 1rpx solid;
-  padding: 0 15rpx;
+  border: 1rpx solid; */
+  /* padding: 0 15rpx; */
   margin-right: 13rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  font-size: 23rpx;
+  color: #666666;
 }
 
 .product-tags .product-tags:last-child {
@@ -145,25 +154,33 @@ page {
 }
 
 .order-tip-text {
-  margin-top: 33rpx;
+  /* margin-top: 33rpx;
   font-size: 24rpx;
-  color: #666;
+  color: #666; */
+  font-weight: 400;
+  font-size: 23rpx;
+  color: #0B898E;
+  margin-top: 18rpx;
 }
 
 .product-right {
   text-align: center;
   flex-shrink: 0;
+  display: flex;
+  align-items: center;
 }
 
 .product-right .price {
+  font-weight: 500;
   color: #D62828;
   font-size: 24rpx;
-  margin-bottom: 20rpx;
+  /* margin-bottom: 20rpx; */
+  margin-right: 19rpx;
 }
 
 .product-right .price text:nth-child(2) {
   font-weight: 500;
-  font-size: 33rpx;
+  font-size: 36rpx;
 }
 
 .product-right .price text:nth-child(3) {
@@ -172,13 +189,22 @@ page {
 }
 
 .product-right .btn {
-  background: #D62828;
+  /* background: #D62828;
   color: #fff;
   border-radius: 30px;
   line-height: 60rpx;
   font-size: 29rpx;
   font-weight: 500;
-  width: 176rpx;
+  width: 176rpx; */
+  width: 93rpx;
+  height: 80rpx;
+  background: #0B898E;
+  border-radius: 13rpx;
+  font-weight: 500;
+  font-size: 31rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 80rpx;
 }
 
 .product-right .btn.disable {
@@ -581,7 +607,7 @@ page {
 
 .btns .btn:nth-child(1) {
   margin-right: 3rpx;
-  border-radius: 39rpx 0 0 39rpx;
+  border-radius: 39rpx;
 }
 
 .btns .btn:nth-child(2) {
@@ -843,4 +869,50 @@ page {
 }
 .btn-r{
   border-radius: 39rpx !important;
+}
+.totalPrice {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 48rpx;
+  color: #D62828;
+}
+.totalPrice::before {
+  content: "￥";
+  font-size: 24rpx;
+}
+.bottom-box {
+  height: 133rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
+  padding: 0 50rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.next {
+  width: 250rpx;
+  height: 80rpx;
+  background: #D62828;
+  border-radius: 40rpx;
+  font-family: PingFang;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 80rpx;
+}
+.mask-content1 {
+  position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    background: white;
+    border-radius: 12rpx;
+    overflow-y: auto;
+}
+.icon-close {
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
 }
\ No newline at end of file
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index 54bbe86..5e9d430 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -56,6 +56,9 @@
 
       <view class="contact-item" wx:for="{{seldManList}}" wx:if="{{seldManList.length>0}}">
         <view class="iconfont icon-jian" bindtap="delLinkman" data-index="{{index}}" data-item="{{item}}"></view>
+        <view style="font-weight: 400;font-size: 27rpx;color: #000000;margin-left: 26rpx;">
+          出行人{{index+1}}
+        </view>
         <view class="contact-info">
           <view class="contact-name">{{item.name}}</view>
           <view class="contact-other" style="margin-bottom:10rpx"><text>手机号</text>{{item.tel}}</view>
@@ -64,7 +67,7 @@
         <view bindtap="gotoEdit" data-item="{{item}}" class="iconfont icon-bianji1"></view>
         <!-- <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator> -->
       </view>
-      <view wx:if="{{is_real_name=='1'}}">
+      <view wx:if="{{is_real_name=='1'}}" style="margin-left: -20rpx;">
       
         <view class="text1" bindtap="addMask" wx:for="{{productNum}}" wx:for-index="index" wx:if="{{index > (seldManList.length -1)}}">
           <view style="display: flex;align-items: center;">
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index 9687713..e57dbe5 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -14,7 +14,7 @@
   padding: 42rpx 20rpx 18rpx;
 }
 .contact-item {
-  padding: 30rpx 0;
+  padding: 30rpx 20rpx;
   /* border-bottom: 1rpx solid #ccc; */
   display: flex;
   align-items: center;
@@ -33,7 +33,7 @@
   text-align: left;
   color: #666666;
   font-size: 25rpx;
-  margin: 0 60rpx;
+  margin: 0 30rpx;
 }
 .contact-item .contact-name {
   font-size: 28rpx;
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 8e25a91..ece97ba 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -40,12 +40,17 @@ Component({
     today:util.formatDate(new Date()),
     tomorrow:util.formatMing(new Date()),
     afterTom:util.formatHou(new Date()),
+    skuName:'',
+    monthList:[]
   },
   lifetimes: {
     attached: function () {
+      console.log(app.globalData.product);
+      let skuName = app.globalData.product.sku.sku_name
       this.setData({
         kjIdCom: app.globalData.kjId,
-        gpIdCom: app.globalData.gp_id || app.globalData.team_id
+        gpIdCom: app.globalData.gp_id || app.globalData.team_id,
+        skuName
       })
       // 在组件实例进入页面节点树时执行
       let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 60 * 24 * 60 * 60 * 1000));
@@ -107,11 +112,32 @@ Component({
             this.setData({
               datelist: res.data
             })
-
+            res.data.forEach(item=> {
+              item.short_date = item.date.split("-").splice(1, 2).join("-")
+              item.week = this.getDay(item.date)
+            })
+            let seldDate = ''
+            if (app.globalData.product.changeFlag) {
+              res.data.forEach(item=> {
+                if (item.date == app.globalData.product.date.date) {
+                  seldDate = item
+                }
+              })
+             setTimeout(() => {
+              this.changeDate(seldDate)
+             })
+              // this.setData({
+              //   activeDate:seldDate
+              // })
+              // this.getTimeStock()
+            }
             this.setData({
-              threeDays: res.data.slice(0, 3)
+              threeDays: res.data.slice(0, 3),
+              monthList: res.data.slice(0, 30), 
             })
+            console.log(this.data.monthList);
             let index = this.data.threeDays.findIndex(item => item.date == this.data.activeDate.date)
+            console.log(this.data.activeDate);
             this.setData({
               moreFlag: index != -1
             })
@@ -136,6 +162,11 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    getDay: function (date) {
+      let d = new Date(date.replace(/-/g, '/')).getDay();
+      let days = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
+      return days[d];
+    },
     showMoreDate: function () {
       this.setData({
         showMoreDateFlag: true
@@ -147,7 +178,7 @@ Component({
       })
     },
     changeDate: function (e) {
-      let date = e.currentTarget.dataset.date;
+      let date = e.currentTarget ? e.currentTarget.dataset.date : e
       if (date.stock <= 0) return;
       if (date.stock == null) return;
       if (date.price == null) return;
@@ -179,7 +210,10 @@ Component({
       this.getTimeStock()
     },
     getTimeStock: function () {
-      if (this.data.activeDate.is_time_stock != true) return;
+      if (this.data.activeDate.is_time_stock != true) {
+        this.triggerEvent("onChangeTime", '')
+        return
+      };
       commonApi.user_post("product/product_timestock_price", {
         date: this.data.activeDate.date,
         sku_id: this.data.activeDate.sku_id ? this.data.activeDate.sku_id : app.globalData.product.sku.id
@@ -195,9 +229,18 @@ Component({
           return;
         }
         for (let i = 0; i < res.data.length; i++) {
+          
           if (res.data[i].stock_number > 0) {
-            timeIndex = i;
-            break;
+            if (app.globalData.product.changeFlag) { 
+                 if (res.data[i].start_time == app.globalData.product.time.start_time) {
+                  timeIndex = i;
+                  break;
+                 } 
+             } else {
+              timeIndex = i;
+              break;
+             }
+            
           }
         }
         this.setData({
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 90bbd65..9e884f6 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -1,13 +1,12 @@
 <!--pages/order/components/date/index.wxml-->
 <wxs src="../../../../utils/filter.wxs" module="tool" />
-<view class="date-box">
+<!-- <view class="date-box">
   <view class="box-title">使用日期</view>
   <view class="dates-boxes">
     <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{threeDays}}">
       <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view>
       <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
       <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
-      <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
       <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
     </view>
     <view wx:if="{{moreFlag || !activeDate}}" class="date-item more-item" bindtap="showMoreDate">
@@ -21,6 +20,48 @@
   <view class="date-times" wx:if="{{timelist.length>0}}">
     <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}"> 不可定</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
   </view>
+</view> -->
+<view class="date-box">
+  <view class="box-title">{{skuName}}</view>
+  <view style="border-top: 1rpx solid #ccc;padding: 48rpx 0 0 21rpx;">
+    <view style="font-weight: 500;font-size: 31rpx;color: #000000;">
+      使用日期
+    </view>
+    <view class="dates-boxes">
+      <view style="width: 580rpx;display: flex;overflow-x: scroll;">
+        <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
+        <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
+        <view>{{item.week}}</view>
+        <view class="short-date">{{item.short_date}}</view>
+        <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
+        <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
+        <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
+        <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
+      </view>
+      </view>
+      <view wx:if="{{moreFlag || !activeDate}}" class="more-item" bindtap="showMoreDate">
+      <!-- <view wx:if="{{moreFlag || !activeDate}}" class="date-item more-item" bindtap="showMoreDate"> -->
+        <view style="width:58rpx;margin-right:12rpx;">
+          更多日期
+        </view>
+        <view>
+        >
+        </view>
+      </view>
+      <view wx:else class="date-item more-item active" bindtap="showMoreDate">
+        <view>{{activeDate.short_date}}</view>
+        <view class="price">{{activeDate.price==0 || kjIdCom?'免费':('￥'+activeDate.price/100)}}</view>
+      </view>
+    </view>
+  </view>
+  <view wx:if="{{timelist.length>0}}">
+    <view style="margin-top: 10rpx;padding-left: 18rpx;">
+      选择时段
+    </view>
+    <view class="date-times" wx:if="{{timelist.length>0}}">
+      <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}"> 不可定</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
+    </view>
+  </view>
   <!-- <view class="date-times" wx:elif="{{activeDate.is_time_stock}}">
     <view>已售罄</view>
   </view> -->
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index 3ce5048..0446023 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -16,14 +16,15 @@
 .dates-boxes {
   display: flex;
   align-items: center;
-  padding: 31rpx 21rpx;
-  border-top: 1rpx solid #ccc;
+  padding: 31rpx 0;
+  /* padding: 31rpx 21rpx; */
+  /* border-top: 1rpx solid #ccc; */
 }
 .date-item {
-  width: 162rpx;
-  height: 97rpx;
+  width: 120rpx;
+  height: 133rpx;
   border-radius: 10rpx;
-  border: 1rpx solid #333;
+  /* border: 1rpx solid #333; */
   text-align: center;
   font-size: 27rpx;
   color: #000;
@@ -32,6 +33,8 @@
   justify-content: center;
   align-items: center;
   flex-direction: column;
+  background: #F5F5F5;
+  flex-shrink: 0;
 }
 .date-item.active {
   border-color: #0B898E;
@@ -40,7 +43,7 @@
 }
 .date-item.disable {
   border-color: #CCCCCC;
-  color: #666;
+  color: #999;
 }
 .date-item .price {
   font-size: 25rpx;
@@ -49,12 +52,27 @@
 .date-item.active .price {
   color: #fff;
 }
+.date-item.active view {
+  color: #fff;
+}
 .date-item.disable .price {
-  color: #666;
+  color: #999;
+}
+.date-item.disable .short-date {
+  color: #999;
 }
 .more-item {
-  width: 99rpx;
-  margin-right: 0;
+  /* width: 125rpx; */
+  /* margin-right: 0; */
+  position: absolute;
+    right: 0;
+    text-align: center;
+    padding: 0 26rpx 0 24rpx;
+    display: flex;
+    font-weight: 400;
+    font-size: 27rpx;
+    color: #0B898E;
+    align-items: center;
 }
 .date-times {
   display: flex;
@@ -63,23 +81,28 @@
   margin: 0 21rpx;
   padding-top: 34rpx;
   padding-bottom: 10rpx;
-  border-top: 1rpx dashed #ccc;
+  /* border-top: 1rpx dashed #ccc; */
   flex-wrap: wrap;
 }
 .date-time {
   width: 315rpx;
   line-height: 58rpx;
-  border: 1px solid #333;
+  /* border: 1px solid #333; */
   border-radius: 10rpx;
   text-align: center;
   font-size: 25rpx;
   flex-shrink: 0;
   margin-bottom: 24rpx;
   color: #000;
+  background-color: #F5F5F5;
 }
 .date-time.disable {
-  border-color: #ccc;
-  color: #666666;
+  /* border-color: #ccc;
+  color: #666666; */
+  background: #F5F5F5;
+    font-weight: 400;
+    font-size: 25rpx;
+    color: #999999;
 }
 .date-time.active {
   border-color: #0B898E;
@@ -93,4 +116,9 @@
   right: 0;
   bottom: 0;
   padding-bottom: 50rpx;
+}
+.short-date {
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #000000;
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index bc4e05c..5a4e20e 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -36,14 +36,19 @@ Page({
     is_authentication:1, // 是否实名，0否1是，默认实名
     phone:'', //不实名时传的手机号
     is_real_name:1, // 是否是一证一票，0否1是，
-    status:false
+    status:false,
+    date: "",
+    time: "",
+    ydxz:false, //预定须知弹框
+    bookingInfo: null,
+    bookingInfoTitle: "",
+    showDate:false,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-      
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -57,7 +62,11 @@ Page({
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
       is_authentication:app.globalData.product.sku.sku_model.is_authentication,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
+      date: app.globalData.product.date,
+      time: app.globalData.product.time
     })
+    console.log('-------',this.data.date,this.data.time);
+    // debugger
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
     console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name);
@@ -92,6 +101,34 @@ Page({
   //     showMask:true
   //   })
   // },
+  // changeDate() {
+  //   this.setData({
+  //     showDate: true,
+  //   })
+  // },
+  hideDate: function () {
+    this.setData({
+      showDate: false
+    })
+  },
+  showBookingInfo: function (e) {
+    this.setData({
+      bookingInfo: this.data.product.sku.sku_model,
+      bookingInfoTitle: this.data.product.sku.sku_name
+    })
+    util.pagePoint({
+      event: "scene_notice",
+      param: {
+        type: this.data.product.type,
+        id: this.data.product.id
+      }
+    }, 1)
+  },
+  closeMask: function () {
+    this.setData({
+      bookingInfo: null
+    })
+  },
   showAllPrice:function () {
     // console.log('detail',app.globalData.product);
     // console.log('singlePrice',this.data.singlePrice);
@@ -255,9 +292,11 @@ Page({
       }
       app.globalData.couponInfo = null;
     }
+    app.globalData.product.changeFlag = true
     this.setData({
       date: e.detail,
-      singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price
+      singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
+      showDate:true
     })
     // this.changePrice()
   },
@@ -290,6 +329,12 @@ Page({
     })
 	
   },
+  changed() {
+    app.globalData.product.date = this.data.date
+    app.globalData.product.time = this.data.time
+    app.globalData.product.changeFlag = true
+    this.hideDate()
+  },
   order:function() {
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
diff --git a/pages/order/scene/index.json b/pages/order/scene/index.json
index 7514262..17ea59b 100644
--- a/pages/order/scene/index.json
+++ b/pages/order/scene/index.json
@@ -1,8 +1,10 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "date":"../components/date/index",
+    "date1":"../components/date/index",
     "contact":"../components/contact/index",
-    "coupon":"../components/coupon/index"
+    "coupon":"../components/coupon/index",
+    "notice":"/pages/component/notice/notice",
+    "date":"/pages/order/components/date"
   }
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 047e151..9197311 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -1,12 +1,31 @@
 <!--pages/order/scene/index.wxml-->
 <view  class="{{product && product.isGroup==1?'group-order':''}}">
   <title title="订单填写"></title>
-  <view class="product-info" wx:if="{{product}}">
+  <!-- <view class="product-info" wx:if="{{product}}">
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
+  </view> -->
+  <!-- <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+    product="{{product}}"></date> -->
+    <!-- 出行日期 信息展示部分 -->
+  <view class="box" style="padding: 42rpx 21rpx 45rpx 19rpx;display: flex;justify-content: space-between;align-items: center;">
+    <view>
+      <view style="font-weight: 500;font-size: 36rpx;color: #000000;margin-bottom: 39rpx;">
+        {{product.product.title}}
+      </view>
+      <view style="font-weight: 400;font-size: 25rpx;color: #666666;padding-left: 2rpx;">
+        <view style="margin-bottom: 20rpx;">
+          {{date.date}}  {{date.week}}
+        </view>
+        <view wx:if="{{time.start_time && time.end_time}}">
+          {{time.start_time}}-{{time.end_time}} 入园
+        </view>
+      </view>
+    </view>
+    <view class="change-date" bindtap="changeDate">
+      修改 >
+    </view>
   </view>
-  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
-    product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">
       <view style="flex-shrink:0">团体主体名称：</view>
@@ -15,11 +34,27 @@
   </view>
   <view class="box">
     <view class="box-title">
-      <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
-      <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view>
+      <view style="flex:1">{{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}</view>
+      <!-- <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view> -->
+      <!-- <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view> -->
+      <view class="s-price">
+        {{product.sku.price/100}}
+      </view>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
       <view class="number-box">{{productNum}}</view>
-      <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view>
+      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
+    </view>
+    <view class="text1">
+      <text wx:for="{{product.sku.display_tags}}">
+        {{item}}<text style="margin:0 8rpx;" wx:if="{{index+1<=product.sku.display_tags.length}}">|</text> 
+      </text>
+      <text bindtap="showBookingInfo">预订须知 ></text>
     </view>
+    <!-- <view class="text2">
+      <text wx:for="{{product.sku.display_tags}}" style="margin-right: 15rpx;">{{item}}</text>
+    </view> -->
   </view>
   <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
   <!-- 补贴 -->
@@ -93,4 +128,23 @@
       </view>
   </view>
 </view>
+<notice bookingInfo="{{bookingInfo}}" skuName="{{bookingInfoTitle}}" wx:if="{{bookingInfo}}" bind:close="closeMask">
+</notice>
+ <!-- 日期弹框 -->
+ <view class="mask" wx:if="{{showDate}}">
+    <view class="mask-bg" bindtap="hideDate"></view>
+    <view class="mask-content2">
+      <view class="iconfont icon-close" bindtap="hideDate"></view>
+      <date bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <view class="bottom-box">
+        <view>
+          合计: <text class="totalPrice">{{price}}</text>
+        </view>
+        <view class="next" bindtap="changed" data-sku="{{sku}}" data-product="{{item}}">
+        <!-- <view class="next" bindtap="order" data-sku="{{sku}}" data-product="{{item}}"> -->
+          确定
+        </view>
+      </view>
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index 945fd9b..0cbec31 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -64,14 +64,14 @@ page {
   display: flex;
   align-items: center;
   padding: 31rpx 21rpx;
-  border-top: 1rpx solid #ccc;
+  /* border-top: 1rpx solid #ccc; */
 }
 
 .date-item {
-  width: 162rpx;
-  height: 97rpx;
+  width: 120rpx;
+  height: 133rpx;
   border-radius: 10rpx;
-  border: 1rpx solid #333;
+  /* border: 1rpx solid #333; */
   text-align: center;
   font-size: 27rpx;
   color: #000;
@@ -80,6 +80,8 @@ page {
   justify-content: center;
   align-items: center;
   flex-direction: column;
+  background: #F5F5F5;
+  flex-shrink: 0;
 }
 
 .date-item.active {
@@ -90,7 +92,7 @@ page {
 
 .date-item.disable {
   border-color: #CCCCCC;
-  color: #666;
+  color: #999;
 }
 
 .date-item .price {
@@ -101,14 +103,29 @@ page {
 .date-item.active .price {
   color: #fff;
 }
+.date-item.active view {
+  color: #fff;
+}
 
 .date-item.disable .price {
-  color: #666;
+  color: #999;
+}
+.date-item.disable .short-date {
+  color: #999;
 }
 
 .more-item {
-  width: 99rpx;
-  margin-right: 0;
+  /* width: 99rpx;
+  margin-right: 0; */
+  position: absolute;
+    right: 0;
+    text-align: center;
+    padding: 0 26rpx 0 24rpx;
+    display: flex;
+    font-weight: 400;
+    font-size: 27rpx;
+    color: #0B898E;
+    align-items: center;
 }
 
 .date-times {
@@ -118,25 +135,35 @@ page {
   margin: 0 21rpx;
   padding-top: 34rpx;
   padding-bottom: 10rpx;
-  border-top: 1rpx dashed #ccc;
+  /* border-top: 1rpx dashed #ccc; */
   flex-wrap: wrap;
 }
 
 .date-time {
   width: 315rpx;
   line-height: 58rpx;
-  border: 1px solid #333;
+  /* border: 1px solid #333; */
   border-radius: 10rpx;
   text-align: center;
   font-size: 25rpx;
   flex-shrink: 0;
   margin-bottom: 24rpx;
   color: #000;
+  background-color: #F5F5F5;
 }
 
 .date-time.disable {
-  border-color: #ccc;
-  color: #666666;
+  /* border-color: #ccc;
+  color: #666666; */
+  background: #F5F5F5;
+    font-weight: 400;
+    font-size: 25rpx;
+    color: #999999;
+}
+.short-date {
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #000000;
 }
 
 .date-time.active {
@@ -155,9 +182,9 @@ page {
   font-weight: 500;
   color: #000;
   flex-shrink: 0;
-  width: 67rpx;
+  /* width: 67rpx; */
   line-height: 49rpx;
-  background: #F0F0F0;
+  /* background: #F0F0F0; */
   border-radius: 7rpx;
   text-align: center;
   margin: 0 20rpx;
@@ -340,4 +367,82 @@ page {
   /* margin-bottom: 45%; */
   overflow-y: auto;
   margin: auto;
+}
+.change-date {
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #0B898E;
+}
+.text1 {
+    margin-left: 21rpx;
+    font-weight: 400;
+    font-size: 23rpx;
+    color: #0B898E;
+    margin-bottom: 21rpx;
+    display: flex;
+    align-items: flex-end;
+    padding-bottom: 40rpx;
+}
+.text2 {
+    margin-left: 22rpx;
+    font-weight: 400;
+    font-size: 23rpx;
+    color: #666666;
+    padding-bottom: 41rpx;
+}
+.mask-content2 {
+  position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    background: white;
+    border-radius: 12rpx;
+    overflow-y: auto;
+}
+.bottom-box {
+  height: 133rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
+  padding: 0 50rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.totalPrice {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 48rpx;
+  color: #D62828;
+}
+.totalPrice::before {
+  content: "￥";
+  font-size: 24rpx;
+}
+.next {
+  width: 250rpx;
+  height: 80rpx;
+  background: #D62828;
+  border-radius: 40rpx;
+  font-family: PingFang;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 80rpx;
+}
+.icon-close {
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
+}
+.s-price {
+  font-weight: 500;
+  font-size: 36rpx;
+  color: #D62828;
+  margin-right: 17rpx;
+}
+.s-price::before {
+  content: "￥";
+  font-size: 24rpx;
 }
\ No newline at end of file

From d62f51cade75e7b3783e74ff10fd4f094b386fa8 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 29 Jul 2024 10:01:33 +0800
Subject: [PATCH 178/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js        | 52 +++++++++++++++++++++++++------------
 pages/index/index.wxml      |  2 +-
 project.private.config.json |  3 ++-
 3 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 9c09033..fb73f07 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,6 +4,7 @@ let app = getApp()
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
+import https from "../../utils/https.js"
 Page({
 	data: {
 		banner: [],
@@ -64,6 +65,17 @@ Page({
 		videoPlay: false,
 	},
 	onLoad: function(options) {
+		console.log('options',options)
+		// 相城小程序跳转获取用户信息
+		if(options && options.szxcCode) {
+			commonApi._post("uservice/user/loginByXC", {
+				code: options.szxcCode
+			}).then(res => {
+				if(res.data && res.data.id && res.data.token) {
+				  https.set_logininfo(res);
+				}
+			})
+		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -75,11 +87,9 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
-					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
-					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -169,11 +179,9 @@ Page({
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
-				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
-				console.log(that.data.viewHeight)
 			}
 		})
 	},
@@ -183,7 +191,6 @@ Page({
 			tag_id: 275,
 			typeId: 3,
 		}).then(res => {
-			console.log('data', res.data);
 			this.setData({
 				xpth: res.data,
 				djsTime: res.data.time
@@ -361,7 +368,6 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -459,7 +465,6 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-		console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -543,7 +548,6 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
-		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
 		app.globalData.weburl = url;
 		wx.navigateTo({
@@ -551,7 +555,6 @@ Page({
 		})
 	},
 	gotoUrl: function(e) {
-		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -564,6 +567,30 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
 	},
+	// 实时路况跳转外链
+	gotoUrls() {
+		// 判断是否登录
+		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+		if(!token || !userId) {
+			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+			
+			app.globalData.weburl = url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+			})
+		}else {
+			commonApi.user_post("uservice/user/userEncry").then(res => {
+				if(res.code == 1) {
+					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+					
+					app.globalData.weburl = url;
+					wx.navigateTo({
+						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+					})
+				}
+			})
+		}
+	},
 	gotoMini: function(e) {
 		let appid = e.currentTarget.dataset.appid,
 			path = e.currentTarget.dataset.path
@@ -580,7 +607,6 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -679,7 +705,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -688,7 +713,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -705,7 +729,6 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
-						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -748,7 +771,6 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
-		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -852,7 +874,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index"
@@ -860,7 +881,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4ae93c2..bdad19e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -174,7 +174,7 @@
   <view style="display: flex;">
     <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"></view>
     <!-- <view bindtap="gotoUrl" data-event="xlqc" data-url="https://wlsjzx.wglj.suzhou.com.cn:8096/kt_h5/index.html#/home" class="sslk"></view> -->
-    <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
+    <view bindtap="gotoUrls" data-event="xlqc" class="sslk"></view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
   <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
diff --git a/project.private.config.json b/project.private.config.json
index acdc8dd..3ee68f4 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,6 +1,7 @@
 {
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": true,
+    "urlCheck": false
   },
   "condition": {
     "miniprogram": {

From 82c95a954c2eee04b44cb6e4caefdab6fcc1ceff Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 29 Jul 2024 19:56:16 +0800
Subject: [PATCH 179/471] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E9=81=BF=E9=AB=98=E5=B3=B0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 9f28cb3..fff3df6 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1185,7 +1185,7 @@ page {
   flex-shrink: 0;
 }
 .sslk {
-  background: url("https://static.ticket.sz-trip.com/uploads/20240606/eec4af8edf598dc7c440cff8a5fdbe98.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
   background-size: 100% 100%;
   width: 365.33rpx;
   height: 166rpx;

From 6c3ff4fbcefd2f5cf92205929e3bae7dc13c8453 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 30 Jul 2024 14:40:31 +0800
Subject: [PATCH 180/471] =?UTF-8?q?=E6=99=AF=E5=8C=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=94=B9=E7=89=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 | 2 +-
 pages/info/sceneProductInfo/index.js   | 8 ++++++--
 pages/info/sceneProductInfo/index.wxml | 2 +-
 pages/info/sceneProductInfo/index.wxss | 5 +++++
 pages/order/scene/index.js             | 6 +++++-
 pages/order/scene/index.wxml           | 2 +-
 pages/order/scene/index.wxss           | 5 +++++
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 5322ea9..b1dbe3f 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.isTest133? true : false;
+      data.isTest = data.isTest134? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index e9d5b05..0fcef85 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -39,7 +39,8 @@ Page({
     date: "",
     time: "",
     showDate:false,
-    showPrice:0
+    showPrice:0,
+    showDate2:false
   },
 
   /**
@@ -759,6 +760,9 @@ Page({
   },
   // 选择日期
   selectDate(e) {
+    this.setData({
+      showDate: true,
+    })
     console.log(e.currentTarget.dataset);
     let sku = {
         sku: e.currentTarget.dataset.sku
@@ -775,7 +779,7 @@ Page({
     console.log(app.globalData.product);
     this.setData({
       product: product,
-      showDate: true,
+      showDate2: true,
       skuFlag: 'order',
       showPrice:e.currentTarget.dataset.sku.price
     })
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index a0aafb6..f7635af 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -111,7 +111,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{showPrice/100}}</text>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 878fa34..742b30c 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -888,6 +888,10 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
 }
 .next {
   width: 250rpx;
@@ -910,6 +914,7 @@ page {
     background: white;
     border-radius: 12rpx;
     overflow-y: auto;
+    height: 1100rpx;
 }
 .icon-close {
   position: absolute;
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 5a4e20e..d5f0efc 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -43,6 +43,7 @@ Page({
     bookingInfo: null,
     bookingInfoTitle: "",
     showDate:false,
+    showDate2:false,
   },
 
   /**
@@ -275,6 +276,9 @@ Page({
   },
   changeDate: function (e) {
     console.log('打印',e);
+    this.setData({
+      showDate:true
+    })
     // debugger
     // this.showAllPrice()
     this.totalPrice(e.detail.price)
@@ -296,7 +300,7 @@ Page({
     this.setData({
       date: e.detail,
       singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
-      showDate:true
+      showDate2:true
     })
     // this.changePrice()
   },
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 9197311..5c01db0 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -135,7 +135,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content2">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{price}}</text>
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index 0cbec31..649d9ab 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -399,6 +399,7 @@ page {
     background: white;
     border-radius: 12rpx;
     overflow-y: auto;
+    height: 1100rpx;
 }
 .bottom-box {
   height: 133rpx;
@@ -408,6 +409,10 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
 }
 .totalPrice {
   font-family: PingFang SC;

From c0316a8def87e2b7534cc83fb2b5f616a1088602 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 30 Jul 2024 15:16:32 +0800
Subject: [PATCH 181/471] =?UTF-8?q?=E6=88=91=E7=9A=84-=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/user.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/user/user.js b/pages/user/user.js
index 7fcff9d..06182c7 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -30,9 +30,10 @@ Page({
     })
   },
   supplier:function(){
+    let url = "https://m.cloud.sz-trip.com/Audit"
     app.globalData.weburl = "https://m.cloud.sz-trip.com/Audit"
     wx.navigateTo({
-      url: '/pages/pbService/web/index',
+      url: '/pages/pbService/web/index?weburl='+ encodeURIComponent(url)
     })
   },
   retail: function () {

From 0b964265adcd39909f2a9feafaa4163f18c81c18 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 31 Jul 2024 15:32:59 +0800
Subject: [PATCH 182/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=88=86=E4=BA=ABbug=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/info/sceneProductInfo/index.js   | 1 +
 pages/info/sceneProductInfo/index.wxml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index b1dbe3f..d460ad7 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.isTest134? true : false;
+      data.isTest = data.isTest135? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 0fcef85..bb97dae 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -158,6 +158,7 @@ Page({
       this.setData({
         info: res.data
       })
+      this.drawImg()
       var arr = []
       res.data.product.forEach((item, index) => {
         item.sku.forEach(itemB => {
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index f7635af..b4c5987 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -236,7 +236,7 @@
 </view>
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
-  <view class="mask-content share-img-box">
+  <view class="mask-content share-img-box" style="bottom: 200rpx;">
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">

From 7b1c746425cd2fcfc54f8285a46e11ffd681d78a Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 31 Jul 2024 16:07:22 +0800
Subject: [PATCH 183/471] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/date/index.wxml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 9e884f6..b226792 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -39,7 +39,7 @@
         <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
       </view>
       </view>
-      <view wx:if="{{moreFlag || !activeDate}}" class="more-item" bindtap="showMoreDate">
+      <view  class="more-item" bindtap="showMoreDate">
       <!-- <view wx:if="{{moreFlag || !activeDate}}" class="date-item more-item" bindtap="showMoreDate"> -->
         <view style="width:58rpx;margin-right:12rpx;">
           更多日期
@@ -48,10 +48,10 @@
         >
         </view>
       </view>
-      <view wx:else class="date-item more-item active" bindtap="showMoreDate">
+      <!-- <view wx:else class="date-item more-item active" bindtap="showMoreDate">
         <view>{{activeDate.short_date}}</view>
         <view class="price">{{activeDate.price==0 || kjIdCom?'免费':('￥'+activeDate.price/100)}}</view>
-      </view>
+      </view> -->
     </view>
   </view>
   <view wx:if="{{timelist.length>0}}">

From 70129560e031cfa1516435f374c648080a17e265 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 31 Jul 2024 16:21:47 +0800
Subject: [PATCH 184/471] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/date/index.js | 3 ++-
 pages/order/scene/index.wxml         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index ece97ba..554795a 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -133,7 +133,8 @@ Component({
             }
             this.setData({
               threeDays: res.data.slice(0, 3),
-              monthList: res.data.slice(0, 30), 
+              monthList: res.data, 
+              // monthList: res.data.slice(0, 30), 
             })
             console.log(this.data.monthList);
             let index = this.data.threeDays.findIndex(item => item.date == this.data.activeDate.date)
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 5c01db0..2cef298 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -9,8 +9,8 @@
     product="{{product}}"></date> -->
     <!-- 出行日期 信息展示部分 -->
   <view class="box" style="padding: 42rpx 21rpx 45rpx 19rpx;display: flex;justify-content: space-between;align-items: center;">
-    <view>
-      <view style="font-weight: 500;font-size: 36rpx;color: #000000;margin-bottom: 39rpx;">
+    <view style="width: 550rpx;">
+      <view style="font-weight: 500;font-size: 36rpx;color: #000000;margin-bottom: 39rpx;" class="textOver2">
         {{product.product.title}}
       </view>
       <view style="font-weight: 400;font-size: 25rpx;color: #666666;padding-left: 2rpx;">

From d59bfd0e892e09f22e758e665fe08c7c41a8158a Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 1 Aug 2024 15:50:53 +0800
Subject: [PATCH 185/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=A1=E6=81=AF=E5=BB=B6=E8=BF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index bb97dae..047dcba 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -761,9 +761,6 @@ Page({
   },
   // 选择日期
   selectDate(e) {
-    this.setData({
-      showDate: true,
-    })
     console.log(e.currentTarget.dataset);
     let sku = {
         sku: e.currentTarget.dataset.sku
@@ -778,6 +775,9 @@ Page({
       ...product
     }
     console.log(app.globalData.product);
+    this.setData({
+      showDate: true,
+    })
     this.setData({
       product: product,
       showDate2: true,

From 545252f17f90d56516810da9fa81efe5b6895aeb Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 1 Aug 2024 15:52:14 +0800
Subject: [PATCH 186/471] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index d460ad7..3bc4f3a 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.isTest135? true : false;
+      data.isTest = data.isTest136? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From c5928de8152b2b041751a878f534537e2fac10ad Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 1 Aug 2024 17:38:51 +0800
Subject: [PATCH 187/471] =?UTF-8?q?=E5=8D=8E=E8=B0=8A=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                               | 2 +-
 pages/info/sceneProductInfo/index.js | 4 +++-
 pages/order/scene/index.js           | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 3bc4f3a..ae5b71b 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.isTest136? true : false;
+      data.isTest = data.isTest137? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 047dcba..058a4f4 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -225,8 +225,10 @@ Page({
   },
   // 获取日期
   changeDate: function (e) {
+    console.log(e);
     this.setData({
-      date: e.detail
+      date: e.detail,
+      showPrice:e.detail.price
     })
     console.log(this.data.date);
   },
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index d5f0efc..86b2b38 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -87,7 +87,8 @@ Page({
   }
     this.setData({
       product: app.globalData.product,
-      singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
+      singlePrice: app.globalData.product?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
+      // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
     console.log(this.data.singlePrice);
     this.showAllPrice()

From 5e61199961048e54a6efe8b950b6032a388dc88f Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 5 Aug 2024 16:20:37 +0800
Subject: [PATCH 188/471] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B8=B8=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=97=A5=E6=9C=9F=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      | 2 +-
 pages/order/road/index.wxss | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index ae5b71b..d692356 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.isTest137? true : false;
+      data.isTest = data.isTest138? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/road/index.wxss b/pages/order/road/index.wxss
index 6a6b500..20475f7 100644
--- a/pages/order/road/index.wxss
+++ b/pages/order/road/index.wxss
@@ -43,7 +43,8 @@ page {
   margin-bottom: 50rpx;
 }
 .day-header-item,.day-item {
-  width: calc(702rpx / 7);
+  width: calc(692rpx / 7);
+  /* width: calc(702rpx / 7); */
   text-align: center;
   flex-shrink: 0;
 }

From 1e9381784c6db41200baf2f7a7acaba13f1c3313 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 6 Aug 2024 19:01:15 +0800
Subject: [PATCH 189/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                   |  2 +-
 pages/info/postProductInfo/index.js      |  1 +
 pages/info/sceneProductInfo/index.js     |  1 +
 pages/order/components/coupon/index.wxml |  9 ++++-
 pages/order/coupon/index.wxml            |  5 ++-
 pages/order/coupon/index.wxss            | 12 +++++++
 pages/order/postOrder/index.js           | 16 +++++++--
 pages/order/postOrder/index.wxml         | 20 +++++++++--
 pages/order/scene/index.js               | 44 ++++++++++++++++++++----
 pages/order/scene/index.wxml             |  2 +-
 pages/user/cartlist/list.js              |  1 +
 pages/user/coupon/index.wxml             |  9 ++++-
 12 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index d692356..79152fd 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.isTest138? true : false;
+      data.isTest = data.isTest139? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 2ce7d62..da9458e 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -336,6 +336,7 @@ Page({
                     }];
                     app.globalData.postProduct = product;
                     app.globalData.retailId = this.data.retailId;
+                    app.globalData.listName = null
                     wx.navigateTo({
                         url: '/pages/order/postOrder/index',
                     })
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 058a4f4..ad008c9 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -358,6 +358,7 @@ Page({
       } else {
         app.globalData.postProduct = []
         app.globalData.list = []
+        app.globalData.listName = null
         if (this.data.skuFlag == 'order') {
           if (e.currentTarget.dataset.disable === 1) return;
           util.pagePoint({
diff --git a/pages/order/components/coupon/index.wxml b/pages/order/components/coupon/index.wxml
index 1ae1794..0db1d8a 100644
--- a/pages/order/components/coupon/index.wxml
+++ b/pages/order/components/coupon/index.wxml
@@ -2,7 +2,14 @@
 <navigator url="/pages/order/coupon/index?money={{money}}&sku={{sku}}" class="box">
   <view class="box-title">
     <view style="flex:1">优惠券</view>
-    <view wx:if="{{coupon}}">-{{coupon.activity.money/100}}</view>
+    <view wx:if="{{coupon}}">
+      <view wx:if="{{coupon.activity.discount_type == 'pricebreak'}}">
+        -{{coupon.activity.money/100}}        
+      </view>
+      <view wx:else>
+        {{coupon.activity.fold}}折
+      </view>
+    </view>
     <view class="coupon-btn" wx:else>请选择</view>
   </view>
 </navigator>
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 1713323..3a169d0 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -2,7 +2,10 @@
 <title title="优惠券"></title>
 <view wx:if="{{list.length>0}}">
   <view class="coupon-item" wx:for="{{list}}">
-    <view class="money">{{item.activity.money/100}}</view>
+    <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
+    <view class="money1" wx:else>
+      {{item.activity.fold}}
+    </view>
     <view class="coupon-info">
       <view>{{item.activity.name}}</view>
       <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
diff --git a/pages/order/coupon/index.wxss b/pages/order/coupon/index.wxss
index 9277006..a8cfad0 100644
--- a/pages/order/coupon/index.wxss
+++ b/pages/order/coupon/index.wxss
@@ -20,10 +20,22 @@ page {
   font-weight: 500;
   flex-shrink: 0;
 }
+.coupon-item .money1 {
+  color: #D62828;
+  font-size: 47rpx;
+  width: 187rpx;
+  text-align: center;
+  font-weight: 500;
+  flex-shrink: 0;
+}
 .coupon-item .money::before {
   content: '￥';
   font-size: 30rpx;
 }
+.coupon-item .money1::after {
+  content: '折';
+  font-size: 30rpx;
+}
 .coupon-info {
   flex: 1;
   margin-right: 20rpx;
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index f48f637..0dfa8ad 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -22,7 +22,8 @@ Page({
     allowance_price: 0,
     showAllowance: false,
     flag:null,
-    isCar:'single'
+    isCar:'single',
+    showYhq:null
   },
 
   /**
@@ -35,7 +36,8 @@ Page({
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
-      isCar:options.isCar
+      isCar:options.isCar,
+      showYhq:app.globalData.listName?false:true
     })
     let price = 0, sku_id = [];
     app.globalData.postProduct.map(item => {
@@ -57,6 +59,16 @@ Page({
     }
 	console.log(this.data.showPrice)
   },
+  price() {
+    let allPrice
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        return allPrice = this.data.showPrice + this.data.postFee - this.data.coupon.activity.money>0?this.data.showPrice + this.data.postFee - this.data.coupon.activity.money/100:0
+     } else {
+      return allPrice = (this.data.showPrice* this.data.coupon.activity.fold)/ 10 + this.data.postFee
+     }
+    }
+  },
   changeAllowance: function () {
     this.setData({
       showAllowance: !this.data.showAllowance
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 7716a2e..f46ff39 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -47,11 +47,25 @@
     </view>
   </view>
 </view>
-<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix' && showYhq}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 <view style="height:113rpx"></view>
 <view class="fixed-bottom" wx:if="{{product}}">
-  <view class="fixed-price-box" wx:if="{{!prizeId}}"><text>合计：</text><text
-      class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+  <view class="fixed-price-box" wx:if="{{!prizeId}}">
+    <view wx:if="{{coupon && showYhq}}">
+      <view wx:if="{{coupon && coupon.activity.discount_type == 'pricebreak'}}">
+        <text>合计：</text><text
+        class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+      </view>
+      <view wx:else>
+        <text>合计：</text><text
+        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+      </view>
+    </view>
+    <view wx:else>
+      <text>合计：</text><text
+        class="price">¥{{showPrice + postFee>0?(showPrice + postFee)/100:0}}</text>
+    </view>
+    
   </view>
   <view class="fixed-price-box" wx:else><text>合计：</text><text class="price">¥{{postFee?(0+postFee)/100:0}}</text></view>
   <view class="fixed-btn" bindtap="order">下一步</view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 86b2b38..f5a0ada 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -44,6 +44,7 @@ Page({
     bookingInfoTitle: "",
     showDate:false,
     showDate2:false,
+    showYhq:null
   },
 
   /**
@@ -64,9 +65,10 @@ Page({
       is_authentication:app.globalData.product.sku.sku_model.is_authentication,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
       date: app.globalData.product.date,
-      time: app.globalData.product.time
+      time: app.globalData.product.time,
+      showYhq:app.globalData.listName?false:true
     })
-    console.log('-------',this.data.date,this.data.time);
+    console.log('-------',this.data.showYhq,this.data.time);
     // debugger
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
@@ -87,7 +89,7 @@ Page({
   }
     this.setData({
       product: app.globalData.product,
-      singlePrice: app.globalData.product?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
+      singlePrice: app.globalData.product.date?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
       // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
     console.log(this.data.singlePrice);
@@ -140,7 +142,17 @@ Page({
       // this.setData({
       //   singlePrice:app.globalData.product.product.price
       // })
-      let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      let price
+      if (this.data.coupon) {
+        if (this.data.coupon.discount_type == 'pricebreak') {
+          price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+       } else {
+        price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+       }
+      } else {
+        price = this.data.singlePrice * this.data.productNum
+      }
+      
       if (price >0) {
         this.setData({
           price:price/100
@@ -152,7 +164,17 @@ Page({
       }
       // console.log(this.data.singlePrice);
     }
-    let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    // let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    let price
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      price = this.data.singlePrice * this.data.productNum
+    }
     if (price >0) {
       this.setData({
         price:price/100
@@ -261,7 +283,17 @@ Page({
   },
   totalPrice(price) {
     let allPrice
-    allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        allPrice = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      allPrice = this.data.singlePrice * this.data.productNum
+    }
+      
+    // allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
       if (allPrice >0) {
         this.setData({
           price:allPrice/100,
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 2cef298..fcb59e6 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -70,7 +70,7 @@
     </view>
   </view>
 
-  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum'}}" id="coupon"
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum' && showYhq}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
 
   <!-- <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 5c4dfc4..ad3dc1d 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -231,6 +231,7 @@ Page({
             product.push(item)
           }
       })
+      app.globalData.listName = 'car'
       if (product.length>1) {
         this.setData({
           showModel:true
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index bf54959..8eceacb 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -9,7 +9,14 @@
 <view class="coupon-item{{index==0?' active':''}}" wx:for="{{list}}" wx:for-index="i">
 	<view class="title-box">
 		<view class="title textOver">{{item.activity.name}}</view>
-		<view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
+		<view class="coupon-money">
+      <view wx:if="{{item.activity.discount_type == 'pricebreak'}}">
+        ￥<text>{{item.activity.money/100}}</text>
+      </view>
+      <view wx:else>
+        <text>{{item.activity.fold}}折</text>
+      </view>
+    </view>
 	</view>
 	<view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
 	<view class="coupon-tip"><text>有效期：</text>{{item.end_time}} 前使用</view>

From 8f9694afe5f3b1633763958a6b1779451ec78482 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 9 Aug 2024 11:14:44 +0800
Subject: [PATCH 190/471] =?UTF-8?q?vr,=E6=9C=9F=E7=A5=A8=E9=80=89=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=90=8E=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         |  2 +-
 pages/info/museumInfo/index.js |  3 ++-
 pages/order/postOrder/index.js |  2 +-
 pages/order/scene/index.js     | 44 ++++++++++++++++++----------------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app.js b/app.js
index 79152fd..6ec30f8 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.isTest139? true : false;
+      data.isTest = data.isTest140? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index a4c3859..8fcbd0e 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -516,8 +516,9 @@ Page({
   },
   goVr:function(){
     app.globalData.weburl = this.data.info.vr_info_url
+    let url = this.data.info.vr_info_url
     wx.navigateTo({
-      url: '/pages/pbService/web/index',
+      url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
     })
   },
 
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 0dfa8ad..1668344 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -62,7 +62,7 @@ Page({
   price() {
     let allPrice
     if (this.data.coupon) {
-      if (this.data.coupon.discount_type == 'pricebreak') {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
         return allPrice = this.data.showPrice + this.data.postFee - this.data.coupon.activity.money>0?this.data.showPrice + this.data.postFee - this.data.coupon.activity.money/100:0
      } else {
       return allPrice = (this.data.showPrice* this.data.coupon.activity.fold)/ 10 + this.data.postFee
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index f5a0ada..66efdf5 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -144,7 +144,8 @@ Page({
       // })
       let price
       if (this.data.coupon) {
-        if (this.data.coupon.discount_type == 'pricebreak') {
+        console.log(app.globalData.couponInfo,this.data.coupon);
+        if (this.data.coupon.activity.discount_type == 'pricebreak') {
           price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
        } else {
         price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
@@ -165,25 +166,26 @@ Page({
       // console.log(this.data.singlePrice);
     }
     // let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
-    let price
-    if (this.data.coupon) {
-      if (this.data.coupon.discount_type == 'pricebreak') {
-        price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
-     } else {
-      price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
-     }
-    } else {
-      price = this.data.singlePrice * this.data.productNum
-    }
-    if (price >0) {
-      this.setData({
-        price:price/100
-      })
-    }else {
-      this.setData({
-        price:0
-      })
-    }
+    // 多写了一遍
+    // let price
+    // if (this.data.coupon) {
+    //   if (this.data.coupon.discount_type == 'pricebreak') {
+    //     price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+    //  } else {
+    //   price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+    //  }
+    // } else {
+    //   price = this.data.singlePrice * this.data.productNum
+    // }
+    // if (price >0) {
+    //   this.setData({
+    //     price:price/100
+    //   })
+    // }else {
+    //   this.setData({
+    //     price:0
+    //   })
+    // }
   },
   cancel: function () {
     this.setData({
@@ -284,7 +286,7 @@ Page({
   totalPrice(price) {
     let allPrice
     if (this.data.coupon) {
-      if (this.data.coupon.discount_type == 'pricebreak') {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
         allPrice = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
      } else {
       allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10

From e129597e7051a4797a5d37aefb5ddc1dfc7546e0 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 12 Aug 2024 09:41:33 +0800
Subject: [PATCH 191/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E9=9D=9E=E9=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 2 +-
 pages/index/index.wxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 6ec30f8..76a5e2e 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.isTest140? true : false;
+      data.isTest = data.isTest141? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index bdad19e..2aa7f66 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -227,7 +227,7 @@
       <view class="pbservice" style="margin-bottom:30rpx">
         <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-          <view class="text">非遗鉴赏</view>
+          <view class="text">数字非遗</view>
         </view>
         <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>

From d79602fcc36944c89d477c9ee0cc0eb424cf2080 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 15 Aug 2024 15:44:35 +0800
Subject: [PATCH 192/471] =?UTF-8?q?=E6=9C=9F=E7=A5=A8=E5=92=8C=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |   2 +-
 app.json                               |   3 +-
 pages/index/index.wxml                 |  10 +-
 pages/index/index.wxss                 |  12 +-
 pages/info/sceneProductInfo/index.js   |  33 +-
 pages/order/components/coupon/index.js |  13 +
 pages/order/components/date/index.wxml |   4 +-
 pages/order/components/date/index.wxss |   6 +-
 pages/order/scene/index.js             |  39 +-
 pages/order/scene/index.wxml           |   6 +-
 pages/user/cartlist/list.js            |   2 +-
 subPackages/gwcOrder/index.js          | 756 +++++++++++++++++++++++++
 subPackages/gwcOrder/index.json        |   8 +
 subPackages/gwcOrder/index.wxml        |  96 ++++
 subPackages/gwcOrder/index.wxss        | 343 +++++++++++
 15 files changed, 1303 insertions(+), 30 deletions(-)
 create mode 100644 subPackages/gwcOrder/index.js
 create mode 100644 subPackages/gwcOrder/index.json
 create mode 100644 subPackages/gwcOrder/index.wxml
 create mode 100644 subPackages/gwcOrder/index.wxss

diff --git a/app.js b/app.js
index 76a5e2e..92156ac 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.isTest141? true : false;
+      data.isTest = data.isTest142? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 340cb02..11743e3 100644
--- a/app.json
+++ b/app.json
@@ -193,7 +193,8 @@
             "techanNew/index",
             "techanCart/index",
             "feiyiNew/index",
-            "postSearch/index"
+            "postSearch/index",
+            "gwcOrder/index"
         ]
     }],
   "plugins": {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 2aa7f66..b1d1eaa 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -172,9 +172,13 @@
   </view>
   <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
   <view style="display: flex;">
-    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"></view>
-    <!-- <view bindtap="gotoUrl" data-event="xlqc" data-url="https://wlsjzx.wglj.suzhou.com.cn:8096/kt_h5/index.html#/home" class="sslk"></view> -->
-    <view bindtap="gotoUrls" data-event="xlqc" class="sslk"></view>
+    <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd"> -->
+    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd">
+      <image src="{{indexSeason.ai}}" mode=""/>
+    </view>
+    <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+      <image src="{{indexSeason.avoid}}" mode=""/>
+    </view>
   </view>
   <!-- 元旦修改  限时特惠--新版-->
   <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index fff3df6..3e7a495 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1178,15 +1178,19 @@ page {
 	bottom: 64rpx;
 }
 .jqssd {
-  background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
-  background-size: 100% 100%;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
+  background-size: 100% 100%; */
   width: 365.33rpx;
   height: 166rpx;
   flex-shrink: 0;
 }
+.jqssd image, .sslk image{
+  width: 100%;
+  height: 100%;
+}
 .sslk {
-  background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
-  background-size: 100% 100%;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
+  background-size: 100% 100%; */
   width: 365.33rpx;
   height: 166rpx;
   flex-shrink: 0;
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index ad008c9..b9cea87 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -360,7 +360,9 @@ Page({
         app.globalData.list = []
         app.globalData.listName = null
         if (this.data.skuFlag == 'order') {
-          if (e.currentTarget.dataset.disable === 1) return;
+          console.log(app.globalData.sku);
+          if (app.globalData.product.product.flag==0 || app.globalData.product.sku.flag=='off') return;
+          // if (e.currentTarget.dataset.disable === 1) return;
           util.pagePoint({
             event: 'scene_order',
             param: {
@@ -770,7 +772,8 @@ Page({
       },
       product = {
         product: e.currentTarget.dataset.product
-      }
+      },
+      ticket_type = e.currentTarget.dataset.sku.ticket_type
       console.log(sku,product);
     product.productNum = 1
     app.globalData.product = {
@@ -778,15 +781,23 @@ Page({
       ...product
     }
     console.log(app.globalData.product);
-    this.setData({
-      showDate: true,
-    })
-    this.setData({
-      product: product,
-      showDate2: true,
-      skuFlag: 'order',
-      showPrice:e.currentTarget.dataset.sku.price
-    })
+    console.log(ticket_type);
+    if (ticket_type != 2) {
+      this.setData({
+        showDate: true,
+      })
+      this.setData({
+        product: product,
+        showDate2: true,
+        skuFlag: 'order',
+        showPrice:e.currentTarget.dataset.sku.price
+      })
+    }else {
+      this.setData({
+        skuFlag: 'order'
+      })
+      this.order()
+    }
   },
   //立即预定
   showOrder: function () {
diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 9f79e8f..883a94b 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -13,6 +13,19 @@ Component({
     sku:{
       type:String,
       value:""
+    },
+    couponFlag:{
+      type:Boolean,
+      value:false,
+      observer(nv, ov) {
+        console.log(nv,ov)
+        if (nv) {
+          app.globalData.couponInfo = null
+          this.setData({
+            coupon:null
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index b226792..f94ab02 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -24,7 +24,7 @@
 <view class="date-box">
   <view class="box-title">{{skuName}}</view>
   <view style="border-top: 1rpx solid #ccc;padding: 48rpx 0 0 21rpx;">
-    <view style="font-weight: 500;font-size: 31rpx;color: #000000;">
+    <view style="font-weight: 500;font-size: 31rpx;color: #000000;margin-bottom: 40rpx;">
       使用日期
     </view>
     <view class="dates-boxes">
@@ -55,7 +55,7 @@
     </view>
   </view>
   <view wx:if="{{timelist.length>0}}">
-    <view style="margin-top: 10rpx;padding-left: 18rpx;">
+    <view style="margin-top: 10rpx;padding-left: 18rpx;margin-bottom: 40rpx;">
       选择时段
     </view>
     <view class="date-times" wx:if="{{timelist.length>0}}">
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index 0446023..9d7444b 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -16,7 +16,9 @@
 .dates-boxes {
   display: flex;
   align-items: center;
-  padding: 31rpx 0;
+  padding: 0 0 31rpx;
+  border:none;
+  /* padding: 31rpx 0; */
   /* padding: 31rpx 21rpx; */
   /* border-top: 1rpx solid #ccc; */
 }
@@ -79,7 +81,7 @@
   justify-content: space-between;
   align-items: center;
   margin: 0 21rpx;
-  padding-top: 34rpx;
+  /* padding-top: 34rpx; */
   padding-bottom: 10rpx;
   /* border-top: 1rpx dashed #ccc; */
   flex-wrap: wrap;
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 66efdf5..0592d57 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -44,7 +44,8 @@ Page({
     bookingInfoTitle: "",
     showDate:false,
     showDate2:false,
-    showYhq:null
+    showYhq:null,
+    couponFlag:false
   },
 
   /**
@@ -164,6 +165,26 @@ Page({
         })
       }
       // console.log(this.data.singlePrice);
+    }else {
+      let price
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      price = this.data.singlePrice * this.data.productNum
+    }
+    if (price >0) {
+      this.setData({
+        price:price/100
+      })
+    }else {
+      this.setData({
+        price:0
+      })
+    }
     }
     // let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
     // 多写了一遍
@@ -274,9 +295,11 @@ Page({
 
     }
     app.globalData.couponInfo = null;
+    console.log(this.data.couponFlag);
     this.setData({
       productNum: (this.data.productNum - 1),
-      coupon: null
+      coupon: null,
+      couponFlag:true
     })
 	this.data.product.num = this.data.productNum
     // this.changePrice()
@@ -389,6 +412,15 @@ Page({
         linkmanIds.push(item.id)
       })
     }
+    if (this.data.is_authentication == 0) { //是否实名：0否1是
+      if (this.data.phone == '') {
+        wx.showToast({
+          title: '请填写手机号',
+          icon: 'none'
+        })
+        return
+      }
+    }
     let data = {
       coupon_id: this.data.coupon ? this.data.coupon.id : null,
       source: "WECHATXCX",
@@ -759,6 +791,9 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
+    this.setData({
+      couponFlag:false
+    })
   },
 
   /**
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index fcb59e6..8fa77b0 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -13,7 +13,7 @@
       <view style="font-weight: 500;font-size: 36rpx;color: #000000;margin-bottom: 39rpx;" class="textOver2">
         {{product.product.title}}
       </view>
-      <view style="font-weight: 400;font-size: 25rpx;color: #666666;padding-left: 2rpx;">
+      <view style="font-weight: 400;font-size: 25rpx;color: #666666;padding-left: 2rpx;" wx:if="{{ticket_type!= 2}}">
         <view style="margin-bottom: 20rpx;">
           {{date.date}}  {{date.week}}
         </view>
@@ -22,7 +22,7 @@
         </view>
       </view>
     </view>
-    <view class="change-date" bindtap="changeDate">
+    <view class="change-date" bindtap="changeDate" wx:if="{{ticket_type!= 2}}">
       修改 >
     </view>
   </view>
@@ -71,7 +71,7 @@
   </view>
 
   <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum' && showYhq}}" id="coupon"
-    money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
+    money="{{singlePrice * productNum}}" sku="{{product.sku.id}}" couponFlag="{{couponFlag}}"></coupon>
 
   <!-- <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
     <view class="box-title" wx:if="{{flag!='mix'}}">
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index ad3dc1d..19260f1 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -216,7 +216,7 @@ Page({
                     })
                 } else {
                     wx.navigateTo({
-                        url: '/pages/order/scene/index?isCar=' + this.data.isCar,
+                        url: '/subPackages/gwcOrder/index?isCar=' + this.data.isCar,
                     })
                 }
             }
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
new file mode 100644
index 0000000..b8c0da7
--- /dev/null
+++ b/subPackages/gwcOrder/index.js
@@ -0,0 +1,756 @@
+// pages/order/scene/index.js
+let app = getApp()
+import util from "../../utils/util"
+import commonApi from "../../utils/https/common"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    product:null,
+    productNum: 1,
+    linkmanList: [],
+    date: "",
+    time: "",
+    remark: "",
+    singlePrice: 0,
+    type: null,
+    coupon:null,
+    isLogin: false,
+    kjId: null,
+    gp_id: null,
+    groupName: "",
+    prizeId: null,
+    select_allowance: false,
+    showAllowance: false,
+    allowance_data: null,
+    allowance_price: 0,
+    pIndex: 0,
+    flag:null,
+		ticket_type:1,
+    isCar:'single',
+    showMask: false,
+    price:0,
+    is_need_idcard:1,
+    is_authentication:1, // 是否实名，0否1是，默认实名
+    phone:'', //不实名时传的手机号
+    is_real_name:1, // 是否是一证一票，0否1是，
+    status:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+      
+    this.setData({
+      product: app.globalData.product,
+      type: options.type,
+      kjId: app.globalData.kjId,
+      gp_id: app.globalData.gp_id || app.globalData.team_id,
+      prizeId: wx.getStorageSync('prizeId'),
+      flag:options.flag,
+      date:null,
+			ticket_type:app.globalData.product.sku.ticket_type || 1,
+      isCar:options.isCar,
+      is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_real_name:app.globalData.product.sku.sku_model.is_real_name,
+    })
+    console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
+    console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
+    console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name);
+
+    if (!app.globalData.product) {
+      util.back();
+      return;
+    }
+    if (app.globalData.product.productNum) {
+      this.setData({
+        productNum: app.globalData.product.productNum < 1 ? 1 : app.globalData.product.productNum
+      })
+    }else{
+		this.setData({
+		  productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num
+		})
+  }
+    this.setData({
+      product: app.globalData.product,
+      singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
+    })
+    console.log(this.data.singlePrice);
+    this.showAllPrice()
+    this.getNewCoupon()
+  //  console.log('********',this.data.product);
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
+      this.couponCom = this.selectAllComponents("#coupon")[0];
+    }
+  },
+  // next: function () {
+  //   this.setData({
+  //     showMask:true
+  //   })
+  // },
+  showAllPrice:function () {
+    // console.log('detail',app.globalData.product);
+    // console.log('singlePrice',this.data.singlePrice);
+    // console.log('productNum',this.data.productNum);
+    console.log('couponInfo',app.globalData.couponInfo);
+    if (this.data.ticket_type != 1) {
+      // this.setData({
+      //   singlePrice:app.globalData.product.product.price
+      // })
+      let price
+      if (this.data.coupon) {
+        console.log(app.globalData.couponInfo,this.data.coupon);
+        if (this.data.coupon.activity.discount_type == 'pricebreak') {
+          price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+       } else {
+        price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+       }
+      } else {
+        price = this.data.singlePrice * this.data.productNum
+      }
+      
+      if (price >0) {
+        this.setData({
+          price:price/100
+        })
+      }else {
+        this.setData({
+          price:0
+        })
+      }
+      // console.log(this.data.singlePrice);
+    }else {
+      let price
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      price = this.data.singlePrice * this.data.productNum
+    }
+    if (price >0) {
+      this.setData({
+        price:price/100
+      })
+    }else {
+      this.setData({
+        price:0
+      })
+    }
+    }
+    // let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    // 多写了一遍
+    // let price
+    // if (this.data.coupon) {
+    //   if (this.data.coupon.discount_type == 'pricebreak') {
+    //     price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+    //  } else {
+    //   price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+    //  }
+    // } else {
+    //   price = this.data.singlePrice * this.data.productNum
+    // }
+    // if (price >0) {
+    //   this.setData({
+    //     price:price/100
+    //   })
+    // }else {
+    //   this.setData({
+    //     price:0
+    //   })
+    // }
+  },
+  cancel: function () {
+    this.setData({
+      showMask:false
+    })
+  },
+  changeGroupName: function (e) {
+    this.setData({
+      groupName: e.detail.value
+    })
+  },
+  setLinkman: function (e) {
+    if (e.detail.phone || e.detail.phone=='') {
+      this.setData({
+        phone:e.detail.phone
+      })
+    }else {
+      console.log(e);
+      let linkmanList = e.detail;
+      if (this.data.productNum != linkmanList.length && this.data.coupon) {
+        wx.showToast({
+          title: '订单价格发生变化，请重新选择优惠券',
+          icon: 'none'
+        })
+        // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
+        //   this.couponCom.setNullCoupon()
+        // }
+        // app.globalData.couponInfo = null;
+        // this.setData({
+        //   coupon: null
+        // })
+      }
+      // let productNum = linkmanList.length == 0 ? 1 : this.data.productNum < linkmanList.length ? linkmanList.length : this.data.productNum;
+    // if (this.data.gp_id) {
+    //   productNum = app.globalData.product.maxNum;
+    // }
+    this.setData({
+      // productNum: productNum,
+      linkmanList: linkmanList
+    })
+    console.log(this.data.linkmanList);
+    // this.changePrice()
+    this.totalPrice(this.data.singlePrice)
+    }
+  },
+  add: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
+      wx.showToast({
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        icon: 'none'
+      })
+      return;
+    }
+    this.setData({
+      productNum: this.data.productNum + 1
+    })
+	this.data.product.num = this.data.productNum
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  minus: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.productNum == 1) return;
+    if (this.data.coupon) {
+      wx.showToast({
+        title: '订单价格发生变化，请重新选择优惠券',
+        icon: 'none'
+      })
+    }
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag && this.data.type!='museum') {
+      // this.couponCom.setNullCoupon()
+    }
+    app.globalData.couponInfo = null;
+    this.setData({
+      productNum: (this.data.productNum - 1),
+      coupon: null
+    })
+	this.data.product.num = this.data.productNum
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  totalPrice(price) {
+    let allPrice
+    if (this.data.coupon) {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
+        allPrice = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      allPrice = this.data.singlePrice * this.data.productNum
+    }
+      
+    // allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      if (allPrice >0) {
+        this.setData({
+          price:allPrice/100,
+          singlePrice:price
+        })
+      }else {
+        this.setData({
+          price:0,
+          singlePrice:price
+        })
+      }
+      console.log('singlePrice',this.data.singlePrice);
+  },
+  changeDate: function (e) {
+    console.log('打印',e);
+    // debugger
+    // this.showAllPrice()
+    this.totalPrice(e.detail.price)
+    if (e.detail.price != this.data.singlePrice && this.data.coupon) {
+      wx.showToast({
+        title: '订单价格发生变化，请重新选择优惠券',
+        icon: 'none'
+      })
+      this.setData({
+        coupon: null,
+        singlePrice:e.detail.price
+      })
+      if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
+        this.couponCom.setNullCoupon()
+      }
+      app.globalData.couponInfo = null;
+    }
+    this.setData({
+      date: e.detail,
+      singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price
+    })
+    // this.changePrice()
+  },
+  changeTime: function (e) {
+    this.setData({
+      time: e.detail
+    })
+  },
+  changeAllowance: function () {
+    this.setData({
+      showAllowance: !this.data.showAllowance
+    })
+  },
+  changeRemark: function (e) {
+    this.setData({
+      remark: e.detail.value
+    })
+  },
+  /**
+   * 补贴价
+   */
+  changePrice: function () {
+    let product = this.data.product, price = product.sku.price;
+    if (this.data.allowance_data && this.data.select_allowance && this.data.allowance_price) {
+      let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price);
+      price -= this.data.allowance_price < spread_price ? this.data.allowance_price : spread_price
+    }
+    this.setData({
+      singlePrice: app.globalData.kjId ? 0 : price
+    })
+	
+  },
+  order:function() {
+    let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
+    let linkmanIds = [];
+    if (linkmanList.length==0 && this.data.is_authentication == 1) {
+      wx.showToast({
+        title: '请选择出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.is_authentication == 1) {
+      linkmanList.map(item => {
+        linkmanIds.push(item.id)
+      })
+    }
+    let data = {
+      coupon_id: this.data.coupon ? this.data.coupon.id : null,
+      source: "WECHATXCX",
+      product_list: [{
+        type: product.product.type,
+        product_id: product.product.id,
+        sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        start_time: time.start_time,
+        end_time: time.end_time,
+        use_date: date ? date.date : '',
+        visitors: linkmanIds.join(","),
+        remark: remark,
+        product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
+        phone:this.data.phone,// 不实名的时候传的手机号参数
+      }],
+      originate_order_id: this.data.kjId,
+      gp_id: app.globalData.gp_id,
+      team_id: app.globalData.team_id,
+      linkmanList:this.data.is_authentication == 1?this.data.linkmanList:[]
+    }
+    if (app.globalData.from) {
+      data.system_name = app.globalData.from;
+    }
+    if (app.globalData.retailId) {
+      data.commission_code = app.globalData.retailId;
+      app.globalData.retailId = null;
+    }
+    if (app.globalData.category_id) {
+      data.category_id = app.globalData.category_id;
+    }
+    if (this.data.prizeId) {
+      data.lottery_id = this.data.prizeId
+    }
+    let service = 'order/create', postData = {
+      data: JSON.stringify(data)
+    }
+    if (app.globalData.product.isGroup == 1) {
+      service = "team_order/appoint"
+      postData.member_num = this.data.productNum
+      postData.team_name = this.data.groupName
+      postData.type = 1;
+    }
+	if(app.globalData.list){
+    app.globalData.list[app.globalData.index] = this.data.product
+    // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+      app.globalData.list[app.globalData.index].phone = this.data.phone
+      app.globalData.list[app.globalData.index].linkmanList = []
+    }else {
+      app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    }
+  }
+  // app.globalData.linkmanList = this.data.linkmanList
+  app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+  console.log(app.globalData);
+	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
+		if(app.globalData.createDate){
+			app.globalData.createDate.product_list.push(data.product_list[0])
+		}else{
+      app.globalData.createDate = data
+    }
+    console.log(app.globalData.createDate);
+		app.globalData.index = app.globalData.index + 1
+		app.globalData.product = app.globalData.list[app.globalData.index]
+		wx.redirectTo({
+		  url: '/subPackages/gwcOrder/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
+		})
+		return
+	}else{
+		if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
+			if(app.globalData.createDate){
+				app.globalData.createDate.product_list.push(data.product_list[0])
+			}
+			wx.redirectTo({
+			  url: '/pages/order/orderList/index?flag='+ this.data.flag
+			})
+		}else{
+			commonApi.user_post(service, postData).then(res => {
+			  if (app.globalData.kjId) {
+			    this.setData({
+			      kjId: null
+			    });
+			    app.globalData.kjId = null;
+			  }
+			  if (app.globalData.gp_id) {
+			    this.setData({
+			      gp_id: null
+			    });
+			    app.globalData.gp_id = null;
+			  }
+			  if (res.code == 1 && app.globalData.product.isGroup == 1) {
+			    // 团购跳转到团购详情
+			    wx.navigateTo({
+			      url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order'
+			    })
+			  }
+			})
+		}
+	}
+  },
+  next: function () {
+	  console.log(this.data)
+    let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
+    let linkmanIds = [];
+    if (this.data.is_need_idcard == 1) {
+      if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+        wx.showToast({
+          title: '请添加出行人',
+          icon: "none"
+        })
+        return;
+      }
+    }
+    if (!date && this.data.ticket_type == 1) {
+      wx.showToast({
+        title: '请选择使用日期',
+        icon: 'none'
+      })
+      return
+    }
+    if (linkmanList.length!=productNum && this.data.is_authentication == 1 && this.data.is_real_name == 1) {
+      wx.showToast({
+        title: '购票数量要和出行人数量一致',
+        icon: 'none'
+      })
+      return
+    }
+    if (!util.isTel(this.data.phone) &&this.data.is_authentication == 0) {
+      wx.showToast({
+        title: '请输入正确的手机号',
+        icon: 'none'
+      })
+      return
+    }
+    if (!time && date && date.is_time_stock == true) {
+      wx.showToast({
+        title: '请选择使用时间',
+        icon: 'none'
+      })
+      return
+    }
+    if (app.globalData.product.isGroup == 1 && !this.data.groupName) {
+      wx.showToast({
+        title: '请输入团队主体名称',
+        icon: 'none'
+      })
+      return;
+    }
+    // if (this.data.phone) {
+    //   linkmanList.map(item => {
+    //     linkmanIds.push(item.id)
+    //   })
+    // }
+    // console.log(app.globalData);
+    // debugger
+    this.setData({
+      showMask:true
+    })
+  //   linkmanList.map(item => {
+  //     linkmanIds.push(item.id)
+  //   })
+	// console.log(date)
+  //   let data = {
+  //     coupon_id: this.data.coupon ? this.data.coupon.id : null,
+  //     source: "WECHATXCX",
+  //     product_list: [{
+  //       type: product.product.type,
+  //       product_id: product.product.id,
+  //       sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+  //       start_time: time.start_time,
+  //       end_time: time.end_time,
+  //       use_date: date ? date.date : '',
+  //       visitors: linkmanIds.join(","),
+  //       remark: remark,
+  //       product_num: app.globalData.product.isGroup == 1 ? 1 : productNum
+  //     }],
+  //     originate_order_id: this.data.kjId,
+  //     gp_id: app.globalData.gp_id,
+  //     team_id: app.globalData.team_id,
+  //     linkmanList:this.data.linkmanList
+  //   }
+  //   if (app.globalData.from) {
+  //     data.system_name = app.globalData.from;
+  //   }
+  //   if (app.globalData.retailId) {
+  //     data.commission_code = app.globalData.retailId;
+  //     app.globalData.retailId = null;
+  //   }
+  //   if (app.globalData.category_id) {
+  //     data.category_id = app.globalData.category_id;
+  //   }
+  //   if (this.data.prizeId) {
+  //     data.lottery_id = this.data.prizeId
+  //   }
+  //   let service = 'order/create', postData = {
+  //     data: JSON.stringify(data)
+  //   }
+  //   if (app.globalData.product.isGroup == 1) {
+  //     service = "team_order/appoint"
+  //     postData.member_num = this.data.productNum
+  //     postData.team_name = this.data.groupName
+  //     postData.type = 1;
+  //   }
+	// if(app.globalData.list){
+	// 	app.globalData.list[app.globalData.index] = this.data.product
+	// 	app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+  // }
+  // // app.globalData.linkmanList = this.data.linkmanList
+  // app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+  // console.log(app.globalData);
+	// if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
+	// 	if(app.globalData.createDate){
+	// 		app.globalData.createDate.product_list.push(data.product_list[0])
+	// 	}else{
+	// 		app.globalData.createDate = data
+  //   }
+	// 	app.globalData.index = app.globalData.index + 1
+	// 	app.globalData.product = app.globalData.list[app.globalData.index]
+	// 	wx.redirectTo({
+	// 	  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
+	// 	})
+	// 	return
+	// }else{
+	// 	if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
+	// 		if(app.globalData.createDate){
+	// 			app.globalData.createDate.product_list.push(data.product_list[0])
+	// 		}
+	// 		wx.redirectTo({
+	// 		  url: '/pages/order/orderList/index?flag='+ this.data.flag
+	// 		})
+	// 	}else{
+	// 		commonApi.user_post(service, postData).then(res => {
+	// 		  if (app.globalData.kjId) {
+	// 		    this.setData({
+	// 		      kjId: null
+	// 		    });
+	// 		    app.globalData.kjId = null;
+	// 		  }
+	// 		  if (app.globalData.gp_id) {
+	// 		    this.setData({
+	// 		      gp_id: null
+	// 		    });
+	// 		    app.globalData.gp_id = null;
+	// 		  }
+	// 		  if (res.code == 1 && app.globalData.product.isGroup == 1) {
+	// 		    // 团购跳转到团购详情
+	// 		    wx.navigateTo({
+	// 		      url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order'
+	// 		    })
+	// 		  }
+	// 		})
+	// 	}
+	// }
+  },
+  // 活动预约
+  activityOrder: function () {
+    if (this.data.linkmanList && this.data.linkmanList.length > 0) {
+      commonApi.user_post("pbservice/Culture/booking", {
+        id: this.data.product.product.id,
+        name: this.data.linkmanList[0].name,
+        card_number: this.data.linkmanList[0].id_number,
+        tel: this.data.linkmanList[0].tel
+      }).then(res => {
+        if (res.code == 1) {
+          wx.showToast({
+            title: '预约成功',
+            icon: 'success'
+          })
+          setTimeout(() => {
+            wx.navigateBack()
+          }, 1000)
+          return;
+        }
+      })
+    }
+    else {
+      wx.showToast({
+        title: '请选择出行人',
+        icon: 'none'
+      })
+      return;
+    }
+
+  },
+  /**
+ * 选择补贴
+ */
+  selectAllowance: function () {
+    this.setData({
+      select_allowance: !this.data.select_allowance
+    })
+    this.changePrice()
+  },
+  //获取最高优惠券
+  getNewCoupon(e){
+   this.setData({
+      coupon:e.detail
+   })
+   this.showAllPrice()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    // this.setData({
+    //   productNum:1
+    // })
+    // app.globalData.productNum =1
+	if(app.globalData.list && app.globalData.list.length != 0 && this.data.type!='museum'){
+		app.globalData.product = app.globalData.list[app.globalData.index]
+	}
+    if (!this.data.isLogin) {
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          this.setData({
+            isLogin: true
+          })
+        }
+      })
+    }
+    // this.setData({
+    //   coupon: app.globalData.couponInfo
+    // })
+    // 获取补贴
+    // if (this.data.product) {
+    //   commonApi.user_post("product/getProductAllowancePrice", {
+    //     product_code: this.data.product.product.product_code
+    //   }).then(resTwo => {
+    //     if (resTwo && resTwo.code == 1) {
+    //       this.setData({
+    //         allowance_data: resTwo.data
+    //       })
+    //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+    //       let sInfo = this.data.product.sku
+    //       if (spread_price > 0) {
+    //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+    //           this.setData({
+    //             allowance_price: spread_price
+    //           })
+    //         } else {
+    //           this.setData({
+    //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+    //           })
+    //         }
+    //         this.changePrice()
+    //       } else {
+    //         this.setData({
+    //           allowance_price: 0
+    //         })
+    //       }
+    //     }
+    //   })
+    // }
+    // console.log('-----',app.globalData.product.sku.price);
+    // app.globalData.product = delete(app.globalData.product.detail)
+    // this.showAllPrice()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    this.setData({
+      kjId: null,
+      gp_id: null
+    });
+    app.globalData.kjId = null;
+    app.globalData.gp_id = null;
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/gwcOrder/index.json b/subPackages/gwcOrder/index.json
new file mode 100644
index 0000000..4596fde
--- /dev/null
+++ b/subPackages/gwcOrder/index.json
@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "date":"../../pages/order/components/date/index",
+    "contact":"../../pages/order/components/contact/index",
+    "coupon":"../../pages/order/components/coupon/index"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
new file mode 100644
index 0000000..9a5a78d
--- /dev/null
+++ b/subPackages/gwcOrder/index.wxml
@@ -0,0 +1,96 @@
+<!--pages/order/scene/index.wxml-->
+<view  class="{{product && product.isGroup==1?'group-order':''}}">
+  <title title="订单填写"></title>
+  <view class="product-info" wx:if="{{product && product.sku.ticket_type == 2}}">
+    <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
+    <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
+  </view>
+  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+    product="{{product}}"></date>
+  <view class="box" wx:if="{{product && product.isGroup==1}}">
+    <view class="box-title">
+      <view style="flex-shrink:0">团体主体名称：</view>
+      <input type="text" placeholder="请输入名称" bindinput="changeGroupName"></input>
+    </view>
+  </view>
+  <view class="box">
+    <view class="box-title">
+      <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
+      <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view>
+      <view class="number-box">{{productNum}}</view>
+      <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view>
+    </view>
+  </view>
+  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+  <!-- 补贴 -->
+  <view class="box">
+    <view class="box-title allowance" wx:if="{{allowance_price}}">
+      <view bindtap="changeAllowance">惠民补贴</view>
+      <view class="com-flex-tao" bindtap="selectAllowance">
+        -￥{{allowance_price / 100}}
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+          alt="" wx:if="{{select_allowance}}"></image>
+        <view class="border" wx:else></view>
+      </view>
+    </view>
+  </view>
+
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum'}}" id="coupon"
+    money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
+
+  <!-- <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
+    <view class="box-title" wx:if="{{flag!='mix'}}">
+      <view style="flex-shrink:0">订单备注</view>
+      <input type="text" bindinput="changeRemark" placeholder="选填"></input>
+    </view>
+  </view> -->
+
+  <view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view>
+  <view class="fixed-bottom" wx:if="{{type!='museum' && type!='activity'}}">
+    <view class="fixed-price-box" wx:if="{{kjId || prizeId}}"><text>合计：</text><text class="price">¥0</text></view>
+    <!-- <view class="fixed-price-box" wx:elif="{{prizeId}}"><text>合计：</text><text class="price">¥0</text></view> -->
+    <view class="fixed-price-box" wx:else><text>合计：</text>
+      <text class="price">¥{{price}}</text>
+    </view>
+    <view class="fixed-btn" bindtap="next">下一步</view>
+  </view>
+  <view class="fixed-bottom yuyue-box" wx:else>
+    <view class="fixed-btn yuyue-btn" bindtap="order" wx:if="{{type=='museum'}}">立即预约</view>
+    <view class="fixed-btn yuyue-btn" bindtap="activityOrder" wx:else>立即预约</view>
+  </view>
+  <view class="mask" style="align-items:flex-end" wx:if="{{showMask}}">
+  <view class="mask-bg" bindtap="cancel"></view>
+  <view class="mask-content1">
+      <view class="dialog-top">
+        <view class="scene-title">{{product.product.title}}-{{product.sku.sku_name}}</view>
+        <view class="people-message">出行人信息</view>
+        <view style="max-height:430rpx;overflow: scroll;" wx:if="{{is_authentication=='1'}}">
+          <view class="people" wx:for="{{linkmanList}}">
+            <view class="flex">
+              <view>姓名：</view>
+              <view style="color: #333;">{{item.name}}</view>
+            </view>
+            <view class="flex" style="margin: 19.33rpx 0;">
+              <view>证件号：</view>
+              <view style="color: #333;">{{item.id_number}}</view>
+            </view>
+            <view class="flex">
+              <view>手机号：</view>
+              <view style="color: #333;">{{item.tel}}</view>
+            </view>
+          </view>
+        </view>
+        <view wx:else>
+            <view class="flex" style="margin: 10rpx 0 30rpx;">
+              <view>手机号：</view>
+              <view style="color: #333;">{{phone}}</view>
+            </view>
+          </view>
+      </view>
+      <view class="bottom-btn">
+        <view class="cancle" bindtap="cancel">取消</view>
+        <view class="confirm" bindtap="order">无问题，下一步</view>
+      </view>
+  </view>
+</view>
+</view>
\ No newline at end of file
diff --git a/subPackages/gwcOrder/index.wxss b/subPackages/gwcOrder/index.wxss
new file mode 100644
index 0000000..945fd9b
--- /dev/null
+++ b/subPackages/gwcOrder/index.wxss
@@ -0,0 +1,343 @@
+/* pages/.wxss */
+page {
+  background: #f6f6f6;
+}
+
+.group-order {
+  background: #fff;
+}
+
+.product-info {
+  padding: 20rpx 47rpx;
+  border-bottom: 1rpx solid #ccc;
+}
+
+.product-title {
+  font-size: 33rpx;
+  color: #000;
+  font-weight: 500;
+}
+
+.product-price {
+  color: #D62828;
+  font-size: 27rpx;
+}
+
+.group-order .box-title {
+  margin: 0;
+}
+
+.group-order .box,
+.group-order .date-box {
+  border-bottom: 1rpx solid #D8D8D8;
+  border-radius: 0;
+  margin: 0 25rpx;
+}
+
+.group-order .dates-boxes {
+  border-top: none;
+  padding-top: 0;
+}
+
+.group-order .date-time.disable {
+  background: #CCCCCC;
+  color: #fff;
+}
+
+.box {
+  margin: 30rpx 25rpx;
+  background: white;
+  border-radius: 9rpx;
+}
+
+.box-title {
+  height: 113rpx;
+  margin: 0 20rpx;
+  font-size: 31rpx;
+  color: #000;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+}
+
+.dates-boxes {
+  display: flex;
+  align-items: center;
+  padding: 31rpx 21rpx;
+  border-top: 1rpx solid #ccc;
+}
+
+.date-item {
+  width: 162rpx;
+  height: 97rpx;
+  border-radius: 10rpx;
+  border: 1rpx solid #333;
+  text-align: center;
+  font-size: 27rpx;
+  color: #000;
+  margin-right: 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+
+.date-item.active {
+  border-color: #0B898E;
+  color: #fff;
+  background: #0B898E;
+}
+
+.date-item.disable {
+  border-color: #CCCCCC;
+  color: #666;
+}
+
+.date-item .price {
+  font-size: 25rpx;
+  color: #D62828;
+}
+
+.date-item.active .price {
+  color: #fff;
+}
+
+.date-item.disable .price {
+  color: #666;
+}
+
+.more-item {
+  width: 99rpx;
+  margin-right: 0;
+}
+
+.date-times {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 0 21rpx;
+  padding-top: 34rpx;
+  padding-bottom: 10rpx;
+  border-top: 1rpx dashed #ccc;
+  flex-wrap: wrap;
+}
+
+.date-time {
+  width: 315rpx;
+  line-height: 58rpx;
+  border: 1px solid #333;
+  border-radius: 10rpx;
+  text-align: center;
+  font-size: 25rpx;
+  flex-shrink: 0;
+  margin-bottom: 24rpx;
+  color: #000;
+}
+
+.date-time.disable {
+  border-color: #ccc;
+  color: #666666;
+}
+
+.date-time.active {
+  border-color: #0B898E;
+  background: #0B898E;
+  color: #fff;
+}
+
+.box-title .iconfont {
+  font-size: 28rpx;
+  flex-shrink: 0;
+}
+
+.number-box {
+  font-size: 29rpx;
+  font-weight: 500;
+  color: #000;
+  flex-shrink: 0;
+  width: 67rpx;
+  line-height: 49rpx;
+  background: #F0F0F0;
+  border-radius: 7rpx;
+  text-align: center;
+  margin: 0 20rpx;
+}
+
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 113rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  z-index: 1;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+}
+
+.yuyue-box {
+  height: 138rpx;
+  justify-content: center;
+}
+
+.fixed-btn {
+  width: 320rpx;
+  line-height: 113rpx;
+  background: #D62828;
+  color: #fff;
+  text-align: center;
+  font-size: 36rpx;
+  font-weight: 500;
+}
+
+.fixed-price-box {
+  margin-left: 25rpx;
+  flex-shrink: 0;
+  font-size: 29rpx;
+  color: #333;
+  font-weight: 500;
+}
+
+.fixed-price-box .price {
+  color: #D62828;
+  font-size: 36rpx;
+  margin-left: 10rpx;
+}
+
+.allowance {
+  justify-content: space-between;
+}
+
+.allowance>view:nth-child(2) {
+  display: flex;
+  align-items: center;
+}
+
+.allowance image {
+  width: 40rpx;
+  height: 40rpx;
+  margin-left: 10rpx;
+}
+
+.allowance .border {
+  width: 30rpx;
+  height: 30rpx;
+  border-radius: 50%;
+  border: 4rpx solid #0B98BE;
+  margin-left: 10rpx;
+}
+
+.coupon-btn {
+  width: 138rpx;
+  line-height: 56rpx;
+  border: 1px solid #333333;
+  border-radius: 29rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #000;
+}
+
+.box-title input {
+  flex: 1;
+  display: block;
+  font-size: 31rpx;
+  color: #666;
+  margin-left: 15rpx;
+  font-weight: 400;
+  text-align: right;
+}
+
+.yuyue-btn {
+  width: 657rpx;
+  line-height: 78rpx;
+  border-radius: 39rpx;
+}
+
+.group-order .yuyue-box {
+  height: 100rpx;
+}
+
+.group-order .yuyue-btn {
+  width: 100%;
+  /* height: 100%; */
+  line-height: 100rpx;
+  border-radius: 0;
+}
+
+.mask-allowance .mask-content {
+  margin: auto;
+  top: initial;
+  bottom: initial;
+  padding: 20rpx;
+}
+
+.mask-allowance .mask-content .rule-title {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+
+.dialog-top {
+  color: #999;
+  font-weight: 500;
+  padding: 40rpx 33.33rpx 0;
+}
+
+.scene-title {
+  font-size: 35rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 32.67rpx;
+}
+
+.people-message {
+  margin-bottom: 26.67rpx;
+  /* padding-bottom: 26.67rpx; */
+  /* border-bottom: 1px solid #F0F0F0; */
+  font-weight: bold;
+  font-size: 32rpx;
+}
+
+.people {
+  border-top: 1rpx solid #F0F0F0;
+  padding: 26.67rpx 0 24rpx;
+}
+
+.flex {
+  display: flex;
+}
+
+.bottom-btn {
+  display: flex;
+  border-top: 1rpx solid #F0F0F0;
+  height: 96rpx;
+  /* padding: 32.67rpx 0; */
+}
+
+.cancle {
+  width: 50%;
+  color: #999;
+  text-align: center;
+  line-height: 96rpx;
+}
+
+.confirm {
+  width: 50%;
+  text-align: center;
+  color: #D62828;
+  line-height: 96rpx;
+  border-left: 1rpx solid #F0F0F0;
+}
+
+.mask-content1 {
+  max-height: 710rpx;
+  position: relative;
+  z-index: 1;
+  width: 80%;
+  background: white;
+  border-radius: 12rpx;
+  /* margin-bottom: 45%; */
+  overflow-y: auto;
+  margin: auto;
+}
\ No newline at end of file

From db16692a7a680ea1fa723bf4c3aaaefb76371e21 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 20 Aug 2024 10:07:04 +0800
Subject: [PATCH 193/471] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BA=AB=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      |  2 +-
 pages/user/service/index.js | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 92156ac..a36249c 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.isTest142? true : false;
+      data.isTest = data.isTest143? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/service/index.js b/pages/user/service/index.js
index 4b01b44..d1c0104 100644
--- a/pages/user/service/index.js
+++ b/pages/user/service/index.js
@@ -103,5 +103,18 @@ Page({
    */
   onReachBottom: function () {
     // this.getList()
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-在线客服',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
+    }
   }
 })
\ No newline at end of file

From eb108bb5620cce9df98bfefe30b90f181ce01ec2 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 22 Aug 2024 10:57:42 +0800
Subject: [PATCH 194/471] =?UTF-8?q?=E6=BC=94=E5=87=BA=E7=A5=A8=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E4=B8=8B=E5=8D=95=E5=87=BA=E8=A1=8C=E4=BA=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                        |  2 +-
 subPackages/gwcOrder/index.js | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index a36249c..961d2eb 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.isTest143? true : false;
+      data.isTest = data.isTest144? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index b8c0da7..0e67cba 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -461,13 +461,24 @@ Page({
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
     if (this.data.is_need_idcard == 1) {
-      if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-        wx.showToast({
-          title: '请添加出行人',
-          icon: "none"
-        })
-        return;
+      if (this.data.is_real_name == 1) {
+        if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+          wx.showToast({
+            title: '请添加出行人',
+            icon: "none"
+          })
+          return;
+        }
+      }else {
+        if (linkmanList.length == 0) {
+          wx.showToast({
+            title: '请添加出行人',
+            icon: "none"
+          })
+          return;
+        }
       }
+      
     }
     if (!date && this.data.ticket_type == 1) {
       wx.showToast({

From 9cdc8c0fc444d49833a6efe1f655f654f87138b4 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 22 Aug 2024 17:40:57 +0800
Subject: [PATCH 195/471] =?UTF-8?q?=E9=82=AE=E5=AF=84=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=BC=B9=E7=AA=97=EF=BC=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?ai=E9=93=BE=E6=8E=A5=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                | 2 +-
 pages/index/index.wxml                | 4 ++--
 pages/info/postProductInfo/index.wxss | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 961d2eb..673d61a 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.isTest144? true : false;
+      data.isTest = data.isTest145? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b1d1eaa..4ac2eaf 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -172,8 +172,8 @@
   </view>
   <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
   <view style="display: flex;">
-    <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd"> -->
-    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd">
+    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+    <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
       <image src="{{indexSeason.ai}}" mode=""/>
     </view>
     <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index f1f5005..c910a2c 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -535,11 +535,12 @@ page {
 .sku-name-item {
   background: #EFEFEF;
   border: 1rpx solid #EFEFEF;
-  width: 318rpx;
+  /* width: 318rpx; */
   line-height: 77rpx;
   border-radius: 14rpx;
   margin-bottom: 25rpx;
   margin-right: 30rpx;
+  max-width: 100%;
 }
 
 .sku-name-item:nth-child(2n) {

From cfdd111e702f4a34dbc5d8ebb940a81b32625872 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Fri, 23 Aug 2024 09:31:27 +0800
Subject: [PATCH 196/471] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                | 2 +-
 pages/info/postProductInfo/index.wxss | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 673d61a..aeb3fd1 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.isTest145? true : false;
+      data.isTest = data.isTest146? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index c910a2c..4aedf61 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -530,6 +530,7 @@ page {
   text-align: center;
   flex-wrap: wrap;
   margin-bottom: 20rpx;
+  justify-content: space-between;
 }
 
 .sku-name-item {
@@ -541,6 +542,8 @@ page {
   margin-bottom: 25rpx;
   margin-right: 30rpx;
   max-width: 100%;
+  padding: 0 15rpx;
+  min-width: 270rpx;
 }
 
 .sku-name-item:nth-child(2n) {

From 0df12d98b4b6516bb4258acd4b010d7943406187 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Mon, 26 Aug 2024 18:01:20 +0800
Subject: [PATCH 197/471] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   | 2 +-
 pages/order/pay/index.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index aeb3fd1..dcb19b7 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.isTest146? true : false;
+      data.isTest = data.isTest147? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 9c33ef7..bc26f71 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -240,7 +240,8 @@ Page({
       }
       else {
         wx.showToast({
-          title: data.ERRORMSG || "支付失败，请重试",
+          // title: data.ERRORMSG || "支付失败，请重试",
+          title: res.msg,
           icon:"none"
         })
       }

From 56413e8d0b592f477d27b3a2f37fd8adb28b1196 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 29 Aug 2024 12:42:32 +0800
Subject: [PATCH 198/471] =?UTF-8?q?=E6=BC=94=E8=89=BA=E7=A5=A8=E9=9D=9E?=
 =?UTF-8?q?=E5=AE=9E=E5=90=8D=E4=BC=98=E6=83=A0=E5=88=B8=E5=90=8E=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/order/scene/index.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index dcb19b7..8daa8ad 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.isTest147? true : false;
+      data.isTest = data.isTest148? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 0592d57..31de4f4 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -94,8 +94,8 @@ Page({
       // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
     console.log(this.data.singlePrice);
-    this.showAllPrice()
     this.getNewCoupon()
+    // this.showAllPrice()
   //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];
@@ -167,8 +167,8 @@ Page({
       // console.log(this.data.singlePrice);
     }else {
       let price
-    if (this.data.coupon) {
-      if (this.data.coupon.discount_type == 'pricebreak') {
+      if (this.data.coupon) {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
         price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
      } else {
       price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10

From 17f19e897e4c1e6822295c4d577145fa485a68a6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 4 Sep 2024 11:14:20 +0800
Subject: [PATCH 199/471] =?UTF-8?q?=E9=85=92=E6=99=AF=E5=A5=97=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                              |  49 +--
 pages/info/postProductInfo/index.js   |  18 +-
 pages/info/postProductInfo/index.wxml |   8 +-
 pages/order/WineSceneOrder/index.js   | 438 +++++++++++++++++++++++++
 pages/order/WineSceneOrder/index.json |  10 +
 pages/order/WineSceneOrder/index.wxml |  54 +++
 pages/order/WineSceneOrder/index.wxss | 453 ++++++++++++++++++++++++++
 project.private.config.json           |   7 +
 utils/util.js                         |  16 +-
 9 files changed, 1024 insertions(+), 29 deletions(-)
 create mode 100644 pages/order/WineSceneOrder/index.js
 create mode 100644 pages/order/WineSceneOrder/index.json
 create mode 100644 pages/order/WineSceneOrder/index.wxml
 create mode 100644 pages/order/WineSceneOrder/index.wxss

diff --git a/app.json b/app.json
index 11743e3..e6ce114 100644
--- a/app.json
+++ b/app.json
@@ -177,31 +177,34 @@
     "pages/culture/index",
     "pages/culture/info/index",
     "pages/user/logout/index",
-	"pages/order/orderList/index",
-	"pages/user/linkman/add/index",
-	"pages/user/address/add/index",
-	"pages/user/linkman/index",
-  "pages/user/userPrivacy/index",
-	"pages/user/personalInfo/index",
-  "pages/info/luggageInfo/index"
+    "pages/order/orderList/index",
+    "pages/user/linkman/add/index",
+    "pages/user/address/add/index",
+    "pages/user/linkman/index",
+    "pages/user/userPrivacy/index",
+    "pages/user/personalInfo/index",
+    "pages/info/luggageInfo/index",
+    "pages/order/WineSceneOrder/index"
+  ],
+  "subpackages": [
+    {
+      "root": "subPackages",
+      "pages": [
+        "indexs/index",
+        "index/index",
+        "techanNew/index",
+        "techanCart/index",
+        "feiyiNew/index",
+        "postSearch/index",
+        "gwcOrder/index"
+      ]
+    }
   ],
-  "subpackages": [{
-        "root": "subPackages",
-        "pages": [
-            "indexs/index",
-            "index/index",
-            "techanNew/index",
-            "techanCart/index",
-            "feiyiNew/index",
-            "postSearch/index",
-            "gwcOrder/index"
-        ]
-    }],
   "plugins": {
-      "live-player-plugin": {
-          "version": "1.3.5",
-          "provider": "wx2b03c6e691cd7370"
-      }
+    "live-player-plugin": {
+      "version": "1.3.5",
+      "provider": "wx2b03c6e691cd7370"
+    }
   },
   "requiredPrivateInfos": [
     "getLocation",
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index da9458e..da0b4d3 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -337,9 +337,21 @@ Page({
                     app.globalData.postProduct = product;
                     app.globalData.retailId = this.data.retailId;
                     app.globalData.listName = null
-                    wx.navigateTo({
-                        url: '/pages/order/postOrder/index',
-                    })
+
+                    if (this.data.info.is_package) {
+                        app.globalData.product = product[0];
+                        wx.navigateTo({
+                            url: '/pages/order/WineSceneOrder/index',
+                        })
+
+                    } else {
+                        wx.navigateTo({
+                            url: '/pages/order/postOrder/index',
+                        })
+                    }
+
+
+                    
                 } else {
                     let tag_id = this.data.info.tag_id,type = ''
                     if (tag_id.includes(20) || tag_id.includes(19)) {  //文创
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index fb79d30..48812d8 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -126,14 +126,18 @@
   </view>
 </view>
 
-  <view class="btns">
+<view class="btns" wx:if="{{info&&info.is_package}}">
+    <view class="btn" style="border-radius: 39rpx;" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
+    <view class="btn disable"  style="border-radius: 39rpx;" wx:elif="{{info}}">该商品已下架</view>
+</view>
+  <view class="btns" wx:if="{{info&&!info.is_package}}">
     <view class="btn" bindtap="showCart">加入购物车</view>
     <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
     <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<navigator wx:if="{{!info.is_package}}" url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js
new file mode 100644
index 0000000..a8df32e
--- /dev/null
+++ b/pages/order/WineSceneOrder/index.js
@@ -0,0 +1,438 @@
+// pages/order/scene/index.js
+let app = getApp()
+import util from "../../../utils/util"
+import commonApi from "../../../utils/https/common"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    product:null,
+    productNum: 1,
+    linkmanList: [],
+    date: "",
+    time: "",
+    remark: "",
+    singlePrice: 0,
+    type: null,
+    coupon:null,
+    isLogin: false,
+    kjId: null,
+    gp_id: null,
+    groupName: "",
+    prizeId: null,
+    select_allowance: false,
+    showAllowance: false,
+    allowance_data: null,
+    allowance_price: 0,
+    pIndex: 0,
+    flag:null,
+	ticket_type:1,
+    isCar:'single',
+    showMask: false,
+    price:0,
+
+    status:false,
+    date: "",
+    time: "",
+    ydxz:false, //预定须知弹框
+    bookingInfo: null,
+    bookingInfoTitle: "",
+    showDate:false,
+    showDate2:false,
+    showYhq:null,
+    couponFlag:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      product: app.globalData.product,
+      type: options.type,
+      kjId: app.globalData.kjId,
+      gp_id: app.globalData.gp_id || app.globalData.team_id,
+      prizeId: wx.getStorageSync('prizeId'),
+      flag:options.flag,
+      date:null,
+      isCar:options.isCar,
+      showYhq:app.globalData.listName?false:true
+    })
+    console.log('-------',this.data.showYhq,this.data.time);
+    // debugger
+
+
+    if (!this.data.product) {
+      util.back();
+      return;
+    }
+    if (this.data.product.productNum) {
+      this.setData({
+        productNum: this.data.product.productNum < 1 ? 1 : this.data.product.productNum
+      })
+    }else{
+		this.setData({productNum: 1})
+    }
+
+    this.setData({singlePrice: this.data.product.sku.price})
+    this.showAllPrice()
+
+    console.log(this.data);
+    this.getNewCoupon()
+    this.couponCom = this.selectAllComponents("#coupon")[0];
+
+  },
+
+
+  showBookingInfo: function (e) {
+    this.setData({
+      bookingInfo: this.data.product.sku.sku_model,
+      bookingInfoTitle: this.data.product.sku.sku_name
+    })
+    util.pagePoint({
+      event: "scene_notice",
+      param: {
+        type: this.data.product.type,
+        id: this.data.product.id
+      }
+    }, 1)
+  },
+  closeMask: function () {
+    this.setData({
+      bookingInfo: null
+    })
+  },
+  showAllPrice:function () {
+
+    console.log('couponInfo',app.globalData.couponInfo);
+   
+      let price = 0
+      if (this.data.coupon) {
+        console.log(app.globalData.couponInfo,this.data.coupon);
+        if (this.data.coupon.activity.discount_type == 'pricebreak') {
+          price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+       } else {
+        price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+       }
+      } else {
+        price = this.data.singlePrice * this.data.productNum
+      }
+      
+      if (price >0) {
+        this.setData({
+          price:price/100
+        })
+      }else {
+        this.setData({
+          price:0
+        })
+      }
+      // console.log(this.data.singlePrice);
+    if (price >0) {
+      this.setData({
+        price:price/100
+      })
+    }else {
+      this.setData({
+        price:0
+      })
+    }
+
+  },
+  cancel: function () {
+    this.setData({
+      showMask:false
+    })
+  },
+  changeGroupName: function (e) {
+    this.setData({
+      groupName: e.detail.value
+    })
+  },
+  setLinkman: function (e) {
+    if (e.detail.phone || e.detail.phone=='') {
+      this.setData({
+        phone:e.detail.phone
+      })
+    }else {
+      console.log(e);
+      let linkmanList = e.detail;
+      if (this.data.productNum != linkmanList.length && this.data.coupon) {
+        // wx.showToast({
+        //   title: '订单价格发生变化，请重新选择优惠券',
+        //   icon: 'none'
+        // })
+      }
+
+    this.setData({
+      // productNum: productNum,
+      linkmanList: linkmanList
+    })
+    console.log(this.data.linkmanList);
+    this.totalPrice(this.data.singlePrice)
+    }
+  },
+  add: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
+      wx.showToast({
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        icon: 'none'
+      })
+      return;
+    }
+    this.setData({
+      productNum: this.data.productNum + 1
+    })
+	this.data.product.num = this.data.productNum
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  minus: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.productNum == 1) return;
+    if (this.data.coupon) {
+      wx.showToast({
+        title: '订单价格发生变化，请重新选择优惠券',
+        icon: 'none'
+      })
+    }
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag && this.data.type!='museum') {
+      // this.couponCom.setNullCoupon()
+
+    }
+    app.globalData.couponInfo = null;
+    console.log(this.data.couponFlag);
+    this.setData({
+      productNum: (this.data.productNum - 1),
+      coupon: null,
+      couponFlag:true
+    })
+	this.data.product.num = this.data.productNum
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  totalPrice(price) {
+    let allPrice
+    if (this.data.coupon) {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
+        allPrice = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      allPrice = this.data.singlePrice * this.data.productNum
+    }
+      
+    // allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      if (allPrice >0) {
+        this.setData({
+          price:allPrice/100,
+          singlePrice:price
+        })
+      }else {
+        this.setData({
+          price:0,
+          singlePrice:price
+        })
+      }
+      console.log('singlePrice',this.data.singlePrice);
+  },
+
+ 
+  order:function() {
+    let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
+    let linkmanIds = [];
+
+    let data = {
+      coupon_id: this.data.coupon ? this.data.coupon.id : null,
+      source: "WECHATXCX",
+      product_list: [{
+        type: product.product.type,
+        product_id: product.product.id,
+        sku_id: product.sku.id,
+        start_time: '',
+        end_time: '',
+        use_date: '',
+        visitors: linkmanIds.join(","),
+        remark: remark,
+        product_num:  productNum,
+        phone:this.data.phone,// 不实名的时候传的手机号参数
+      }],
+      originate_order_id: this.data.kjId,
+      gp_id: app.globalData.gp_id,
+      team_id: app.globalData.team_id,
+      
+    }
+    if (app.globalData.from) {
+      data.system_name = app.globalData.from;
+    }
+    if (app.globalData.retailId) {
+      data.commission_code = app.globalData.retailId;
+      app.globalData.retailId = null;
+    }
+    if (app.globalData.category_id) {
+      data.category_id = app.globalData.category_id;
+    }
+    if (this.data.prizeId) {
+      data.lottery_id = this.data.prizeId
+    }
+    let service = 'order/create', postData = {
+      data: JSON.stringify(data)
+    }
+    // if (app.globalData.product.isGroup == 1) {
+    //   service = "team_order/appoint"
+    //   postData.member_num = this.data.productNum
+    //   postData.team_name = this.data.groupName
+    //   postData.type = 1;
+    // }
+	if(app.globalData.list){
+        app.globalData.list[app.globalData.index] = this.data.product
+    }
+  // app.globalData.linkmanList = this.data.linkmanList
+  app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+  console.log(app.globalData);
+	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
+		if(app.globalData.createDate){
+			app.globalData.createDate.product_list.push(data.product_list[0])
+		}else{
+      app.globalData.createDate = data
+    }
+    console.log(app.globalData.createDate);
+		app.globalData.index = app.globalData.index + 1
+		app.globalData.product = app.globalData.list[app.globalData.index]
+		wx.redirectTo({
+		  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
+		})
+		return
+	}else{
+		// if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
+        if (false) {
+			if(app.globalData.createDate){
+				app.globalData.createDate.product_list.push(data.product_list[0])
+			}
+			wx.redirectTo({
+			  url: '/pages/order/orderList/index?flag='+ this.data.flag
+			})
+		}else{
+			commonApi.user_post(service, postData).then(res => {
+			  if (app.globalData.kjId) {
+			    this.setData({
+			      kjId: null
+			    });
+			    app.globalData.kjId = null;
+			  }
+			  if (app.globalData.gp_id) {
+			    this.setData({
+			      gp_id: null
+			    });
+			    app.globalData.gp_id = null;
+			  }
+			  if (res.code == 1 && app.globalData.product.isGroup == 1) {
+			    // 团购跳转到团购详情
+			    wx.navigateTo({
+			      url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order'
+			    })
+			  }
+			})
+		}
+	}
+  },
+  next: function () {
+	console.log(this.data)
+    if (!util.isTel(this.data.phone)) {
+      wx.showToast({
+        title: '请输入正确的手机号',
+        icon: 'none'
+      })
+      return
+    }
+    this.setData({
+      showMask:true
+    })
+  
+  },
+
+
+  //获取最高优惠券
+  getNewCoupon(e){
+   this.setData({
+      coupon:e.detail
+   })
+   this.showAllPrice()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+    if (!this.data.isLogin) {
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          this.setData({
+            isLogin: true
+          })
+        }
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+    this.setData({
+      couponFlag:false
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    this.setData({
+      kjId: null,
+      gp_id: null
+    });
+    app.globalData.kjId = null;
+    app.globalData.gp_id = null;
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/order/WineSceneOrder/index.json b/pages/order/WineSceneOrder/index.json
new file mode 100644
index 0000000..17ea59b
--- /dev/null
+++ b/pages/order/WineSceneOrder/index.json
@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "date1":"../components/date/index",
+    "contact":"../components/contact/index",
+    "coupon":"../components/coupon/index",
+    "notice":"/pages/component/notice/notice",
+    "date":"/pages/order/components/date"
+  }
+}
\ No newline at end of file
diff --git a/pages/order/WineSceneOrder/index.wxml b/pages/order/WineSceneOrder/index.wxml
new file mode 100644
index 0000000..e5971bf
--- /dev/null
+++ b/pages/order/WineSceneOrder/index.wxml
@@ -0,0 +1,54 @@
+<!--pages/order/scene/index.wxml-->
+<view >
+  <title title="订单填写"></title>
+ 
+  <view class="box" style="padding: 42rpx 21rpx 45rpx 19rpx;display: flex;justify-content: space-between;align-items: center;">
+    <view style="width: 550rpx;">
+      <view style="font-weight: 500;font-size: 36rpx;color: #000000;" class="textOver2">
+        {{product.product.title}}
+      </view>
+    </view>
+    
+  </view>
+
+  <view class="box">
+    <view class="box-title">
+      <view style="flex:1">{{product.sku.sku_name}}</view>
+      <view class="s-price">
+        {{product.sku.price/100}}
+      </view>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <view class="number-box">{{productNum}}</view>
+      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+ 
+    </view>
+    <view class="text1">
+      <text wx:for="{{product.sku.display_tags}}">
+        {{item}}<text style="margin:0 8rpx;" wx:if="{{index+1<=product.sku.display_tags.length}}">|</text> 
+      </text>
+      <text bindtap="showBookingInfo">预订须知 ></text>
+    </view>
+    <!-- <view class="text2">
+      <text wx:for="{{product.sku.display_tags}}" style="margin-right: 15rpx;">{{item}}</text>
+    </view> -->
+  </view>
+
+  <contact wx:if="{{isLogin}}" type="{{null}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{0}}" is_real_name="{{0}}"></contact>
+
+  
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum' && showYhq}}" id="coupon"
+    money="{{singlePrice * productNum}}" sku="{{product.sku.id}}" couponFlag="{{couponFlag}}"></coupon>
+
+ 
+
+  <view class="fixed-bottom" >
+    <view class="fixed-price-box" ><text>合计：</text>
+      <text class="price">¥{{price}}</text>
+    </view>
+    <view class="fixed-btn" bindtap="order">提交订单</view>
+  </view>
+<notice bookingInfo="{{bookingInfo}}" skuName="{{bookingInfoTitle}}" wx:if="{{bookingInfo}}" bind:close="closeMask">
+</notice>
+
+</view>
\ No newline at end of file
diff --git a/pages/order/WineSceneOrder/index.wxss b/pages/order/WineSceneOrder/index.wxss
new file mode 100644
index 0000000..3e49fea
--- /dev/null
+++ b/pages/order/WineSceneOrder/index.wxss
@@ -0,0 +1,453 @@
+/* pages/.wxss */
+page {
+    background: #f6f6f6;
+  }
+  
+  .group-order {
+    background: #fff;
+  }
+  
+  .product-info {
+    padding: 20rpx 47rpx;
+    border-bottom: 1rpx solid #ccc;
+  }
+  
+  .product-title {
+    font-size: 33rpx;
+    color: #000;
+    font-weight: 500;
+  }
+  
+  .product-price {
+    color: #D62828;
+    font-size: 27rpx;
+  }
+  
+  .group-order .box-title {
+    margin: 0;
+  }
+  
+  .group-order .box,
+  .group-order .date-box {
+    border-bottom: 1rpx solid #D8D8D8;
+    border-radius: 0;
+    margin: 0 25rpx;
+  }
+  
+  .group-order .dates-boxes {
+    border-top: none;
+    padding-top: 0;
+  }
+  
+  .group-order .date-time.disable {
+    background: #CCCCCC;
+    color: #fff;
+  }
+  
+  .box {
+    margin: 30rpx 25rpx;
+    background: white;
+    border-radius: 9rpx;
+  }
+  
+  .box-title {
+    height: 113rpx;
+    margin: 0 20rpx;
+    font-size: 31rpx;
+    color: #000;
+    font-weight: 500;
+    display: flex;
+    align-items: center;
+  }
+  
+  .dates-boxes {
+    display: flex;
+    align-items: center;
+    padding: 31rpx 21rpx;
+    /* border-top: 1rpx solid #ccc; */
+  }
+  
+  .date-item {
+    width: 120rpx;
+    height: 133rpx;
+    border-radius: 10rpx;
+    /* border: 1rpx solid #333; */
+    text-align: center;
+    font-size: 27rpx;
+    color: #000;
+    margin-right: 20rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    background: #F5F5F5;
+    flex-shrink: 0;
+  }
+  
+  .date-item.active {
+    border-color: #0B898E;
+    color: #fff;
+    background: #0B898E;
+  }
+  
+  .date-item.disable {
+    border-color: #CCCCCC;
+    color: #999;
+  }
+  
+  .date-item .price {
+    font-size: 25rpx;
+    color: #D62828;
+  }
+  
+  .date-item.active .price {
+    color: #fff;
+  }
+  .date-item.active view {
+    color: #fff;
+  }
+  
+  .date-item.disable .price {
+    color: #999;
+  }
+  .date-item.disable .short-date {
+    color: #999;
+  }
+  
+  .more-item {
+    /* width: 99rpx;
+    margin-right: 0; */
+    position: absolute;
+      right: 0;
+      text-align: center;
+      padding: 0 26rpx 0 24rpx;
+      display: flex;
+      font-weight: 400;
+      font-size: 27rpx;
+      color: #0B898E;
+      align-items: center;
+  }
+  
+  .date-times {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0 21rpx;
+    padding-top: 34rpx;
+    padding-bottom: 10rpx;
+    /* border-top: 1rpx dashed #ccc; */
+    flex-wrap: wrap;
+  }
+  
+  .date-time {
+    width: 315rpx;
+    line-height: 58rpx;
+    /* border: 1px solid #333; */
+    border-radius: 10rpx;
+    text-align: center;
+    font-size: 25rpx;
+    flex-shrink: 0;
+    margin-bottom: 24rpx;
+    color: #000;
+    background-color: #F5F5F5;
+  }
+  
+  .date-time.disable {
+    /* border-color: #ccc;
+    color: #666666; */
+    background: #F5F5F5;
+      font-weight: 400;
+      font-size: 25rpx;
+      color: #999999;
+  }
+  .short-date {
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+  }
+  
+  .date-time.active {
+    border-color: #0B898E;
+    background: #0B898E;
+    color: #fff;
+  }
+  
+  .box-title .iconfont {
+    font-size: 28rpx;
+    flex-shrink: 0;
+  }
+  
+  .number-box {
+    font-size: 29rpx;
+    font-weight: 500;
+    color: #000;
+    flex-shrink: 0;
+    /* width: 67rpx; */
+    line-height: 49rpx;
+    /* background: #F0F0F0; */
+    border-radius: 7rpx;
+    text-align: center;
+    margin: 0 20rpx;
+  }
+  
+  .fixed-bottom {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 113rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: white;
+    z-index: 1;
+    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  }
+  
+  .yuyue-box {
+    height: 138rpx;
+    justify-content: center;
+  }
+  
+  .fixed-btn {
+    width: 320rpx;
+    line-height: 113rpx;
+    background: #D62828;
+    color: #fff;
+    text-align: center;
+    font-size: 36rpx;
+    font-weight: 500;
+  }
+  
+  .fixed-price-box {
+    margin-left: 25rpx;
+    flex-shrink: 0;
+    font-size: 29rpx;
+    color: #333;
+    font-weight: 500;
+  }
+  
+  .fixed-price-box .price {
+    color: #D62828;
+    font-size: 36rpx;
+    margin-left: 10rpx;
+  }
+  
+  .allowance {
+    justify-content: space-between;
+  }
+  
+  .allowance>view:nth-child(2) {
+    display: flex;
+    align-items: center;
+  }
+  
+  .allowance image {
+    width: 40rpx;
+    height: 40rpx;
+    margin-left: 10rpx;
+  }
+  
+  .allowance .border {
+    width: 30rpx;
+    height: 30rpx;
+    border-radius: 50%;
+    border: 4rpx solid #0B98BE;
+    margin-left: 10rpx;
+  }
+  
+  .coupon-btn {
+    width: 138rpx;
+    line-height: 56rpx;
+    border: 1px solid #333333;
+    border-radius: 29rpx;
+    text-align: center;
+    font-size: 28rpx;
+    color: #000;
+  }
+  
+  .box-title input {
+    flex: 1;
+    display: block;
+    font-size: 31rpx;
+    color: #666;
+    margin-left: 15rpx;
+    font-weight: 400;
+    text-align: right;
+  }
+  
+  .yuyue-btn {
+    width: 657rpx;
+    line-height: 78rpx;
+    border-radius: 39rpx;
+  }
+  
+  .group-order .yuyue-box {
+    height: 100rpx;
+  }
+  
+  .group-order .yuyue-btn {
+    width: 100%;
+    /* height: 100%; */
+    line-height: 100rpx;
+    border-radius: 0;
+  }
+  
+  .mask-allowance .mask-content {
+    margin: auto;
+    top: initial;
+    bottom: initial;
+    padding: 20rpx;
+  }
+  
+  .mask-allowance .mask-content .rule-title {
+    text-align: center;
+    margin-bottom: 20rpx;
+  }
+  
+  .dialog-top {
+    color: #999;
+    font-weight: 500;
+    padding: 40rpx 33.33rpx 0;
+  }
+  
+  .scene-title {
+    font-size: 35rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 32.67rpx;
+  }
+  
+  .people-message {
+    margin-bottom: 26.67rpx;
+    /* padding-bottom: 26.67rpx; */
+    /* border-bottom: 1px solid #F0F0F0; */
+    font-weight: bold;
+    font-size: 32rpx;
+  }
+  
+  .people {
+    border-top: 1rpx solid #F0F0F0;
+    padding: 26.67rpx 0 24rpx;
+  }
+  
+  .flex {
+    display: flex;
+  }
+  
+  .bottom-btn {
+    display: flex;
+    border-top: 1rpx solid #F0F0F0;
+    height: 96rpx;
+    /* padding: 32.67rpx 0; */
+  }
+  
+  .cancle {
+    width: 50%;
+    color: #999;
+    text-align: center;
+    line-height: 96rpx;
+  }
+  
+  .confirm {
+    width: 50%;
+    text-align: center;
+    color: #D62828;
+    line-height: 96rpx;
+    border-left: 1rpx solid #F0F0F0;
+  }
+  
+  .mask-content1 {
+    max-height: 710rpx;
+    position: relative;
+    z-index: 1;
+    width: 80%;
+    background: white;
+    border-radius: 12rpx;
+    /* margin-bottom: 45%; */
+    overflow-y: auto;
+    margin: auto;
+  }
+  .change-date {
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #0B898E;
+  }
+  .text1 {
+      margin-left: 21rpx;
+      font-weight: 400;
+      font-size: 23rpx;
+      color: #0B898E;
+      margin-bottom: 21rpx;
+      display: flex;
+      align-items: flex-end;
+      padding-bottom: 40rpx;
+  }
+  .text2 {
+      margin-left: 22rpx;
+      font-weight: 400;
+      font-size: 23rpx;
+      color: #666666;
+      padding-bottom: 41rpx;
+  }
+  .mask-content2 {
+    position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      width: 100%;
+      background: white;
+      border-radius: 12rpx;
+      overflow-y: auto;
+      height: 1100rpx;
+  }
+  .bottom-box {
+    height: 133rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
+    padding: 0 50rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+  }
+  .totalPrice {
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 48rpx;
+    color: #D62828;
+  }
+  .totalPrice::before {
+    content: "￥";
+    font-size: 24rpx;
+  }
+  .next {
+    width: 250rpx;
+    height: 80rpx;
+    background: #D62828;
+    border-radius: 40rpx;
+    font-family: PingFang;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 80rpx;
+  }
+  .icon-close {
+    position: absolute;
+    top: 30rpx;
+    right: 30rpx;
+  }
+  .s-price {
+    font-weight: 500;
+    font-size: 36rpx;
+    color: #D62828;
+    margin-right: 17rpx;
+  }
+  .s-price::before {
+    content: "￥";
+    font-size: 24rpx;
+  }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 3ee68f4..0ddceb1 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=428628",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "首页",
           "pathName": "pages/index/index",
diff --git a/utils/util.js b/utils/util.js
index 8ccbf50..04f6e9c 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -179,6 +179,14 @@ const gotoDetail = (item,isPagePoint) =>{
     },
     type: item.type
   }
+
+  if (item.is_package === 1) {
+    wx.navigateTo({
+        url: '/pages/info/postProductInfo/index?id='+item.id,
+    })
+      return
+  }
+
   switch(item.type){
     case "tenscenic":
      
@@ -320,7 +328,13 @@ const gotoDetail = (item,isPagePoint) =>{
 const orderMoreTime = function(item){
   if(item && item.order_product_list && item.order_product_list[0]){
     let info = item.order_product_list[0];
-    if(info.product_model=='movie'){
+    console.log(info)
+    if (info.is_package === 1) {
+        wx.navigateTo({
+            url: '/pages/info/postProductInfo/index?id='+info.id,
+        })
+    }
+    else if(info.product_model=='movie'){
       wx.navigateTo({
         url: '/pages/list/movieticket/index',
       })

From 5a8c76f6e3d2b0b1b60c8c8638d5ff88535cac32 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 4 Sep 2024 13:22:58 +0800
Subject: [PATCH 200/471] =?UTF-8?q?=E9=85=92=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.wxml | 7 ++++++-
 utils/util.js                              | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 8d02f7e..9078068 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -50,7 +50,12 @@
   </view>
   <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
-    <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
+    <view wx:if="{{info.state!='UNPAID'}}">
+        <navigator wx:if="{{info.order_product_list[0].is_package}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+
+        <navigator wx:else  url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
+    </view>
+    
     <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
diff --git a/utils/util.js b/utils/util.js
index 04f6e9c..aa7c720 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -331,7 +331,7 @@ const orderMoreTime = function(item){
     console.log(info)
     if (info.is_package === 1) {
         wx.navigateTo({
-            url: '/pages/info/postProductInfo/index?id='+info.id,
+            url: '/pages/info/postProductInfo/index?id='+info.product_id,
         })
     }
     else if(info.product_model=='movie'){

From 6c3db25c39f90a89b8adfad7aeb5540a53ea22fb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 4 Sep 2024 14:10:23 +0800
Subject: [PATCH 201/471] fix

---
 pages/user/order/sceneOrderInfo/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index b15311c..9806bcb 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -212,6 +212,13 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+    if (item.is_package) {
+        wx.navigateTo({
+            url:"/pages/info/postProductInfo/index?id="+item.product_id
+        })
+        return
+    }
+
     if (item.product_model=='ticket') {
       wx.navigateTo({
         url:"/pages/info/sceneProductInfo/index?id="+item.scene_id

From 91faca88a9ee4afae49db93111e3268b5d43c015 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 4 Sep 2024 15:45:45 +0800
Subject: [PATCH 202/471] fix

---
 pages/user/likes/index.js   | 9 +++++++++
 pages/user/likes/index.wxml | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pages/user/likes/index.js b/pages/user/likes/index.js
index 1a48a93..52c4270 100644
--- a/pages/user/likes/index.js
+++ b/pages/user/likes/index.js
@@ -136,6 +136,15 @@ Page({
     let item = e.currentTarget.dataset.item;
     console.log(item)
     let type = item.product?item.product.type:item.scene.type
+
+    if (item.product.is_package) {
+        wx.navigateTo({
+            url: '/pages/info/postProductInfo/index?id='+item.product.id
+          });
+          return
+    }
+
+
     switch(type){
       case "ticket":
         wx.navigateTo({
diff --git a/pages/user/likes/index.wxml b/pages/user/likes/index.wxml
index 248ee03..fb366e4 100644
--- a/pages/user/likes/index.wxml
+++ b/pages/user/likes/index.wxml
@@ -11,7 +11,7 @@
     <view class="right-info">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="price">￥{{item.product.price/100}}</view>
-      <view class="location" wx:if="{{item.product.address}}"><text class="iconfont icon-location"></text> {{item.product.address}}</view>
+      <view class="location textOver" wx:if="{{item.product.address}}"><text class="iconfont icon-location"></text> {{item.product.address}}</view>
     </view>
   </view>
   <view class='del' catchtap="del1" data-index="{{index}}">删除</view>
@@ -22,7 +22,7 @@
     <view class="right-info">
       <view class="title textOver">{{item.scene.title}}</view>
       <view class="price">￥{{item.scene.price/100}}</view>
-      <view class="location"><text class="iconfont icon-location"></text> {{item.scene.address}}</view>
+      <view class="location textOver"><text class="iconfont icon-location"></text> {{item.scene.address}}</view>
     </view>
   </view>
   <view class='del' catchtap="del2" data-index="{{index}}">删除</view>

From 898bba7a14a9994546f044d6c9001dcc655f63d1 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Sep 2024 10:02:19 +0800
Subject: [PATCH 203/471] =?UTF-8?q?=E9=85=92=E6=99=AF=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.wxml |  9 +++------
 pages/order/components/date/index.js  | 16 +++++++++-------
 pages/order/scene/index.js            | 22 ++++++++++++++++++++--
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 48812d8..2f079ba 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -126,18 +126,15 @@
   </view>
 </view>
 
-<view class="btns" wx:if="{{info&&info.is_package}}">
-    <view class="btn" style="border-radius: 39rpx;" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
-    <view class="btn disable"  style="border-radius: 39rpx;" wx:elif="{{info}}">该商品已下架</view>
-</view>
-  <view class="btns" wx:if="{{info&&!info.is_package}}">
+
+  <view class="btns">
     <view class="btn" bindtap="showCart">加入购物车</view>
     <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
     <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<navigator wx:if="{{!info.is_package}}" url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 554795a..8193e31 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -118,14 +118,16 @@ Component({
             })
             let seldDate = ''
             if (app.globalData.product.changeFlag) {
-              res.data.forEach(item=> {
-                if (item.date == app.globalData.product.date.date) {
-                  seldDate = item
+                if( app.globalData.product.date) {
+                    res.data.forEach(item=> {
+                        if (item.date == app.globalData.product.date.date) {
+                        seldDate = item
+                        }
+                    })
                 }
-              })
-             setTimeout(() => {
-              this.changeDate(seldDate)
-             })
+                setTimeout(() => {
+                    this.changeDate(seldDate)
+                })
               // this.setData({
               //   activeDate:seldDate
               // })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 31de4f4..c224e55 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -66,7 +66,7 @@ Page({
       is_authentication:app.globalData.product.sku.sku_model.is_authentication,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
       date: app.globalData.product.date,
-      time: app.globalData.product.time,
+      time: app.globalData.product.time || {},
       showYhq:app.globalData.listName?false:true
     })
     console.log('-------',this.data.showYhq,this.data.time);
@@ -74,11 +74,13 @@ Page({
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
     console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name);
-
     if (!app.globalData.product) {
       util.back();
       return;
     }
+    if (!app.globalData.product.time) {
+        app.globalData.product.time = {}
+    }
     if (app.globalData.product.productNum) {
       this.setData({
         productNum: app.globalData.product.productNum < 1 ? 1 : app.globalData.product.productNum
@@ -421,6 +423,22 @@ Page({
         return
       }
     }
+    // 判断时间日期
+    if (!date && this.data.ticket_type == 1) {
+        wx.showToast({
+          title: '请选择使用日期',
+          icon: 'none'
+        })
+        return
+    }
+    if (!time && date && date.is_time_stock == true) {
+        wx.showToast({
+          title: '请选择使用时间',
+          icon: 'none'
+        })
+        return
+      }
+
     let data = {
       coupon_id: this.data.coupon ? this.data.coupon.id : null,
       source: "WECHATXCX",

From ea84089b010975de74515b22c8976556a2918a67 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Sep 2024 11:12:04 +0800
Subject: [PATCH 204/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=9C=89=E9=97=A8=E7=A5=A8=E7=A6=81=E7=94=A8=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.js   | 15 ++++++++++++---
 pages/order/orderList/index.wxml | 14 +++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 5793f24..27c84fd 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -22,7 +22,10 @@ Page({
   allowance_data: null,
   allowance_price: 0,
   flag:null,
-  linkmanList:[]
+  linkmanList:[],
+  finalPrice: 0,
+
+  showCoupon: false,
   },
 
   /**
@@ -35,6 +38,7 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       flag:options.flag,
+      showCoupon: (app.globalData.list || []).length<=0,
       // linkmanList: app.globalData.linkmanList
     })
     console.log('-------------',this.data.ticketList);
@@ -94,10 +98,12 @@ Page({
         coupon: null
       })
     }
+
     this.setData({
       showPrice: app.globalData.kjId ? 0 : price
     })
   },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -111,12 +117,15 @@ Page({
       }
     })
 	},
-	    //获取最高优惠券
-			getNewCoupon(e){
+	//获取最高优惠券
+	getNewCoupon(e){
         this.setData({
           coupon:e.detail
        })
      },
+
+
+
   /**
    * 生命周期函数--监听页面显示
    */
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index a783dba..29fc4b1 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -66,12 +66,20 @@
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view> -->
-<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{showCoupon && !kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
 <view class="fixed-bottom">
     <view class="fixed-price-box">
-		<text>合计:</text>
-		<text class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+        
+      <view wx:if="{{coupon && coupon.activity.discount_type != 'pricebreak'}}">
+        <text>合计：</text><text
+        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+      </view>
+      <view wx:else>
+        <text>合计：</text>
+        <text class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+      </view>
+
     </view>
     <view class="fixed-btn" bindtap="order">下一步</view>
 </view>
\ No newline at end of file

From 7c750c6aa0d8849734a5cfc1119607e2593fd84f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Sep 2024 15:57:16 +0800
Subject: [PATCH 205/471] fix

---
 pages/user/cartlist/list.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 19260f1..b013ace 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -189,6 +189,9 @@ Page({
                     })
                     return;
                 }
+
+                this.setData({flag:''})
+
                 if (product.length > 0 && product1.length > 0) {
                     this.setData({
                         flag: 'mix',
@@ -204,7 +207,13 @@ Page({
                         isCar: 'single'
                     })
                 }
-                console.log(product1);
+                console.log(product1,'product1');
+
+                app.globalData.listName = null
+                if (product1.length>0) {
+                    app.globalData.listName = 'car'
+                }
+
                 app.globalData.postProduct = product;
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]

From 9db1dd2fc70e81cf7aa6622ed0707d7ef1758823 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 6 Sep 2024 20:51:10 +0800
Subject: [PATCH 206/471] =?UTF-8?q?=E9=85=92=E6=99=AF=E4=B8=8B=E5=8D=95fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/TitleHeader.js      |  3 ++-
 pages/order/WineSceneOrder/index.js | 36 +++++++++++++++--------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 31dd347..9da6b3a 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -54,7 +54,8 @@ Component({
       // }
       const pages = getCurrentPages();
 	  if(pages[pages.length-1].route.indexOf('linkman/add')==-1){
-		app.globalData.index = app.globalData.index -1
+        app.globalData.index = app.globalData.index -1
+        console.log(app.globalData.index, 'appGlobalIndex')
 	  }
       if(pages[pages.length-1].route.indexOf('login')!=-1 || pages[pages.length-1].route.indexOf('bindTel')!=-1){
         // 如果是登录页面的返回需要返回两层
diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js
index a8df32e..94defbc 100644
--- a/pages/order/WineSceneOrder/index.js
+++ b/pages/order/WineSceneOrder/index.js
@@ -63,7 +63,7 @@ Page({
     console.log('-------',this.data.showYhq,this.data.time);
     // debugger
 
-
+    console.log(app.globalData.list, app.globalData.index,'list---index')
     if (!this.data.product) {
       util.back();
       return;
@@ -302,25 +302,27 @@ Page({
     //   postData.team_name = this.data.groupName
     //   postData.type = 1;
     // }
-	if(app.globalData.list){
-        app.globalData.list[app.globalData.index] = this.data.product
-    }
+    // if(app.globalData.list){
+    //   app.globalData.list[app.globalData.index] = this.data.product
+    // }
   // app.globalData.linkmanList = this.data.linkmanList
   app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
   console.log(app.globalData);
-	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
-		if(app.globalData.createDate){
-			app.globalData.createDate.product_list.push(data.product_list[0])
-		}else{
-      app.globalData.createDate = data
-    }
-    console.log(app.globalData.createDate);
-		app.globalData.index = app.globalData.index + 1
-		app.globalData.product = app.globalData.list[app.globalData.index]
-		wx.redirectTo({
-		  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
-		})
-		return
+  
+	// if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
+	if (false) {	
+    if(app.globalData.createDate){
+        app.globalData.createDate.product_list.push(data.product_list[0])
+      }else{
+        app.globalData.createDate = data
+      }
+      console.log(app.globalData.createDate);
+      app.globalData.index = app.globalData.index + 1
+      app.globalData.product = app.globalData.list[app.globalData.index]
+      wx.redirectTo({
+        url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
+      })
+      return
 	}else{
 		// if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
         if (false) {

From 888a7fb7d1bb461dea5b6d6b30b71cac0216268b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 9 Sep 2024 11:19:30 +0800
Subject: [PATCH 207/471] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC(=E4=BB=A3=E7=A0=81=E8=BF=87=E5=A4=A7=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2place3=E5=9B=BE=E7=89=87=E4=B8=BA=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.wxss                           |    2 +
 images/place3.jpg                  |  Bin 318459 -> 0 bytes
 pages/list/activity/index.wxml     |    2 +-
 pages/list/activitynew/index.wxml  |    2 +-
 pages/order/scene/index.js         |    1 +
 pages/user/service/info/index.js   |   21 +-
 pages/user/service/info/index.wxml |    8 +-
 utils/wxParse/emojis/00.gif        |  Bin 0 -> 1810 bytes
 utils/wxParse/html2json.js         |  303 ++++
 utils/wxParse/htmlparser.js        |  192 +++
 utils/wxParse/showdown.js          | 2532 ++++++++++++++++++++++++++++
 utils/wxParse/wxDiscode.js         |  207 +++
 utils/wxParse/wxParse.js           |  159 ++
 utils/wxParse/wxParse.wxml         |  967 +++++++++++
 utils/wxParse/wxParse.wxss         |  206 +++
 15 files changed, 4598 insertions(+), 4 deletions(-)
 delete mode 100644 images/place3.jpg
 create mode 100644 utils/wxParse/emojis/00.gif
 create mode 100644 utils/wxParse/html2json.js
 create mode 100644 utils/wxParse/htmlparser.js
 create mode 100644 utils/wxParse/showdown.js
 create mode 100644 utils/wxParse/wxDiscode.js
 create mode 100644 utils/wxParse/wxParse.js
 create mode 100644 utils/wxParse/wxParse.wxml
 create mode 100644 utils/wxParse/wxParse.wxss

diff --git a/app.wxss b/app.wxss
index 7ef7977..cdecea9 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,5 +1,7 @@
 /**app.wxss**/
 @import './iconfont/iconfont.wxss';
+@import "./utils/wxParse/wxParse.wxss";
+
 .container {
   height: 100%;
   display: flex;
diff --git a/images/place3.jpg b/images/place3.jpg
deleted file mode 100644
index 2c6200e2dffcf8aed93625bc2c6339ce3a6acfb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318459
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
DW5$VH

diff --git a/pages/list/activity/index.wxml b/pages/list/activity/index.wxml
index eb040be..5c6200e 100644
--- a/pages/list/activity/index.wxml
+++ b/pages/list/activity/index.wxml
@@ -41,7 +41,7 @@
           <view wx:if="{{type==2}}">{{item.source?item.source:""}}</view>
         </view>
       </view>
-      <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
+      <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
       <!-- <image  ></image> -->
     </view>
   </view>
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 6adcbd1..e30e9de 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -106,7 +106,7 @@
   <view wx:if="{{list.length>0 && type!=4}}" style="background:#fff;padding:1rpx 0">
     <!-- <view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="activity-item-out"> -->
       <view class="activity-item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
-        <common-image width="320rpx" height='220rpx' style="margin-right: 13rpx;" src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
+        <common-image width="320rpx" height='220rpx' style="margin-right: 13rpx;" src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
         <view class="activity-info">
           <view class="activity-title textOver2">{{item.name || item.title}}</view>
           <view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index c224e55..9577afb 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -74,6 +74,7 @@ Page({
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
     console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name);
+    console.log(app.globalData.list, app.globalData.index,'list---index')
     if (!app.globalData.product) {
       util.back();
       return;
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index c947c6b..be99801 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -1,13 +1,14 @@
 // pages/user/service/info/index.js
 import commonApi from "../../../../utils/https/common"
 import util from "../../../../utils/util"
+import WxParse from "../../../../utils/wxParse/wxParse.js"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    info:null
+    info:null,
   },
 
   /**
@@ -22,12 +23,30 @@ Page({
         this.setData({
           info:res.data
         })
+
+        var article = res.data.answer.replace(/&quot;/g, '');
+        var that = this;
+        WxParse.wxParse('article', 'html', article, that, 0);
+
+        
       })
     }
     else {
       util.back()
     }
   },
+  // wxParse 解析a标签
+  wxParseTagATap: function(e){
+    var href = e.currentTarget.dataset.src;
+    console.log(href);
+    if(href.indexOf("http") >= 0){
+        wx.navigateTo({
+            url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href)
+        })
+    }
+},
+
+
   showService:function(){
     util.pagePoint({
       event:'customer_service_human_click',
diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml
index 81759d7..73623a1 100644
--- a/pages/user/service/info/index.wxml
+++ b/pages/user/service/info/index.wxml
@@ -1,8 +1,14 @@
 <!--pages/user/service/info/index.wxml-->
+<import src="../../../../utils/wxParse/wxParse.wxml"/>
+
 <title title="常见问题"></title>
+
 <view class="ques-ans-box" wx:if="{{info}}">
   <view class="ques-title">{{info.question_name}}</view>
-  <view class="ques-content">{{info.answer}}</view>
+  <!-- <view class="">{{info.answer}}</view> -->
+  <view class="wxParse ques-content">
+    <template is="wxParse" data="{{wxParseData:article.nodes}}"/>
+  </view>
   <view class="ques-tip"><text>以上答案是否解决您的问题?</text> <text class="{{info.useful_info && info.useful_info.is_useful==1?'active':''}}" style="margin:0 10rpx;" bindtap="zan"><text class="iconfont icon-zan"></text>有用({{info.useful_num}})</text> <text bindtap="unzan" class="{{info.useful_info && info.useful_info.is_useful===0?'active':''}}"><text class="iconfont icon-zan-copy"></text>没用({{info.unuseful_num}})</text></view>
 </view>
 <view class="ques-ans-box" wx:if="{{info}}">
diff --git a/utils/wxParse/emojis/00.gif b/utils/wxParse/emojis/00.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5be27cb0ecf9a21240e151962f59f94a2ce361ad
GIT binary patch
literal 1810
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
aFh)GGI9`xTUo*Ck;`0*ODswCb+5LY;c94Pq

literal 0
HcmV?d00001

diff --git a/utils/wxParse/html2json.js b/utils/wxParse/html2json.js
new file mode 100644
index 0000000..6909559
--- /dev/null
+++ b/utils/wxParse/html2json.js
@@ -0,0 +1,303 @@
+/**
+ * html2Json 改造来自: https://github.com/Jxck/html2json
+ * 
+ * 
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+var __placeImgeUrlHttps = "https";
+var __emojisReg = '';
+var __emojisBaseSrc = '';
+var __emojis = {};
+var wxDiscode = require('./wxDiscode.js');
+var HTMLParser = require('./htmlparser.js');
+// Empty Elements - HTML 5
+var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
+// Block Elements - HTML 5
+var block = makeMap("br,a,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
+
+// Inline Elements - HTML 5
+var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
+
+// Attributes that have their values filled in disabled="disabled"
+var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
+
+// Special Elements (can contain anything)
+var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
+function makeMap(str) {
+    var obj = {}, items = str.split(",");
+    for (var i = 0; i < items.length; i++)
+        obj[items[i]] = true;
+    return obj;
+}
+
+function q(v) {
+    return '"' + v + '"';
+}
+
+function removeDOCTYPE(html) {
+    return html
+        .replace(/<\?xml.*\?>\n/, '')
+        .replace(/<.*!doctype.*\>\n/, '')
+        .replace(/<.*!DOCTYPE.*\>\n/, '');
+}
+
+function trimHtml(html) {
+  return html
+        .replace(/\r?\n+/g, '')
+        .replace(/<!--.*?-->/ig, '')
+        .replace(/\/\*.*?\*\//ig, '')
+        .replace(/[ ]+</ig, '<')
+}
+
+
+function html2json(html, bindName) {
+    //处理字符串
+    html = removeDOCTYPE(html);
+    html = trimHtml(html);
+    html = wxDiscode.strDiscode(html);
+    //生成node节点
+    var bufArray = [];
+    var results = {
+        node: bindName,
+        nodes: [],
+        images:[],
+        imageUrls:[]
+    };
+    var index = 0;
+    HTMLParser(html, {
+        start: function (tag, attrs, unary) {
+            //debug(tag, attrs, unary);
+            // node for this element
+            var node = {
+                node: 'element',
+                tag: tag,
+            };
+
+            if (bufArray.length === 0) {
+                node.index = index.toString()
+                index += 1
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                node.index = parent.index + '.' + parent.nodes.length
+            }
+
+            if (block[tag]) {
+                node.tagType = "block";
+            } else if (inline[tag]) {
+                node.tagType = "inline";
+            } else if (closeSelf[tag]) {
+                node.tagType = "closeSelf";
+            }
+
+            if (attrs.length !== 0) {
+                node.attr = attrs.reduce(function (pre, attr) {
+                    var name = attr.name;
+                    var value = attr.value;
+                    if (name == 'class') {
+                        console.dir(value);
+                        //  value = value.join("")
+                        node.classStr = value;
+                    }
+                    // has multi attibutes
+                    // make it array of attribute
+                    if (name == 'style') {
+                        console.dir(value);
+                        //  value = value.join("")
+                        node.styleStr = value;
+                    }
+                    if (value.match(/ /)) {
+                        value = value.split(' ');
+                    }
+                    
+
+                    // if attr already exists
+                    // merge it
+                    if (pre[name]) {
+                        if (Array.isArray(pre[name])) {
+                            // already array, push to last
+                            pre[name].push(value);
+                        } else {
+                            // single value, make it array
+                            pre[name] = [pre[name], value];
+                        }
+                    } else {
+                        // not exist, put it
+                        pre[name] = value;
+                    }
+
+                    return pre;
+                }, {});
+            }
+
+            //对img添加额外数据
+            if (node.tag === 'img') {
+                node.imgIndex = results.images.length;
+                var imgUrl = node.attr.src;
+                if (imgUrl[0] == '') {
+                    imgUrl.splice(0, 1);
+                }
+                imgUrl = wxDiscode.urlToHttpUrl(imgUrl, __placeImgeUrlHttps);
+                node.attr.src = imgUrl;
+                node.from = bindName;
+                results.images.push(node);
+                results.imageUrls.push(imgUrl);
+            }
+            
+            // 处理font标签样式属性
+            if (node.tag === 'font') {
+                var fontSize = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', '-webkit-xxx-large'];
+                var styleAttrs = {
+                    'color': 'color',
+                    'face': 'font-family',
+                    'size': 'font-size'
+                };
+                if (!node.attr.style) node.attr.style = [];
+                if (!node.styleStr) node.styleStr = '';
+                for (var key in styleAttrs) {
+                    if (node.attr[key]) {
+                        var value = key === 'size' ? fontSize[node.attr[key]-1] : node.attr[key];
+                        node.attr.style.push(styleAttrs[key]);
+                        node.attr.style.push(value);
+                        node.styleStr += styleAttrs[key] + ': ' + value + ';';
+                    }
+                }
+            }
+
+            //临时记录source资源
+            if(node.tag === 'source'){
+                results.source = node.attr.src;
+            }
+            
+            if (unary) {
+                // if this tag doesn't have end tag
+                // like <img src="hoge.png"/>
+                // add to parents
+                var parent = bufArray[0] || results;
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            } else {
+                bufArray.unshift(node);
+            }
+        },
+        end: function (tag) {
+            //debug(tag);
+            // merge into parent tag
+            var node = bufArray.shift();
+            if (node.tag !== tag) console.error('invalid state: mismatch end tag');
+
+            //当有缓存source资源时于于video补上src资源
+            if(node.tag === 'video' && results.source){
+                node.attr.src = results.source;
+                delete results.source;
+            }
+            
+            if (bufArray.length === 0) {
+                results.nodes.push(node);
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            }
+        },
+        chars: function (text) {
+            //debug(text);
+            var node = {
+                node: 'text',
+                text: text,
+                textArray:transEmojiStr(text)
+            };
+            
+            if (bufArray.length === 0) {
+                node.index = index.toString()
+                index += 1
+                results.nodes.push(node);
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                node.index = parent.index + '.' + parent.nodes.length
+                parent.nodes.push(node);
+            }
+        },
+        comment: function (text) {
+            //debug(text);
+            // var node = {
+            //     node: 'comment',
+            //     text: text,
+            // };
+            // var parent = bufArray[0];
+            // if (parent.nodes === undefined) {
+            //     parent.nodes = [];
+            // }
+            // parent.nodes.push(node);
+        },
+    });
+    return results;
+};
+
+function transEmojiStr(str){
+  // var eReg = new RegExp("["+__reg+' '+"]");
+//   str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
+  
+  var emojiObjs = [];
+  //如果正则表达式为空
+  if(__emojisReg.length == 0 || !__emojis){
+      var emojiObj = {}
+      emojiObj.node = "text";
+      emojiObj.text = str;
+      array = [emojiObj];
+      return array;
+  }
+  //这个地方需要调整
+  str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
+  var eReg = new RegExp("[:]");
+  var array = str.split(eReg);
+  for(var i = 0; i < array.length; i++){
+    var ele = array[i];
+    var emojiObj = {};
+    if(__emojis[ele]){
+      emojiObj.node = "element";
+      emojiObj.tag = "emoji";
+      emojiObj.text = __emojis[ele];
+      emojiObj.baseSrc= __emojisBaseSrc;
+    }else{
+      emojiObj.node = "text";
+      emojiObj.text = ele;
+    }
+    emojiObjs.push(emojiObj);
+  }
+  
+  return emojiObjs;
+}
+
+function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
+    __emojisReg = reg;
+    __emojisBaseSrc=baseSrc;
+    __emojis=emojis;
+}
+
+module.exports = {
+    html2json: html2json,
+    emojisInit:emojisInit
+};
+
diff --git a/utils/wxParse/htmlparser.js b/utils/wxParse/htmlparser.js
new file mode 100644
index 0000000..811ddac
--- /dev/null
+++ b/utils/wxParse/htmlparser.js
@@ -0,0 +1,192 @@
+/**
+ * 
+ * htmlParser改造自: https://github.com/blowsie/Pure-JavaScript-HTML5-Parser
+ * 
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
+	endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/,
+	attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
+
+// Empty Elements - HTML 5
+var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
+
+// Block Elements - HTML 5
+var block = makeMap("a,address,code,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
+
+// Inline Elements - HTML 5
+var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
+
+// Attributes that have their values filled in disabled="disabled"
+var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
+
+// Special Elements (can contain anything)
+var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
+
+function HTMLParser(html, handler) {
+	var index, chars, match, stack = [], last = html;
+	stack.last = function () {
+		return this[this.length - 1];
+	};
+
+	while (html) {
+		chars = true;
+
+		// Make sure we're not in a script or style element
+		if (!stack.last() || !special[stack.last()]) {
+
+			// Comment
+			if (html.indexOf("<!--") == 0) {
+				index = html.indexOf("-->");
+
+				if (index >= 0) {
+					if (handler.comment)
+						handler.comment(html.substring(4, index));
+					html = html.substring(index + 3);
+					chars = false;
+				}
+
+				// end tag
+			} else if (html.indexOf("</") == 0) {
+				match = html.match(endTag);
+
+				if (match) {
+					html = html.substring(match[0].length);
+					match[0].replace(endTag, parseEndTag);
+					chars = false;
+				}
+
+				// start tag
+			} else if (html.indexOf("<") == 0) {
+				match = html.match(startTag);
+
+				if (match) {
+					html = html.substring(match[0].length);
+					match[0].replace(startTag, parseStartTag);
+					chars = false;
+				}
+			}
+
+			if (chars) {
+				index = html.indexOf("<");
+				var text = ''
+				while (index === 0) {
+                                  text += "<";
+                                  html = html.substring(1);
+                                  index = html.indexOf("<");
+				}
+				text += index < 0 ? html : html.substring(0, index);
+				html = index < 0 ? "" : html.substring(index);
+
+				if (handler.chars)
+					handler.chars(text);
+			}
+
+		} else {
+
+			html = html.replace(new RegExp("([\\s\\S]*?)<\/" + stack.last() + "[^>]*>"), function (all, text) {
+				text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, "$1$2");
+				if (handler.chars)
+					handler.chars(text);
+
+				return "";
+			});
+
+
+			parseEndTag("", stack.last());
+		}
+
+		if (html == last)
+			throw "Parse Error: " + html;
+		last = html;
+	}
+
+	// Clean up any remaining tags
+	parseEndTag();
+
+	function parseStartTag(tag, tagName, rest, unary) {
+		tagName = tagName.toLowerCase();
+
+		if (block[tagName]) {
+			while (stack.last() && inline[stack.last()]) {
+				parseEndTag("", stack.last());
+			}
+		}
+
+		if (closeSelf[tagName] && stack.last() == tagName) {
+			parseEndTag("", tagName);
+		}
+
+		unary = empty[tagName] || !!unary;
+
+		if (!unary)
+			stack.push(tagName);
+
+		if (handler.start) {
+			var attrs = [];
+
+			rest.replace(attr, function (match, name) {
+				var value = arguments[2] ? arguments[2] :
+					arguments[3] ? arguments[3] :
+						arguments[4] ? arguments[4] :
+							fillAttrs[name] ? name : "";
+
+				attrs.push({
+					name: name,
+					value: value,
+					escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') //"
+				});
+			});
+
+			if (handler.start) {
+				handler.start(tagName, attrs, unary);
+			}
+
+		}
+	}
+
+	function parseEndTag(tag, tagName) {
+		// If no tag name is provided, clean shop
+		if (!tagName)
+			var pos = 0;
+
+		// Find the closest opened tag of the same type
+		else {
+			tagName = tagName.toLowerCase();
+			for (var pos = stack.length - 1; pos >= 0; pos--)
+				if (stack[pos] == tagName)
+					break;
+		}
+		if (pos >= 0) {
+			// Close all the open elements, up the stack
+			for (var i = stack.length - 1; i >= pos; i--)
+				if (handler.end)
+					handler.end(stack[i]);
+
+			// Remove the open elements from the stack
+			stack.length = pos;
+		}
+	}
+};
+
+
+function makeMap(str) {
+	var obj = {}, items = str.split(",");
+	for (var i = 0; i < items.length; i++)
+		obj[items[i]] = true;
+	return obj;
+}
+
+module.exports = HTMLParser;
diff --git a/utils/wxParse/showdown.js b/utils/wxParse/showdown.js
new file mode 100644
index 0000000..d29206d
--- /dev/null
+++ b/utils/wxParse/showdown.js
@@ -0,0 +1,2532 @@
+/**
+ * 
+ * showdown: https://github.com/showdownjs/showdown
+ * 
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+function getDefaultOpts(simple) {
+  'use strict';
+
+  var defaultOptions = {
+    omitExtraWLInCodeBlocks: {
+      defaultValue: false,
+      describe: 'Omit the default extra whiteline added to code blocks',
+      type: 'boolean'
+    },
+    noHeaderId: {
+      defaultValue: false,
+      describe: 'Turn on/off generated header id',
+      type: 'boolean'
+    },
+    prefixHeaderId: {
+      defaultValue: false,
+      describe: 'Specify a prefix to generated header ids',
+      type: 'string'
+    },
+    headerLevelStart: {
+      defaultValue: false,
+      describe: 'The header blocks level start',
+      type: 'integer'
+    },
+    parseImgDimensions: {
+      defaultValue: false,
+      describe: 'Turn on/off image dimension parsing',
+      type: 'boolean'
+    },
+    simplifiedAutoLink: {
+      defaultValue: false,
+      describe: 'Turn on/off GFM autolink style',
+      type: 'boolean'
+    },
+    literalMidWordUnderscores: {
+      defaultValue: false,
+      describe: 'Parse midword underscores as literal underscores',
+      type: 'boolean'
+    },
+    strikethrough: {
+      defaultValue: false,
+      describe: 'Turn on/off strikethrough support',
+      type: 'boolean'
+    },
+    tables: {
+      defaultValue: false,
+      describe: 'Turn on/off tables support',
+      type: 'boolean'
+    },
+    tablesHeaderId: {
+      defaultValue: false,
+      describe: 'Add an id to table headers',
+      type: 'boolean'
+    },
+    ghCodeBlocks: {
+      defaultValue: true,
+      describe: 'Turn on/off GFM fenced code blocks support',
+      type: 'boolean'
+    },
+    tasklists: {
+      defaultValue: false,
+      describe: 'Turn on/off GFM tasklist support',
+      type: 'boolean'
+    },
+    smoothLivePreview: {
+      defaultValue: false,
+      describe: 'Prevents weird effects in live previews due to incomplete input',
+      type: 'boolean'
+    },
+    smartIndentationFix: {
+      defaultValue: false,
+      description: 'Tries to smartly fix identation in es6 strings',
+      type: 'boolean'
+    }
+  };
+  if (simple === false) {
+    return JSON.parse(JSON.stringify(defaultOptions));
+  }
+  var ret = {};
+  for (var opt in defaultOptions) {
+    if (defaultOptions.hasOwnProperty(opt)) {
+      ret[opt] = defaultOptions[opt].defaultValue;
+    }
+  }
+  return ret;
+}
+
+/**
+ * Created by Tivie on 06-01-2015.
+ */
+
+// Private properties
+var showdown = {},
+    parsers = {},
+    extensions = {},
+    globalOptions = getDefaultOpts(true),
+    flavor = {
+      github: {
+        omitExtraWLInCodeBlocks:   true,
+        prefixHeaderId:            'user-content-',
+        simplifiedAutoLink:        true,
+        literalMidWordUnderscores: true,
+        strikethrough:             true,
+        tables:                    true,
+        tablesHeaderId:            true,
+        ghCodeBlocks:              true,
+        tasklists:                 true
+      },
+      vanilla: getDefaultOpts(true)
+    };
+
+/**
+ * helper namespace
+ * @type {{}}
+ */
+showdown.helper = {};
+
+/**
+ * TODO LEGACY SUPPORT CODE
+ * @type {{}}
+ */
+showdown.extensions = {};
+
+/**
+ * Set a global option
+ * @static
+ * @param {string} key
+ * @param {*} value
+ * @returns {showdown}
+ */
+showdown.setOption = function (key, value) {
+  'use strict';
+  globalOptions[key] = value;
+  return this;
+};
+
+/**
+ * Get a global option
+ * @static
+ * @param {string} key
+ * @returns {*}
+ */
+showdown.getOption = function (key) {
+  'use strict';
+  return globalOptions[key];
+};
+
+/**
+ * Get the global options
+ * @static
+ * @returns {{}}
+ */
+showdown.getOptions = function () {
+  'use strict';
+  return globalOptions;
+};
+
+/**
+ * Reset global options to the default values
+ * @static
+ */
+showdown.resetOptions = function () {
+  'use strict';
+  globalOptions = getDefaultOpts(true);
+};
+
+/**
+ * Set the flavor showdown should use as default
+ * @param {string} name
+ */
+showdown.setFlavor = function (name) {
+  'use strict';
+  if (flavor.hasOwnProperty(name)) {
+    var preset = flavor[name];
+    for (var option in preset) {
+      if (preset.hasOwnProperty(option)) {
+        globalOptions[option] = preset[option];
+      }
+    }
+  }
+};
+
+/**
+ * Get the default options
+ * @static
+ * @param {boolean} [simple=true]
+ * @returns {{}}
+ */
+showdown.getDefaultOptions = function (simple) {
+  'use strict';
+  return getDefaultOpts(simple);
+};
+
+/**
+ * Get or set a subParser
+ *
+ * subParser(name)       - Get a registered subParser
+ * subParser(name, func) - Register a subParser
+ * @static
+ * @param {string} name
+ * @param {function} [func]
+ * @returns {*}
+ */
+showdown.subParser = function (name, func) {
+  'use strict';
+  if (showdown.helper.isString(name)) {
+    if (typeof func !== 'undefined') {
+      parsers[name] = func;
+    } else {
+      if (parsers.hasOwnProperty(name)) {
+        return parsers[name];
+      } else {
+        throw Error('SubParser named ' + name + ' not registered!');
+      }
+    }
+  }
+};
+
+/**
+ * Gets or registers an extension
+ * @static
+ * @param {string} name
+ * @param {object|function=} ext
+ * @returns {*}
+ */
+showdown.extension = function (name, ext) {
+  'use strict';
+
+  if (!showdown.helper.isString(name)) {
+    throw Error('Extension \'name\' must be a string');
+  }
+
+  name = showdown.helper.stdExtName(name);
+
+  // Getter
+  if (showdown.helper.isUndefined(ext)) {
+    if (!extensions.hasOwnProperty(name)) {
+      throw Error('Extension named ' + name + ' is not registered!');
+    }
+    return extensions[name];
+
+    // Setter
+  } else {
+    // Expand extension if it's wrapped in a function
+    if (typeof ext === 'function') {
+      ext = ext();
+    }
+
+    // Ensure extension is an array
+    if (!showdown.helper.isArray(ext)) {
+      ext = [ext];
+    }
+
+    var validExtension = validate(ext, name);
+
+    if (validExtension.valid) {
+      extensions[name] = ext;
+    } else {
+      throw Error(validExtension.error);
+    }
+  }
+};
+
+/**
+ * Gets all extensions registered
+ * @returns {{}}
+ */
+showdown.getAllExtensions = function () {
+  'use strict';
+  return extensions;
+};
+
+/**
+ * Remove an extension
+ * @param {string} name
+ */
+showdown.removeExtension = function (name) {
+  'use strict';
+  delete extensions[name];
+};
+
+/**
+ * Removes all extensions
+ */
+showdown.resetExtensions = function () {
+  'use strict';
+  extensions = {};
+};
+
+/**
+ * Validate extension
+ * @param {array} extension
+ * @param {string} name
+ * @returns {{valid: boolean, error: string}}
+ */
+function validate(extension, name) {
+  'use strict';
+
+  var errMsg = (name) ? 'Error in ' + name + ' extension->' : 'Error in unnamed extension',
+    ret = {
+      valid: true,
+      error: ''
+    };
+
+  if (!showdown.helper.isArray(extension)) {
+    extension = [extension];
+  }
+
+  for (var i = 0; i < extension.length; ++i) {
+    var baseMsg = errMsg + ' sub-extension ' + i + ': ',
+        ext = extension[i];
+    if (typeof ext !== 'object') {
+      ret.valid = false;
+      ret.error = baseMsg + 'must be an object, but ' + typeof ext + ' given';
+      return ret;
+    }
+
+    if (!showdown.helper.isString(ext.type)) {
+      ret.valid = false;
+      ret.error = baseMsg + 'property "type" must be a string, but ' + typeof ext.type + ' given';
+      return ret;
+    }
+
+    var type = ext.type = ext.type.toLowerCase();
+
+    // normalize extension type
+    if (type === 'language') {
+      type = ext.type = 'lang';
+    }
+
+    if (type === 'html') {
+      type = ext.type = 'output';
+    }
+
+    if (type !== 'lang' && type !== 'output' && type !== 'listener') {
+      ret.valid = false;
+      ret.error = baseMsg + 'type ' + type + ' is not recognized. Valid values: "lang/language", "output/html" or "listener"';
+      return ret;
+    }
+
+    if (type === 'listener') {
+      if (showdown.helper.isUndefined(ext.listeners)) {
+        ret.valid = false;
+        ret.error = baseMsg + '. Extensions of type "listener" must have a property called "listeners"';
+        return ret;
+      }
+    } else {
+      if (showdown.helper.isUndefined(ext.filter) && showdown.helper.isUndefined(ext.regex)) {
+        ret.valid = false;
+        ret.error = baseMsg + type + ' extensions must define either a "regex" property or a "filter" method';
+        return ret;
+      }
+    }
+
+    if (ext.listeners) {
+      if (typeof ext.listeners !== 'object') {
+        ret.valid = false;
+        ret.error = baseMsg + '"listeners" property must be an object but ' + typeof ext.listeners + ' given';
+        return ret;
+      }
+      for (var ln in ext.listeners) {
+        if (ext.listeners.hasOwnProperty(ln)) {
+          if (typeof ext.listeners[ln] !== 'function') {
+            ret.valid = false;
+            ret.error = baseMsg + '"listeners" property must be an hash of [event name]: [callback]. listeners.' + ln +
+              ' must be a function but ' + typeof ext.listeners[ln] + ' given';
+            return ret;
+          }
+        }
+      }
+    }
+
+    if (ext.filter) {
+      if (typeof ext.filter !== 'function') {
+        ret.valid = false;
+        ret.error = baseMsg + '"filter" must be a function, but ' + typeof ext.filter + ' given';
+        return ret;
+      }
+    } else if (ext.regex) {
+      if (showdown.helper.isString(ext.regex)) {
+        ext.regex = new RegExp(ext.regex, 'g');
+      }
+      if (!ext.regex instanceof RegExp) {
+        ret.valid = false;
+        ret.error = baseMsg + '"regex" property must either be a string or a RegExp object, but ' + typeof ext.regex + ' given';
+        return ret;
+      }
+      if (showdown.helper.isUndefined(ext.replace)) {
+        ret.valid = false;
+        ret.error = baseMsg + '"regex" extensions must implement a replace string or function';
+        return ret;
+      }
+    }
+  }
+  return ret;
+}
+
+/**
+ * Validate extension
+ * @param {object} ext
+ * @returns {boolean}
+ */
+showdown.validateExtension = function (ext) {
+  'use strict';
+
+  var validateExtension = validate(ext, null);
+  if (!validateExtension.valid) {
+    console.warn(validateExtension.error);
+    return false;
+  }
+  return true;
+};
+
+/**
+ * showdownjs helper functions
+ */
+
+if (!showdown.hasOwnProperty('helper')) {
+  showdown.helper = {};
+}
+
+/**
+ * Check if var is string
+ * @static
+ * @param {string} a
+ * @returns {boolean}
+ */
+showdown.helper.isString = function isString(a) {
+  'use strict';
+  return (typeof a === 'string' || a instanceof String);
+};
+
+/**
+ * Check if var is a function
+ * @static
+ * @param {string} a
+ * @returns {boolean}
+ */
+showdown.helper.isFunction = function isFunction(a) {
+  'use strict';
+  var getType = {};
+  return a && getType.toString.call(a) === '[object Function]';
+};
+
+/**
+ * ForEach helper function
+ * @static
+ * @param {*} obj
+ * @param {function} callback
+ */
+showdown.helper.forEach = function forEach(obj, callback) {
+  'use strict';
+  if (typeof obj.forEach === 'function') {
+    obj.forEach(callback);
+  } else {
+    for (var i = 0; i < obj.length; i++) {
+      callback(obj[i], i, obj);
+    }
+  }
+};
+
+/**
+ * isArray helper function
+ * @static
+ * @param {*} a
+ * @returns {boolean}
+ */
+showdown.helper.isArray = function isArray(a) {
+  'use strict';
+  return a.constructor === Array;
+};
+
+/**
+ * Check if value is undefined
+ * @static
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
+ */
+showdown.helper.isUndefined = function isUndefined(value) {
+  'use strict';
+  return typeof value === 'undefined';
+};
+
+/**
+ * Standardidize extension name
+ * @static
+ * @param {string} s extension name
+ * @returns {string}
+ */
+showdown.helper.stdExtName = function (s) {
+  'use strict';
+  return s.replace(/[_-]||\s/g, '').toLowerCase();
+};
+
+function escapeCharactersCallback(wholeMatch, m1) {
+  'use strict';
+  var charCodeToEscape = m1.charCodeAt(0);
+  return '~E' + charCodeToEscape + 'E';
+}
+
+/**
+ * Callback used to escape characters when passing through String.replace
+ * @static
+ * @param {string} wholeMatch
+ * @param {string} m1
+ * @returns {string}
+ */
+showdown.helper.escapeCharactersCallback = escapeCharactersCallback;
+
+/**
+ * Escape characters in a string
+ * @static
+ * @param {string} text
+ * @param {string} charsToEscape
+ * @param {boolean} afterBackslash
+ * @returns {XML|string|void|*}
+ */
+showdown.helper.escapeCharacters = function escapeCharacters(text, charsToEscape, afterBackslash) {
+  'use strict';
+  // First we have to escape the escape characters so that
+  // we can build a character class out of them
+  var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])';
+
+  if (afterBackslash) {
+    regexString = '\\\\' + regexString;
+  }
+
+  var regex = new RegExp(regexString, 'g');
+  text = text.replace(regex, escapeCharactersCallback);
+
+  return text;
+};
+
+var rgxFindMatchPos = function (str, left, right, flags) {
+  'use strict';
+  var f = flags || '',
+    g = f.indexOf('g') > -1,
+    x = new RegExp(left + '|' + right, 'g' + f.replace(/g/g, '')),
+    l = new RegExp(left, f.replace(/g/g, '')),
+    pos = [],
+    t, s, m, start, end;
+
+  do {
+    t = 0;
+    while ((m = x.exec(str))) {
+      if (l.test(m[0])) {
+        if (!(t++)) {
+          s = x.lastIndex;
+          start = s - m[0].length;
+        }
+      } else if (t) {
+        if (!--t) {
+          end = m.index + m[0].length;
+          var obj = {
+            left: {start: start, end: s},
+            match: {start: s, end: m.index},
+            right: {start: m.index, end: end},
+            wholeMatch: {start: start, end: end}
+          };
+          pos.push(obj);
+          if (!g) {
+            return pos;
+          }
+        }
+      }
+    }
+  } while (t && (x.lastIndex = s));
+
+  return pos;
+};
+
+/**
+ * matchRecursiveRegExp
+ *
+ * (c) 2007 Steven Levithan <stevenlevithan.com>
+ * MIT License
+ *
+ * Accepts a string to search, a left and right format delimiter
+ * as regex patterns, and optional regex flags. Returns an array
+ * of matches, allowing nested instances of left/right delimiters.
+ * Use the "g" flag to return all matches, otherwise only the
+ * first is returned. Be careful to ensure that the left and
+ * right format delimiters produce mutually exclusive matches.
+ * Backreferences are not supported within the right delimiter
+ * due to how it is internally combined with the left delimiter.
+ * When matching strings whose format delimiters are unbalanced
+ * to the left or right, the output is intentionally as a
+ * conventional regex library with recursion support would
+ * produce, e.g. "<<x>" and "<x>>" both produce ["x"] when using
+ * "<" and ">" as the delimiters (both strings contain a single,
+ * balanced instance of "<x>").
+ *
+ * examples:
+ * matchRecursiveRegExp("test", "\\(", "\\)")
+ * returns: []
+ * matchRecursiveRegExp("<t<<e>><s>>t<>", "<", ">", "g")
+ * returns: ["t<<e>><s>", ""]
+ * matchRecursiveRegExp("<div id=\"x\">test</div>", "<div\\b[^>]*>", "</div>", "gi")
+ * returns: ["test"]
+ */
+showdown.helper.matchRecursiveRegExp = function (str, left, right, flags) {
+  'use strict';
+
+  var matchPos = rgxFindMatchPos (str, left, right, flags),
+    results = [];
+
+  for (var i = 0; i < matchPos.length; ++i) {
+    results.push([
+      str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end),
+      str.slice(matchPos[i].match.start, matchPos[i].match.end),
+      str.slice(matchPos[i].left.start, matchPos[i].left.end),
+      str.slice(matchPos[i].right.start, matchPos[i].right.end)
+    ]);
+  }
+  return results;
+};
+
+/**
+ *
+ * @param {string} str
+ * @param {string|function} replacement
+ * @param {string} left
+ * @param {string} right
+ * @param {string} flags
+ * @returns {string}
+ */
+showdown.helper.replaceRecursiveRegExp = function (str, replacement, left, right, flags) {
+  'use strict';
+
+  if (!showdown.helper.isFunction(replacement)) {
+    var repStr = replacement;
+    replacement = function () {
+      return repStr;
+    };
+  }
+
+  var matchPos = rgxFindMatchPos(str, left, right, flags),
+      finalStr = str,
+      lng = matchPos.length;
+
+  if (lng > 0) {
+    var bits = [];
+    if (matchPos[0].wholeMatch.start !== 0) {
+      bits.push(str.slice(0, matchPos[0].wholeMatch.start));
+    }
+    for (var i = 0; i < lng; ++i) {
+      bits.push(
+        replacement(
+          str.slice(matchPos[i].wholeMatch.start, matchPos[i].wholeMatch.end),
+          str.slice(matchPos[i].match.start, matchPos[i].match.end),
+          str.slice(matchPos[i].left.start, matchPos[i].left.end),
+          str.slice(matchPos[i].right.start, matchPos[i].right.end)
+        )
+      );
+      if (i < lng - 1) {
+        bits.push(str.slice(matchPos[i].wholeMatch.end, matchPos[i + 1].wholeMatch.start));
+      }
+    }
+    if (matchPos[lng - 1].wholeMatch.end < str.length) {
+      bits.push(str.slice(matchPos[lng - 1].wholeMatch.end));
+    }
+    finalStr = bits.join('');
+  }
+  return finalStr;
+};
+
+/**
+ * POLYFILLS
+ */
+if (showdown.helper.isUndefined(console)) {
+  console = {
+    warn: function (msg) {
+      'use strict';
+      alert(msg);
+    },
+    log: function (msg) {
+      'use strict';
+      alert(msg);
+    },
+    error: function (msg) {
+      'use strict';
+      throw msg;
+    }
+  };
+}
+
+/**
+ * Created by Estevao on 31-05-2015.
+ */
+
+/**
+ * Showdown Converter class
+ * @class
+ * @param {object} [converterOptions]
+ * @returns {Converter}
+ */
+showdown.Converter = function (converterOptions) {
+  'use strict';
+
+  var
+      /**
+       * Options used by this converter
+       * @private
+       * @type {{}}
+       */
+      options = {},
+
+      /**
+       * Language extensions used by this converter
+       * @private
+       * @type {Array}
+       */
+      langExtensions = [],
+
+      /**
+       * Output modifiers extensions used by this converter
+       * @private
+       * @type {Array}
+       */
+      outputModifiers = [],
+
+      /**
+       * Event listeners
+       * @private
+       * @type {{}}
+       */
+      listeners = {};
+
+  _constructor();
+
+  /**
+   * Converter constructor
+   * @private
+   */
+  function _constructor() {
+    converterOptions = converterOptions || {};
+
+    for (var gOpt in globalOptions) {
+      if (globalOptions.hasOwnProperty(gOpt)) {
+        options[gOpt] = globalOptions[gOpt];
+      }
+    }
+
+    // Merge options
+    if (typeof converterOptions === 'object') {
+      for (var opt in converterOptions) {
+        if (converterOptions.hasOwnProperty(opt)) {
+          options[opt] = converterOptions[opt];
+        }
+      }
+    } else {
+      throw Error('Converter expects the passed parameter to be an object, but ' + typeof converterOptions +
+      ' was passed instead.');
+    }
+
+    if (options.extensions) {
+      showdown.helper.forEach(options.extensions, _parseExtension);
+    }
+  }
+
+  /**
+   * Parse extension
+   * @param {*} ext
+   * @param {string} [name='']
+   * @private
+   */
+  function _parseExtension(ext, name) {
+
+    name = name || null;
+    // If it's a string, the extension was previously loaded
+    if (showdown.helper.isString(ext)) {
+      ext = showdown.helper.stdExtName(ext);
+      name = ext;
+
+      // LEGACY_SUPPORT CODE
+      if (showdown.extensions[ext]) {
+        console.warn('DEPRECATION WARNING: ' + ext + ' is an old extension that uses a deprecated loading method.' +
+          'Please inform the developer that the extension should be updated!');
+        legacyExtensionLoading(showdown.extensions[ext], ext);
+        return;
+      // END LEGACY SUPPORT CODE
+
+      } else if (!showdown.helper.isUndefined(extensions[ext])) {
+        ext = extensions[ext];
+
+      } else {
+        throw Error('Extension "' + ext + '" could not be loaded. It was either not found or is not a valid extension.');
+      }
+    }
+
+    if (typeof ext === 'function') {
+      ext = ext();
+    }
+
+    if (!showdown.helper.isArray(ext)) {
+      ext = [ext];
+    }
+
+    var validExt = validate(ext, name);
+    if (!validExt.valid) {
+      throw Error(validExt.error);
+    }
+
+    for (var i = 0; i < ext.length; ++i) {
+      switch (ext[i].type) {
+
+        case 'lang':
+          langExtensions.push(ext[i]);
+          break;
+
+        case 'output':
+          outputModifiers.push(ext[i]);
+          break;
+      }
+      if (ext[i].hasOwnProperty(listeners)) {
+        for (var ln in ext[i].listeners) {
+          if (ext[i].listeners.hasOwnProperty(ln)) {
+            listen(ln, ext[i].listeners[ln]);
+          }
+        }
+      }
+    }
+
+  }
+
+  /**
+   * LEGACY_SUPPORT
+   * @param {*} ext
+   * @param {string} name
+   */
+  function legacyExtensionLoading(ext, name) {
+    if (typeof ext === 'function') {
+      ext = ext(new showdown.Converter());
+    }
+    if (!showdown.helper.isArray(ext)) {
+      ext = [ext];
+    }
+    var valid = validate(ext, name);
+
+    if (!valid.valid) {
+      throw Error(valid.error);
+    }
+
+    for (var i = 0; i < ext.length; ++i) {
+      switch (ext[i].type) {
+        case 'lang':
+          langExtensions.push(ext[i]);
+          break;
+        case 'output':
+          outputModifiers.push(ext[i]);
+          break;
+        default:// should never reach here
+          throw Error('Extension loader error: Type unrecognized!!!');
+      }
+    }
+  }
+
+  /**
+   * Listen to an event
+   * @param {string} name
+   * @param {function} callback
+   */
+  function listen(name, callback) {
+    if (!showdown.helper.isString(name)) {
+      throw Error('Invalid argument in converter.listen() method: name must be a string, but ' + typeof name + ' given');
+    }
+
+    if (typeof callback !== 'function') {
+      throw Error('Invalid argument in converter.listen() method: callback must be a function, but ' + typeof callback + ' given');
+    }
+
+    if (!listeners.hasOwnProperty(name)) {
+      listeners[name] = [];
+    }
+    listeners[name].push(callback);
+  }
+
+  function rTrimInputText(text) {
+    var rsp = text.match(/^\s*/)[0].length,
+        rgx = new RegExp('^\\s{0,' + rsp + '}', 'gm');
+    return text.replace(rgx, '');
+  }
+
+  /**
+   * Dispatch an event
+   * @private
+   * @param {string} evtName Event name
+   * @param {string} text Text
+   * @param {{}} options Converter Options
+   * @param {{}} globals
+   * @returns {string}
+   */
+  this._dispatch = function dispatch (evtName, text, options, globals) {
+    if (listeners.hasOwnProperty(evtName)) {
+      for (var ei = 0; ei < listeners[evtName].length; ++ei) {
+        var nText = listeners[evtName][ei](evtName, text, this, options, globals);
+        if (nText && typeof nText !== 'undefined') {
+          text = nText;
+        }
+      }
+    }
+    return text;
+  };
+
+  /**
+   * Listen to an event
+   * @param {string} name
+   * @param {function} callback
+   * @returns {showdown.Converter}
+   */
+  this.listen = function (name, callback) {
+    listen(name, callback);
+    return this;
+  };
+
+  /**
+   * Converts a markdown string into HTML
+   * @param {string} text
+   * @returns {*}
+   */
+  this.makeHtml = function (text) {
+    //check if text is not falsy
+    if (!text) {
+      return text;
+    }
+
+    var globals = {
+      gHtmlBlocks:     [],
+      gHtmlMdBlocks:   [],
+      gHtmlSpans:      [],
+      gUrls:           {},
+      gTitles:         {},
+      gDimensions:     {},
+      gListLevel:      0,
+      hashLinkCounts:  {},
+      langExtensions:  langExtensions,
+      outputModifiers: outputModifiers,
+      converter:       this,
+      ghCodeBlocks:    []
+    };
+
+    // attacklab: Replace ~ with ~T
+    // This lets us use tilde as an escape char to avoid md5 hashes
+    // The choice of character is arbitrary; anything that isn't
+    // magic in Markdown will work.
+    text = text.replace(/~/g, '~T');
+
+    // attacklab: Replace $ with ~D
+    // RegExp interprets $ as a special character
+    // when it's in a replacement string
+    text = text.replace(/\$/g, '~D');
+
+    // Standardize line endings
+    text = text.replace(/\r\n/g, '\n'); // DOS to Unix
+    text = text.replace(/\r/g, '\n'); // Mac to Unix
+
+    if (options.smartIndentationFix) {
+      text = rTrimInputText(text);
+    }
+
+    // Make sure text begins and ends with a couple of newlines:
+    //text = '\n\n' + text + '\n\n';
+    text = text;
+    // detab
+    text = showdown.subParser('detab')(text, options, globals);
+
+    // stripBlankLines
+    text = showdown.subParser('stripBlankLines')(text, options, globals);
+
+    //run languageExtensions
+    showdown.helper.forEach(langExtensions, function (ext) {
+      text = showdown.subParser('runExtension')(ext, text, options, globals);
+    });
+
+    // run the sub parsers
+    text = showdown.subParser('hashPreCodeTags')(text, options, globals);
+    text = showdown.subParser('githubCodeBlocks')(text, options, globals);
+    text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
+    text = showdown.subParser('hashHTMLSpans')(text, options, globals);
+    text = showdown.subParser('stripLinkDefinitions')(text, options, globals);
+    text = showdown.subParser('blockGamut')(text, options, globals);
+    text = showdown.subParser('unhashHTMLSpans')(text, options, globals);
+    text = showdown.subParser('unescapeSpecialChars')(text, options, globals);
+
+    // attacklab: Restore dollar signs
+    text = text.replace(/~D/g, '$$');
+
+    // attacklab: Restore tildes
+    text = text.replace(/~T/g, '~');
+
+    // Run output modifiers
+    showdown.helper.forEach(outputModifiers, function (ext) {
+      text = showdown.subParser('runExtension')(ext, text, options, globals);
+    });
+    return text;
+  };
+
+  /**
+   * Set an option of this Converter instance
+   * @param {string} key
+   * @param {*} value
+   */
+  this.setOption = function (key, value) {
+    options[key] = value;
+  };
+
+  /**
+   * Get the option of this Converter instance
+   * @param {string} key
+   * @returns {*}
+   */
+  this.getOption = function (key) {
+    return options[key];
+  };
+
+  /**
+   * Get the options of this Converter instance
+   * @returns {{}}
+   */
+  this.getOptions = function () {
+    return options;
+  };
+
+  /**
+   * Add extension to THIS converter
+   * @param {{}} extension
+   * @param {string} [name=null]
+   */
+  this.addExtension = function (extension, name) {
+    name = name || null;
+    _parseExtension(extension, name);
+  };
+
+  /**
+   * Use a global registered extension with THIS converter
+   * @param {string} extensionName Name of the previously registered extension
+   */
+  this.useExtension = function (extensionName) {
+    _parseExtension(extensionName);
+  };
+
+  /**
+   * Set the flavor THIS converter should use
+   * @param {string} name
+   */
+  this.setFlavor = function (name) {
+    if (flavor.hasOwnProperty(name)) {
+      var preset = flavor[name];
+      for (var option in preset) {
+        if (preset.hasOwnProperty(option)) {
+          options[option] = preset[option];
+        }
+      }
+    }
+  };
+
+  /**
+   * Remove an extension from THIS converter.
+   * Note: This is a costly operation. It's better to initialize a new converter
+   * and specify the extensions you wish to use
+   * @param {Array} extension
+   */
+  this.removeExtension = function (extension) {
+    if (!showdown.helper.isArray(extension)) {
+      extension = [extension];
+    }
+    for (var a = 0; a < extension.length; ++a) {
+      var ext = extension[a];
+      for (var i = 0; i < langExtensions.length; ++i) {
+        if (langExtensions[i] === ext) {
+          langExtensions[i].splice(i, 1);
+        }
+      }
+      for (var ii = 0; ii < outputModifiers.length; ++i) {
+        if (outputModifiers[ii] === ext) {
+          outputModifiers[ii].splice(i, 1);
+        }
+      }
+    }
+  };
+
+  /**
+   * Get all extension of THIS converter
+   * @returns {{language: Array, output: Array}}
+   */
+  this.getAllExtensions = function () {
+    return {
+      language: langExtensions,
+      output: outputModifiers
+    };
+  };
+};
+
+/**
+ * Turn Markdown link shortcuts into XHTML <a> tags.
+ */
+showdown.subParser('anchors', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('anchors.before', text, options, globals);
+
+  var writeAnchorTag = function (wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
+    if (showdown.helper.isUndefined(m7)) {
+      m7 = '';
+    }
+    wholeMatch = m1;
+    var linkText = m2,
+        linkId = m3.toLowerCase(),
+        url = m4,
+        title = m7;
+
+    if (!url) {
+      if (!linkId) {
+        // lower-case and turn embedded newlines into spaces
+        linkId = linkText.toLowerCase().replace(/ ?\n/g, ' ');
+      }
+      url = '#' + linkId;
+
+      if (!showdown.helper.isUndefined(globals.gUrls[linkId])) {
+        url = globals.gUrls[linkId];
+        if (!showdown.helper.isUndefined(globals.gTitles[linkId])) {
+          title = globals.gTitles[linkId];
+        }
+      } else {
+        if (wholeMatch.search(/\(\s*\)$/m) > -1) {
+          // Special case for explicit empty url
+          url = '';
+        } else {
+          return wholeMatch;
+        }
+      }
+    }
+
+    url = showdown.helper.escapeCharacters(url, '*_', false);
+    var result = '<a href="' + url + '"';
+
+    if (title !== '' && title !== null) {
+      title = title.replace(/"/g, '&quot;');
+      title = showdown.helper.escapeCharacters(title, '*_', false);
+      result += ' title="' + title + '"';
+    }
+
+    result += '>' + linkText + '</a>';
+
+    return result;
+  };
+
+  // First, handle reference-style links: [link text] [id]
+  /*
+   text = text.replace(/
+   (							// wrap whole match in $1
+   \[
+   (
+   (?:
+   \[[^\]]*\]		// allow brackets nested one level
+   |
+   [^\[]			// or anything else
+   )*
+   )
+   \]
+
+   [ ]?					// one optional space
+   (?:\n[ ]*)?				// one optional newline followed by spaces
+
+   \[
+   (.*?)					// id = $3
+   \]
+   )()()()()					// pad remaining backreferences
+   /g,_DoAnchors_callback);
+   */
+  text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)][ ]?(?:\n[ ]*)?\[(.*?)])()()()()/g, writeAnchorTag);
+
+  //
+  // Next, inline-style links: [link text](url "optional title")
+  //
+
+  /*
+   text = text.replace(/
+   (						// wrap whole match in $1
+   \[
+   (
+   (?:
+   \[[^\]]*\]	// allow brackets nested one level
+   |
+   [^\[\]]			// or anything else
+   )
+   )
+   \]
+   \(						// literal paren
+   [ \t]*
+   ()						// no id, so leave $3 empty
+   <?(.*?)>?				// href = $4
+   [ \t]*
+   (						// $5
+   (['"])				// quote char = $6
+   (.*?)				// Title = $7
+   \6					// matching quote
+   [ \t]*				// ignore any spaces/tabs between closing quote and )
+   )?						// title is optional
+   \)
+   )
+   /g,writeAnchorTag);
+   */
+  text = text.replace(/(\[((?:\[[^\]]*]|[^\[\]])*)]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,
+                      writeAnchorTag);
+
+  //
+  // Last, handle reference-style shortcuts: [link text]
+  // These must come last in case you've also got [link test][1]
+  // or [link test](/foo)
+  //
+
+  /*
+   text = text.replace(/
+   (                // wrap whole match in $1
+   \[
+   ([^\[\]]+)       // link text = $2; can't contain '[' or ']'
+   \]
+   )()()()()()      // pad rest of backreferences
+   /g, writeAnchorTag);
+   */
+  text = text.replace(/(\[([^\[\]]+)])()()()()()/g, writeAnchorTag);
+
+  text = globals.converter._dispatch('anchors.after', text, options, globals);
+  return text;
+});
+
+showdown.subParser('autoLinks', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('autoLinks.before', text, options, globals);
+
+  var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)(?=\s|$)(?!["<>])/gi,
+      delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi,
+      simpleMailRegex = /(?:^|[ \n\t])([A-Za-z0-9!#$%&'*+-/=?^_`\{|}~\.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?:$|[ \n\t])/gi,
+      delimMailRegex  = /<(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi;
+
+  text = text.replace(delimUrlRegex, replaceLink);
+  text = text.replace(delimMailRegex, replaceMail);
+  // simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[-.+~:?#@!$&'()*,;=[\]\w]+)\b/gi,
+  // Email addresses: <address@domain.foo>
+
+  if (options.simplifiedAutoLink) {
+    text = text.replace(simpleURLRegex, replaceLink);
+    text = text.replace(simpleMailRegex, replaceMail);
+  }
+
+  function replaceLink(wm, link) {
+    var lnkTxt = link;
+    if (/^www\./i.test(link)) {
+      link = link.replace(/^www\./i, 'http://www.');
+    }
+    return '<a href="' + link + '">' + lnkTxt + '</a>';
+  }
+
+  function replaceMail(wholeMatch, m1) {
+    var unescapedStr = showdown.subParser('unescapeSpecialChars')(m1);
+    return showdown.subParser('encodeEmailAddress')(unescapedStr);
+  }
+
+  text = globals.converter._dispatch('autoLinks.after', text, options, globals);
+
+  return text;
+});
+
+/**
+ * These are all the transformations that form block-level
+ * tags like paragraphs, headers, and list items.
+ */
+showdown.subParser('blockGamut', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('blockGamut.before', text, options, globals);
+
+  // we parse blockquotes first so that we can have headings and hrs
+  // inside blockquotes
+  text = showdown.subParser('blockQuotes')(text, options, globals);
+  text = showdown.subParser('headers')(text, options, globals);
+
+  // Do Horizontal Rules:
+  var key = showdown.subParser('hashBlock')('<hr />', options, globals);
+  text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key);
+  text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
+  text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key);
+
+  text = showdown.subParser('lists')(text, options, globals);
+  text = showdown.subParser('codeBlocks')(text, options, globals);
+  text = showdown.subParser('tables')(text, options, globals);
+
+  // We already ran _HashHTMLBlocks() before, in Markdown(), but that
+  // was to escape raw HTML in the original Markdown source. This time,
+  // we're escaping the markup we've just created, so that we don't wrap
+  // <p> tags around block-level tags.
+  text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
+  text = showdown.subParser('paragraphs')(text, options, globals);
+
+  text = globals.converter._dispatch('blockGamut.after', text, options, globals);
+
+  return text;
+});
+
+showdown.subParser('blockQuotes', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('blockQuotes.before', text, options, globals);
+  /*
+   text = text.replace(/
+   (								// Wrap whole match in $1
+   (
+   ^[ \t]*>[ \t]?			// '>' at the start of a line
+   .+\n					// rest of the first line
+   (.+\n)*					// subsequent consecutive lines
+   \n*						// blanks
+   )+
+   )
+   /gm, function(){...});
+   */
+
+  text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) {
+    var bq = m1;
+
+    // attacklab: hack around Konqueror 3.5.4 bug:
+    // "----------bug".replace(/^-/g,"") == "bug"
+    bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting
+
+    // attacklab: clean up hack
+    bq = bq.replace(/~0/g, '');
+
+    bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
+    bq = showdown.subParser('githubCodeBlocks')(bq, options, globals);
+    bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
+
+    bq = bq.replace(/(^|\n)/g, '$1  ');
+    // These leading spaces screw with <pre> content, so we need to fix that:
+    bq = bq.replace(/(\s*<pre>[^\r]+?<\/pre>)/gm, function (wholeMatch, m1) {
+      var pre = m1;
+      // attacklab: hack around Konqueror 3.5.4 bug:
+      pre = pre.replace(/^  /mg, '~0');
+      pre = pre.replace(/~0/g, '');
+      return pre;
+    });
+
+    return showdown.subParser('hashBlock')('<blockquote>\n' + bq + '\n</blockquote>', options, globals);
+  });
+
+  text = globals.converter._dispatch('blockQuotes.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Process Markdown `<pre><code>` blocks.
+ */
+showdown.subParser('codeBlocks', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('codeBlocks.before', text, options, globals);
+  /*
+   text = text.replace(text,
+   /(?:\n\n|^)
+   (								// $1 = the code block -- one or more lines, starting with a space/tab
+   (?:
+   (?:[ ]{4}|\t)			// Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
+   .*\n+
+   )+
+   )
+   (\n*[ ]{0,3}[^ \t\n]|(?=~0))	// attacklab: g_tab_width
+   /g,function(){...});
+   */
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += '~0';
+
+  var pattern = /(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g;
+  text = text.replace(pattern, function (wholeMatch, m1, m2) {
+    var codeblock = m1,
+        nextChar = m2,
+        end = '\n';
+
+    codeblock = showdown.subParser('outdent')(codeblock);
+    codeblock = showdown.subParser('encodeCode')(codeblock);
+    codeblock = showdown.subParser('detab')(codeblock);
+    codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+    codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing newlines
+
+    if (options.omitExtraWLInCodeBlocks) {
+      end = '';
+    }
+
+    codeblock = '<pre><code>' + codeblock + end + '</code></pre>';
+
+    return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
+  });
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  text = globals.converter._dispatch('codeBlocks.after', text, options, globals);
+  return text;
+});
+
+/**
+ *
+ *   *  Backtick quotes are used for <code></code> spans.
+ *
+ *   *  You can use multiple backticks as the delimiters if you want to
+ *     include literal backticks in the code span. So, this input:
+ *
+ *         Just type ``foo `bar` baz`` at the prompt.
+ *
+ *       Will translate to:
+ *
+ *         <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
+ *
+ *    There's no arbitrary limit to the number of backticks you
+ *    can use as delimters. If you need three consecutive backticks
+ *    in your code, use four for delimiters, etc.
+ *
+ *  *  You can use spaces to get literal backticks at the edges:
+ *
+ *         ... type `` `bar` `` ...
+ *
+ *       Turns to:
+ *
+ *         ... type <code>`bar`</code> ...
+ */
+showdown.subParser('codeSpans', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('codeSpans.before', text, options, globals);
+
+  /*
+   text = text.replace(/
+   (^|[^\\])					// Character before opening ` can't be a backslash
+   (`+)						// $2 = Opening run of `
+   (							// $3 = The code block
+   [^\r]*?
+   [^`]					// attacklab: work around lack of lookbehind
+   )
+   \2							// Matching closer
+   (?!`)
+   /gm, function(){...});
+   */
+
+  if (typeof(text) === 'undefined') {
+    text = '';
+  }
+  text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
+    function (wholeMatch, m1, m2, m3) {
+      var c = m3;
+      c = c.replace(/^([ \t]*)/g, '');	// leading whitespace
+      c = c.replace(/[ \t]*$/g, '');	// trailing whitespace
+      c = showdown.subParser('encodeCode')(c);
+      return m1 + '<code>' + c + '</code>';
+    }
+  );
+
+  text = globals.converter._dispatch('codeSpans.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Convert all tabs to spaces
+ */
+showdown.subParser('detab', function (text) {
+  'use strict';
+
+  // expand first n-1 tabs
+  text = text.replace(/\t(?=\t)/g, '    '); // g_tab_width
+
+  // replace the nth with two sentinels
+  text = text.replace(/\t/g, '~A~B');
+
+  // use the sentinel to anchor our regex so it doesn't explode
+  text = text.replace(/~B(.+?)~A/g, function (wholeMatch, m1) {
+    var leadingText = m1,
+        numSpaces = 4 - leadingText.length % 4;  // g_tab_width
+
+    // there *must* be a better way to do this:
+    for (var i = 0; i < numSpaces; i++) {
+      leadingText += ' ';
+    }
+
+    return leadingText;
+  });
+
+  // clean up sentinels
+  text = text.replace(/~A/g, '    ');  // g_tab_width
+  text = text.replace(/~B/g, '');
+
+  return text;
+
+});
+
+/**
+ * Smart processing for ampersands and angle brackets that need to be encoded.
+ */
+showdown.subParser('encodeAmpsAndAngles', function (text) {
+  'use strict';
+  // Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+  // http://bumppo.net/projects/amputator/
+  text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&amp;');
+
+  // Encode naked <'s
+  text = text.replace(/<(?![a-z\/?\$!])/gi, '&lt;');
+
+  return text;
+});
+
+/**
+ * Returns the string, with after processing the following backslash escape sequences.
+ *
+ * attacklab: The polite way to do this is with the new escapeCharacters() function:
+ *
+ *    text = escapeCharacters(text,"\\",true);
+ *    text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
+ *
+ * ...but we're sidestepping its use of the (slow) RegExp constructor
+ * as an optimization for Firefox.  This function gets called a LOT.
+ */
+showdown.subParser('encodeBackslashEscapes', function (text) {
+  'use strict';
+  text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
+  text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
+  return text;
+});
+
+/**
+ * Encode/escape certain characters inside Markdown code runs.
+ * The point is that in code, these characters are literals,
+ * and lose their special Markdown meanings.
+ */
+showdown.subParser('encodeCode', function (text) {
+  'use strict';
+
+  // Encode all ampersands; HTML entities are not
+  // entities within a Markdown code span.
+  text = text.replace(/&/g, '&amp;');
+
+  // Do the angle bracket song and dance:
+  text = text.replace(/</g, '&lt;');
+  text = text.replace(/>/g, '&gt;');
+
+  // Now, escape characters that are magic in Markdown:
+  text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false);
+
+  // jj the line above breaks this:
+  //---
+  //* Item
+  //   1. Subitem
+  //            special char: *
+  // ---
+
+  return text;
+});
+
+/**
+ *  Input: an email address, e.g. "foo@example.com"
+ *
+ *  Output: the email address as a mailto link, with each character
+ *    of the address encoded as either a decimal or hex entity, in
+ *    the hopes of foiling most address harvesting spam bots. E.g.:
+ *
+ *    <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
+ *       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
+ *       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
+ *
+ *  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+ *  mailing list: <http://tinyurl.com/yu7ue>
+ *
+ */
+showdown.subParser('encodeEmailAddress', function (addr) {
+  'use strict';
+
+  var encode = [
+    function (ch) {
+      return '&#' + ch.charCodeAt(0) + ';';
+    },
+    function (ch) {
+      return '&#x' + ch.charCodeAt(0).toString(16) + ';';
+    },
+    function (ch) {
+      return ch;
+    }
+  ];
+
+  addr = 'mailto:' + addr;
+
+  addr = addr.replace(/./g, function (ch) {
+    if (ch === '@') {
+      // this *must* be encoded. I insist.
+      ch = encode[Math.floor(Math.random() * 2)](ch);
+    } else if (ch !== ':') {
+      // leave ':' alone (to spot mailto: later)
+      var r = Math.random();
+      // roughly 10% raw, 45% hex, 45% dec
+      ch = (
+        r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
+      );
+    }
+    return ch;
+  });
+
+  addr = '<a href="' + addr + '">' + addr + '</a>';
+  addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
+
+  return addr;
+});
+
+/**
+ * Within tags -- meaning between < and > -- encode [\ ` * _] so they
+ * don't conflict with their use in Markdown for code, italics and strong.
+ */
+showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
+  'use strict';
+
+  // Build a regex to find HTML tags and comments.  See Friedl's
+  // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
+  var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi;
+
+  text = text.replace(regex, function (wholeMatch) {
+    var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
+    tag = showdown.helper.escapeCharacters(tag, '\\`*_', false);
+    return tag;
+  });
+
+  return text;
+});
+
+/**
+ * Handle github codeblocks prior to running HashHTML so that
+ * HTML contained within the codeblock gets escaped properly
+ * Example:
+ * ```ruby
+ *     def hello_world(x)
+ *       puts "Hello, #{x}"
+ *     end
+ * ```
+ */
+showdown.subParser('githubCodeBlocks', function (text, options, globals) {
+  'use strict';
+
+  // early exit if option is not enabled
+  if (!options.ghCodeBlocks) {
+    return text;
+  }
+
+  text = globals.converter._dispatch('githubCodeBlocks.before', text, options, globals);
+
+  text += '~0';
+
+  text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
+    var end = (options.omitExtraWLInCodeBlocks) ? '' : '\n';
+
+    // First parse the github code block
+    codeblock = showdown.subParser('encodeCode')(codeblock);
+    codeblock = showdown.subParser('detab')(codeblock);
+    codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+    codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
+
+    codeblock = '<pre><code' + (language ? ' class="' + language + ' language-' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
+
+    codeblock = showdown.subParser('hashBlock')(codeblock, options, globals);
+
+    // Since GHCodeblocks can be false positives, we need to
+    // store the primitive text and the parsed text in a global var,
+    // and then return a token
+    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
+  });
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  return globals.converter._dispatch('githubCodeBlocks.after', text, options, globals);
+});
+
+showdown.subParser('hashBlock', function (text, options, globals) {
+  'use strict';
+  text = text.replace(/(^\n+|\n+$)/g, '');
+  return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
+});
+
+showdown.subParser('hashElement', function (text, options, globals) {
+  'use strict';
+
+  return function (wholeMatch, m1) {
+    var blockText = m1;
+
+    // Undo double lines
+    blockText = blockText.replace(/\n\n/g, '\n');
+    blockText = blockText.replace(/^\n/, '');
+
+    // strip trailing blank lines
+    blockText = blockText.replace(/\n+$/g, '');
+
+    // Replace the element text with a marker ("~KxK" where x is its key)
+    blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
+
+    return blockText;
+  };
+});
+
+showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
+  'use strict';
+
+  var blockTags = [
+      'pre',
+      'div',
+      'h1',
+      'h2',
+      'h3',
+      'h4',
+      'h5',
+      'h6',
+      'blockquote',
+      'table',
+      'dl',
+      'ol',
+      'ul',
+      'script',
+      'noscript',
+      'form',
+      'fieldset',
+      'iframe',
+      'math',
+      'style',
+      'section',
+      'header',
+      'footer',
+      'nav',
+      'article',
+      'aside',
+      'address',
+      'audio',
+      'canvas',
+      'figure',
+      'hgroup',
+      'output',
+      'video',
+      'p'
+    ],
+    repFunc = function (wholeMatch, match, left, right) {
+      var txt = wholeMatch;
+      // check if this html element is marked as markdown
+      // if so, it's contents should be parsed as markdown
+      if (left.search(/\bmarkdown\b/) !== -1) {
+        txt = left + globals.converter.makeHtml(match) + right;
+      }
+      return '\n\n~K' + (globals.gHtmlBlocks.push(txt) - 1) + 'K\n\n';
+    };
+
+  for (var i = 0; i < blockTags.length; ++i) {
+    text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<' + blockTags[i] + '\\b[^>]*>', '</' + blockTags[i] + '>', 'gim');
+  }
+
+  // HR SPECIAL CASE
+  text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,
+    showdown.subParser('hashElement')(text, options, globals));
+
+  // Special case for standalone HTML comments:
+  text = text.replace(/(<!--[\s\S]*?-->)/g,
+    showdown.subParser('hashElement')(text, options, globals));
+
+  // PHP and ASP-style processor instructions (<?...?> and <%...%>)
+  text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,
+    showdown.subParser('hashElement')(text, options, globals));
+  return text;
+});
+
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+showdown.subParser('hashHTMLSpans', function (text, config, globals) {
+  'use strict';
+
+  var matches = showdown.helper.matchRecursiveRegExp(text, '<code\\b[^>]*>', '</code>', 'gi');
+
+  for (var i = 0; i < matches.length; ++i) {
+    text = text.replace(matches[i][0], '~L' + (globals.gHtmlSpans.push(matches[i][0]) - 1) + 'L');
+  }
+  return text;
+});
+
+/**
+ * Unhash HTML spans
+ */
+showdown.subParser('unhashHTMLSpans', function (text, config, globals) {
+  'use strict';
+
+  for (var i = 0; i < globals.gHtmlSpans.length; ++i) {
+    text = text.replace('~L' + i + 'L', globals.gHtmlSpans[i]);
+  }
+
+  return text;
+});
+
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+showdown.subParser('hashPreCodeTags', function (text, config, globals) {
+  'use strict';
+
+  var repFunc = function (wholeMatch, match, left, right) {
+    // encode html entities
+    var codeblock = left + showdown.subParser('encodeCode')(match) + right;
+    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
+  };
+
+  text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<pre\\b[^>]*>\\s*<code\\b[^>]*>', '^(?: |\\t){0,3}</code>\\s*</pre>', 'gim');
+  return text;
+});
+
+showdown.subParser('headers', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('headers.before', text, options, globals);
+
+  var prefixHeader = options.prefixHeaderId,
+      headerLevelStart = (isNaN(parseInt(options.headerLevelStart))) ? 1 : parseInt(options.headerLevelStart),
+
+  // Set text-style headers:
+  //	Header 1
+  //	========
+  //
+  //	Header 2
+  //	--------
+  //
+      setextRegexH1 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n={2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n=+[ \t]*\n+/gm,
+      setextRegexH2 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n-+[ \t]*\n+/gm;
+
+  text = text.replace(setextRegexH1, function (wholeMatch, m1) {
+
+    var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
+        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
+        hLevel = headerLevelStart,
+        hashBlock = '<h' + hLevel + hID + '>' + spanGamut + '</h' + hLevel + '>';
+    return showdown.subParser('hashBlock')(hashBlock, options, globals);
+  });
+
+  text = text.replace(setextRegexH2, function (matchFound, m1) {
+    var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
+        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
+        hLevel = headerLevelStart + 1,
+      hashBlock = '<h' + hLevel + hID + '>' + spanGamut + '</h' + hLevel + '>';
+    return showdown.subParser('hashBlock')(hashBlock, options, globals);
+  });
+
+  // atx-style headers:
+  //  # Header 1
+  //  ## Header 2
+  //  ## Header 2 with closing hashes ##
+  //  ...
+  //  ###### Header 6
+  //
+  text = text.replace(/^(#{1,6})[ \t]*(.+?)[ \t]*#*\n+/gm, function (wholeMatch, m1, m2) {
+    var span = showdown.subParser('spanGamut')(m2, options, globals),
+        hID = (options.noHeaderId) ? '' : ' id="' + headerId(m2) + '"',
+        hLevel = headerLevelStart - 1 + m1.length,
+        header = '<h' + hLevel + hID + '>' + span + '</h' + hLevel + '>';
+
+    return showdown.subParser('hashBlock')(header, options, globals);
+  });
+
+  function headerId(m) {
+    var title, escapedId = m.replace(/[^\w]/g, '').toLowerCase();
+
+    if (globals.hashLinkCounts[escapedId]) {
+      title = escapedId + '-' + (globals.hashLinkCounts[escapedId]++);
+    } else {
+      title = escapedId;
+      globals.hashLinkCounts[escapedId] = 1;
+    }
+
+    // Prefix id to prevent causing inadvertent pre-existing style matches.
+    if (prefixHeader === true) {
+      prefixHeader = 'section';
+    }
+
+    if (showdown.helper.isString(prefixHeader)) {
+      return prefixHeader + title;
+    }
+    return title;
+  }
+
+  text = globals.converter._dispatch('headers.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Turn Markdown image shortcuts into <img> tags.
+ */
+showdown.subParser('images', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('images.before', text, options, globals);
+
+  var inlineRegExp    = /!\[(.*?)]\s?\([ \t]*()<?(\S+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(['"])(.*?)\6[ \t]*)?\)/g,
+      referenceRegExp = /!\[([^\]]*?)] ?(?:\n *)?\[(.*?)]()()()()()/g;
+
+  function writeImageTag (wholeMatch, altText, linkId, url, width, height, m5, title) {
+
+    var gUrls   = globals.gUrls,
+        gTitles = globals.gTitles,
+        gDims   = globals.gDimensions;
+
+    linkId = linkId.toLowerCase();
+
+    if (!title) {
+      title = '';
+    }
+
+    if (url === '' || url === null) {
+      if (linkId === '' || linkId === null) {
+        // lower-case and turn embedded newlines into spaces
+        linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
+      }
+      url = '#' + linkId;
+
+      if (!showdown.helper.isUndefined(gUrls[linkId])) {
+        url = gUrls[linkId];
+        if (!showdown.helper.isUndefined(gTitles[linkId])) {
+          title = gTitles[linkId];
+        }
+        if (!showdown.helper.isUndefined(gDims[linkId])) {
+          width = gDims[linkId].width;
+          height = gDims[linkId].height;
+        }
+      } else {
+        return wholeMatch;
+      }
+    }
+
+    altText = altText.replace(/"/g, '&quot;');
+    altText = showdown.helper.escapeCharacters(altText, '*_', false);
+    url = showdown.helper.escapeCharacters(url, '*_', false);
+    var result = '<img src="' + url + '" alt="' + altText + '"';
+
+    if (title) {
+      title = title.replace(/"/g, '&quot;');
+      title = showdown.helper.escapeCharacters(title, '*_', false);
+      result += ' title="' + title + '"';
+    }
+
+    if (width && height) {
+      width  = (width === '*') ? 'auto' : width;
+      height = (height === '*') ? 'auto' : height;
+
+      result += ' width="' + width + '"';
+      result += ' height="' + height + '"';
+    }
+
+    result += ' />';
+    return result;
+  }
+
+  // First, handle reference-style labeled images: ![alt text][id]
+  text = text.replace(referenceRegExp, writeImageTag);
+
+  // Next, handle inline images:  ![alt text](url =<width>x<height> "optional title")
+  text = text.replace(inlineRegExp, writeImageTag);
+
+  text = globals.converter._dispatch('images.after', text, options, globals);
+  return text;
+});
+
+showdown.subParser('italicsAndBold', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('italicsAndBold.before', text, options, globals);
+
+  if (options.literalMidWordUnderscores) {
+    //underscores
+    // Since we are consuming a \s character, we need to add it
+    text = text.replace(/(^|\s|>|\b)__(?=\S)([\s\S]+?)__(?=\b|<|\s|$)/gm, '$1<strong>$2</strong>');
+    text = text.replace(/(^|\s|>|\b)_(?=\S)([\s\S]+?)_(?=\b|<|\s|$)/gm, '$1<em>$2</em>');
+    //asterisks
+    text = text.replace(/(\*\*)(?=\S)([^\r]*?\S[*]*)\1/g, '<strong>$2</strong>');
+    text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
+
+  } else {
+    // <strong> must go first:
+    text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '<strong>$2</strong>');
+    text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
+  }
+
+  text = globals.converter._dispatch('italicsAndBold.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Form HTML ordered (numbered) and unordered (bulleted) lists.
+ */
+showdown.subParser('lists', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('lists.before', text, options, globals);
+  /**
+   * Process the contents of a single ordered or unordered list, splitting it
+   * into individual list items.
+   * @param {string} listStr
+   * @param {boolean} trimTrailing
+   * @returns {string}
+   */
+  function processListItems (listStr, trimTrailing) {
+    // The $g_list_level global keeps track of when we're inside a list.
+    // Each time we enter a list, we increment it; when we leave a list,
+    // we decrement. If it's zero, we're not in a list anymore.
+    //
+    // We do this because when we're not inside a list, we want to treat
+    // something like this:
+    //
+    //    I recommend upgrading to version
+    //    8. Oops, now this line is treated
+    //    as a sub-list.
+    //
+    // As a single paragraph, despite the fact that the second line starts
+    // with a digit-period-space sequence.
+    //
+    // Whereas when we're inside a list (or sub-list), that line will be
+    // treated as the start of a sub-list. What a kludge, huh? This is
+    // an aspect of Markdown's syntax that's hard to parse perfectly
+    // without resorting to mind-reading. Perhaps the solution is to
+    // change the syntax rules such that sub-lists must start with a
+    // starting cardinal number; e.g. "1." or "a.".
+    globals.gListLevel++;
+
+    // trim trailing blank lines:
+    listStr = listStr.replace(/\n{2,}$/, '\n');
+
+    // attacklab: add sentinel to emulate \z
+    listStr += '~0';
+
+    var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+((\[(x|X| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
+        isParagraphed = (/\n[ \t]*\n(?!~0)/.test(listStr));
+
+    listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4, taskbtn, checked) {
+      checked = (checked && checked.trim() !== '');
+      var item = showdown.subParser('outdent')(m4, options, globals),
+          bulletStyle = '';
+
+      // Support for github tasklists
+      if (taskbtn && options.tasklists) {
+        bulletStyle = ' class="task-list-item" style="list-style-type: none;"';
+        item = item.replace(/^[ \t]*\[(x|X| )?]/m, function () {
+          var otp = '<input type="checkbox" disabled style="margin: 0px 0.35em 0.25em -1.6em; vertical-align: middle;"';
+          if (checked) {
+            otp += ' checked';
+          }
+          otp += '>';
+          return otp;
+        });
+      }
+      // m1 - Leading line or
+      // Has a double return (multi paragraph) or
+      // Has sublist
+      if (m1 || (item.search(/\n{2,}/) > -1)) {
+        item = showdown.subParser('githubCodeBlocks')(item, options, globals);
+        item = showdown.subParser('blockGamut')(item, options, globals);
+      } else {
+        // Recursion for sub-lists:
+        item = showdown.subParser('lists')(item, options, globals);
+        item = item.replace(/\n$/, ''); // chomp(item)
+        if (isParagraphed) {
+          item = showdown.subParser('paragraphs')(item, options, globals);
+        } else {
+          item = showdown.subParser('spanGamut')(item, options, globals);
+        }
+      }
+      item =  '\n<li' + bulletStyle + '>' + item + '</li>\n';
+      return item;
+    });
+
+    // attacklab: strip sentinel
+    listStr = listStr.replace(/~0/g, '');
+
+    globals.gListLevel--;
+
+    if (trimTrailing) {
+      listStr = listStr.replace(/\s+$/, '');
+    }
+
+    return listStr;
+  }
+
+  /**
+   * Check and parse consecutive lists (better fix for issue #142)
+   * @param {string} list
+   * @param {string} listType
+   * @param {boolean} trimTrailing
+   * @returns {string}
+   */
+  function parseConsecutiveLists(list, listType, trimTrailing) {
+    // check if we caught 2 or more consecutive lists by mistake
+    // we use the counterRgx, meaning if listType is UL we look for UL and vice versa
+    var counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm,
+      subLists = [],
+      result = '';
+
+    if (list.search(counterRxg) !== -1) {
+      (function parseCL(txt) {
+        var pos = txt.search(counterRxg);
+        if (pos !== -1) {
+          // slice
+          result += '\n\n<' + listType + '>' + processListItems(txt.slice(0, pos), !!trimTrailing) + '</' + listType + '>\n\n';
+
+          // invert counterType and listType
+          listType = (listType === 'ul') ? 'ol' : 'ul';
+          counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm;
+
+          //recurse
+          parseCL(txt.slice(pos));
+        } else {
+          result += '\n\n<' + listType + '>' + processListItems(txt, !!trimTrailing) + '</' + listType + '>\n\n';
+        }
+      })(list);
+      for (var i = 0; i < subLists.length; ++i) {
+
+      }
+    } else {
+      result = '\n\n<' + listType + '>' + processListItems(list, !!trimTrailing) + '</' + listType + '>\n\n';
+    }
+
+    return result;
+  }
+
+  // attacklab: add sentinel to hack around khtml/safari bug:
+  // http://bugs.webkit.org/show_bug.cgi?id=11231
+  text += '~0';
+
+  // Re-usable pattern to match any entire ul or ol list:
+  var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
+
+  if (globals.gListLevel) {
+    text = text.replace(wholeList, function (wholeMatch, list, m2) {
+      var listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
+      return parseConsecutiveLists(list, listType, true);
+    });
+  } else {
+    wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
+    //wholeList = /(\n\n|^\n?)( {0,3}([*+-]|\d+\.)[ \t]+[\s\S]+?)(?=(~0)|(\n\n(?!\t| {2,}| {0,3}([*+-]|\d+\.)[ \t])))/g;
+    text = text.replace(wholeList, function (wholeMatch, m1, list, m3) {
+
+      var listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
+      return parseConsecutiveLists(list, listType);
+    });
+  }
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  text = globals.converter._dispatch('lists.after', text, options, globals);
+  return text;
+});
+
+/**
+ * Remove one level of line-leading tabs or spaces
+ */
+showdown.subParser('outdent', function (text) {
+  'use strict';
+
+  // attacklab: hack around Konqueror 3.5.4 bug:
+  // "----------bug".replace(/^-/g,"") == "bug"
+  text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
+
+  // attacklab: clean up hack
+  text = text.replace(/~0/g, '');
+
+  return text;
+});
+
+/**
+ *
+ */
+showdown.subParser('paragraphs', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('paragraphs.before', text, options, globals);
+  // Strip leading and trailing lines:
+  text = text.replace(/^\n+/g, '');
+  text = text.replace(/\n+$/g, '');
+
+  var grafs = text.split(/\n{2,}/g),
+      grafsOut = [],
+      end = grafs.length; // Wrap <p> tags
+
+  for (var i = 0; i < end; i++) {
+    var str = grafs[i];
+    // if this is an HTML marker, copy it
+    if (str.search(/~(K|G)(\d+)\1/g) >= 0) {
+      grafsOut.push(str);
+    } else {
+      str = showdown.subParser('spanGamut')(str, options, globals);
+      str = str.replace(/^([ \t]*)/g, '<p>');
+      str += '</p>';
+      grafsOut.push(str);
+    }
+  }
+
+  /** Unhashify HTML blocks */
+  end = grafsOut.length;
+  for (i = 0; i < end; i++) {
+    var blockText = '',
+        grafsOutIt = grafsOut[i],
+        codeFlag = false;
+    // if this is a marker for an html block...
+    while (grafsOutIt.search(/~(K|G)(\d+)\1/) >= 0) {
+      var delim = RegExp.$1,
+          num   = RegExp.$2;
+
+      if (delim === 'K') {
+        blockText = globals.gHtmlBlocks[num];
+      } else {
+        // we need to check if ghBlock is a false positive
+        if (codeFlag) {
+          // use encoded version of all text
+          blockText = showdown.subParser('encodeCode')(globals.ghCodeBlocks[num].text);
+        } else {
+          blockText = globals.ghCodeBlocks[num].codeblock;
+        }
+      }
+      blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
+
+      grafsOutIt = grafsOutIt.replace(/(\n\n)?~(K|G)\d+\2(\n\n)?/, blockText);
+      // Check if grafsOutIt is a pre->code
+      if (/^<pre\b[^>]*>\s*<code\b[^>]*>/.test(grafsOutIt)) {
+        codeFlag = true;
+      }
+    }
+    grafsOut[i] = grafsOutIt;
+  }
+  text = grafsOut.join('\n\n');
+  // Strip leading and trailing lines:
+  text = text.replace(/^\n+/g, '');
+  text = text.replace(/\n+$/g, '');
+  return globals.converter._dispatch('paragraphs.after', text, options, globals);
+});
+
+/**
+ * Run extension
+ */
+showdown.subParser('runExtension', function (ext, text, options, globals) {
+  'use strict';
+
+  if (ext.filter) {
+    text = ext.filter(text, globals.converter, options);
+
+  } else if (ext.regex) {
+    // TODO remove this when old extension loading mechanism is deprecated
+    var re = ext.regex;
+    if (!re instanceof RegExp) {
+      re = new RegExp(re, 'g');
+    }
+    text = text.replace(re, ext.replace);
+  }
+
+  return text;
+});
+
+/**
+ * These are all the transformations that occur *within* block-level
+ * tags like paragraphs, headers, and list items.
+ */
+showdown.subParser('spanGamut', function (text, options, globals) {
+  'use strict';
+
+  text = globals.converter._dispatch('spanGamut.before', text, options, globals);
+  text = showdown.subParser('codeSpans')(text, options, globals);
+  text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
+  text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
+
+  // Process anchor and image tags. Images must come first,
+  // because ![foo][f] looks like an anchor.
+  text = showdown.subParser('images')(text, options, globals);
+  text = showdown.subParser('anchors')(text, options, globals);
+
+  // Make links out of things like `<http://example.com/>`
+  // Must come after _DoAnchors(), because you can use < and >
+  // delimiters in inline links like [this](<url>).
+  text = showdown.subParser('autoLinks')(text, options, globals);
+  text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
+  text = showdown.subParser('italicsAndBold')(text, options, globals);
+  text = showdown.subParser('strikethrough')(text, options, globals);
+
+  // Do hard breaks:
+  text = text.replace(/  +\n/g, ' <br />\n');
+
+  text = globals.converter._dispatch('spanGamut.after', text, options, globals);
+  return text;
+});
+
+showdown.subParser('strikethrough', function (text, options, globals) {
+  'use strict';
+
+  if (options.strikethrough) {
+    text = globals.converter._dispatch('strikethrough.before', text, options, globals);
+    text = text.replace(/(?:~T){2}([\s\S]+?)(?:~T){2}/g, '<del>$1</del>');
+    text = globals.converter._dispatch('strikethrough.after', text, options, globals);
+  }
+
+  return text;
+});
+
+/**
+ * Strip any lines consisting only of spaces and tabs.
+ * This makes subsequent regexs easier to write, because we can
+ * match consecutive blank lines with /\n+/ instead of something
+ * contorted like /[ \t]*\n+/
+ */
+showdown.subParser('stripBlankLines', function (text) {
+  'use strict';
+  return text.replace(/^[ \t]+$/mg, '');
+});
+
+/**
+ * Strips link definitions from text, stores the URLs and titles in
+ * hash references.
+ * Link defs are in the form: ^[id]: url "optional title"
+ *
+ * ^[ ]{0,3}\[(.+)\]: // id = $1  attacklab: g_tab_width - 1
+ * [ \t]*
+ * \n?                  // maybe *one* newline
+ * [ \t]*
+ * <?(\S+?)>?          // url = $2
+ * [ \t]*
+ * \n?                // maybe one newline
+ * [ \t]*
+ * (?:
+ * (\n*)              // any lines skipped = $3 attacklab: lookbehind removed
+ * ["(]
+ * (.+?)              // title = $4
+ * [")]
+ * [ \t]*
+ * )?                 // title is optional
+ * (?:\n+|$)
+ * /gm,
+ * function(){...});
+ *
+ */
+showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
+  'use strict';
+
+  var regex = /^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*<?(\S+?)>?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=~0))/gm;
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += '~0';
+
+  text = text.replace(regex, function (wholeMatch, linkId, url, width, height, blankLines, title) {
+    linkId = linkId.toLowerCase();
+    globals.gUrls[linkId] = showdown.subParser('encodeAmpsAndAngles')(url);  // Link IDs are case-insensitive
+
+    if (blankLines) {
+      // Oops, found blank lines, so it's not a title.
+      // Put back the parenthetical statement we stole.
+      return blankLines + title;
+
+    } else {
+      if (title) {
+        globals.gTitles[linkId] = title.replace(/"|'/g, '&quot;');
+      }
+      if (options.parseImgDimensions && width && height) {
+        globals.gDimensions[linkId] = {
+          width:  width,
+          height: height
+        };
+      }
+    }
+    // Completely remove the definition from the text
+    return '';
+  });
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/, '');
+
+  return text;
+});
+
+showdown.subParser('tables', function (text, options, globals) {
+  'use strict';
+
+  if (!options.tables) {
+    return text;
+  }
+
+  var tableRgx = /^[ \t]{0,3}\|?.+\|.+\n[ \t]{0,3}\|?[ \t]*:?[ \t]*(?:-|=){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:-|=){2,}[\s\S]+?(?:\n\n|~0)/gm;
+
+  function parseStyles(sLine) {
+    if (/^:[ \t]*--*$/.test(sLine)) {
+      return ' style="text-align:left;"';
+    } else if (/^--*[ \t]*:[ \t]*$/.test(sLine)) {
+      return ' style="text-align:right;"';
+    } else if (/^:[ \t]*--*[ \t]*:$/.test(sLine)) {
+      return ' style="text-align:center;"';
+    } else {
+      return '';
+    }
+  }
+
+  function parseHeaders(header, style) {
+    var id = '';
+    header = header.trim();
+    if (options.tableHeaderId) {
+      id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"';
+    }
+    header = showdown.subParser('spanGamut')(header, options, globals);
+
+    return '<th' + id + style + '>' + header + '</th>\n';
+  }
+
+  function parseCells(cell, style) {
+    var subText = showdown.subParser('spanGamut')(cell, options, globals);
+    return '<td' + style + '>' + subText + '</td>\n';
+  }
+
+  function buildTable(headers, cells) {
+    var tb = '<table>\n<thead>\n<tr>\n',
+        tblLgn = headers.length;
+
+    for (var i = 0; i < tblLgn; ++i) {
+      tb += headers[i];
+    }
+    tb += '</tr>\n</thead>\n<tbody>\n';
+
+    for (i = 0; i < cells.length; ++i) {
+      tb += '<tr>\n';
+      for (var ii = 0; ii < tblLgn; ++ii) {
+        tb += cells[i][ii];
+      }
+      tb += '</tr>\n';
+    }
+    tb += '</tbody>\n</table>\n';
+    return tb;
+  }
+
+  text = globals.converter._dispatch('tables.before', text, options, globals);
+
+  text = text.replace(tableRgx, function (rawTable) {
+
+    var i, tableLines = rawTable.split('\n');
+
+    // strip wrong first and last column if wrapped tables are used
+    for (i = 0; i < tableLines.length; ++i) {
+      if (/^[ \t]{0,3}\|/.test(tableLines[i])) {
+        tableLines[i] = tableLines[i].replace(/^[ \t]{0,3}\|/, '');
+      }
+      if (/\|[ \t]*$/.test(tableLines[i])) {
+        tableLines[i] = tableLines[i].replace(/\|[ \t]*$/, '');
+      }
+    }
+
+    var rawHeaders = tableLines[0].split('|').map(function (s) { return s.trim();}),
+        rawStyles = tableLines[1].split('|').map(function (s) { return s.trim();}),
+        rawCells = [],
+        headers = [],
+        styles = [],
+        cells = [];
+
+    tableLines.shift();
+    tableLines.shift();
+
+    for (i = 0; i < tableLines.length; ++i) {
+      if (tableLines[i].trim() === '') {
+        continue;
+      }
+      rawCells.push(
+        tableLines[i]
+          .split('|')
+          .map(function (s) {
+            return s.trim();
+          })
+      );
+    }
+
+    if (rawHeaders.length < rawStyles.length) {
+      return rawTable;
+    }
+
+    for (i = 0; i < rawStyles.length; ++i) {
+      styles.push(parseStyles(rawStyles[i]));
+    }
+
+    for (i = 0; i < rawHeaders.length; ++i) {
+      if (showdown.helper.isUndefined(styles[i])) {
+        styles[i] = '';
+      }
+      headers.push(parseHeaders(rawHeaders[i], styles[i]));
+    }
+
+    for (i = 0; i < rawCells.length; ++i) {
+      var row = [];
+      for (var ii = 0; ii < headers.length; ++ii) {
+        if (showdown.helper.isUndefined(rawCells[i][ii])) {
+
+        }
+        row.push(parseCells(rawCells[i][ii], styles[ii]));
+      }
+      cells.push(row);
+    }
+
+    return buildTable(headers, cells);
+  });
+
+  text = globals.converter._dispatch('tables.after', text, options, globals);
+
+  return text;
+});
+
+/**
+ * Swap back in all the special characters we've hidden.
+ */
+showdown.subParser('unescapeSpecialChars', function (text) {
+  'use strict';
+
+  text = text.replace(/~E(\d+)E/g, function (wholeMatch, m1) {
+    var charCodeToReplace = parseInt(m1);
+    return String.fromCharCode(charCodeToReplace);
+  });
+  return text;
+});
+module.exports = showdown;
diff --git a/utils/wxParse/wxDiscode.js b/utils/wxParse/wxDiscode.js
new file mode 100644
index 0000000..fca29bb
--- /dev/null
+++ b/utils/wxParse/wxDiscode.js
@@ -0,0 +1,207 @@
+// HTML 支持的数学符号
+function strNumDiscode(str){
+    str = str.replace(/&forall;/g, '∀');
+    str = str.replace(/&part;/g, '∂');
+    str = str.replace(/&exists;/g, '∃');
+    str = str.replace(/&empty;/g, '∅');
+    str = str.replace(/&nabla;/g, '∇');
+    str = str.replace(/&isin;/g, '∈');
+    str = str.replace(/&notin;/g, '∉');
+    str = str.replace(/&ni;/g, '∋');
+    str = str.replace(/&prod;/g, '∏');
+    str = str.replace(/&sum;/g, '∑');
+    str = str.replace(/&minus;/g, '−');
+    str = str.replace(/&lowast;/g, '∗');
+    str = str.replace(/&radic;/g, '√');
+    str = str.replace(/&prop;/g, '∝');
+    str = str.replace(/&infin;/g, '∞');
+    str = str.replace(/&ang;/g, '∠');
+    str = str.replace(/&and;/g, '∧');
+    str = str.replace(/&or;/g, '∨');
+    str = str.replace(/&cap;/g, '∩');
+    str = str.replace(/&cap;/g, '∪');
+    str = str.replace(/&int;/g, '∫');
+    str = str.replace(/&there4;/g, '∴');
+    str = str.replace(/&sim;/g, '∼');
+    str = str.replace(/&cong;/g, '≅');
+    str = str.replace(/&asymp;/g, '≈');
+    str = str.replace(/&ne;/g, '≠');
+    str = str.replace(/&le;/g, '≤');
+    str = str.replace(/&ge;/g, '≥');
+    str = str.replace(/&sub;/g, '⊂');
+    str = str.replace(/&sup;/g, '⊃');
+    str = str.replace(/&nsub;/g, '⊄');
+    str = str.replace(/&sube;/g, '⊆');
+    str = str.replace(/&supe;/g, '⊇');
+    str = str.replace(/&oplus;/g, '⊕');
+    str = str.replace(/&otimes;/g, '⊗');
+    str = str.replace(/&perp;/g, '⊥');
+    str = str.replace(/&sdot;/g, '⋅');
+    return str;
+}
+
+//HTML 支持的希腊字母
+function strGreeceDiscode(str){
+    str = str.replace(/&Alpha;/g, 'Α');
+    str = str.replace(/&Beta;/g, 'Β');
+    str = str.replace(/&Gamma;/g, 'Γ');
+    str = str.replace(/&Delta;/g, 'Δ');
+    str = str.replace(/&Epsilon;/g, 'Ε');
+    str = str.replace(/&Zeta;/g, 'Ζ');
+    str = str.replace(/&Eta;/g, 'Η');
+    str = str.replace(/&Theta;/g, 'Θ');
+    str = str.replace(/&Iota;/g, 'Ι');
+    str = str.replace(/&Kappa;/g, 'Κ');
+    str = str.replace(/&Lambda;/g, 'Λ');
+    str = str.replace(/&Mu;/g, 'Μ');
+    str = str.replace(/&Nu;/g, 'Ν');
+    str = str.replace(/&Xi;/g, 'Ν');
+    str = str.replace(/&Omicron;/g, 'Ο');
+    str = str.replace(/&Pi;/g, 'Π');
+    str = str.replace(/&Rho;/g, 'Ρ');
+    str = str.replace(/&Sigma;/g, 'Σ');
+    str = str.replace(/&Tau;/g, 'Τ');
+    str = str.replace(/&Upsilon;/g, 'Υ');
+    str = str.replace(/&Phi;/g, 'Φ');
+    str = str.replace(/&Chi;/g, 'Χ');
+    str = str.replace(/&Psi;/g, 'Ψ');
+    str = str.replace(/&Omega;/g, 'Ω');
+
+    str = str.replace(/&alpha;/g, 'α');
+    str = str.replace(/&beta;/g, 'β');
+    str = str.replace(/&gamma;/g, 'γ');
+    str = str.replace(/&delta;/g, 'δ');
+    str = str.replace(/&epsilon;/g, 'ε');
+    str = str.replace(/&zeta;/g, 'ζ');
+    str = str.replace(/&eta;/g, 'η');
+    str = str.replace(/&theta;/g, 'θ');
+    str = str.replace(/&iota;/g, 'ι');
+    str = str.replace(/&kappa;/g, 'κ');
+    str = str.replace(/&lambda;/g, 'λ');
+    str = str.replace(/&mu;/g, 'μ');
+    str = str.replace(/&nu;/g, 'ν');
+    str = str.replace(/&xi;/g, 'ξ');
+    str = str.replace(/&omicron;/g, 'ο');
+    str = str.replace(/&pi;/g, 'π');
+    str = str.replace(/&rho;/g, 'ρ');
+    str = str.replace(/&sigmaf;/g, 'ς');
+    str = str.replace(/&sigma;/g, 'σ');
+    str = str.replace(/&tau;/g, 'τ');
+    str = str.replace(/&upsilon;/g, 'υ');
+    str = str.replace(/&phi;/g, 'φ');
+    str = str.replace(/&chi;/g, 'χ');
+    str = str.replace(/&psi;/g, 'ψ');
+    str = str.replace(/&omega;/g, 'ω');
+    str = str.replace(/&thetasym;/g, 'ϑ');
+    str = str.replace(/&upsih;/g, 'ϒ');
+    str = str.replace(/&piv;/g, 'ϖ');
+    str = str.replace(/&middot;/g, '·');
+    return str;
+}
+
+// 
+
+function strcharacterDiscode(str){
+    // 加入常用解析
+    str = str.replace(/&nbsp;/g, ' ');
+    str = str.replace(/&quot;/g, "'");
+    str = str.replace(/&amp;/g, '&');
+    // str = str.replace(/&lt;/g, '‹');
+    // str = str.replace(/&gt;/g, '›');
+
+    str = str.replace(/&lt;/g, '<');
+    str = str.replace(/&gt;/g, '>');
+    str = str.replace(/&#8226;/g, '•');
+
+    return str;
+}
+
+// HTML 支持的其他实体
+function strOtherDiscode(str){
+    str = str.replace(/&OElig;/g, 'Œ');
+    str = str.replace(/&oelig;/g, 'œ');
+    str = str.replace(/&Scaron;/g, 'Š');
+    str = str.replace(/&scaron;/g, 'š');
+    str = str.replace(/&Yuml;/g, 'Ÿ');
+    str = str.replace(/&fnof;/g, 'ƒ');
+    str = str.replace(/&circ;/g, 'ˆ');
+    str = str.replace(/&tilde;/g, '˜');
+    str = str.replace(/&ensp;/g, '');
+    str = str.replace(/&emsp;/g, '');
+    str = str.replace(/&thinsp;/g, '');
+    str = str.replace(/&zwnj;/g, '');
+    str = str.replace(/&zwj;/g, '');
+    str = str.replace(/&lrm;/g, '');
+    str = str.replace(/&rlm;/g, '');
+    str = str.replace(/&ndash;/g, '–');
+    str = str.replace(/&mdash;/g, '—');
+    str = str.replace(/&lsquo;/g, '‘');
+    str = str.replace(/&rsquo;/g, '’');
+    str = str.replace(/&sbquo;/g, '‚');
+    str = str.replace(/&ldquo;/g, '“');
+    str = str.replace(/&rdquo;/g, '”');
+    str = str.replace(/&bdquo;/g, '„');
+    str = str.replace(/&dagger;/g, '†');
+    str = str.replace(/&Dagger;/g, '‡');
+    str = str.replace(/&bull;/g, '•');
+    str = str.replace(/&hellip;/g, '…');
+    str = str.replace(/&permil;/g, '‰');
+    str = str.replace(/&prime;/g, '′');
+    str = str.replace(/&Prime;/g, '″');
+    str = str.replace(/&lsaquo;/g, '‹');
+    str = str.replace(/&rsaquo;/g, '›');
+    str = str.replace(/&oline;/g, '‾');
+    str = str.replace(/&euro;/g, '€');
+    str = str.replace(/&trade;/g, '™');
+
+    str = str.replace(/&larr;/g, '←');
+    str = str.replace(/&uarr;/g, '↑');
+    str = str.replace(/&rarr;/g, '→');
+    str = str.replace(/&darr;/g, '↓');
+    str = str.replace(/&harr;/g, '↔');
+    str = str.replace(/&crarr;/g, '↵');
+    str = str.replace(/&lceil;/g, '⌈');
+    str = str.replace(/&rceil;/g, '⌉');
+
+    str = str.replace(/&lfloor;/g, '⌊');
+    str = str.replace(/&rfloor;/g, '⌋');
+    str = str.replace(/&loz;/g, '◊');
+    str = str.replace(/&spades;/g, '♠');
+    str = str.replace(/&clubs;/g, '♣');
+    str = str.replace(/&hearts;/g, '♥');
+
+    str = str.replace(/&diams;/g, '♦');
+    str = str.replace(/&#39;/g, '\'');
+    return str;
+}
+
+function strMoreDiscode(str){
+    str = str.replace(/\r\n/g,"");  
+    str = str.replace(/\n/g,"");
+
+    str = str.replace(/code/g,"wxxxcode-style");
+    return str;
+}
+
+function strDiscode(str){
+    str = strNumDiscode(str);
+    str = strGreeceDiscode(str);
+    str = strcharacterDiscode(str);
+    str = strOtherDiscode(str);
+    str = strMoreDiscode(str);
+    return str;
+}
+function urlToHttpUrl(url,rep){
+    
+    var patt1 = new RegExp("^//");
+    var result = patt1.test(url);
+    if(result){
+        url = rep+":"+url;
+    }
+    return  url;
+}
+
+module.exports = {
+    strDiscode:strDiscode,
+    urlToHttpUrl:urlToHttpUrl
+}
\ No newline at end of file
diff --git a/utils/wxParse/wxParse.js b/utils/wxParse/wxParse.js
new file mode 100644
index 0000000..379f2f6
--- /dev/null
+++ b/utils/wxParse/wxParse.js
@@ -0,0 +1,159 @@
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+/**
+ * utils函数引入
+ **/
+import showdown from './showdown.js';
+import HtmlToJson from './html2json.js';
+/**
+ * 配置及公有属性
+ **/
+var realWindowWidth = 0;
+var realWindowHeight = 0;
+wx.getSystemInfo({
+  success: function (res) {
+    realWindowWidth = res.windowWidth
+    realWindowHeight = res.windowHeight
+  }
+})
+/**
+ * 主函数入口区
+ **/
+function wxParse(bindName = 'wxParseData', type='html', data='<div class="color:red;">数据不能为空</div>', target,imagePadding) {
+  var that = target;
+  var transData = {};//存放转化后的数据
+  if (type == 'html') {
+    transData = HtmlToJson.html2json(data, bindName);
+    console.log(JSON.stringify(transData, ' ', ' '));
+  } else if (type == 'md' || type == 'markdown') {
+    var converter = new showdown.Converter();
+    var html = converter.makeHtml(data);
+    transData = HtmlToJson.html2json(html, bindName);
+    console.log(JSON.stringify(transData, ' ', ' '));
+  }
+  transData.view = {};
+  transData.view.imagePadding = 0;
+  if(typeof(imagePadding) != 'undefined'){
+    transData.view.imagePadding = imagePadding
+  }
+  var bindData = {};
+  bindData[bindName] = transData;
+  that.setData(bindData)
+  that.wxParseImgLoad = wxParseImgLoad;
+  that.wxParseImgTap = wxParseImgTap;
+}
+// 图片点击事件
+function wxParseImgTap(e) {
+  var that = this;
+  var nowImgUrl = e.target.dataset.src;
+  var tagFrom = e.target.dataset.from;
+  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
+    wx.previewImage({
+      current: nowImgUrl, // 当前显示图片的http链接
+      urls: that.data[tagFrom].imageUrls // 需要预览的图片http链接列表
+    })
+  }
+}
+
+/**
+ * 图片视觉宽高计算函数区 
+ **/
+function wxParseImgLoad(e) {
+  var that = this;
+  var tagFrom = e.target.dataset.from;
+  var idx = e.target.dataset.idx;
+  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
+    calMoreImageInfo(e, idx, that, tagFrom)
+  } 
+}
+// 假循环获取计算图片视觉最佳宽高
+function calMoreImageInfo(e, idx, that, bindName) {
+  var temData = that.data[bindName];
+  if (!temData || temData.images.length == 0) {
+    return;
+  }
+  var temImages = temData.images;
+  //因为无法获取view宽度 需要自定义padding进行计算，稍后处理
+  var recal = wxAutoImageCal(e.detail.width, e.detail.height,that,bindName); 
+  // temImages[idx].width = recal.imageWidth;
+  // temImages[idx].height = recal.imageheight; 
+  // temData.images = temImages;
+  // var bindData = {};
+  // bindData[bindName] = temData;
+  // that.setData(bindData);
+  var index = temImages[idx].index
+  var key = `${bindName}`
+  for (var i of index.split('.')) key+=`.nodes[${i}]`
+  var keyW = key + '.width'
+  var keyH = key + '.height'
+  that.setData({
+    [keyW]: recal.imageWidth,
+    [keyH]: recal.imageheight,
+  })
+}
+
+// 计算视觉优先的图片宽高
+function wxAutoImageCal(originalWidth, originalHeight,that,bindName) {
+  //获取图片的原始长宽
+  var windowWidth = 0, windowHeight = 0;
+  var autoWidth = 0, autoHeight = 0;
+  var results = {};
+  var padding = that.data[bindName].view.imagePadding;
+  windowWidth = realWindowWidth-2*padding;
+  windowHeight = realWindowHeight;
+  //判断按照那种方式进行缩放
+  // console.log("windowWidth" + windowWidth);
+  if (originalWidth > windowWidth) {//在图片width大于手机屏幕width时候
+    autoWidth = windowWidth;
+    // console.log("autoWidth" + autoWidth);
+    autoHeight = (autoWidth * originalHeight) / originalWidth;
+    // console.log("autoHeight" + autoHeight);
+    results.imageWidth = autoWidth;
+    results.imageheight = autoHeight;
+  } else {//否则展示原来的数据
+    results.imageWidth = originalWidth;
+    results.imageheight = originalHeight;
+  }
+  return results;
+}
+
+function wxParseTemArray(temArrayName,bindNameReg,total,that){
+  var array = [];
+  var temData = that.data;
+  var obj = null;
+  for(var i = 0; i < total; i++){
+    var simArr = temData[bindNameReg+i].nodes;
+    array.push(simArr);
+  }
+
+  temArrayName = temArrayName || 'wxParseTemArray';
+  obj = JSON.parse('{"'+ temArrayName +'":""}');
+  obj[temArrayName] = array;
+  that.setData(obj);
+}
+
+/**
+ * 配置emojis
+ * 
+ */
+
+function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
+   HtmlToJson.emojisInit(reg,baseSrc,emojis);
+}
+
+module.exports = {
+  wxParse: wxParse,
+  wxParseTemArray:wxParseTemArray,
+  emojisInit:emojisInit
+}
+
+
diff --git a/utils/wxParse/wxParse.wxml b/utils/wxParse/wxParse.wxml
new file mode 100644
index 0000000..00fa568
--- /dev/null
+++ b/utils/wxParse/wxParse.wxml
@@ -0,0 +1,967 @@
+<!--**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */-->
+
+<!--基础元素-->
+<template name="wxParseVideo">
+  <!--增加video标签支持，并循环添加-->
+  <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+    <video class="{{item.classStr}} wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
+  </view>
+</template>
+
+<template name="wxParseImg">
+  <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;"
+  />
+</template>
+
+<template name="WxEmojiView">
+  <view class="WxEmojiView wxParse-inline" style="{{item.styleStr}}">
+    <block wx:for="{{item.textArray}}" wx:key="">
+      <block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block>
+      <block wx:elif="{{item.node == 'element'}}">
+        <image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
+      </block>
+    </block>
+  </view>
+</template>
+
+<template name="WxParseBr">
+  <text>\n</text>
+</template>
+<!--入口模版-->
+
+<template name="wxParse">
+  <block wx:for="{{wxParseData}}" wx:key="">
+    <template is="wxParse0" data="{{item}}" />
+  </block>
+</template>
+
+
+<!--循环模版-->
+<template name="wxParse0">
+  <!--<template is="wxParse1" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse1" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+    <block wx:elif="{{item.tag == 'table'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse1" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+
+
+<!--循环模版-->
+<template name="wxParse1">
+  <!--<template is="wxParse2" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse2" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse2" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse2" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse2" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse2" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+
+<!--循环模版-->
+<template name="wxParse2">
+  <!--<template is="wxParse3" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse3" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse3" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse3" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse3" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse3" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse3">
+  <!--<template is="wxParse4" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse4" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse4" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse4" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse4" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse4" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse4">
+  <!--<template is="wxParse5" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse5" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse5" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse5" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse5" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse5" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse5">
+  <!--<template is="wxParse6" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse6" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse6" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse6" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse6" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse6" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse6">
+  <!--<template is="wxParse7" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse7" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse7" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse7" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse7" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse7" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+<!--循环模版-->
+<template name="wxParse7">
+  <!--<template is="wxParse8" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse8" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse8" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse8" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse8" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse8" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse8">
+  <!--<template is="wxParse9" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse9" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse9" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse9" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse9" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse9" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse9">
+  <!--<template is="wxParse10" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse10" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse10" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse10" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse10" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse10" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse10">
+  <!--<template is="wxParse11" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse11" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse11" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse11" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse11" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse11" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
+
+<!--循环模版-->
+<template name="wxParse11">
+  <!--<template is="wxParse12" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse12" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse12" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
+
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
+
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
+
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse12" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse12" data="{{item}}" />
+        </block>
+      </view>
+    </block>
+
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse12" data="{{item}}" />
+      </block>
+    </view>
+
+  </block>
+
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
\ No newline at end of file
diff --git a/utils/wxParse/wxParse.wxss b/utils/wxParse/wxParse.wxss
new file mode 100644
index 0000000..6e1d604
--- /dev/null
+++ b/utils/wxParse/wxParse.wxss
@@ -0,0 +1,206 @@
+
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ * 
+ * github地址: https://github.com/icindy/wxParse
+ * 
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+.wxParse{
+    margin: 0 5px;
+    font-family: Helvetica,sans-serif;
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.8;
+}
+view{
+    word-break:break-all; overflow:auto;
+}
+.wxParse-inline{
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
+/*//标题 */
+.wxParse-div{margin: 0;padding: 0;}
+.wxParse-h1{ font-size:2em; margin: .67em 0 }
+.wxParse-h2{ font-size:1.5em; margin: .75em 0 }
+.wxParse-h3{ font-size:1.17em; margin: .83em 0 }
+.wxParse-h4{ margin: 1.12em 0}
+.wxParse-h5 { font-size:.83em; margin: 1.5em 0 }
+.wxParse-h6{ font-size:.75em; margin: 1.67em 0 }
+
+.wxParse-h1 {
+  font-size: 18px;
+  font-weight: 400;
+  margin-bottom: .9em;
+}
+.wxParse-h2 {
+  font-size: 16px;
+  font-weight: 400;
+  margin-bottom: .34em;
+}
+.wxParse-h3 {
+  font-weight: 400;
+  font-size: 15px;
+  margin-bottom: .34em;
+}
+.wxParse-h4 {
+  font-weight: 400;
+  font-size: 14px;
+  margin-bottom: .24em;
+}
+.wxParse-h5 {
+  font-weight: 400;
+  font-size: 13px;
+  margin-bottom: .14em;
+}
+.wxParse-h6 {
+  font-weight: 400;
+  font-size: 12px;
+  margin-bottom: .04em;
+}
+
+.wxParse-h1, .wxParse-h2, .wxParse-h3, .wxParse-h4, .wxParse-h5, .wxParse-h6, .wxParse-b, .wxParse-strong  { font-weight: bolder }
+
+.wxParse-i,.wxParse-cite,.wxParse-em,.wxParse-var,.wxParse-address{font-style:italic}
+.wxParse-pre,.wxParse-tt,.wxParse-code,.wxParse-kbd,.wxParse-samp{font-family:monospace}
+.wxParse-pre{white-space:pre}
+.wxParse-big{font-size:1.17em}
+.wxParse-small,.wxParse-sub,.wxParse-sup{font-size:.83em}
+.wxParse-sub{vertical-align:sub}
+.wxParse-sup{vertical-align:super}
+.wxParse-s,.wxParse-strike,.wxParse-del{text-decoration:line-through}
+/*wxparse-自定义个性化的css样式*/
+/*增加video的css样式*/
+.wxParse-strong,.wxParse-s{display: inline}
+.wxParse-a{
+    color: deepskyblue;
+    word-break:break-all;
+    overflow:auto;
+}
+
+.wxParse-video{
+    text-align: center;
+    margin: 10px 0;
+}
+
+.wxParse-video-video{
+    width:100%;
+}
+
+.wxParse-img{
+    /*background-color: #efefef;*/
+    overflow: hidden;
+}
+
+.wxParse-blockquote {
+    margin: 0;
+    padding:10px 0 10px 5px;
+    font-family:Courier, Calibri,"宋体";
+    background:#f5f5f5;
+    border-left: 3px solid #dbdbdb;
+}
+
+.wxParse-code,.wxParse-wxxxcode-style{
+    display: inline;
+    background:#f5f5f5;
+}
+.wxParse-ul{
+    margin: 20rpx 10rpx;
+}
+
+.wxParse-li,.wxParse-li-inner{
+    display: flex;
+    align-items: baseline;
+    margin: 10rpx 0;
+}
+.wxParse-li-text{
+    
+    align-items: center;
+    line-height: 20px;
+}
+
+.wxParse-li-circle{
+    display: inline-flex;
+    width: 5px;
+    height: 5px;
+    background-color: #333;
+    margin-right: 5px;
+}
+
+.wxParse-li-square{
+    display: inline-flex;
+    width: 10rpx;
+    height: 10rpx;
+    background-color: #333;
+    margin-right: 5px;
+}
+.wxParse-li-ring{
+    display: inline-flex;
+    width: 10rpx;
+    height: 10rpx;
+    border: 2rpx solid #333;
+    border-radius: 50%;
+    background-color: #fff;
+    margin-right: 5px;
+}
+
+/*.wxParse-table{
+    width: 100%;
+    height: 400px;
+}
+.wxParse-thead,.wxParse-tfoot,.wxParse-tr{
+    display: flex;
+    flex-direction: row;
+}
+.wxParse-th,.wxParse-td{
+    display: flex;
+    width: 580px;
+    overflow: auto;
+}*/
+
+.wxParse-u {
+  text-decoration: underline;
+}
+.wxParse-hide{
+    display: none;
+}
+.WxEmojiView{
+    align-items: center;
+}
+.wxEmoji{
+    width: 16px;
+    height:16px;
+}
+.wxParse-tr{
+	display: flex;
+	border-right:1px solid #e0e0e0;
+	border-bottom:1px solid #e0e0e0;
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-th,
+.wxParse-td{
+	flex:1;
+	padding:5px;
+	font-size:28rpx;
+	border-left:1px solid #e0e0e0;
+	word-break: break-all;
+}
+.wxParse-td:last{
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-th{
+	background:#f0f0f0;
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-del{
+    display: inline;
+}
+.wxParse-figure {
+  overflow: hidden;
+}

From eed42f4f77177e582e9a3f8371704bdd5c8bc413 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 11 Sep 2024 11:21:27 +0800
Subject: [PATCH 208/471] =?UTF-8?q?=E5=A4=9A=E6=96=87=E6=9C=AC=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml           |  2 +-
 pages/user/service/info/index.js | 49 ++++++++++++++++++++++++++++----
 utils/wxParse/wxParse.wxss       |  3 --
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4ac2eaf..41518cc 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -172,7 +172,7 @@
   </view>
   <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
   <view style="display: flex;">
-    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://test.m.cloud.sz-trip.com/aiPlay" class="jqssd">
     <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
       <image src="{{indexSeason.ai}}" mode=""/>
     </view>
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index be99801..aa5bb40 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -9,6 +9,7 @@ Page({
    */
   data: {
     info:null,
+    linkData:[]
   },
 
   /**
@@ -28,7 +29,10 @@ Page({
         var that = this;
         WxParse.wxParse('article', 'html', article, that, 0);
 
-        
+        // console.log(this.data)
+        let arrayData = []
+        this.parseTagA(this.data.article.nodes, arrayData)
+        this.setData({linkData: arrayData})
       })
     }
     else {
@@ -37,15 +41,48 @@ Page({
   },
   // wxParse 解析a标签
   wxParseTagATap: function(e){
-    var href = e.currentTarget.dataset.src;
-    console.log(href);
-    if(href.indexOf("http") >= 0){
+     console.log(e)
+     let href = e.currentTarget.dataset.src;
+     let linkTarget = this.data.linkData.find(v=>v.href == href)
+     if (linkTarget) {
+         if (linkTarget["attr-minilink"]) {
+            wx.navigateTo({url: linkTarget["attr-minilink"]})
+         } else {
+            if(href.indexOf("http") >= 0){
+                wx.navigateTo({
+                    url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href)
+                })
+            }
+         }
+     }
+      if (this.data.link) {
         wx.navigateTo({
-            url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href)
+            url: this.data.link
         })
-    }
+      }
+      return
+    //   console.log(e.currentTarget)
+    //     var href = e.currentTarget.dataset.src;
+    //     console.log(href);
+    //     if(href.indexOf("http") >= 0){
+    //         wx.navigateTo({
+    //             url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href)
+    //         })
+    //     }
 },
 
+    // 递归article取出所有a标签
+    parseTagA:function (nodes, array) {
+        nodes.forEach(v=>{
+            if (v.attr && v.attr.href) {
+                array.push(v.attr)
+            }
+            if (Array.isArray(v.nodes) && v.nodes.length>0) {
+                this.parseTagA(v.nodes,array)
+            }
+        })
+    },
+
 
   showService:function(){
     util.pagePoint({
diff --git a/utils/wxParse/wxParse.wxss b/utils/wxParse/wxParse.wxss
index 6e1d604..063fc24 100644
--- a/utils/wxParse/wxParse.wxss
+++ b/utils/wxParse/wxParse.wxss
@@ -17,9 +17,6 @@
     color: #666;
     line-height: 1.8;
 }
-view{
-    word-break:break-all; overflow:auto;
-}
 .wxParse-inline{
     display: inline;
     margin: 0;

From c18af5a02c99f73d363b5d003333d91ecf6ee23c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 18 Sep 2024 15:26:29 +0800
Subject: [PATCH 209/471] =?UTF-8?q?=E9=85=92=E6=99=AF=E5=A5=97=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |    2 +-
 pages/index/index.wxml                | 1374 ++++++++++++++-----------
 pages/info/postProductInfo/index.js   |   26 +-
 pages/info/postProductInfo/index.wxml |   60 +-
 pages/info/postProductInfo/index.wxss |   97 +-
 pages/map/index.js                    |   34 +
 pages/map/index.wxml                  |   31 +
 pages/map/index.wxss                  |   43 +-
 pages/order/orderList/index.wxml      |    2 +-
 pages/order/postOrder/index.wxml      |    2 +-
 10 files changed, 1069 insertions(+), 602 deletions(-)

diff --git a/app.js b/app.js
index 8daa8ad..2d8e4ba 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.isTest148? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 41518cc..778d17d 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -4,612 +4,808 @@
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-  <view class="weather-num">{{weather.max_temp}}°</view>
-  <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
-</view>
-<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-    <view class="iconfont icon-sousuo"></view>
-    <view class="textOver">搜索想要的旅游产品或服务</view>
-  </navigator>
-</view>
-<view style="position:relative;z-index: 1;">
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+<view wx:if="{{!isTest}}">
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+    <view class="weather-num">{{weather.max_temp}}°</view>
+    <view class="weather">{{weather.weather}}</view>
+    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
+        mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
+    </view>
+    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+        <view class="iconfont icon-sousuo"></view>
+        <view class="textOver">搜索想要的旅游产品或服务</view>
+    </navigator>
+    </view>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+    </view>
+    </view>
+
+    <!-- <swiper class="swiper" indicator-dots="{{true}}"
+    autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
     <block wx:for="{{banner}}" wx:key="*this">
-      <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
-      </swiper-item>
+        <swiper-item bindtap="bannerClick2" data-item="{{item}}">
+        <image src="{{item.img}}" mode="aspectFill"></image>
+        </swiper-item>
     </block>
-  </swiper>
-  <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-  </view>
-</view>
+    </swiper> -->
+    <view class="top-icons" wx:if="{{!isTest}}">
+    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">活动日历</view>
+    </view>
+    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">场馆预约</view>
+    </view>
+    <!-- 非遗跳专题 -->
+    <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
+        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
+    <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+        <view class="top-icon-text">非遗专卖</view>
+    </view>
+    <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+        <view class="top-icon-text">非遗专卖</view>
+    </view> -->
+    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">剧场演出</view>
+    </view>
+    <!-- 2024年7月新版文创特产 -->
+    <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+        <view class="top-icon-text">文创特产</view>
+    </view>
+    <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+        data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+        <view class="top-icon-text">文创特产</view>
+    </view> -->
+    <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">景点门票</view>
+    </view>
+    <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">酒店住宿</view>
+    </view>
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">夜游苏州</view>
+    </view>
+    <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">一日游</view>
+    </view>
+    <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">研学游</view>
+    </view>
+    </view>
+    <view class="content">
+    <view class="sale-road-boxes" wx:if="{{false}}">
+        <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+        <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+        <view class="sale-product">
+            <view class="sale-product-bg"></view>
+            <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
+            </image>
+            <view class="sale-info">
+            <view class="sale-product-title textOver2">
+                <view>限时特惠</view>
+                <view>新品推荐</view>
+            </view>
+            <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
+                ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
+            </view>
+        </view>
+        </view>
+        <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
+        <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+        <view class="sale-product">
+            <view class="sale-product-bg road-product-bg"></view>
+            <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
+            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
+            </image>
+            <view class="sale-info">
+            <view class="sale-product-title textOver2">
+                <view>四季苏州</view>
+                <view>最是江南</view>
+            </view>
+            <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+                ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+            </view>
+        </view>
+        </view>
+    </view>
+    <!-- 五一修改 一张banner不滚动 -->
+    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+    </view>
+    <view class="small-swiper-box" wx:else>
+        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <block wx:for="{{xiaobanner}}" wx:key="*this">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <!-- 原 圆角77rpx，现改为13rpx -->
+            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            </swiper-item>
+        </block>
+        </swiper>
+        <view class="dot-list com-flex sm-dot-list">
+        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        </view>
+    </view>
+    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+    <view style="display: flex;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
+        <image src="{{indexSeason.ai}}" mode=""/>
+        </view>
+        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+        <image src="{{indexSeason.avoid}}" mode=""/>
+        </view>
+    </view>
+    <!-- 元旦修改  限时特惠--新版-->
+    <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+        <!-- 上方标题部分 -->
+        <view class="xsth-title">
+        <view class="xsth-left" style="display: flex;">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+        </view>
+        <view class="time-box" style="z-index: 9;">
+            倒计时
+            <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+            <text>:</text>
+            <view class="xsth-time">{{djs.m}}</view>
+            <text>:</text>
+            <view class="xsth-time">{{djs.s}}</view>
+        </view>
+        <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
+        <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+            更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+        </view> -->
+        </view>
+        <!-- 商品部分 -->
+        <view class="xpth-product">
+        <!-- 左边的2个产品 -->
+        <view class="xpth-left">
+            <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+            <image src="{{item.headimg}}" mode="" />
+            <view class="xpth-item-content">
+                <view class="xpth-item-title textOver2">{{item.title}}</view>
+                <!-- <view class="xpth-tag">唇齿留香</view> -->
+                <view class="xpth-item-bottom">
+                <view class="xpth-item-price">{{item.price/100}}</view>
+                <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                </view>
+            </view>
+            </view>
+        </view>
+        <!-- 右边的banner -->
+        <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" />
+        </view>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+    </view>
+    <!-- 五一修改 .slide-out-box 增加背景色-->
+    <view class="slide-out-box">
+        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+            <view class="text">数字非遗</view>
+            </view>
+            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+            <view class="text">数字博物馆</view>
+            </view>
+            <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/df0683bb40ec2615a932ef2379779374.png" mode="widthFix"></image>
+            <view class="text">数字名人馆</view>
+            </view>
+            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+            <view>云上观展</view>
+            </view>
+            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+            <view class="text">云上文博会</view>
+            </view>
+            <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
+            <view class="text">精彩回顾</view>
+            </view>
+            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+            <view class="text">文化场馆查询</view>
+            </view>
+            <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
+            <view class="text">苏影通</view>
+            </view>
+            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view>
+            <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/1a5fc26d419e589c5649273f8105b723.png" mode="widthFix"></image>
+            <view class="text">e读书</view>
+            </view>
 
-<!-- <swiper class="swiper" indicator-dots="{{true}}"
-  autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
-  <block wx:for="{{banner}}" wx:key="*this">
-    <swiper-item bindtap="bannerClick2" data-item="{{item}}">
-      <image src="{{item.img}}" mode="aspectFill"></image>
-    </swiper-item>
-  </block>
-</swiper> -->
-<view class="top-icons" wx:if="{{!isTest}}">
-  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">活动日历</view>
-  </view>
-  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">场馆预约</view>
-  </view>
-  <!-- 非遗跳专题 -->
-  <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-    <view class="top-icon-text">非遗专卖</view>
-  </view>
-  <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-    <view class="top-icon-text">非遗专卖</view>
-  </view> -->
-  <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">剧场演出</view>
-  </view>
-  <!-- 2024年7月新版文创特产 -->
-  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-    <view class="top-icon-text">文创特产</view>
-  </view>
-  <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-    <view class="top-icon-text">文创特产</view>
-  </view> -->
-  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">景点门票</view>
-  </view>
-  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">酒店住宿</view>
-  </view>
-  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">夜游苏州</view>
-  </view>
-  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">一日游</view>
-  </view>
-  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">研学游</view>
-  </view>
-</view>
-<view class="content">
-  <view class="sale-road-boxes" wx:if="{{false}}">
-    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-      <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-      <view class="sale-product">
-        <view class="sale-product-bg"></view>
-        <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
+            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+            <view class="text">数字公共文化</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+            <view class="text">文旅单位</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view> -->
+            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
+            <view class="text">云游苏州</view>
+            </view>
+            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+            <view class="text">美图鉴赏</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+            <view>文物查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+            data-path="/pages/pbService/museum/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+            <view>博物馆查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+            <view>云上文博会</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+            <view class="text">投资导引图</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="数字文物"
+            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+            <view>数字文物</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+            <view>团体预约</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+            <view>廉洁地图</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+            <view>文化配送</view>
+            </view> -->
+        </view>
+        </scroll-view>
+        <view class="scroll-line">
+        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+        </view>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
+    </view>
+    <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+        <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+        <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
         </image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">
-            <view>限时特惠</view>
-            <view>新品推荐</view>
-          </view>
-          <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
-            ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-        </view>
-      </view>
-    </view>
-    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-      <view class="sale-product">
-        <view class="sale-product-bg road-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+        <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
+        <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+        data-path="/pages/list/{{isTest?'road':'food'}}/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
+        <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
         </image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">
-            <view>四季苏州</view>
-            <view>最是江南</view>
-          </view>
-          <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-            ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <!-- 五一修改 一张banner不滚动 -->
-  <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-    <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-  </view>
-  <view class="small-swiper-box" wx:else>
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <!-- 原 圆角77rpx，现改为13rpx -->
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-        </swiper-item>
-      </block>
-    </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
-    </view>
-  </view>
-  <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-  <view style="display: flex;">
-    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://test.m.cloud.sz-trip.com/aiPlay" class="jqssd">
-    <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
-      <image src="{{indexSeason.ai}}" mode=""/>
-    </view>
-    <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-      <image src="{{indexSeason.avoid}}" mode=""/>
-    </view>
-  </view>
-  <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-    <!-- 上方标题部分 -->
-    <view class="xsth-title">
-      <view class="xsth-left" style="display: flex;">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
-      </view>
-      <view class="time-box" style="z-index: 9;">
-        倒计时
-        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-        <text>:</text>
-        <view class="xsth-time">{{djs.m}}</view>
-        <text>:</text>
-        <view class="xsth-time">{{djs.s}}</view>
-      </view>
-      <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-      <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-      </view> -->
-    </view>
-    <!-- 商品部分 -->
-    <view class="xpth-product">
-      <!-- 左边的2个产品 -->
-      <view class="xpth-left">
-        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-          <image src="{{item.headimg}}" mode="" />
-          <view class="xpth-item-content">
-            <view class="xpth-item-title textOver2">{{item.title}}</view>
-            <!-- <view class="xpth-tag">唇齿留香</view> -->
-            <view class="xpth-item-bottom">
-              <view class="xpth-item-price">{{item.price/100}}</view>
-              <!-- <view class="xpth-item-buy">立即抢购</view> -->
-            </view>
-          </view>
-        </view>
-      </view>
-      <!-- 右边的banner -->
-      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" />
-    </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-  </view>
-  <!-- 五一修改 .slide-out-box 增加背景色-->
-  <view class="slide-out-box">
-    <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-    <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-      <view class="pbservice" style="margin-bottom:30rpx">
-        <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-          <view class="text">数字非遗</view>
-        </view>
-        <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-          <view class="text">数字博物馆</view>
-        </view>
-        <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240717/df0683bb40ec2615a932ef2379779374.png" mode="widthFix"></image>
-          <view class="text">数字名人馆</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-          <view>云上观展</view>
-        </view>
-        <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-          <view class="text">云上文博会</view>
-        </view>
-        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
-          <view class="text">精彩回顾</view>
-        </view>
-        <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-          <view class="text">文化场馆查询</view>
-        </view>
-        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
-          <view class="text">苏影通</view>
-        </view>
-        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-          <view class="text">书仓</view>
-        </view>
-        <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240717/1a5fc26d419e589c5649273f8105b723.png" mode="widthFix"></image>
-          <view class="text">e读书</view>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
+        <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
+        <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
+        <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+        data-path="/pages/list/{{isTest?'road':'food'}}/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
+        <image bindtap="audioGuide" data-event="voice_click"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
+        </image>
+        <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
+        <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
+        mode="aspectFill"></image> -->
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0;">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+        <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+        <view>
+            查看全部
         </view>
-
-        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-          <view class="text">数字公共文化</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-          data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-          <view class="text">文旅单位</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-          <view class="text">书仓</view>
-        </view> -->
-        <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-          <view class="text">云游苏州</view>
-        </view>
-        <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-          <view class="text">美图鉴赏</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-          data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-          <view>文物查询</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-          data-path="/pages/pbService/museum/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-          <view>博物馆查询</view>
+        <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode="" />
+        <!-- <text class="iconfont icon-you"></text>  -->
+        </navigator>
+        <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
+    </view>
+    <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
+        <!-- 元旦修改 ggfw为新增类名 -->
+        <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+        <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
+            data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+            <view>景区舒适度</view>
         </view> -->
-        <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-          <view>云上文博会</view>
+        <!-- 元旦修改 ggfw为新增类名 -->
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
+            <view>安全服务</view>
         </view> -->
-        <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-          <view class="text">投资导引图</view>
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
+            <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+            <view>景区舒适度</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
+            <!-- 元旦修改 -->
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+            <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
+            <!-- 元旦修改 -->
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+            <view>实时路况</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
+            data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
+            <view>找厕所</view>
         </view> -->
-        <!-- <view bindtap="gotoUrl" data-title="数字文物"
-          data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-          <view>数字文物</view>
+        <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
+            data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
+            <view>停车场</view>
         </view> -->
-        <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-          <view>团体预约</view>
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
+            <view>12348</view>
         </view> -->
-        <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-          data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-          <view>廉洁地图</view>
+        </view>
+    </view>
+    <view class="sale-road-boxes">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
+    </view>
+    <!-- <view class="six-box">
+        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+        data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
+        src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
+        </image>
+    </view> -->
+    <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+    <view class="six-box-new" wx:if="{{!isTest}}">
+        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+        </image>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
+    </view>
+    <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
+        <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
+        <image src="{{item.icon}}" mode="widthFix"></image>
+        <view>{{item.name}}</view>
+        </view>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
+    </view>
+    <view class="hot-list" wx:if="{{isTest==false}}">
+        <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+        <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+            <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+            <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
+            <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+            <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
+            <view class="today-date">{{date}} {{month}}</view>
+            <view class="today-hot-box">
+                <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
+                {{item.ext.display_tags[0]}}</view>
+                <view class="today-hot-title">{{item.title}}</view>
+            </view>
+            </view>
+            <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+            <view style="position:relative">
+                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+            </view>
+            <view class="hot-info">
+                <view class="hot-title">{{item.title}}</view>
+                <view class="tags textOver" style="margin-bottom:0">
+                <view class="icon-box">
+                    <text class="iconfont icon-xin"></text>
+                    <text>{{item.ext.like_number}}</text>
+                </view>
+                <view class="icon-box">
+                    <text class="iconfont icon-eye"></text>
+                    <text>{{item.ext.view_number}}</text>
+                </view>
+                </view>
+            </view>
+            </view>
+            <view wx:else class="hot-item">
+            <view style="position:relative">
+                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                <!-- <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' && item.ext.price}}" class="hot-price">
+                <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                </view>
+            </view>
+            </view>
+        </view>
+        </view>
+    </view>
+    <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+    <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+    </view>
+    <view class="mask prizeMask" wx:if="{{videoPrize}}">
+    <view class="mask-bg"></view>
+    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+        <!-- 中奖的卡券 -->
+        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
         </view> -->
-        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-          <view>文化配送</view>
+        </view>
+        <!-- 中奖的产品 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
         </view> -->
-      </view>
-    </scroll-view>
-    <view class="scroll-line">
-      <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-      <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-      <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-      <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-    </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
-  </view>
-  <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-    <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-    <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-    </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
-    <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
-    <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
-    <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
-    </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
-    <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
-    <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
-    <image bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
-    </image>
-    <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
-    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-      mode="aspectFill"></image> -->
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0;">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-      <view>
-        查看全部
-      </view>
-      <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode="" />
-      <!-- <text class="iconfont icon-you"></text>  -->
-    </navigator>
-    <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
-  </view>
-  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
-    <!-- 元旦修改 ggfw为新增类名 -->
-    <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-      <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
-        data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
-      </view> -->
-      <!-- 元旦修改 ggfw为新增类名 -->
-      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
-        <view>安全服务</view>
-      </view> -->
-      <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
-        <view>电子社保卡</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
-        <view>行李寄存</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
-        <view>实时路况</view>
-      </view>
-      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
-        data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
-        <view>找厕所</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
-        data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
-        <view>停车场</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-        <view>12348</view>
-      </view> -->
-    </view>
-  </view>
-  <view class="sale-road-boxes">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
-  </view>
-  <!-- <view class="six-box">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
-    </image>
-  </view> -->
-  <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
-  <view class="six-box-new" wx:if="{{!isTest}}">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
-    </image>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
-  </view>
-  <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-    <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
-      <image src="{{item.icon}}" mode="widthFix"></image>
-      <view>{{item.name}}</view>
-    </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
-  </view>
-  <view class="hot-list" wx:if="{{isTest==false}}">
-    <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
-      <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-        <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-          <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-          <view class="today-date">{{date}} {{month}}</view>
-          <view class="today-hot-box">
-            <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
-              {{item.ext.display_tags[0]}}</view>
-            <view class="today-hot-title">{{item.title}}</view>
-          </view>
-        </view>
-        <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-          <view style="position:relative">
-            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-          </view>
-          <view class="hot-info">
-            <view class="hot-title">{{item.title}}</view>
-            <view class="tags textOver" style="margin-bottom:0">
-              <view class="icon-box">
-                <text class="iconfont icon-xin"></text>
-                <text>{{item.ext.like_number}}</text>
-              </view>
-              <view class="icon-box">
-                <text class="iconfont icon-eye"></text>
-                <text>{{item.ext.view_number}}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view wx:else class="hot-item">
-          <view style="position:relative">
-            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <!-- <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' && item.ext.price}}" class="hot-price">
-              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
-            </view>
-          </view>
         </view>
-      </view>
+        <!-- 未中奖 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <view bindtap="closePrice">我知道了</view>
+        </view>
+        </view>
+        <!-- 未抽奖状态 -->
+        <view style="position:relative" wx:else>
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
+        </view>
+        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
+    </view>
+    </view>
+    <!-- 广告弹窗 -->
+    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
+    <view class="alertavd" wx:if="{{showAdv}}">
+    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <block wx:for="{{alertSwipeList}}" wx:key="*this">
+        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
+            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+    </view>
+    <!-- 广告弹窗结束 -->
+    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
+    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
-  </view>
-  <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-  <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
-</view>
-<view class="mask prizeMask" wx:if="{{videoPrize}}">
-  <view class="mask-bg"></view>
-  <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-    <!-- 中奖的卡券 -->
-    <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-      <view class="prize-name">{{prizeInfo.prize_name}}</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <!-- <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-      </view> -->
-    </view>
-    <!-- 中奖的产品 -->
-    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-      <view class="prize-name">{{prizeInfo.prize_name}}</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <!-- <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-      </view> -->
-    </view>
-    <!-- 未中奖 -->
-    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
-      <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <view bindtap="closePrice">我知道了</view>
-      </view>
-    </view>
-    <!-- 未抽奖状态 -->
-    <view style="position:relative" wx:else>
-      <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-      <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-    </view>
-    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
-  </view>
-</view>
-<!-- 广告弹窗 -->
-<view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
-<view class="alertavd" wx:if="{{showAdv}}">
-  <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-    <block wx:for="{{alertSwipeList}}" wx:key="*this">
-      <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
-        <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-      </swiper-item>
-    </block>
-  </swiper>
-  <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
-</view>
-<!-- 广告弹窗结束 -->
-<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
-  <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-  <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-    <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
-  </view>
 
-  <!-- 视频 -->
-  <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-    <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
+    <!-- 视频 -->
+    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
-    <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-    <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-  </view>
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+    </view>
+    </view>
+    <!-- <view class="topBox">
+        <view class="Qtop" :style="{height:height}">
+        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+        </view>
+        <view class="jumpBox">
+        <view class="time">{{time}}s</view>
+        <view bind:tap="gotoIndex">跳过</view>
+        </view>
+    </view> -->
 </view>
-<!-- <view class="topBox">
-    <view class="Qtop" :style="{height:height}">
-      <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+
+<view wx:else>
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+    </view>
+    </view>
+    <view class="top-icons">
+    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">活动日历</view>
+    </view>
+    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">场馆预约</view>
+    </view>
+
+  
+    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">剧场演出</view>
+    </view>
+  
+   
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">夜游苏州</view>
+    </view>
+    </view>
+    <view class="content">
+ 
+    <!-- 五一修改 一张banner不滚动 -->
+    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+    </view>
+    <view class="small-swiper-box" wx:else>
+        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <block wx:for="{{xiaobanner}}" wx:key="*this">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <!-- 原 圆角77rpx，现改为13rpx -->
+            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            </swiper-item>
+        </block>
+        </swiper>
+        <view class="dot-list com-flex sm-dot-list">
+        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        </view>
+    </view>
+    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+    <view style="display: flex;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
+        <image src="{{indexSeason.ai}}" mode=""/>
+        </view>
+        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+        <image src="{{indexSeason.avoid}}" mode=""/>
+        </view>
+    </view>
+
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+    </view>
+    <!-- 五一修改 .slide-out-box 增加背景色-->
+    <view class="slide-out-box">
+        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+            <view class="text">数字非遗</view>
+            </view>
+            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+            <view class="text">数字博物馆</view>
+            </view>
+            
+            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+            <view>云上观展</view>
+            </view>
+            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+            <view class="text">云上文博会</view>
+            </view>
+            
+            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+            <view class="text">文化场馆查询</view>
+            </view>
+            
+            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view>
+            
+
+            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+            <view class="text">数字公共文化</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+            <view class="text">文旅单位</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view> -->
+            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
+            <view class="text">云游苏州</view>
+            </view>
+            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+            <view class="text">美图鉴赏</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+            <view>文物查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+            data-path="/pages/pbService/museum/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+            <view>博物馆查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+            <view>云上文博会</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+            <view class="text">投资导引图</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="数字文物"
+            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+            <view>数字文物</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+            <view>团体预约</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+            <view>廉洁地图</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+            <view>文化配送</view>
+            </view> -->
+        </view>
+        </scroll-view>
+        <view class="scroll-line">
+        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+        </view>
     </view>
-    <view class="jumpBox">
-      <view class="time">{{time}}s</view>
-      <view bind:tap="gotoIndex">跳过</view>
+
+
+
+
+
+
+  
     </view>
-</view> -->
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index da0b4d3..fd88ffb 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -73,8 +73,22 @@ Page({
                 res.data.sku = [sku];
             }
             res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+
+            let resData = res.data
+            if (resData.product_data) {
+                if (resData.product_data["住"]) {
+                    resData.product_data["住"] = JSON.parse(resData.product_data["住"])
+                }
+                if (resData.product_data["游"]) {
+                    resData.product_data["游"] = JSON.parse(resData.product_data["游"])
+                }
+                if (resData.product_data["食"]) {
+                    resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+                }
+            }
+
             this.setData({
-                info: res.data,
+                info: resData,
                 supplierId: res.data.supplier_id,
                 iShop: res.data.supplier_id ? true : false
             })
@@ -686,6 +700,16 @@ Page({
             util.gotoDetail(item);
         }
     },
+
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+          latitude: Number(info.scene_lat),
+          longitude: Number(info.scene_lon),
+          name:info.scene_name,
+            address:info.scene_address
+        })
+      },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 2f079ba..d6742cc 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -21,15 +21,61 @@
   <view class="com-price two">￥{{ allowance_data.mini_price / 100 }}起</view>
   <view class="yellow">单品最高补贴{{ allowance_data.max_price / 100 }}元</view>
 </view>
-<view class="top-info" wx:if="{{info}}">
-  <view class="title">{{info.title}}</view>
-  <view class="subtitle">{{info.subtitle}}</view>
-  <view class="tags-box textOver">
-    <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+
+<view wx:if="{{info}}">
+    <!-- 酒景套餐 -->
+    <view class="top-info" style="padding: 0;" wx:if="{{info.is_package===1}}">
+        <div class="wineScene-price-container" >
+            <div class="wineSecne-price">{{info.price/100}}<span class="wineSecne-money">￥{{info.market_price/100}}</span></div>
+            <div>已售{{info.sales_number||0}}份</div>
+        </div>
+        <view style="padding: 26rpx 26rpx 0;">
+            <view class="title" style="font-weight: bold;">{{info.title}}</view>
+            <view class="hotel-custom" style="padding:26rpx 0">
+                <view class="hotel-custom-detail" wx:for="{{info.product_data}}" wx:key="item">
+                    <view class="tip-info">
+                        <view class="tip">{{index}}</view>
+                        <view class="info"></view>
+                    </view>
+                    <view class="hotel-custom-right" style="padding-left: 8rpx;flex:1;width: 1rpx;" >
+                        <view style="display: flex;align-items: center;justify-content: space-between;" wx:for="{{item}}" wx:key="data" wx:for-item="str" wx:for-index="i">
+                            <view class="textOver" style="flex:1;">
+                                {{str.title}}
+                            </view>
+                            <view style="flex-shrink: 0;width: 60rpx;text-align: right;">{{str.unit}}</view>
+                        </view>
+                    </view>
+                </view>
+
+            </view>
+        </view>
+
+        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;" bindtap="gotolocation">
+            <view class="map-container">
+                <view>
+                    <view class="textOver" style="font-weight: 500;font-size: 28rpx;color: #000000;width: 600rpx;">{{info.scene_name}}</view>
+                    <view style="padding-top: 17rpx;">{{info.scene_address}}</view>
+                    
+                </view>
+                <view style="text-align: center;">
+                    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/navigation.png"></image>
+                    <view style="padding-top: 14rpx;">去这里</view>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="top-info" wx:else>
+        <view class="title">{{info.title}}</view>
+        <view class="subtitle">{{info.subtitle}}</view>
+        <view class="tags-box textOver">
+            <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+            </view>
+            <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
+        </view>
     </view>
-    <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
-  </view>
 </view>
+
+
 <view class="scroll-all-box" id="menus" wx:if="{{info}}">
   <view class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px">
     <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">产品特色</view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 4aedf61..7e97fa7 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -938,4 +938,99 @@ page {
   align-items: center;
   justify-content: space-between;
   height: 70rpx;
-}
\ No newline at end of file
+}
+
+ .wineScene-price-container {
+    width: 750rpx;
+    height: 100rpx;
+    background: linear-gradient(-90deg,#FF413B, #FFAB2E);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    color: #FFFFFF;
+    font-size: 24rpx;
+ }
+
+ .wineScene-price-container .wineSecne-price {
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #FFFFFF;
+}
+.wineScene-price-container .wineSecne-money {
+    font-size: 24rpx;
+    font-weight: 500;
+    text-decoration-line: line-through;
+    padding-left: 14rpx;
+}
+.wineScene-price-container .wineSecne-price::before {
+    font-size: 24rpx;
+    content: '￥';
+}
+
+.hotel-custom-detail{
+    display: flex;
+    /* justify-content: space-between; */
+    height: fit-content;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 20rpx;
+}
+.hotel-custom-detail .tip-info{
+    width: 33rpx;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.hotel-custom-detail .tip-info .tip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    width: 33rpx;
+    height: 33rpx;
+    background: #6394FD;
+    border-radius: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    text-align: center;
+    line-height: 33rpx;
+}
+.hotel-custom-detail .tip-info .info{
+    width: 11rpx;
+    height: 100%;
+    background: #D0DFFE;
+    border-radius: 5rpx;
+}
+
+.hotel-custom-right>view{
+    margin-bottom: 20rpx;
+}
+.hotel-custom-right>view:last-of-type{
+    margin-bottom: 0;
+}
+.map-container{
+    background-image: url('https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/locationBg.png');
+    background-size: 100% 100%;
+    width: 100%;
+    height: 128rpx;
+    padding: 30rpx 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    box-sizing: border-box;
+}
+.map-container image{
+    width: 29rpx;
+    height: 29rpx;
+}
diff --git a/pages/map/index.js b/pages/map/index.js
index 0d73bd3..bfa0fe6 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -759,6 +759,40 @@ Page({
     })
   },
 
+// 位页面 gotoUrl 和 gotourls
+  gotoUrl: function(e) {
+    let url = e.currentTarget.dataset.url;
+    app.globalData.weburl = url;
+    wx.navigateTo({
+        // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+    })
+},
+// 实时路况跳转外链
+gotoUrls() {
+    // 判断是否登录
+    var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+    if(!token || !userId) {
+        let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+        
+        app.globalData.weburl = url;
+        wx.navigateTo({
+            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+        })
+    }else {
+        commonApi.user_post("uservice/user/userEncry").then(res => {
+            if(res.code == 1) {
+                let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+                
+                app.globalData.weburl = url;
+                wx.navigateTo({
+                    url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+                })
+            }
+        })
+    }
+},
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 8bcf488..99daf15 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -1,6 +1,8 @@
 <!--pages/map/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
 <title title="图游"></title>
+
+<view wx:if="{{!isTest}}">
 <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" scale='13'>
 </map>
 <view style="height:{{topHeight}}px"></view>
@@ -307,4 +309,33 @@
 </view>
 <view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask" catchtouchmove="preventTouchMove">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
+</view>
+
+</view>
+
+<view wx:else>
+   
+    <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
+        <!-- 元旦修改 ggfw为新增类名 -->
+        <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
+            <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+            <view>景区舒适度</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+            <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+            <view>实时路况</view>
+        </view>
+
+        </view>
+    </view>
 </view>
\ No newline at end of file
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index bde614b..7c6d54b 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -672,4 +672,45 @@
     /* color: #83D851; */
     text-align: center;
     line-height: 40rpx;
-}
\ No newline at end of file
+}
+
+/* // 位页面 */
+.pbservice {
+    /* width: calc(175rpx * 6); */
+    /* 元旦修改 */
+    width: calc(190rpx * 7);
+    display: flex;
+    margin-top: 30rpx;
+    flex-wrap: wrap;
+    /* margin-bottom: 60rpx; */
+    /* 元旦修改 注释margin-bottom */
+    justify-content: center;
+  }
+  .pbservice-item {
+    /* 元旦修改 截止到注释的width*/
+    width: 120rpx;
+    margin-bottom: 33.33rpx;
+    margin-right: 62.33rpx;
+    /* width: 175rpx; */
+    text-align: center;
+    font-size: 25rpx;
+    /* color: #333; */
+    /* 春节调整颜色改版 */
+    color: #54504D;
+    line-height: 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+  .text {
+    width: 200rpx;
+  }
+  .pbservice-item image {
+    /* width: 60rpx;
+    margin-bottom: 20rpx;
+    margin-top: 50rpx; */
+    /* 元旦修改 以上都是之前的*/
+    width: 106rpx;
+    margin-bottom: 10rpx;
+  }
\ No newline at end of file
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 29fc4b1..a488969 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -73,7 +73,7 @@
         
       <view wx:if="{{coupon && coupon.activity.discount_type != 'pricebreak'}}">
         <text>合计：</text><text
-        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+        class="price">¥{{((postFee+showPrice* coupon.activity.fold/10))/100}}</text>
       </view>
       <view wx:else>
         <text>合计：</text>
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index f46ff39..fd18ba0 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -58,7 +58,7 @@
       </view>
       <view wx:else>
         <text>合计：</text><text
-        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+        class="price">¥{{(postFee+showPrice* coupon.activity.fold/10)/100}}</text>
       </view>
     </view>
     <view wx:else>

From 9c46d5d1c3e6fa9b20701fb1d295838dea06e708 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 19 Sep 2024 17:38:19 +0800
Subject: [PATCH 210/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 2d8e4ba..8daa8ad 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.isTest149? true : false;
+      data.isTest = data.isTest148? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 17ae9645b1f5532c5dff8e9fb84fb32807ad4807 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 23 Sep 2024 10:36:02 +0800
Subject: [PATCH 211/471] =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=BB=BA=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                        |   3 +-
 pages/index/index.wxml          |   6 +-
 pages/index/index.wxss          |   2 +-
 pages/map/index.wxml            |   2 +-
 pages/user/suggest/suggest.js   | 146 ++++++++++++++++++++++++++++++++
 pages/user/suggest/suggest.json |   5 ++
 pages/user/suggest/suggest.wxml |  32 +++++++
 pages/user/suggest/suggest.wxss |  85 +++++++++++++++++++
 pages/user/user.wxml            |   8 ++
 pages/user/user.wxss            |  11 +++
 project.private.config.json     |   7 ++
 subPackages/index/index.wxml    |   4 +-
 subPackages/indexs/index.wxml   |   4 +-
 13 files changed, 305 insertions(+), 10 deletions(-)
 create mode 100644 pages/user/suggest/suggest.js
 create mode 100644 pages/user/suggest/suggest.json
 create mode 100644 pages/user/suggest/suggest.wxml
 create mode 100644 pages/user/suggest/suggest.wxss

diff --git a/app.json b/app.json
index e6ce114..4007d30 100644
--- a/app.json
+++ b/app.json
@@ -184,7 +184,8 @@
     "pages/user/userPrivacy/index",
     "pages/user/personalInfo/index",
     "pages/info/luggageInfo/index",
-    "pages/order/WineSceneOrder/index"
+    "pages/order/WineSceneOrder/index",
+    "pages/user/suggest/suggest"
   ],
   "subpackages": [
     {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 778d17d..a8b12df 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -174,7 +174,7 @@
     <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
     <view style="display: flex;">
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
         <image src="{{indexSeason.ai}}" mode=""/>
         </view>
         <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
@@ -407,7 +407,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
             <view>电子社保卡</view>
         </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
             <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
             <view>景区舒适度</view>
         </view>
@@ -682,7 +682,7 @@
     <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
     <view style="display: flex;">
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="jqssd"> -->
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
         <image src="{{indexSeason.ai}}" mode=""/>
         </view>
         <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3e7a495..34cd243 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1195,4 +1195,4 @@ page {
   height: 166rpx;
   flex-shrink: 0;
   margin-left: -20rpx;
-}
\ No newline at end of file
+}
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 99daf15..58ef64d 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -322,7 +322,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
             <view>电子社保卡</view>
         </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
             <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
             <view>景区舒适度</view>
         </view>
diff --git a/pages/user/suggest/suggest.js b/pages/user/suggest/suggest.js
new file mode 100644
index 0000000..d445941
--- /dev/null
+++ b/pages/user/suggest/suggest.js
@@ -0,0 +1,146 @@
+// pages/user/address/add/index.js
+import util from "../../../utils/util.js"
+import user from "../../../utils/https/user.js"
+import commonApi from "../../../utils/https/common"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+ 
+    formData:{
+        username: "",
+        mobile: null,
+        content:""
+    },
+
+    safeBottom:app.globalData.safeBottom,
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    
+  },
+
+  // 输入监听 不是双向绑定啊 绝望
+  nameInput:function(e){
+    var formData = this.data.formData;
+    formData.username = e.detail.value;
+    this.setData({
+      formData: formData
+    })
+  },
+  telInput:function(e){
+    var formData = this.data.formData;
+    formData.mobile = e.detail.value;
+    this.setData({
+      formData: formData
+    })
+  },
+  contentInput:function(e){
+    var formData = this.data.formData;
+    formData.content = e.detail.value;
+    this.setData({
+      formData: formData
+    })
+  },
+
+  // 保存
+  save:function(){
+    if (!(this.data.formData.username||'').trim()){
+      wx.showToast({
+        title: '请输入姓名！',
+        icon:"none"
+      })
+      return false;
+    }
+    if (!this.data.formData.mobile) {
+      wx.showToast({
+        title: '请输入手机号码！',
+        icon: "none"
+      })
+      return false;
+    }
+    if (!util.isTel(this.data.formData.mobile)) {
+      wx.showToast({
+        title: '请输入正确的手机号码！',
+        icon: "none"
+      })
+      return false;
+    }
+ 
+    if (!(this.data.formData.content||'').trim()) {
+      wx.showToast({
+        title: '请输入反馈内容！',
+        icon: "none"
+      })
+      return false;
+    }
+    let data = this.data.formData;
+
+    commonApi.user_post("Suggest/add", data).then(res => {
+        if(res.code==1){
+
+            let data = {
+                username: "",
+                mobile: null,
+                content:""
+            }
+
+            this.setData({formData: data})
+
+            wx.showToast({
+                title: '提交成功',
+                icon:"none",
+            })
+        }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/user/suggest/suggest.json b/pages/user/suggest/suggest.json
new file mode 100644
index 0000000..b4c6fd2
--- /dev/null
+++ b/pages/user/suggest/suggest.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+      "title-header": "/pages/component/TitleHeader"
+    }
+  }
\ No newline at end of file
diff --git a/pages/user/suggest/suggest.wxml b/pages/user/suggest/suggest.wxml
new file mode 100644
index 0000000..29a54e9
--- /dev/null
+++ b/pages/user/suggest/suggest.wxml
@@ -0,0 +1,32 @@
+<!--pages/user/address/add/index.wxml-->
+<view class="container-view">
+    <view>
+        <title-header title="投诉建议"></title-header>
+        <view class="input-box">
+            <view class="input-item">
+            <text class="input-label">姓名:</text>
+            <input bindinput="nameInput" value="{{formData.username}}" class="weui-input" auto-focus placeholder="请填写您的姓名" />
+            </view>
+            <view class="input-item">
+            <text class="input-label">手机号:</text>
+            <input bindinput="telInput" type="number" value="{{formData.mobile}}" class="weui-input" placeholder="请填写您的联系方式" />
+            </view>
+            
+            <view class="input-item" style="border-bottom: none;">
+            <text class="input-label">反馈内容:</text>
+            </view>
+            <view class="textarea-container">
+                <textarea bindinput="contentInput" maxlength="500" value="{{formData.content}}" class="weui-input" placeholder="请填写具体的问题内容" ></textarea>
+                
+                <view class="textarea-tip">{{formData.content.length}}/500</view>
+            </view>
+            
+        </view>
+    </view>
+  
+  <view>
+    <view class="btn" bindtap="save">提交</view>
+    <view style="height:{{safeBottom}}rpx"></view>
+  </view>
+  
+</view>
\ No newline at end of file
diff --git a/pages/user/suggest/suggest.wxss b/pages/user/suggest/suggest.wxss
new file mode 100644
index 0000000..21bc86b
--- /dev/null
+++ b/pages/user/suggest/suggest.wxss
@@ -0,0 +1,85 @@
+/* pages/user/address/add/index.wxss */
+page {
+    background: white;
+    height: 100%;
+  }
+  .input-box {
+    background: white;
+    padding: 0 20rpx;
+    font-size: 28rpx;
+    margin: 0;
+  }
+  .input-item {
+    display: flex;
+    align-items: center;
+    height: 106rpx;
+    justify-content: space-between;
+    border-bottom: 1rpx solid #EEE;
+  }
+  .input-label {
+    width: 140rpx;
+  }
+  .input-item .weui-input {
+    flex: 1;
+  }
+  .select-card {
+    display: flex;
+    align-items: center;
+    line-height: 90rpx;
+  }
+  .select-card .iconfont {
+    line-height: 90rpx;
+  }
+  .btn {
+    margin: 0 20rpx;
+    margin-top: 100rpx;
+    width: 700rpx;
+    margin-bottom: 30rpx;
+    line-height: 72rpx;
+    border-radius: 35rpx;
+    text-align: center;
+    color: white;
+    font-size: 36rpx;
+    background: #0B898E;
+  }
+  .icon-xia {
+     margin-left: 10rpx;
+     color: #999;
+     font-size: 28rpx;
+  }
+  .textarea-container{
+    width: 100%;
+    height: 243rpx;
+    background: #F7F7F7;
+    border-radius: 13rpx 13rpx 13rpx 13rpx;
+    margin: 0 auto;
+    padding: 20rpx;
+    box-sizing: border-box;
+    position: relative;
+    padding-bottom: 50rpx;
+  }
+  .textarea-container textarea{
+      width: 100%;
+      height: 100%;
+      overflow-y: auto;
+   } 
+
+  .container-view{
+      display: flex;
+      justify-content: space-between;
+      flex-direction: column;
+      height: 100%;
+  }
+  .textarea-tip{
+      position: absolute;
+      right: 22rpx;
+      bottom: 13rpx;
+
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+
+        text-align: left;
+
+  }
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 37be7b7..595065a 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -110,6 +110,9 @@
     <navigator url="userPrivacy/index?id=9" class="user-box-line" catchtap="pagePoint" data-event="mine_travelinfo">
       用户协议
     </navigator>
+    <navigator url="suggest/suggest" class="user-box-line" catchtap="pagePoint" data-event="mine_travelinfo">
+      投诉建议
+    </navigator>
     <navigator url="userPrivacy/index?id=12" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       隐私政策
     </navigator>
@@ -120,6 +123,11 @@
       第三方共享信息清单
     </navigator>
   </view>
+
+  <view class="bottom-intro">
+    <view>主办方:苏州市文旅融合发展中心</view>
+    <view>备案号:苏ICP备19064944号-3X@君到苏州</view>
+  </view>
 </view>
 <view class="mask" wx:if="{{showModel}}"> 
   <view class="model">
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index 34d22ba..a9aec25 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -222,4 +222,15 @@ margin-top: 10rpx;
         border: none;
     }
     
+    .bottom-intro{
+        width: 100%;
+        padding: 75rpx;
+        font-family: PingFang-SC, PingFang-SC;
+        font-weight: 500;
+        font-size: 25rpx;
+        color: #999999;
+        line-height: 40rpx;
+        text-align: center;
+        box-sizing: border-box;
+    }
     
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 0ddceb1..615b7db 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/user/suggest/suggest",
+          "pathName": "pages/user/suggest/suggest",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 59e3171..13ecfd3 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -187,7 +187,7 @@
   <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
   <view style="display: flex;">
     <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort"  class="jqssd" ></view>
+      data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"  class="jqssd" ></view>
     <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
   </view>
@@ -446,7 +446,7 @@
         <view>安全服务</view>
       </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+      data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
         <!-- 元旦修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml
index 4af909c..b046453 100644
--- a/subPackages/indexs/index.wxml
+++ b/subPackages/indexs/index.wxml
@@ -74,7 +74,7 @@
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
       <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
       <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
@@ -153,7 +153,7 @@
           <view>安全服务</view>
         </view>
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
           <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gaofeng.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>

From c407c00e9e1a8297fa7e6800a4663037868688b6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 23 Sep 2024 13:52:38 +0800
Subject: [PATCH 212/471] =?UTF-8?q?=E5=9B=BD=E5=BA=86=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                       |   11 +-
 images/index_seld_1.png        |  Bin 0 -> 4591 bytes
 images/map_seld_1.png          |  Bin 0 -> 7019 bytes
 images/user_seld_1.png         |  Bin 0 -> 5070 bytes
 pages/index/index.js           |  806 +++++++++++-------
 pages/index/index.wxml         | 1099 +++++++-----------------
 pages/index/index.wxss         |  458 +++++++---
 project.private.config.json    |   10 +-
 subPackages/index/index.js     |   74 +-
 subPackages/index/index.wxml   | 1446 ++++++++++++++++---------------
 subPackages/index/index.wxss   |   25 +-
 subPackages/indexGQ/index.js   | 1224 +++++++++++++++++++++++++++
 subPackages/indexGQ/index.json |    6 +
 subPackages/indexGQ/index.wxml |  316 +++++++
 subPackages/indexGQ/index.wxss | 1448 ++++++++++++++++++++++++++++++++
 15 files changed, 5031 insertions(+), 1892 deletions(-)
 create mode 100644 images/index_seld_1.png
 create mode 100644 images/map_seld_1.png
 create mode 100644 images/user_seld_1.png
 create mode 100644 subPackages/indexGQ/index.js
 create mode 100644 subPackages/indexGQ/index.json
 create mode 100644 subPackages/indexGQ/index.wxml
 create mode 100644 subPackages/indexGQ/index.wxss

diff --git a/app.json b/app.json
index 4007d30..c86da7a 100644
--- a/app.json
+++ b/app.json
@@ -197,7 +197,8 @@
         "techanCart/index",
         "feiyiNew/index",
         "postSearch/index",
-        "gwcOrder/index"
+        "gwcOrder/index",
+        "indexGQ/index"
       ]
     }
   ],
@@ -228,26 +229,26 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999",
-    "selectedColor": "#4285F4",
+    "selectedColor": "#FF6756",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/index_seld.png",
+        "selectedIconPath": "/images/index_seld_1.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/map_seld.png",
+        "selectedIconPath": "/images/map_seld_1.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/user_seld.png",
+        "selectedIconPath": "/images/user_seld_1.png",
         "text": "我的"
       }
     ]
diff --git a/images/index_seld_1.png b/images/index_seld_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8fdc23753c947b1fa3be29e018467c59b152935
GIT binary patch
literal 4591
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
Z{|i02`@`H<mQVly002ovPDHLkV1n~M(Ut%J

literal 0
HcmV?d00001

diff --git a/images/map_seld_1.png b/images/map_seld_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c972214340db3d6566e0a84047e3cb7502591cdd
GIT binary patch
literal 7019
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
JPDHLkV1gwQzd8T_

literal 0
HcmV?d00001

diff --git a/images/user_seld_1.png b/images/user_seld_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..10da26cef647a92e4f15feaa81768dd0c79a0682
GIT binary patch
literal 5070
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

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index fb73f07..4cc4882 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,7 +4,6 @@ let app = getApp()
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
-import https from "../../utils/https.js"
 Page({
 	data: {
 		banner: [],
@@ -18,7 +17,9 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: [ "changshu", "taicang", "kunshan", "wujiang", "gongyeyuanqu", "zhangjiagang", "wuzhong", "xiangcheng", "gusu", "gaoxin"],
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -49,33 +50,85 @@ Page({
 		djs: null, // 元旦新增 新品特惠倒计时
 		djsTime: null,
 		sqjNew: [
-      'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
-			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
-			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
-			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
-			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
-			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
-			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
-			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
 		],
 		viewHeight: "0px",
 		isMuted: true,
-		videoPlay: false,
+    videoPlay: false,
+    hdrlNavList:[
+      {
+        type:null,
+        title:'全部'
+      },
+      {
+        type:'scene',
+        title:'景区活动'
+      },
+      {
+        type:'show',
+        title:'演出'
+      },
+      {
+        type:'exhibition',
+        title:'展览'
+      },
+      {
+        type:'movie',
+        title:'电影'
+      },
+      {
+        type:'other',
+        title:'其他'
+      }
+    ], //活动日历板块导航分类
+    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+    today:null,
+    hdrlList:[],
+    yszNav:['公共服务','旅游助手'],
+    yszIndex:0,
+    bdList:[
+        {
+            bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游
+            url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
+            path:'',
+        },
+        {
+            bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可
+            path:'/pages/list/scene/index',
+            url:'',
+        },
+        {
+            bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
+            url:'',
+            path:'/pages/list/theatre/index',
+        },
+        {
+            bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
+            path:'/pages/list/techan/index',
+            url:'',
+        },
+      
+      
+    ],
+    list1:[], //非玩-景点
+    list2:[], //非买-文创
+    list3:[], //非游-一日游
+    list4:[], //非看-剧场演出
 	},
 	onLoad: function(options) {
-		console.log('options',options)
-		// 相城小程序跳转获取用户信息
-		if(options && options.szxcCode) {
-			commonApi._post("uservice/user/loginByXC", {
-				code: options.szxcCode
-			}).then(res => {
-				if(res.data && res.data.id && res.data.token) {
-				  https.set_logininfo(res);
-				}
-			})
-		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -87,9 +140,11 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
+					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -132,7 +187,21 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-		}
+    }
+    // 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+    let d = new Date();
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
+    this.setData({
+      today: d.getFullYear() + "-" + month + "-" + day
+    })
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -143,10 +212,12 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			},
 			fail: (err) => {
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			}
 		})
 		this.setData({
@@ -165,78 +236,232 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-		this.getWeather()
-		// 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-		this.getVideoPrize()
-		this.getXpthList()
-	},
+    this.getWeather()
+  },
+  gobdDetail(e) {
+    console.log(e);
+    let url = e.currentTarget.dataset.url
+    wx.navigateTo({
+      url: url
+    })
+  },
+  getList() {
+    let bdList = this.data.bdList
+    // 非玩不可--景点
+    commonApi._post("scene/get_scene_by_tag",{
+      tag_id:"4",
+      limit:6,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      offset:0,
+      sort:"weight",
+      title:'',
+      area_id:''
+    }).then(res=>{
+      res.data.list.map(item => {
+        if (item.distance || item.distance == 0) {
+          if (item.distance >= 1000) {
+            item.distance = (item.distance / 1000).toFixed(2) + 'km';
+          } else {
+            item.distance = (item.distance).toFixed(2) + 'm';
+          }
+        }
+      })
+      this.setData({
+        list1:res.data.list
+      })
+    })
+    // 非买不可--文创
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: 326,
+      offset: 0,
+      limit: 6,
+    }).then(res=>{
+      this.setData({
+        list2:res.data.list
+      })
+    })
+    // 非游不可--线路一日游
+    commonApi._post('product/get_product_by_tag',{
+      type_id: 23,
+      tag_id:17,
+      offset: 0,
+      limit: 6,
+      sort: 'weight'
+    }).then(res=>{
+      this.setData({
+        list3:res.data.list
+      })
+    })
+    // 非看不可--剧场演出
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:"6",
+      offset:0,
+      limit:6,
+      sort:'',
+      order:'',
+      lat:this.data.lat,
+      lon:this.data.lon,
+      title:''
+    }).then(res=>{
+      this.setData({
+        list4:res.data.list
+      })
+    })
+  },
+  goDetail(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+    if (type == 'movie') {
+      wx.navigateTo({
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/info/activityInfo/index?id=' + item.id,
+      })
+    }
+  },
+  // 分类为电影时调这个接口
+  getMovieList() {
+    let service = "Cinema/getHotMovieList";
+		let data = {
+			page: 1,
+			pageSize: 5
+    };
+    commonApi._post(service, data).then(res => {
+      console.log(res.data);
+			this.setData({
+				hdrlList: res.data
+			})
+    })
+    console.log(this.data.hdrlList);
+  },
+  // 推荐榜单更多跳转
+  moreBtn(e) {
+    let item = e.currentTarget.dataset.item
+    if (item.path!='') {
+      wx.navigateTo({
+        url: item.path,
+      })
+    } else {
+      // if (e.currentTarget.dataset.event) {
+      //   this.pagePoint({
+      //     event: e.currentTarget.dataset.event
+      //   }, 1)
+      // }
+      let url = item.url;
+      app.globalData.weburl = url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+      })
+    }
+  },
+  // 活动日历下的列表
+  getHdrlList() {
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: 1,
+      date: this.data.today,
+      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+      keywords: '',
+      area_key: '',
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 5
+    }).then(res => {
+      this.setData({
+        hdrlList:res.data.rows
+      })
+    })
+  },
+  // 切换活动日历分类
+  changeHdrlNav(e) {
+    console.log(e.currentTarget.dataset);
+    this.setData({
+      hdrlList:[],
+      hdrlNavIndex:e.currentTarget.dataset.index,
+    })
+    if (this.data.hdrlNavIndex == 4) {
+      this.getMovieList()
+    } else {
+      this.getHdrlList() //切换分类重新获取活动日历列表
+    }
+  },
+  // 游苏州下的公共服务和旅游助手切换
+  changeType(e) {
+    this.setData({
+      yszIndex:e.currentTarget.dataset.index,
+    })
+  },
+  // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
+				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
+				console.log(that.data.viewHeight)
 			}
 		})
 	},
-	getXpthList: function() {
-		// 元旦新增 新品特惠
-		commonApi._post("product/get_product_indulgence", {
-			tag_id: 275,
-			typeId: 3,
-		}).then(res => {
-			this.setData({
-				xpth: res.data,
-				djsTime: res.data.time
-			})
-			let time = setInterval(() => {
-				this.setData({
-					djsTime: this.data.djsTime - 1
-				})
-				this.formatDate(this.data.djsTime)
-			}, 1000)
-			if (this.data.djsTime == 0) {
-				clearInterval(time)
-			}
-		})
-	},
+	// getXpthList: function() {
+	// 	// 元旦新增 新品特惠
+	// 	commonApi._post("product/get_product_indulgence", {
+	// 		tag_id: 275,
+	// 		typeId: 3,
+	// 	}).then(res => {
+	// 		console.log('data', res.data);
+	// 		this.setData({
+	// 			xpth: res.data,
+	// 			djsTime: res.data.time
+	// 		})
+	// 		let time = setInterval(() => {
+	// 			this.setData({
+	// 				djsTime: this.data.djsTime - 1
+	// 			})
+	// 			this.formatDate(this.data.djsTime)
+	// 		}, 1000)
+	// 		if (this.data.djsTime == 0) {
+	// 			clearInterval(time)
+	// 		}
+	// 	})
+	// },
 	// 元旦新品特惠 倒计时 
-	formatDate: function(oTime) {
-		let h = parseInt(oTime / 3600)
-		let m = parseInt((oTime % 3600) / 60)
-		let s = parseInt(oTime % 60)
-		h = h < 10 ? "0" + h : h;
-		m = m < 10 ? "0" + m : m;
-		s = s < 10 ? "0" + s : s;
-		this.setData({
-			djs: {
-				h: h,
-				m: m,
-				s: s
-			}
-		})
-		return
-	},
-	goFeiyi: function() {
-		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-		wx.navigateTo({
-			url: "/pages/pbService/web/index"
-		})
-	},
-	onTabItemTap: function(e) {
-		console.log(e, 99999999)
-	},
+	// formatDate: function(oTime) {
+	// 	let h = parseInt(oTime / 3600)
+	// 	let m = parseInt((oTime % 3600) / 60)
+	// 	let s = parseInt(oTime % 60)
+	// 	h = h < 10 ? "0" + h : h;
+	// 	m = m < 10 ? "0" + m : m;
+	// 	s = s < 10 ? "0" + s : s;
+	// 	this.setData({
+	// 		djs: {
+	// 			h: h,
+	// 			m: m,
+	// 			s: s
+	// 		}
+	// 	})
+	// 	return
+	// },
+  // 非遗跳转
+  // goFeiyi: function() {
+	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+	// 	wx.navigateTo({
+	// 		url: "/pages/pbService/web/index"
+	// 	})
+	// },
+	// onTabItemTap: function(e) {
+	// 	console.log(e, 99999999)
+  // },
+  // 大轮播的监听方法
 	changeBannerIndex: function(e) {
 		this.setData({
 			activeBannerIndex: e.detail.current
 		})
-	},
+  },
+  // 小轮播监听方法
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
@@ -368,6 +593,7 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -465,6 +691,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
+    console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -490,19 +717,13 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-		// 	wx.navigateToMiniProgram({
-		// 		appId: 'wxdd39069b9a91dbfe',
-		// 		path: 'pages/index/index'
-		// 	})
-		// 	return;
-		} else if (e.currentTarget.dataset.title == 'e读书') {
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
 			wx.navigateToMiniProgram({
-				appId: 'wx26e6f4c0baba005b',
+				appId: 'wxdd39069b9a91dbfe',
 				path: 'pages/index/index'
 			})
 			return;
-		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
@@ -548,6 +769,7 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
 		app.globalData.weburl = url;
 		wx.navigateTo({
@@ -555,6 +777,7 @@ Page({
 		})
 	},
 	gotoUrl: function(e) {
+		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -566,8 +789,8 @@ Page({
 			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
-	},
-	// 实时路况跳转外链
+    },
+    	// 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -607,6 +830,7 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -628,33 +852,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	getList: function() {
-		if (!this.data.listMore) return;
-		commonApi._post("search/recommend", {
-			offset: this.data.list.length,
-			limit: 16
-		}).then(res => {
-			res.data.map(item => {
-				if (item.ext.display_tags) {
-					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-				} else {
-					item.ext.display_tags = []
-				}
-			})
-			if (res.data.length < 15) {
-				this.setData({
-					listMore: false
-				})
-			}
-			this.setData({
-				list: this.data.list.concat(res.data)
-			})
-		})
-	},
+	// getList: function() {
+	// 	if (!this.data.listMore) return;
+	// 	commonApi._post("search/recommend", {
+	// 		offset: this.data.list.length,
+	// 		limit: 16
+	// 	}).then(res => {
+	// 		res.data.map(item => {
+	// 			if (item.ext.display_tags) {
+	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+	// 			} else {
+	// 				item.ext.display_tags = []
+	// 			}
+	// 		})
+	// 		if (res.data.length < 15) {
+	// 			this.setData({
+	// 				listMore: false
+	// 			})
+	// 		}
+	// 		this.setData({
+	// 			list: this.data.list.concat(res.data)
+	// 		})
+	// 	})
+	// },
 	onReachBottom: function() {
-		if (this.data.list.length < 30) {
-			this.getList()
-		}
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+		// }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -705,6 +929,7 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
+					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -713,6 +938,7 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
+					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -729,6 +955,7 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -771,6 +998,7 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -778,184 +1006,186 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	bannerClick2: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.action == 'href') {
-			if (item.href.indexOf(",") != -1) {
-				let info = item.href.split(",");
-				wx.navigateToMiniProgram({
-					appId: info[0],
-					path: info[1]
-				})
-			} else if (item.href.indexOf('map/index') != -1) {
-				wx.reLaunch({
-					url: item.href
-				})
-			} else {
-				wx.navigateTo({
-					url: item.href,
-				})
-			}
-		} else if (item.action == "web") {
-			app.globalData.weburl = item.href;
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-			})
-		}
-	},
+	// bannerClick2: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.action == 'href') {
+	// 		if (item.href.indexOf(",") != -1) {
+	// 			let info = item.href.split(",");
+	// 			wx.navigateToMiniProgram({
+	// 				appId: info[0],
+	// 				path: info[1]
+	// 			})
+	// 		} else if (item.href.indexOf('map/index') != -1) {
+	// 			wx.reLaunch({
+	// 				url: item.href
+	// 			})
+	// 		} else {
+	// 			wx.navigateTo({
+	// 				url: item.href,
+	// 			})
+	// 		}
+	// 	} else if (item.action == "web") {
+	// 		app.globalData.weburl = item.href;
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+	// 		})
+	// 	}
+	// },
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// 获取短视频大赛是否中奖 中奖详情
-	getVideoPrize() {
-		let user_id = wx.getStorageSync('jstrip_userid');
-		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-		commonApi.user_post('actonline/video_act/getRaffle', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				videoPrize: res.data
-			})
-		})
-	},
-	noMoreTip() {
-		wx.setStorageSync('indexPriceNoTip', true)
-		this.closePrice()
-	},
-	closePrice() {
-		this.setData({
-			videoPrize: false,
-			prizeInfo: null
-		})
-	},
+	// // 获取短视频大赛是否中奖 中奖详情
+	// getVideoPrize() {
+	// 	let user_id = wx.getStorageSync('jstrip_userid');
+	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+	// 	commonApi.user_post('actonline/video_act/getRaffle', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			videoPrize: res.data
+	// 		})
+	// 	})
+	// },
+	// noMoreTip() {
+	// 	wx.setStorageSync('indexPriceNoTip', true)
+	// 	this.closePrice()
+	// },
+	// closePrice() {
+	// 	this.setData({
+	// 		videoPrize: false,
+	// 		prizeInfo: null
+	// 	})
+	// },
 	// 抽奖
-	choosePrize() {
-		commonApi.user_post('actonline/video_act/luckyDraw', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				prizeInfo: res.data
-			})
-			if (res.data.type != 'none') {
-				// 抽奖成功的话 弹框
-				wx.showModal({
-					title: "提示",
-					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-					showCancel: false
-				})
-			}
-		})
-	},
-	bannerJumpNew(item) {
-		let that = this
-		item = item.currentTarget.dataset.item
-		if (item.tdata == '') return
-		that.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index"
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index"
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return
-	},
+	// choosePrize() {
+	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			prizeInfo: res.data
+	// 		})
+	// 		if (res.data.type != 'none') {
+	// 			// 抽奖成功的话 弹框
+	// 			wx.showModal({
+	// 				title: "提示",
+	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+	// 				showCancel: false
+	// 			})
+	// 		}
+	// 	})
+	// },
+	// bannerJumpNew(item) {
+	// 	let that = this
+	// 	item = item.currentTarget.dataset.item
+	// 	if (item.tdata == '') return
+	// 	that.pagePoint({
+	// 		event: "banner_click",
+	// 		type: 'banner'
+	// 	}, 1)
+	// 	switch (item.jump_type) {
+	// 		case 0:
+	// 			break;
+	// 		case 1:
+	// 			util.gotoDetail(item.product_model)
+	// 			break;
+	// 		case 2:
+	// 			if (item.front_model && item.front_model.mini) {
+	// 				wx.navigateTo({
+	// 					url: "/" + item.front_model.mini
+	// 				})
+	// 			}
+	// 			break;
+	// 		case 3:
+	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+	// 				// 外部h5
+	// 				console.log(item.tdata)
+	// 				app.globalData.weburl = item.tdata.url;
+	// 				wx.navigateTo({
+	// 					url: "/pages/pbService/web/index"
+	// 				})
+	// 			} else {
+	// 				let page = item.tdata.url.split("/");
+	// 				page = page[page.length - 1].split("?")
+	// 				console.log(page[0])
+	// 				let url = this.data.urltopage[page[0]];
+	// 				if (url && url.indexOf('map') != -1) {
+	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+	// 							'cinema', 'academes'
+	// 						],
+	// 						type = page[1] ? page[1].split("=") : [];
+	// 					wx.reLaunch({
+	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+	// 					})
+	// 				} else if (url) {
+	// 					wx.navigateTo({
+	// 						url: url,
+	// 					})
+	// 				} else {
+	// 					app.globalData.weburl = item.tdata.url;
+	// 					wx.navigateTo({
+	// 						url: "/pages/pbService/web/index"
+	// 					})
+	// 				}
+	// 			}
+	// 			break;
+	// 		case 4:
+	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+	// 				// 如果是苏心游的小程序 直接把authCode带过去
+	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+	// 					let weburl = item.tdata.page
+	// 					if (weburl.indexOf('?') != -1) {
+	// 						weburl += '&authCode=' + res.data;
+	// 					} else {
+	// 						weburl += '?authCode=' + res.data
+	// 					}
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: weburl
+	// 					})
+	// 				}).catch(err => {
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: item.tdata.page
+	// 					})
+	// 				})
+	// 			} else {
+	// 				wx.navigateToMiniProgram({
+	// 					appId: item.tdata.appid,
+	// 					path: item.tdata.page
+	// 				})
+	// 			}
+	// 			break;
+	// 		default:
+	// 			break;
+	// 	}
+	// 	return
+	// },
 	onReady: function() {
 
 
 	},
-	gotoOther: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.type == 'h5') {
-			app.globalData.weburl = item.url
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-			})
-		} else if (item.type == 'mini') {
-			wx.navigateToMiniProgram({
-				appId: item.appid,
-				path: item.path
-			})
-		} else if (item.type == 'page') {
-			wx.navigateTo({
-				url: item.page,
-			})
-		}
-	},
+	// gotoOther: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.type == 'h5') {
+	// 		app.globalData.weburl = item.url
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+	// 		})
+	// 	} else if (item.type == 'mini') {
+	// 		wx.navigateToMiniProgram({
+	// 			appId: item.appid,
+	// 			path: item.path
+	// 		})
+	// 	} else if (item.type == 'page') {
+	// 		wx.navigateTo({
+	// 			url: item.page,
+	// 		})
+	// 	}
+	// },
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index a8b12df..ad62e9a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,811 +1,316 @@
-<!--index.wxml-->
+<!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
-<!-- <view class="old-btn">关怀模式</view> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<view wx:if="{{!isTest}}">
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-    <view class="weather-num">{{weather.max_temp}}°</view>
-    <view class="weather">{{weather.weather}}</view>
-    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-        mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
-    </view>
-    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <view class="iconfont icon-sousuo"></view>
-        <view class="textOver">搜索想要的旅游产品或服务</view>
-    </navigator>
-    </view>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-    </view>
-    </view>
-
-    <!-- <swiper class="swiper" indicator-dots="{{true}}"
-    autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
-    <block wx:for="{{banner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick2" data-item="{{item}}">
-        <image src="{{item.img}}" mode="aspectFill"></image>
-        </swiper-item>
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20240923/d62c7214a790c9746c9dd9f8821775f7.gif" mode="widthFix"></image>
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <view class="weather-num">{{weather.max_temp}}°</view>
+  <view class="weather">{{weather.weather}}</view>
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+</view>
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+    <view class="iconfont icon-sousuo"></view>
+    <view class="textOver">搜索想要的旅游产品或服务</view>
+  </navigator>
+</view>
+<view style="position:relative;z-index: 1;" >
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+    <block wx:for="{{banner}}" wx:key="this">
+      <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+      </swiper-item>
     </block>
-    </swiper> -->
-    <view class="top-icons" wx:if="{{!isTest}}">
-    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">活动日历</view>
-    </view>
-    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">场馆预约</view>
-    </view>
-    <!-- 非遗跳专题 -->
-    <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
-        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-    <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-        <view class="top-icon-text">非遗专卖</view>
-    </view>
-    <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-        <view class="top-icon-text">非遗专卖</view>
-    </view> -->
-    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">剧场演出</view>
-    </view>
-    <!-- 2024年7月新版文创特产 -->
-    <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-        <view class="top-icon-text">文创特产</view>
-    </view>
-    <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-        data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-        <view class="top-icon-text">文创特产</view>
-    </view> -->
-    <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">景点门票</view>
-    </view>
-    <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">酒店住宿</view>
-    </view>
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">夜游苏州</view>
-    </view>
-    <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">一日游</view>
-    </view>
-    <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">研学游</view>
-    </view>
-    </view>
-    <view class="content">
-    <view class="sale-road-boxes" wx:if="{{false}}">
-        <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-        <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-        <view class="sale-product">
-            <view class="sale-product-bg"></view>
-            <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
-            </image>
-            <view class="sale-info">
-            <view class="sale-product-title textOver2">
-                <view>限时特惠</view>
-                <view>新品推荐</view>
-            </view>
-            <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
-                ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-            </view>
-        </view>
-        </view>
-        <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-        <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-        <view class="sale-product">
-            <view class="sale-product-bg road-product-bg"></view>
-            <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
-            </image>
-            <view class="sale-info">
-            <view class="sale-product-title textOver2">
-                <view>四季苏州</view>
-                <view>最是江南</view>
-            </view>
-            <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-                ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
-            </view>
-        </view>
-        </view>
-    </view>
-    <!-- 五一修改 一张banner不滚动 -->
-    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-    </view>
-    <view class="small-swiper-box" wx:else>
-        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-        <block wx:for="{{xiaobanner}}" wx:key="*this">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <!-- 原 圆角77rpx，现改为13rpx -->
-            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-            </swiper-item>
-        </block>
-        </swiper>
-        <view class="dot-list com-flex sm-dot-list">
-        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
-        </view>
-    </view>
-    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-    <view style="display: flex;">
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-        <image src="{{indexSeason.ai}}" mode=""/>
-        </view>
-        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-        <image src="{{indexSeason.avoid}}" mode=""/>
-        </view>
-    </view>
-    <!-- 元旦修改  限时特惠--新版-->
-    <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-        <!-- 上方标题部分 -->
-        <view class="xsth-title">
-        <view class="xsth-left" style="display: flex;">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
-        </view>
-        <view class="time-box" style="z-index: 9;">
-            倒计时
-            <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-            <text>:</text>
-            <view class="xsth-time">{{djs.m}}</view>
-            <text>:</text>
-            <view class="xsth-time">{{djs.s}}</view>
-        </view>
-        <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-        <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-            更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-        </view> -->
-        </view>
-        <!-- 商品部分 -->
-        <view class="xpth-product">
-        <!-- 左边的2个产品 -->
-        <view class="xpth-left">
-            <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-            <image src="{{item.headimg}}" mode="" />
-            <view class="xpth-item-content">
-                <view class="xpth-item-title textOver2">{{item.title}}</view>
-                <!-- <view class="xpth-tag">唇齿留香</view> -->
-                <view class="xpth-item-bottom">
-                <view class="xpth-item-price">{{item.price/100}}</view>
-                <!-- <view class="xpth-item-buy">立即抢购</view> -->
-                </view>
-            </view>
-            </view>
-        </view>
-        <!-- 右边的banner -->
-        <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" />
-        </view>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-    </view>
-    <!-- 五一修改 .slide-out-box 增加背景色-->
-    <view class="slide-out-box">
-        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-            <view class="text">数字非遗</view>
-            </view>
-            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-            <view class="text">数字博物馆</view>
-            </view>
-            <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/df0683bb40ec2615a932ef2379779374.png" mode="widthFix"></image>
-            <view class="text">数字名人馆</view>
-            </view>
-            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-            <view>云上观展</view>
-            </view>
-            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-            <view class="text">云上文博会</view>
-            </view>
-            <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
-            <view class="text">精彩回顾</view>
-            </view>
-            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-            <view class="text">文化场馆查询</view>
-            </view>
-            <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
-            <view class="text">苏影通</view>
-            </view>
-            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view>
-            <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/1a5fc26d419e589c5649273f8105b723.png" mode="widthFix"></image>
-            <view class="text">e读书</view>
-            </view>
-
-            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-            <view class="text">数字公共文化</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-            <view class="text">文旅单位</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view> -->
-            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-            <view class="text">云游苏州</view>
-            </view>
-            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-            <view class="text">美图鉴赏</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-            <view>文物查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-            data-path="/pages/pbService/museum/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-            <view>博物馆查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-            <view>云上文博会</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-            <view class="text">投资导引图</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="数字文物"
-            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-            <view>数字文物</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-            <view>团体预约</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-            <view>廉洁地图</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-            <view>文化配送</view>
-            </view> -->
-        </view>
-        </scroll-view>
-        <view class="scroll-line">
-        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-        </view>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
-    </view>
-    <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-        <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-        <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
-        <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
-        <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-        data-path="/pages/list/{{isTest?'road':'food'}}/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
-        <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
-        <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
-        <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
-        <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-        data-path="/pages/list/{{isTest?'road':'food'}}/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
-        <image bindtap="audioGuide" data-event="voice_click"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
-        </image>
-        <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
-        <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-        mode="aspectFill"></image> -->
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0;">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-        <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-        <view>
-            查看全部
-        </view>
-        <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode="" />
-        <!-- <text class="iconfont icon-you"></text>  -->
-        </navigator>
-        <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
-    </view>
-    <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
-        <!-- 元旦修改 ggfw为新增类名 -->
-        <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-        <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
-            data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-            <view>景区舒适度</view>
-        </view> -->
-        <!-- 元旦修改 ggfw为新增类名 -->
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
-            <view>安全服务</view>
-        </view> -->
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
-            <view>电子社保卡</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
-            <view>景区舒适度</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
-            <!-- 元旦修改 -->
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
-            <view>行李寄存</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
-            <!-- 元旦修改 -->
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
-            <view>实时路况</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
-            data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
-            <view>找厕所</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
-            data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
-            <view>停车场</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-            <view>12348</view>
-        </view> -->
-        </view>
-    </view>
-    <view class="sale-road-boxes">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
-    </view>
-    <!-- <view class="six-box">
-        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-        data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
-        src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
-        </image>
-    </view> -->
-    <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
-    <view class="six-box-new" wx:if="{{!isTest}}">
-        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
-        </image>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
-    </view>
-    <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-        <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
-        <image src="{{item.icon}}" mode="widthFix"></image>
-        <view>{{item.name}}</view>
-        </view>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
-    </view>
-    <view class="hot-list" wx:if="{{isTest==false}}">
-        <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
-        <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-            <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-            <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-            <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-            <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-            <view class="today-date">{{date}} {{month}}</view>
-            <view class="today-hot-box">
-                <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
-                {{item.ext.display_tags[0]}}</view>
-                <view class="today-hot-title">{{item.title}}</view>
-            </view>
-            </view>
-            <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-            <view style="position:relative">
-                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-            </view>
-            <view class="hot-info">
-                <view class="hot-title">{{item.title}}</view>
-                <view class="tags textOver" style="margin-bottom:0">
-                <view class="icon-box">
-                    <text class="iconfont icon-xin"></text>
-                    <text>{{item.ext.like_number}}</text>
-                </view>
-                <view class="icon-box">
-                    <text class="iconfont icon-eye"></text>
-                    <text>{{item.ext.view_number}}</text>
-                </view>
-                </view>
-            </view>
-            </view>
-            <view wx:else class="hot-item">
-            <view style="position:relative">
-                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                <!-- <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' && item.ext.price}}" class="hot-price">
-                <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
-                </view>
-            </view>
-            </view>
-        </view>
-        </view>
-    </view>
-    <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-    <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
-    </view>
-    <view class="mask prizeMask" wx:if="{{videoPrize}}">
-    <view class="mask-bg"></view>
-    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-        <!-- 中奖的卡券 -->
-        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 中奖的产品 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 未中奖 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <view bindtap="closePrice">我知道了</view>
-        </view>
-        </view>
-        <!-- 未抽奖状态 -->
-        <view style="position:relative" wx:else>
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-        </view>
-        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
-    </view>
-    </view>
-    <!-- 广告弹窗 -->
-    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
-    <view class="alertavd" wx:if="{{showAdv}}">
-    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-        <block wx:for="{{alertSwipeList}}" wx:key="*this">
-        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
-            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
-    </view>
-    <!-- 广告弹窗结束 -->
-    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
-    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
-    </view>
-
-    <!-- 视频 -->
-    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
-
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-    </view>
-    </view>
-    <!-- <view class="topBox">
-        <view class="Qtop" :style="{height:height}">
-        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
-        </view>
-        <view class="jumpBox">
-        <view class="time">{{time}}s</view>
-        <view bind:tap="gotoIndex">跳过</view>
-        </view>
-    </view> -->
+  </swiper>
+  <view class="com-flex dot-list">
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+  </view>
 </view>
-
-<view wx:else>
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="*this">
+<view class="content">
+  <!-- 活动日历 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/uploads/20240923/00c7635dd9648e9dc4d0d044c06f495c.png"></image>
+    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+  </view>
+  <view class="hdrlNavList">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+      {{item.title}}
+    </view>
+  </view>
+  <view wx:if="{{hdrlNavIndex!=4}}">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
+        <view style="background: #fff;display: flex;border-radius: 13rpx;">
+          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <view class="hdrlItem-content">
+            <view class="hdrlItem-title textOver3">{{item.name}}</view>
+            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view wx:else>
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
+          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
+            <view>{{item.title}}</view>
+            <view style="display: flex;justify-content: flex-end;">
+              <view class="buyMovie">去购票 ></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" wx:if="{{!isTest}}">
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
+      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
+          </view>
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
+            <view class="text">一卡游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <view class="text">非遗专卖</view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
-        </block>
+      </block>
     </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-    </view>
-    </view>
-    <view class="top-icons">
-    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">活动日历</view>
-    </view>
-    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">场馆预约</view>
-    </view>
-
-  
-    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">剧场演出</view>
-    </view>
-  
-   
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">夜游苏州</view>
-    </view>
-    </view>
-    <view class="content">
- 
-    <!-- 五一修改 一张banner不滚动 -->
-    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-    </view>
-    <view class="small-swiper-box" wx:else>
-        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-        <block wx:for="{{xiaobanner}}" wx:key="*this">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <!-- 原 圆角77rpx，现改为13rpx -->
-            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-            </swiper-item>
-        </block>
-        </swiper>
-        <view class="dot-list com-flex sm-dot-list">
-        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
-        </view>
-    </view>
-    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-    <view style="display: flex;">
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-        <image src="{{indexSeason.ai}}" mode=""/>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+    </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
+    </view>
+    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
+        <view bindtap="gotoPath" data-event="security_home_click" data-title="电子社保卡" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
         </view>
-        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-        <image src="{{indexSeason.avoid}}" mode=""/>
-        </view>
-    </view>
-
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-    </view>
-    <!-- 五一修改 .slide-out-box 增加背景色-->
-    <view class="slide-out-box">
-        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-            <view class="text">数字非遗</view>
-            </view>
-            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-            <view class="text">数字博物馆</view>
-            </view>
-            
-            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-            <view>云上观展</view>
-            </view>
-            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-            <view class="text">云上文博会</view>
-            </view>
-            
-            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-            <view class="text">文化场馆查询</view>
-            </view>
-            
-            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view>
-            
-
-            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-            <view class="text">数字公共文化</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-            <view class="text">文旅单位</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view> -->
-            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-            <view class="text">云游苏州</view>
-            </view>
-            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-            <view class="text">美图鉴赏</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-            <view>文物查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-            data-path="/pages/pbService/museum/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-            <view>博物馆查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-            <view>云上文博会</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-            <view class="text">投资导引图</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="数字文物"
-            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-            <view>数字文物</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-            <view>团体预约</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-            <view>廉洁地图</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-            <view>文化配送</view>
-            </view> -->
-        </view>
-        </scroll-view>
-        <view class="scroll-line">
-        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-        </view>
-    </view>
 
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view> -->
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
+    </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          data-path="/pages/list/{{isTest?'road':'food'}}/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
+  <!-- 推荐榜单 -->
+  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
+  <!-- 4个产品榜单 -->
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
+  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
+    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <view class="bd-top">
+      <image class="bd-type" src="{{item.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
+    </view>
+    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
+      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+ </view>
 
 
 
+</view>
 
+<!-- 开屏页 -->
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
+</view>
 
-  
-    </view>
-</view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 34cd243..69871b7 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,12 +1,12 @@
-/**index.wxss**/
+/* pages/indexs/index.wxss */
 /* 元旦修改 */
 page {
-  /* background: #9DDCF5; */
+  height: fit-content;
   padding-bottom: 36.67rpx;
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
-  background: #9DDCF5 url('https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png');
-  background-repeat: repeat-y;
-  background-size: contain;
+  background: url("https://static.ticket.sz-trip.com/uploads/20240923/69d4d68f5207c84146739951d07dbda4.jpg");
+  background-size: 100% 300%;
+  /* background-repeat: round; */
+  background-repeat: no-repeat;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -39,18 +39,10 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
-  /* height: 64rpx; */
-  /* background: rgba(255, 255, 255, 0.6); */
-  /* border-radius: 32rpx; */
-  /* color: #666; */
-  /* height: 70.67rpx; */
   height: 64rpx;
   background: rgba(255,255,255,0.7);
   border-radius: 32rpx;
-  /* color: #72674E; */
-  color: #333333;
-  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
-  background-size: 100% 100%; */
+  color: #000;
   display: flex;
   align-items: center;
   font-size: 25rpx;
@@ -59,7 +51,7 @@ page {
   font-size: 30rpx;
   margin-left: 20rpx;
   margin-right: 10rpx;
-  /* color: #72674E; */
+  color: #000;
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -81,20 +73,18 @@ page {
   /* background: #FFFFFF; */
   /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
-  width: 710rpx;
+  width: 697rpx;
   margin: 0 auto;
   position: relative;
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 29.33rpx;
+  padding-bottom: 7rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  /* background: #FFFED6; */
-  margin-top: -50rpx;
-  padding-top: 84rpx;
-  background: url('https://static.ticket.sz-trip.com/uploads/20240606/80bc185bf83b276b114415d670eaa57f.png');
-  background-size: 100% 100%;
+  background: #FFFED6;
+  margin-top: -20rpx;
+  padding-top: 54rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -115,7 +105,8 @@ page {
   margin-bottom: 10rpx;
 }
 .content {
-  margin: 0 25rpx;
+  /* margin: 0 25rpx; */
+  margin-top: 20.67rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -205,13 +196,11 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 50rpx 0;
-  width: 100%;
+  margin: 24rpx 26.67rpx 26.67rpx;
+  /* width: 100%; */
   height: 154rpx;
   border-radius: 20rpx;
-  /* border-radius: 77rpx; */
   overflow: hidden;
-  margin-bottom: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -319,12 +308,15 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  width: 100%;
+  /* width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap;
+  flex-wrap: wrap; */
+    display: flex;
+    justify-content: space-between;
+    margin: 0 28rpx;
 }
 .title-more {
   font-size: 24rpx;
@@ -334,48 +326,38 @@ page {
   z-index: 9;
   width: 173rpx;
   height: 40rpx;
-  /* line-height: 40rpx; */
+  line-height: 40rpx;
   background: rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
   text-align: center;
-  display: flex;
-  align-items: center;
-  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  margin-top: 20rpx;
+  /* margin-top: 20rpx;
   background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  margin-bottom: 40rpx;
-  background: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
-  background-size: 100% 100%;
+  /* margin-bottom: 40rpx; */
 }
 .pbservice {
-  /* width: calc(175rpx * 6); */
-  /* 元旦修改 */
-  width: calc(190rpx * 7);
+  width: calc(160rpx * 8);
   display: flex;
-  margin-top: 30rpx;
-  flex-wrap: wrap;
-  /* margin-bottom: 60rpx; */
-  /* 元旦修改 注释margin-bottom */
+  margin-top: 5rpx;
+  /* flex-wrap: wrap; */
+  flex-wrap: nowrap;
+  /* padding-left: 12rpx; */
+  /* overflow-x: scroll; */
 }
 .pbservice-item {
-  /* 元旦修改 截止到注释的width*/
-  width: 120rpx;
-  margin-bottom: 33.33rpx;
-  margin-right: 62.33rpx;
-  /* width: 175rpx; */
+  width: 106rpx;
+  margin-bottom: 25rpx;
+  margin-right: 32.33rpx;
   text-align: center;
-  font-size: 25rpx;
-  /* color: #333; */
-  /* 春节调整颜色改版 */
-  color: #54504D;
+  font-size: 27rpx;
+  color: #000;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -390,7 +372,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 106rpx;
+  width: 80rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -574,29 +556,24 @@ page {
   overflow: hidden;
   margin: 30rpx auto; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
-  width: 73rpx !important;
-  height: 7rpx;
+  width: 48rpx !important;
+  height: 8rpx;
   /* background: #DDCEAC; */
   background: #fff;
-  border-radius: 3rpx;
-  margin: 33.33rpx auto;
+  border-radius: 4rpx;
+  margin: 15rpx auto 10rpx;
 }
 .scroll-line-bg {
-  /* width: 300rpx;
-  height: 6rpx;
-  border-radius: 3rpx;
-  background: #0B898E; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
-  height: 7rpx;
-  background: #56A5EA;
-  border-radius: 3rpx;
+  height: 8rpx;
+  background: #FF4848;
+  border-radius: 4rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 37.33rpx;
-  background: #56A5EA;
-  height: 7rpx;
-  border-radius: 3rpx;
+  margin-left: 24rpx;
+  background: #078565;
+  height: 8rpx;
+  border-radius: 4rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -708,8 +685,6 @@ page {
   box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
-  background: url('https://static.ticket.sz-trip.com/uploads/20240606/e1c3f60baf65787d593c6a7c79f881c7.png');
-  background-size: 100% 100%;
 }
 .other-plats image {
   width: 80rpx;
@@ -867,16 +842,23 @@ page {
 }
 /* 元旦修改新增样式 */
 .xsth-time {
+  /* margin: 0 5rpx; */
+  /* width: 50rpx; */
+  /* height: 33rpx; */
   width: 43rpx;
   height: 43rpx;
   line-height: 43rpx;
-  background: #FFEF47;
+  background: #4AB648;
+  /* background: #F9F1DB; */
+  /* border-radius: 5rpx; */
   border-radius: 13rpx;
   font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #000;
+  /* color: #D62828; */
+  color: white;
   text-align: center;
+  /* line-height: 33rpx; */
 }
 .time-box text {
   width: 18rpx;
@@ -923,20 +905,18 @@ page {
 /* 元旦修改新增样式 */
 .xpth-product {
   /* position: absolute; */
-  width: 700rpx;
+  width: 697rpx;
   height: 373rpx;
-  /* background: #FFFED6; */
+  background: #FFFED6;
   box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx;
+  padding: 25rpx 15rpx;
   box-sizing: border-box;
   /* left: 0;
   bottom: 15.33rpx;
   /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
-  background-size: 100% 100%;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
@@ -1007,7 +987,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 210rpx;
+  width: 230rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
@@ -1055,21 +1035,20 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 158.67rpx !important;
-  height: 218.67rpx !important;
-  margin-bottom: 26.67rpx;
+  width: 160rpx !important;
+  height: 255rpx !important;
+  /* margin-bottom: 26.67rpx; */
 }
 
-.ggfw-list {
-  justify-content: space-around !important;
-}
+
 .ggfw {
-  width: auto;
+  width: 132rpx;
+  margin:0 22rpx;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 70rpx !important;
-  height: 70rpx !important;
+  width: 113.33rpx !important;
+  height: 113.33rpx !important;
 }
 
 .six-box-new {
@@ -1177,22 +1156,293 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-.jqssd {
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
-  background-size: 100% 100%; */
-  width: 365.33rpx;
-  height: 166rpx;
+
+.right-more {
+  width: 120rpx;
+  height: 47rpx;
+  background-color: rgba(255,255,255,.3);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 47rpx;
+}
+
+.hdrlNavList {
+  display: flex;
+  margin: 28rpx 26.67rpx 10rpx;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+}
+.hdrlNav {
   flex-shrink: 0;
+  /* width: 160rpx; */
+  padding: 0 20rpx;
+  height: 53rpx;
+  background: rgba(255,250,245,0.3);
+  border-radius: 13rpx;
+  border: 1px solid #FFFFFF;
+
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 53rpx;
+  margin-right: 14rpx;
 }
-.jqssd image, .sslk image{
-  width: 100%;
-  height: 100%;
+.hdrlNavActive {
+  background: linear-gradient(180deg, #FFFAF5, #FFE3C2);
+  font-size: 32rpx;
+  color: #FF4848;
+  border: none;
+}
+.hdrlItem {
+  flex-shrink: 0;
+  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
+  /* width: 593.33rpx; */
+  display: flex;
+  background: url("https://static.ticket.sz-trip.com/uploads/20240923/d4c9e6e558796b0ff89726d0857a5d03.png");
+  background-size: 100% 100%;
+}
+.hdrlItem-img {
+  width: 280rpx;
+  height: 213rpx;
+  background: #8C8C8C;
+  border-radius: 13rpx;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+}
+.hdrlItem-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 213rpx;
+}
+.hdrlItem-title {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 15.33rpx;
+}
+.hdrlItem-date {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #000000;
+  margin-bottom: 19.33rpx;
+}
+
+.main-box {
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
+  background-size: 100% 100%;
+  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
+  margin: 0 8rpx;
+}
+.main-box-top {
+  display: flex;
+  margin-bottom: 5.33rpx;
+}
+.gfyj,.sslk {
+  width: 369.33rpx;
+  height: 146rpx;
+  flex-shrink: 0;
 }
 .sslk {
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
-  background-size: 100% 100%; */
-  width: 365.33rpx;
-  height: 166rpx;
+  margin-left: -48rpx;
+}
+
+.movieItem {
+  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
   flex-shrink: 0;
-  margin-left: -20rpx;
+  height: 206.67rpx;
+}
+.movieItem-img {
+  width: 213rpx;
+  height: 213rpx;
+  border-radius: 18rpx;
+  margin-right: 18rpx;
+  flex-shrink: 0;
+}
+.ysz-box {
+    margin: 0 8rpx 15.33rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
+    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
+    background-size: 100% 100%;
+    width: 733.33rpx;
+    height: 320rpx;
+    padding-top: 33.33rpx;
+}
+.ysz-more {
+    width: 267rpx;
+    height: 53rpx;
+    background: #FFFFFF;
+    border-radius: 27rpx;
+    margin: 38rpx auto 0;
+    text-align: center;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 25rpx;
+    color: #320000;
+}
+.ysz-box2 {
+  /* padding: 20rpx 35rpx; */
+  padding-top: 23.33rpx;
+}
+.tjbd-title {
+  width: 286.67rpx;
+  height: 80rpx;
+}
+
+.bd-box {
+  position: relative;
+  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
+  margin-left: 26.67rpx;
+  width: 582rpx;
+  /* height: 1133rpx; */
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  border-radius: 20rpx 80rpx 20rpx 20rpx;
+}
+.bd-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+  position: relative;
+}
+.zz {
+    width: 236.67rpx;
+    height: 206.67rpx;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 2;
+}
+.bd-type {
+  width: 125.33rpx;
+  height: 38.67rpx;
+}
+.bd-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #320000;
+  z-index: 9;
+  text-align: center;
+  line-height: 47rpx;
+}
+.bd-index {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #000000;
+}
+.bd-item {
+  margin-left: 45.33rpx;
+  width: 453rpx;
+  height: 147rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  display: flex;
+}
+.bd-item-img {
+    width: 147rpx;
+    height: 147rpx;
+    background: #D9D9D9;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.bd-item-content {
+    padding: 14rpx 29.33rpx 13.33rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.bd-item-title {
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+}
+.bd-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    width: 260rpx;
+}
+.bd-price {
+    font-size: 29.33rpx;
+    color: #F93434;
+    font-weight: bold;
+}
+.bd-price:after {
+  content:'起';
+  color: #999999;
+  font-size: 23rpx;
+  font-weight: 700;
+}
+.bd-price::before {
+  content:'￥';
+  font-size: 23rpx;
+}
+.bd-distance {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #999999;
+}
+
+.buyMovie {
+    width: 160rpx;
+    height: 56rpx;
+    background: #078565;
+    color: #fff;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 56rpx;
+}
+
+.bg1 {
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+}
+.bg2 {
+  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
+}
+.bg3 {
+  background: linear-gradient(180deg, #E0F7DC, #A0F292);
+}
+.bg4 {
+  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
+}
+
+.hdrlNavList::-webkit-scrollbar{
+  display:none;
+}
+.hdrlList::-webkit-scrollbar{
+  display:none;
+}
+.bottom-box::-webkit-scrollbar{
+  display:none;
+}
+.slide-box::-webkit-scrollbar{
+  display:none;
+}
+.pbservice::-webkit-scrollbar{
+  display:none;
+}
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}
+.public-box {
+  width: 593.33rpx;
+  height: 266.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
 }
+.one::-webkit-scrollbar{
+  display:none;
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 615b7db..e52bcf5 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,16 +7,16 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/user/suggest/suggest",
-          "pathName": "pages/user/suggest/suggest",
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "subPackages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "pages/info/postProductInfo/index",
-          "query": "id=428628",
+          "name": "subPackages/indexs/index",
+          "pathName": "subPackages/indexGQ/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index cb95008..fb73f07 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -4,6 +4,7 @@ let app = getApp()
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
+import https from "../../utils/https.js"
 Page({
 	data: {
 		banner: [],
@@ -17,9 +18,7 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
-			"gongyeyuanqu", "gaoxin"
-		],
+		area_ids: [ "changshu", "taicang", "kunshan", "wujiang", "gongyeyuanqu", "zhangjiagang", "wuzhong", "xiangcheng", "gusu", "gaoxin"],
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -50,15 +49,15 @@ Page({
 		djs: null, // 元旦新增 新品特惠倒计时
 		djsTime: null,
 		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
-			'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
+      'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
 			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
 			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
 			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
+			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
+			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
 			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
 			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
 			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
 			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
 		],
 		viewHeight: "0px",
@@ -66,6 +65,17 @@ Page({
 		videoPlay: false,
 	},
 	onLoad: function(options) {
+		console.log('options',options)
+		// 相城小程序跳转获取用户信息
+		if(options && options.szxcCode) {
+			commonApi._post("uservice/user/loginByXC", {
+				code: options.szxcCode
+			}).then(res => {
+				if(res.data && res.data.id && res.data.token) {
+				  https.set_logininfo(res);
+				}
+			})
+		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -77,11 +87,9 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
-					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
-					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -171,11 +179,9 @@ Page({
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
-				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
-				console.log(that.data.viewHeight)
 			}
 		})
 	},
@@ -185,7 +191,6 @@ Page({
 			tag_id: 275,
 			typeId: 3,
 		}).then(res => {
-			console.log('data', res.data);
 			this.setData({
 				xpth: res.data,
 				djsTime: res.data.time
@@ -363,7 +368,6 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -461,7 +465,6 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-		console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -487,13 +490,19 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// 	wx.navigateToMiniProgram({
+		// 		appId: 'wxdd39069b9a91dbfe',
+		// 		path: 'pages/index/index'
+		// 	})
+		// 	return;
+		} else if (e.currentTarget.dataset.title == 'e读书') {
 			wx.navigateToMiniProgram({
-				appId: 'wxdd39069b9a91dbfe',
+				appId: 'wx26e6f4c0baba005b',
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
@@ -539,7 +548,6 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
-		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
 		app.globalData.weburl = url;
 		wx.navigateTo({
@@ -547,7 +555,6 @@ Page({
 		})
 	},
 	gotoUrl: function(e) {
-		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -560,6 +567,30 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
 	},
+	// 实时路况跳转外链
+	gotoUrls() {
+		// 判断是否登录
+		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+		if(!token || !userId) {
+			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+			
+			app.globalData.weburl = url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+			})
+		}else {
+			commonApi.user_post("uservice/user/userEncry").then(res => {
+				if(res.code == 1) {
+					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+					
+					app.globalData.weburl = url;
+					wx.navigateTo({
+						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+					})
+				}
+			})
+		}
+	},
 	gotoMini: function(e) {
 		let appid = e.currentTarget.dataset.appid,
 			path = e.currentTarget.dataset.path
@@ -576,7 +607,6 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -675,7 +705,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -684,7 +713,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -701,7 +729,6 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
-						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -744,7 +771,6 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
-		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -848,7 +874,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index"
@@ -856,7 +881,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 13ecfd3..a8b12df 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -4,680 +4,808 @@
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
 <!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-  <view class="weather-num">{{weather.max_temp}}°</view>
-  <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
-</view>
-<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-    <view class="iconfont icon-sousuo"></view>
-    <view class="textOver">搜索想要的旅游产品或服务</view>
-  </navigator>
-</view>
-<view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+<view wx:if="{{!isTest}}">
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+    <view class="weather-num">{{weather.max_temp}}°</view>
+    <view class="weather">{{weather.weather}}</view>
+    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
+        mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
+    </view>
+    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+        <view class="iconfont icon-sousuo"></view>
+        <view class="textOver">搜索想要的旅游产品或服务</view>
+    </navigator>
+    </view>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+    </view>
+    </view>
+
+    <!-- <swiper class="swiper" indicator-dots="{{true}}"
+    autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
     <block wx:for="{{banner}}" wx:key="*this">
-      <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
-      </swiper-item>
+        <swiper-item bindtap="bannerClick2" data-item="{{item}}">
+        <image src="{{item.img}}" mode="aspectFill"></image>
+        </swiper-item>
     </block>
-  </swiper>
-  <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-  </view>
-</view>
+    </swiper> -->
+    <view class="top-icons" wx:if="{{!isTest}}">
+    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">活动日历</view>
+    </view>
+    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">场馆预约</view>
+    </view>
+    <!-- 非遗跳专题 -->
+    <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
+        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
+    <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+        <view class="top-icon-text">非遗专卖</view>
+    </view>
+    <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+        <view class="top-icon-text">非遗专卖</view>
+    </view> -->
+    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">剧场演出</view>
+    </view>
+    <!-- 2024年7月新版文创特产 -->
+    <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+        <view class="top-icon-text">文创特产</view>
+    </view>
+    <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+        data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+        <view class="top-icon-text">文创特产</view>
+    </view> -->
+    <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">景点门票</view>
+    </view>
+    <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">酒店住宿</view>
+    </view>
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">夜游苏州</view>
+    </view>
+    <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">一日游</view>
+    </view>
+    <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">研学游</view>
+    </view>
+    </view>
+    <view class="content">
+    <view class="sale-road-boxes" wx:if="{{false}}">
+        <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+        <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+        <view class="sale-product">
+            <view class="sale-product-bg"></view>
+            <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
+            </image>
+            <view class="sale-info">
+            <view class="sale-product-title textOver2">
+                <view>限时特惠</view>
+                <view>新品推荐</view>
+            </view>
+            <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
+                ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
+            </view>
+        </view>
+        </view>
+        <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
+        <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+        <view class="sale-product">
+            <view class="sale-product-bg road-product-bg"></view>
+            <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
+            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
+            </image>
+            <view class="sale-info">
+            <view class="sale-product-title textOver2">
+                <view>四季苏州</view>
+                <view>最是江南</view>
+            </view>
+            <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+                ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+            </view>
+        </view>
+        </view>
+    </view>
+    <!-- 五一修改 一张banner不滚动 -->
+    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+    </view>
+    <view class="small-swiper-box" wx:else>
+        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <block wx:for="{{xiaobanner}}" wx:key="*this">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <!-- 原 圆角77rpx，现改为13rpx -->
+            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            </swiper-item>
+        </block>
+        </swiper>
+        <view class="dot-list com-flex sm-dot-list">
+        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        </view>
+    </view>
+    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+    <view style="display: flex;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
+        <image src="{{indexSeason.ai}}" mode=""/>
+        </view>
+        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+        <image src="{{indexSeason.avoid}}" mode=""/>
+        </view>
+    </view>
+    <!-- 元旦修改  限时特惠--新版-->
+    <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+        <!-- 上方标题部分 -->
+        <view class="xsth-title">
+        <view class="xsth-left" style="display: flex;">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+        </view>
+        <view class="time-box" style="z-index: 9;">
+            倒计时
+            <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+            <text>:</text>
+            <view class="xsth-time">{{djs.m}}</view>
+            <text>:</text>
+            <view class="xsth-time">{{djs.s}}</view>
+        </view>
+        <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
+        <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+            更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+        </view> -->
+        </view>
+        <!-- 商品部分 -->
+        <view class="xpth-product">
+        <!-- 左边的2个产品 -->
+        <view class="xpth-left">
+            <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+            <image src="{{item.headimg}}" mode="" />
+            <view class="xpth-item-content">
+                <view class="xpth-item-title textOver2">{{item.title}}</view>
+                <!-- <view class="xpth-tag">唇齿留香</view> -->
+                <view class="xpth-item-bottom">
+                <view class="xpth-item-price">{{item.price/100}}</view>
+                <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                </view>
+            </view>
+            </view>
+        </view>
+        <!-- 右边的banner -->
+        <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" />
+        </view>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+    </view>
+    <!-- 五一修改 .slide-out-box 增加背景色-->
+    <view class="slide-out-box">
+        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+            <view class="text">数字非遗</view>
+            </view>
+            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+            <view class="text">数字博物馆</view>
+            </view>
+            <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/df0683bb40ec2615a932ef2379779374.png" mode="widthFix"></image>
+            <view class="text">数字名人馆</view>
+            </view>
+            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+            <view>云上观展</view>
+            </view>
+            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+            <view class="text">云上文博会</view>
+            </view>
+            <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
+            <view class="text">精彩回顾</view>
+            </view>
+            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+            <view class="text">文化场馆查询</view>
+            </view>
+            <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
+            <view class="text">苏影通</view>
+            </view>
+            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view>
+            <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/1a5fc26d419e589c5649273f8105b723.png" mode="widthFix"></image>
+            <view class="text">e读书</view>
+            </view>
 
-<!-- <swiper class="swiper" indicator-dots="{{true}}"
-  autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
-  <block wx:for="{{banner}}" wx:key="*this">
-    <swiper-item bindtap="bannerClick2" data-item="{{item}}">
-      <image src="{{item.img}}" mode="aspectFill"></image>
-    </swiper-item>
-  </block>
-</swiper> -->
-<view class="top-icons" wx:if="{{!isTest}}">
-  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index"
-    class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">活动日历</view>
-  </view>
-  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约"
-    data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">场馆预约</view>
-  </view>
-  <!-- 非遗跳专题 -->
-  <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-    data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">非遗专卖</view>
-  </view>
-  <view bindtap="gotoPath" data-event="show" data-title="剧场演出"
-    data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">剧场演出</view>
-  </view>
-  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-    data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">文创特产</view>
-  </view>
-  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index"
-    class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">景点门票</view>
-  </view>
-  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index"
-    class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">酒店住宿</view>
-  </view>
-  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index"
-    class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">夜游苏州</view>
-  </view>
-  <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew"
-    class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">一日游</view>
-  </view>
-  <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel"
-    class="top-icon-item">
-    <!-- 夏季修改 -->
-    <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
-    <view class="top-icon-text">研学游</view>
-  </view>
-</view>
-<view class="content">
-  <view class="sale-road-boxes" wx:if="{{false}}">
-    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品"
-      data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-      <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-      <view class="sale-product">
-        <view class="sale-product-bg"></view>
-        <image mode="aspectFill" class="sale-img"
-          src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png"
-          mode="aspectFill">
+            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+            <view class="text">数字公共文化</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+            <view class="text">文旅单位</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view> -->
+            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
+            <view class="text">云游苏州</view>
+            </view>
+            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+            <view class="text">美图鉴赏</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+            <view>文物查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+            data-path="/pages/pbService/museum/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+            <view>博物馆查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+            <view>云上文博会</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+            <view class="text">投资导引图</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="数字文物"
+            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+            <view>数字文物</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+            <view>团体预约</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+            <view>廉洁地图</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+            <view>文化配送</view>
+            </view> -->
+        </view>
+        </scroll-view>
+        <view class="scroll-line">
+        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+        </view>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
+    </view>
+    <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+        <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+        <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
         </image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">
-            <view>限时特惠</view>
-            <view>新品推荐</view>
-          </view>
-          <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
-            ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-        </view>
-      </view>
-    </view>
-    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路"
-      data-path="/pages/list/road/index">
-      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-      <view class="sale-product">
-        <view class="sale-product-bg road-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx"
-          src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg"
-          mode="aspectFill"></common-image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png"
-          mode="aspectFill">
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+        <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
+        <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+        data-path="/pages/list/{{isTest?'road':'food'}}/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
+        <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
         </image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">
-            <view>四季苏州</view>
-            <view>最是江南</view>
-          </view>
-          <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-            ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <!-- 五一修改 一张banner不滚动 -->
-  <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-    <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-  </view>
-  <view class="small-swiper-box" wx:else>
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <!-- 原 圆角77rpx，现改为13rpx -->
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-        </swiper-item>
-      </block>
-    </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
-    </view>
-  </view>
-  <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-  <view style="display: flex;">
-    <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"  class="jqssd" ></view>
-    <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk"></view>
-  </view>
-  <!-- 元旦修改  限时特惠--新版-->
-  <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-    <!-- 上方标题部分 -->
-    <view class="xsth-title">
-      <view class="xsth-left" style="display: flex;">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
-      </view>
-      <view class="time-box" style="z-index: 9;">
-      倒计时
-        <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-        <text>:</text>
-        <view class="xsth-time">{{djs.m}}</view>
-        <text>:</text>
-        <view class="xsth-time">{{djs.s}}</view>
-      </view>
-      <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-      <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-        更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-      </view> -->
-    </view>
-    <!-- 商品部分 -->
-    <view class="xpth-product">
-      <!-- 左边的2个产品 -->
-      <view class="xpth-left">
-        <view  class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-          <image src="{{item.headimg}}" mode=""/>
-          <view class="xpth-item-content">
-            <view class="xpth-item-title textOver2">{{item.title}}</view>
-            <!-- <view class="xpth-tag">唇齿留香</view> -->
-            <view class="xpth-item-bottom">
-              <view class="xpth-item-price">{{item.price/100}}</view>
-              <!-- <view class="xpth-item-buy">立即抢购</view> -->
-            </view>
-          </view>
-        </view>
-      </view>
-      <!-- 右边的banner -->
-      <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill"/>
-    </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode=""/>
-  </view>
-  <!-- 五一修改 .slide-out-box 增加背景色-->
-  <view class="slide-out-box">
-    <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-    <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-      <view class="pbservice" style="margin-bottom:30rpx">
-        <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
-          <view>非遗鉴赏</view> -->
-          <!-- 元旦修改 第一个pbservice-item新增margin-left -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-          <view class="text">非遗鉴赏</view>
-        </view>
-        <view bindtap="goH5" data-title="数字博物馆"
-          data-path="BwsInfo" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
-          <view>数字博物馆</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-          <view class="text">数字博物馆</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
-        class="pbservice-item">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
-        <view>公共文化资源库</view> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-        <view class="text">公共文化资源库</view>
-      </view>
-      <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-          <view>云上文博会</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-          <view class="text">云上文博会</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
-          data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
-          <view>云上观展</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-          <view>云上观展</view>
-        </view>
-        <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
-          <view>精彩回顾</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
-          <view class="text">精彩回顾</view>
-        </view>
-        <view bindtap="gotoPath" data-event="institution_click" 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> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-          <view class="text">文旅单位</view>
-        </view>
-        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-          <view>书香借阅</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-          <view class="text">书仓</view>
-        </view>
-        <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
-          <view>苏影通</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
-          <view class="text">苏影通</view>
-        </view>
-        <view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
-          data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
-          <view>视觉中心</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-          <view class="text">视觉中心</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-          data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-          <view>文物查询</view>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
+        <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
+        <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
+        <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+        data-path="/pages/list/{{isTest?'road':'food'}}/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
+        <image bindtap="audioGuide" data-event="voice_click"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
+        </image>
+        <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
+        <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
+        mode="aspectFill"></image> -->
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0;">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+        <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+        <view>
+            查看全部
+        </view>
+        <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode="" />
+        <!-- <text class="iconfont icon-you"></text>  -->
+        </navigator>
+        <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
+    </view>
+    <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
+        <!-- 元旦修改 ggfw为新增类名 -->
+        <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+        <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
+            data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+            <view>景区舒适度</view>
         </view> -->
-        <view bindtap="goH5"  data-title="文化场馆查询"
-          data-path="Museum" class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/9fb0bc6ed4ba61b198b1928985d1645d.png" mode="widthFix"></image>
-          <view>文化场馆查询</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-          <view class="text">文化场馆查询</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-          data-path="/pages/pbService/museum/index" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-          <view>博物馆查询</view>
+        <!-- 元旦修改 ggfw为新增类名 -->
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
+            <view>安全服务</view>
         </view> -->
-        <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-          <view>云上文博会</view>
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
+            <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+            <view>景区舒适度</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
+            <!-- 元旦修改 -->
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+            <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
+            <!-- 元旦修改 -->
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+            <view>实时路况</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
+            data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
+            <view>找厕所</view>
         </view> -->
-        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-          class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-          <view>投资导引图</view> -->
-          <!-- 元旦修改 -->
-          <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-          <view class="text">投资导引图</view>
-        </view>
-        <!-- <view bindtap="gotoUrl" data-title="数字文物"
-          data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-          <view>数字文物</view>
+        <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
+            data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
+            <view>停车场</view>
         </view> -->
-        <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-          <view>团体预约</view>
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
+            <view>12348</view>
         </view> -->
-
-        <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-          data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-          <view>廉洁地图</view>
+        </view>
+    </view>
+    <view class="sale-road-boxes">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
+    </view>
+    <!-- <view class="six-box">
+        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
+        data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
+        src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
+        </image>
+    </view> -->
+    <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+    <view class="six-box-new" wx:if="{{!isTest}}">
+        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+        </image>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
+    </view>
+    <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
+        <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
+        <image src="{{item.icon}}" mode="widthFix"></image>
+        <view>{{item.name}}</view>
+        </view>
+    </view>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
+    </view>
+    <view class="hot-list" wx:if="{{isTest==false}}">
+        <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
+        <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+            <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+            <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
+            <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+            <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
+            <view class="today-date">{{date}} {{month}}</view>
+            <view class="today-hot-box">
+                <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
+                {{item.ext.display_tags[0]}}</view>
+                <view class="today-hot-title">{{item.title}}</view>
+            </view>
+            </view>
+            <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+            <view style="position:relative">
+                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+            </view>
+            <view class="hot-info">
+                <view class="hot-title">{{item.title}}</view>
+                <view class="tags textOver" style="margin-bottom:0">
+                <view class="icon-box">
+                    <text class="iconfont icon-xin"></text>
+                    <text>{{item.ext.like_number}}</text>
+                </view>
+                <view class="icon-box">
+                    <text class="iconfont icon-eye"></text>
+                    <text>{{item.ext.view_number}}</text>
+                </view>
+                </view>
+            </view>
+            </view>
+            <view wx:else class="hot-item">
+            <view style="position:relative">
+                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                <!-- <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' && item.ext.price}}" class="hot-price">
+                <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                </view>
+            </view>
+            </view>
+        </view>
+        </view>
+    </view>
+    <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+    <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+    </view>
+    <view class="mask prizeMask" wx:if="{{videoPrize}}">
+    <view class="mask-bg"></view>
+    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+        <!-- 中奖的卡券 -->
+        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
         </view> -->
-
-        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-          class="pbservice-item">
-          <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-          <view>文化配送</view>
+        </view>
+        <!-- 中奖的产品 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
         </view> -->
-      </view>
-    </scroll-view>
-    <view class="scroll-line">
-      <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-      <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-      <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-      <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-    </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode=""/>
-  </view>
-  <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-    <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-      <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-      <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-    </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
-    <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
-    <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
-    <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
-    </image>
-    <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
-      <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
-    <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-      data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
-    <image bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
-    </image>
-    <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
-    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-      mode="aspectFill"></image> -->
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0;">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">查看全部 <text
-        class="iconfont icon-you"></text> </navigator>
-    <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
-  </view>
-  <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240606/ec3159a8e5b6bb0ccce8aef14ca70f14.png');background-size: 100% 100%;">
-    <!-- 元旦修改 ggfw为新增类名 -->
-    <view class="pbservice ggfw-list" style="width:100%;margin-top: 30rpx;">
-      <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
-        data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
-      </view> -->
-        <!-- 元旦修改 ggfw为新增类名 -->
-            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
-        <view>安全服务</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-      data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
-        <view>景区舒适度</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
-        <view>行李寄存</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-        <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
-        <view>实时路况</view>
-      </view>
-      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
-        data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
-        <view>找厕所</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
-        data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
-        <view>停车场</view>
-      </view> -->
-      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-        <view>12348</view>
-      </view> -->
-    </view>
-  </view>
-  <view class="sale-road-boxes">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode=""/>
-  </view>
-  <!-- <view class="six-box">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
-    </image>
-  </view> -->
-  <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
-  <view class="six-box-new" wx:if="{{!isTest}}">
-    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-      data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}"
-      src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
-    </image>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode=""/>
-  </view>
-  <view class="other-plats" wx:if="{{otherPlat}}">
-    <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
-      <image src="{{item.icon}}" mode="widthFix"></image>
-      <view>{{item.name}}</view>
-    </view>
-  </view>
-  <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-    <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode=""/>
-  </view>
-  <view class="hot-list" wx:if="{{isTest==false}}">
-    <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
-      <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-        <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-          <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}"
-            mode="aspectFill"></common-image>
-          <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-          <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png"
-            mode="widthFix"></image>
-          <view class="today-date">{{date}} {{month}}</view>
-          <view class="today-hot-box">
-            <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
-              {{item.ext.display_tags[0]}}</view>
-            <view class="today-hot-title">{{item.title}}</view>
-          </view>
-        </view>
-        <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-          <view style="position:relative">
-            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-          </view>
-          <view class="hot-info">
-            <view class="hot-title">{{item.title}}</view>
-            <view class="tags textOver" style="margin-bottom:0">
-              <view class="icon-box">
-                <text class="iconfont icon-xin"></text>
-                <text>{{item.ext.like_number}}</text>
-              </view>
-              <view class="icon-box">
-                <text class="iconfont icon-eye"></text>
-                <text>{{item.ext.view_number}}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view wx:else class="hot-item">
-          <view style="position:relative">
-            <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <!-- <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' && item.ext.price}}" class="hot-price">
-              <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
-          </view>
         </view>
-      </view>
+        <!-- 未中奖 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <view bindtap="closePrice">我知道了</view>
+        </view>
+        </view>
+        <!-- 未抽奖状态 -->
+        <view style="position:relative" wx:else>
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
+        </view>
+        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
     </view>
-  </view>
-  <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-  <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
-</view>
-<view class="mask prizeMask" wx:if="{{videoPrize}}">
-  <view class="mask-bg"></view>
-  <view class="mask-content"
-    style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-    <!-- 中奖的卡券 -->
-    <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
-        class="prize-tip-text"></image>
-      <view class="prize-name">{{prizeInfo.prize_name}}</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <!-- <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-      </view> -->
-    </view>
-    <!-- 中奖的产品 -->
-    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix"
-        class="prize-tip-text"></image>
-      <view class="prize-name">{{prizeInfo.prize_name}}</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <!-- <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-      </view> -->
-    </view>
-    <!-- 未中奖 -->
-    <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix"
-        class="prize-tip-text"></image>
-      <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-      <view class="prize-img">
-        <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-      </view>
-      <view class="btn-box">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-        <view bindtap="closePrice">我知道了</view>
-      </view>
-    </view>
-    <!-- 未抽奖状态 -->
-    <view style="position:relative" wx:else>
-      <image bindtap="choosePrize" style="display:block;width:533rpx"
-        src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-      <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-    </view>
-    <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx"
-      src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
-  </view>
-</view>
-<!-- 广告弹窗 -->
-<view class="zzc" bindtap="closeAdv"  wx:if="{{showAdv}}"  ></view>
-<view class="alertavd" wx:if="{{showAdv}}">
-  <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-    <block wx:for="{{alertSwipeList}}" wx:key="*this">
-    <swiper-item data-item="{{item}}" bindtap="bannerJumpNew" >
-      <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-    </swiper-item>
-    </block>
-  </swiper>
-  <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
-</view>
-<!-- 广告弹窗结束 -->
-<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
-	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    </view>
+    <!-- 广告弹窗 -->
+    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
+    <view class="alertavd" wx:if="{{showAdv}}">
+    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <block wx:for="{{alertSwipeList}}" wx:key="*this">
+        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
+            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+    </view>
+    <!-- 广告弹窗结束 -->
+    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
+    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
-    </view>
-	
-	<!-- 视频 -->
-	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-		<video
-			style="width:100vw;height:100vh;display:block;"
-			id="myVideo" 
-			src="{{startList.head_img}}" 
-			show-center-play-btn="{{false}}"
-			show-play-btn="{{true}}" 
-			autoplay
-			controls="{{false}}"
-			bindended="videoend"
-			loop="{{true}}"
-			muted="{{isMuted}}"
-			object-fit="fill"
-		></video>
-		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-	</view>
+        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
+
+    <!-- 视频 -->
+    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
+
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+    </view>
+    </view>
+    <!-- <view class="topBox">
+        <view class="Qtop" :style="{height:height}">
+        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+        </view>
+        <view class="jumpBox">
+        <view class="time">{{time}}s</view>
+        <view bind:tap="gotoIndex">跳过</view>
+        </view>
+    </view> -->
 </view>
-<!-- <view class="topBox">
-    <view class="Qtop" :style="{height:height}">
-      <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+
+<view wx:else>
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+    </view>
+    </view>
+    <view class="top-icons">
+    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">活动日历</view>
+    </view>
+    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">场馆预约</view>
+    </view>
+
+  
+    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">剧场演出</view>
+    </view>
+  
+   
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">夜游苏州</view>
+    </view>
+    </view>
+    <view class="content">
+ 
+    <!-- 五一修改 一张banner不滚动 -->
+    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+    </view>
+    <view class="small-swiper-box" wx:else>
+        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <block wx:for="{{xiaobanner}}" wx:key="*this">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <!-- 原 圆角77rpx，现改为13rpx -->
+            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            </swiper-item>
+        </block>
+        </swiper>
+        <view class="dot-list com-flex sm-dot-list">
+        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        </view>
+    </view>
+    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+    <view style="display: flex;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
+        <image src="{{indexSeason.ai}}" mode=""/>
+        </view>
+        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+        <image src="{{indexSeason.avoid}}" mode=""/>
+        </view>
+    </view>
+
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+    </view>
+    <!-- 五一修改 .slide-out-box 增加背景色-->
+    <view class="slide-out-box">
+        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+            <view class="text">数字非遗</view>
+            </view>
+            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+            <view class="text">数字博物馆</view>
+            </view>
+            
+            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+            <view>云上观展</view>
+            </view>
+            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+            <view class="text">云上文博会</view>
+            </view>
+            
+            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+            <view class="text">文化场馆查询</view>
+            </view>
+            
+            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view>
+            
+
+            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+            <view class="text">数字公共文化</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+            <view class="text">文旅单位</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view> -->
+            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
+            <view class="text">云游苏州</view>
+            </view>
+            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+            <view class="text">美图鉴赏</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+            <view>文物查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+            data-path="/pages/pbService/museum/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+            <view>博物馆查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+            <view>云上文博会</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+            <view class="text">投资导引图</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="数字文物"
+            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+            <view>数字文物</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+            <view>团体预约</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+            <view>廉洁地图</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+            <view>文化配送</view>
+            </view> -->
+        </view>
+        </scroll-view>
+        <view class="scroll-line">
+        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+        </view>
     </view>
-    <view class="jumpBox">
-      <view class="time">{{time}}s</view>
-      <view bind:tap="gotoIndex">跳过</view>
+
+
+
+
+
+
+  
     </view>
-</view> -->
+</view>
\ No newline at end of file
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 6195ca8..34cd243 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -334,10 +334,13 @@ page {
   z-index: 9;
   width: 173rpx;
   height: 40rpx;
-  line-height: 40rpx;
+  /* line-height: 40rpx; */
   background: rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
@@ -355,9 +358,9 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 8);
+  width: calc(190rpx * 7);
   display: flex;
-  margin-top: 20rpx;
+  margin-top: 30rpx;
   flex-wrap: wrap;
   /* margin-bottom: 60rpx; */
   /* 元旦修改 注释margin-bottom */
@@ -1004,7 +1007,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 230rpx;
+  width: 210rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
@@ -1175,17 +1178,21 @@ page {
 	bottom: 64rpx;
 }
 .jqssd {
-  background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
-  background-size: 100% 100%;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
+  background-size: 100% 100%; */
   width: 365.33rpx;
   height: 166rpx;
   flex-shrink: 0;
 }
+.jqssd image, .sslk image{
+  width: 100%;
+  height: 100%;
+}
 .sslk {
-  background: url("https://static.ticket.sz-trip.com/uploads/20240606/eec4af8edf598dc7c440cff8a5fdbe98.png");
-  background-size: 100% 100%;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
+  background-size: 100% 100%; */
   width: 365.33rpx;
   height: 166rpx;
   flex-shrink: 0;
   margin-left: -20rpx;
-}
\ No newline at end of file
+}
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
new file mode 100644
index 0000000..4cc4882
--- /dev/null
+++ b/subPackages/indexGQ/index.js
@@ -0,0 +1,1224 @@
+//index.js
+//获取应用实例
+let app = getApp()
+import commonApi from "../../utils/https/common"
+import userApi from "../../utils/https/user"
+import util from "../../utils/util"
+Page({
+	data: {
+		banner: [],
+		xiaobanner: [],
+		height: 0,
+		padHeight: 0,
+		right: 0,
+		weather: null,
+		saleProduct: null,
+		roadProduct: null,
+		fourProduct: [],
+		hotIndex: 0,
+		indexHot: [],
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
+		month: "",
+		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
+		date: "",
+		list: [],
+		listMore: true,
+		isTest: false,
+		lat: "",
+		lon: "",
+		urltopage: {},
+		scrollLeft: 0,
+		videoPrize: false,
+		prizeInfo: null,
+		otherPlat: null,
+		activeBannerIndex: 0,
+		smBannerIndex: 0,
+		indexSeason: {},
+		// startList: [], // 启动页广告
+		startList: {
+			head_img: ''
+		}, // 启动页广告
+		alertSwipeList: [], //弹窗广告
+		showAdv: false, //弹窗开关
+		showFullAdv: true, //全屏广告开关
+		opacity: 1,
+		time: 3, //全屏广告剩余时间
+		showTime: false,
+		xpth: {}, // 元旦新增 新品特惠和sqjNew
+		djs: null, // 元旦新增 新品特惠倒计时
+		djsTime: null,
+		sqjNew: [
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+		],
+		viewHeight: "0px",
+		isMuted: true,
+    videoPlay: false,
+    hdrlNavList:[
+      {
+        type:null,
+        title:'全部'
+      },
+      {
+        type:'scene',
+        title:'景区活动'
+      },
+      {
+        type:'show',
+        title:'演出'
+      },
+      {
+        type:'exhibition',
+        title:'展览'
+      },
+      {
+        type:'movie',
+        title:'电影'
+      },
+      {
+        type:'other',
+        title:'其他'
+      }
+    ], //活动日历板块导航分类
+    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+    today:null,
+    hdrlList:[],
+    yszNav:['公共服务','旅游助手'],
+    yszIndex:0,
+    bdList:[
+        {
+            bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游
+            url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
+            path:'',
+        },
+        {
+            bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可
+            path:'/pages/list/scene/index',
+            url:'',
+        },
+        {
+            bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
+            url:'',
+            path:'/pages/list/theatre/index',
+        },
+        {
+            bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
+            path:'/pages/list/techan/index',
+            url:'',
+        },
+      
+      
+    ],
+    list1:[], //非玩-景点
+    list2:[], //非买-文创
+    list3:[], //非游-一日游
+    list4:[], //非看-剧场演出
+	},
+	onLoad: function(options) {
+		this.getHeight()
+		//全屏广告
+		wx.hideTabBar() //这里隐藏了底部导航栏
+		commonApi._post("adv/getAdv", {
+			position: 2,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+				if (res.data.length > 1) {
+					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
+					this.setData({
+						startList: res.data[num]
+					})
+					console.log(this.data.startList.head_img);
+				} else {
+					this.setData({
+						startList: res.data[0]
+					})
+				}
+
+				// 图片
+				if (this.data.startList.media_type) {
+					this.setData({
+						showTime: true
+					})
+					var timer = setInterval(() => {
+						this.setData({
+							time: this.data.time - 1
+						})
+						if (this.data.time === 0) {
+							var opacityTimer = setInterval(() => {
+								this.setData({
+									opacity: this.data.opacity - 0.3
+								})
+							}, 100)
+						}
+						if (this.data.time == -1) {
+							clearInterval(timer)
+							clearInterval(opacityTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							this.setData({
+								showFullAdv: false
+							})
+						}
+					}, 1000)
+				} else {
+					// 视频
+				}
+			} else {
+				this.setData({
+					showFullAdv: false
+				})
+			}
+		})
+		if (options.from) {
+			app.globalData.from = options.from;
+    }
+    // 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+    let d = new Date();
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
+    this.setData({
+      today: d.getFullYear() + "-" + month + "-" + day
+    })
+		let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+		wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+        this.getList()
+        this.getHdrlList()
+			},
+			fail: (err) => {
+        this.getList()
+        this.getHdrlList()
+			}
+		})
+		this.setData({
+			height: height,
+			padHeight: systemInfo.statusBarHeight,
+			right: (systemInfo.screenWidth - rect.right) + rect.width
+		})
+
+		commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
+			this.setData({
+				urltopage: data
+			})
+		})
+		this.getTwoProduct()
+		this.getBanner()
+    this.getWeather()
+  },
+  gobdDetail(e) {
+    console.log(e);
+    let url = e.currentTarget.dataset.url
+    wx.navigateTo({
+      url: url
+    })
+  },
+  getList() {
+    let bdList = this.data.bdList
+    // 非玩不可--景点
+    commonApi._post("scene/get_scene_by_tag",{
+      tag_id:"4",
+      limit:6,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      offset:0,
+      sort:"weight",
+      title:'',
+      area_id:''
+    }).then(res=>{
+      res.data.list.map(item => {
+        if (item.distance || item.distance == 0) {
+          if (item.distance >= 1000) {
+            item.distance = (item.distance / 1000).toFixed(2) + 'km';
+          } else {
+            item.distance = (item.distance).toFixed(2) + 'm';
+          }
+        }
+      })
+      this.setData({
+        list1:res.data.list
+      })
+    })
+    // 非买不可--文创
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: 326,
+      offset: 0,
+      limit: 6,
+    }).then(res=>{
+      this.setData({
+        list2:res.data.list
+      })
+    })
+    // 非游不可--线路一日游
+    commonApi._post('product/get_product_by_tag',{
+      type_id: 23,
+      tag_id:17,
+      offset: 0,
+      limit: 6,
+      sort: 'weight'
+    }).then(res=>{
+      this.setData({
+        list3:res.data.list
+      })
+    })
+    // 非看不可--剧场演出
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:"6",
+      offset:0,
+      limit:6,
+      sort:'',
+      order:'',
+      lat:this.data.lat,
+      lon:this.data.lon,
+      title:''
+    }).then(res=>{
+      this.setData({
+        list4:res.data.list
+      })
+    })
+  },
+  goDetail(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+    if (type == 'movie') {
+      wx.navigateTo({
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/info/activityInfo/index?id=' + item.id,
+      })
+    }
+  },
+  // 分类为电影时调这个接口
+  getMovieList() {
+    let service = "Cinema/getHotMovieList";
+		let data = {
+			page: 1,
+			pageSize: 5
+    };
+    commonApi._post(service, data).then(res => {
+      console.log(res.data);
+			this.setData({
+				hdrlList: res.data
+			})
+    })
+    console.log(this.data.hdrlList);
+  },
+  // 推荐榜单更多跳转
+  moreBtn(e) {
+    let item = e.currentTarget.dataset.item
+    if (item.path!='') {
+      wx.navigateTo({
+        url: item.path,
+      })
+    } else {
+      // if (e.currentTarget.dataset.event) {
+      //   this.pagePoint({
+      //     event: e.currentTarget.dataset.event
+      //   }, 1)
+      // }
+      let url = item.url;
+      app.globalData.weburl = url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+      })
+    }
+  },
+  // 活动日历下的列表
+  getHdrlList() {
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: 1,
+      date: this.data.today,
+      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+      keywords: '',
+      area_key: '',
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 5
+    }).then(res => {
+      this.setData({
+        hdrlList:res.data.rows
+      })
+    })
+  },
+  // 切换活动日历分类
+  changeHdrlNav(e) {
+    console.log(e.currentTarget.dataset);
+    this.setData({
+      hdrlList:[],
+      hdrlNavIndex:e.currentTarget.dataset.index,
+    })
+    if (this.data.hdrlNavIndex == 4) {
+      this.getMovieList()
+    } else {
+      this.getHdrlList() //切换分类重新获取活动日历列表
+    }
+  },
+  // 游苏州下的公共服务和旅游助手切换
+  changeType(e) {
+    this.setData({
+      yszIndex:e.currentTarget.dataset.index,
+    })
+  },
+  // 获取导航栏项目标题高度
+	getHeight() {
+		let that = this
+		wx.getSystemInfo({
+			success(res) {
+				console.log(res)
+				that.setData({
+					viewHeight: res.windowHeight + 'px'
+				})
+				console.log(that.data.viewHeight)
+			}
+		})
+	},
+	// getXpthList: function() {
+	// 	// 元旦新增 新品特惠
+	// 	commonApi._post("product/get_product_indulgence", {
+	// 		tag_id: 275,
+	// 		typeId: 3,
+	// 	}).then(res => {
+	// 		console.log('data', res.data);
+	// 		this.setData({
+	// 			xpth: res.data,
+	// 			djsTime: res.data.time
+	// 		})
+	// 		let time = setInterval(() => {
+	// 			this.setData({
+	// 				djsTime: this.data.djsTime - 1
+	// 			})
+	// 			this.formatDate(this.data.djsTime)
+	// 		}, 1000)
+	// 		if (this.data.djsTime == 0) {
+	// 			clearInterval(time)
+	// 		}
+	// 	})
+	// },
+	// 元旦新品特惠 倒计时 
+	// formatDate: function(oTime) {
+	// 	let h = parseInt(oTime / 3600)
+	// 	let m = parseInt((oTime % 3600) / 60)
+	// 	let s = parseInt(oTime % 60)
+	// 	h = h < 10 ? "0" + h : h;
+	// 	m = m < 10 ? "0" + m : m;
+	// 	s = s < 10 ? "0" + s : s;
+	// 	this.setData({
+	// 		djs: {
+	// 			h: h,
+	// 			m: m,
+	// 			s: s
+	// 		}
+	// 	})
+	// 	return
+	// },
+  // 非遗跳转
+  // goFeiyi: function() {
+	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+	// 	wx.navigateTo({
+	// 		url: "/pages/pbService/web/index"
+	// 	})
+	// },
+	// onTabItemTap: function(e) {
+	// 	console.log(e, 99999999)
+  // },
+  // 大轮播的监听方法
+	changeBannerIndex: function(e) {
+		this.setData({
+			activeBannerIndex: e.detail.current
+		})
+  },
+  // 小轮播监听方法
+	changeSmBannerIndex: function(e) {
+		this.setData({
+			smBannerIndex: e.detail.current
+		})
+	},
+	// 一城百馆
+	city: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx114d514f39cb1fed',
+			path: "pages/entry/index"
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "一城百馆",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+	},
+	changeHotIndex: function(e) {
+		this.setData({
+			hotIndex: e.currentTarget.dataset.index,
+			fourProduct: []
+		})
+		this.getFourProduct()
+	},
+	getBanner: function() {
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xcxBanner"
+		// }).then(res=>{
+		//   console.log(res)
+		//   this.setData({
+		//     banner:res.data.content || []
+		//   })
+		// })
+		// commonApi._post("adv/getAdvByKey",{
+		//   key:"xiaobanner"
+		// }).then(res=>{
+		//   this.setData({
+		//     xiaobanner:res.data.content || []
+		//   })
+		// })
+		// return;
+		commonApi._post("adv/getAdv", {
+			position: 0,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				banner: res.data || []
+			})
+		})
+		commonApi._post("adv/getAdv", {
+			position: 1,
+			type_id: 3
+		}).then(res => {
+			this.setData({
+				xiaobanner: res.data || []
+			})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {
+			position: 3,
+			type_id: 3
+		}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
+				})
+			} else if (!this.data.showFullAdv) {
+				wx.showTabBar({
+					animation: true,
+				})
+			}
+		})
+
+	},
+	//获取季节配置
+	getIndexSeason() {
+		this.setData({
+			indexHot: app.globalData.configJson.indexHot,
+			isTest: app.globalData.configJson.isTest,
+			otherPlat: app.globalData.configJson.otherPlats,
+			indexSeason: app.globalData.configJson.indexSeason
+		})
+		this.getFourProduct()
+	},
+	//关闭弹窗广告
+	closeAdv: function() {
+		this.setData({
+			showAdv: false
+		})
+		wx.showTabBar({
+			animation: true,
+		})
+	},
+	//关闭全屏广告
+	closeFullAdv: function() {
+		this.setData({
+			showFullAdv: false
+		})
+		if (!this.data.alertSwipeList.length > 0) {
+			wx.showTabBar({
+				animation: true,
+			})
+		}
+	},
+	// 是否静音
+	closeMuted: function() {
+		this.setData({
+			isMuted: this.data.isMuted = !this.data.isMuted
+		})
+	},
+	// 播放视频
+	videoPlay: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.play();
+		this.setData({
+			videoPlay: false
+		})
+	},
+	// 暂停视频
+	videoPause: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.pause();
+		this.setData({
+			videoPlay: true
+		})
+	},
+	getWeather: function() {
+		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
+			this.setData({
+				weather: res.data
+			})
+		})
+	},
+	saleDetail: function() {},
+	getTwoProduct: function() {
+		// 获取首页限时特惠
+		commonApi._post('act/fast_sale_now', {
+			offset: 0,
+			limit: 1
+		}).then(res => {
+			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
+				if (res.data[0].fast_sales_sku.length > 0) {
+					let price = res.data[0].fast_sales_sku[0].price
+					let data = res.data[0].fast_sales_sku[0]
+					for (let item of res.data[0].fast_sales_sku) {
+						if (price > item.price) price = item.price
+					}
+					data.price = price
+					this.setData({
+						saleProduct: data
+					})
+				} else {
+					this.setData({
+						saleProduct: res.data[0].fast_sales_sku[0]
+					})
+				}
+			}
+		})
+		commonApi._post("product/get_product_by_tag", {
+			tag_id: 17,
+			offset: 0,
+			limit: 1,
+			sort: 'price',
+			order: 'asc'
+		}).then(res => {
+			if (res.data.list.length > 0) {
+				let price = res.data.list[0].price
+				for (let item of res.data.list) {
+					if (item.price > price) {
+						price = item.price
+					}
+				}
+				let data = res.data.list[0]
+				data.price = price
+				this.setData({
+					roadProduct: data
+				})
+			} else {
+				this.setData({
+					roadProduct: [111]
+				})
+			}
+		})
+	},
+	getFourProduct: function() {
+		let item = this.data.indexHot[this.data.hotIndex],
+			service = "product/get_product_by_tag",
+			data = {
+				tag_id: item.id,
+				offset: 0,
+				limit: 4,
+				sort: 'weight',
+				order: 'desc'
+			};
+		if (item.type == 'scene') {
+			service = "scene/get_scene_by_tag";
+		} else if (item.type == 'movie') {
+			service = "Cinema/getHotMovieList";
+			data = {
+				page: 1,
+				pageSize: 4
+			};
+		}
+		commonApi._post(service, data).then(res => {
+			this.setData({
+				fourProduct: res.data.list || res.data
+			})
+		})
+	},
+	tagGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
+			wx.navigateTo({
+				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+					item.title,
+			})
+		} else {
+			util.gotoDetail(item)
+		}
+	},
+	productGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.gotoDetail(item)
+	},
+	gotoPath: function(e) {
+    console.log(e)
+		// if (e.currentTarget.dataset.event) {
+		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
+		//     wx.navigateToMiniProgram({
+		//       appId: 'wxd323e63a10aa6865',
+		//       path: 'pages/home/index'
+		//     })
+		//     return
+		//   }else{
+		//     this.pagePoint({
+		//       event: e.currentTarget.dataset.event
+		//     }, 1)
+		//   }
+		// }
+		if (e.currentTarget.dataset.title == '书香借阅') {
+			wx.navigateToMiniProgram({
+				appId: 'wx165d4f1727f6bdb0',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.title == '12348') {
+			wx.navigateToMiniProgram({
+				appId: 'wxcdfd45c001466ba3',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxdd39069b9a91dbfe',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8888a3fd0862b4c8',
+				path: 'pages/index/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'taicang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8853b0d93cbca75e',
+				path: 'pages/home/home'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'changshu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx4df5fd9a6a5ea123',
+				path: 'pages/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wxd323e63a10aa6865',
+				path: 'pages/home/index'
+			})
+			return;
+		} else if (e.currentTarget.dataset.event == 'wujiang_click') {
+			wx.navigateToMiniProgram({
+				appId: 'wx8eadea4ee2d42d4b',
+				path: 'pages/index/index'
+			})
+			return;
+		}
+		wx.navigateTo({
+			url: e.currentTarget.dataset.path,
+		})
+		if (e.currentTarget.dataset.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: e.currentTarget.dataset.title
+			}).then(res => {
+
+			})
+		}
+	},
+	// 元旦  新品特惠部分
+	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
+		})
+	},
+	gotoUrl: function(e) {
+		console.log(e)
+		if (e.currentTarget.dataset.event) {
+			this.pagePoint({
+				event: e.currentTarget.dataset.event
+			}, 1)
+		}
+		let url = e.currentTarget.dataset.url;
+		app.globalData.weburl = url;
+		wx.navigateTo({
+			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+		})
+    },
+    	// 实时路况跳转外链
+	gotoUrls() {
+		// 判断是否登录
+		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+		if(!token || !userId) {
+			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+			
+			app.globalData.weburl = url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+			})
+		}else {
+			commonApi.user_post("uservice/user/userEncry").then(res => {
+				if(res.code == 1) {
+					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+					
+					app.globalData.weburl = url;
+					wx.navigateTo({
+						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+					})
+				}
+			})
+		}
+	},
+	gotoMini: function(e) {
+		let appid = e.currentTarget.dataset.appid,
+			path = e.currentTarget.dataset.path
+		wx.navigateToMiniProgram({
+			appId: appid,
+			path: path
+		})
+	},
+	garbage: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx13be821f3b1afed3',
+			path: 'pages/home/home'
+		})
+	},
+	gotoSku: function() {
+		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
+			app.globalData.weburl = res.data.url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index'
+			})
+			return;
+		})
+	},
+	audioGuide: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx74f380bc721a0379',
+			path: '/pages/listen/listen?title=君到苏州'
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "语音导览",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+	},
+	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
+	// getList: function() {
+	// 	if (!this.data.listMore) return;
+	// 	commonApi._post("search/recommend", {
+	// 		offset: this.data.list.length,
+	// 		limit: 16
+	// 	}).then(res => {
+	// 		res.data.map(item => {
+	// 			if (item.ext.display_tags) {
+	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+	// 			} else {
+	// 				item.ext.display_tags = []
+	// 			}
+	// 		})
+	// 		if (res.data.length < 15) {
+	// 			this.setData({
+	// 				listMore: false
+	// 			})
+	// 		}
+	// 		this.setData({
+	// 			list: this.data.list.concat(res.data)
+	// 		})
+	// 	})
+	// },
+	onReachBottom: function() {
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+		// }
+	},
+	gotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.pagePoint({
+			event: 'recommend_click',
+			param: {
+				id: item.id,
+				type: item.type
+			}
+		}, 1)
+		if (item.type == 'travels') {
+			// 游记做特殊处理 其他都按照原来的来
+			wx.navigateTo({
+				url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+			})
+		} else {
+			util.gotoDetail(item.ext);
+		}
+	},
+	meituan: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wxde8ac0a21135c07d',
+			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
+		})
+	},
+	// 轮播图点击
+	bannerClick: function(e) {
+		if (this.data.isTest) return;
+		let item = e.currentTarget.dataset.item;
+		this.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					console.log(111, item.tdata)
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+							.url)
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					console.log(page[0])
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+								null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
+						wx.navigateTo({
+							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+								.tdata.url)
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return;
+
+	},
+	//博物馆跳转  直接跳君到苏州H5
+	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
+		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+		wx.navigateTo({
+			// url: "/pages/pbService/web/index"
+			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
+		})
+	},
+	// bannerClick2: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.action == 'href') {
+	// 		if (item.href.indexOf(",") != -1) {
+	// 			let info = item.href.split(",");
+	// 			wx.navigateToMiniProgram({
+	// 				appId: info[0],
+	// 				path: info[1]
+	// 			})
+	// 		} else if (item.href.indexOf('map/index') != -1) {
+	// 			wx.reLaunch({
+	// 				url: item.href
+	// 			})
+	// 		} else {
+	// 			wx.navigateTo({
+	// 				url: item.href,
+	// 			})
+	// 		}
+	// 	} else if (item.action == "web") {
+	// 		app.globalData.weburl = item.href;
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+	// 		})
+	// 	}
+	// },
+	// 监听文旅查询的scroll
+	listenScroll(e) {
+		this.setData({
+			scrollLeft: e.detail.scrollLeft
+		})
+	},
+	// // 获取短视频大赛是否中奖 中奖详情
+	// getVideoPrize() {
+	// 	let user_id = wx.getStorageSync('jstrip_userid');
+	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+	// 	commonApi.user_post('actonline/video_act/getRaffle', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			videoPrize: res.data
+	// 		})
+	// 	})
+	// },
+	// noMoreTip() {
+	// 	wx.setStorageSync('indexPriceNoTip', true)
+	// 	this.closePrice()
+	// },
+	// closePrice() {
+	// 	this.setData({
+	// 		videoPrize: false,
+	// 		prizeInfo: null
+	// 	})
+	// },
+	// 抽奖
+	// choosePrize() {
+	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			prizeInfo: res.data
+	// 		})
+	// 		if (res.data.type != 'none') {
+	// 			// 抽奖成功的话 弹框
+	// 			wx.showModal({
+	// 				title: "提示",
+	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+	// 				showCancel: false
+	// 			})
+	// 		}
+	// 	})
+	// },
+	// bannerJumpNew(item) {
+	// 	let that = this
+	// 	item = item.currentTarget.dataset.item
+	// 	if (item.tdata == '') return
+	// 	that.pagePoint({
+	// 		event: "banner_click",
+	// 		type: 'banner'
+	// 	}, 1)
+	// 	switch (item.jump_type) {
+	// 		case 0:
+	// 			break;
+	// 		case 1:
+	// 			util.gotoDetail(item.product_model)
+	// 			break;
+	// 		case 2:
+	// 			if (item.front_model && item.front_model.mini) {
+	// 				wx.navigateTo({
+	// 					url: "/" + item.front_model.mini
+	// 				})
+	// 			}
+	// 			break;
+	// 		case 3:
+	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+	// 				// 外部h5
+	// 				console.log(item.tdata)
+	// 				app.globalData.weburl = item.tdata.url;
+	// 				wx.navigateTo({
+	// 					url: "/pages/pbService/web/index"
+	// 				})
+	// 			} else {
+	// 				let page = item.tdata.url.split("/");
+	// 				page = page[page.length - 1].split("?")
+	// 				console.log(page[0])
+	// 				let url = this.data.urltopage[page[0]];
+	// 				if (url && url.indexOf('map') != -1) {
+	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+	// 							'cinema', 'academes'
+	// 						],
+	// 						type = page[1] ? page[1].split("=") : [];
+	// 					wx.reLaunch({
+	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+	// 					})
+	// 				} else if (url) {
+	// 					wx.navigateTo({
+	// 						url: url,
+	// 					})
+	// 				} else {
+	// 					app.globalData.weburl = item.tdata.url;
+	// 					wx.navigateTo({
+	// 						url: "/pages/pbService/web/index"
+	// 					})
+	// 				}
+	// 			}
+	// 			break;
+	// 		case 4:
+	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+	// 				// 如果是苏心游的小程序 直接把authCode带过去
+	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+	// 					let weburl = item.tdata.page
+	// 					if (weburl.indexOf('?') != -1) {
+	// 						weburl += '&authCode=' + res.data;
+	// 					} else {
+	// 						weburl += '?authCode=' + res.data
+	// 					}
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: weburl
+	// 					})
+	// 				}).catch(err => {
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: item.tdata.page
+	// 					})
+	// 				})
+	// 			} else {
+	// 				wx.navigateToMiniProgram({
+	// 					appId: item.tdata.appid,
+	// 					path: item.tdata.page
+	// 				})
+	// 			}
+	// 			break;
+	// 		default:
+	// 			break;
+	// 	}
+	// 	return
+	// },
+	onReady: function() {
+
+
+	},
+	// gotoOther: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.type == 'h5') {
+	// 		app.globalData.weburl = item.url
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+	// 		})
+	// 	} else if (item.type == 'mini') {
+	// 		wx.navigateToMiniProgram({
+	// 			appId: item.appid,
+	// 			path: item.path
+	// 		})
+	// 	} else if (item.type == 'page') {
+	// 		wx.navigateTo({
+	// 			url: item.page,
+	// 		})
+	// 	}
+	// },
+	pagePoint: function(e, type) {
+		util.pagePoint(e, type)
+	},
+	onShow: function() {
+		if (app.globalData.loadIndexSeason) {
+			this.getIndexSeason()
+		} else {
+			let t = setInterval(() => {
+				if (app.globalData.loadIndexSeason) {
+					this.getIndexSeason()
+					clearInterval(t)
+					t = null
+				}
+			}, 500)
+		}
+
+		this.pagePoint({
+			event: 'home_view'
+		}, 1)
+		// this.data.time!=5?wx.showTabBar():1
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+	onShareTimeline: function() {
+		return {
+			title: '君到苏州（文化旅游总入口）',
+			query: '',
+			imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
+		}
+	}
+})
\ No newline at end of file
diff --git a/subPackages/indexGQ/index.json b/subPackages/indexGQ/index.json
new file mode 100644
index 0000000..7c4437e
--- /dev/null
+++ b/subPackages/indexGQ/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "common-image":"/pages/component/commonImage/index",
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
new file mode 100644
index 0000000..ad62e9a
--- /dev/null
+++ b/subPackages/indexGQ/index.wxml
@@ -0,0 +1,316 @@
+<!--pages/indexs/index.wxml-->
+<title title="君到苏州（文化旅游总入口）"></title>
+<!-- 后台获取的季节动图 -->
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20240923/d62c7214a790c9746c9dd9f8821775f7.gif" mode="widthFix"></image>
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <view class="weather-num">{{weather.max_temp}}°</view>
+  <view class="weather">{{weather.weather}}</view>
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+</view>
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+    <view class="iconfont icon-sousuo"></view>
+    <view class="textOver">搜索想要的旅游产品或服务</view>
+  </navigator>
+</view>
+<view style="position:relative;z-index: 1;" >
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+    <block wx:for="{{banner}}" wx:key="this">
+      <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="com-flex dot-list">
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+  </view>
+</view>
+<view class="content">
+  <!-- 活动日历 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/uploads/20240923/00c7635dd9648e9dc4d0d044c06f495c.png"></image>
+    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+  </view>
+  <view class="hdrlNavList">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+      {{item.title}}
+    </view>
+  </view>
+  <view wx:if="{{hdrlNavIndex!=4}}">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
+        <view style="background: #fff;display: flex;border-radius: 13rpx;">
+          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <view class="hdrlItem-content">
+            <view class="hdrlItem-title textOver3">{{item.name}}</view>
+            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view wx:else>
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
+          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
+            <view>{{item.title}}</view>
+            <view style="display: flex;justify-content: flex-end;">
+              <view class="buyMovie">去购票 ></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" wx:if="{{!isTest}}">
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
+      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
+          </view>
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
+            <view class="text">一卡游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <view class="text">非遗专卖</view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+    </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
+    </view>
+    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
+        <view bindtap="gotoPath" data-event="security_home_click" data-title="电子社保卡" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
+
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view> -->
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
+    </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          data-path="/pages/list/{{isTest?'road':'food'}}/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
+  <!-- 推荐榜单 -->
+  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
+  <!-- 4个产品榜单 -->
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
+  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
+    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <view class="bd-top">
+      <image class="bd-type" src="{{item.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
+    </view>
+    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
+      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+ </view>
+
+
+
+</view>
+
+<!-- 开屏页 -->
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
+</view>
+
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
new file mode 100644
index 0000000..69871b7
--- /dev/null
+++ b/subPackages/indexGQ/index.wxss
@@ -0,0 +1,1448 @@
+/* pages/indexs/index.wxss */
+/* 元旦修改 */
+page {
+  height: fit-content;
+  padding-bottom: 36.67rpx;
+  background: url("https://static.ticket.sz-trip.com/uploads/20240923/69d4d68f5207c84146739951d07dbda4.jpg");
+  background-size: 100% 300%;
+  /* background-repeat: round; */
+  background-repeat: no-repeat;
+}
+.swiper,.swiper image {
+  width: 697rpx;
+  display: block;
+  height: 335rpx;
+  border-radius: 27rpx;
+}
+.swiper {
+  margin: 0 auto;
+}
+.top-box {
+  display: flex;
+  padding: 10rpx 0;
+  align-items: center;
+  margin: 0 30rpx;
+  justify-content: flex-start;
+  position: relative;
+  z-index: 1;
+}
+.top-box image {
+  flex-shrink: 0;
+  width: 40rpx;
+  height: 40rpx;
+  /* 样式改版 */
+  /* width: 63rpx;
+  height: 63rpx; */
+  display: block;
+  margin-left: 18rpx;
+}
+.search-box {
+  flex: 1;
+  width: 100%;
+  height: 64rpx;
+  background: rgba(255,255,255,0.7);
+  border-radius: 32rpx;
+  color: #000;
+  display: flex;
+  align-items: center;
+  font-size: 25rpx;
+}
+.search-box .iconfont {
+  font-size: 30rpx;
+  margin-left: 20rpx;
+  margin-right: 10rpx;
+  color: #000;
+}
+.top-box .weather-num,.top-box .weather {
+  flex-shrink: 0;
+  color: #333;
+  /* color: #72674E; */
+}
+.top-box .weather-num {
+  font-size: 29rpx;
+  margin-bottom: 10rpx;
+  margin-left: 4rpx;
+}
+.top-box .weather {
+  font-size: 19rpx;
+  margin-top: 20rpx;
+  margin-left: -4rpx;
+  margin-right: 30rpx;
+}
+.top-icons {
+  /* background: #FFFFFF; */
+  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
+  border-radius: 0 0 27rpx 27rpx;
+  width: 697rpx;
+  margin: 0 auto;
+  position: relative;
+  z-index: 0;
+  display: flex;
+  padding: 34rpx 0;
+  padding-bottom: 7rpx;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  background: #FFFED6;
+  margin-top: -20rpx;
+  padding-top: 54rpx;
+}
+.top-icon-item {
+  margin-bottom: 20rpx;
+  line-height: 37rpx;
+  font-size: 25rpx;
+  color: #000;
+  text-align: center;
+  flex-shrink: 0;
+  width: 20%;
+}
+.top-icon-item:nth-child(5n){
+  margin-right: 0;
+}
+.top-icon-item image {
+  width: 113rpx;
+  display: block;
+  margin: 0 auto;
+  margin-bottom: 10rpx;
+}
+.content {
+  /* margin: 0 25rpx; */
+  margin-top: 20.67rpx;
+}
+.sale-road-boxes {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 40rpx;
+  position: relative;
+  align-items: flex-end;
+  margin-bottom: 28rpx;
+}
+.sale-box {
+  flex-shrink: 0;
+  width: 337rpx;
+}
+.sale-title {
+  color: #999999;
+  font-size: 20rpx;
+  margin-bottom: 20rpx;
+}
+.sale-title text {
+  color: #000000;
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-right: 8rpx;
+}
+.sale-product {
+  width: 337rpx;
+  position: relative;
+  height: 165rpx;
+  overflow: hidden;
+  border-radius: 8rpx;
+}
+.sale-product-bg {
+  width: 197rpx;
+  height: 165rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background: linear-gradient(90deg, #F78C56, #FB6044);
+  
+}
+.road-product-bg {
+  background: linear-gradient(90deg, #35CFB4, #00A6A0);
+}
+.sale-img {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 173rpx;
+  height: 165rpx;
+}
+.sale-info {
+  position: absolute;
+  left: 20rpx;
+  top: 20rpx;
+  bottom: 20rpx;
+  width: 140rpx;
+}
+.sale-product-title {
+  font-size: 28rpx;
+  color: #fff;
+  font-weight: 500;
+  line-height: 36rpx;
+}
+.sale-price {
+  padding: 0 10rpx;
+  color: #F44747;
+  font-size: 25rpx;
+  line-height: 39rpx;
+  background: #FFFFFF;
+  border-radius: 5rpx;
+  margin-top: 15rpx;
+  display: inline-block;
+}
+.sale-tip-img {
+  position: absolute;
+  width: 200rpx;
+  height: 165rpx;
+  left: 0;
+  top: 0;
+}
+.small-swiper {
+  height: 154rpx;
+}
+.small-swiper image {
+  display: block;
+  width: 100%;
+  height: 154rpx;
+}
+.small-swiper-box {
+  margin: 24rpx 26.67rpx 26.67rpx;
+  /* width: 100%; */
+  height: 154rpx;
+  border-radius: 20rpx;
+  overflow: hidden;
+  position: relative;
+}
+.product-tags {
+  display: flex;
+  margin-top: 40rpx;
+  margin-bottom: 50rpx;
+  overflow-x: auto;
+}
+.product-tag {
+  padding: 0 20rpx;
+  height: 43rpx;
+  background: #F4F4F4;
+  border-radius: 21rpx;
+  font-size: 27rpx;
+  color: #666;
+  margin-right: 20rpx;
+  flex-shrink: 0;
+}
+.product-tag.active {
+  background: #0B898E;
+  color: #fff;
+}
+.tag-product-list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.tag-product {
+  width: 337rpx;
+  background: #FFFFFF;
+  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 13rpx;
+  margin-bottom: 35rpx;
+}
+.tag-product image {
+  display: block;
+  width: 337rpx;
+  height: 213rpx;
+  border-radius: 13rpx 13rpx 0px 0px;
+}
+.tag-product .product-info {
+  padding: 20rpx;
+  padding-bottom: 0;
+}
+.tag-product .tag-product-title {
+  font-size: 33rpx;
+  color: #333333;
+  font-weight: 500;
+  margin-bottom: 10rpx;
+}
+.tag-product .tag-product-address {
+  color: #999;
+  font-size: 22rpx;
+  line-height: 40rpx;
+  padding-bottom: 10rpx;
+}
+.tag-product-price-box {
+  display: flex;
+  height: 70rpx;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+}
+.tag-product .tag-product-address .iconfont {
+  font-size: 26rpx;
+}
+.price {
+  color: #D62828;
+  font-size: 24rpx;
+}
+.price text:nth-child(2){
+  font-weight: 500;
+  font-size: 33rpx;
+}
+.price text:nth-child(3){
+  font-size: 20rpx;
+  color: #8D8D8D;
+  margin-left: 4rpx;
+}
+.sale-number {
+  font-size: 24rpx;
+  color: #666;
+}
+.sale-number text {
+  font-size: 21rpx;
+}
+.more-btn {
+  line-height: 77rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #0B898E;
+  font-size: 31rpx;
+  font-weight: 500;
+}
+/* .pic-list {
+  display: flex;
+  justify-content: space-between;
+  margin: 60rpx 0;
+}
+.pic-list image {
+  width: 155.33rpx;
+  height: 200rpx;
+  display: block;
+} */
+/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
+.pic-list {
+  /* width: 100%;
+  display: flex;
+  margin-right: 26rpx;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap; */
+    display: flex;
+    justify-content: space-between;
+    margin: 0 28rpx;
+}
+.title-more {
+  font-size: 24rpx;
+  /* color: #0B898E; */
+  /* 元旦修改 */
+  color: #54504D;
+  z-index: 9;
+  width: 173rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 20rpx;
+  text-align: center;
+}
+.title-more .iconfont {
+  font-size: 22rpx;
+}
+.slide-out-box {
+  /* margin-top: 20rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
+  border-radius: 27rpx;
+  padding-bottom: 1rpx;
+  /* margin-bottom: 40rpx; */
+}
+.pbservice {
+  width: calc(160rpx * 8);
+  display: flex;
+  margin-top: 5rpx;
+  /* flex-wrap: wrap; */
+  flex-wrap: nowrap;
+  /* padding-left: 12rpx; */
+  /* overflow-x: scroll; */
+}
+.pbservice-item {
+  width: 106rpx;
+  margin-bottom: 25rpx;
+  margin-right: 32.33rpx;
+  text-align: center;
+  font-size: 27rpx;
+  color: #000;
+  line-height: 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.text {
+  width: 200rpx;
+}
+.pbservice-item image {
+  /* width: 60rpx;
+  margin-bottom: 20rpx;
+  margin-top: 50rpx; */
+  /* 元旦修改 以上都是之前的*/
+  width: 80rpx;
+  margin-bottom: 10rpx;
+}
+.six-box {
+  margin-top: 43rpx;
+  display: flex;
+  margin-bottom: 50rpx;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.six-box image {
+  width: 128rpx;
+  height: 110rpx;
+  margin-bottom: 20rpx;
+}
+.hot-list {
+  display: flex;
+  margin-top: 47rpx;
+  justify-content: space-between;
+}
+.hot-list-item {
+  width: 337rpx;
+}
+.hot-item {
+  background: white;
+  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 15rpx;
+  margin-bottom: 35rpx;
+}
+.hot-item image:nth-child(1) {
+  display: block;
+  width: 100%;
+  border-radius: 15rpx 15rpx 0 0;
+}
+.hot-item .hot-info {
+  padding: 20rpx 25rpx;
+}
+.hot-item .hot-title {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 500;
+}
+.hot-info .tags {
+  display: flex;
+  align-items: center;
+  width: 286rpx;
+  margin: 15rpx 0;
+}
+.hot-info .tag {
+  margin-right: 16rpx;
+  line-height: 32rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 5rpx;
+  box-sizing: border-box;
+  padding: 0 10rpx;
+  color: #0B898E;
+  font-size: 20rpx;
+}
+.hot-info .tag:last-child {
+  margin-right: 0;
+}
+.hot-price {
+  color: #D62828;
+  font-size: 24rpx;
+  margin-top:28rpx;
+
+}
+.hot-price text:nth-child(2){
+  font-size: 33rpx;
+  font-weight: 500;
+}
+.hot-price text:nth-child(3){
+  font-size: 20rpx;
+  color: #8D8D8D;
+  margin-left: 4rpx;
+}
+.hot-location {
+  position: absolute;
+  color: #fff;
+  line-height: 32rpx;
+  font-size: 19rpx;
+  padding: 20rpx;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.hot-location .iconfont {
+  font-size: 22rpx;
+  margin-right: 10rpx;
+}
+.hot-info .tags .icon-box {
+  flex-shrink: 0;
+  width: 50%;
+  text-align: left;
+  color: #666666;
+  font-size: 21rpx;
+  display: flex;
+  align-items: center;
+}
+.hot-info .tags .icon-box .iconfont {
+  font-size: 30rpx;
+  margin-right: 5rpx;
+}
+.today-hot {
+  position: relative;
+  border-radius: 15rpx;
+  font-size: 0;
+  overflow: hidden;
+}
+.today-hot .today-main-img {
+  border-radius: 15rpx;
+  height: 615rpx;
+}
+.today-hot-box {
+  position: absolute;
+  left: 10rpx;
+  right: 10rpx;
+  bottom: 10rpx;
+}
+.today-hot-tag {
+  line-height: 34rpx;
+  max-width: 265rpx;
+  background: #FF2245;
+  border-radius: 15rpx 15rpx 0px 0px;
+  padding: 0 15rpx;
+  color: #fff;
+  font-size: 20rpx;
+  display: inline-block;
+  margin: 0 40rpx;
+}
+.today-hot-title {
+  background: rgba(255, 255, 255, 0.8);
+  padding: 20rpx 28rpx;
+  border-radius: 13rpx;
+  font-size: 33rpx;
+  color: #000;
+  font-weight: 500;
+
+}
+.today-hot .today-tip-img {
+  position: absolute;
+  width: 154rpx;
+  left: 11rpx;
+  top: 31rpx;
+}
+.today-date {
+  position: absolute;
+  top: 65rpx;
+  left: 11rpx;
+  width: 154rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #fff;
+  letter-spacing: 3rpx;
+  font-weight: 500;
+}
+.title-header .icon-fanhui1 {
+  display: none;
+}
+.more-btn-text {
+  text-align: center;
+  /* color: #0b898e;
+  font-size: 27rpx;
+  width: 200rpx;
+  line-height: 65rpx;
+  border: 1px solid #0b898e;
+  border-radius: 33rpx; */
+  margin: 20rpx auto;
+  width: 200rpx;
+  height: 67rpx;
+  line-height: 67rpx;
+  border: 1px solid #111;
+  border-radius: 35rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+}
+.scroll-line {
+  /* height: 6rpx;
+  border-radius: 3rpx;
+  background: #ccc;
+  overflow: hidden;
+  margin: 30rpx auto; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  width: 48rpx !important;
+  height: 8rpx;
+  /* background: #DDCEAC; */
+  background: #fff;
+  border-radius: 4rpx;
+  margin: 15rpx auto 10rpx;
+}
+.scroll-line-bg {
+  height: 8rpx;
+  background: #FF4848;
+  border-radius: 4rpx;
+}
+/* 元旦修改  新增样式 */
+.scroll-line-bg2 {
+  margin-left: 24rpx;
+  background: #078565;
+  height: 8rpx;
+  border-radius: 4rpx;
+}
+.nomore-tip-btn {
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 78rpx;
+  bottom: 0;
+}
+.prize-tip-text {
+  width: 267rpx;
+  display: block;
+  top: 39rpx;
+  left: 134rpx;
+  position: absolute;
+}
+.prize-name {
+  position: absolute;
+  text-align: center;
+  left: 132rpx;
+  right: 132rpx;
+  top: 169rpx;
+  font-size: 31rpx;
+  color: #333333;  
+}
+.prize-img {
+  width: 333rpx;
+  height: 240rpx;
+  border-radius: 13rpx;
+  overflow: hidden;
+  position: absolute;
+  left: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 269rpx;
+}
+.prize-img image {
+  display: block;
+  width: 333rpx;
+  height: 240rpx;
+}
+.btn-box {
+  position: absolute;
+  width: 400rpx;
+  height: 87rpx;
+  left: 67rpx;
+  bottom: 78rpx;
+  text-align: center;
+  line-height: 87rpx;
+}
+.btn-box image {
+  display: block;
+  width: 100%;
+}
+.btn-box navigator,.btn-box view {
+  color: #fff;
+  font-size: 35rpx;
+  font-weight: bold;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 1;
+  right: 0;
+}
+.prize-coupon {
+  width: 293rpx;
+  height: 227rpx;
+  position: absolute;
+  top: 274rpx;
+  left: 120rpx;
+  color: #fff;
+  font-size: 24rpx;
+  text-align: center;
+}
+.prize-coupon image {
+  display: block;
+  width: 100%;
+}
+.prize-coupon-money {
+  position: absolute;
+  left: 0;
+  right: 0;
+  font-size: 80rpx;
+  font-weight: bold;
+  line-height: 110rpx;
+  top: 12rpx;
+}
+.prize-coupon-money::before{
+  content: "￥";
+  font-size: 32rpx;
+}
+.prize-coupon-tip {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 120rpx;
+}
+.other-plats {
+  display: flex;
+  font-size: 25rpx;
+  text-align: center;
+  margin-bottom: 30rpx;
+  color: #333333;
+  line-height: 42rpx;
+  flex-wrap: wrap;
+  background: #FFFED6;
+  justify-content: space-around;
+  height: 187rpx;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  align-items: center;
+}
+.other-plats image {
+  width: 80rpx;
+  display: block;
+  height: 80rpx;
+  margin-bottom: 15rpx;
+}
+.other-plat {
+  /* 春节新增样式 */
+  color: #54504D;
+}
+.other-plat:nth-child(4n){
+  margin-right: 0;
+}
+.old-btn {
+  position: fixed;
+  left: 0;
+  top: 170rpx;
+  writing-mode:tb-rl;
+  margin-top: 142rpx;
+  color: #0B898E;
+  font-size: 29rpx;
+  width: 64rpx;
+  height: 140rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  letter-spacing: 3rpx;
+  background: rgba(255, 255, 255, 0.7);
+  box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3);
+  border-radius: 0 13rpx 13rpx 0;
+  font-weight: 500;
+  z-index: 1;
+}
+.top-bg-img {
+  display: block;
+  width: 100%;
+  position: absolute;
+  left: 0;
+}
+.dot-list {
+  display: flex;
+  position: absolute;
+  right: 43rpx;
+  bottom: 15rpx;
+}
+.dot {
+  width: 11rpx;
+  height: 11rpx;
+  background: #FFFFFF;
+  opacity: 0.4;
+  border-radius: 50%;
+  margin-left: 8rpx;
+}
+.dot.active {
+  opacity: 1;
+}
+.sm-dot-list {
+  left: 0;
+  justify-content: center;
+  bottom: 11rpx;
+}
+.sm-dot-list .dot {
+  width: 7rpx;
+  height: 7rpx;
+}
+.sm-dot-list .dot:nth-child(1){
+  margin-left: 0;
+}
+.sm-dot-list .dot.active {
+  width: 20rpx;
+  height: 7rpx;
+  border-radius: 3rpx;
+}
+/* 弹窗广告 */
+.zzc{
+  background: gray;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  width:100%;
+  height: 100%;
+  z-index: 998;
+  filter: alpha(opacity=80);
+  opacity: 0.8 !important;
+}
+.alertavd{
+  width: 500rpx;
+  height: 700rpx;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-250rpx,-300rpx);
+  z-index: 999;
+
+}
+.alertsp{
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+}
+.fullavd{
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  width:100%;
+  height: 100%;
+  z-index: 1001;
+  background-color: #fff;
+  opacity: 1;
+  transition: all 1s;
+  
+}
+.fullsp{
+  width: 100%;
+  height: 100%;
+}
+.time{
+  width: 150rpx;
+  height: 60rpx;
+  background-color: #fff;
+  color: #000;
+  position: absolute;
+  left: 20rpx;
+  top: 120rpx;
+  border-radius:6rpx ;
+  text-align: center;
+  line-height: 60rpx;
+  z-index: 1002;
+}
+
+/* 元旦修改新增样式 */
+.xpth {
+  /* width: 697rpx; */
+  /* height: 462rpx; */
+  /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
+  border-radius: 20rpx;
+  padding: 22.67rpx 0 15.33rpx 0;
+  position: relative;
+  flex-direction: column;
+}
+/* 元旦修改新增样式 */
+.time-box {
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  /* color: #54504D; */
+  color: #000000;
+  display: flex;
+  align-items: center;
+  height: 37px;
+  margin-left: -50rpx;
+  z-index: 9;
+  flex-wrap: nowrap;
+}
+/* 元旦修改新增样式 */
+.xsth-time {
+  /* margin: 0 5rpx; */
+  /* width: 50rpx; */
+  /* height: 33rpx; */
+  width: 43rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  background: #4AB648;
+  /* background: #F9F1DB; */
+  /* border-radius: 5rpx; */
+  border-radius: 13rpx;
+  font-size: 25rpx;
+  font-family: DIN;
+  font-weight: 500;
+  /* color: #D62828; */
+  color: white;
+  text-align: center;
+  /* line-height: 33rpx; */
+}
+.time-box text {
+  width: 18rpx;
+  text-align: center;
+}
+/* 元旦修改新增样式 */
+.xpth-left {
+  width: 393rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+/* 元旦修改新增样式 */
+.xsth-title {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  align-items: flex-end;
+  margin-bottom: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xsth-more {
+  margin-top: 19.33rpx;
+  font-size: 27rpx;
+  font-family: HYZhongYuan;
+  font-weight: normal;
+  color: #FFE7C0;
+}
+/* 元旦修改新增样式 */
+.xsth-more image {
+  margin-left: 14.67rpx;
+  width: 12.67rpx;
+  height: 22.67rpx;
+  vertical-align: middle;
+}
+/* 元旦修改新增样式 */
+.yanhua {
+  height: 104rpx;
+  width: 104rpx;
+  position: absolute;
+  right: 120rpx;
+  z-index: 999;
+}
+/* 元旦修改新增样式 */
+.xpth-product {
+  /* position: absolute; */
+  width: 697rpx;
+  height: 373rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  border-radius: 27rpx;
+  padding: 25rpx 15rpx;
+  box-sizing: border-box;
+  /* left: 0;
+  bottom: 15.33rpx;
+  /* width: 710rpx; */
+  display: flex;
+  justify-content: space-between; 
+}
+/* 元旦修改新增样式 */
+.xpth-banner {
+  /* width: 270rpx; */
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
+  /* background-size: 100% 100%; */
+  border-radius: 20rpx;
+  flex: 1;
+  margin-left: 15rpx;
+  /* padding: 4rpx;
+  background: #72674e;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  height: 319rpx;
+}
+.xpth-banner image {
+  /* width: 270rpx; */
+  flex: 1;
+  height: 319rpx;
+  border-radius: 20rpx;
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  /* border-radius: 20rpx; */
+}
+/* 元旦修改新增样式 */
+.xpth-item {
+  /* width: 413rpx;
+  height: 160rpx; */
+  /* background: #FFFFFF; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%; */
+  border-radius: 20rpx;
+  height: 153rpx;
+  background: #FFFFFF;
+  display: flex;
+  margin-bottom: 13rpx;
+  /* margin-bottom: 10rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
+  /* padding: 5rpx; */
+}
+.xpth-item:last-child {
+  margin-bottom: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item image {
+  /* width: 160rpx;
+  height: 160rpx;
+  background: #FFE7C0;
+  border-radius: 15rpx 0 0 15rpx; */
+  width: 157rpx;
+  height: 154rpx;
+  background: #72707D;
+  border-radius: 20rpx;
+  /* margin-right: 15.33rpx; */
+  flex-shrink: 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-content {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  /* background: #FBECDE; */
+  padding-left: 15.33rpx;
+  border-radius: 0 15rpx 15rpx 0;
+}
+/* 元旦修改新增样式 */
+.xpth-item-title {
+  width: 230rpx;
+  font-size: 27rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  margin-right: 18rpx;
+  /* height: 80rpx; */
+}
+.xpth-tag {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #E5A54A;
+}
+/* 元旦修改新增样式 */
+.xpth-item-bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-right: 13.33rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price {
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #D62828;
+}
+/* 元旦修改新增样式 */
+.xpth-item-price::before {
+  content: "￥";
+  font-size: 20rpx;
+}
+/* 元旦修改新增样式 */
+.xpth-item-buy {
+  width: 111rpx;
+  height: 36rpx;
+  background: linear-gradient(180deg, #FF9B6A, #E63100);
+  border-radius: 18rpx;
+  font-size: 21rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFE7C0;
+  text-align: center;
+  line-height: 36rpx;
+}
+/* 元旦修改新增样式 */
+.new-pic {
+  width: 160rpx !important;
+  height: 255rpx !important;
+  /* margin-bottom: 26.67rpx; */
+}
+
+
+.ggfw {
+  width: 132rpx;
+  margin:0 22rpx;
+}
+.ggfw image{
+  margin-bottom: 16.67rpx;
+  width: 113.33rpx !important;
+  height: 113.33rpx !important;
+}
+
+.six-box-new {
+  width: 697rpx;
+  /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
+  border-radius: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 13.33rpx;
+  overflow: scroll;
+  margin-bottom: 53.33rpx;
+  z-index: 1;
+  position: relative;
+}
+
+.six-box-new image {
+  width: 440rpx;
+  height: 213.33rpx !important;
+  /* background: #FFE7C0; */
+  border-radius: 20rpx;
+  flex-shrink: 0;
+  margin-right: 13.33rpx;
+}
+/* 春节金刚区字体颜色样式更换 */
+.top-icon-text {
+  color: #54504D;
+}
+
+.rmtj-right {
+  /* width: 313.33rpx;
+  height: 154rpx; */
+  width: 240rpx;
+  height: 66rpx;
+  position: absolute;
+  right: -22rpx;
+  right: 0;
+  z-index: 2;
+  /* top: -20rpx; */
+}
+
+.Qtop{
+  width: 100%;
+}
+.Qtop img{
+  width: 100%;
+}
+.miao{
+  position: fixed;
+  top: 100rpx;
+  background: antiquewhite;
+  margin: 18rpx;
+  width: 129rpx;
+  height: 63rpx;
+  background: rgba(17, 17, 17, 0.1);
+  text-align: center;
+  border-radius: 13rpx;
+  line-height: 63rpx;
+}
+.topBox {
+    /* display: flex;
+    padding-top: 120rpx;
+    padding-left: 20rpx; */
+}
+.jumpBox {
+    color: #000;
+    background: rgba(255,255,255, 0.911);
+    display: flex;
+    align-items: center;
+    border-radius: 10rpx;
+    padding: 10rpx 20rpx;
+    position: fixed;
+    top: 150rpx;
+    left: 20rpx;
+}
+.time{
+  padding-right: 10rpx;
+}
+
+.muteImg {
+	width: 62rpx;
+	height: 62rpx;
+	position: absolute;
+	top: 194rpx;
+	right: 38rpx;
+}
+.logoImg {
+	width: 464.67rpx;
+	height: 342.67rpx;
+	position: absolute;
+	top: 406rpx;
+	left: 142rpx;
+}
+.btnImg {
+	width: 296.67rpx;
+	height: 79.33rpx;
+	position: absolute;
+	left: 226rpx;
+	bottom: 208rpx;
+}
+.playImg {
+	position: absolute;
+	width: 31.33rpx;
+	height: 38rpx;
+	left: 56.67rpx;
+	bottom: 64rpx;
+}
+
+.right-more {
+  width: 120rpx;
+  height: 47rpx;
+  background-color: rgba(255,255,255,.3);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 47rpx;
+}
+
+.hdrlNavList {
+  display: flex;
+  margin: 28rpx 26.67rpx 10rpx;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+}
+.hdrlNav {
+  flex-shrink: 0;
+  /* width: 160rpx; */
+  padding: 0 20rpx;
+  height: 53rpx;
+  background: rgba(255,250,245,0.3);
+  border-radius: 13rpx;
+  border: 1px solid #FFFFFF;
+
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 53rpx;
+  margin-right: 14rpx;
+}
+.hdrlNavActive {
+  background: linear-gradient(180deg, #FFFAF5, #FFE3C2);
+  font-size: 32rpx;
+  color: #FF4848;
+  border: none;
+}
+.hdrlItem {
+  flex-shrink: 0;
+  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
+  /* width: 593.33rpx; */
+  display: flex;
+  background: url("https://static.ticket.sz-trip.com/uploads/20240923/d4c9e6e558796b0ff89726d0857a5d03.png");
+  background-size: 100% 100%;
+}
+.hdrlItem-img {
+  width: 280rpx;
+  height: 213rpx;
+  background: #8C8C8C;
+  border-radius: 13rpx;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+}
+.hdrlItem-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 213rpx;
+}
+.hdrlItem-title {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 15.33rpx;
+}
+.hdrlItem-date {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #000000;
+  margin-bottom: 19.33rpx;
+}
+
+.main-box {
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
+  background-size: 100% 100%;
+  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
+  margin: 0 8rpx;
+}
+.main-box-top {
+  display: flex;
+  margin-bottom: 5.33rpx;
+}
+.gfyj,.sslk {
+  width: 369.33rpx;
+  height: 146rpx;
+  flex-shrink: 0;
+}
+.sslk {
+  margin-left: -48rpx;
+}
+
+.movieItem {
+  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+  flex-shrink: 0;
+  height: 206.67rpx;
+}
+.movieItem-img {
+  width: 213rpx;
+  height: 213rpx;
+  border-radius: 18rpx;
+  margin-right: 18rpx;
+  flex-shrink: 0;
+}
+.ysz-box {
+    margin: 0 8rpx 15.33rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
+    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
+    background-size: 100% 100%;
+    width: 733.33rpx;
+    height: 320rpx;
+    padding-top: 33.33rpx;
+}
+.ysz-more {
+    width: 267rpx;
+    height: 53rpx;
+    background: #FFFFFF;
+    border-radius: 27rpx;
+    margin: 38rpx auto 0;
+    text-align: center;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 25rpx;
+    color: #320000;
+}
+.ysz-box2 {
+  /* padding: 20rpx 35rpx; */
+  padding-top: 23.33rpx;
+}
+.tjbd-title {
+  width: 286.67rpx;
+  height: 80rpx;
+}
+
+.bd-box {
+  position: relative;
+  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
+  margin-left: 26.67rpx;
+  width: 582rpx;
+  /* height: 1133rpx; */
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  border-radius: 20rpx 80rpx 20rpx 20rpx;
+}
+.bd-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+  position: relative;
+}
+.zz {
+    width: 236.67rpx;
+    height: 206.67rpx;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 2;
+}
+.bd-type {
+  width: 125.33rpx;
+  height: 38.67rpx;
+}
+.bd-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #320000;
+  z-index: 9;
+  text-align: center;
+  line-height: 47rpx;
+}
+.bd-index {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #000000;
+}
+.bd-item {
+  margin-left: 45.33rpx;
+  width: 453rpx;
+  height: 147rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  display: flex;
+}
+.bd-item-img {
+    width: 147rpx;
+    height: 147rpx;
+    background: #D9D9D9;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.bd-item-content {
+    padding: 14rpx 29.33rpx 13.33rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.bd-item-title {
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+}
+.bd-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    width: 260rpx;
+}
+.bd-price {
+    font-size: 29.33rpx;
+    color: #F93434;
+    font-weight: bold;
+}
+.bd-price:after {
+  content:'起';
+  color: #999999;
+  font-size: 23rpx;
+  font-weight: 700;
+}
+.bd-price::before {
+  content:'￥';
+  font-size: 23rpx;
+}
+.bd-distance {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #999999;
+}
+
+.buyMovie {
+    width: 160rpx;
+    height: 56rpx;
+    background: #078565;
+    color: #fff;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 56rpx;
+}
+
+.bg1 {
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+}
+.bg2 {
+  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
+}
+.bg3 {
+  background: linear-gradient(180deg, #E0F7DC, #A0F292);
+}
+.bg4 {
+  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
+}
+
+.hdrlNavList::-webkit-scrollbar{
+  display:none;
+}
+.hdrlList::-webkit-scrollbar{
+  display:none;
+}
+.bottom-box::-webkit-scrollbar{
+  display:none;
+}
+.slide-box::-webkit-scrollbar{
+  display:none;
+}
+.pbservice::-webkit-scrollbar{
+  display:none;
+}
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}
+.public-box {
+  width: 593.33rpx;
+  height: 266.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.one::-webkit-scrollbar{
+  display:none;
+}
\ No newline at end of file

From c06705afe700114fb8fe98f68be05ff16f192688 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 23 Sep 2024 17:10:44 +0800
Subject: [PATCH 213/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.wxss                       |  4 ++++
 pages/index/index.js           | 34 +++++++++++++++++++---------------
 pages/index/index.wxml         | 24 ++++++++++++------------
 pages/index/index.wxss         | 13 ++++++++-----
 project.private.config.json    |  8 ++++----
 subPackages/indexGQ/index.wxml |  2 +-
 subPackages/indexGQ/index.wxss |  2 +-
 7 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/app.wxss b/app.wxss
index cdecea9..779e439 100644
--- a/app.wxss
+++ b/app.wxss
@@ -140,6 +140,10 @@ page{
   background-repeat: no-repeat;
   margin: 0 auto;
 }
+
+.no-scrollbar::-webkit-scrollbar{
+    display: none;
+}
 /* page {
   filter: grayscale(100%);
 } */
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 4cc4882..068d161 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -98,14 +98,14 @@ Page({
     bdList:[
         {
             bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游
-            url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
-            path:'',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点
+            url:'',
+            path:'/pages/list/scene/index',
         },
         {
             bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可
-            path:'/pages/list/scene/index',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品
+            path:'/pages/list/night/index',
             url:'',
         },
         {
@@ -123,10 +123,13 @@ Page({
       
       
     ],
-    list1:[], //非玩-景点
-    list2:[], //非买-文创
-    list3:[], //非游-一日游
-    list4:[], //非看-剧场演出
+    list1:[], //游-景点
+    list2:[], //非晚-夜游
+    list3:[], //非看-剧场演出
+    list4:[], //非买-文创
+    
+   
+    
 	},
 	onLoad: function(options) {
 		this.getHeight()
@@ -247,7 +250,7 @@ Page({
   },
   getList() {
     let bdList = this.data.bdList
-    // 非玩不可--景点
+    // 游--景点
     commonApi._post("scene/get_scene_by_tag",{
       tag_id:"4",
       limit:6,
@@ -258,6 +261,7 @@ Page({
       title:'',
       area_id:''
     }).then(res=>{
+        console.log('景点', res)
       res.data.list.map(item => {
         if (item.distance || item.distance == 0) {
           if (item.distance >= 1000) {
@@ -278,19 +282,19 @@ Page({
       limit: 6,
     }).then(res=>{
       this.setData({
-        list2:res.data.list
+        list4:res.data.list
       })
     })
     // 非游不可--线路一日游
     commonApi._post('product/get_product_by_tag',{
-      type_id: 23,
-      tag_id:17,
+    //   type_id: 23,
+      tag_id: "10,11,12",
       offset: 0,
       limit: 6,
       sort: 'weight'
     }).then(res=>{
       this.setData({
-        list3:res.data.list
+        list2:res.data.list
       })
     })
     // 非看不可--剧场演出
@@ -305,7 +309,7 @@ Page({
       title:''
     }).then(res=>{
       this.setData({
-        list4:res.data.list
+        list3:res.data.list
       })
     })
   },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ad62e9a..f1d6541 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -20,14 +20,14 @@
 </view>
 <view style="position:relative;z-index: 1;" >
   <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
-    <block wx:for="{{banner}}" wx:key="this">
+    <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
   <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
   </view>
 </view>
 <view class="content">
@@ -43,9 +43,9 @@
   </view>
   <view wx:if="{{hdrlNavIndex!=4}}">
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
         <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
             <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
@@ -56,7 +56,7 @@
   </view>
   <view wx:else>
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
         <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
           <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
           <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
@@ -80,8 +80,8 @@
     </view>
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx;width: fit-content;">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
@@ -127,14 +127,14 @@
   <view class="small-swiper-box">
     <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
       bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="*this">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
           <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
     <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
     </view>
   </view>
   <!-- 游苏州 -->
@@ -150,7 +150,7 @@
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoPath" data-event="security_home_click" data-title="电子社保卡" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view>
@@ -201,7 +201,7 @@
   <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
+  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="index">
     <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
     <view class="bd-top">
       <image class="bd-type" src="{{item.icon}}" mode=""/>
@@ -235,7 +235,7 @@
             </view>
             <view class="bd-item-bottom">
               <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance)}}</view>
             </view>
           </view>
         </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 69871b7..1f87819 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1040,10 +1040,13 @@ page {
   /* margin-bottom: 26.67rpx; */
 }
 
-
+.ggfw-list{
+    display: flex;
+    justify-content: space-around;
+}
 .ggfw {
-  width: 132rpx;
-  margin:0 22rpx;
+  width: auto;
+  margin:0;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
@@ -1182,7 +1185,7 @@ page {
   height: 53rpx;
   background: rgba(255,250,245,0.3);
   border-radius: 13rpx;
-  border: 1px solid #FFFFFF;
+  /* border: 1px solid #FFFFFF; */
 
   font-size: 32rpx;
   color: #FFFFFF;
@@ -1396,7 +1399,7 @@ page {
 .buyMovie {
     width: 160rpx;
     height: 56rpx;
-    background: #078565;
+    background: #FF4848;
     color: #fff;
     border-radius: 20rpx;
     text-align: center;
diff --git a/project.private.config.json b/project.private.config.json
index e52bcf5..8591e8c 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,15 +7,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "subPackages/index/index",
+          "name": "subPackages/indexs/index",
+          "pathName": "subPackages/indexs/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "subPackages/indexs/index",
-          "pathName": "subPackages/indexGQ/index",
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "subPackages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index ad62e9a..f36a82d 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -150,7 +150,7 @@
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoPath" data-event="security_home_click" data-title="电子社保卡" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view>
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
index 69871b7..66c98e6 100644
--- a/subPackages/indexGQ/index.wxss
+++ b/subPackages/indexGQ/index.wxss
@@ -1396,7 +1396,7 @@ page {
 .buyMovie {
     width: 160rpx;
     height: 56rpx;
-    background: #078565;
+    background: #FF4848;
     color: #fff;
     border-radius: 20rpx;
     text-align: center;

From bc3f5f80d853ae9c781ba8aa3ab91d0808f11e16 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 24 Sep 2024 09:19:24 +0800
Subject: [PATCH 214/471] 1

---
 app.js                          | 2 +-
 pages/user/suggest/suggest.wxml | 1 +
 pages/user/suggest/suggest.wxss | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 8daa8ad..2d8e4ba 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.isTest148? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/suggest/suggest.wxml b/pages/user/suggest/suggest.wxml
index 29a54e9..7b1e37a 100644
--- a/pages/user/suggest/suggest.wxml
+++ b/pages/user/suggest/suggest.wxml
@@ -2,6 +2,7 @@
 <view class="container-view">
     <view>
         <title-header title="投诉建议"></title-header>
+        <!-- <view class="tips">此投诉为本小程序自有投诉渠道，非微信官方投诉渠道</view> -->
         <view class="input-box">
             <view class="input-item">
             <text class="input-label">姓名:</text>
diff --git a/pages/user/suggest/suggest.wxss b/pages/user/suggest/suggest.wxss
index 21bc86b..73b18cd 100644
--- a/pages/user/suggest/suggest.wxss
+++ b/pages/user/suggest/suggest.wxss
@@ -82,4 +82,12 @@ page {
 
         text-align: left;
 
+  }
+
+  .tips{
+    background-color: #fdf6ec;
+    color: #e6a23c;
+    font-size: 26rpx;
+    text-align: center;
+    padding: 20rpx;
   }
\ No newline at end of file

From 487c179bc7e84ebe07bff3f470335648f4920851 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 24 Sep 2024 16:56:32 +0800
Subject: [PATCH 215/471] =?UTF-8?q?=E5=9B=BD=E5=BA=86=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                        |  2 +-
 pages/index/index.js          | 43 ++++++++++++++-----
 pages/index/index.wxml        | 81 ++++++++---------------------------
 pages/index/index.wxss        |  5 ++-
 pages/list/six/index.js       |  8 ++++
 pages/list/six/index.wxml     |  4 +-
 pages/pbService/index.wxml    |  4 +-
 project.private.config.json   | 12 +++---
 subPackages/index/index.wxml  |  4 +-
 subPackages/indexs/index.wxml |  2 +-
 10 files changed, 75 insertions(+), 90 deletions(-)

diff --git a/app.js b/app.js
index 2d8e4ba..8daa8ad 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.isTest149? true : false;
+      data.isTest = data.isTest148? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 068d161..79b0978 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -101,24 +101,32 @@ Page({
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点
             url:'',
             path:'/pages/list/scene/index',
+            list: [],
+            
         },
         {
             bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品
             path:'/pages/list/night/index',
             url:'',
+            list: [],
+            
         },
         {
             bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
             url:'',
             path:'/pages/list/theatre/index',
+            list: [],
+            
         },
         {
             bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
-            path:'/pages/list/techan/index',
+            path:'/subPackages/techanNew/index',
             url:'',
+            list: [],
+            
         },
       
       
@@ -242,11 +250,11 @@ Page({
     this.getWeather()
   },
   gobdDetail(e) {
-    console.log(e);
-    let url = e.currentTarget.dataset.url
-    wx.navigateTo({
-      url: url
-    })
+    let item = e.currentTarget.dataset.item
+    // wx.navigateTo({
+    //   url: url
+    // })
+    util.gotoDetail(item)
   },
   getList() {
     let bdList = this.data.bdList
@@ -261,7 +269,7 @@ Page({
       title:'',
       area_id:''
     }).then(res=>{
-        console.log('景点', res)
+      console.log('景点', res)
       res.data.list.map(item => {
         if (item.distance || item.distance == 0) {
           if (item.distance >= 1000) {
@@ -271,8 +279,10 @@ Page({
           }
         }
       })
+      bdList[0].list = res.data.list
       this.setData({
-        list1:res.data.list
+        list1:res.data.list,
+        bdList: bdList
       })
     })
     // 非买不可--文创
@@ -281,8 +291,10 @@ Page({
       offset: 0,
       limit: 6,
     }).then(res=>{
+        bdList[3].list = res.data.list
       this.setData({
-        list4:res.data.list
+        list4:res.data.list,
+        bdList: bdList
       })
     })
     // 非游不可--线路一日游
@@ -293,8 +305,10 @@ Page({
       limit: 6,
       sort: 'weight'
     }).then(res=>{
+        bdList[1].list = res.data.list
       this.setData({
-        list2:res.data.list
+        list2:res.data.list,
+        bdList: bdList
       })
     })
     // 非看不可--剧场演出
@@ -308,8 +322,10 @@ Page({
       lon:this.data.lon,
       title:''
     }).then(res=>{
+        bdList[2].list = res.data.list
       this.setData({
-        list3:res.data.list
+        list3:res.data.list,
+        bdList: bdList
       })
     })
   },
@@ -373,6 +389,11 @@ Page({
       lon: this.data.lon,
       page_num: 5
     }).then(res => {
+        res.data.rows.forEach(v=>{
+            if (!v.post_url) {
+                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+            }
+        })
       this.setData({
         hdrlList:res.data.rows
       })
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f1d6541..410f917 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -45,7 +45,8 @@
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
         <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/>
+          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
             <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
@@ -58,8 +59,10 @@
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
         <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
+          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
+          
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
             <view>{{item.title}}</view>
             <view style="display: flex;justify-content: flex-end;">
               <view class="buyMovie">去购票 ></view>
@@ -90,7 +93,7 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
             <view class="text">夜游苏州</view>
           </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
             <view class="text">文创特产</view>
           </view>
@@ -111,7 +114,7 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
             <view class="text">一卡游</view>
           </view>
-          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
@@ -155,7 +158,8 @@
           <view>电子社保卡</view>
         </view>
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
@@ -201,14 +205,15 @@
   <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="index">
+  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
     <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
     <view class="bd-top">
-      <image class="bd-type" src="{{item.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
+      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{bdItem}}">更多 ></view>
     </view>
-    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
-      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
+    <view style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
+        wx:key="id" data-item="{{item}}">
         <view class="bd-index">{{index+1}}</view>
         <view class="bd-item">
           <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
@@ -218,63 +223,13 @@
             </view>
             <view class="bd-item-bottom">
               <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance)}}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
+              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
             </view>
           </view>
         </view>
       </view>
     </view>
+
   </view>
  </view>
 
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1f87819..3f8a88e 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -571,7 +571,7 @@ page {
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 24rpx;
-  background: #078565;
+  background: #FF4848;
   height: 8rpx;
   border-radius: 4rpx;
 }
@@ -1208,12 +1208,13 @@ page {
   background-size: 100% 100%;
 }
 .hdrlItem-img {
-  width: 280rpx;
+  width: 240rpx;
   height: 213rpx;
   background: #8C8C8C;
   border-radius: 13rpx;
   flex-shrink: 0;
   margin-right: 12rpx;
+  overflow: hidden;
 }
 .hdrlItem-content {
   display: flex;
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index 574d584..e788f1d 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -37,6 +37,14 @@ Page({
       this.getTypes()
     })
   },
+  gotoUrl: function(e) {
+    let url = e.currentTarget.dataset.url;
+    app.globalData.weburl = url;
+    wx.navigateTo({
+        // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+    })
+},
   gotoPath:function(e){
     console.log(e);
 	if(e.currentTarget.dataset.event.area_key == 'taicang'){
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 8968e3a..9c16788 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -39,10 +39,10 @@
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
-  <navigator url="/pages/pbService/sceneComfort/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
+  <view data-event="comfort_click" data-title="景区舒适度" bindtap="gotoUrl" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="new-icon">
     <image class="green-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon5.png" mode="widthFix"></image>
     <view>景区舒适度</view>
-  </navigator>
+  </view>
   <navigator url="/pages/pbService/bike/index?type=2&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
     <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon6.png" mode="widthFix"></image>
     <view>停车场</view>
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 7201975..7177e64 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -9,8 +9,8 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
-    <view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath"
-      data-path="/pages/pbService/sceneComfort/index">
+    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoUrl"
+    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>高峰预警</view>
     </view>
diff --git a/project.private.config.json b/project.private.config.json
index 8591e8c..0a13832 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,22 +7,22 @@
     "miniprogram": {
       "list": [
         {
-          "name": "subPackages/indexs/index",
-          "pathName": "subPackages/indexs/index",
+          "name": "首页",
+          "pathName": "pages/list/six/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "subPackages/index/index",
+          "name": "subPackages/indexs/index",
+          "pathName": "subPackages/indexs/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "首页",
-          "pathName": "pages/index/index",
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "subPackages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index a8b12df..c6b19ef 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -393,8 +393,8 @@
     <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
         <!-- 元旦修改 ggfw为新增类名 -->
         <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-        <!-- <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度"
-            data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+            data-url="data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
             <view>景区舒适度</view>
         </view> -->
diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml
index b046453..1e3582c 100644
--- a/subPackages/indexs/index.wxml
+++ b/subPackages/indexs/index.wxml
@@ -73,7 +73,7 @@
   <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
       <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
     </view>

From 8bcafe73a749ad796dcf0a1e04760d0c8404f16c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 26 Sep 2024 10:30:11 +0800
Subject: [PATCH 216/471] =?UTF-8?q?=E5=9B=BD=E5=BA=86=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                   |   4 +-
 pages/index/index.wxml                 | 148 +++++++++++++++++++++++--
 pages/index/index.wxss                 |  33 ++++++
 pages/info/postProductInfo/index.js    |  19 ++--
 pages/info/sceneProductInfo/index.js   |   7 +-
 pages/info/sceneProductInfo/index.wxml |   2 +-
 pages/pbService/index.wxml             |   5 +
 pages/search/list/index.js             |   9 ++
 8 files changed, 205 insertions(+), 22 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 79b0978..8c339b2 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -136,7 +136,7 @@ Page({
     list3:[], //非看-剧场演出
     list4:[], //非买-文创
     
-   
+    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
     
 	},
 	onLoad: function(options) {
@@ -287,7 +287,7 @@ Page({
     })
     // 非买不可--文创
     commonApi._post('product/get_product_by_tag',{
-      tag_id: 326,
+        product_model: 'post',
       offset: 0,
       limit: 6,
     }).then(res=>{
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 410f917..ed9f76b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -30,11 +30,17 @@
     <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
   </view>
 </view>
-<view class="content">
+<view class="content" wx:if="{{!isTest}}">
   <!-- 活动日历 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/uploads/20240923/00c7635dd9648e9dc4d0d044c06f495c.png"></image>
+  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20240925/9d10d5ff4a5314573328dd6cdab67b82.png"></image>
     <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+    <view class="nowDate"> 
+        <view class="num">{{nowDate[0]}}</view>
+        <view>月</view>
+        <view class="num">{{nowDate[1]}}</view>
+        <view>日</view>
+    </view>
   </view>
   <view class="hdrlNavList">
     <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
@@ -152,26 +158,32 @@
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
+        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
-        </view>
+        </view> -->
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
          class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
-          <view>实时路况</view>
+        
+        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+            data-path="/pages/pbService/bike/index?type=1">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240925/38ee5d21e1eb4ef2379c3d81edfb3799.png" mode="widthFix"></image>
+            <view>找厕所</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
@@ -233,10 +245,126 @@
   </view>
  </view>
 
+</view>
 
+<view class="content" wx:else>
+    <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" >
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image  data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
+      <image  class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          
+          
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+    </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
+    </view>
+    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
 
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view> -->
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
+    </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" >
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
 </view>
 
+
 <!-- 开屏页 -->
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3f8a88e..d9479c5 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1449,4 +1449,37 @@ page {
 }
 .one::-webkit-scrollbar{
   display:none;
+}
+
+
+.date-container{
+    position: relative;
+}
+.nowDate{
+    display: flex;
+    position: absolute;
+    left: 228.77rpx;
+    bottom: 7.33rpx;
+}
+
+.nowDate>view{
+
+    width: 44rpx;
+    height: 44rpx;
+    border-radius: 7rpx;
+    text-align: center;
+    line-height: 44rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 29rpx;
+    color: #FFFFFF;
+}
+.nowDate .num{
+    background: #FFEBD5;
+    color: #111111;
+
+    font-family: PingFang SC;
+    /* font-weight: bold; */
+    font-size: 29rpx;
+    color: #111111;
 }
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index fd88ffb..3afaff8 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -76,15 +76,18 @@ Page({
 
             let resData = res.data
             if (resData.product_data) {
-                if (resData.product_data["住"]) {
-                    resData.product_data["住"] = JSON.parse(resData.product_data["住"])
-                }
-                if (resData.product_data["游"]) {
-                    resData.product_data["游"] = JSON.parse(resData.product_data["游"])
-                }
-                if (resData.product_data["食"]) {
-                    resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+                for(let key in resData.product_data) {
+                    resData.product_data[key] = JSON.parse(resData.product_data[key])
                 }
+                // if (resData.product_data["住"]) {
+                //     resData.product_data["住"] = JSON.parse(resData.product_data["住"])
+                // }
+                // if (resData.product_data["游"]) {
+                //     resData.product_data["游"] = JSON.parse(resData.product_data["游"])
+                // }
+                // if (resData.product_data["食"]) {
+                //     resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+                // }
             }
 
             this.setData({
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index b9cea87..4b41d22 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -345,6 +345,8 @@ Page({
 
   },
   order: function (e) {
+    console.log(this.data.skuList)
+
     commonApi.user_post("/product/checkStock", {
       sku_id: this.data.skuList[this.data.skuIndex].id,
     }).then(res => {
@@ -793,8 +795,11 @@ Page({
         showPrice:e.currentTarget.dataset.sku.price
       })
     }else {
+        let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id)
+
       this.setData({
-        skuFlag: 'order'
+        skuFlag: 'order',
+        skuIndex: skuIndex,
       })
       this.order()
     }
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index b4c5987..02470b1 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -35,7 +35,7 @@
   <view class="box-top">
     <text>{{item.title}}</text>
   </view>
-  <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku">
+  <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI">
     <view class="skutitle">{{sku.sku_name}}</view>
     <view class="product-box">
       <view class="product-left textOver">
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 7177e64..c21a591 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -24,6 +24,11 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
       <view>找厕所</view>
     </view>
+    <view class="pb-item"  data-title="Suzhou Tour" bindtap="gotoUrl"
+        data-url="https://traveltosuzhou.wglj.suzhou.gov.cn/">
+      <image src="https://m.cloud.sz-trip.com/static/images/serve/isuzhou.png" mode="widthFix"></image>
+      <view>Suzhou Tour</view>
+    </view>
     <view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
       data-path="/pages/pbService/security/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
diff --git a/pages/search/list/index.js b/pages/search/list/index.js
index 5cd8b5e..bc6bd62 100644
--- a/pages/search/list/index.js
+++ b/pages/search/list/index.js
@@ -94,6 +94,15 @@ Page({
       },
       type:item.genre
     },1)
+    // 苏州博物馆跳小程序
+    if([1063163,1062298].includes(item.id)) {
+        wx.navigateToMiniProgram({
+            appId: 'wxfef80ee1ab7e58a2',
+            path: 'pages/index/index'
+        })
+        return
+    }
+
     if(item.type=='travels'){
       // 游记做特殊处理 其他都按照原来的来
       wx.navigateTo({

From a2d7cbdf13aa78eae12c75b44cb00c11dffc7c59 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 15 Oct 2024 16:57:57 +0800
Subject: [PATCH 217/471] =?UTF-8?q?=E7=A7=8B=E5=AD=A3=E9=A6=96=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                       |    8 +-
 images/home.png                |  Bin 3426 -> 3694 bytes
 images/index-selds_1.png       |  Bin 17388 -> 0 bytes
 images/index_seld_2.png        |  Bin 0 -> 5534 bytes
 images/map.png                 |  Bin 6148 -> 6225 bytes
 images/map_seld_2.png          |  Bin 0 -> 7901 bytes
 images/my-selds_1.png          |  Bin 18998 -> 0 bytes
 images/tuyou-selds_1.png       |  Bin 26535 -> 0 bytes
 images/user.png                |  Bin 4390 -> 4465 bytes
 images/user_seld_2.png         |  Bin 0 -> 5879 bytes
 pages/index/index.js           |  849 +++++++++----------------
 pages/index/index.wxml         | 1084 +++++++++++++++++++++-----------
 pages/index/index.wxss         |  579 +++++------------
 project.private.config.json    |    8 +-
 subPackages/indexGQ/index.js   |   71 ++-
 subPackages/indexGQ/index.wxml |  235 ++++---
 subPackages/indexGQ/index.wxss |   49 +-
 17 files changed, 1427 insertions(+), 1456 deletions(-)
 delete mode 100644 images/index-selds_1.png
 create mode 100644 images/index_seld_2.png
 create mode 100644 images/map_seld_2.png
 delete mode 100644 images/my-selds_1.png
 delete mode 100644 images/tuyou-selds_1.png
 create mode 100644 images/user_seld_2.png

diff --git a/app.json b/app.json
index c86da7a..8bba4f0 100644
--- a/app.json
+++ b/app.json
@@ -229,26 +229,26 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999",
-    "selectedColor": "#FF6756",
+    "selectedColor": "#F58812",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/index_seld_1.png",
+        "selectedIconPath": "/images/index_seld_2.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/map_seld_1.png",
+        "selectedIconPath": "/images/map_seld_2.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/user_seld_1.png",
+        "selectedIconPath": "/images/user_seld_2.png",
         "text": "我的"
       }
     ]
diff --git a/images/home.png b/images/home.png
index 0911ce1c4df3be711ac4966fe35892867b1646b5..daff9c315440a9d7cdadfda0b52dbce4c7a8ec44 100755
GIT binary patch
literal 3694
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
M07*qoM6N<$g3svT`Tzg`

literal 3426
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
Ef)7!*wg3PC

diff --git a/images/index-selds_1.png b/images/index-selds_1.png
deleted file mode 100644
index fa7ca9a71bb880cca1a31f5c0c1c77f8d84aa25f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17388
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

diff --git a/images/index_seld_2.png b/images/index_seld_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..99298186d06c97a82076d7edbe4085804da58939
GIT binary patch
literal 5534
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

literal 0
HcmV?d00001

diff --git a/images/map.png b/images/map.png
index 2099fe7a5832b1e16967500d456cf70f60d23bb5..205703a3b73629bdf602fa2a519b358b3b1b33a5 100755
GIT binary patch
literal 6225
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

literal 6148
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
Wf{g1*p|b)20000<MNUMnLSTZa3h?~^

diff --git a/images/map_seld_2.png b/images/map_seld_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb83501da4970f19cb747d05350e027a5f84f48c
GIT binary patch
literal 7901
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
Hu0mjft?Wfn

literal 0
HcmV?d00001

diff --git a/images/my-selds_1.png b/images/my-selds_1.png
deleted file mode 100644
index c5103f629828c28e78faf45e90733ed55ed45db1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18998
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

diff --git a/images/tuyou-selds_1.png b/images/tuyou-selds_1.png
deleted file mode 100644
index b8efcbcdda90f49b893ddc48a91fd3e82889799c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26535
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

diff --git a/images/user.png b/images/user.png
index 1f0b66e5f2d2e524c227ea96b0f422b15b3fce15..0404c5f9b767aeceb1324bb6f5307db6b79d91cf 100755
GIT binary patch
literal 4465
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
D@H?1^

literal 4390
zcmV+>5!vpEP)<h;3K|Lk000e1NJLTq003P8002}71^@s6;C?#`000o}Nkl<ZcwX&Y
z50q5ZdH=rqW@lO01!gHxmj;tI5)~V@nwVn}E2j0&f*Q4MFjC0k&b&9f?phmDs#Ot9
zs}`$q1!msN0>P3$E-E&GjVCc7iAic=qSjPv#KeDLC5b`^2+p5(zn<ToJDz0=?7W$I
zZ%FGs$KyHdefQq)_wM`d_viQBVS1;9jsS-~<2w`59|Y(tR;-v7jYdBrBBwI*`$gnP
zB8rJfQ7N^Ph<>HDepV^<n27w)w(Y{<{B93R&<6(xtzElz9VH?k6_G_E@)yk9R1T0L
z@_VJ!gIeqL(P;GP&d$!)nOVwtHmp8}8|a+PW{=fcf0BqUB%%|DC{iI9Z(-Ln^Mm<(
zeq(QM?{J0V)cmo-26WeT8?@G+R!Ut%M1M*|)+lM;BBGxV(f5ex8Ku;#%)C=;9q~M`
zRVno+M06q%okc{)5$&fo@$7$!$kmSH{720ZtYE;y0`zP)dxX~d1|o7sfxVZAUJ{Wn
zTbA|3cs%~%c=Cw|zLXQS)^TP&kBHtq>Pvy1UovUZq}2-+EcpF+V+Hy5dV|iXRO%$l
zvThfVzZxYdcJ-QKvAD6Pr)Rrg0G2LYs*XD9sAHM=QX*PNMEDZW_7Tw+i0DS!wqN%<
zZms&)6?E5iXEO7BBJv?3Qp}tekyZJ8e);RKzrKChvSqp&L6<IF8ksqB=IlbDa62>O
zr79xI6VcaZ&6+iT&YU^LYR0eh*}8!~Ffh=nwSGuMK4upGJ0iL{m&>i{>+8!^D$s$R
zTf27cRE*2a7ZXvV>9e+}si}A2!i8_va;|d5stf1_gcZzuITi^skC{J1MC*dGv0c}l
zNJKXg(Un95^Ycv+`N!7Q)>KDF2X=pGEp*V0zD+RmzY-CE$cac#YisKlIyySMASHKQ
zcM1{RK}3s<s(Hn-thrrXUH=v2yko}>9rRQx^&V!vpP5e~B2Prt?Ao>KGfS2%*&T-9
z*=+W`TI+u&qCYe9ZHUEUmj(U8N6QvE=$TCBDiOghhaLV4&+{(s?(Tj%48Tisq|@nk
zW`2N(CYVsdd5J{gk+9YfD(L<F{f&){jlU$KHY4DY;o;#ss<l%5f`u@{&Ye56MAT`X
z{XQJ4pw5%Js+V*+y?~kj%`9SDEEYSaqoV`1bLh==U8tAuB5+1TZ!q%(iA3UuVJsxH
zosI*vt*z}FMD%eZ7#x&a!VvOcW@J8}UrR)vAR>6HHzpDZ*z<u0$3g=g2dGjCpYaT4
zev_F`kH_Po>hjUxBV>@tWIjto|71c1Uy4K`&J|Z&5%_@~8tCbC`dnuIG7(KR!K({w
z+kUNHJ00`7t~=L+1^$SLendnawr#%>^qN8gJ(Wtul~Q-ZF%c1%j9s>E?+RMLLyezG
zrA|;veT|6TV}fgQ9mjb#=rx4~dM1;(R%?ATGb28}BA3fuQ)_qMFIa2VteIXY6mXa#
z9K2g8H76dA|J3g|e*1?8y6d{1Bcf|fVC(j6+qPZ5Y}vB91e{7B-Fxr7llJY~hZs97
znS$qeXLNUWKjs%izx_i4J(J1&vxxiy5)90I>(r@JZwS*1JP<G@9s|%n0Pk2S_0f1d
z{(lPe>qTU#u@pWZi^Z0N9cUU0{Hj%}VwPn+N<_1XXfHFLnMfoa_q%ib_782Rr_<?P
zW?pVWtLtO2ShAy|V~^hj*Rp>)oj!({zi!flu%ynhZTn}noZ~=ag$BCox^P0)5z%B3
zc~nIHI+;xVCTIc2v0lznN_~lljv%5Zl~R|KlNPLY&7pz5X3d)83x&eBjeu_u(P_4A
z|Dsv}s(IdZ-6Rp+Wxl?LEX%s0tE+2AHDi|ZY-pe(b=KC_hTJEz_Bc(iNF)+#%2{L(
zeU>j@K56pg$@iF`7t(^a4G$0B5JvDVG|-I)2<zom10oKrkAxN38~fr`u3Y)PNF;(-
z(0hq!m)3egGMU^I#0wrfW~iX|_xDe4Y;1hlq|1;cy3Dri4Pgj6b`IBdLHR)XPKn6R
z8yXru7)IP><SP$bVApk_L$AWzBJ!k&oE!Fm>bfq-Oz=FBz7r8~9LLFog+)C;hxdnc
z89r;UuRfQ{<?aY8BmgpMBobN6%;y`B5$Hk!1LUSqT0KB-U}iW<2njS0(QicLQpa&X
znG3Xmx<^D{9l%MO09`I3mpG2|tw1LpGkEBrWBybsHA5-&5D}efEScekhK6%rdg-NS
zg0db=iVnONs1byhi_E-IM6L^Sm)Aw7mtMN-x~CBl;_FZ|XwNb8-)-Br?VGg@gxz`P
zolVWn&B%w|BqGzzi~f%1d7a5*@})3$d0j!r<k@WYV_Iu?gnx`QnTWh5A~!mYv$|G5
z7_JM{Nt}q9&A3lDG&Iaxym;}ewVKDzICW7kr3D(|(Zz;%G_&;YaLo~kv@Gj|&dyF8
zwtgG0UcI_Gm&?soO8pBnm#BL%Q-4w{78msN^t|AA&|3AcE9ejcz|WX5<17)mo`?Vr
zh@{x{u;;(Z%tOUu@yFfW-6(Szx7~BkJ#CGRjc14mtdn_&^_YhM_<dUITa(G;GcXm$
z9W0;@bqBp9mpNQf5MUeU34eln4zP!r8FB7!=W@AcqS5FpNcADKFn#*;DGdz`?<1m<
znE5a9e-U{X5w(o+Ltr7@0ETeAQ-pQb>0>vNp=kg(WSNdJ&P$~m13MdhmLKHv`5Ugh
z@=EOP!=hCxknhE>UcI`-^Stv!Bod8AhdMhuL5)6OLojN}lqqKu(b<MdJ<Hhi<;)90
z>J!ZTUC;9#wk+#_)pp1lA-v4YQzuNA@W7%)i?)?BcrE&b0(yUc|K!HTM#MQ5LtksH
zmz3jn!_;eOX_@AE9x5r$U}h8#;0u^x)CYL%czH-bJS!qlLErN{@7Iw?<c&iG)3Vv@
znObWExZtck>v`VQ$z&2q>cDk<;Gi48mx)LpGmlhT5YgW!5{dpW1U%TzOsCU$i2xnC
z9}O?=s^Q_`jkWd@#;zey&`kl??WXPrb72>)E*6V7_w@AC#YQdxV3N{{hzKmNl7ogr
z`<7@lnyS!LElc|Z2KxH->nHEsyB7sqT_zdr!S;UZt+$r<_4U=Yx@{EjD5HG8QVOKj
zlgz*GVP<@pcLx>g4+QirTed{DZryqv%rpZybZ>t&8oe>d9aPpfJ3yyYD)lY{JnB$E
zhWece_ug0On1_0<=Aaw154JXl|0AX4ref}<zP`TS1|dW(#>`|gv$WQzgDRC)Lj8Tp
zwr!AJYuaiKdODrHkeNY22Jahyug~Z6JwdCKp`oGaTI(xe;egF_D3nBGpVs;-^XARl
zz|3!#O_~zRheZT5JG2+_`TW_vy}jcW4*Pj4H3dDJ%^rt~5Qyl{jW_woq)C%54Z1=Z
zwCACrp^fG~fpX>FD<aoC{`lkW=y0-;0bH1)v1gchU7=9u?dj>M8AqpPpqqF#s*zEq
zh;g6OS}#f_lRqvOg-ZKv-n{upW_}fpm(MXa<n#H&MHgN4wxb3)cI?>kX=X+h9^&ph
zm^qn9BnEwsebDYT1KoAq9%jB%M51Q4j#w=AU>JPGhaY};w&!`3lqG(B;>3vy=ggV2
zU&%T=;+B?{EHhtbWO;UYc=+UH%a+xo-n1s5r_<@<nHiJ{)P=${T$M;9`f9Z^#v5nT
zrcEa>vu`?_q0}vEZ*Tu!2mHXmz|o%Pfv1Cl0q}IdG`_ADnXRfphdsV$&z`%P8IA_V
z`@Usa7ly%<D!q&#K*!jbOy+NhXuy2Edz4aV)`GuYHR!2S3Vgt?5E0T~J4D2`ZTo>R
z3Z{YvedWrP&6Z`|$IR`<o6g2!vEFLg##Mn1tHE{MFP3y4GjA*u3JYs_(vPQF@b{p0
zI>t_=QXNXE0TZKn-m<LuU0q#Imb0#d^{EPU*L7hUg5M2Yj;e||K{ylR2^b{kD_5>O
z(z2{UlkzKqI^sAEESrj3RiI}wnQw{+k`8c!?r&{vogap^GFI9kLB~0j$z=LO<nw0U
zCv4lsy#^Jxia}4MQYR~=o-lx;>iI;+akf^xk}4hy7<80A!h!)+V-l9BwLYyH|Dz(%
zP2nq2YS$U89vU7VzBK4K^ugXs(4ZSj2E?Rpv&jY>$H9$y6}5^$H>H4xz|BEb8Z$eI
zL;~@az_Ts~k}@RFXNkyvn|oqF3wd{?_kdLddMcIrkWvclETqw1@H}sRcXxN-^_TVB
z=}VU`jkdM5p%M?q1J1BdIF17%tnXG4=$TArzKCFFgM|4l%d$GcbcXyKq#}Z(1TIX2
zg|%Nhlt((YuZb<)Nkk=2`!?IQL4x(&e1mS{<+#0KM4y`s%hh2zLq0&?1s_6d{c&an
zSYYkG-TZ)#htlcvLS_c#FCrqFnE8{HkWVWCJu+j)j6o5(2n(rq?GV<mY15|TkkKE7
zCql9>i^%-BbLakO%a$z@_U+quH}35nbz2?QKID1cqVvx`zpOhNjrU!u#(P|A-BAev
zwGz;w+d!lr$tjxBZa7GFYePdrpw7K0BCY1@+lrmt-roL=Qj!9|@7=riMiD_hD~O~c
zN%BY}^0()lb52>;1P%-goZxvL42a{aIm>*5ZmxtvCgmsySS%K2);qJ0b!^_e87l4;
zt#v^uHE++JJ&%ob)CLC!o12@PuN4s#2D}E<)85{W4OEuZWvG9MtDjCpzcw{fTm0@e
z-=MEuyLLi8pGVMt<Wk98E;l9UR9rbi;jB6R^wVc~o>ypZZ$D^#>d??oW1&zut)Zde
zsrL4EU#tYM)QZL8{a~IE5f13f6N$uE%UR!kXNlhj4Crs)yA_MYBK2_n{jR$f{Z07{
zK)=9TL3Md0)q$1n^tVB`ZQJ)4wE&=AW4Nx1s|CTS2c3I?ZQD3leKp^J8J&(&?h(7U
zsi~>C9{1JylCnmfP51*l9kojU{c^`~;3WELzCj-x9E|SVxf8TwaKh0(5XQ|BzN8AM
z^Idn{HFe^|i6}NkWEGdceJT{44))gb&p-bl5slPgib&FNoOD2P9#+Gq)9DkL8CkMp
zi3oncWtIH;fbX4dJ~32G+-6EuhC~ERsJdQ)7WCUOa`&1Gk{d+iJIEr%<8hddzM5~)
zF?u$e{V*6(hL8iM>(z-w;@*0O0(?nbLFZMgR-K}hLI$bys{^2W-%*Lo6@hLJ(-lMn
zMlRZ~a3OpcS20z9SJjVz%T7e=nHj&a0hRhot@Wwp7N3n>Kt-Tq5b*xYud#rBhL%@K
z^%e?+4c*<{aGuKY@~TE8paBq7+`W7E5uWE=V%WzcMZYLI!_~F6Z9iA()D?qn)XXVb
zYh=nx+-_WI@Q8>!6p2J0ojiH+i+^a2)4Fx*rsZ<Elkvk=_yrjeK|Zwf^FKegEbFsf
zU0t|9v*K12=$JK=$)JP~H;dvE9BH^qS44h`dsLKCsN;D`M4oSIYT911>EYS#-o3j-
z!K+w+N*`=#X;Gf%P4PT$8Z#fQwVut)A2h)%a2UZl9{pQOh$`CKw{QPhwQ0$!L5I-B
zenlxbe&Pl-ocqPCD+T5-cn)9gi=YX{<MC7_hvtD~s0rw$fwAkg*7I<`p@^WEcG_V8
zoZls&Y6SZFr&{YDpkUZ>oR@0__=qO(yQ1;>n+wvWDy6222!37b!%C^yB7#eVTM^4P
z+(0CEYr=vZZ%qgJJBk5t;Nw5gD?lH4%CfAd3x&c?{Q6@hS)p>)QghJDne_jApLam7
g!wz@{^g4k4KY$J^zT))7-T(jq07*qoM6N<$g0(H1p8x;=

diff --git a/images/user_seld_2.png b/images/user_seld_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e6e54cf093c091a4a27239270f140df186eaece
GIT binary patch
literal 5879
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
N002ovPDHLkV1hhMQ8WMm

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index 8c339b2..315ced7 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,6 +4,7 @@ let app = getApp()
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
+import https from "../../utils/https.js"
 Page({
 	data: {
 		banner: [],
@@ -17,9 +18,7 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
-			"gongyeyuanqu", "gaoxin"
-		],
+		
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -34,7 +33,8 @@ Page({
 		prizeInfo: null,
 		otherPlat: null,
 		activeBannerIndex: 0,
-		smBannerIndex: 0,
+        smBannerIndex: 0,
+        XPathBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -48,98 +48,36 @@ Page({
 		showTime: false,
 		xpth: {}, // 元旦新增 新品特惠和sqjNew
 		djs: null, // 元旦新增 新品特惠倒计时
-		djsTime: null,
+        djsTime: null,
+        area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
 		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+            'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
+			'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓
+            'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山
+            'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江
+            'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区
+            'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港
+            'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中
+            'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城
+            'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
+			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
 		],
 		viewHeight: "0px",
 		isMuted: true,
-    videoPlay: false,
-    hdrlNavList:[
-      {
-        type:null,
-        title:'全部'
-      },
-      {
-        type:'scene',
-        title:'景区活动'
-      },
-      {
-        type:'show',
-        title:'演出'
-      },
-      {
-        type:'exhibition',
-        title:'展览'
-      },
-      {
-        type:'movie',
-        title:'电影'
-      },
-      {
-        type:'other',
-        title:'其他'
-      }
-    ], //活动日历板块导航分类
-    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
-    today:null,
-    hdrlList:[],
-    yszNav:['公共服务','旅游助手'],
-    yszIndex:0,
-    bdList:[
-        {
-            bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点
-            url:'',
-            path:'/pages/list/scene/index',
-            list: [],
-            
-        },
-        {
-            bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品
-            path:'/pages/list/night/index',
-            url:'',
-            list: [],
-            
-        },
-        {
-            bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
-            url:'',
-            path:'/pages/list/theatre/index',
-            list: [],
-            
-        },
-        {
-            bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
-            path:'/subPackages/techanNew/index',
-            url:'',
-            list: [],
-            
-        },
-      
-      
-    ],
-    list1:[], //游-景点
-    list2:[], //非晚-夜游
-    list3:[], //非看-剧场演出
-    list4:[], //非买-文创
-    
-    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
-    
+		videoPlay: false,
 	},
 	onLoad: function(options) {
+		console.log('options',options)
+		// 相城小程序跳转获取用户信息
+		if(options && options.szxcCode) {
+			commonApi._post("uservice/user/loginByXC", {
+				code: options.szxcCode
+			}).then(res => {
+				if(res.data && res.data.id && res.data.token) {
+				  https.set_logininfo(res);
+				}
+			})
+		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -151,11 +89,9 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
-					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
-					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -198,21 +134,7 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-    }
-    // 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-    let d = new Date();
-    let month = d.getMonth() + 1,
-      day = d.getDate();
-    month = month > 10 ? month : ("0" + month);
-    day = day > 10 ? day : ("0" + day);
-    this.setData({
-      today: d.getFullYear() + "-" + month + "-" + day
-    })
+		}
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -223,12 +145,10 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-        this.getList()
-        this.getHdrlList()
+				this.getList()
 			},
 			fail: (err) => {
-        this.getList()
-        this.getHdrlList()
+				this.getList()
 			}
 		})
 		this.setData({
@@ -247,251 +167,90 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-    this.getWeather()
-  },
-  gobdDetail(e) {
-    let item = e.currentTarget.dataset.item
-    // wx.navigateTo({
-    //   url: url
-    // })
-    util.gotoDetail(item)
-  },
-  getList() {
-    let bdList = this.data.bdList
-    // 游--景点
-    commonApi._post("scene/get_scene_by_tag",{
-      tag_id:"4",
-      limit:6,
-      lon:this.data.lon,
-      lat:this.data.lat,
-      offset:0,
-      sort:"weight",
-      title:'',
-      area_id:''
-    }).then(res=>{
-      console.log('景点', res)
-      res.data.list.map(item => {
-        if (item.distance || item.distance == 0) {
-          if (item.distance >= 1000) {
-            item.distance = (item.distance / 1000).toFixed(2) + 'km';
-          } else {
-            item.distance = (item.distance).toFixed(2) + 'm';
-          }
-        }
-      })
-      bdList[0].list = res.data.list
-      this.setData({
-        list1:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非买不可--文创
-    commonApi._post('product/get_product_by_tag',{
-        product_model: 'post',
-      offset: 0,
-      limit: 6,
-    }).then(res=>{
-        bdList[3].list = res.data.list
-      this.setData({
-        list4:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非游不可--线路一日游
-    commonApi._post('product/get_product_by_tag',{
-    //   type_id: 23,
-      tag_id: "10,11,12",
-      offset: 0,
-      limit: 6,
-      sort: 'weight'
-    }).then(res=>{
-        bdList[1].list = res.data.list
-      this.setData({
-        list2:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非看不可--剧场演出
-    commonApi._post("product/get_product_by_tag",{
-      tag_id:"6",
-      offset:0,
-      limit:6,
-      sort:'',
-      order:'',
-      lat:this.data.lat,
-      lon:this.data.lon,
-      title:''
-    }).then(res=>{
-        bdList[2].list = res.data.list
-      this.setData({
-        list3:res.data.list,
-        bdList: bdList
-      })
-    })
-  },
-  goDetail(e) {
-    let item = e.currentTarget.dataset.item;
-    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
-    if (type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
-    }else {
-      wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id=' + item.id,
-      })
-    }
-  },
-  // 分类为电影时调这个接口
-  getMovieList() {
-    let service = "Cinema/getHotMovieList";
-		let data = {
-			page: 1,
-			pageSize: 5
-    };
-    commonApi._post(service, data).then(res => {
-      console.log(res.data);
-			this.setData({
-				hdrlList: res.data
-			})
-    })
-    console.log(this.data.hdrlList);
-  },
-  // 推荐榜单更多跳转
-  moreBtn(e) {
-    let item = e.currentTarget.dataset.item
-    if (item.path!='') {
-      wx.navigateTo({
-        url: item.path,
-      })
-    } else {
-      // if (e.currentTarget.dataset.event) {
-      //   this.pagePoint({
-      //     event: e.currentTarget.dataset.event
-      //   }, 1)
-      // }
-      let url = item.url;
-      app.globalData.weburl = url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-      })
-    }
-  },
-  // 活动日历下的列表
-  getHdrlList() {
-    commonApi._post('pbservice/Actcalendar/getActList', {
-      page_no: 1,
-      date: this.data.today,
-      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
-      keywords: '',
-      area_key: '',
-      lat: this.data.lat,
-      lon: this.data.lon,
-      page_num: 5
-    }).then(res => {
-        res.data.rows.forEach(v=>{
-            if (!v.post_url) {
-                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
-            }
-        })
-      this.setData({
-        hdrlList:res.data.rows
-      })
-    })
-  },
-  // 切换活动日历分类
-  changeHdrlNav(e) {
-    console.log(e.currentTarget.dataset);
-    this.setData({
-      hdrlList:[],
-      hdrlNavIndex:e.currentTarget.dataset.index,
-    })
-    if (this.data.hdrlNavIndex == 4) {
-      this.getMovieList()
-    } else {
-      this.getHdrlList() //切换分类重新获取活动日历列表
-    }
-  },
-  // 游苏州下的公共服务和旅游助手切换
-  changeType(e) {
-    this.setData({
-      yszIndex:e.currentTarget.dataset.index,
-    })
-  },
-  // 获取导航栏项目标题高度
+		this.getWeather()
+		// 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+		this.getVideoPrize()
+		this.getXpthList()
+	},
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
-				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
-				console.log(that.data.viewHeight)
 			}
 		})
 	},
-	// getXpthList: function() {
-	// 	// 元旦新增 新品特惠
-	// 	commonApi._post("product/get_product_indulgence", {
-	// 		tag_id: 275,
-	// 		typeId: 3,
-	// 	}).then(res => {
-	// 		console.log('data', res.data);
-	// 		this.setData({
-	// 			xpth: res.data,
-	// 			djsTime: res.data.time
-	// 		})
-	// 		let time = setInterval(() => {
-	// 			this.setData({
-	// 				djsTime: this.data.djsTime - 1
-	// 			})
-	// 			this.formatDate(this.data.djsTime)
-	// 		}, 1000)
-	// 		if (this.data.djsTime == 0) {
-	// 			clearInterval(time)
-	// 		}
-	// 	})
-	// },
+	getXpthList: function() {
+		// 元旦新增 新品特惠
+		commonApi._post("product/get_product_indulgence", {
+			tag_id: 275,
+            typeId: 3,
+            type: 1, // 返回数组
+		}).then(res => {
+            // res.data.adv = [res.data.adv]
+			this.setData({
+				xpth: res.data,
+				djsTime: res.data.time
+			})
+			let time = setInterval(() => {
+				this.setData({
+					djsTime: this.data.djsTime - 1
+				})
+				this.formatDate(this.data.djsTime)
+			}, 1000)
+			if (this.data.djsTime == 0) {
+				clearInterval(time)
+			}
+		})
+	},
 	// 元旦新品特惠 倒计时 
-	// formatDate: function(oTime) {
-	// 	let h = parseInt(oTime / 3600)
-	// 	let m = parseInt((oTime % 3600) / 60)
-	// 	let s = parseInt(oTime % 60)
-	// 	h = h < 10 ? "0" + h : h;
-	// 	m = m < 10 ? "0" + m : m;
-	// 	s = s < 10 ? "0" + s : s;
-	// 	this.setData({
-	// 		djs: {
-	// 			h: h,
-	// 			m: m,
-	// 			s: s
-	// 		}
-	// 	})
-	// 	return
-	// },
-  // 非遗跳转
-  // goFeiyi: function() {
-	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-	// 	wx.navigateTo({
-	// 		url: "/pages/pbService/web/index"
-	// 	})
-	// },
-	// onTabItemTap: function(e) {
-	// 	console.log(e, 99999999)
-  // },
-  // 大轮播的监听方法
+	formatDate: function(oTime) {
+		let h = parseInt(oTime / 3600)
+		let m = parseInt((oTime % 3600) / 60)
+		let s = parseInt(oTime % 60)
+		h = h < 10 ? "0" + h : h;
+		m = m < 10 ? "0" + m : m;
+		s = s < 10 ? "0" + s : s;
+		this.setData({
+			djs: {
+				h: h,
+				m: m,
+				s: s
+			}
+		})
+		return
+	},
+	goFeiyi: function() {
+		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+		wx.navigateTo({
+			url: "/pages/pbService/web/index"
+		})
+	},
+	onTabItemTap: function(e) {
+		console.log(e, 99999999)
+	},
 	changeBannerIndex: function(e) {
 		this.setData({
 			activeBannerIndex: e.detail.current
 		})
-  },
-  // 小轮播监听方法
+	},
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
-	},
+    },
+    changeXPathBannerIndex: function(e) {
+		this.setData({
+			XPathBannerIndex: e.detail.current
+		})
+    },
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -618,7 +377,6 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -716,7 +474,6 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-    console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -742,13 +499,19 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// 	wx.navigateToMiniProgram({
+		// 		appId: 'wxdd39069b9a91dbfe',
+		// 		path: 'pages/index/index'
+		// 	})
+		// 	return;
+		} else if (e.currentTarget.dataset.title == 'e读书') {
 			wx.navigateToMiniProgram({
-				appId: 'wxdd39069b9a91dbfe',
+				appId: 'wx26e6f4c0baba005b',
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
@@ -794,15 +557,14 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
-		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
+        app.globalData.weburl = url;
+        console.log(url)
 		wx.navigateTo({
 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
 		})
 	},
 	gotoUrl: function(e) {
-		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -814,8 +576,8 @@ Page({
 			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
-    },
-    	// 实时路况跳转外链
+	},
+	// 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -855,7 +617,6 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -877,33 +638,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	// getList: function() {
-	// 	if (!this.data.listMore) return;
-	// 	commonApi._post("search/recommend", {
-	// 		offset: this.data.list.length,
-	// 		limit: 16
-	// 	}).then(res => {
-	// 		res.data.map(item => {
-	// 			if (item.ext.display_tags) {
-	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-	// 			} else {
-	// 				item.ext.display_tags = []
-	// 			}
-	// 		})
-	// 		if (res.data.length < 15) {
-	// 			this.setData({
-	// 				listMore: false
-	// 			})
-	// 		}
-	// 		this.setData({
-	// 			list: this.data.list.concat(res.data)
-	// 		})
-	// 	})
-	// },
+	getList: function() {
+		if (!this.data.listMore) return;
+		commonApi._post("search/recommend", {
+			offset: this.data.list.length,
+			limit: 16
+		}).then(res => {
+			res.data.map(item => {
+				if (item.ext.display_tags) {
+					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+				} else {
+					item.ext.display_tags = []
+				}
+			})
+			if (res.data.length < 15) {
+				this.setData({
+					listMore: false
+				})
+			}
+			this.setData({
+				list: this.data.list.concat(res.data)
+			})
+		})
+	},
 	onReachBottom: function() {
-		// if (this.data.list.length < 30) {
-		// 	this.getList()
-		// }
+		if (this.data.list.length < 30) {
+			this.getList()
+		}
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -954,7 +715,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -963,7 +723,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -980,7 +739,6 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
-						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -1023,7 +781,6 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
-		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -1031,186 +788,184 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	// bannerClick2: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.action == 'href') {
-	// 		if (item.href.indexOf(",") != -1) {
-	// 			let info = item.href.split(",");
-	// 			wx.navigateToMiniProgram({
-	// 				appId: info[0],
-	// 				path: info[1]
-	// 			})
-	// 		} else if (item.href.indexOf('map/index') != -1) {
-	// 			wx.reLaunch({
-	// 				url: item.href
-	// 			})
-	// 		} else {
-	// 			wx.navigateTo({
-	// 				url: item.href,
-	// 			})
-	// 		}
-	// 	} else if (item.action == "web") {
-	// 		app.globalData.weburl = item.href;
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-	// 		})
-	// 	}
-	// },
+	bannerClick2: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.action == 'href') {
+			if (item.href.indexOf(",") != -1) {
+				let info = item.href.split(",");
+				wx.navigateToMiniProgram({
+					appId: info[0],
+					path: info[1]
+				})
+			} else if (item.href.indexOf('map/index') != -1) {
+				wx.reLaunch({
+					url: item.href
+				})
+			} else {
+				wx.navigateTo({
+					url: item.href,
+				})
+			}
+		} else if (item.action == "web") {
+			app.globalData.weburl = item.href;
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+			})
+		}
+	},
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// // 获取短视频大赛是否中奖 中奖详情
-	// getVideoPrize() {
-	// 	let user_id = wx.getStorageSync('jstrip_userid');
-	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-	// 	commonApi.user_post('actonline/video_act/getRaffle', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			videoPrize: res.data
-	// 		})
-	// 	})
-	// },
-	// noMoreTip() {
-	// 	wx.setStorageSync('indexPriceNoTip', true)
-	// 	this.closePrice()
-	// },
-	// closePrice() {
-	// 	this.setData({
-	// 		videoPrize: false,
-	// 		prizeInfo: null
-	// 	})
-	// },
+	// 获取短视频大赛是否中奖 中奖详情
+	getVideoPrize() {
+		let user_id = wx.getStorageSync('jstrip_userid');
+		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+		commonApi.user_post('actonline/video_act/getRaffle', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				videoPrize: res.data
+			})
+		})
+	},
+	noMoreTip() {
+		wx.setStorageSync('indexPriceNoTip', true)
+		this.closePrice()
+	},
+	closePrice() {
+		this.setData({
+			videoPrize: false,
+			prizeInfo: null
+		})
+	},
 	// 抽奖
-	// choosePrize() {
-	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			prizeInfo: res.data
-	// 		})
-	// 		if (res.data.type != 'none') {
-	// 			// 抽奖成功的话 弹框
-	// 			wx.showModal({
-	// 				title: "提示",
-	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-	// 				showCancel: false
-	// 			})
-	// 		}
-	// 	})
-	// },
-	// bannerJumpNew(item) {
-	// 	let that = this
-	// 	item = item.currentTarget.dataset.item
-	// 	if (item.tdata == '') return
-	// 	that.pagePoint({
-	// 		event: "banner_click",
-	// 		type: 'banner'
-	// 	}, 1)
-	// 	switch (item.jump_type) {
-	// 		case 0:
-	// 			break;
-	// 		case 1:
-	// 			util.gotoDetail(item.product_model)
-	// 			break;
-	// 		case 2:
-	// 			if (item.front_model && item.front_model.mini) {
-	// 				wx.navigateTo({
-	// 					url: "/" + item.front_model.mini
-	// 				})
-	// 			}
-	// 			break;
-	// 		case 3:
-	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-	// 				// 外部h5
-	// 				console.log(item.tdata)
-	// 				app.globalData.weburl = item.tdata.url;
-	// 				wx.navigateTo({
-	// 					url: "/pages/pbService/web/index"
-	// 				})
-	// 			} else {
-	// 				let page = item.tdata.url.split("/");
-	// 				page = page[page.length - 1].split("?")
-	// 				console.log(page[0])
-	// 				let url = this.data.urltopage[page[0]];
-	// 				if (url && url.indexOf('map') != -1) {
-	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-	// 							'cinema', 'academes'
-	// 						],
-	// 						type = page[1] ? page[1].split("=") : [];
-	// 					wx.reLaunch({
-	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-	// 					})
-	// 				} else if (url) {
-	// 					wx.navigateTo({
-	// 						url: url,
-	// 					})
-	// 				} else {
-	// 					app.globalData.weburl = item.tdata.url;
-	// 					wx.navigateTo({
-	// 						url: "/pages/pbService/web/index"
-	// 					})
-	// 				}
-	// 			}
-	// 			break;
-	// 		case 4:
-	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-	// 				// 如果是苏心游的小程序 直接把authCode带过去
-	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-	// 					let weburl = item.tdata.page
-	// 					if (weburl.indexOf('?') != -1) {
-	// 						weburl += '&authCode=' + res.data;
-	// 					} else {
-	// 						weburl += '?authCode=' + res.data
-	// 					}
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: weburl
-	// 					})
-	// 				}).catch(err => {
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: item.tdata.page
-	// 					})
-	// 				})
-	// 			} else {
-	// 				wx.navigateToMiniProgram({
-	// 					appId: item.tdata.appid,
-	// 					path: item.tdata.page
-	// 				})
-	// 			}
-	// 			break;
-	// 		default:
-	// 			break;
-	// 	}
-	// 	return
-	// },
+	choosePrize() {
+		commonApi.user_post('actonline/video_act/luckyDraw', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				prizeInfo: res.data
+			})
+			if (res.data.type != 'none') {
+				// 抽奖成功的话 弹框
+				wx.showModal({
+					title: "提示",
+					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+					showCancel: false
+				})
+			}
+		})
+	},
+	bannerJumpNew(item) {
+		let that = this
+		item = item.currentTarget.dataset.item
+		if (item.tdata == '') return
+		that.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index"
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index"
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return
+	},
 	onReady: function() {
 
 
 	},
-	// gotoOther: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.type == 'h5') {
-	// 		app.globalData.weburl = item.url
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-	// 		})
-	// 	} else if (item.type == 'mini') {
-	// 		wx.navigateToMiniProgram({
-	// 			appId: item.appid,
-	// 			path: item.path
-	// 		})
-	// 	} else if (item.type == 'page') {
-	// 		wx.navigateTo({
-	// 			url: item.page,
-	// 		})
-	// 	}
-	// },
+	gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
+	},
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ed9f76b..408bb8a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,399 +1,755 @@
-<!--pages/indexs/index.wxml-->
+<!--index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
+<!-- <view class="old-btn">关怀模式</view> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20240923/d62c7214a790c9746c9dd9f8821775f7.gif" mode="widthFix"></image>
-<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-  <view class="weather-num">{{weather.max_temp}}°</view>
-  <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-</view>
-<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-    <view class="iconfont icon-sousuo"></view>
-    <view class="textOver">搜索想要的旅游产品或服务</view>
-  </navigator>
-</view>
-<view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
-    <block wx:for="{{banner}}" wx:key="index">
-      <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
-      </swiper-item>
-    </block>
-  </swiper>
-  <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
-  </view>
-</view>
-<view class="content" wx:if="{{!isTest}}">
-  <!-- 活动日历 -->
-  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20240925/9d10d5ff4a5314573328dd6cdab67b82.png"></image>
-    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
-    <view class="nowDate"> 
-        <view class="num">{{nowDate[0]}}</view>
-        <view>月</view>
-        <view class="num">{{nowDate[1]}}</view>
-        <view>日</view>
-    </view>
-  </view>
-  <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
-      {{item.title}}
-    </view>
-  </view>
-  <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
-        <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
-          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-          <view class="hdrlItem-content">
-            <view class="hdrlItem-title textOver3">{{item.name}}</view>
-            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view wx:else>
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
-        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
-          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-          
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
-            <view>{{item.title}}</view>
-            <view style="display: flex;justify-content: flex-end;">
-              <view class="buyMovie">去购票 ></view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" wx:if="{{!isTest}}">
-    <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
-      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+<view wx:if="{{!isTest}}">
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+    <view class="weather-num">{{weather.max_temp}}°</view>
+    <view class="weather">{{weather.weather}}</view>
+    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
+        mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
     </view>
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
-            <view class="text">文创特产</view>
-          </view>
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
-            <view class="text">一日游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
-            <view class="text">一卡游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
-            <view class="text">非遗专卖</view>
-          </view>
-        </view>
-      </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
-      </view>
+    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+        <view class="iconfont icon-sousuo"></view>
+        <view class="textOver">搜索想要的旅游产品或服务</view>
+    </navigator>
     </view>
-  </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="index">
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
         </swiper-item>
-      </block>
+        </block>
     </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
     </view>
-  </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
-      </view>
     </view>
-    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
-  </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
-        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
-          <view>电子社保卡</view>
+
+    <!-- <swiper class="swiper" indicator-dots="{{true}}"
+    autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
+    <block wx:for="{{banner}}" wx:key="*this">
+        <swiper-item bindtap="bannerClick2" data-item="{{item}}">
+        <image src="{{item.img}}" mode="aspectFill"></image>
+        </swiper-item>
+    </block>
+    </swiper> -->
+    <view class="top-icons" wx:if="{{!isTest}}">
+        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/48059df0ab43af6fd86a7a2f8ca2fa47.png" mode="widthFix"></image>
+            <view class="top-icon-text">活动日历</view>
+        </view>
+        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/95098baee61e82506860793945970c04.png" mode="widthFix"></image>
+            <view class="top-icon-text">场馆预约</view>
+        </view>
+        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/af56b9461fc129eeb2076cddc7575b4e.png" mode="widthFix"></image>
+            <view class="top-icon-text">非遗专卖</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+            data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+            <view class="top-icon-text">非遗专卖</view>
         </view> -->
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
-         class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
-          <view>高峰预警</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
-          <view>实时路况</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
-          <view>行李寄存</view>
+        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/486a7a434f036ffa4e4f3dacec8eedfc.png" mode="widthFix"></image>
+            <view class="top-icon-text">剧场演出</view>
         </view>
-        
-        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-            data-path="/pages/pbService/bike/index?type=1">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240925/38ee5d21e1eb4ef2379c3d81edfb3799.png" mode="widthFix"></image>
-            <view>找厕所</view>
+        <!-- 2024年7月新版文创特产 -->
+        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/193c7646a95fb88ff1bc2d73bda03e70.png" mode="widthFix"></image>
+            <view class="top-icon-text">文创特产</view>
         </view>
-
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
-          <view>安全服务</view>
+        <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+            data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+            <view class="top-icon-text">文创特产</view>
         </view> -->
-        
-        
-      </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
-    </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-          data-path="/pages/list/{{isTest?'road':'food'}}/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
-      </view>
-    </view>
-  </view>
-  <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
-  <!-- 4个产品榜单 -->
- <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
-    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
-    <view class="bd-top">
-      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" data-item="{{bdItem}}">更多 ></view>
+        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/bde4344ae2bfe55ff8cd91704904a07b.png" mode="widthFix"></image>
+            <view class="top-icon-text">景点门票</view>
+        </view>
+        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/05c99091489d8eba395075471c5abfd3.png" mode="widthFix"></image>
+            <view class="top-icon-text">酒店住宿</view>
+        </view>
+        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/32e3894971c3f57f2e86f46c885f4d64.png" mode="widthFix"></image>
+            <view class="top-icon-text">夜游苏州</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/56333c7e1867719fdfbbdd1acd8b8af1.png" mode="widthFix"></image>
+            <view class="top-icon-text">一日游</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/23c1af842453eb981adbc315b2012ff9.png" mode="widthFix"></image>
+            <view class="top-icon-text">研学游</view>
+        </view>
     </view>
-    <view style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
-        wx:key="id" data-item="{{item}}">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
+    <view class="content">
+        <view class="sale-road-boxes" wx:if="{{false}}">
+            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+            <view class="sale-product">
+                <view class="sale-product-bg"></view>
+                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
+                </image>
+                <view class="sale-info">
+                <view class="sale-product-title textOver2">
+                    <view>限时特惠</view>
+                    <view>新品推荐</view>
+                </view>
+                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
+                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
+                </view>
+            </view>
+            </view>
+            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
+            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+            <view class="sale-product">
+                <view class="sale-product-bg road-product-bg"></view>
+                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
+                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
+                </image>
+                <view class="sale-info">
+                <view class="sale-product-title textOver2">
+                    <view>四季苏州</view>
+                    <view>最是江南</view>
+                </view>
+                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+                </view>
+            </view>
+            </view>
+        </view>
+        <!-- ai避高峰 -->
+        <view style="display: flex;margin-top: 30rpx;">
+            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
+            <image src="{{indexSeason.ai}}" mode=""/>
+            </view>
+            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+            <image src="{{indexSeason.avoid}}" mode=""/>
+            </view>
+        </view>
+
+        <!-- 小banner 五一修改 一张banner不滚动 -->
+        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+        </view>
+        <view class="small-swiper-box" wx:else>
+            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+            <block wx:for="{{xiaobanner}}" wx:key="index">
+                <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <!-- 原 圆角77rpx，现改为13rpx -->
+                <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                </swiper-item>
+            </block>
+            </swiper>
+            <view class="dot-list com-flex sm-dot-list">
+            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+            </view>
+        </view>
+    
+        <!-- 限时特惠--新版-->
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+            <!-- 上方标题部分 -->
+            <view class="xsth-title">
+            <view class="xsth-left" style="display: flex;">
+                <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+            </view>
+            <view class="time-box" style="z-index: 9;flex-shrink: 0;">
+                倒计时
+                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+                <text>:</text>
+                <view class="xsth-time">{{djs.m}}</view>
+                <text>:</text>
+                <view class="xsth-time">{{djs.s}}</view>
+            </view>
+            <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
+            <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+                更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+            </view> -->
+            </view>
+            <!-- 商品部分 -->
+            <view class="xpth-product">
+            <!-- 左边的2个产品 -->
+            <view class="xpth-left">
+                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                <image src="{{item.headimg}}" mode="" />
+                <view class="xpth-item-content">
+                    <view class="xpth-item-title textOver2">{{item.title}}</view>
+                    <!-- <view class="xpth-tag">唇齿留香</view> -->
+                    <view class="xpth-item-bottom">
+                    <view class="xpth-item-price">{{item.price/100}}</view>
+                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                    </view>
+                </view>
+                </view>
+            </view>
+            <!-- 右边的banner -->
+            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
+                <block wx:for="{{xpth.adv}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <view class="xpth-banner-dot-list">
+                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                </view>
+            </view>
+            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
+            </view>
+        </view>
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+        </view>
+
+        <!-- 数字文旅-->
+        <view class="slide-out-box">
+            <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+            <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+            <view class="pbservice" style="margin-bottom:30rpx">
+                <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/3f386ea45281d642a2692c9e65a2037c.png" mode="widthFix"></image>
+                <view class="text">数字非遗</view>
+                </view>
+                <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/d1e0df4aa32de12451228e776a75a882.png" mode="widthFix"></image>
+                <view class="text">数字博物馆</view>
+                </view>
+                <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/c3c31a60c94d1fe1292dbe2ffc253519.png" mode="widthFix"></image>
+                <view class="text">数字名人馆</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/cc82f9b107f600b444bc4e43f0d06d68.png" mode="widthFix"></image>
+                <view>云上观展</view>
+                </view>
+                <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/ba90dbaaf1b833411e517991d0784292.png" mode="widthFix"></image>
+                <view class="text">云上文博会</view>
+                </view>
+                <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/b0b3cc6f2ed3ed0fafe9e9f9b9ed3f88.png" mode="widthFix"></image>
+                <view class="text">精彩回顾</view>
+                </view>
+                <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/8de0e891c1e8fec7439619d1d6e63db4.png" mode="widthFix"></image>
+                <view class="text">文化场馆查询</view>
+                </view>
+                <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/ced5cb9b113d5c37cabf199e2a348b46.png" mode="widthFix"></image>
+                <view class="text">苏影通</view>
+                </view>
+                <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/579dd26c8549e7c77cc0edd72bb7d9b9.png" mode="widthFix"></image>
+                <view class="text">书仓</view>
+                </view>
+                <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/8dcf8ddf93d276d5009617f77ff26df4.png" mode="widthFix"></image>
+                <view class="text">e读书</view>
+                </view>
+
+                <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/640e0ea31fa881e694b93591d4d84b49.png" mode="widthFix"></image>
+                <view class="text">数字公共文化</view>
+                </view>
+                <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+                data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+                <view class="text">文旅单位</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+                <view class="text">书仓</view>
+                </view> -->
+                <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/4fc0b988d1d5ced741b585c22ae875f2.png" mode="widthFix"></image>
+                <view class="text">云游苏州</view>
+                </view>
+                <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/267db6cc986b61bb3777b70f67cafb47.png" mode="widthFix"></image>
+                <view class="text">美图鉴赏</view>
+                </view>
+                <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+                data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+                <view>文物查询</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+                data-path="/pages/pbService/museum/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+                <view>博物馆查询</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+                <view>云上文博会</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+                <view class="text">投资导引图</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-title="数字文物"
+                data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+                <view>数字文物</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+                <view>团体预约</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+                data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+                <view>廉洁地图</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+                <view>文化配送</view>
+                </view> -->
+            </view>
+            </scroll-view>
+            <view class="scroll-line">
+            <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+            <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+            <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
+            <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+            </view>
+        </view>
+
+        <!-- 旅游助手 -->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
+        </view>
+        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
+            </image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+        </view>
+
+        <!-- 公共服务 -->
+        <view class="sale-road-boxes" style="margin-top:0;">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                <view style="height: 40rpx;line-height: 40rpx;">查看全部</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241012/a3eea8df9bb8347f550d5828bddfc215.png" mode="" />
+            </navigator>
+            
+        </view>
+        <view style="overflow-x:auto;background: #FFF1C2;border-radius: 20rpx;height: 199.33rpx;">
+            <!-- 元旦修改 ggfw为新增类名 -->
+            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/882033bd48c99ea745036697beefb6bb.png" mode="widthFix"></image>
+                <view>高峰预警</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="xlqc"
+                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/90d32d4b4be584bbdb23b43c20da188c.png" mode="widthFix"></image>
+                <view>实时路况</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="xlqc"
+                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/340f637b40d21fdafa42b67463ef371a.png" mode="widthFix"></image>
+                <view>行李寄存</view>
+                </view>
+                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+                    data-path="/pages/pbService/bike/index?type=1">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20241012/5d794820cbb29acea5c78e0a46df29ee.png" mode="widthFix"></image>
+                    <view>找厕所</view>
+                </view>
+            </view>
+        </view>
+        <view class="sale-road-boxes">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
+        </view>
+
+        <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+        <view class="six-box-new" wx:if="{{!isTest}}">
+            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+            </image>
+        </view>
+        <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
+        </view>
+        
+        <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
+            <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+            <image src="{{item.icon}}" mode="widthFix"></image>
+            <view>{{item.name}}</view>
+            </view>
+        </view>
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
+        </view>
+        <view class="hot-list" wx:if="{{isTest==false}}">
+            <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
+            <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+                <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
+                <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+                <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
+                <view class="today-date">{{date}} {{month}}</view>
+                <view class="today-hot-box">
+                    <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
+                    {{item.ext.display_tags[0]}}</view>
+                    <view class="today-hot-title">{{item.title}}</view>
+                </view>
+                </view>
+                <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+                <view style="position:relative">
+                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                    <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+                </view>
+                <view class="hot-info">
+                    <view class="hot-title">{{item.title}}</view>
+                    <view class="tags textOver" style="margin-bottom:0">
+                    <view class="icon-box">
+                        <text class="iconfont icon-xin"></text>
+                        <text>{{item.ext.like_number}}</text>
+                    </view>
+                    <view class="icon-box">
+                        <text class="iconfont icon-eye"></text>
+                        <text>{{item.ext.view_number}}</text>
+                    </view>
+                    </view>
+                </view>
+                </view>
+                <view wx:else class="hot-item">
+                <view style="position:relative">
+                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                    <!-- <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' && item.ext.price}}" class="hot-price">
+                    <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                    </view>
+                </view>
+                </view>
             </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
             </view>
-          </view>
         </view>
-      </view>
+        <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+        <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
     </view>
 
-  </view>
- </view>
+    <view class="mask prizeMask" wx:if="{{videoPrize}}">
+    <view class="mask-bg"></view>
+    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+        <!-- 中奖的卡券 -->
+        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+        </view> -->
+        </view>
+        <!-- 中奖的产品 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+        </view> -->
+        </view>
+        <!-- 未中奖 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <view bindtap="closePrice">我知道了</view>
+        </view>
+        </view>
+        <!-- 未抽奖状态 -->
+        <view style="position:relative" wx:else>
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
+        </view>
+        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
+    </view>
+    </view>
+    <!-- 广告弹窗 -->
+    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
+    <view class="alertavd" wx:if="{{showAdv}}">
+    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <block wx:for="{{alertSwipeList}}" wx:key="index">
+        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
+            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+    </view>
+    <!-- 广告弹窗结束 -->
+    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
+    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    </view>
 
-</view>
+    <!-- 视频 -->
+    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
-<view class="content" wx:else>
-    <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" >
-    <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image  data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
-      <image  class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
     </view>
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          
-          
-        </view>
-      </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
-      </view>
     </view>
-  </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="index">
+    <!-- <view class="topBox">
+        <view class="Qtop" :style="{height:height}">
+        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+        </view>
+        <view class="jumpBox">
+        <view class="time">{{time}}s</view>
+        <view bind:tap="gotoIndex">跳过</view>
+        </view>
+    </view> -->
+</view>
+
+<view wx:else>
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
         </swiper-item>
-      </block>
+        </block>
     </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
     </view>
-  </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
-      </view>
     </view>
-    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
-  </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
-          <view>电子社保卡</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
-         class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
-          <view>高峰预警</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
-          <view>行李寄存</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
-          <view>实时路况</view>
-        </view>
+    <view class="top-icons">
+    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">活动日历</view>
+    </view>
+    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">场馆预约</view>
+    </view>
 
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
-          <view>安全服务</view>
-        </view> -->
-        
-        
-      </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
+  
+    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">剧场演出</view>
     </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" >
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
-      </view>
+  
+   
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">夜游苏州</view>
+    </view>
+    </view>
+    <view class="content">
+ 
+    <!-- 五一修改 一张banner不滚动 -->
+    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+    </view>
+    <view class="small-swiper-box" wx:else>
+        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <block wx:for="{{xiaobanner}}" wx:key="*this">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <!-- 原 圆角77rpx，现改为13rpx -->
+            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            </swiper-item>
+        </block>
+        </swiper>
+        <view class="dot-list com-flex sm-dot-list">
+        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        </view>
+    </view>
+    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
+    <view style="display: flex;">
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
+        <image src="{{indexSeason.ai}}" mode=""/>
+        </view>
+        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+        <image src="{{indexSeason.avoid}}" mode=""/>
+        </view>
     </view>
-  </view>
-</view>
 
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+    </view>
+    <!-- 五一修改 .slide-out-box 增加背景色-->
+    <view class="slide-out-box">
+        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+            <view class="text">数字非遗</view>
+            </view>
+            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+            <view class="text">数字博物馆</view>
+            </view>
+            
+            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+            <view>云上观展</view>
+            </view>
+            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+            <view class="text">云上文博会</view>
+            </view>
+            
+            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+            <view class="text">文化场馆查询</view>
+            </view>
+            
+            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view>
+            
 
-<!-- 开屏页 -->
-<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
-	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+            <view class="text">数字公共文化</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+            <view class="text">文旅单位</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view> -->
+            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
+            <view class="text">云游苏州</view>
+            </view>
+            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+            <view class="text">美图鉴赏</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+            <view>文物查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+            data-path="/pages/pbService/museum/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+            <view>博物馆查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+            <view>云上文博会</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+            <view class="text">投资导引图</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="数字文物"
+            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+            <view>数字文物</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+            <view>团体预约</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+            <view>廉洁地图</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+            <view>文化配送</view>
+            </view> -->
+        </view>
+        </scroll-view>
+        <view class="scroll-line">
+        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+        </view>
     </view>
-	
-	<!-- 视频 -->
-	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-		<video
-			style="width:100vw;height:100vh;display:block;"
-			id="myVideo" 
-			src="{{startList.head_img}}" 
-			show-center-play-btn="{{false}}"
-			show-play-btn="{{true}}" 
-			autoplay
-			controls="{{false}}"
-			bindended="videoend"
-			loop="{{true}}"
-			muted="{{isMuted}}"
-			object-fit="fill"
-		></video>
-		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-	</view>
-</view>
 
+
+
+
+
+
+  
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d9479c5..adcd838 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,12 +1,12 @@
-/* pages/indexs/index.wxss */
+/**index.wxss**/
 /* 元旦修改 */
 page {
-  height: fit-content;
+  /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  background: url("https://static.ticket.sz-trip.com/uploads/20240923/69d4d68f5207c84146739951d07dbda4.jpg");
-  background-size: 100% 300%;
-  /* background-repeat: round; */
-  background-repeat: no-repeat;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20241012/abae687010ec0955b70872edd660002a.jpg');
+  background-repeat: repeat-y;
+  background-size: 100% 100%;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -39,10 +39,18 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
+  /* height: 64rpx; */
+  /* background: rgba(255, 255, 255, 0.6); */
+  /* border-radius: 32rpx; */
+  /* color: #666; */
+  /* height: 70.67rpx; */
   height: 64rpx;
   background: rgba(255,255,255,0.7);
   border-radius: 32rpx;
-  color: #000;
+  /* color: #72674E; */
+  color: #333333;
+  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
+  background-size: 100% 100%; */
   display: flex;
   align-items: center;
   font-size: 25rpx;
@@ -51,7 +59,7 @@ page {
   font-size: 30rpx;
   margin-left: 20rpx;
   margin-right: 10rpx;
-  color: #000;
+  /* color: #72674E; */
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -70,8 +78,6 @@ page {
   margin-right: 30rpx;
 }
 .top-icons {
-  /* background: #FFFFFF; */
-  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
   width: 697rpx;
   margin: 0 auto;
@@ -79,12 +85,12 @@ page {
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 7rpx;
+  padding-bottom: 29.33rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  background: #FFFED6;
-  margin-top: -20rpx;
-  padding-top: 54rpx;
+  margin-top: -50rpx;
+  padding-top: 84rpx;
+  background: #FFF1C2;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -105,8 +111,7 @@ page {
   margin-bottom: 10rpx;
 }
 .content {
-  /* margin: 0 25rpx; */
-  margin-top: 20.67rpx;
+  margin: 0 25rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -196,11 +201,13 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 24rpx 26.67rpx 26.67rpx;
-  /* width: 100%; */
+  margin: 50rpx 0;
+  width: 100%;
   height: 154rpx;
   border-radius: 20rpx;
+  /* border-radius: 77rpx; */
   overflow: hidden;
+  margin-top: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -308,56 +315,56 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  /* width: 100%;
+  width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap; */
-    display: flex;
-    justify-content: space-between;
-    margin: 0 28rpx;
+  flex-wrap: wrap;
 }
 .title-more {
-  font-size: 24rpx;
-  /* color: #0B898E; */
-  /* 元旦修改 */
-  color: #54504D;
+  font-size: 27rpx;
+  font-weight: 500;
+  color: #F65D1F;
   z-index: 9;
   width: 173rpx;
   height: 40rpx;
-  line-height: 40rpx;
-  background: rgba(255, 255, 255, 0.5);
+  background: rgba(255,255,255,0.5);
   border-radius: 20rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  /* margin-top: 20rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
+  margin-top: 20rpx;
+  background: #FFF1C2;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  /* margin-bottom: 40rpx; */
+  margin-bottom: 40rpx;
 }
 .pbservice {
-  width: calc(160rpx * 8);
+  /* width: calc(175rpx * 6); */
+  /* 元旦修改 */
+  width: calc(190rpx * 7);
   display: flex;
-  margin-top: 5rpx;
-  /* flex-wrap: wrap; */
-  flex-wrap: nowrap;
-  /* padding-left: 12rpx; */
-  /* overflow-x: scroll; */
+  margin-top: 30rpx;
+  flex-wrap: wrap;
+  /* margin-bottom: 60rpx; */
+  /* 元旦修改 注释margin-bottom */
 }
 .pbservice-item {
-  width: 106rpx;
-  margin-bottom: 25rpx;
-  margin-right: 32.33rpx;
+  /* 元旦修改 截止到注释的width*/
+  width: 120rpx;
+  margin-bottom: 33.33rpx;
+  margin-right: 62.33rpx;
+  /* width: 175rpx; */
   text-align: center;
-  font-size: 27rpx;
-  color: #000;
+  font-size: 25rpx;
+  color: #111111;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -372,7 +379,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 80rpx;
+  width: 106rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -533,21 +540,16 @@ page {
 }
 .more-btn-text {
   text-align: center;
-  /* color: #0b898e;
-  font-size: 27rpx;
-  width: 200rpx;
-  line-height: 65rpx;
-  border: 1px solid #0b898e;
-  border-radius: 33rpx; */
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #111;
+  border: 1px solid #F6591D;
   border-radius: 35rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
-  font-weight: 500;
+  font-weight: bold;
+  color: #F6591D;
 }
 .scroll-line {
   /* height: 6rpx;
@@ -556,24 +558,29 @@ page {
   overflow: hidden;
   margin: 30rpx auto; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
-  width: 48rpx !important;
-  height: 8rpx;
+  width: 73rpx !important;
+  height: 7rpx;
   /* background: #DDCEAC; */
   background: #fff;
-  border-radius: 4rpx;
-  margin: 15rpx auto 10rpx;
+  border-radius: 3rpx;
+  margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  height: 8rpx;
-  background: #FF4848;
-  border-radius: 4rpx;
+  /* width: 300rpx;
+  height: 6rpx;
+  border-radius: 3rpx;
+  background: #0B898E; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  height: 7rpx;
+  background: #F65D1F;
+  border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 24rpx;
-  background: #FF4848;
-  height: 8rpx;
-  border-radius: 4rpx;
+  margin-left: 37.33rpx;
+  background: #F65D1F;
+  height: 7rpx;
+  border-radius: 3rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -679,10 +686,9 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
-  background: #FFFED6;
+  background: #FFF1C2;
   justify-content: space-around;
   height: 187rpx;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
 }
@@ -694,7 +700,7 @@ page {
 }
 .other-plat {
   /* 春节新增样式 */
-  color: #54504D;
+  color: #111111;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -828,7 +834,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .time-box {
-  font-size: 25rpx;
+  font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
   /* color: #54504D; */
@@ -842,23 +848,17 @@ page {
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  /* margin: 0 5rpx; */
-  /* width: 50rpx; */
-  /* height: 33rpx; */
-  width: 43rpx;
+  /* width: 43rpx; */
   height: 43rpx;
+  padding: 0 7rpx;
   line-height: 43rpx;
-  background: #4AB648;
-  /* background: #F9F1DB; */
-  /* border-radius: 5rpx; */
+  background: #FFF1C2;
   border-radius: 13rpx;
-  font-size: 25rpx;
+  font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  /* color: #D62828; */
-  color: white;
+  color: #ED1C19;
   text-align: center;
-  /* line-height: 33rpx; */
 }
 .time-box text {
   width: 18rpx;
@@ -904,44 +904,53 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-product {
-  /* position: absolute; */
-  width: 697rpx;
+  width: 700rpx;
   height: 373rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx 15rpx;
+  padding: 25rpx 13rpx;
   box-sizing: border-box;
-  /* left: 0;
-  bottom: 15.33rpx;
-  /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
+  background: #FFF1C2;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
-  /* width: 270rpx; */
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
-  /* background-size: 100% 100%; */
-  border-radius: 20rpx;
   flex: 1;
   margin-left: 15rpx;
-  /* padding: 4rpx;
-  background: #72674e;
-  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  height: 319rpx;
+  height: 320rpx;
+  width: 100%;
+  border-radius: 20rpx;
+  overflow: hidden;
+  position: relative;
+}
+.xpth-banner-swiper{
+    height: 100%;
 }
 .xpth-banner image {
-  /* width: 270rpx; */
   flex: 1;
-  height: 319rpx;
+  height: 100%;
+  width: 100%;
   border-radius: 20rpx;
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  /* border-radius: 20rpx; */
+}
+.xpth-banner-dot-list{
+    position: absolute;
+    right: 0;
+    bottom: 10rpx;
+    padding: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+.xpth-banner-dot-list .xpth-dot{
+    width: 9rpx;
+    height: 9rpx;
+    background: #FFFFFF;
+    border-radius: 50%;
+    opacity: 0.6;
+    margin: 0 4rpx;
+}
+.xpth-banner-dot-list .xpth-dot.active{
+    opacity: 1;
 }
 /* 元旦修改新增样式 */
 .xpth-item {
@@ -987,7 +996,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 230rpx;
+  width: 210rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
@@ -1010,15 +1019,15 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-price {
-  font-size: 32rpx;
+  font-size: 31rpx;
   font-family: PingFang SC;
-  font-weight: 500;
-  color: #D62828;
+  font-weight: bold;
+  color: #ED1C19;
 }
 /* 元旦修改新增样式 */
 .xpth-item-price::before {
   content: "￥";
-  font-size: 20rpx;
+  font-size: 23rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-item-buy {
@@ -1036,22 +1045,24 @@ page {
 /* 元旦修改新增样式 */
 .new-pic {
   width: 160rpx !important;
-  height: 255rpx !important;
-  /* margin-bottom: 26.67rpx; */
+  height: 213rpx !important;
+  margin-bottom: 26.67rpx;
 }
 
-.ggfw-list{
-    display: flex;
-    justify-content: space-around;
+.ggfw-list {
+  justify-content: space-around !important;
+}
+.ggfw-list .pbservice-item{
+    margin-right: 0;
+    color: #111111;
 }
 .ggfw {
   width: auto;
-  margin:0;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 113.33rpx !important;
-  height: 113.33rpx !important;
+  width: 70rpx !important;
+  height: 70rpx !important;
 }
 
 .six-box-new {
@@ -1078,7 +1089,7 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #54504D;
+  color: #111111;
 }
 
 .rmtj-right {
@@ -1159,327 +1170,31 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-
-.right-more {
-  width: 120rpx;
-  height: 47rpx;
-  background-color: rgba(255,255,255,.3);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #FFFFFF;
-  text-align: center;
-  line-height: 47rpx;
-}
-
-.hdrlNavList {
-  display: flex;
-  margin: 28rpx 26.67rpx 10rpx;
-  overflow-x: scroll;
-  flex-wrap: nowrap;
-}
-.hdrlNav {
-  flex-shrink: 0;
-  /* width: 160rpx; */
-  padding: 0 20rpx;
-  height: 53rpx;
-  background: rgba(255,250,245,0.3);
-  border-radius: 13rpx;
-  /* border: 1px solid #FFFFFF; */
-
-  font-size: 32rpx;
-  color: #FFFFFF;
-  text-align: center;
-  line-height: 53rpx;
-  margin-right: 14rpx;
-}
-.hdrlNavActive {
-  background: linear-gradient(180deg, #FFFAF5, #FFE3C2);
-  font-size: 32rpx;
-  color: #FF4848;
-  border: none;
-}
-.hdrlItem {
-  flex-shrink: 0;
-  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
-  /* width: 593.33rpx; */
-  display: flex;
-  background: url("https://static.ticket.sz-trip.com/uploads/20240923/d4c9e6e558796b0ff89726d0857a5d03.png");
-  background-size: 100% 100%;
-}
-.hdrlItem-img {
-  width: 240rpx;
-  height: 213rpx;
-  background: #8C8C8C;
-  border-radius: 13rpx;
+.jqssd {
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
+  background-size: 100% 100%; */
+  width: 365.33rpx;
+  height: 166rpx;
   flex-shrink: 0;
-  margin-right: 12rpx;
-  overflow: hidden;
-}
-.hdrlItem-content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 213rpx;
-}
-.hdrlItem-title {
-  font-weight: bold;
-  font-size: 28rpx;
-  color: #000000;
-  margin-top: 15.33rpx;
-}
-.hdrlItem-date {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #000000;
-  margin-bottom: 19.33rpx;
-}
-
-.main-box {
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
-  background-size: 100% 100%;
-  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
-  margin: 0 8rpx;
 }
-.main-box-top {
-  display: flex;
-  margin-bottom: 5.33rpx;
-}
-.gfyj,.sslk {
-  width: 369.33rpx;
-  height: 146rpx;
-  flex-shrink: 0;
+.jqssd image, .sslk image{
+  width: 100%;
+  height: 100%;
 }
 .sslk {
-  margin-left: -48rpx;
-}
-
-.movieItem {
-  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-  flex-shrink: 0;
-  height: 206.67rpx;
-}
-.movieItem-img {
-  width: 213rpx;
-  height: 213rpx;
-  border-radius: 18rpx;
-  margin-right: 18rpx;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
+  background-size: 100% 100%; */
+  width: 365.33rpx;
+  height: 166rpx;
   flex-shrink: 0;
-}
-.ysz-box {
-    margin: 0 8rpx 15.33rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
-    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
-    background-size: 100% 100%;
-    width: 733.33rpx;
-    height: 320rpx;
-    padding-top: 33.33rpx;
-}
-.ysz-more {
-    width: 267rpx;
-    height: 53rpx;
-    background: #FFFFFF;
-    border-radius: 27rpx;
-    margin: 38rpx auto 0;
-    text-align: center;
-    line-height: 53rpx;
-    font-weight: 500;
-    font-size: 25rpx;
-    color: #320000;
-}
-.ysz-box2 {
-  /* padding: 20rpx 35rpx; */
-  padding-top: 23.33rpx;
-}
-.tjbd-title {
-  width: 286.67rpx;
-  height: 80rpx;
+  margin-left: -20rpx;
 }
 
-.bd-box {
-  position: relative;
-  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
-  margin-left: 26.67rpx;
-  width: 582rpx;
-  /* height: 1133rpx; */
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
-  border-radius: 20rpx 80rpx 20rpx 20rpx;
-}
-.bd-top {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 30rpx;
-  position: relative;
+.xsth-left{
+    /* flex: 1;
+    width: 1rpx; */
 }
-.zz {
-    width: 236.67rpx;
-    height: 206.67rpx;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 2;
-}
-.bd-type {
-  width: 125.33rpx;
-  height: 38.67rpx;
-}
-.bd-more {
-  width: 120rpx;
-  height: 47rpx;
-  background: rgba(255,255,255,.7);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #320000;
-  z-index: 9;
-  text-align: center;
-  line-height: 47rpx;
-}
-.bd-index {
-  font-weight: bold;
-  font-size: 40rpx;
-  color: #000000;
-}
-.bd-item {
-  margin-left: 45.33rpx;
-  width: 453rpx;
-  height: 147rpx;
-  background: #FFFFFF;
-  border-radius: 13rpx;
-  display: flex;
-}
-.bd-item-img {
-    width: 147rpx;
-    height: 147rpx;
-    background: #D9D9D9;
-    border-radius: 13rpx;
-    flex-shrink: 0;
-    margin-right: 12.67rpx;
-}
-.bd-item-content {
-    padding: 14rpx 29.33rpx 13.33rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-.bd-item-title {
-    font-weight: bold;
-    font-size: 27rpx;
-    color: #333333;
-}
-.bd-item-bottom {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    width: 260rpx;
-}
-.bd-price {
-    font-size: 29.33rpx;
-    color: #F93434;
-    font-weight: bold;
-}
-.bd-price:after {
-  content:'起';
-  color: #999999;
-  font-size: 23rpx;
-  font-weight: 700;
-}
-.bd-price::before {
-  content:'￥';
-  font-size: 23rpx;
-}
-.bd-distance {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #999999;
-}
-
-.buyMovie {
-    width: 160rpx;
-    height: 56rpx;
-    background: #FF4848;
-    color: #fff;
-    border-radius: 20rpx;
-    text-align: center;
-    line-height: 56rpx;
-}
-
-.bg1 {
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-}
-.bg2 {
-  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
-}
-.bg3 {
-  background: linear-gradient(180deg, #E0F7DC, #A0F292);
-}
-.bg4 {
-  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
-}
-
-.hdrlNavList::-webkit-scrollbar{
-  display:none;
-}
-.hdrlList::-webkit-scrollbar{
-  display:none;
-}
-.bottom-box::-webkit-scrollbar{
-  display:none;
-}
-.slide-box::-webkit-scrollbar{
-  display:none;
-}
-.pbservice::-webkit-scrollbar{
-  display:none;
-}
-.textOver3 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
-.public-box {
-  width: 593.33rpx;
-  height: 266.67rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-}
-.one::-webkit-scrollbar{
-  display:none;
-}
-
-
-.date-container{
-    position: relative;
-}
-.nowDate{
-    display: flex;
-    position: absolute;
-    left: 228.77rpx;
-    bottom: 7.33rpx;
-}
-
-.nowDate>view{
-
-    width: 44rpx;
-    height: 44rpx;
-    border-radius: 7rpx;
-    text-align: center;
-    line-height: 44rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    font-size: 29rpx;
-    color: #FFFFFF;
-}
-.nowDate .num{
-    background: #FFEBD5;
-    color: #111111;
-
-    font-family: PingFang SC;
-    /* font-weight: bold; */
-    font-size: 29rpx;
-    color: #111111;
+.xsth-left>image{
+    max-width: 100%;
+    overflow: hidden;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 0a13832..1c5ca67 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,15 +7,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "首页",
-          "pathName": "pages/list/six/index",
+          "name": "subPackages/index/index",
+          "pathName": "subPackages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "subPackages/indexs/index",
-          "pathName": "subPackages/indexs/index",
+          "name": "首页",
+          "pathName": "pages/list/six/index",
           "query": "",
           "launchMode": "default",
           "scene": null
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
index 4cc4882..8c339b2 100644
--- a/subPackages/indexGQ/index.js
+++ b/subPackages/indexGQ/index.js
@@ -98,35 +98,46 @@ Page({
     bdList:[
         {
             bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游
-            url:'https://m.cloud.sz-trip.com/OneDayTravelNew',
-            path:'',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点
+            url:'',
+            path:'/pages/list/scene/index',
+            list: [],
+            
         },
         {
             bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可
-            path:'/pages/list/scene/index',
+            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品
+            path:'/pages/list/night/index',
             url:'',
+            list: [],
+            
         },
         {
             bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
             url:'',
             path:'/pages/list/theatre/index',
+            list: [],
+            
         },
         {
             bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
-            path:'/pages/list/techan/index',
+            path:'/subPackages/techanNew/index',
             url:'',
+            list: [],
+            
         },
       
       
     ],
-    list1:[], //非玩-景点
-    list2:[], //非买-文创
-    list3:[], //非游-一日游
-    list4:[], //非看-剧场演出
+    list1:[], //游-景点
+    list2:[], //非晚-夜游
+    list3:[], //非看-剧场演出
+    list4:[], //非买-文创
+    
+    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
+    
 	},
 	onLoad: function(options) {
 		this.getHeight()
@@ -239,15 +250,15 @@ Page({
     this.getWeather()
   },
   gobdDetail(e) {
-    console.log(e);
-    let url = e.currentTarget.dataset.url
-    wx.navigateTo({
-      url: url
-    })
+    let item = e.currentTarget.dataset.item
+    // wx.navigateTo({
+    //   url: url
+    // })
+    util.gotoDetail(item)
   },
   getList() {
     let bdList = this.data.bdList
-    // 非玩不可--景点
+    // 游--景点
     commonApi._post("scene/get_scene_by_tag",{
       tag_id:"4",
       limit:6,
@@ -258,6 +269,7 @@ Page({
       title:'',
       area_id:''
     }).then(res=>{
+      console.log('景点', res)
       res.data.list.map(item => {
         if (item.distance || item.distance == 0) {
           if (item.distance >= 1000) {
@@ -267,30 +279,36 @@ Page({
           }
         }
       })
+      bdList[0].list = res.data.list
       this.setData({
-        list1:res.data.list
+        list1:res.data.list,
+        bdList: bdList
       })
     })
     // 非买不可--文创
     commonApi._post('product/get_product_by_tag',{
-      tag_id: 326,
+        product_model: 'post',
       offset: 0,
       limit: 6,
     }).then(res=>{
+        bdList[3].list = res.data.list
       this.setData({
-        list2:res.data.list
+        list4:res.data.list,
+        bdList: bdList
       })
     })
     // 非游不可--线路一日游
     commonApi._post('product/get_product_by_tag',{
-      type_id: 23,
-      tag_id:17,
+    //   type_id: 23,
+      tag_id: "10,11,12",
       offset: 0,
       limit: 6,
       sort: 'weight'
     }).then(res=>{
+        bdList[1].list = res.data.list
       this.setData({
-        list3:res.data.list
+        list2:res.data.list,
+        bdList: bdList
       })
     })
     // 非看不可--剧场演出
@@ -304,8 +322,10 @@ Page({
       lon:this.data.lon,
       title:''
     }).then(res=>{
+        bdList[2].list = res.data.list
       this.setData({
-        list4:res.data.list
+        list3:res.data.list,
+        bdList: bdList
       })
     })
   },
@@ -369,6 +389,11 @@ Page({
       lon: this.data.lon,
       page_num: 5
     }).then(res => {
+        res.data.rows.forEach(v=>{
+            if (!v.post_url) {
+                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+            }
+        })
       this.setData({
         hdrlList:res.data.rows
       })
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index f36a82d..ed9f76b 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -20,21 +20,27 @@
 </view>
 <view style="position:relative;z-index: 1;" >
   <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
-    <block wx:for="{{banner}}" wx:key="this">
+    <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
   <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
   </view>
 </view>
-<view class="content">
+<view class="content" wx:if="{{!isTest}}">
   <!-- 活动日历 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/uploads/20240923/00c7635dd9648e9dc4d0d044c06f495c.png"></image>
+  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20240925/9d10d5ff4a5314573328dd6cdab67b82.png"></image>
     <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+    <view class="nowDate"> 
+        <view class="num">{{nowDate[0]}}</view>
+        <view>月</view>
+        <view class="num">{{nowDate[1]}}</view>
+        <view>日</view>
+    </view>
   </view>
   <view class="hdrlNavList">
     <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
@@ -43,9 +49,10 @@
   </view>
   <view wx:if="{{hdrlNavIndex!=4}}">
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
         <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
             <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
@@ -56,10 +63,12 @@
   </view>
   <view wx:else>
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
         <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
+          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
+          
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
             <view>{{item.title}}</view>
             <view style="display: flex;justify-content: flex-end;">
               <view class="buyMovie">去购票 ></view>
@@ -80,8 +89,8 @@
     </view>
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx;width: fit-content;">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
@@ -90,7 +99,7 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
             <view class="text">夜游苏州</view>
           </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
             <view class="text">文创特产</view>
           </view>
@@ -111,7 +120,7 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
             <view class="text">一卡游</view>
           </view>
-          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
@@ -127,14 +136,14 @@
   <view class="small-swiper-box">
     <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
       bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="*this">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
           <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
     <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
     </view>
   </view>
   <!-- 游苏州 -->
@@ -149,25 +158,32 @@
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
+        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
-        </view>
+        </view> -->
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
-          <view>实时路况</view>
+        
+        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+            data-path="/pages/pbService/bike/index?type=1">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240925/38ee5d21e1eb4ef2379c3d81edfb3799.png" mode="widthFix"></image>
+            <view>找厕所</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
@@ -201,14 +217,15 @@
   <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
+  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
     <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
     <view class="bd-top">
-      <image class="bd-type" src="{{item.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
+      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{bdItem}}">更多 ></view>
     </view>
-    <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
-      <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
+    <view style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
+        wx:key="id" data-item="{{item}}">
         <view class="bd-index">{{index+1}}</view>
         <view class="bd-item">
           <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
@@ -218,70 +235,136 @@
             </view>
             <view class="bd-item-bottom">
               <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view>
+              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view wx:if="{{index==1}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
-            </view>
+
+  </view>
+ </view>
+
+</view>
+
+<view class="content" wx:else>
+    <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" >
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image  data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
+      <image  class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
           </view>
+          
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          
+          
         </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
       </view>
     </view>
-    <view wx:if="{{index==2}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
-            </view>
-          </view>
-        </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+    </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <view wx:if="{{index==3}}" style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <view class="bd-distance" wx:if="{{item.distance}}">{{(item.distance/1000)}}km</view>
-            </view>
-          </view>
+    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <view>行李寄存</view>
         </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
+
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view> -->
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
+    </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" >
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
       </view>
     </view>
   </view>
- </view>
-
-
-
 </view>
 
+
 <!-- 开屏页 -->
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
index 66c98e6..d9479c5 100644
--- a/subPackages/indexGQ/index.wxss
+++ b/subPackages/indexGQ/index.wxss
@@ -571,7 +571,7 @@ page {
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 24rpx;
-  background: #078565;
+  background: #FF4848;
   height: 8rpx;
   border-radius: 4rpx;
 }
@@ -1040,10 +1040,13 @@ page {
   /* margin-bottom: 26.67rpx; */
 }
 
-
+.ggfw-list{
+    display: flex;
+    justify-content: space-around;
+}
 .ggfw {
-  width: 132rpx;
-  margin:0 22rpx;
+  width: auto;
+  margin:0;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
@@ -1182,7 +1185,7 @@ page {
   height: 53rpx;
   background: rgba(255,250,245,0.3);
   border-radius: 13rpx;
-  border: 1px solid #FFFFFF;
+  /* border: 1px solid #FFFFFF; */
 
   font-size: 32rpx;
   color: #FFFFFF;
@@ -1205,12 +1208,13 @@ page {
   background-size: 100% 100%;
 }
 .hdrlItem-img {
-  width: 280rpx;
+  width: 240rpx;
   height: 213rpx;
   background: #8C8C8C;
   border-radius: 13rpx;
   flex-shrink: 0;
   margin-right: 12rpx;
+  overflow: hidden;
 }
 .hdrlItem-content {
   display: flex;
@@ -1445,4 +1449,37 @@ page {
 }
 .one::-webkit-scrollbar{
   display:none;
+}
+
+
+.date-container{
+    position: relative;
+}
+.nowDate{
+    display: flex;
+    position: absolute;
+    left: 228.77rpx;
+    bottom: 7.33rpx;
+}
+
+.nowDate>view{
+
+    width: 44rpx;
+    height: 44rpx;
+    border-radius: 7rpx;
+    text-align: center;
+    line-height: 44rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 29rpx;
+    color: #FFFFFF;
+}
+.nowDate .num{
+    background: #FFEBD5;
+    color: #111111;
+
+    font-family: PingFang SC;
+    /* font-weight: bold; */
+    font-size: 29rpx;
+    color: #111111;
 }
\ No newline at end of file

From 7bfec33aa8d7a953173ebce4faca77f790c42c84 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 16 Oct 2024 13:13:48 +0800
Subject: [PATCH 218/471] =?UTF-8?q?isTest=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 8daa8ad..2d8e4ba 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.isTest148? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 0b0ab4bcd90e172793ae0cb0a2dc8d5c4f3178a9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 22 Oct 2024 09:48:05 +0800
Subject: [PATCH 219/471] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=B0=B1=E7=99=BB=E5=BD=95fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js          |  7 ++++---
 pages/login/index.js          | 24 +++++++++++++++++++++++-
 pages/login/index.wxml        | 10 ++++++++++
 pages/login/index.wxss        | 15 +++++++++++++++
 pages/user/bindtel/index.js   | 17 ++++++++++++++++-
 pages/user/bindtel/index.wxml | 12 ++++++++++++
 pages/user/bindtel/index.wxss | 32 +++++++++++++++++++++++++++++++-
 7 files changed, 111 insertions(+), 6 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 315ced7..bb5c43c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -173,8 +173,9 @@ Page({
 		this.setData({
 			month: (this.data.months[today.getMonth()]).toUpperCase(),
 			date: today.getDate()
-		})
-		this.getVideoPrize()
+        })
+        // 调用接口如果token过期会导致一进入就要登陆
+		// this.getVideoPrize()
 		this.getXpthList()
 	},
 	getHeight() {
@@ -822,7 +823,7 @@ Page({
 	// 获取短视频大赛是否中奖 中奖详情
 	getVideoPrize() {
 		let user_id = wx.getStorageSync('jstrip_userid');
-		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
 		commonApi.user_post('actonline/video_act/getRaffle', {
 			act_id: 5
 		}).then(res => {
diff --git a/pages/login/index.js b/pages/login/index.js
index e3b739c..d6166db 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -11,7 +11,9 @@ Page({
   data: {
     err:null,
     canIUseGetUserProfile:false,
-    event: ''
+    event: '',
+
+    isApproval: false
   },
 
   /**
@@ -45,6 +47,15 @@ Page({
     })
   },
   getUserProfile:function(e){
+    if (!this.data.isApproval) {
+        wx.showToast({
+            title: '请先阅读并同意相关协议',
+            icon: "none"
+        });
+        return
+    }
+
+
     wx.getUserProfile({
       desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
       success: (res) => {
@@ -53,6 +64,14 @@ Page({
     })
   },
   getUserInfo:function(e,type){
+    if (!this.data.isApproval) {
+        wx.showToast({
+            title: '请先阅读并同意相关协议',
+            icon: "none"
+        });
+        return
+    }
+
     let that = this;
     if (e.detail && (!e.detail.userInfo)){
       wx.reLaunch({
@@ -113,6 +132,9 @@ Page({
     let id = e.currentTarget?e.currentTarget.dataset.clickid:e;
     wx.uma.trackEvent(id)
   },
+  changeIsApproval:function (e) {
+      this.setData({isApproval: !this.data.isApproval})
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 281becb..a97a59e 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -6,6 +6,16 @@
   <icon class="iconfont icon-gou1"></icon>
   <text>获得你的公开信息（昵称、头像、地区及性别）</text>
 </view>
+<view class="login-tip-box">
+  <view class="select-icon" wx:if="{{!isApproval}}" bindtap="changeIsApproval"></view>
+  <icon class="iconfont icon-gou1" wx:else bindtap="changeIsApproval"></icon>
+  <view>
+    <text>选中代表您已阅读同意</text>
+    <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=9">《君到苏州用户协议》</navigator>
+    <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=12">《君到苏州隐私政策》</navigator>
+    <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=14">《君到苏州第三方共享信息清单》</navigator>
+  </view>
+</view>
 <!-- <view>{{err}}</view> -->
 <view class="btn-box">
   <button bindtap="cancel" type="default" >取消</button>
diff --git a/pages/login/index.wxss b/pages/login/index.wxss
index fd661a0..70a7d8b 100644
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -37,4 +37,19 @@ page {
 }
 .btn-box button {
   width: 400rpx;
+}
+
+.select-icon{
+    border-radius: 50%;
+    color: transparent;
+    border: 1px solid #666;
+    width: 24rpx;
+    height: 24rpx;
+    flex-shrink: 0;
+    margin-right: 34rpx;
+    margin-top: 7rpx;
+}
+.navigator-file{
+    display: inline-block;
+    color: #0b898e;
 }
\ No newline at end of file
diff --git a/pages/user/bindtel/index.js b/pages/user/bindtel/index.js
index 0b6fa7a..ce73a3f 100644
--- a/pages/user/bindtel/index.js
+++ b/pages/user/bindtel/index.js
@@ -16,7 +16,9 @@ Page({
     sendFlag:true,
     regToken:null,
     codeId:null,
-    imgCodeInfo:null
+    imgCodeInfo:null,
+
+    isApproval: false
   },
 
   /**
@@ -152,6 +154,15 @@ Page({
       })
       return false;
     }
+
+    if (this.data.regToken && !this.data.isApproval) {
+        wx.showToast({
+            title: '请先阅读并同意相关协议',
+            icon: "none"
+        });
+        return
+    }
+
     let service = "user/changeMobile",data={smsCode:this.data.code,mobile:this.data.tel,smsCodeId:this.data.codeId},api = user.user_post;
     if(this.data.regToken){
       service = "user/wxBindPhoneAndLogin"
@@ -185,6 +196,10 @@ Page({
     })
   },
 
+  changeIsApproval:function (e) {
+    this.setData({isApproval: !this.data.isApproval})
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/user/bindtel/index.wxml b/pages/user/bindtel/index.wxml
index 999a0b6..0e252e3 100644
--- a/pages/user/bindtel/index.wxml
+++ b/pages/user/bindtel/index.wxml
@@ -18,6 +18,18 @@
       <button style="font-size:30rpx;background:#fff;color:#0B898E" type="primary" size="mini" bindtap="getCode">{{buttonText}}</button>
     </view>
   </view>
+
+  <view class="login-tip-box" wx:if="{{regToken}}">
+    <view class="select-icon" wx:if="{{!isApproval}}" bindtap="changeIsApproval"></view>
+    <icon class="iconfont icon-gou1" wx:else bindtap="changeIsApproval"></icon>
+    <view>
+        <text>选中代表您已阅读同意</text>
+        <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=9">《君到苏州用户协议》</navigator>
+        <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=12">《君到苏州隐私政策》</navigator>
+        <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=14">《君到苏州第三方共享信息清单》</navigator>
+    </view>
+  </view>
+
   <view class="btn" bindtap="submit">{{regToken?'绑定':'保存修改'}}</view>
   <button wx:if="{{regToken}}" type="default" bindtap="cancel">取消</button>
   <!-- <button class="btn" type="primary" bindtap="submit"></button> -->
diff --git a/pages/user/bindtel/index.wxss b/pages/user/bindtel/index.wxss
index fdbbcda..b7f2e59 100644
--- a/pages/user/bindtel/index.wxss
+++ b/pages/user/bindtel/index.wxss
@@ -38,4 +38,34 @@
 .code-img {
   width: 150rpx;
   height: 60rpx;
-}
\ No newline at end of file
+}
+
+.login-tip-box {
+    display: flex;
+    align-items: flex-start;
+    margin: 0 20rpx;
+    font-size: 28rpx;
+    margin-top: 40rpx;
+    line-height: 40rpx;
+  }
+  .login-tip-box .icon-gou1 {
+    line-height: 80rpx;
+    margin-top: -20rpx;
+    margin-right: 30rpx;
+    color: #666;
+  }
+  
+  .select-icon{
+      border-radius: 50%;
+      color: transparent;
+      border: 1px solid #666;
+      width: 24rpx;
+      height: 24rpx;
+      flex-shrink: 0;
+      margin-right: 34rpx;
+      margin-top: 7rpx;
+  }
+  .navigator-file{
+      display: inline-block;
+      color: #0b898e;
+  }
\ No newline at end of file

From 50f815cfa7d68c74d5ee9a107f964ba2bd199715 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 23 Oct 2024 16:02:55 +0800
Subject: [PATCH 220/471] 1

---
 app.js                      | 2 +-
 project.private.config.json | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 2d8e4ba..8daa8ad 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.isTest149? true : false;
+      data.isTest = data.isTest148? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/project.private.config.json b/project.private.config.json
index 1c5ca67..08edf69 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/user/bindtel/index",
+          "pathName": "pages/user/bindtel/index",
+          "query": "regToken=123456",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/index/index",
           "pathName": "subPackages/index/index",

From 310cfb26c82b51b3e3ebd503b61270338b5e0229 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 1 Nov 2024 17:11:12 +0800
Subject: [PATCH 221/471] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=9C=88=E4=BB=BDfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      | 2 +-
 pages/order/road/index.wxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 8daa8ad..2d8e4ba 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.isTest148? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/road/index.wxml b/pages/order/road/index.wxml
index 9d857f5..35cbc24 100644
--- a/pages/order/road/index.wxml
+++ b/pages/order/road/index.wxml
@@ -2,7 +2,7 @@
 <title title="预订选择"></title>
 <view class="date-all-box">
   <view class="month-box">
-    <view bindtap="changeMonth" data-index="{{index}}" class="month-item{{monthIndex==index?' active':''}}" wx:for="{{month}}">{{item}}月</view>
+    <view bindtap="changeMonth" data-index="{{index}}" class="month-item{{monthIndex==index?' active':''}}" wx:for="{{month}}">{{item==0?'12':item}}月</view>
     <!-- <view class="month-item">12月</view> -->
   </view>
   <view class="day-header">

From 786c29034743cb759f92ae3c617549f67f753315 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 12 Nov 2024 15:05:51 +0800
Subject: [PATCH 222/471] 1

---
 app.js                              | 2 +-
 pages/info/postProductInfo/index.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 2d8e4ba..8daa8ad 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.isTest149? true : false;
+      data.isTest = data.isTest148? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 3afaff8..22e9eb8 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -75,7 +75,8 @@ Page({
             res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
 
             let resData = res.data
-            if (resData.product_data) {
+            try {
+            if (resData.product_data && resData.is_package==1) {
                 for(let key in resData.product_data) {
                     resData.product_data[key] = JSON.parse(resData.product_data[key])
                 }
@@ -89,6 +90,7 @@ Page({
                 //     resData.product_data["食"] = JSON.parse(resData.product_data["食"])
                 // }
             }
+            } catch(e) {} 
 
             this.setData({
                 info: resData,

From b7f83cd6bcb6b494d69bb62efc9e8a7acadfea21 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 15 Nov 2024 13:48:24 +0800
Subject: [PATCH 223/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=B9=BF=E5=91=8A=E4=BD=8D?=
 =?UTF-8?q?=E3=80=81=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=A4=8D=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |   2 +-
 pages/component/orderAdv/orderAdv.js       | 147 +++++++++++++++++++++
 pages/component/orderAdv/orderAdv.json     |   4 +
 pages/component/orderAdv/orderAdv.wxml     |   5 +
 pages/component/orderAdv/orderAdv.wxss     |  12 ++
 pages/user/order/sceneOrderInfo/index.js   |  11 ++
 pages/user/order/sceneOrderInfo/index.json |   4 +-
 pages/user/order/sceneOrderInfo/index.wxml |   6 +-
 pages/user/order/sceneOrderInfo/index.wxss |  13 ++
 9 files changed, 200 insertions(+), 4 deletions(-)
 create mode 100644 pages/component/orderAdv/orderAdv.js
 create mode 100644 pages/component/orderAdv/orderAdv.json
 create mode 100644 pages/component/orderAdv/orderAdv.wxml
 create mode 100644 pages/component/orderAdv/orderAdv.wxss

diff --git a/app.js b/app.js
index 2d8e4ba..215d2b7 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.isTest149? true : false;
+      data.isTest = data.isTest150? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/orderAdv/orderAdv.js b/pages/component/orderAdv/orderAdv.js
new file mode 100644
index 0000000..89c9b32
--- /dev/null
+++ b/pages/component/orderAdv/orderAdv.js
@@ -0,0 +1,147 @@
+// pages/component/TitleHeader.js
+import commonApi from "../../../utils/https/common.js"
+import util from '../../../utils/util'
+var app = getApp()
+Component({
+  options: {
+    styleIsolation: 'apply-shared',
+    addGlobalClass: true
+  },
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    ids:{
+      type: String,
+      value: ""
+    }
+  },
+  observers:{
+    'ids': function(newVal,oldVal){
+      console.log('newVal--------',newVal)
+      console.log('oldVal--------',oldVal)
+      if (newVal) {
+        this.getAdv(newVal)
+      }
+    }
+  },
+  lifetimes: {
+    created() {
+      this.data.advList=[]
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    advList: [],
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    getAdv() {
+      this.data.advList = []
+      commonApi._post("adv/getAdv", {
+        position: 5,
+        type_id: 3,
+        product_id: this.data.ids
+      }).then(res => {
+        try {
+          this.setData({
+            advList: res.data
+          })
+        } catch (error) {
+          console.log(error);
+        }
+        console.log('advList',this.data.advList);
+      })
+    },
+    bannerClick: function(e) {
+    	if (this.data.isTest) return;
+    	let item = e.currentTarget.dataset.item;
+    	switch (item.jump_type) {
+    		case 0:
+    			break;
+    		case 1:
+    			util.gotoDetail(item.product_model)
+    			break;
+    		case 2:
+    			if (item.front_model && item.front_model.mini) {
+    				wx.navigateTo({
+    					url: "/" + item.front_model.mini
+    				})
+    			}
+    			break;
+    		case 3:
+    			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+    				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+    				// 外部h5
+    				app.globalData.weburl = item.tdata.url;
+    				wx.navigateTo({
+    					url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+    						.url)
+    				})
+    			} else {
+    				let page = item.tdata.url.split("/");
+    				page = page[page.length - 1].split("?")
+    				let url = this.data.urltopage[page[0]];
+    				if (url && url.indexOf('map') != -1) {
+    					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+    							'cinema', 'academes'
+    						],
+    						type = page[1] ? page[1].split("=") : [];
+    					wx.reLaunch({
+    						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+    							null)
+    					})
+    				} else if (url) {
+    					wx.navigateTo({
+    						url: url,
+    					})
+    				} else {
+    					app.globalData.weburl = item.tdata.url;
+    					wx.navigateTo({
+    						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+    							.tdata.url)
+    					})
+    				}
+    			}
+    			break;
+    		case 4:
+    			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+    				// 如果是苏心游的小程序 直接把authCode带过去
+    				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+    					let weburl = item.tdata.page
+    					if (weburl.indexOf('?') != -1) {
+    						weburl += '&authCode=' + res.data;
+    					} else {
+    						weburl += '?authCode=' + res.data
+    					}
+    					wx.navigateToMiniProgram({
+    						appId: item.tdata.appid,
+    						path: weburl
+    					})
+    				}).catch(err => {
+    					wx.navigateToMiniProgram({
+    						appId: item.tdata.appid,
+    						path: item.tdata.page
+    					})
+    				})
+    			} else {
+    				wx.navigateToMiniProgram({
+    					appId: item.tdata.appid,
+    					path: item.tdata.page
+    				})
+    			}
+    			break;
+    		default:
+    			break;
+    	}
+    	return;
+    
+    },
+  },
+  
+})
\ No newline at end of file
diff --git a/pages/component/orderAdv/orderAdv.json b/pages/component/orderAdv/orderAdv.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/component/orderAdv/orderAdv.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/component/orderAdv/orderAdv.wxml b/pages/component/orderAdv/orderAdv.wxml
new file mode 100644
index 0000000..dbbb929
--- /dev/null
+++ b/pages/component/orderAdv/orderAdv.wxml
@@ -0,0 +1,5 @@
+<view>
+	<view class="box" wx:if="{{advList.length > 0}}">
+		<image src="{{advList[0].head_img}}" mode="scaleToFill" bindtap="bannerClick" data-item="{{advList[0]}}"></image>
+	</view>
+</view>
\ No newline at end of file
diff --git a/pages/component/orderAdv/orderAdv.wxss b/pages/component/orderAdv/orderAdv.wxss
new file mode 100644
index 0000000..27cccce
--- /dev/null
+++ b/pages/component/orderAdv/orderAdv.wxss
@@ -0,0 +1,12 @@
+.box {
+	margin: 20rpx 30rpx;
+	height: 133rpx;
+	border-radius: 13rpx;
+	padding: 0;
+}
+
+.box >image {
+	width: 100%;
+	height: 133rpx;
+	border-radius: 13rpx;
+}
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 9806bcb..f0f4a84 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -49,6 +49,17 @@ Page({
       })
     })
   },
+  copy:function(){
+    wx.setClipboardData({
+      data: this.data.codeImgs[this.data.codeIndex].code,
+      success: function (res) {
+        wx.showToast({
+          title: '复制成功',
+          icon:'success'
+        })
+      }
+    })
+  },
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0,arr = [];
     this.data.info.order_product_list.forEach(qrcode=>{
diff --git a/pages/user/order/sceneOrderInfo/index.json b/pages/user/order/sceneOrderInfo/index.json
index cef374c..807fd96 100644
--- a/pages/user/order/sceneOrderInfo/index.json
+++ b/pages/user/order/sceneOrderInfo/index.json
@@ -1,7 +1,7 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "sptj":"/pages/component/proRec/proRec"
-
+    "sptj":"/pages/component/proRec/proRec",
+	"advBox":"/pages/component/orderAdv/orderAdv"
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 9078068..29da784 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -26,10 +26,14 @@
     </view>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
-  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}</view>
+  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}  <view class="copy-box" bindtap="copy">复制</view></view>
   <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
 </view>
 
+<view wx:if="{{info && codeImgs.length>0}}">
+	<advBox ids="{{ ids }}"></advBox>
+</view>
+
 <sptj ids="{{ ids }}"></sptj>
 
 <!-- 景点订单详情需要这个 -->
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 258adb3..a7621ab 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -251,6 +251,8 @@ page {
   font-size: 30rpx;
   font-weight: 500;
   margin: 25rpx;
+  display: flex;
+  justify-content: center;
 }
 .code-btn {
   width: 220rpx;
@@ -338,4 +340,15 @@ page {
   background: #FFFFFF;
   border-radius: 50%;
   color: #0B898E;
+}
+.copy-box {
+	width: 73rpx;
+	line-height: 35rpx;
+	border-radius: 7rpx;
+	border: 1rpx solid #09898C;
+	margin-left: 15rpx;
+	text-align: center;
+	font-weight: 500;
+	font-size: 23rpx;
+	color: #0E8790;
 }
\ No newline at end of file

From fe35e641b6ede28ae4455ebfe4621986ac5ac2c4 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 15 Nov 2024 15:11:30 +0800
Subject: [PATCH 224/471] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=97=B6=20=E5=A4=9C=E6=B8=B8=E8=8B=8F=E5=B7=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 408bb8a..8305409 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -597,7 +597,7 @@
     </view>
   
    
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item" wx:if="{{false}}">
         <!-- 夏季修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->

From 0c61222316d8987eaa08908ba431fb781cd2afe7 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 18 Nov 2024 10:45:54 +0800
Subject: [PATCH 225/471] 1

---
 pages/list/theatre/index.js   |  14 +++++
 pages/list/theatre/index.wxml |  30 ++++++----
 pages/list/theatre/index.wxss | 102 +++++++++++++++++++---------------
 utils/util.js                 |   2 +
 4 files changed, 94 insertions(+), 54 deletions(-)

diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js
index 97dc1fa..e65e066 100644
--- a/pages/list/theatre/index.js
+++ b/pages/list/theatre/index.js
@@ -9,6 +9,7 @@ Page({
    */
   data: {
     list:[],
+    tagList: [], // 父标签6
     total:1,
     type:1,
     sort:["","weight","distance","weight","price"],
@@ -27,6 +28,7 @@ Page({
         withShareTicket: true,
         menus: ['shareAppMessage', 'shareTimeline']
       })
+    //   this.getTags()
     this.getList();
   },
   search:function(e){
@@ -101,6 +103,18 @@ Page({
     this.getList();
   },
 
+  // 获取子标签
+  getTags () {
+    commonApi._post("",{
+        tag_id:"6",
+      }).then(res=>{
+          let resData = res.data.list || []
+        this.setData({
+            tagList:resData
+        })
+      })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index 849b02e..95803f5 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -1,20 +1,30 @@
 <!--pages/list/theatre/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<search bind:onload="search"></search>
-<view class="sale-types">
-  <view class="sale-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">综合排序</view>
-  <view class="sale-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">距离最近</view>
-  <view class="sale-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">销量最高</view>
-  <view class="sale-type{{type==4?' active':''}}" bindtap="changeType" data-type="4">价格最低</view>
+<view class="my-header-search">
+    <search bind:onload="search" transparent="1"></search>
+    <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
+
+    <view class="sale-types no-scrollbar">
+        <view class="sale-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">全部</view>
+        <view class="sale-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">距离最近</view>
+        <view class="sale-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">销量最高</view>
+        <view class="sale-type{{type==4?' active':''}}" bindtap="changeType" data-type="4">价格最低</view>
+        <view class="sale-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">销量最高</view>
+        <view class="sale-type{{type==4?' active':''}}" bindtap="changeType" data-type="4">价格最低</view>
+    </view>
+
 </view>
-<view style="height:87rpx"></view>
+
+
+<view style="height:580rpx"></view>
 <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
   <image src="{{item.headimg}}" mode="aspectFill"></image>
-  <view class="info textOver">
-    <view class="textOver title">{{item.title}}</view>
+  <view class="info">
+    <view class="textOver2 title">{{item.title}}</view>
     <view class="textOver subtitle">{{item.subtitle?item.subtitle:""}}</view>
+    <view class="textOver subtitle">{{item.supplier_address}}</view>
     <view class="tags textOver">
-      <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view>
+      <!-- <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view> -->
       <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
     </view>
   </view>
diff --git a/pages/list/theatre/index.wxss b/pages/list/theatre/index.wxss
index bfba264..e663263 100644
--- a/pages/list/theatre/index.wxss
+++ b/pages/list/theatre/index.wxss
@@ -1,56 +1,63 @@
 /* pages/list/theatre/index.wxss */
+page{
+    background: white;
+}
+
+.my-header-search{
+    background: white;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+}
+.my-header-search .bg-box .title-header{
+    color: #999;
+}
+.my-header-search .title-header .icon-fanhui1{
+    color: #333 !important;
+}
+.my-header-search .heaimg{
+    width: 100%;
+    display: block;
+}
+
 .sale-types {
   display: flex;
-  justify-content: space-around;
   align-items: center;
-  height: 86rpx;
-  position: fixed;
-  left: 0;
-  right: 0;
-  border-bottom: 1rpx solid #ccc;
-  font-size: 29rpx;
-  color: #333;
-  background: white;
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding:36rpx 27rpx 44rpx;
 }
 .sale-type {
-  position: relative;
-  width: 25%;
-  text-align: center;
-  height: 86rpx;
-  line-height: 86rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 29rpx;
+    color: #111111;
+    padding: 9rpx 18rpx;
+    flex-shrink: 0;
+    margin-right: 7rpx;
 }
 .sale-type.active {
-  color: #000;
-  font-size: 33rpx;
-  font-weight: 500;
-}
-.sale-type.active::after {
-  content: "1";
-  font-size: 0;
-  display: block;
-  position: absolute;
-  width: 46rpx;
-  height: 5rpx;
-  background: #0B898E;
-  border-radius: 3rpx;
-  left: 50%;
-  margin-left: -23rpx;
-  bottom: 0;
+    border-radius: 30rpx;
+    border: 1px solid #0B898E;
+    color: #0B898E;
+    font-weight: bold;
 }
+
+
 .item {
-  margin: 30rpx 25rpx;
+  margin: 0rpx 27rpx 30rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 15rpx 13rpx;
-  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
-  border-radius: 10rpx;
 }
 .item image {
-  width: 247rpx;
-  height: 200rpx;
-  margin-right: 30rpx;
-  flex-shrink: 0;
+    width: 187rpx;
+    height: 240rpx;
+    background: #D1D7CB;
+    border-radius: 13rpx;
+    margin-right: 30rpx;
+    flex-shrink: 0;
 }
 .tags {
   display: flex;
@@ -70,9 +77,10 @@
   text-overflow: ellipsis;
 }
 .price {
-  font-size: 20rpx;
-  color: #D62828;
-  text-align: right;
+    font-weight: bold;
+    font-size: 21rpx;
+  color: #E52910;
+  text-align: left;
   flex: 1;
 }
 .price text:nth-child(1){
@@ -85,18 +93,24 @@
 .price text:nth-child(3){
   color: #8D8D8D;
   margin-left: 4rpx;
+  font-weight: 500;
 }
 .info {
   flex: 1;
+  width: 1rpx;
 }
 .info .title {
   font-weight: 500;
   font-size: 31rpx;
   color: #000;
-  margin-bottom: 52rpx;
+  margin-bottom: 32rpx;
 }
 .info .subtitle {
   font-size: 24rpx;
   color: #999999;
-  margin-bottom: 30rpx;
-}
\ No newline at end of file
+  margin-bottom: 19rpx;
+}
+
+
+
+
diff --git a/utils/util.js b/utils/util.js
index aa7c720..49c0b5b 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -187,6 +187,8 @@ const gotoDetail = (item,isPagePoint) =>{
       return
   }
 
+  console.log(item)
+
   switch(item.type){
     case "tenscenic":
      

From 91c06ed1bd7e8c19cb58863be206d5130bfabcac Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 21 Nov 2024 09:22:47 +0800
Subject: [PATCH 226/471] =?UTF-8?q?=E5=89=A7=E5=9C=BA=E6=BC=94=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.wxss                       |  13 +
 pages/info/showInfo/index.js   | 786 ++++++++++++++++++++++++----
 pages/info/showInfo/index.json |   4 +-
 pages/info/showInfo/index.wxml | 242 +++++++--
 pages/info/showInfo/index.wxss | 918 +++++++++++++++++++++++++++++++--
 pages/list/theatre/index.js    |  53 +-
 pages/list/theatre/index.wxml  |   7 +-
 pages/order/show/index.js      | 158 +++++-
 pages/order/show/index.wxml    |  59 ++-
 pages/order/show/index.wxss    | 241 ++++++---
 utils/https.js                 |   4 +-
 11 files changed, 2175 insertions(+), 310 deletions(-)

diff --git a/app.wxss b/app.wxss
index 779e439..19c1009 100644
--- a/app.wxss
+++ b/app.wxss
@@ -144,6 +144,19 @@ page{
 .no-scrollbar::-webkit-scrollbar{
     display: none;
 }
+
+.flex-1{
+    flex: 1;
+}
+.w-1rpx{
+    width: 1rpx;
+}
+.h-1rpx{
+    height: 1rpx;
+}
+.flex-shrink-0{
+    flex-shrink: 0;
+}
 /* page {
   filter: grayscale(100%);
 } */
\ No newline at end of file
diff --git a/pages/info/showInfo/index.js b/pages/info/showInfo/index.js
index ec51cf5..50f66d4 100644
--- a/pages/info/showInfo/index.js
+++ b/pages/info/showInfo/index.js
@@ -1,115 +1,709 @@
-// pages/info/showInfo/index.js
+// pages/info/roadInfo/index.js
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
 import commonApi from "../../../utils/https/common"
+import QRCode from '../../../utils/weapp-qrcode.js'
+import util from '../../../utils/util'
 let app = getApp()
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    info:null,
-    retailId:''
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    if(options.retailId){
-      this.setData({
-        retailId:options.retailId
-      })
-    }
-    commonApi.user_post('product/get_product_detail',{
-      id:options.id
-    }).then(res=>{
-      res.data.display_tags = (res.data.display_tags?res.data.display_tags.split(","):[]).splice(0,2);
-      this.setData({
-        info:res.data
-      })
-      this.BroswerRecord()
-    })
-  },
-  BroswerRecord:function(){
-    setTimeout(()=>{
-      if(app.globalData.uuid){
-        commonApi._post('browse/browse_record',{
-          type:"goods",
-          title:this.data.info.title,
-          drive:"mini",
-          source_id:this.data.info.id,
-          url:"/pages/info/showInfo/index?id="+this.data.info.id,
-          uuid:app.globalData.uuid
-        }).then(res=>{
-        })
-      }
-      else {
-        this.BroswerRecord();
-      }
-    },500)
-  },
-  order:function(){
-    if(this.data.info.sku.length==0){
-      wx.showToast({
-        title: '该演出暂时无法预约',
-        icon:'none'
-      })
-      return;
-    }
-    app.globalData.retailId = this.data.retailId;
-    app.globalData.couponInfo = null;
-    app.globalData.product = this.data.info;
-    wx.navigateTo({
-      url: '/pages/order/show/index?id='+this.data.id,
-    })
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        autoPlay: true,
+        fixed: false,
+        type: 1,
+        top: 0,
+        isLike: 0,
+        commentTotal: 0,
+        comment: [],
+        info: null,
+        skuFlag: null,
+        producNum: 1,
+        skuIndex: 0,
+        aniSkuIndex: -1,
+        retailId: "",
+        cartTop: 0,
+        cartImgInfo: null,
+        cartCount: 0,
+        shareImg: null,
+        showShareFlag: false,
+        allowance_data: null,
+        showAllowance: false,
+        tjList: [], //推荐商品列表
+        iShop: false,
+        supplierId: null,
+        showQrCode: false,
+        wxqrcode: null,
+
+        showDetail: false
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        //删除临时存储的联系人
+        wx.removeStorageSync('linkMan')
+        let rect = wx.getMenuButtonBoundingClientRect(),
+            that = this;
+        let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+        this.setData({
+            top: height,
+            id: options.id
+        })
+        // 获取购物车按钮的位置
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
+
+        if (options.retailId) {
+            this.setData({
+                retailId: options.retailId
+            })
+        }
+        commonApi._post("product/get_product_detail", {
+            id: options.id
+        }).then(res => {
+            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+            if (options.skuid) {
+                let sku = res.data.sku.find(item => item.id == options.skuid);
+                res.data.sku = [sku];
+            }
+            res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+            let resData = res.data
+            this.setData({
+                info: resData,
+                supplierId: res.data.supplier_id,
+                iShop: res.data.supplier_id ? true : false
+            })
+
+            this.BroswerRecord()
+        })
+        
+        // 推荐
+        commonApi._post("search/product_recommend", {
+            offset: 0,
+            limit: 6,
+            rand: true,
+            type: 'post',
+            product_ids:options.id,
+        }).then(res => {
+            try {
+                this.setData({
+                    tjList: res.data.list
+                })
+            } catch (error) {
+                console.log(error);
+            }
+        })
+    },
+    changeAllowance: function () {
+        this.setData({
+            showAllowance: !this.data.showAllowance
+        })
+    },
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "goods",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
+            }
+        }, 500)
+    },
+    like: function () {
+        let id = this.data.id,
+            isLike = this.data.isLike;
+        commonApi.user_post("product/" + (isLike == 1 ? "product_cancel_collection" : "product_collection"), {
+            product_id: id
+        }).then(res => {
+            if (res.code == 1) {
+                this.setData({
+                    isLike: isLike == 1 ? 0 : 1
+                })
+            }
+        })
+    },
+    changeMenu: function (e) {
+        let index = e.currentTarget.dataset.index,
+            that = this;
+        const query = wx.createSelectorQuery(); //创建节点查询器
+        query.select("#box" + index).boundingClientRect() //选择toViewid获取位置信息
+        query.selectViewport().scrollOffset() //获取页面查询位置的
+        query.exec(function (res) {
+            let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
+            wx.pageScrollTo({
+                scrollTop: scrollTop + 4,
+                duration: 0
+            })
+            that.setData({
+                type: index
+            })
+        })
+    },
+    onPageScroll: function (e) {
+        let that = this,
+            height = this.data.top;
+        let topHeight = height;
+        wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
+            if (rect.top <= topHeight) {
+                // 此时应该把menus固定在顶部
+                that.setData({
+                    fixed: true
+                })
+            } else {
+                that.setData({
+                    fixed: false
+                })
+            }
+            // 滚动时判断滚动到哪个部分了
+            const query = wx.createSelectorQuery(); //创建节点查询器
+            query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
+            query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
+            // query.select("#box4").boundingClientRect() //选择toViewid获取位置信息
+            let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
+            query.exec(function (res) {
+                try {
+                    if (res[2].top < minHeight) {
+                        that.setData({
+                            type: 3
+                        })
+                    }else if (res[1].top < minHeight) {
+                        that.setData({
+                            type: 2
+                        })
+                    } else {
+                        that.setData({
+                            type: 1
+                        })
+                    }
+                } catch(e) {}
+                
+            })
+        }).exec()
+
+    },
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: "cart"
+                })
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    console.log(res)
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+    },
+    hideSku: function () {
+        this.setData({
+            skuFlag: null,
+            cartImgInfo: null
+        })
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+    selectSku: function (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            skuIndex: index
+        })
+    },
+    showOrder: function () {
+        // if(this.data.info.sku.length==0){
+        //     wx.showToast({
+        //         title: '该演出暂时无法预约',
+        //         icon:'none'
+        //     })
+        //     return;
+        // }
+        app.globalData.couponInfo = null;
+        app.globalData.product = this.data.info;
+        app.globalData.retailId = this.data.retailId;
+
+        wx.navigateTo({
+            url: '/pages/order/show/index?id='+this.data.id,
+        })
+    },
+    order: function () {
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        commonApi.user_post("/product/checkStock", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+        }).then(res => {
+            if (res && res.code != 1) {
+                return;
+            } else {
+                if (this.data.skuFlag == 'order') {
+                    wx.setStorageSync('login_from', 'product_order_login')
+                    wx.setStorageSync('order_from', 'product_order_submit')
+                    app.globalData.couponInfo = null;
+                    // 购买
+                    let product = [{
+                        product: this.data.info,
+                        sku: this.data.info.sku[this.data.skuIndex],
+                        productNum: this.data.producNum
+                    }];
+                    app.globalData.postProduct = product;
+                    app.globalData.retailId = this.data.retailId;
+                    app.globalData.listName = null
+
+                    if (this.data.info.is_package) {
+                        app.globalData.product = product[0];
+                        wx.navigateTo({
+                            url: '/pages/order/WineSceneOrder/index',
+                        })
+
+                    } else {
+                        wx.navigateTo({
+                            url: '/pages/order/postOrder/index',
+                        })
+                    }
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
 
-  },
+                    
+                } else {
+                    let tag_id = this.data.info.tag_id,type = ''
+                    if (tag_id.includes(20) || tag_id.includes(19)) {  //文创
+                      type = '1'
+                    }else if (tag_id.includes(5)) { //非遗
+                      type = '2'
+                    }else {
+                      type = ''
+                    }
+                    commonApi.user_post("cart/add_sku", {
+                        sku_id: this.data.info.sku[this.data.skuIndex].id,
+                        num: this.data.producNum,
+                        type:type
+                    }).then(res => {
+                        if (res.code == 1) {
+                            commonApi.user_post('cart/get_list', {}).then(res => {
+                                this.setData({
+                                    cartCount: res.data.length
+                                })
+                            })
+                            // 加动效
+                            this.setData({
+                                skuFlag: null,
+                                aniSkuIndex: this.data.skuIndex,
+                                cartImgInfo: null
+                            })
+                            setTimeout(() => {
+                                this.setData({
+                                    aniSkuIndex: -1
+                                })
+                                wx.showModal({
+                                    title: "提示",
+                                    content: "去购物车结算？",
+                                    success: function (res) {
+                                        if (res.confirm) {
+                                            wx.navigateTo({
+                                                url: '/pages/user/cartlist/list',
+                                            })
+                                        }
+                                    }
+                                })
+                            }, 650)
+                        }
+                    })
+                }
+            }
+        })
+
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
+            commonApi.user_post("user/getMyInfo", {}).then(res => {
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+            })
+            return;
+        }
+        if (!this.data.shareImg) {
+            wx.showToast({
+                title: '图片生成中，稍后再试',
+                icon: 'none'
+            })
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
+        })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !this.data.showShareFlag
+                        })
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                console.log(res);
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
+            }
+        });
 
-  },
+    },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
+        }
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
 
-  },
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
+            })
+        })
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
+            })
+        })
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = "￥" + (that.data.info.price / 100);
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.subtitle;
+            if (that.data.info.subtitle.length > 10) {
+                subtitle = that.data.info.subtitle.substr(0, 10) + '...'
+            }
+            ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            // ctx.draw();
+            // 划线价
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(32 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let market_price = "￥" + (that.data.info.market_price / 100)
+            ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
+            let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            ctx.beginPath()
+            ctx.setLineWidth(1)
+            ctx.moveTo(40 * ratio + width, 608 * ratio)
+            ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
+            ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
+        row.push(temp);
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
+        }
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+        }
+    },
+    gotoDetail: function (e) {
+        let item = e.currentTarget.dataset.item;
+        if (item.type == 'travels') {
+            // 游记做特殊处理 其他都按照原来的来
+            wx.navigateTo({
+                url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+            })
+        } else {
+            util.gotoDetail(item);
+        }
+    },
 
-  },
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+          latitude: Number(info.scene_lat),
+          longitude: Number(info.scene_lon),
+          name:info.scene_name,
+            address:info.scene_address
+        })
+    },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    // 演出详情展开收起
+    changeShowDetail: function (e) {
+        let showDetail = e.currentTarget.dataset.flag;
+        this.setData({showDetail: showDetail})
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        app.globalData.postProduct = []
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+        if (this.data.info && this.data.info.id) {
+            commonApi.user_post("product/is_product_collection", {
+                product_id: this.data.info.id
+            }).then(res => {
+                this.setData({
+                    isLike: res.data
+                })
+                this.drawImg()
+            })
+            commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                    cartCount: res.data.length
+                })
+            })
+        } else {
+            setTimeout(() => {
+                this.onShow()
+            }, 200)
+        }
+    },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  }
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
 })
\ No newline at end of file
diff --git a/pages/info/showInfo/index.json b/pages/info/showInfo/index.json
index 35cf02f..ab4ec76 100644
--- a/pages/info/showInfo/index.json
+++ b/pages/info/showInfo/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "code":"../../order/components/wxqrCode/index"
+
   }
 }
\ No newline at end of file
diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml
index 28f7ff5..2a0d0f9 100644
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@@ -1,32 +1,216 @@
-<!--pages/info/showInfo/index.wxml-->
+<!--pages/info/hotelProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<title title="产品详情"></title>
+<title title="演出详情"></title>
+
+
 <view wx:if="{{info}}">
-  <swiper class="swiper" indicator-dots="{{true}}"
-    autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
-    <block wx:for="{{info.listimg}}" wx:key="*this">
-      <swiper-item>
-        <image src="{{item}}" mode="aspectFill"></image>
-      </swiper-item>
-    </block>
-  </swiper>
-  <view class="top-box">
-    <view class="title">{{info.title}}</view>
-    <view class="tags">
-      <view class="tag" wx:for="{{info.display_tags}}">{{item}}</view>
-    </view>
-    <view class="time">演出时间：<text wx:for="{{info.sku[0].sku_model.next_show_date}}">{{item}}</text></view>
-    <view class="show-location">{{info.scene_name}}</view>
-    <view class="show-address"><text class="iconfont icon-location"></text>{{info.scene_address}}</view>
-  </view>
-</view>
-<view class="all-title">演出详情</view>
-<rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
-<view class="all-title">预定须知</view>
-<!-- <rich-text class="detail"></rich-text> -->
-<rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
-<view style="height:120rpx"></view>
+    <view class="top-info">
+        <view class="product-base-info">
+            <image class="headImg" src="{{info.headimg}}"></image>
+            <view class="base-info">
+                <view class="title textOver2">{{info.title}}</view>
+                <view class="tags-box textOver">
+                    <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+                    </view>
+                </view>
+                <view class="subtitle">演出时间：<text wx:for="{{info.sku[0].sku_model.next_show_date}}">{{item}}</text></view>
+
+                <view class="bottom-price">
+                    <view class="tags-price">
+                        <text>￥</text><text>{{info.price/100}}</text><text>起</text>
+                    </view>
+                </view>
+                
+            </view>
+        </view>
+        
+        <view class="address-info" bindtap="gotolocation">
+            <view class="map-container">
+                
+                <view style="width: 526rpx;">
+                    <view class="textOver" style="font-size: 31rpx;color: #000000;padding-top: 12rpx;">{{info.scene_name}}</view>
+                    <view class="textOver2" style="padding-top: 26rpx;">{{info.scene_address}}</view>
+                </view>
+                <view style="text-align: center;">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20241119/a98e35f23497c1a8ddf7c7769fbd4fd1.png"></image>
+                    <view style="padding-top: 14rpx;">25.5km</view>
+                </view>
+            </view>
+        </view>
+
+        <view class="show-tip">
+            <view class="com-flex"><image src="https://static.ticket.sz-trip.com/uploads/20241119/a98e35f23497c1a8ddf7c7769fbd4fd1.png"></image>不支持退款</view>
+            <view class="com-flex">不支持退款</view>
+
+            <view class="com-flex">不支持退款</view>
+
+        </view>
+        
+    </view>
+</view>
+
+
+<view class="scroll-all-box" id="menus" wx:if="{{info}}">
+  <view class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px">
+    <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">详情</view>
+    <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">须知</view>
+    <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">推荐</view>
+  </view>
+  <view style="height:85rpx" wx:if="{{fixed}}"></view>
+
+
+  <view class="content-text">
+    <view class="info-box info-box-line" id="box1">
+        <view class="info-title">演出详情</view>
+        <view class="{{showDetail?'':'max-details'}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
+            <view wx:if="{{!showDetail}}" class="white-placholder">123</view>
+        </view>
+        <view class="show-btn">
+            <view bindtap="changeShowDetail" data-flag="{{true}}">展开全部</view>
+            <view bindtap="changeShowDetail" data-flag="{{false}}">收起</view>
+        </view>
+    </view>
+    <view class="info-box" id="box2">
+        <view class="info-title">演出须知</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
+    </view>
+    <view class="info-box info-box-line" >
+        <view class="info-title">观看提示</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
+    </view>
+
+    <view class="info-box" id="box3">
+        <view class="info-title">推荐演出</view>
+        <view class="pro-list">
+            <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+            <view class="item-hd">
+            <image src="{{item.headimg}}"></image>
+            </view>
+            <view class="item-bm">
+            <view class="protitle textOver">{{item.title}}</view>
+            <view class="pro-price">
+                {{item.price/100}}
+            </view>
+            </view>
+        </view>
+    </view>
+
+</view>
+  </view>
+
+
+ 
+
+</view>
+
+<view style="height:140rpx"></view>
 <view class="fixed-bottom">
-  <view class="btn" bindtap="order" wx:if="{{info && info.flag==1}}">立即预约</view>
-  <view class="btn disable" wx:else>该商品已下架</view>
-</view>
\ No newline at end of file
+<view class="['left-img',{{!iShop?'no-shop':''}}]">
+  <navigator  url="/pages/index/index" class="shop-box">
+  <view class="shop-box">
+    <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20241119/868addcaedbc5d63ebdfa150fcace34d.png" mode="aspectFill"/>
+    <view>首页</view>
+  </view>
+  </navigator>
+  <navigator url="/pages/user/service/index"  catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+    <view class="iconfont icon-kefu"></view>
+    <view>客服</view>
+  </navigator>
+  <view bindtap="like" class="kefu-box">
+    <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
+    <view>收藏</view>
+  </view>
+</view>
+
+
+  <view class="btns">
+    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
+    <view class="btn" bindtap="showOrder" >立即购买</view>
+
+    <!-- <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>
+    <view class="btn disable" wx:elif="{{info}}">该商品已下架</view> -->
+  </view>
+</view>
+<!-- 购物车悬浮框 -->
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <view class="cart-num">{{cartCount}}</view>
+</navigator>
+
+
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view class="sku-price">{{info.sku[skuIndex].price/100}}
+          <view class="allowance" wx:if="{{allowance_data}}">
+            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+        </view>
+        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+      </view>
+    </view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{info.sku}}">{{item.sku_name}}</view>
+    </view>
+    <view class="number-box">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select" bindtap="add"></view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="order" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+      </view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
+
+
+<view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
+  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
+  </canvas>
+  <canvas class="canvasCode" style="opacity:0;width:500px;height:500px" canvas-id="myQrcode"></canvas>
+</view>
+
+<!-- 分享 -->
+<view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
+  <view class="mask-bg" bindtap="share"></view>
+  <view class="mask-content share-img-box">
+    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <view class="share-tips">
+      <view style="position:relative">
+        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        </image>
+        <view>保存图片到相册</view>
+        <view class="tipimg">
+          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+        </view>
+      </view>
+      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <view style="position:relative">
+        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        </image>
+        <view>微信识别二维码</view>
+        <view class="tipimg">
+          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+        </view>
+      </view>
+    </view>
+    <view class="save-btn" bindtap="save">保存到相册</view>
+  </view>
+</view>
+<view class="mask mask-allowance" wx:if="{{showAllowance}}">
+  <view bindtap="changeAllowance" class="mask-bg"></view>
+  <view class="mask-content rule-box">
+    <view class="rule-title">{{allowance_data.title}}</view>
+    <rich-text nodes="{{allowance_data.content}}"></rich-text>
+  </view>
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss
index f6bdada..284b0b5 100644
--- a/pages/info/showInfo/index.wxss
+++ b/pages/info/showInfo/index.wxss
@@ -1,86 +1,898 @@
-/* pages/info/showInfo/index.wxss */
+/* pages/info/hotelProductInfo/index.wxss */
 page {
-  background: #f6f6f6;
+  background: white;
 }
-.swiper,.swiper image {
-  display: block;
-  width: 100%;
-  height: 330rpx;
+
+
+.top-info {
+  background: white;
+  margin-top: -20rpx;
+  padding: 48rpx 28rpx 28rpx;
 }
-.top-box {
-  border-bottom: 1rpx solid #ccc;
-  padding: 22rpx 27rpx;
+
+
+.product-base-info{
+    display: flex;
 }
-.top-box .title {
-  font-size: 32rpx;
-  color: #000;
-  font-weight: 500;
-  margin-bottom: 10rpx;
+.product-base-info .headImg{
+    width: 187rpx;
+    height: 240rpx;
+    background: #D1D7CB;
+    border-radius: 13rpx;
+    margin-right: 20rpx;
+    flex-shrink: 0;
+}
+
+.product-base-info .title {
+font-family: PingFang SC;
+font-weight: bold;
+font-size: 32rpx;
+color: #111111;
 }
-.top-box .tags {
+
+.product-base-info .subtitle {
+    margin-top: 20rpx;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #888888;
+}
+.base-info{
+flex: 1;
+width: 1rpx;
+display: flex;
+flex-direction: column;
+justify-content: space-between;
+}
+.product-base-info .tags-box {
+  margin-top: 18rpx;
   display: flex;
-  color: #0B898E;
-  font-size: 20rpx;
-  margin-bottom: 20rpx;
+  align-items: center;
+  height: 50rpx;
+  overflow-y: hidden;
+  overflow-x: auto;
 }
-.top-box .tag {
-  margin-right: 20rpx;
-  padding: 0 15rpx;
-  line-height: 30rpx;
-  border-radius: 16rpx;
-  border: 1rpx solid;
+
+.tags-box .tag {
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #0B898E;
+    padding: 7rpx 16rpx;
+    background: #E6F3F3;
+    border-radius: 19rpx;
+  margin-right: 13rpx;
 }
-.top-box .time {
-  font-size: 27rpx;
-  color: #333;
-  padding-bottom: 20rpx;
-  border-bottom: 1rpx solid #ccc;
+
+.tags-box .tag .line {
+  content: "1";
+  display: block;
+  font-size: 0;
+  position: absolute;
+  left: 0;
+  right: 0;
+  background: #DAF3E9;
+  height: 8rpx;
+  top: 30rpx;
+  z-index: -1;
 }
-.show-location {
-  margin: 20rpx 0;
-  font-size: 28rpx;
-  color: #666;
+
+.bottom-price {
+    flex: 1;
+    height: 1rpx;
+  color: #E52910;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.tags-price text:nth-child(1) {
+  font-size: 21rpx;
 }
-.show-address {
+
+.tags-price text:nth-child(2) {
+  font-size: 37rpx;
+  font-weight: bold;
+}
+
+.tags-price text:nth-child(3) {
+  font-size: 21rpx;
   color: #999999;
+  margin-left: 4rpx;
+}
+
+.tags-box .iconfont {
+  margin-left: 4rpx;
   font-size: 24rpx;
-  margin-bottom: 10rpx;
 }
-.show-location .iconfont {
-  font-size: 26rpx;
-  margin-right: 10rpx;
+
+.address-info{
+    margin-top: 26rpx;
+    padding-top: 15rpx;
+    border-top: 1px solid #D8D8D8;
 }
-.all-title {
-  margin: 27rpx;
+
+.map-container{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #888;
+    box-sizing: border-box;
+}
+.map-container image{
+    width: 53rpx;
+    height: 53rpx;
+}
+
+.show-tip{
+    margin-top: 27rpx;
+    width: 100%;
+    box-sizing: border-box;
+    height: 80rpx;
+    background: #E6F3F3;
+    border-radius: 13rpx;
+    padding: 0 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #111111;
+}
+
+.show-tip image{
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 12rpx;
+}
+
+.scroll-all-box {
+    margin: 20rpx 0;
+    background: white;
+  }
+  
+  .scroll-menus {
+    padding: 0 107rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 29rpx;
+    color: #333;
+    height: 84rpx;
+  }
+  
+  .scroll-menu-item {
+    position: relative;
+    line-height: 84rpx;
+  }
+  .scroll-menu-item.active{
+    color: #0B898E;
+  }
+  
+  .scroll-menu-item.active::after {
+    content: "1";
+    font-size: 0;
+    display: block;
+    position: absolute;
+    width: 46rpx;
+    height: 6rpx;
+    border-radius: 3rpx;
+    background: #0B898E;
+    left: 50%;
+    margin-left: -23rpx;
+    bottom: 0rpx;
+  }
+
+  .fixed-menus {
+    position: fixed;
+    left: 0;
+    right: 0;
+    background: white;
+    z-index: 1;
+  }
+  
+  .content-text{
+      padding: 0 40rpx;
+  }
+  .info-box {
+      padding: 30rpx 0rpx 39rpx;
+    }
+    .info-box-line{
+        border-bottom: 1px solid #D8D8D8;
+    }
+  .info-title {
+    font-size: 35rpx;
+    font-weight: bold;
+    color: #000;
+    margin-bottom: 30rpx;
+  }
+  #box1{
+      margin-top: 40rpx;
+  }
+
+.max-details{
+    position: relative;
+    max-height: 650rpx;
+    overflow: hidden;
+}
+.white-placholder{
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 333rpx;
+    background-image: linear-gradient(to bottom, transparent, #fff);
+}
+.show-btn{
+    padding-top: 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    padding-right: 70rpx;
+}
+.show-btn view{
+    width: 158rpx;
+    height: 44rpx;
+    border-radius: 22rpx;
+    border: 1px solid #0B898E;
+font-weight: 500;
+font-size: 28rpx;
+color: #0B898E;
+text-align: center;
+line-height: 44rpx;
+margin-right: 29rpx;
+}
+
+.box {
+  /* margin: 20rpx; */
+  /* background: white; */
+  /* border-radius: 13rpx; */
+  background: #f2f2f2;
+  padding: 20rpx;
+}
+
+.box-top {
+  line-height: 95rpx;
+  border-bottom: 1rpx solid #d9d9d9;
   font-weight: 500;
+  color: #000;
   font-size: 35rpx;
+  padding: 0 20rpx;
+  background: #fff;
+  border-radius: 13rpx 13rpx 0 0;
 }
-.detail {
-  padding: 0 27rpx;
-  display: block;
+
+.box-top .iconfont {
+  color: #0B898E;
+  font-size: 33rpx;
+  margin-right: 16rpx;
 }
+
+.empty-box {
+  text-align: center;
+  padding: 40rpx 0;
+  font-size: 23rpx;
+  color: #333;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
+}
+
+.empty-btn {
+  margin: 0 auto;
+  margin-top: 30rpx;
+  width: 283rpx;
+  line-height: 79rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 39rpx;
+  color: #0B898E;
+  font-size: 32rpx;
+  margin-bottom: 10rpx;
+}
+
+.box-top .score {
+  color: #D62828;
+  font-size: 30rpx;
+  font-weight: 400;
+  margin-left: 11rpx;
+}
+
+
 .fixed-bottom {
   position: fixed;
   left: 0;
   right: 0;
-  height: 104rpx;
-  background: #FFFFFF;
-  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  bottom: 0;
+  height: 140rpx;
+  background: white;
+  display: flex;
+  align-items: center;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  padding: 0 40rpx;
+  color: #666666;
+  font-size: 23rpx;
+  justify-content: space-between;
+  text-align: center;
+  padding-left: 0;
+}
+
+.fixed-bottom .iconfont {
+  font-size: 34rpx;
+  line-height: 40rpx;
+}
+
+.btns {
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 500;
+  border-radius: 39rpx;
   text-align: center;
   display: flex;
+  align-items: center;
   justify-content: center;
+}
+
+.btns .btn {
+  width: 240rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+}
+/* 
+.btns .btn:nth-child(1) {
+  margin-right: 3rpx;
+  border-radius: 39rpx 0 0 39rpx;
+}
+
+.btns .btn:nth-child(2) {
+  border-radius: 0 39rpx 39rpx 0;
+} */
+
+.btns .btn.disable {
+  background: #ccc;
+}
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+
+.sku-info-box {
+  margin: 50rpx 40rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.sku-info-box image {
+  width: 218rpx;
+  height: 180rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 40rpx;
+  flex-shrink: 0;
+}
+
+.sku-info {
+  flex: 1;
+}
+
+.sku-price {
+  font-size: 40rpx;
+  font-weight: 500;
+  color: #D62828;
+  margin: 20rpx 0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.sku-price::before {
+  content: "￥";
+  font-weight: 400;
+  font-size: 27rpx;
+  vertical-align: baseline;
+}
+
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+
+.sku-names {
+  display: flex;
+  font-size: 29rpx;
+  color: #333;
+  margin: 0 40rpx;
+  text-align: center;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+  justify-content: space-between;
+}
+
+.sku-name-item {
+  background: #EFEFEF;
+  border: 1rpx solid #EFEFEF;
+  /* width: 318rpx; */
+  line-height: 77rpx;
+  border-radius: 14rpx;
+  margin-bottom: 25rpx;
+  margin-right: 30rpx;
+  max-width: 100%;
+  padding: 0 15rpx;
+  min-width: 270rpx;
+}
+
+.sku-name-item:nth-child(2n) {
+  margin-right: 0;
+}
+
+.sku-name-item.active {
+  color: #0B898E;
+  border-color: #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+
+.number-box {
+  display: flex;
+  align-items: center;
+  border-top: 1rpx solid #ccc;
+  justify-content: space-between;
+  margin: 0 40rpx;
+  padding: 40rpx 0;
+}
+
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+
+.number-box view {
+  border: 1rpx solid #666;
+  border-radius: 7rpx;
+  text-align: center;
+  width: 67rpx;
+  line-height: 67rpx;
+  font-size: 33rpx;
+  color: #000;
+}
+
+.number-box view.disable {
+  border-color: #ccc;
+  color: #999;
+}
+
+.number-box view.number {
+  width: 94rpx;
+  margin: 0 15rpx;
+}
+
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
   align-items: center;
+  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
   bottom: 0;
 }
-.fixed-bottom .btn {
-  width: 391rpx;
-  line-height: 74rpx;
+
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
   background: #D62828;
-  border-radius: 37rpx;
+  border-radius: 39rpx;
   color: #fff;
-  font-size: 31rpx;
+  text-align: center;
+  font-size: 33rpx;
   font-weight: 500;
 }
-.fixed-bottom .btn.disable {
+
+.mask-btn.disable {
   background: #ccc;
-}
\ No newline at end of file
+}
+
+/* .icon-xin,.icon-shoucang {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  line-height: 60rpx;
+  background: rgba(0, 0, 0, 0.4);
+  border-radius: 50%;
+  text-align: center;
+  color: #fff;
+  font-size: 36rpx;
+  z-index: 1;
+} */
+.icon-fenxiang {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  line-height: 60rpx;
+  background: rgba(0, 0, 0, 0.4);
+  border-radius: 50%;
+  text-align: center;
+  color: #fff;
+  font-size: 36rpx;
+  z-index: 1;
+}
+
+.icon-shoucang {
+  color: #D62828;
+  font-size: 40rpx !important;
+
+}
+
+/* 购物车 */
+.cart-box {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 80rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.2);
+  border-radius: 50%;
+  right: 20rpx;
+  bottom: 166rpx;
+}
+
+.cart-box image {
+  display: block;
+  width: 49rpx;
+}
+
+.cart-num {
+  width: 26rpx;
+  border: 1rpx solid;
+  border-radius: 50%;
+  line-height: 26rpx;
+  text-align: center;
+  font-size: 23rpx;
+  color: #D20000;
+  position: absolute;
+  right: -2rpx;
+  top: -5rpx;
+}
+
+
+.share-img-box {
+  /* width: 551rpx; */
+  position: static;
+  background: none;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.share-img {
+  display: block;
+  width: 551rpx;
+}
+
+.share-tips {
+  width: 426rpx;
+  height: 150rpx;
+  background: #FFFFFF;
+  border-radius: 25rpx;
+  margin-top: 25rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 65rpx;
+  color: #999;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 40rpx;
+}
+
+.share-tips .img {
+  display: block;
+  width: 55rpx;
+  margin: 0 auto;
+  margin-bottom: 4rpx;
+}
+
+.tipimg {
+  position: absolute;
+  left: 50%;
+  margin-left: 16rpx;
+  width: 24rpx;
+  height: 24rpx;
+  background: #D62828;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 34rpx;
+}
+
+.tipimg image {
+  width: 21rpx;
+  display: block;
+
+}
+
+.save-btn {
+  width: 403rpx;
+  line-height: 77rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 31rpx;
+  font-weight: 500;
+  margin-top: 50rpx;
+}
+
+.allowance-box {
+  height: 113rpx;
+  background: url("https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
+  background-size: 100% auto;
+  background-repeat: no-repeat;
+  padding: 30rpx 30rpx 10rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  margin-top: -60rpx;
+  position: relative;
+  display: flex;
+  justify-content: start;
+  align-items: baseline;
+}
+
+.allowance-box .com-price {
+  font-size: 30rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:before {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:after {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .yellow {
+  color: #DF2115;
+  padding: 8rpx 14rpx;
+  background-color: #FDEDD4;
+  margin-left: 20rpx;
+  border-radius: 30rpx;
+}
+
+.mask-allowance .mask-content {
+  margin: auto;
+  width: auto;
+  top: initial;
+  bottom: initial;
+  padding: 20rpx;
+  width: 80%;
+}
+
+.mask-allowance .mask-content .rule-title {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.imgs{
+  width: 200rpx;
+  height: 200rpx;
+  margin: 10rpx;
+  border-radius: 8rpx;
+}
+.img-box{
+  display: inline-block;
+  position: relative;
+}
+.all{
+  color: #fff;
+  position:absolute;
+  bottom: 17rpx;
+  right: 10rpx;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 8rpx;
+  background-color: rgba(0, 0, 0, .5);
+}
+.all view{
+  text-align: center;
+}
+.all view:first-child{
+  font-size: 45rpx;
+  margin-top: 40rpx;
+}
+.all view:last-child{
+  margin-top: 10rpx;
+}
+.sku{
+  margin-left: 10rpx;
+  color: #666;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.proad{
+  margin: 20rpx;
+}
+.proad-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+}
+.proad-title image{
+  width: 292rpx;
+  height: 34rpx;
+}
+.pro-list{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.proitem{
+    width: 213rpx;
+}
+.item-hd image{
+    width: 213rpx;
+    height: 273rpx;
+    background: #D1D7CB;
+    border-radius: 13rpx;
+}
+.item-bm{
+  padding: 8rpx 12rpx;
+}
+.protitle{
+
+font-family: PingFang SC;
+font-weight: 500;
+font-size: 29rpx;
+color: #111111;
+
+}
+.pro-price{
+  color: #E52910;
+  font-weight: 500;
+  font-size: 30rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #E52910;
+  font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
+  color: #999999;
+  font-size: 10px;
+}
+.icon-shop{
+  width: 34rpx;
+  height: 36rpx;
+}
+.left-img{
+  display: flex;
+  width: 290rpx;
+  flex-shrink: 0;
+  justify-content: space-between;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.no-shop{
+  width: 230rpx;
+}
+.shop-box{
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  height: 70rpx;
+}
+
+ .wineScene-price-container {
+    width: 750rpx;
+    height: 100rpx;
+    background: linear-gradient(-90deg,#FF413B, #FFAB2E);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    color: #FFFFFF;
+    font-size: 24rpx;
+ }
+
+ .wineScene-price-container .wineSecne-price {
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #FFFFFF;
+}
+.wineScene-price-container .wineSecne-money {
+    font-size: 24rpx;
+    font-weight: 500;
+    text-decoration-line: line-through;
+    padding-left: 14rpx;
+}
+.wineScene-price-container .wineSecne-price::before {
+    font-size: 24rpx;
+    content: '￥';
+}
+
+.hotel-custom-detail{
+    display: flex;
+    /* justify-content: space-between; */
+    height: fit-content;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 20rpx;
+}
+.hotel-custom-detail .tip-info{
+    width: 33rpx;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.hotel-custom-detail .tip-info .tip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    width: 33rpx;
+    height: 33rpx;
+    background: #6394FD;
+    border-radius: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    text-align: center;
+    line-height: 33rpx;
+}
+.hotel-custom-detail .tip-info .info{
+    width: 11rpx;
+    height: 100%;
+    background: #D0DFFE;
+    border-radius: 5rpx;
+}
+
+.hotel-custom-right>view{
+    margin-bottom: 20rpx;
+}
+.hotel-custom-right>view:last-of-type{
+    margin-bottom: 0;
+}
+
diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js
index e65e066..6deda18 100644
--- a/pages/list/theatre/index.js
+++ b/pages/list/theatre/index.js
@@ -11,7 +11,7 @@ Page({
     list:[],
     tagList: [], // 父标签6
     total:1,
-    type:1,
+    type:278,
     sort:["","weight","distance","weight","price"],
     order:['','desc',"asc","desc","asc"],
     lat:"",
@@ -52,37 +52,38 @@ Page({
   getList:function(){
     let list = this.data.list,that = this;
     if(list.length>=this.data.total) return;
-    // 距离排序
-    if(this.data.type==2 && !this.data.lon){
-      wx.getLocation({
-        type: 'gcj02',
-        success: function (res) {
-          that.setData({
-            lat:res.latitude,
-            lon:res.longitude
-          })
-          that.realgetList()
-        },
-        fail:function(){
-          that.realgetList()
-        }
-      })
-    }
-    else {
-      this.realgetList()
-    }
+    that.realgetList()
+    // // 距离排序
+    // if(this.data.type==2 && !this.data.lon){
+    //   wx.getLocation({
+    //     type: 'gcj02',
+    //     success: function (res) {
+    //       that.setData({
+    //         lat:res.latitude,
+    //         lon:res.longitude
+    //       })
+    //       that.realgetList()
+    //     },
+    //     fail:function(){
+    //       that.realgetList()
+    //     }
+    //   })
+    // }
+    // else {
+    //   this.realgetList()
+    // }
     
   },
   realgetList:function(){
     let list = this.data.list;
     commonApi._post("product/get_product_by_tag",{
-      tag_id:"6",
+      tag_id: this.data.type,
       offset:list.length,
       limit:10,
-      sort:this.data.sort[this.data.type],
-      order:this.data.order[this.data.type],
-      lat:this.data.lat,
-      lon:this.data.lon,
+    //   sort:this.data.sort[this.data.type],
+    //   order:this.data.order[this.data.type],
+    //   lat:this.data.lat,
+    //   lon:this.data.lon,
       title:this.data.keywords
     }).then(res=>{
       res.data.list.map(item=>{
@@ -106,7 +107,7 @@ Page({
   // 获取子标签
   getTags () {
     commonApi._post("",{
-        tag_id:"6",
+        tag_id:"278",
       }).then(res=>{
           let resData = res.data.list || []
         this.setData({
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index 95803f5..03bdcf0 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -5,7 +5,7 @@
     <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
 
     <view class="sale-types no-scrollbar">
-        <view class="sale-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">全部</view>
+        <view class="sale-type{{type==278?' active':''}}" bindtap="changeType" data-type="1">全部</view>
         <view class="sale-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">距离最近</view>
         <view class="sale-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">销量最高</view>
         <view class="sale-type{{type==4?' active':''}}" bindtap="changeType" data-type="4">价格最低</view>
@@ -21,10 +21,9 @@
   <image src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2 title">{{item.title}}</view>
-    <view class="textOver subtitle">{{item.subtitle?item.subtitle:""}}</view>
-    <view class="textOver subtitle">{{item.supplier_address}}</view>
+    <view class="textOver subtitle">{{"开放时间"}}</view>
+    <view class="textOver subtitle">{{"地址"}}</view>
     <view class="tags textOver">
-      <!-- <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view> -->
       <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
     </view>
   </view>
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index 266ff5b..412bc6d 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -8,43 +8,99 @@ Page({
    * 页面的初始数据
    */
   data: {
-    times:[],
+    dateArr: [
+        {date: '2024-11-19', price: 7000},
+        {date: '2024-11-20', price: 7000},
+        {date: '2024-11-21', price: 7000},
+    ],
+    times:[
+        {sale_date: "2024-11-19", stock_number: 0, start_time: "07:30", end_time: "08:30"},
+        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
+        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
+        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
+        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
+        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
+
+    ],
     product:null,
     dateindex:-1,
-    timeindex:-1
+    timeindex:-1,
+    sku_id: null,
+    producNum: 1,
+
+    cartTop: 0,
+    cartImgInfo: null,
+    cartCount: 0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+      let that = this
     let product = app.globalData.product,start_date = util.formatDate(new Date());
     this.setData({
       product:product
     })
     let end_date = util.formatDate(new Date(new Date(start_date.replace(/-/g,'/')).getTime() + 30 * 24 * 60 * 60 * 1000));
-    commonApi.user_post("show/get_show_sku_seats_price_by_date",{
-      sku_id:product.sku[0].id,
+    commonApi.user_post("product/product_date_price",{
+      sku_id:1208,
       start_date:start_date,
       end_date:end_date
     }).then(res=>{
-      let dateindex = -1,timeindex=-1;
-      for(let i=0;i<res.data.length;i++){
-        for(let j =0;j<res.data[i].screen.length;j++){
-          if(res.data[i].screen[j].is_ticket==1 && dateindex==-1 && timeindex==-1){
-            dateindex = i;
-            timeindex = j;
-            break;
-          }
-        }
-      }
-      this.setData({
-        times:res.data,
-        dateindex:dateindex,
-        timeindex:timeindex
-      })
+
+    //   this.setData({
+    //     times:res.data,
+    //     dateindex:dateindex,
+    //     timeindex:timeindex
+    //   })
       console.log(res)
+
+        // 获取购物车按钮的位置
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
+    })
+
+    this.initDate()
+  },
+
+  getDay: function (date) {
+    let d = new Date(date.replace(/-/g, '/')).getDay();
+    let days = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
+    return days[d];
+  },
+  // 初始化日期
+  initDate () {
+      let date = this.data.dateArr
+      date.forEach(v=>{
+          v.short_date = v.date.split("-").splice(1, 2).join("-")
+      })
+      this.setData({dateArr: date})
+
+      this.initTime()
+  },
+
+  // 时间处理
+  initTime () {
+      let times = this.data.times
+      times.forEach(v=>{
+          v.week = this.getDay(v.sale_date)
+      })
+      this.setData({times: times})
+  },
+
+  // 选择日期
+  changeDate:function(e){
+    let dateindex = e.currentTarget.dataset.date
+    // todo获取时间
+    this.setData({
+        dateindex: dateindex
     })
+
   },
 
   selectTime:function(e){
@@ -56,14 +112,20 @@ Page({
       })
     }
   },
+
+  minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
   next:function(){
-    let product = app.globalData.product;
-    product.timeInfo = this.data.times[this.data.dateindex];
-    product.timeInfo.screen = [this.data.times[this.data.dateindex].screen[this.data.timeindex]];
-    app.globalData.product = product;
-    wx.navigateTo({
-      url: '../showSeat/index',
-    })
+    
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -76,9 +138,51 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getCartNum()
   },
 
+   // 获取购物车数量
+    getCartNum () {
+        commonApi.user_post('cart/get_list', {}).then(res => {
+            this.setData({
+                cartCount: res.data.length
+            })
+        })
+    },
+    // 加入购物车
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: "cart"
+                })
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    console.log(res)
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+    },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index 775597f..95a9109 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -1,17 +1,62 @@
 <!--pages/order/show/index.wxml-->
-<title title="选择场次"></title>
+<title title="选择票档"></title>
 <view class="order-top" wx:if="{{product}}">
   <view class="order-name">{{product.title}}</view>
-  <view class="order-subtitle">{{product.subtitle}}</view>
 </view>
 <view class="box">
-  <view class="order-name box-title">场次</view>
-  <view wx:for="{{times}}" wx:for-item="date" wx:for-index="dateIndex">
-    <view wx:for="{{date.screen}}" bindtap="selectTime" data-dateindex="{{dateIndex}}" data-timeindex="{{index}}" class="order-line-item{{item.is_ticket==0?' disable':''}}{{timeindex==index && dateIndex==dateindex?' active':''}}" ><text>{{date.sale_date}}</text><text>{{item.start_time}} ~ {{item.end_time}}</text> <view class="state">{{item.is_ticket==1?'有票':'售罄'}}</view></view>
+  <view class="box-content">
+    <view class="box-title">选择日期</view>
+    <view class="flex-between">
+        <view class="tag {{dateindex==0?'active':''}}" bindtap="changeDate" data-date="0">今天 {{dateArr[0].short_date}}</view>
+        <view class="tag {{dateindex==1?'active':''}}" bindtap="changeDate" data-date="1">明天 {{dateArr[1].short_date}}</view>
+        <view class="tag {{dateindex==2?'active':''}}" bindtap="changeDate" data-date="2">后天 {{dateArr[2].short_date}}</view>
+        <view class="tag">更多</view>
+    </view>
   </view>
+
+  <view class="box-content">
+    <view class="box-title">场次</view>
+    <view class="flex-wrap flex-between">
+        <view wx:for="{{times}}" date-item="{{item}}" class="tag {{dateindex==key?'active':''}} {{item.stock_number<=0?'disabled':''}}" 
+        bindtap="changeTime" data-date="{{key}}">
+            {{item.sale_date}} {{item.week}} {{item.start_time}}
+        </view>
+    </view>
+  </view>
+
+  <view class="box-content">
+    <view class="box-title">票档</view>
+    <view class="sku-box">
+        <view wx:for="{{times}}" date-item="{{item}}" class="tag {{dateindex==key?'active':''}} {{item.stock_number<=0?'disabled':''}}" 
+        bindtap="changeSku" data-date="{{key}}">
+            {{item.sale_date}} {{item.week}} {{item.start_time}}
+        </view>
+    </view>
+  </view>
+
+
+    
+    <view class="number-box box-content">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select add" bindtap="add"></view>
+    </view>
+
   
 </view>
 <view style="height:138rpx"></view>
 <view class="fixed-bottom">
-  <view class="fixed-btn" bindtap="next">下一步</view>
-</view>
\ No newline at end of file
+    <view>总价：<text class="bottom-price">￥560.00</text></view>
+    <view class="btns">
+        <view class="btn" bindtap="showCart">加入购物车</view>
+        <view class="btn" bindtap="showOrder" >立即购买</view>
+    </view>
+</view>
+
+
+<!-- 购物车悬浮框 -->
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <view class="cart-num">{{cartCount}}</view>
+</navigator>
\ No newline at end of file
diff --git a/pages/order/show/index.wxss b/pages/order/show/index.wxss
index 16b489c..53c245f 100644
--- a/pages/order/show/index.wxss
+++ b/pages/order/show/index.wxss
@@ -1,92 +1,203 @@
 /* pages/order/show/index.wxss */
 page {
-  background: #f6f6f6;
+  background: white;
 }
 .order-top {
-  border-bottom: 1rpx solid #ccc;
-  padding: 30rpx 47rpx;
-
-}
-.order-name {
-  font-weight: 500;
-  color: #000;
-  font-size: 33rpx;
-}
-.order-subtitle {
-  margin-top: 20rpx;
-  font-size: 27rpx;
-  color: #666;
+    background: #E6F3F3;
+    width: 100%;
+    padding: 26rpx 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #111111;
 }
+
 .box {
-  margin: 30rpx 25rpx;
-  background: white;
-  border-radius: 9rpx;
   padding-bottom: 30rpx;
+  padding: 48rpx 26rpx;
 }
-.box-title {
-  line-height: 113rpx;
-  border-bottom: 1rpx solid #ccc;
-  padding: 0 20rpx;
+
+.box-content{
+    margin-bottom: 50rpx;
+    width: 100%;
 }
-.order-line-item {
-  margin: 0 20rpx;
-  display: flex;
-  align-items: center;
-  border: 1rpx solid #333;
-  border-radius: 10rpx;
-  margin-top: 30rpx;
-  font-size: 27rpx;
-  padding: 0 22rpx;
-  line-height: 70rpx;
-  box-sizing: border-box;
+
+.box-title{
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 35rpx;
+    color: #333333;
+    margin-bottom: 38rpx;
 }
-.order-line-item text {
-  margin-right: 15rpx;
+.flex-between{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 }
-.order-line-item .state {
-  width: 78rpx;
-  line-height: 34rpx;
-  border: 1rpx solid;
-  border-radius: 17rpx;
-  box-sizing: border-box;
-  text-align: center;
-  font-size: 24rpx;
-  color: #D62828;
+.flex-wrap{
+    display: flex;
+    flex-wrap: wrap;
 }
-.order-line-item.disable .state {
-  color: #666;
-  border-color: #ccc;
+.sku-box{
+    display: flex;
+    flex-direction: column;
 }
-.order-line-item.disable {
-  color: #666666;
+.sku-box .tag{
+    width: fit-content;
 }
-.order-line-item.active .state {
-  color: #fff;
+.tag{
+    padding: 0rpx 19rpx;
+    border: 1px solid #999999;
+    height: 67rpx;
+    line-height: 67rpx;
+    text-align: center;
+    border-radius: 13rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+    margin-bottom: 17rpx;
 }
-.order-line-item.active {
-  background: #0B898E;
-  border-color: #0B898E;
-  color: #fff;
+
+.tag.active{
+    background: #0B898E;
+    border: none;
+    color: #FFFFFF;
+}
+
+.tag.disabled{
+    background: #CCCCCC;
+    border: none;
+    color: #FFFFFF;
 }
+
+.number-box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  
+  .number-box text {
+    flex: 1;
+    font-size: 35rpx;
+    color: #333;
+    font-weight: bold;
+  }
+  
+  .number-box view {
+    border: 1rpx solid #999999;
+    border-radius: 10rpx;
+    text-align: center;
+    width: 67rpx;
+    line-height: 67rpx;
+    font-size: 33rpx;
+    color: #000;
+  }
+  
+  .number-box view.disable {
+    border-color: #ccc;
+    color: #999;
+  }
+  
+  .number-box view.number {
+    width: 80rpx;
+    margin: 0 10rpx;
+    border: none;
+  }
+  .number-box .add{
+    background: #0B898E;
+    border-radius: 10rpx;
+    border: none;
+    color: white;
+  }
+
+
 .fixed-bottom {
   height: 138rpx;
   background: #FFFFFF;
   box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: space-between;
   position: fixed;
   left: 0;
   right: 0;
   bottom: 0;
+  padding:0 26rpx;
+  color: #333333;
+  font-size: 31rpx;
+  font-weight: bold;
 }
-.fixed-btn {
-  width: 657rpx;
-  line-height: 78rpx;
-  background: #D62828;
-  border-radius: 39rpx;
-  text-align: center;
-  color: #fff;
-  font-size: 33rpx;
-  font-weight: 500;
-}
\ No newline at end of file
+
+
+/* 购物车 */
+.cart-box {
+    position: fixed;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 80rpx;
+    height: 80rpx;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.2);
+    border-radius: 50%;
+    right: 20rpx;
+    bottom: 166rpx;
+  }
+  
+  .cart-box image {
+    display: block;
+    width: 49rpx;
+  }
+  
+  .cart-num {
+    width: 26rpx;
+    border: 1rpx solid;
+    border-radius: 50%;
+    line-height: 26rpx;
+    text-align: center;
+    font-size: 23rpx;
+    color: #D20000;
+    position: absolute;
+    right: -2rpx;
+    top: -5rpx;
+  }
+
+  .btns {
+    font-size: 32rpx;
+    font-weight: bold;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 39rpx;
+    border: 1px solid #D62828;
+    color: #D62828;
+  }
+  
+  .btns .btn {
+    width: 200rpx;
+    height: 73rpx;
+    line-height: 73rpx;
+    background: #D62828;
+  }
+  
+  .btns .btn:nth-child(1) {
+    border-radius: 39rpx 0 0 39rpx;
+    background: white;
+   
+  }
+  
+  .btns .btn:nth-child(2) {
+    border-radius: 0 39rpx 39rpx 0;
+    color: white;
+  }
+  
+  .btns .btn.disable {
+    background: #ccc;
+  }
+
+  .bottom-price{
+      color: #D62828;
+      font-size: 36rpx;
+  }
\ No newline at end of file
diff --git a/utils/https.js b/utils/https.js
index 50f43f4..58ee3a1 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 0e3da4f4660a929e9a900a3460aded4ff9e7c9e7 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Dec 2024 17:59:27 +0800
Subject: [PATCH 227/471] =?UTF-8?q?=E5=89=A7=E5=9C=BA=E6=BC=94=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                   |   2 +
 pages/component/calendarTheatre/index.js   | 154 +++++
 pages/component/calendarTheatre/index.json |   4 +
 pages/component/calendarTheatre/index.wxml |  20 +
 pages/component/calendarTheatre/index.wxss | 116 ++++
 pages/index/index.js                       |   2 +
 pages/info/showInfo/index.js               |  66 +-
 pages/info/showInfo/index.wxml             |  26 +-
 pages/info/showInfo/index.wxss             |   9 +-
 pages/list/theatre/index.js                |  10 +-
 pages/list/theatre/index.wxml              |  14 +-
 pages/list/theatre/index.wxss              |   1 +
 pages/order/components/contact/index.wxss  |   2 +-
 pages/order/show/index.js                  | 333 +++++++---
 pages/order/show/index.json                |   3 +-
 pages/order/show/index.wxml                |  49 +-
 pages/order/show/index.wxss                |  38 +-
 pages/order/showOrderNew/index.js          | 708 +++++++++++++++++++++
 pages/order/showOrderNew/index.json        |  10 +
 pages/order/showOrderNew/index.wxml        | 116 ++++
 pages/order/showOrderNew/index.wxss        | 457 +++++++++++++
 pages/user/order/showOrderInfo/index.js    | 381 +++++++++++
 pages/user/order/showOrderInfo/index.json  |   7 +
 pages/user/order/showOrderInfo/index.wxml  | 144 +++++
 pages/user/order/showOrderInfo/index.wxss  | 354 +++++++++++
 project.private.config.json                |  56 +-
 utils/util.js                              |   8 +-
 27 files changed, 2875 insertions(+), 215 deletions(-)
 create mode 100644 pages/component/calendarTheatre/index.js
 create mode 100644 pages/component/calendarTheatre/index.json
 create mode 100644 pages/component/calendarTheatre/index.wxml
 create mode 100644 pages/component/calendarTheatre/index.wxss
 create mode 100644 pages/order/showOrderNew/index.js
 create mode 100644 pages/order/showOrderNew/index.json
 create mode 100644 pages/order/showOrderNew/index.wxml
 create mode 100644 pages/order/showOrderNew/index.wxss
 create mode 100644 pages/user/order/showOrderInfo/index.js
 create mode 100644 pages/user/order/showOrderInfo/index.json
 create mode 100644 pages/user/order/showOrderInfo/index.wxml
 create mode 100644 pages/user/order/showOrderInfo/index.wxss

diff --git a/app.json b/app.json
index 8bba4f0..3fa2a3a 100644
--- a/app.json
+++ b/app.json
@@ -185,6 +185,8 @@
     "pages/user/personalInfo/index",
     "pages/info/luggageInfo/index",
     "pages/order/WineSceneOrder/index",
+    "pages/order/showOrderNew/index",
+    "pages/user/order/showOrderInfo/index",
     "pages/user/suggest/suggest"
   ],
   "subpackages": [
diff --git a/pages/component/calendarTheatre/index.js b/pages/component/calendarTheatre/index.js
new file mode 100644
index 0000000..a08d93e
--- /dev/null
+++ b/pages/component/calendarTheatre/index.js
@@ -0,0 +1,154 @@
+// pages/component/myCalendar/index.js
+import util from "../../../utils/util"
+let app = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  options: {
+    styleIsolation: 'apply-shared',
+    addGlobalClass: true
+  },
+  properties: {
+    datelist:{
+      type:Array,
+      value:[]
+    },
+    activeDay:{
+      type:String,
+      value:''
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    year: 0,
+    month: 0,
+    date: ['日', '一', '二', '三', '四', '五', '六'],
+    dateArr: [],
+    isToday: 0,
+    isTodayWeek: false,
+    todayIndex: 0,
+    isKj:null,
+    isGp:null
+  },
+  lifetimes: {
+    attached: function() {
+      let now = new Date();
+      let year = now.getFullYear();
+      let month = now.getMonth() + 1;
+      this.dateInit();
+      this.setData({
+        year: year,
+        month: month,
+        isToday: '' + year + month + now.getDate(),
+        isKj:app.globalData.kjId,
+        isGp:app.globalData.gp_id || app.globalData.team_id
+      })
+      let dates={}
+      this.properties.datelist.map(item=>{
+        dates[item.date] = item
+      })
+      console.log(dates)
+      this.setData({
+        dates:dates
+      })
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    dateInit: function (setYear, setMonth) {
+      //全部时间的月份都是按0~11基准，显示月份才+1
+      let dateArr = [];                        //需要遍历的日历数组数据
+      let arrLen = 0;                            //dateArr的数组长度
+      let now = setYear ? new Date(setYear, setMonth) : new Date();
+      let year = setYear || now.getFullYear();
+      let nextYear = 0;
+      let month = setMonth || now.getMonth();                    //没有+1方便后面计算当月总天数
+      let nextMonth = (month + 1) > 11 ? 1 : (month + 1);
+      let startWeek = new Date(year + '/' + (month + 1) + '/' + 1).getDay();                            //目标月1号对应的星期
+      let dayNums = new Date(year, nextMonth, 0).getDate();                //获取目标月有多少天
+      let obj = {};
+      let num = 0;
+  
+      if (month + 1 > 11) {
+        nextYear = year + 1;
+        dayNums = new Date(nextYear, nextMonth, 0).getDate();
+      }
+      arrLen = startWeek + dayNums;
+      for (let i = 0; i < arrLen; i++) {
+        if (i >= startWeek) {
+          num = i - startWeek + 1;
+          let date =util.formatDate(new Date(year +'/' + (month + 1) +'/' + num));
+          obj = {
+            isToday: '' + year + (month + 1) + num,
+            dateNum: num,
+            weight: 5,
+            date:date
+          }
+        } else {
+          obj = {};
+        }
+        dateArr[i] = obj;
+      }
+    //   dateArr.map(monthDate=>{
+    //     console.log(monthDate) 
+    //   })
+      this.setData({
+        dateArr: dateArr
+      })
+  
+      let nowDate = new Date();
+      let nowYear = nowDate.getFullYear();
+      let nowMonth = nowDate.getMonth() + 1;
+      let nowWeek = nowDate.getDay();
+      let getYear = setYear || nowYear;
+      let getMonth = setMonth >= 0 ? (setMonth + 1) : nowMonth;
+  
+      if (nowYear == getYear && nowMonth == getMonth) {
+        this.setData({
+          isTodayWeek: true,
+          todayIndex: nowWeek
+        })
+      } else {
+        this.setData({
+          isTodayWeek: false,
+          todayIndex: -1
+        })
+      }
+    },
+    lastMonth: function () {
+      //全部时间的月份都是按0~11基准，显示月份才+1
+      let year = this.data.month - 2 < 0 ? this.data.year - 1 : this.data.year;
+      let month = this.data.month - 2 < 0 ? 11 : this.data.month - 2;
+      this.setData({
+        year: year,
+        month: (month + 1)
+      })
+      this.dateInit(year, month);
+    },
+    nextMonth: function () {
+      //全部时间的月份都是按0~11基准，显示月份才+1
+      let year = this.data.month > 11 ? this.data.year + 1 : this.data.year;
+      let month = this.data.month > 11 ? 0 : this.data.month;
+      this.setData({
+        year: year,
+        month: (month + 1)
+      })
+      this.dateInit(year, month);
+    },
+    onTapDay:function(e){
+      let date = e.currentTarget.dataset.date;
+      console.log(date)
+      
+      if (date) {
+          console.log('trigger')
+        this.triggerEvent("onTapDay",date)
+      }
+    },
+  }
+})
diff --git a/pages/component/calendarTheatre/index.json b/pages/component/calendarTheatre/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/component/calendarTheatre/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/component/calendarTheatre/index.wxml b/pages/component/calendarTheatre/index.wxml
new file mode 100644
index 0000000..0c84684
--- /dev/null
+++ b/pages/component/calendarTheatre/index.wxml
@@ -0,0 +1,20 @@
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<view class='wrap'>
+    <view>
+        <view class='date-show'>
+            <view class="iconfont icon-you-copy lt-arrow" bindtap='lastMonth'></view>
+            {{year}}年{{month}}月
+            <view class="iconfont icon-you rt-arrow" bindtap='nextMonth'></view>
+        </view>
+    </view>
+    <view class='header'>
+        <view wx:for='{{date}}' class='{{(index == todayIndex) && isTodayWeek ? "weekMark" : ""}}'>{{item}}<view></view></view>
+    </view>
+    <view class='date-box'>
+        <view bindtap="onTapDay" wx:for='{{dateArr}}' class='{{activeDay == item.date ? "nowDay" : ""}}' data-date='{{dates[item.date]}}' style="flex-direction:column">
+            <view class="date-head{{dates[item.date]?'':' disable'}}" >
+                <view>{{item.dateNum}}</view>
+            </view>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/component/calendarTheatre/index.wxss b/pages/component/calendarTheatre/index.wxss
new file mode 100644
index 0000000..a3d0095
--- /dev/null
+++ b/pages/component/calendarTheatre/index.wxss
@@ -0,0 +1,116 @@
+.date-show{
+  position: relative;
+  width: 250rpx;
+  font-family: PingFang-SC-Regular;
+  font-size: 40rpx;
+  color: #282828;
+  text-align: center;
+  margin: 30rpx auto;
+}
+.lt-arrow,.rt-arrow{
+  position: absolute;
+  top: 1rpx;
+  width: 60rpx;
+  line-height: 60rpx;
+padding-right: 0.6rem;
+}
+.lt-arrow image,.rt-arrow image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.lt-arrow{
+  left: -110rpx;
+  /* transform: rotate(180deg); */
+}
+.rt-arrow{
+  right: -100rpx;
+}
+.header{
+  font-size: 0;
+  padding: 0 24rpx;
+}
+.header>view{
+  display: inline-block;
+  width: 14.285%;
+  color: #333;
+  font-size: 30rpx;
+  text-align: center;
+  border-bottom: 1px solid #D0D0D0;
+  padding: 39rpx 0;
+}
+.weekMark{
+  position: relative;
+}
+.weekMark view{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  /* border-bottom: 1px solid #22A7F6; */
+}
+.date-box{
+  font-size: 0;
+  padding: 10rpx 0;
+}
+.date-box>view{
+  position: relative;
+  width: 14.285%;
+  color: #020202;
+  font-size: 40rpx;
+  text-align: center;
+  vertical-align: middle;
+  height: 90rpx;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+.date-head{
+  /* height: 60rpx; */
+  /* line-height: 60rpx; */
+  font-size: 26rpx;
+}
+.date-head.disable {
+  color: #999;
+}
+.date-tip {
+  font-size: 24rpx;
+  line-height: 26rpx;
+  color: #D62828;
+}
+.date-tip.disable {
+  color: #999;
+}
+.nowDay .date-head{
+  width: 60rpx;
+  line-height: 60rpx;
+  border-radius: 50%;
+  text-align: center;
+  color: #fff;
+  background-color: #0B898E;
+  margin: 0 auto;
+}
+.date-weight{
+  font-size: 22rpx;
+  padding: 15rpx 0;
+}
+.nowDay .date-weight{
+  color: #0B898E;
+}
+.one{
+  position: absolute;
+  bottom: 0;
+  right: 5rpx;
+  width: 20rpx;
+  height: 20rpx;
+  border-radius: 50%;
+  background-color: red;
+}
+.two{
+  position: absolute;
+  bottom: 30rpx;
+  right: 5rpx;
+  width: 20rpx;
+  height: 20rpx;
+  border-radius: 50%;
+  background-color: blue;
+}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index bb5c43c..64f346e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -67,6 +67,8 @@ Page({
 		videoPlay: false,
 	},
 	onLoad: function(options) {
+        wx.getLocation({type: 'gcj02'})
+           
 		console.log('options',options)
 		// 相城小程序跳转获取用户信息
 		if(options && options.szxcCode) {
diff --git a/pages/info/showInfo/index.js b/pages/info/showInfo/index.js
index 50f66d4..f4ae96b 100644
--- a/pages/info/showInfo/index.js
+++ b/pages/info/showInfo/index.js
@@ -37,7 +37,10 @@ Page({
         showQrCode: false,
         wxqrcode: null,
 
-        showDetail: false
+        showDetail: false,
+        lat:120,
+        lng:31,
+        distance: 0
     },
 
     /**
@@ -54,12 +57,12 @@ Page({
             id: options.id
         })
         // 获取购物车按钮的位置
-        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-            console.log(res)
-            that.setData({
-                cartTop: res.top
-            })
-        }).exec()
+        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+        //     console.log(res)
+        //     that.setData({
+        //         cartTop: res.top
+        //     })
+        // }).exec()
 
         if (options.retailId) {
             this.setData({
@@ -75,6 +78,16 @@ Page({
                 res.data.sku = [sku];
             }
             res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+            // 解析 service_desc  service_images
+            try {
+                let service_desc = JSON.parse(res.data.service_desc)
+                let service_images = (res.data.service_images ? res.data.service_images.split(",") : [])
+                service_desc.forEach((v,index)=>{
+                    v.image = 'https://static.ticket.sz-trip.com'+service_images[index]
+                })
+                res.data.serviceData = service_desc
+            } catch(e) {}
+
             let resData = res.data
             this.setData({
                 info: resData,
@@ -82,26 +95,53 @@ Page({
                 iShop: res.data.supplier_id ? true : false
             })
 
+            this.getDistance()
             this.BroswerRecord()
         })
         
         // 推荐
         commonApi._post("search/product_recommend", {
             offset: 0,
-            limit: 6,
+            limit: 3,
             rand: true,
-            type: 'post',
+            type: 'show',
             product_ids:options.id,
         }).then(res => {
             try {
                 this.setData({
-                    tjList: res.data.list
+                    tjList: res.data.list.slice(0,3)
                 })
             } catch (error) {
                 console.log(error);
             }
         })
     },
+
+    // 获取距离
+    getDistance () {
+        let that = this
+        wx.getLocation({
+            type: 'gcj02',
+            success: function (res) {
+              that.setData({lat: res.latitude,lon: res.longitude})
+              commonApi.user_post("scene/calculate_distance", {
+                    lat1: res.latitude,
+                    lng1:res.longitude,
+                    lat2:that.data.info.scene_lat,
+                    lng2:that.data.info.scene_lon
+                }).then(res => {
+                    console.log(res)
+                    if (res&&res.data && res.data.distance) {
+                        that.setData({
+                            distance: res.data.distance
+                        })
+                    }
+                })
+            }
+          })
+        
+    },
+
     changeAllowance: function () {
         this.setData({
             showAllowance: !this.data.showAllowance
@@ -259,9 +299,9 @@ Page({
         //     })
         //     return;
         // }
-        app.globalData.couponInfo = null;
-        app.globalData.product = this.data.info;
-        app.globalData.retailId = this.data.retailId;
+        // app.globalData.couponInfo = null;
+        // app.globalData.productShow = this.data.info;
+        // app.globalData.retailId = this.data.retailId;
 
         wx.navigateTo({
             url: '/pages/order/show/index?id='+this.data.id,
diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml
index 2a0d0f9..fa6565c 100644
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@@ -13,7 +13,7 @@
                     <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
                     </view>
                 </view>
-                <view class="subtitle">演出时间：<text wx:for="{{info.sku[0].sku_model.next_show_date}}">{{item}}</text></view>
+                <view class="subtitle">演出时间：<text>{{info.subtitle}}</text></view>
 
                 <view class="bottom-price">
                     <view class="tags-price">
@@ -33,16 +33,16 @@
                 </view>
                 <view style="text-align: center;">
                     <image src="https://static.ticket.sz-trip.com/uploads/20241119/a98e35f23497c1a8ddf7c7769fbd4fd1.png"></image>
-                    <view style="padding-top: 14rpx;">25.5km</view>
+                    <view style="padding-top: 14rpx;" wx:if="{{distance}}">{{distance}}km</view>
                 </view>
             </view>
         </view>
 
-        <view class="show-tip">
-            <view class="com-flex"><image src="https://static.ticket.sz-trip.com/uploads/20241119/a98e35f23497c1a8ddf7c7769fbd4fd1.png"></image>不支持退款</view>
-            <view class="com-flex">不支持退款</view>
-
-            <view class="com-flex">不支持退款</view>
+        <view class="show-tip" wx:if="{{info.serviceData.length>0}}">
+            <view class="com-flex" wx:for="{{info.serviceData}}">
+                <image src="{{item.image}}"></image>
+                {{item.info}}
+            </view>
 
         </view>
         
@@ -64,11 +64,11 @@
         <view class="info-title">演出详情</view>
         <view class="{{showDetail?'':'max-details'}}">
             <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
-            <view wx:if="{{!showDetail}}" class="white-placholder">123</view>
+            <view wx:if="{{!showDetail}}" class="white-placholder"></view>
         </view>
         <view class="show-btn">
-            <view bindtap="changeShowDetail" data-flag="{{true}}">展开全部</view>
-            <view bindtap="changeShowDetail" data-flag="{{false}}">收起</view>
+            <view wx:if="{{!showDetail}}" bindtap="changeShowDetail" data-flag="{{true}}">展开全部</view>
+            <view wx:if="{{showDetail}}" bindtap="changeShowDetail" data-flag="{{false}}">收起</view>
         </view>
     </view>
     <view class="info-box" id="box2">
@@ -77,7 +77,7 @@
     </view>
     <view class="info-box info-box-line" >
         <view class="info-title">观看提示</view>
-        <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.expense_info)}}"></rich-text>
     </view>
 
     <view class="info-box" id="box3">
@@ -133,10 +133,10 @@
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator>
+</navigator> -->
 
 
 <view class="mask" wx:if="{{skuFlag}}">
diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss
index 284b0b5..441ab09 100644
--- a/pages/info/showInfo/index.wxss
+++ b/pages/info/showInfo/index.wxss
@@ -129,13 +129,12 @@ justify-content: space-between;
     margin-top: 27rpx;
     width: 100%;
     box-sizing: border-box;
-    height: 80rpx;
     background: #E6F3F3;
     border-radius: 13rpx;
-    padding: 0 26rpx;
+    padding: 24rpx 5rpx;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    /* justify-content: space-between; */
 
 
     font-weight: 500;
@@ -146,7 +145,8 @@ justify-content: space-between;
 .show-tip image{
     width: 26rpx;
     height: 26rpx;
-    margin-right: 12rpx;
+    margin:0 12rpx 0 20rpx;
+    flex-shrink: 0;
 }
 
 .scroll-all-box {
@@ -231,7 +231,6 @@ justify-content: space-between;
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    padding-right: 70rpx;
 }
 .show-btn view{
     width: 158rpx;
diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js
index 6deda18..668cd36 100644
--- a/pages/list/theatre/index.js
+++ b/pages/list/theatre/index.js
@@ -9,7 +9,7 @@ Page({
    */
   data: {
     list:[],
-    tagList: [], // 父标签6
+    tagList: [], // 父标签278
     total:1,
     type:278,
     sort:["","weight","distance","weight","price"],
@@ -28,7 +28,7 @@ Page({
         withShareTicket: true,
         menus: ['shareAppMessage', 'shareTimeline']
       })
-    //   this.getTags()
+      this.getTags()
     this.getList();
   },
   search:function(e){
@@ -106,10 +106,10 @@ Page({
 
   // 获取子标签
   getTags () {
-    commonApi._post("",{
-        tag_id:"278",
+    commonApi._post("product/tag_list",{
+        pid:"278",
       }).then(res=>{
-          let resData = res.data.list || []
+          let resData = res.data || []
         this.setData({
             tagList:resData
         })
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index 03bdcf0..ff6ce3e 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -5,12 +5,10 @@
     <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
 
     <view class="sale-types no-scrollbar">
-        <view class="sale-type{{type==278?' active':''}}" bindtap="changeType" data-type="1">全部</view>
-        <view class="sale-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">距离最近</view>
-        <view class="sale-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">销量最高</view>
-        <view class="sale-type{{type==4?' active':''}}" bindtap="changeType" data-type="4">价格最低</view>
-        <view class="sale-type{{type==3?' active':''}}" bindtap="changeType" data-type="3">销量最高</view>
-        <view class="sale-type{{type==4?' active':''}}" bindtap="changeType" data-type="4">价格最低</view>
+        <view class="sale-type{{type==278?' active':''}}" bindtap="changeType" data-type="278">全部</view>
+        <view wx:for="{{tagList}}" wx:key="id" class="sale-type{{type==item.id?' active':''}}" 
+        bindtap="changeType" data-type="{{item.id}}">{{item.name}}</view>
+
     </view>
 
 </view>
@@ -21,8 +19,8 @@
   <image src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2 title">{{item.title}}</view>
-    <view class="textOver subtitle">{{"开放时间"}}</view>
-    <view class="textOver subtitle">{{"地址"}}</view>
+    <view class="textOver subtitle">{{item.subtitle}}</view>
+    <view class="textOver subtitle">{{item.address}}</view>
     <view class="tags textOver">
       <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
     </view>
diff --git a/pages/list/theatre/index.wxss b/pages/list/theatre/index.wxss
index e663263..5fded7d 100644
--- a/pages/list/theatre/index.wxss
+++ b/pages/list/theatre/index.wxss
@@ -1,6 +1,7 @@
 /* pages/list/theatre/index.wxss */
 page{
     background: white;
+    padding-bottom: 20rpx;
 }
 
 .my-header-search{
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index e57dbe5..8ac2731 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -41,7 +41,7 @@
   margin-bottom: 20rpx;
 }
 .contact-item .contact-other text {
-  margin-right: 57rpx;
+  margin-right: 20rpx;
 }
 .contact-item .icon-bianji1 {
   color: #666666;
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index 412bc6d..eba7e5b 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -8,125 +8,270 @@ Page({
    * 页面的初始数据
    */
   data: {
-    dateArr: [
-        {date: '2024-11-19', price: 7000},
-        {date: '2024-11-20', price: 7000},
-        {date: '2024-11-21', price: 7000},
-    ],
-    times:[
-        {sale_date: "2024-11-19", stock_number: 0, start_time: "07:30", end_time: "08:30"},
-        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
-        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
-        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
-        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
-        {sale_date: "2024-11-19", stock_number: 2, start_time: "07:30", end_time: "08:30"},
-
-    ],
+    productId: null,
+    dateArr: [],
+    times:[],
+    skuArr: [],
     product:null,
     dateindex:-1,
     timeindex:-1,
-    sku_id: null,
-    producNum: 1,
+    skuindex: -1,
+
+    selectSku: {price:0},
+    
+    activeDate: {date: ''},
+    noStock: false,
 
     cartTop: 0,
     cartImgInfo: null,
     cartCount: 0,
+
+    // 日历
+    showMoreDateFlag: false,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-      let that = this
-    let product = app.globalData.product,start_date = util.formatDate(new Date());
-    this.setData({
-      product:product
-    })
-    let end_date = util.formatDate(new Date(new Date(start_date.replace(/-/g,'/')).getTime() + 30 * 24 * 60 * 60 * 1000));
-    commonApi.user_post("product/product_date_price",{
-      sku_id:1208,
-      start_date:start_date,
-      end_date:end_date
-    }).then(res=>{
-
-    //   this.setData({
-    //     times:res.data,
-    //     dateindex:dateindex,
-    //     timeindex:timeindex
-    //   })
-      console.log(res)
-
-        // 获取购物车按钮的位置
-        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-            console.log(res)
-            that.setData({
-                cartTop: res.top
+    onLoad: function (options) {
+        let that = this
+        let id = options.id
+        this.setData({
+            productId: id
+        })
+        // let product = app.globalData.product
+        // console.log(product)
+        // this.setData({
+        //     product:product,
+        // })
+
+        this.getProductDetail()
+        
+    },
+
+    //  获取商品详情
+    getProductDetail () {
+        commonApi._post("product/get_product_detail", {
+            id: this.data.productId
+        }).then(res => {
+            res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+            let resData = res.data
+            this.setData({
+                product: resData,
             })
-        }).exec()
-    })
 
-    this.initDate()
-  },
+            this.initDate()
+        })
+    },
 
-  getDay: function (date) {
-    let d = new Date(date.replace(/-/g, '/')).getDay();
-    let days = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
-    return days[d];
-  },
-  // 初始化日期
-  initDate () {
-      let date = this.data.dateArr
-      date.forEach(v=>{
-          v.short_date = v.date.split("-").splice(1, 2).join("-")
-      })
-      this.setData({dateArr: date})
-
-      this.initTime()
-  },
+    getDay: function (date) {
+        let d = new Date(date.replace(/-/g, '/')).getDay();
+        let days = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
+        return days[d];
+    },
 
-  // 时间处理
-  initTime () {
-      let times = this.data.times
-      times.forEach(v=>{
-          v.week = this.getDay(v.sale_date)
-      })
-      this.setData({times: times})
-  },
+    showMoreDate: function () {
+        this.setData({
+        showMoreDateFlag: true
+        })
+    },
+    hideCalendar: function () {
+        this.setData({
+        showMoreDateFlag: false
+        })
+    },
 
-  // 选择日期
-  changeDate:function(e){
-    let dateindex = e.currentTarget.dataset.date
-    // todo获取时间
-    this.setData({
-        dateindex: dateindex
-    })
+    // 修改日期
+    onTapDay: function (e) {
+        console.log(e.detail)
+        let date = e.detail.date
+        let index = this.data.dateArr.findIndex(v=>v.date==date)
 
-  },
+        let param = {currentTarget: {dataset: {date: index}}} 
+        if (index>=0) {
+            this.changeDate(param)
+            this.hideCalendar()
+        }
+    },
+    // 初始化日期
+    initDate () {
+        //  设置90天日期
+        let dateArr = []
+        let now = new Date().getTime()
+        for(let i=0 ;i<=90;i++) {
+            let date = now+i*24*60*60*1000
+            dateArr.push({date: util.formatDate(new Date(date))})
+        }
 
-  selectTime:function(e){
-    let dateindex = e.currentTarget.dataset.dateindex,times = this.data.times,timeindex=e.currentTarget.dataset.timeindex;
-    if(times[dateindex].screen[timeindex].is_ticket==1){
-      this.setData({
-        timeindex:timeindex,
-        dateindex:dateindex
-      })
-    }
-  },
+        dateArr.forEach(v=>{
+            v.short_date = v.date.split("-").splice(1, 2).join("-")
+        })
+        this.setData({dateArr: dateArr})
+        // 默认选中第一天
+        let param = {currentTarget: {dataset: {date: 0}}}
+        this.changeDate(param)
+    },
+
+    // 选择日期
+    changeDate:function(e){
+        let _this = this
+        let dateindex = e.currentTarget.dataset.date
+        let date = this.data.dateArr[dateindex]
+        let activeDate = {date: date.date}
+        // 获取时间
+        commonApi.user_post("product/get_time_slots", {
+            product_id: _this.data.product.id,
+            date: date.date
+        }).then(res => {
+            console.log(res)
+            let week = _this.getDay(res.data.date)
+            let times = res.data.time_slots
+            times.forEach(v=>{
+                v.sale_date = res.data.date
+                v.week = week
+            })
+            console.log(times)
+
+            let timeindex = times.findIndex(v=>v.total_stock>0 && v.skus.some(x=>x.stock_number>0))
+            
+            this.setData({
+                dateindex: dateindex,
+                activeDate:activeDate,
+                times: times,
+                timeindex: -1,
+                skuindex: -1,
+                selectSku: {price:0}
+            })
+            
+            if (timeindex>=0) {
+                let param = {currentTarget: {dataset: {date: timeindex}}}
+                this.changeTime(param)
+            }
+            this.judgeNoStock()
+            
+        })
 
-  minus: function () {
-        if (this.data.producNum == 1) return;
+        
+    },
+  
+    // 选择时间
+    changeTime:function(e){
+        console.log(e.currentTarget.dataset)
+        let dateindex = e.currentTarget.dataset.date;
+        let time = this.data.times[dateindex]
+        let skuArr = time.skus || [] 
+        console.log(time)
+        if (time.total_stock<=0) { return}
+
+        //给sku设置余票
         this.setData({
-            producNum: this.data.producNum - 1
+            timeindex: dateindex,
+            skuArr: skuArr,
+            skuindex: -1,
+            selectSku: {price:0}
         })
+        let trueSkuIndex = skuArr.findIndex(v=>v.stock_number>0)
+        if (trueSkuIndex>=0) {
+            let param = {currentTarget: {dataset: {date: trueSkuIndex}}}
+            this.changeSku(param)
+        }
     },
-    add: function () {
+
+    // 选择sku
+    changeSku:function(e){
+        console.log(e.currentTarget.dataset)
+        let dateindex = e.currentTarget.dataset.date;
+        let sku = this.data.skuArr[dateindex]
+        if (sku.stock_number<=0) { return }
         this.setData({
-            producNum: this.data.producNum + 1
+            skuindex: dateindex,
+            selectSku: sku
         })
     },
-  next:function(){
-    
-  },
+
+    judgeNoStock () {
+        let times = this.data.times
+        let data =  times.length<=0 || times.every(v=>v.total_stock<=0)
+        this.setData({
+            noStock: data
+        })
+    },
+
+    showOrder:function(){
+        let date = this.data.dateArr[this.data.dateindex]
+        if (!date) {
+            wx.showToast({title: '请选择日期',icon: "none"});
+            return
+        }
+        date.week = this.getDay(date.date)
+
+        let time = this.data.times[this.data.timeindex]
+        if (!time) {
+            wx.showToast({title: '请选择场次',icon: "none"});
+            return
+        }
+
+        if (this.data.skuindex<0) {
+            wx.showToast({title: '请选择票档',icon: "none"});
+            return
+        }
+
+        let product = this.data.product
+        console.log(product)
+        let skuSelect = this.data.skuArr[this.data.skuindex]
+        let sku = this.data.product.sku.find(v=>v.id == skuSelect.id)
+        sku = JSON.parse(JSON.stringify(sku))
+        sku.display_tags = sku.display_tags?sku.display_tags.split(","):[];
+        
+        
+
+        // commonApi.user_post("/product/checkStock", {
+        //     sku_id: sku.id
+        // }).then(res => {
+        // if (res && res.code != 1) {
+        //     wx.showModal({
+        //     title: "温馨提示",
+        //     content: '商品已经被抢光啦~要不要瞧瞧别的~',
+        //     showCancel: false
+        //     })
+        //     return;
+        // } else {
+            app.globalData.postProduct = []
+            app.globalData.list = []
+            app.globalData.listName = null
+            
+            if (product.flag==0 || sku.flag=='off') return;
+                // if (e.currentTarget.dataset.disable === 1) return;
+                // util.pagePoint({
+                //     event: 'scene_order',
+                //     param: {
+                //     type: this.data.info.type,
+                //     id: this.data.info.id
+                //     }
+                // }, 1)
+                // wx.setStorageSync('login_from', 'scene_order_login')
+                // wx.setStorageSync('order_from', 'scene_order_submit')
+                app.globalData.couponInfo = null;
+                // app.globalData.retailId = this.data.retailId;
+                
+                app.globalData.product = {
+                    product: product,
+                    sku: sku
+                  }
+                date.price = skuSelect.price
+                app.globalData.product.date = date
+                app.globalData.product.time = time
+                app.globalData.product.price = skuSelect.price
+                app.globalData.product.productNum = 1
+                console.log(app.globalData.product)
+                app.globalData.index = 0
+                wx.navigateTo({
+                    url: '/pages/order/showOrderNew/index',
+                })
+            // }
+
+        // })
+    },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -138,7 +283,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.getCartNum()
+    // this.getCartNum()
   },
 
    // 获取购物车数量
diff --git a/pages/order/show/index.json b/pages/order/show/index.json
index 35cf02f..cb8bb39 100644
--- a/pages/order/show/index.json
+++ b/pages/order/show/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "calendar":"/pages/component/calendarTheatre/index"
   }
 }
\ No newline at end of file
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index 95a9109..c8dba60 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -1,4 +1,5 @@
 <!--pages/order/show/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="选择票档"></title>
 <view class="order-top" wx:if="{{product}}">
   <view class="order-name">{{product.title}}</view>
@@ -10,53 +11,71 @@
         <view class="tag {{dateindex==0?'active':''}}" bindtap="changeDate" data-date="0">今天 {{dateArr[0].short_date}}</view>
         <view class="tag {{dateindex==1?'active':''}}" bindtap="changeDate" data-date="1">明天 {{dateArr[1].short_date}}</view>
         <view class="tag {{dateindex==2?'active':''}}" bindtap="changeDate" data-date="2">后天 {{dateArr[2].short_date}}</view>
-        <view class="tag">更多</view>
+        <view class="tag {{dateindex>2?'active':''}}" bindtap="showMoreDate">{{dateindex>2?dateArr[dateindex].short_date:'更多'}}</view>
     </view>
   </view>
 
-  <view class="box-content">
+  <view class="box-content" wx:if="{{dateindex>=0}}">
     <view class="box-title">场次</view>
-    <view class="flex-wrap flex-between">
-        <view wx:for="{{times}}" date-item="{{item}}" class="tag {{dateindex==key?'active':''}} {{item.stock_number<=0?'disabled':''}}" 
-        bindtap="changeTime" data-date="{{key}}">
+    
+
+    <view wx:if="{{noStock}}">
+        <image  class="no-data" src="https://static.ticket.sz-trip.com/uploads/20241129/894f45acb51cffcdddd5a2ddd695660b.png"></image>
+        <view style="text-align: center;color: #666;padding-top: 40rpx;">暂无场次</view>
+    </view>
+    
+    <view class="flex-wrap flex-between" wx:else>
+        <view wx:for="{{times}}" wx:key="index" date-item="{{item}}" 
+        class="tag {{timeindex==index?'active':''}} {{item.total_stock<=0?'disabled':''}}" 
+        bindtap="changeTime" data-date="{{index}}">
             {{item.sale_date}} {{item.week}} {{item.start_time}}
         </view>
     </view>
   </view>
 
-  <view class="box-content">
+  <view class="box-content" wx:if="{{timeindex>=0}}">
     <view class="box-title">票档</view>
     <view class="sku-box">
-        <view wx:for="{{times}}" date-item="{{item}}" class="tag {{dateindex==key?'active':''}} {{item.stock_number<=0?'disabled':''}}" 
-        bindtap="changeSku" data-date="{{key}}">
-            {{item.sale_date}} {{item.week}} {{item.start_time}}
+        <view wx:for="{{skuArr}}" wx:key="index" date-item="{{item}}" 
+        class="tag {{skuindex==index?'active':''}} {{item.stock_number<=0?'disabled':''}}" 
+        bindtap="changeSku" data-date="{{index}}">
+            {{item.sku_name}} ￥{{item.price/100}}
         </view>
     </view>
   </view>
 
 
     
-    <view class="number-box box-content">
+    <!-- <view class="number-box box-content">
       <text>数量</text>
       <view class="iconfont icon-sami-select" bindtap="minus"></view>
       <view class="number">{{producNum}}</view>
       <view class="iconfont icon-add-select add" bindtap="add"></view>
-    </view>
+    </view> -->
 
   
 </view>
 <view style="height:138rpx"></view>
 <view class="fixed-bottom">
-    <view>总价：<text class="bottom-price">￥560.00</text></view>
+    <view>单价：<text class="bottom-price">￥{{selectSku.price/100}}</text></view>
     <view class="btns">
-        <view class="btn" bindtap="showCart">加入购物车</view>
+        <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
         <view class="btn" bindtap="showOrder" >立即购买</view>
     </view>
 </view>
 
 
 <!-- 购物车悬浮框 -->
-<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator>
\ No newline at end of file
+</navigator> -->
+
+<!-- 日历选择 -->
+<view class="mask" wx:if="{{showMoreDateFlag}}" style="z-index:101">
+  <view class="mask-bg" bindtap="hideCalendar"></view>
+  <view class="calendar-content">
+    <calendar activeDay="{{activeDate.date}}" id="calendar" datelist="{{dateArr}}" calendarConfig="{{calendarConfig}}" 
+    bind:afterCalendarRender="calendarReady" bind:onTapDay="onTapDay" bind:afterTapDay="afterTapDay"></calendar>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/order/show/index.wxss b/pages/order/show/index.wxss
index 53c245f..71a92e9 100644
--- a/pages/order/show/index.wxss
+++ b/pages/order/show/index.wxss
@@ -10,6 +10,7 @@ page {
     font-weight: bold;
     font-size: 32rpx;
     color: #111111;
+    box-sizing: border-box;
 }
 
 .box {
@@ -46,11 +47,9 @@ page {
     width: fit-content;
 }
 .tag{
-    padding: 0rpx 19rpx;
+    padding: 15rpx 19rpx;
     border: 1px solid #999999;
-    height: 67rpx;
-    line-height: 67rpx;
-    text-align: center;
+    text-align: left;
     border-radius: 13rpx;
     font-family: PingFang SC;
     font-weight: bold;
@@ -180,18 +179,20 @@ page {
     height: 73rpx;
     line-height: 73rpx;
     background: #D62828;
+    border-radius: 39rpx;
+    color: white;
   }
   
-  .btns .btn:nth-child(1) {
+  /* .btns .btn:nth-child(1) {
     border-radius: 39rpx 0 0 39rpx;
     background: white;
    
-  }
+  } */
   
-  .btns .btn:nth-child(2) {
+  /* .btns .btn:nth-child(2) {
     border-radius: 0 39rpx 39rpx 0;
     color: white;
-  }
+  } */
   
   .btns .btn.disable {
     background: #ccc;
@@ -200,4 +201,25 @@ page {
   .bottom-price{
       color: #D62828;
       font-size: 36rpx;
+  }
+
+  .calendar-content {
+    background: white;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    padding-bottom: 50rpx;
+  }
+  .short-date {
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #000000;
+  }
+
+  .no-data{
+      width: 353.33rpx;
+      height: 129.33rpx;
+      display: block;
+      margin: 198rpx auto 0;
   }
\ No newline at end of file
diff --git a/pages/order/showOrderNew/index.js b/pages/order/showOrderNew/index.js
new file mode 100644
index 0000000..393e269
--- /dev/null
+++ b/pages/order/showOrderNew/index.js
@@ -0,0 +1,708 @@
+// pages/order/scene/index.js
+let app = getApp()
+import util from "../../../utils/util"
+import commonApi from "../../../utils/https/common"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    product:null,
+    productNum: 1,
+    linkmanList: [],
+    date: "",
+    time: "",
+    remark: "",
+    singlePrice: 0,
+    type: null,
+    coupon:null,
+    isLogin: false,
+    kjId: null,
+    gp_id: null,
+    groupName: "",
+    prizeId: null,
+    select_allowance: false,
+    showAllowance: false,
+    allowance_data: null,
+    allowance_price: 0,
+    pIndex: 0,
+    flag:null,
+		ticket_type:1,
+    isCar:'single',
+    showMask: false,
+    price:0,
+    is_need_idcard:1,
+    is_authentication:1, // 是否实名，0否1是，默认实名
+    phone:'', //不实名时传的手机号
+    is_real_name:1, // 是否是一证一票，0否1是，
+    status:false,
+    date: "",
+    time: "",
+    ydxz:false, //预定须知弹框
+    bookingInfo: null,
+    bookingInfoTitle: "",
+    showDate:false,
+    showDate2:false,
+    showYhq:null,
+    couponFlag:false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      product: app.globalData.product,
+      type: options.type,
+      kjId: app.globalData.kjId,
+      gp_id: app.globalData.gp_id || app.globalData.team_id,
+      prizeId: wx.getStorageSync('prizeId'),
+      flag:options.flag,
+      date:null,
+		ticket_type:app.globalData.product.sku.ticket_type || 1,
+      isCar:options.isCar,
+      is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_real_name:app.globalData.product.sku.sku_model.is_real_name,
+      date: app.globalData.product.date,
+      time: app.globalData.product.time || {},
+      showYhq:app.globalData.listName?false:true
+    })
+    console.log('-------',this.data.product.sku.sku_model);
+    // // debugger
+    console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
+    console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
+    console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name);
+    // console.log(app.globalData.list, app.globalData.index,'list---index')
+    if (!app.globalData.product) {
+      util.back();
+      return;
+    }
+    if (!app.globalData.product.time) {
+        app.globalData.product.time = {}
+    }
+    if (app.globalData.product.productNum) {
+      this.setData({
+        productNum: app.globalData.product.productNum < 1 ? 1 : app.globalData.product.productNum
+      })
+    }else{
+		this.setData({
+		  productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num
+		})
+  }
+    this.setData({
+      product: app.globalData.product,
+      singlePrice: app.globalData.product.date?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
+      // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
+    })
+    // console.log(this.data.singlePrice);
+    this.getNewCoupon()
+    // this.showAllPrice()
+  //  console.log('********',this.data.product);
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
+      this.couponCom = this.selectAllComponents("#coupon")[0];
+    }
+  },
+  // next: function () {
+  //   this.setData({
+  //     showMask:true
+  //   })
+  // },
+  // changeDate() {
+  //   this.setData({
+  //     showDate: true,
+  //   })
+  // },
+  hideDate: function () {
+    this.setData({
+      showDate: false
+    })
+  },
+  showBookingInfo: function (e) {
+    this.setData({
+      bookingInfo: this.data.product.sku.sku_model,
+      bookingInfoTitle: this.data.product.sku.sku_name
+    })
+    util.pagePoint({
+      event: "scene_notice",
+      param: {
+        type: this.data.product.type,
+        id: this.data.product.id
+      }
+    }, 1)
+  },
+  closeMask: function () {
+    this.setData({
+      bookingInfo: null
+    })
+  },
+  showAllPrice:function () {
+    // console.log('detail',app.globalData.product);
+    // console.log('singlePrice',this.data.singlePrice);
+    // console.log('productNum',this.data.productNum);
+    console.log('couponInfo',app.globalData.couponInfo);
+    if (this.data.ticket_type != 1) {
+      // this.setData({
+      //   singlePrice:app.globalData.product.product.price
+      // })
+      let price
+      if (this.data.coupon) {
+        console.log(app.globalData.couponInfo,this.data.coupon);
+        if (this.data.coupon.activity.discount_type == 'pricebreak') {
+          price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+       } else {
+        price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+       }
+      } else {
+        price = this.data.singlePrice * this.data.productNum
+      }
+      
+      if (price >0) {
+        this.setData({
+          price:price/100
+        })
+      }else {
+        this.setData({
+          price:0
+        })
+      }
+      // console.log(this.data.singlePrice);
+    }else {
+      let price
+      if (this.data.coupon) {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
+        price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      price = this.data.singlePrice * this.data.productNum
+    }
+    if (price >0) {
+      this.setData({
+        price:price/100
+      })
+    }else {
+      this.setData({
+        price:0
+      })
+    }
+    }
+   
+  },
+  cancel: function () {
+    this.setData({
+      showMask:false
+    })
+  },
+  changeGroupName: function (e) {
+    this.setData({
+      groupName: e.detail.value
+    })
+  },
+  setLinkman: function (e) {
+    if (e.detail.phone || e.detail.phone=='') {
+      this.setData({
+        phone:e.detail.phone
+      })
+    }else {
+      console.log(e);
+      let linkmanList = e.detail;
+      if (this.data.productNum != linkmanList.length && this.data.coupon) {
+        wx.showToast({
+          title: '订单价格发生变化，请重新选择优惠券',
+          icon: 'none'
+        })
+       
+      }
+    this.setData({
+      // productNum: productNum,
+      linkmanList: linkmanList
+    })
+    console.log(this.data.linkmanList);
+    // this.changePrice()
+    this.totalPrice(this.data.singlePrice)
+    }
+  },
+  add: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
+      wx.showToast({
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        icon: 'none'
+      })
+      return;
+    }
+    this.setData({
+      productNum: this.data.productNum + 1
+    })
+	this.data.product.num = this.data.productNum
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  minus: function () {
+    if (this.data.productNum==undefined) {
+      wx.showToast({
+        title: '请先添加出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.productNum == 1) return;
+    if (this.data.coupon) {
+      wx.showToast({
+        title: '订单价格发生变化，请重新选择优惠券',
+        icon: 'none'
+      })
+    }
+    if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag && this.data.type!='museum') {
+      // this.couponCom.setNullCoupon()
+
+    }
+    app.globalData.couponInfo = null;
+    console.log(this.data.couponFlag);
+    this.setData({
+      productNum: (this.data.productNum - 1),
+      coupon: null,
+      couponFlag:true
+    })
+	this.data.product.num = this.data.productNum
+    // this.changePrice()
+    // this.showAllPrice()
+    this.totalPrice(this.data.singlePrice)
+  },
+  totalPrice(price) {
+    let allPrice
+    if (this.data.coupon) {
+      if (this.data.coupon.activity.discount_type == 'pricebreak') {
+        allPrice = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      allPrice = this.data.singlePrice * this.data.productNum
+    }
+      
+    // allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      if (allPrice >0) {
+        this.setData({
+          price:allPrice/100,
+          singlePrice:price
+        })
+      }else {
+        this.setData({
+          price:0,
+          singlePrice:price
+        })
+      }
+      console.log('singlePrice',this.data.singlePrice);
+  },
+  changeDate: function (e) {
+    console.log('打印',e);
+    this.setData({
+      showDate:true
+    })
+    // debugger
+    // this.showAllPrice()
+    this.totalPrice(e.detail.price)
+    if (e.detail.price != this.data.singlePrice && this.data.coupon) {
+      wx.showToast({
+        title: '订单价格发生变化，请重新选择优惠券',
+        icon: 'none'
+      })
+      this.setData({
+        coupon: null,
+        singlePrice:e.detail.price
+      })
+      if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
+        this.couponCom.setNullCoupon()
+      }
+      app.globalData.couponInfo = null;
+    }
+    app.globalData.product.changeFlag = true
+    this.setData({
+      date: e.detail,
+      singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
+      showDate2:true
+    })
+    // this.changePrice()
+  },
+  changeTime: function (e) {
+    this.setData({
+      time: e.detail
+    })
+  },
+  changeAllowance: function () {
+    this.setData({
+      showAllowance: !this.data.showAllowance
+    })
+  },
+  phoneInput:function(e){
+    this.setData({
+      phone: e.detail.value
+    })
+  },
+  /**
+   * 补贴价
+   */
+  changePrice: function () {
+    let product = this.data.product, price = product.sku.price;
+    if (this.data.allowance_data && this.data.select_allowance && this.data.allowance_price) {
+      let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price);
+      price -= this.data.allowance_price < spread_price ? this.data.allowance_price : spread_price
+    }
+    this.setData({
+      singlePrice: app.globalData.kjId ? 0 : price
+    })
+	
+  },
+  changed() {
+    app.globalData.product.date = this.data.date
+    app.globalData.product.time = this.data.time
+    app.globalData.product.changeFlag = true
+    this.hideDate()
+  },
+  order:function() {
+    let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
+    let linkmanIds = [];
+    if (linkmanList.length==0 && this.data.is_authentication == 1) {
+      wx.showToast({
+        title: '请选择出行人',
+        icon: 'none'
+      })
+      return
+    }
+    if (this.data.is_authentication == 1) {
+      linkmanList.map(item => {
+        linkmanIds.push(item.id)
+      })
+    }
+    if (this.data.is_authentication == 0) { //是否实名：0否1是
+      if (this.data.phone == '') {
+        wx.showToast({
+          title: '请填写手机号',
+          icon: 'none'
+        })
+        return
+      }
+    }
+    // 判断时间日期
+    if (!date && this.data.ticket_type == 1) {
+        wx.showToast({
+          title: '请选择使用日期',
+          icon: 'none'
+        })
+        return
+    }
+    if (!time && date && date.is_time_stock == true) {
+        wx.showToast({
+          title: '请选择使用时间',
+          icon: 'none'
+        })
+        return
+      }
+
+    let data = {
+      coupon_id: this.data.coupon ? this.data.coupon.id : null,
+      source: "WECHATXCX",
+      product_list: [{
+        type: product.product.type,
+        product_id: product.product.id,
+        sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        start_time: time.start_time,
+        end_time: time.end_time,
+        use_date: date ? date.date : '',
+        visitors: linkmanIds.join(","),
+        remark: remark,
+        product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
+        phone:this.data.phone,// 不实名的时候传的手机号参数
+      }],
+      originate_order_id: this.data.kjId,
+      gp_id: app.globalData.gp_id,
+      team_id: app.globalData.team_id,
+      linkmanList:this.data.is_authentication == 1?this.data.linkmanList:[]
+    }
+    if (app.globalData.from) {
+      data.system_name = app.globalData.from;
+    }
+    if (app.globalData.retailId) {
+      data.commission_code = app.globalData.retailId;
+      app.globalData.retailId = null;
+    }
+    if (app.globalData.category_id) {
+      data.category_id = app.globalData.category_id;
+    }
+    if (this.data.prizeId) {
+      data.lottery_id = this.data.prizeId
+    }
+    console.log(data)
+    let service = 'order/create', postData = {
+      data: JSON.stringify(data)
+    }
+    if (app.globalData.product.isGroup == 1) {
+      service = "team_order/appoint"
+      postData.member_num = this.data.productNum
+      postData.team_name = this.data.groupName
+      postData.type = 1;
+    }
+	if(app.globalData.list){
+    app.globalData.list[app.globalData.index] = this.data.product
+    // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+      app.globalData.list[app.globalData.index].phone = this.data.phone
+      app.globalData.list[app.globalData.index].linkmanList = []
+    }else {
+      app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
+    }
+  }
+  // app.globalData.linkmanList = this.data.linkmanList
+  app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+  console.log(app.globalData);
+	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
+		if(app.globalData.createDate){
+			app.globalData.createDate.product_list.push(data.product_list[0])
+		}else{
+      app.globalData.createDate = data
+    }
+    console.log(app.globalData.createDate);
+		app.globalData.index = app.globalData.index + 1
+		app.globalData.product = app.globalData.list[app.globalData.index]
+		wx.redirectTo({
+		  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
+		})
+		return
+	}else{
+		if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
+			if(app.globalData.createDate){
+				app.globalData.createDate.product_list.push(data.product_list[0])
+			}
+			wx.redirectTo({
+			  url: '/pages/order/orderList/index?flag='+ this.data.flag
+			})
+		}else{
+			commonApi.user_post(service, postData).then(res => {
+			  if (app.globalData.kjId) {
+			    this.setData({
+			      kjId: null
+			    });
+			    app.globalData.kjId = null;
+			  }
+			  if (app.globalData.gp_id) {
+			    this.setData({
+			      gp_id: null
+			    });
+			    app.globalData.gp_id = null;
+			  }
+			  if (res.code == 1 && app.globalData.product.isGroup == 1) {
+			    // 团购跳转到团购详情
+			    wx.navigateTo({
+			      url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order'
+			    })
+			  }
+			})
+		}
+	}
+  },
+  next: function () {
+	  console.log(this.data)
+    let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
+    let linkmanIds = [];
+
+    if (!date && this.data.ticket_type == 1) {
+      wx.showToast({
+        title: '请选择使用日期',
+        icon: 'none'
+      })
+      return
+    }
+    if (linkmanList.length!=productNum && this.data.is_authentication == 1 && this.data.is_real_name == 1) {
+      wx.showToast({
+        title: '购票数量要和出行人数量一致',
+        icon: 'none'
+      })
+      return
+    }
+    if (!util.isTel(this.data.phone) &&this.data.is_authentication == 0) {
+      wx.showToast({
+        title: '请输入正确的手机号',
+        icon: 'none'
+      })
+      return
+    }
+    if (!time && date && date.is_time_stock == true) {
+      wx.showToast({
+        title: '请选择使用时间',
+        icon: 'none'
+      })
+      return
+    }
+    if (app.globalData.product.isGroup == 1 && !this.data.groupName) {
+      wx.showToast({
+        title: '请输入团队主体名称',
+        icon: 'none'
+      })
+      return;
+    }
+
+    this.setData({
+      showMask:true
+    })
+  
+  },
+  // 活动预约
+  activityOrder: function () {
+    if (this.data.linkmanList && this.data.linkmanList.length > 0) {
+      commonApi.user_post("pbservice/Culture/booking", {
+        id: this.data.product.product.id,
+        name: this.data.linkmanList[0].name,
+        card_number: this.data.linkmanList[0].id_number,
+        tel: this.data.linkmanList[0].tel
+      }).then(res => {
+        if (res.code == 1) {
+          wx.showToast({
+            title: '预约成功',
+            icon: 'success'
+          })
+          setTimeout(() => {
+            wx.navigateBack()
+          }, 1000)
+          return;
+        }
+      })
+    }
+    else {
+      wx.showToast({
+        title: '请选择出行人',
+        icon: 'none'
+      })
+      return;
+    }
+
+  },
+  /**
+ * 选择补贴
+ */
+  selectAllowance: function () {
+    this.setData({
+      select_allowance: !this.data.select_allowance
+    })
+    this.changePrice()
+  },
+  //获取最高优惠券
+  getNewCoupon(e){
+      
+    this.setData({
+        coupon:e.detail
+    })
+
+   this.showAllPrice()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    // this.setData({
+    //   productNum:1
+    // })
+    // app.globalData.productNum =1
+	if(app.globalData.list && app.globalData.list.length != 0 && this.data.type!='museum'){
+		app.globalData.product = app.globalData.list[app.globalData.index]
+	}
+    if (!this.data.isLogin) {
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          this.setData({
+            isLogin: true
+          })
+        }
+      })
+    }
+    // this.setData({
+    //   coupon: app.globalData.couponInfo
+    // })
+    // 获取补贴
+    // if (this.data.product) {
+    //   commonApi.user_post("product/getProductAllowancePrice", {
+    //     product_code: this.data.product.product.product_code
+    //   }).then(resTwo => {
+    //     if (resTwo && resTwo.code == 1) {
+    //       this.setData({
+    //         allowance_data: resTwo.data
+    //       })
+    //       let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+    //       let sInfo = this.data.product.sku
+    //       if (spread_price > 0) {
+    //         if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+    //           this.setData({
+    //             allowance_price: spread_price
+    //           })
+    //         } else {
+    //           this.setData({
+    //             allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+    //           })
+    //         }
+    //         this.changePrice()
+    //       } else {
+    //         this.setData({
+    //           allowance_price: 0
+    //         })
+    //       }
+    //     }
+    //   })
+    // }
+    // console.log('-----',app.globalData.product.sku.price);
+    // app.globalData.product = delete(app.globalData.product.detail)
+    // this.showAllPrice()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+    this.setData({
+      couponFlag:false
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    this.setData({
+      kjId: null,
+      gp_id: null
+    });
+    app.globalData.kjId = null;
+    app.globalData.gp_id = null;
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/order/showOrderNew/index.json b/pages/order/showOrderNew/index.json
new file mode 100644
index 0000000..17ea59b
--- /dev/null
+++ b/pages/order/showOrderNew/index.json
@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "date1":"../components/date/index",
+    "contact":"../components/contact/index",
+    "coupon":"../components/coupon/index",
+    "notice":"/pages/component/notice/notice",
+    "date":"/pages/order/components/date"
+  }
+}
\ No newline at end of file
diff --git a/pages/order/showOrderNew/index.wxml b/pages/order/showOrderNew/index.wxml
new file mode 100644
index 0000000..9891d53
--- /dev/null
+++ b/pages/order/showOrderNew/index.wxml
@@ -0,0 +1,116 @@
+<!--pages/order/scene/index.wxml-->
+<view  class="{{product && product.isGroup==1?'group-order':''}}">
+  <title title="提交订单"></title>
+
+  <view class="box" style="padding: 42rpx 21rpx 45rpx 19rpx;display: flex;justify-content: space-between;align-items: center;">
+    <view style="width: 550rpx;">
+      <view style="font-weight: bold;font-size: 36rpx;color: #000000;margin-bottom: 27rpx;" class="textOver2">
+        {{product.product.title}}
+      </view>
+      <view style="font-weight: 500;font-size: 27rpx;color: #333;padding-left: 2rpx;">
+            场次： {{date.date}}  {{date.week}} {{time.start_time}}
+      </view>
+    </view>
+    <!-- <view class="change-date" bindtap="changeDate" wx:if="{{ticket_type!= 2}}">
+      修改 >
+    </view> -->
+  </view>
+
+  <view class="box">
+    <view class="box-title">
+      <view class="textOver" style="flex:1;font-size:36rpx;font-weight: bold;">{{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}</view>
+     
+      <view class="s-price">
+        {{product.sku.price/100}}
+      </view>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <view class="number-box">{{productNum}}</view>
+      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
+    </view>
+    <view class="text1">
+      <text wx:for="{{product.sku.display_tags}}">
+        {{item}}<text style="margin:0 8rpx;" wx:if="{{index+1<=product.sku.display_tags.length}}">|</text> 
+      </text>
+      <text bindtap="showBookingInfo" wx:if="{{product.sku.sku_model.bookinfo}}">预订须知 ></text>
+    </view>
+
+  </view>
+  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+  <!-- <view class="box" style="margin-top: -30rpx;border-top: 1px solid #CCCCCC;" wx:if="{{is_authentication}}">
+    <view class="box-title">
+      <view style="flex-shrink:0">联系手机</view>
+      <input bindinput="phoneInput" type="number" value="{{phone}}" class="weui-input" placeholder="请输入手机号" />
+    </view>
+  </view> -->
+
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum' && showYhq}}" id="coupon"
+    money="{{singlePrice * productNum}}" sku="{{product.sku.id}}" couponFlag="{{couponFlag}}"></coupon>
+
+
+
+  <view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view>
+  <view class="fixed-bottom">
+    <view class="fixed-price-box" wx:if="{{kjId || prizeId}}"><text>合计：</text><text class="price">¥0</text></view>
+    <view class="fixed-price-box" wx:else><text>合计：</text>
+      <text class="price">¥{{price}}</text>
+    </view>
+    <view class="fixed-btn" bindtap="order">去支付</view>
+  </view>
+
+  <view class="mask" style="align-items:flex-end" wx:if="{{showMask}}">
+  <view class="mask-bg" bindtap="cancel"></view>
+  <view class="mask-content1">
+      <view class="dialog-top">
+        <view class="scene-title">{{product.product.title}}-{{product.sku.sku_name}}</view>
+        <view class="people-message">出行人信息</view>
+        <view style="max-height:430rpx;overflow: scroll;" wx:if="{{is_authentication=='1'}}">
+          <view class="people" wx:for="{{linkmanList}}">
+            <view class="flex">
+              <view>姓名：</view>
+              <view style="color: #333;">{{item.name}}</view>
+            </view>
+            <view class="flex" style="margin: 19.33rpx 0;">
+              <view>证件号：</view>
+              <view style="color: #333;">{{item.id_number}}</view>
+            </view>
+            <view class="flex">
+              <view>手机号：</view>
+              <view style="color: #333;">{{item.tel}}</view>
+            </view>
+          </view>
+        </view>
+        <view wx:else>
+            <view class="flex" style="margin: 10rpx 0 30rpx;">
+              <view>手机号：</view>
+              <view style="color: #333;">{{phone}}</view>
+            </view>
+          </view>
+      </view>
+      <view class="bottom-btn">
+        <view class="cancle" bindtap="cancel">取消</view>
+        <view class="confirm" bindtap="order">无问题，下一步</view>
+      </view>
+  </view>
+</view>
+<notice bookingInfo="{{bookingInfo}}" skuName="{{bookingInfoTitle}}" wx:if="{{bookingInfo}}" bind:close="closeMask">
+</notice>
+ <!-- 日期弹框 -->
+ <view class="mask" wx:if="{{showDate}}">
+    <view class="mask-bg" bindtap="hideDate"></view>
+    <view class="mask-content2">
+      <view class="iconfont icon-close" bindtap="hideDate"></view>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <view class="bottom-box">
+        <view>
+          合计: <text class="totalPrice">{{price}}</text>
+        </view>
+        <view class="next" bindtap="changed" data-sku="{{sku}}" data-product="{{item}}">
+        <!-- <view class="next" bindtap="order" data-sku="{{sku}}" data-product="{{item}}"> -->
+          确定
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/order/showOrderNew/index.wxss b/pages/order/showOrderNew/index.wxss
new file mode 100644
index 0000000..3780f39
--- /dev/null
+++ b/pages/order/showOrderNew/index.wxss
@@ -0,0 +1,457 @@
+/* pages/.wxss */
+page {
+  background: #f6f6f6;
+}
+
+.group-order {
+  background: #fff;
+}
+
+.product-info {
+  padding: 20rpx 47rpx;
+  border-bottom: 1rpx solid #ccc;
+}
+
+.product-title {
+  font-size: 33rpx;
+  color: #000;
+  font-weight: 500;
+}
+
+.product-price {
+  color: #D62828;
+  font-size: 27rpx;
+}
+
+.group-order .box-title {
+  margin: 0;
+}
+
+.group-order .box,
+.group-order .date-box {
+  border-bottom: 1rpx solid #D8D8D8;
+  border-radius: 0;
+  margin: 0 25rpx;
+}
+
+.group-order .dates-boxes {
+  border-top: none;
+  padding-top: 0;
+}
+
+.group-order .date-time.disable {
+  background: #CCCCCC;
+  color: #fff;
+}
+
+.box {
+  margin: 30rpx 25rpx;
+  background: white;
+  border-radius: 9rpx;
+}
+
+.box-title {
+  height:108rpx;
+  margin: 0 20rpx;
+  font-size: 31rpx;
+  color: #000;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+}
+
+.dates-boxes {
+  display: flex;
+  align-items: center;
+  padding: 31rpx 21rpx;
+  /* border-top: 1rpx solid #ccc; */
+}
+
+.date-item {
+  width: 120rpx;
+  height: 133rpx;
+  border-radius: 10rpx;
+  /* border: 1rpx solid #333; */
+  text-align: center;
+  font-size: 27rpx;
+  color: #000;
+  margin-right: 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  background: #F5F5F5;
+  flex-shrink: 0;
+}
+
+.date-item.active {
+  border-color: #0B898E;
+  color: #fff;
+  background: #0B898E;
+}
+
+.date-item.disable {
+  border-color: #CCCCCC;
+  color: #999;
+}
+
+.date-item .price {
+  font-size: 25rpx;
+  color: #D62828;
+}
+
+.date-item.active .price {
+  color: #fff;
+}
+.date-item.active view {
+  color: #fff;
+}
+
+.date-item.disable .price {
+  color: #999;
+}
+.date-item.disable .short-date {
+  color: #999;
+}
+
+.more-item {
+  /* width: 99rpx;
+  margin-right: 0; */
+  position: absolute;
+    right: 0;
+    text-align: center;
+    padding: 0 26rpx 0 24rpx;
+    display: flex;
+    font-weight: 400;
+    font-size: 27rpx;
+    color: #0B898E;
+    align-items: center;
+}
+
+.date-times {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 0 21rpx;
+  padding-top: 34rpx;
+  padding-bottom: 10rpx;
+  /* border-top: 1rpx dashed #ccc; */
+  flex-wrap: wrap;
+}
+
+.date-time {
+  width: 315rpx;
+  line-height: 58rpx;
+  /* border: 1px solid #333; */
+  border-radius: 10rpx;
+  text-align: center;
+  font-size: 25rpx;
+  flex-shrink: 0;
+  margin-bottom: 24rpx;
+  color: #000;
+  background-color: #F5F5F5;
+}
+
+.date-time.disable {
+  /* border-color: #ccc;
+  color: #666666; */
+  background: #F5F5F5;
+    font-weight: 400;
+    font-size: 25rpx;
+    color: #999999;
+}
+.short-date {
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #000000;
+}
+
+.date-time.active {
+  border-color: #0B898E;
+  background: #0B898E;
+  color: #fff;
+}
+
+.box-title .iconfont {
+  font-size: 28rpx;
+  flex-shrink: 0;
+}
+
+.number-box {
+  font-size: 29rpx;
+  font-weight: 500;
+  color: #000;
+  flex-shrink: 0;
+  /* width: 67rpx; */
+  line-height: 49rpx;
+  /* background: #F0F0F0; */
+  border-radius: 7rpx;
+  text-align: center;
+  margin: 0 20rpx;
+}
+
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 113rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  z-index: 1;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+}
+
+.yuyue-box {
+  height: 138rpx;
+  justify-content: center;
+}
+
+.fixed-btn {
+  line-height: 80rpx;
+  width: 250rpx;
+height: 80rpx;
+background: #D62828;
+border-radius: 40rpx;
+margin-right: 50rpx;
+font-family: PingFang SC;
+font-weight: bold;
+font-size: 32rpx;
+color: #FFFFFF;
+text-align: center;
+}
+
+.fixed-price-box {
+  margin-left: 25rpx;
+  flex-shrink: 0;
+  font-size: 29rpx;
+  color: #333;
+  font-weight: 500;
+}
+
+.fixed-price-box .price {
+  color: #D62828;
+  font-size: 36rpx;
+  margin-left: 10rpx;
+}
+
+.allowance {
+  justify-content: space-between;
+}
+
+.allowance>view:nth-child(2) {
+  display: flex;
+  align-items: center;
+}
+
+.allowance image {
+  width: 40rpx;
+  height: 40rpx;
+  margin-left: 10rpx;
+}
+
+.allowance .border {
+  width: 30rpx;
+  height: 30rpx;
+  border-radius: 50%;
+  border: 4rpx solid #0B98BE;
+  margin-left: 10rpx;
+}
+
+.coupon-btn {
+  width: 138rpx;
+  line-height: 56rpx;
+  border: 1px solid #333333;
+  border-radius: 29rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #000;
+}
+
+.box-title input {
+  flex: 1;
+  display: block;
+  font-size: 32rpx;
+  color: #000;
+  margin-left: 42rpx;
+  font-weight: 500;
+  text-align: left;
+}
+
+.yuyue-btn {
+  width: 657rpx;
+  line-height: 78rpx;
+  border-radius: 39rpx;
+}
+
+.group-order .yuyue-box {
+  height: 100rpx;
+}
+
+.group-order .yuyue-btn {
+  width: 100%;
+  /* height: 100%; */
+  line-height: 100rpx;
+  border-radius: 0;
+}
+
+.mask-allowance .mask-content {
+  margin: auto;
+  top: initial;
+  bottom: initial;
+  padding: 20rpx;
+}
+
+.mask-allowance .mask-content .rule-title {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+
+.dialog-top {
+  color: #999;
+  font-weight: 500;
+  padding: 40rpx 33.33rpx 0;
+}
+
+.scene-title {
+  font-size: 35rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 32.67rpx;
+}
+
+.people-message {
+  margin-bottom: 26.67rpx;
+  /* padding-bottom: 26.67rpx; */
+  /* border-bottom: 1px solid #F0F0F0; */
+  font-weight: bold;
+  font-size: 32rpx;
+}
+
+.people {
+  border-top: 1rpx solid #F0F0F0;
+  padding: 26.67rpx 0 24rpx;
+}
+
+.flex {
+  display: flex;
+}
+
+.bottom-btn {
+  display: flex;
+  border-top: 1rpx solid #F0F0F0;
+  height: 96rpx;
+  /* padding: 32.67rpx 0; */
+}
+
+.cancle {
+  width: 50%;
+  color: #999;
+  text-align: center;
+  line-height: 96rpx;
+}
+
+.confirm {
+  width: 50%;
+  text-align: center;
+  color: #D62828;
+  line-height: 96rpx;
+  border-left: 1rpx solid #F0F0F0;
+}
+
+.mask-content1 {
+  max-height: 710rpx;
+  position: relative;
+  z-index: 1;
+  width: 80%;
+  background: white;
+  border-radius: 12rpx;
+  /* margin-bottom: 45%; */
+  overflow-y: auto;
+  margin: auto;
+}
+.change-date {
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #0B898E;
+}
+.text1 {
+    margin-left: 21rpx;
+    font-weight: 400;
+    font-size: 23rpx;
+    color: #0B898E;
+    margin-bottom: 21rpx;
+    display: flex;
+    align-items: flex-end;
+    padding-bottom: 40rpx;
+}
+.text2 {
+    margin-left: 22rpx;
+    font-weight: 400;
+    font-size: 23rpx;
+    color: #666666;
+    padding-bottom: 41rpx;
+}
+.mask-content2 {
+  position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    background: white;
+    border-radius: 12rpx;
+    overflow-y: auto;
+    height: 1100rpx;
+}
+.bottom-box {
+  height: 133rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
+  padding: 0 50rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+.totalPrice {
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 48rpx;
+  color: #D62828;
+}
+.totalPrice::before {
+  content: "￥";
+  font-size: 24rpx;
+}
+.next {
+  width: 250rpx;
+  height: 80rpx;
+  background: #D62828;
+  border-radius: 40rpx;
+  font-family: PingFang;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 80rpx;
+}
+.icon-close {
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
+}
+.s-price {
+  font-weight: 500;
+  font-size: 36rpx;
+  color: #D62828;
+  margin-right: 17rpx;
+}
+.s-price::before {
+  content: "￥";
+  font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js
new file mode 100644
index 0000000..f290e3a
--- /dev/null
+++ b/pages/user/order/showOrderInfo/index.js
@@ -0,0 +1,381 @@
+// pages/user/order/sceneOrderInfo/index.js
+import commonApi from "../../../../utils/https/common"
+import userApi from "../../../../utils/https/user"
+import QRCode from '../../../../utils/weapp-qrcode.js'
+import util from '../../../../utils/util'
+let app = getApp(),timer
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    id:null,
+    info:null,
+    orderState:app.globalData.orderState,
+    productState:app.globalData.productState,
+    product_model:null,
+    isRefund:false,
+    feeInfoFlag:false,
+    codeIndex:0,
+    codeImgs:[],
+    minute:0,
+    second:0,
+    cardTypes:{},
+    cxr1:false,
+    cxr1Text:'更多',
+    sysm:false,
+    sysmText:'更多',
+    sysm2:false,
+    sysm2Text:'更多',
+    imgLen:[],
+    ids:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      id:options.id
+    })
+    userApi.user_post("user/getCardTypeList").then(res=>{
+      let cardTypes = {};
+      res.data.map(item=>{
+        cardTypes[item.type]=item.title;
+      })
+      this.setData({
+        cardTypes:cardTypes
+      })
+    })
+  },
+  copy:function(){
+    wx.setClipboardData({
+      data: this.data.codeImgs[this.data.codeIndex].code,
+      success: function (res) {
+        wx.showToast({
+          title: '复制成功',
+          icon:'success'
+        })
+      }
+    })
+  },
+  getCodeImg:function(){
+    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0,arr = [];
+    this.data.info.order_product_list.forEach(qrcode=>{
+      qrcode.qrcode.map((item,index)=>{
+        console.log(qrcode.is_force_display_code);
+        item.is_force_display_code = qrcode.is_force_display_code
+        console.log(item.is_force_display_code);
+        arr.push(index)
+        this.setData({
+          imgLen:arr
+        })
+        if(item.use_url&&item.use_code){
+          codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
+          // if(codeImgs.length==qrcode.qrcode.length){
+          //   that.setData({
+          //     codeImgs:codeImgs
+          //   })
+          // }
+          that.setData({
+            codeImgs:codeImgs
+          })
+        }
+        else {
+          console.log(item);
+          new QRCode('damocode'+codeId,{
+            text: item.use_code,
+            width: 300 * radio,
+            height: 300 * radio,
+            padding:10, // 生成二维码四周自动留边宽度，不传入默认为0
+            correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+            callback: (res) => {
+              console.log(res);
+              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
+              that.setData({
+                codeImgs:codeImgs
+              })
+            }
+          })
+          console.log(this.data.codeImgs);
+          codeId = codeId + 1
+        }
+      }) 
+    })
+    console.log(this.data.imgLen);
+    console.log(this.data.codeImgs);
+  },
+  prevCodeImg:function(){
+    let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
+    if(codeIndex==0){
+      this.setData({
+        codeIndex:qrcode.length-1
+      })
+    }
+    else {
+      this.setData({
+        codeIndex:codeIndex-1
+      })
+    }
+  },
+  nextCodeImg:function(){
+    console.log(this.data.codeImgs);
+    let qrcode=this.data.codeImgs,codeIndex = this.data.codeIndex;
+    codeIndex = codeIndex + 1;
+    if(codeIndex==qrcode.length){
+      codeIndex = 0;
+    }
+    this.setData({
+      codeIndex:codeIndex
+
+    })
+  },
+  showFeeInfo:function(){
+    this.setData({
+      feeInfoFlag:!this.data.feeInfoFlag
+    })
+  },
+  close:function(){
+    let _this = this,info = _this.data.info;
+    wx.showModal({
+      title:'提示',
+      content:"确定取消吗",
+      success:function(res){
+        if(res.confirm){
+          commonApi.user_post("order/close",{
+            order_id:info.order_id
+          }).then(res=>{
+            if(res.code==1){
+              wx.showToast({
+                title: '取消成功',
+                icon:'success'
+              })
+              info.state = "CLOSED";
+              info.order_product_list.map(item=>{
+                item.state='CLOSED'
+              })
+              _this.setData({
+                info:info
+              })
+            }
+          })
+        }
+      }
+    })
+  },
+  refund:function(){
+    let _this = this,info = _this.data.info;
+    wx.showModal({
+      title:'提示',
+      content:"确定取消吗",
+      success:function(res){
+        if(res.confirm){
+          commonApi.user_post("order/refund",{
+            order_id:info.order_id
+          }).then(res=>{
+            if(res.code==1){
+              wx.showToast({
+                title: '取消成功',
+                icon:'success'
+              })
+              info.state = "WAIT_REFUND";
+              info.order_product_list.map(item=>{
+                item.state='WAIT_REFUND'
+              })
+              _this.setData({
+                info:info
+              })
+            }
+          })
+        }
+      }
+    })
+  },
+  daojishi:function(time){
+    let now = new Date().getTime();
+    if(now>time){
+      clearTimeout(timer);
+      timer = null;
+      util.back();
+      return;
+    }
+    let times = time - now,minute = Math.floor(times / (60 * 1000)),second = Math.round((times - minute * 60 * 1000) / 1000);
+    this.setData({
+      minute:util.formatNumber(minute),
+      second:util.formatNumber(second)
+    })
+    timer = setTimeout(()=>{
+      this.daojishi(time);
+    },1000)
+  },
+  // 查看苏康码
+  gotoSku:function(){
+    commonApi.user_post("pbservice/Ztfw/sukangCode").then(res=>{
+      console.log(res)
+      app.globalData.weburl = res.data.url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index'
+      })
+      return;
+    })
+  },
+  goDetail(e){
+    console.log(e.currentTarget.dataset);
+    let item = e.currentTarget.dataset.set
+    if (item.is_package) {
+        wx.navigateTo({
+            url:"/pages/info/postProductInfo/index?id="+item.product_id
+        })
+        return
+    }
+
+    if (item.product_model=='ticket') {
+      wx.navigateTo({
+        url:"/pages/info/sceneProductInfo/index?id="+item.scene_id
+      })
+    }else if (item.product_model=='post') {
+      wx.navigateTo({
+        url:"/pages/info/postProductInfo/index?id="+item.product_id
+      })
+    } else if (item.product_model == 'show') {
+        wx.navigateTo({
+            url:"/pages/info/showInfo/index?id="+item.product_id
+        })
+    }
+  },
+  showMsg(e){
+    console.log(e.currentTarget.dataset);
+    let msg = e.currentTarget.dataset.msg
+    switch (msg) {
+      case 'cxr1':
+        this.setData({
+          cxr1:!this.data.cxr1,
+          cxr1Text:this.data.cxr1?'更多':'收起',
+
+        })
+        break;
+        case 'sysm1':
+          this.setData({
+            sysm:!this.data.sysm,
+            sysmText:this.data.sysm?'更多':'收起',
+          })
+          break;
+          case 'sysm2':
+            this.setData({
+              sysm2:!this.data.sysm2,
+              sysm2Text:this.data.sysm2?'更多':'收起',
+            })
+            break;
+      default:
+        break;
+    }
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    commonApi.user_post("order/query",{
+      order_id:this.data.id
+    }).then(res=>{
+      if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
+        let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
+        this.daojishi(time);
+      }
+      let proId = []
+      res.data.order_product_list.forEach(item => {
+        proId.push(item.product_id)
+      })
+      let state = ""
+      res.data.order_product_list.map(order=>{
+        order.qrcode.map(item=>{
+          item.stateText = app.globalData.codeState[item.state];
+        })
+        order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[];
+        state = state + order.state;
+      })
+      this.setData({
+        isRefund:state.indexOf("REFUND")!=-1,
+        info:res.data,
+        product_model:"ticket"||res.data.order_product_list[0].product_model,
+        ids: proId.join(",")
+      })
+      console.log(res.data);
+      // debugger
+      console.log('ids',this.data.ids);
+      this.getCodeImg()
+      // 获取行程规划
+      let that = this;
+      wx.getLocation({
+        type: 'gcj02',
+        success: function (r) {
+          let ajaxes=[];
+          res.data.order_product_list.map(item=>{
+            ajaxes.push(commonApi.user_post("order/tripplan",{
+              point_type:"gd",
+              child_order_id:item.child_order_id,
+              lon:r.longitude,
+              lat:r.latitude
+            }))
+          })
+          Promise.all(ajaxes).then(r=>{
+            console.log(r)
+            let orderInfo = that.data.info;
+            r.map((item,index)=>{
+              if(item && item.data && item.data.url){
+                orderInfo.order_product_list[index].btnUrl = item.data.url;
+              }
+            })
+            that.setData({
+              info:orderInfo
+            })
+          })
+        }
+      })
+    })
+  },
+  // 行程规划
+  leadRoad:function(e){
+    let url = e.currentTarget.dataset.url;
+    app.globalData.weburl = url;
+    wx.navigateTo({
+      url: '/pages/pbService/web/index'
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+    clearTimeout(timer)
+    timer = null
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/user/order/showOrderInfo/index.json b/pages/user/order/showOrderInfo/index.json
new file mode 100644
index 0000000..807fd96
--- /dev/null
+++ b/pages/user/order/showOrderInfo/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec",
+	"advBox":"/pages/component/orderAdv/orderAdv"
+  }
+}
\ No newline at end of file
diff --git a/pages/user/order/showOrderInfo/index.wxml b/pages/user/order/showOrderInfo/index.wxml
new file mode 100644
index 0000000..bd534d9
--- /dev/null
+++ b/pages/user/order/showOrderInfo/index.wxml
@@ -0,0 +1,144 @@
+<!--pages/user/order/sceneOrderInfo/index.wxml-->
+<wxs src="../../../../utils/filter.wxs" module="tool" />
+<title title="订单详情"></title>
+<view class="top-bg"></view>
+<canvas wx:for="{{imgLen}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+
+<view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
+  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
+  <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
+    <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
+    <!-- 代表核销后是否继续展示二维码（0否1是） -->
+    <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
+      <view class="text-shadow-state">
+        {{item.state}}
+      </view>
+    </view>
+  </view>
+  <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
+  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}  <view class="copy-box" bindtap="copy">复制</view></view>
+  <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
+</view>
+
+<view wx:if="{{info && codeImgs.length>0}}">
+	<advBox ids="{{ ids }}"></advBox>
+</view>
+
+<sptj ids="{{ ids }}"></sptj>
+
+<!-- 景点订单详情需要这个 -->
+<view class="box">
+  <view class="scene-box">
+    <view class="scene-box-left">
+      <view wx:if="{{info.state=='UNPAID'}}">库存有限，请尽快完成付款</view>
+      <view wx:if="{{info.state=='CLOSED' || info.state=='REFUND'}}">您的订单已取消，您可以通过苏州文旅总入口再次预订</view>
+      <view wx:if="{{info.order_product_list[0].state=='WAIT_USE'}}">预定已成功，祝您出游愉快</view>
+      <view>订单号：{{info.order_id}}</view>
+      <view>下单时间：{{info.create_time}}</view>
+
+    </view>
+    <view class="scene-box-right">
+      <view class="price">￥{{info.paid_money/100}}</view>
+      <view bindtap="showFeeInfo">费用明细</view>
+    </view>
+  </view>
+  <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
+    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
+    <view wx:if="{{info.state!='UNPAID'}}">
+        <navigator wx:if="{{info.order_product_list[0].is_package}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+
+        <navigator wx:else  url="/pages/info/showInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+    </view>
+    
+    <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view> -->
+    <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
+    <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
+    <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
+  </view>
+</view>
+<!--景点订单详情需要这个  -->
+<view  class="box" wx:for="{{info.order_product_list}}" wx:for-index='index'>
+  <view class="scene-box" style="align-items:center">
+    <view class="scene-box-left" style="width:630rpx">
+      <view class="box-title" bindtap="goDetail" data-set='{{item}}'>
+        <view class="title-content">{{item.product_title}}</view>
+        <view class="iconfont icon-you"></view>
+      </view>
+      <view class="detail-item">
+        <text>{{item.sku_name}}</text>
+        <text>x{{item.product_num}}</text>
+      </view>
+      <view class="childStatus" style="text-align: left;font-size: 30rpx; font-weight:bold;padding-bottom: 30rpx;color: #0b898e">
+        {{ item.state_text }}
+      </view>
+      <view class="row" wx:if="{{ !item.order_advance.id}}">
+        <view>场次：</view>
+        <view>{{item.use_date}} <text style="padding-left: 20rpx;" wx:if="{{item.start_time && item.end_time}}">{{ item.start_time }}-{{ item.end_time }}</text> </view>
+      </view>
+
+      <view class="row" wx:if="{{ item.order_advance.id}}">
+        <view>使用日期：</view>
+        <view>{{ item.order_advance.start_time }}-{{ item.order_advance.end_time }}</view>
+      </view>
+      <view >
+        <view class="box-title tflex">
+          <view>出行人信息</view>
+          <view bindtap="showMsg" data-msg="cxr1" style="color: rgb(49, 154, 158);">{{cxr1Text}}</view>
+        </view>
+        <view wx:if="{{item.sku_model.is_authentication == 0}}">
+          <view class="detail-item">
+              <text>手机号： {{item.phone}}</text>
+            </view>
+        </view>
+        <view wx:else>
+          <view wx:if="{{cxr1}}" wx:for="{{item.contacts_info}}">
+          <view class="line" wx:if="{{index!=0}}"></view>
+            <view class="detail-item">
+              <text>姓名： {{item.name}}</text>
+              <!-- <text>￥168</text> -->
+            </view>
+            <view class="detail-item">
+              <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text>
+              <!-- <text>-￥10</te、xt> -->
+            </view>
+            <view class="detail-item">
+              <text>手机号： {{item.tel}}</text>
+              <!-- <text>-￥10</text> -->
+            </view>
+        </view>
+        </view>
+      </view>
+      <view >
+        <view class="box-title tflex">
+          <view>使用说明</view>
+          <view bindtap="showMsg" data-msg="sysm1" style="color: rgb(49, 154, 158);">{{sysmText}}</view>
+        </view>
+        <rich-text wx:if="{{sysm}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+      </view>
+      <view wx:if="{{item.product_model=='post'}}">
+        <view class="box-title tflex">
+          <view>使用说明</view>
+          <view bindtap="showMsg" data-msg="sysm2" style="color: rgb(49, 154, 158);">{{sysm2Text}}</view>
+        </view>
+        <rich-text wx:if="{{sysm2}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+      </view>
+    </view>
+  </view>
+</view>
+
+<navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
+  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+</navigator>
+<view class="mask" wx:if="{{feeInfoFlag}}">
+  <view class="mask-bg" bindtap="showFeeInfo"></view>
+  <view class="mask-content">
+    <view class="mask-title">费用明细</view>
+    <view class="iconfont icon-close" bindtap="showFeeInfo"></view>
+    <view class="mask-item"><text>商品总价</text><text>￥{{info.total_money/100}}</text></view>
+    <view class="mask-item"><text>优惠券抵扣</text><text>-￥{{info.preference_money/100}}</text></view>
+    <view class="mask-item"><text>订单实付</text><text>￥{{info.paid_money/100}}</text></view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/user/order/showOrderInfo/index.wxss b/pages/user/order/showOrderInfo/index.wxss
new file mode 100644
index 0000000..a7621ab
--- /dev/null
+++ b/pages/user/order/showOrderInfo/index.wxss
@@ -0,0 +1,354 @@
+/* pages/user/order/sceneOrderInfo/index.wxss */
+.top-bg {
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 280rpx;
+  background: linear-gradient(180deg, #0B898E, #0B898E, rgba(237, 237, 237, 0));
+  z-index: -1;
+}
+page {
+  background: #f6f6f6;
+}
+.state-text {
+  margin: 20rpx 30rpx;
+  line-height: 100rpx;
+  color: #fff;
+  font-size: 48rpx;
+}
+.box {
+  padding: 20rpx;
+  background: white;
+  border-radius: 20rpx;
+  margin: 20rpx 30rpx;
+}
+.product-info {
+  display: flex;
+  justify-content: space-between;
+  color: #333;
+  font-size: 24rpx;
+  padding-bottom: 20rpx;
+  border-bottom: 1rpx solid #d8d8d8;
+  margin-bottom: 10rpx;
+}
+.product-info image {
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 10rpx;
+  flex-shrink: 0;
+}
+.title-box {
+  flex: 1;
+  margin: 0 20rpx;
+}
+.title-box .title {
+  font-size: 30rpx;
+  width: 100%;
+  margin-bottom: 10rpx;
+}
+.title-box .subtitle {
+  color: #888888;
+  font-size: 26rpx;
+}
+.price-box-tip {
+  text-align: right;
+}
+.detail-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  min-height: 45rpx;
+  color: #000;
+  font-size: 30rpx;
+  padding-bottom:30rpx ;
+}
+.all-total-item {
+  font-weight: bold;
+  height: 70rpx;
+  border-bottom: 1rpx solid #d8d8d8;
+}
+.all-total-item .price {
+  color: #D62828;
+  font-size: 36rpx;
+}
+.all-total-item .price::before {
+  content: "￥";
+  font-size: 26rpx;
+}
+.btns {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  height: 103rpx;
+  font-size: 26rpx;
+}
+.btn {
+  width: 160rpx;
+  line-height: 60rpx;
+  background: #fff;
+  text-align: center;
+  box-sizing: border-box;
+  border: 1rpx solid #d8d8d8;
+  border-radius: 30rpx;
+  text-align: center;
+  margin-left: 20rpx;
+}
+.btn.active {
+  color: #fff;
+  background: #FC9132;
+  border-color: #FC9132;
+}
+.box-title {
+  font-size: 30rpx;
+  font-weight: bold;
+  margin-bottom: 10rpx;
+  display: flex;
+  text-align: center;
+  justify-content: space-between;
+}
+.box-title.tflex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.title-content{
+  overflow-x: hidden;
+  overflow-y: inherit;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.scene-box {
+  display: flex;
+  justify-content: space-between;
+}
+.scene-box-left {
+  width: 400rpx;
+  font-size: 26rpx;
+  color: #333;
+}
+.scene-box-right {
+  flex-shrink: 0;
+  font-size: 24rpx;
+  color: #999;
+  text-align: right;
+}
+.scene-box-right .price {
+  color: #D62828;
+  font-size: 36rpx;
+  font-weight: bold;
+}
+.scene-btns {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  font-size: 26rpx;
+  color: #333;
+  text-align: center;
+  margin-top: 50rpx;
+}
+.scene-btn {
+  width: 160rpx;
+  line-height: 60rpx;
+  box-sizing: border-box;
+  border: 1rpx solid #d8d8d8;
+  border-radius: 30rpx;
+  margin-left: 20rpx;
+  flex-shrink: 0;
+}
+.scene-rest-time {
+  flex: 1;
+  text-align: left;
+  font-size: 26rpx;
+  font-weight: bold;
+}
+.scene-btn.active {
+  color: #fff;
+  background: #FC9132;
+  border-color: #FC9132;
+}
+.scene-btn.active1 {
+  background: #0B898E;
+  border-color: #0B898E;
+  color: #fff;
+}
+.bottom-btn {
+  display: flex;
+  width: 360rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  border-radius: 40rpx;
+  justify-content: center;
+  align-items: center;
+  font-size: 30rpx;
+  color: #333;
+  font-weight: 500;
+  margin: 20rpx auto;
+}
+.bottom-btn image {
+  width: 40rpx;
+  margin-right: 10rpx;
+}
+.line {
+  margin: 10rpx 0;
+  height: 1rpx;
+  background: #d8d8d8;
+}
+.mask-title {
+  text-align: center;
+  padding-top: 30rpx;
+  margin-bottom: 60rpx;
+  font-weight: 500;
+}
+.mask-item {
+  margin: 0 40rpx;
+  margin-bottom: 60rpx;
+  display: flex;
+  justify-content: space-between;
+  font-size: 30rpx;
+  color: #333;
+}
+.icon-close {
+  position: absolute;
+  right: 20rpx;
+  top: 30rpx;
+}
+.code-box {
+  text-align: center;
+  height: 440rpx;
+  position: relative;
+}
+.code-box .iconfont {
+  position: absolute;
+  color: #0B898E;
+  font-size: 30rpx;
+  line-height: 50rpx;
+  width: 50rpx;
+  left: 40rpx;
+  text-align: center;
+  margin-top: 125rpx;
+}
+.code-box .iconfont.icon-you {
+  left: auto;
+  right: 40rpx;
+  top: 20rpx;
+}
+.code-img {
+  width: 300rpx;
+  height: 300rpx;
+  display: block;
+  margin: 0 auto;
+  position: absolute;
+  left: -1000rpx;
+  top: -400rpx;
+}
+.code-state {
+  font-size: 26rpx;
+  color: #333;
+  margin-bottom: 30rpx;
+}
+.code-text {
+  color: #0B898E;
+  font-size: 30rpx;
+  font-weight: 500;
+  margin: 25rpx;
+  display: flex;
+  justify-content: center;
+}
+.code-btn {
+  width: 220rpx;
+  line-height: 60rpx;
+  background: #FFFFFF;
+  border: 1rpx solid #D8D8D8;
+  border-radius: 30rpx;
+  box-sizing: border-box;
+  font-size: 26rpx;
+  color: #333;
+  margin: 0 auto;
+}
+.hotel-tel-box {
+  line-height: 80rpx;
+  border-top: 1rpx solid #D8D8D8;
+  color: #0B898E;
+  font-size: 26rpx;
+  margin-top: 20rpx;
+}
+.hotel-tel-box .iconfont {
+  margin-right: 20rpx;
+  font-size: 34rpx;
+}
+.hotel-tips {
+  display: flex;
+  align-items: center;
+  font-size: 24rpx;
+  color: #999;
+}
+.hotel-tips .hotel-days-num {
+  width: 70rpx;
+  font-size: 20rpx;
+  line-height: 30rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 15rpx;
+  text-align: center;
+  color: #0B898E;
+  margin: 0 20rpx;
+  text-align: center;
+  box-sizing: border-box;
+}
+.hotel-tips .hotel-date {
+  font-size: 26rpx;
+  color: #333;
+  margin-right: 6rpx;
+}
+.hotel-tip {
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 30rpx;
+}
+.row{
+  display: flex;
+  align-items: center;
+  justify-content:space-between;
+  padding-bottom: 30rpx;
+}
+.showmsg{
+  display: none;
+}
+.btn{
+  float: right;
+}
+.text-shadow {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  text-align: center;
+  background: rgba(0, 0, 0, .3);
+  width: 300rpx;
+  height: 300rpx;
+  /*border-radius: .3rem;*/
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10;
+}
+.text-shadow-state {
+  width: 200rpx;
+  height: 200rpx;
+  line-height: 200rpx;
+  background: #FFFFFF;
+  border-radius: 50%;
+  color: #0B898E;
+}
+.copy-box {
+	width: 73rpx;
+	line-height: 35rpx;
+	border-radius: 7rpx;
+	border: 1rpx solid #09898C;
+	margin-left: 15rpx;
+	text-align: center;
+	font-weight: 500;
+	font-size: 23rpx;
+	color: #0E8790;
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 08edf69..3284060 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,15 +7,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/user/bindtel/index",
-          "pathName": "pages/user/bindtel/index",
-          "query": "regToken=123456",
+          "name": "pages/info/showInfo/index",
+          "pathName": "pages/info/showInfo/index",
+          "query": "id=13170",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "subPackages/index/index",
-          "pathName": "subPackages/index/index",
+          "name": "pages/order/showOrderNew/index",
+          "pathName": "pages/order/showOrderNew/index",
           "query": "",
           "launchMode": "default",
           "scene": null
@@ -27,25 +27,12 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "subPackages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "景点购物车5447",
           "pathName": "pages/info/sceneProductInfoNew/index",
           "query": "id=5447",
           "scene": null
         },
-        {
-          "name": "测试支付",
-          "pathName": "pages/order/pay/index",
-          "query": "id=35532207011748334675",
-          "scene": null
-        },
         {
           "name": "pages/group/info/index",
           "pathName": "pages/group/info/index",
@@ -58,38 +45,12 @@
           "query": "",
           "scene": null
         },
-        {
-          "name": "测试美团酒店详情",
-          "pathName": "pages/info/hotelProductInfo/index",
-          "query": "id=5974",
-          "scene": null
-        },
         {
           "name": "pages/order/joinOrder/index",
           "pathName": "pages/order/joinOrder/index",
           "query": "oid=59532109231539023692&id=336&uid=24",
           "scene": null
         },
-        {
-          "name": "pages/order/orderList/index",
-          "pathName": "pages/order/orderList/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "团体预约场馆",
-          "pathName": "pages/pbService/group/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/supplier/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "",
           "pathName": "pages/order/payresult/index",
@@ -103,13 +64,6 @@
           "query": "id=82342309051435565877",
           "launchMode": "default",
           "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/user/order/activityOrderInfo/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }
diff --git a/utils/util.js b/utils/util.js
index 49c0b5b..b31d739 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -392,12 +392,18 @@ const gotoOrder = function(item){
     })
     return;
   }
-  if(item.order_product_list[0].product_model=='movie' || item.order_product_list[0].product_model=='show'){
+  if(item.order_product_list[0].product_model=='movie'){
     wx.navigateTo({
       url: '/pages/user/order/movieOrderInfo/index?id='+item.order_id,
     })
     return;
   }
+  if (item.order_product_list[0].product_model=='show') {
+    wx.navigateTo({
+        url: '/pages/user/order/showOrderInfo/index?id='+item.order_id,
+      })
+      return;
+  }
   if(item.order_product_list[0].product_model=='post'){
     wx.navigateTo({
       url: '/pages/user/order/postOrderInfo/index?id='+item.order_id,

From 075616121a95380dcd2619a56d263ee296b0ed1b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Dec 2024 17:59:32 +0800
Subject: [PATCH 228/471] 1

---
 pages/info/showInfo/index.js   | 14 +++++++-------
 pages/info/showInfo/index.wxml |  2 +-
 pages/info/showInfo/index.wxss |  6 +++++-
 pages/list/theatre/index.js    |  6 +++---
 pages/list/theatre/index.wxml  |  2 +-
 pages/order/show/index.js      |  5 +++--
 utils/https.js                 |  4 ++--
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/pages/info/showInfo/index.js b/pages/info/showInfo/index.js
index f4ae96b..baf18b8 100644
--- a/pages/info/showInfo/index.js
+++ b/pages/info/showInfo/index.js
@@ -292,13 +292,13 @@ Page({
         })
     },
     showOrder: function () {
-        // if(this.data.info.sku.length==0){
-        //     wx.showToast({
-        //         title: '该演出暂时无法预约',
-        //         icon:'none'
-        //     })
-        //     return;
-        // }
+        if(this.data.info.sku.length<=0){
+            wx.showToast({
+                title: '暂无绑定演出具体信息',
+                icon:'none'
+            })
+            return;
+        }
         // app.globalData.couponInfo = null;
         // app.globalData.productShow = this.data.info;
         // app.globalData.retailId = this.data.retailId;
diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml
index fa6565c..acf357a 100644
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@@ -107,7 +107,7 @@
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
-  <navigator  url="/pages/index/index" class="shop-box">
+  <navigator url="/pages/index/index" open-type="switchTab" class="shop-box">
   <view class="shop-box">
     <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20241119/868addcaedbc5d63ebdfa150fcace34d.png" mode="aspectFill"/>
     <view>首页</view>
diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss
index 441ab09..1ad32cd 100644
--- a/pages/info/showInfo/index.wxss
+++ b/pages/info/showInfo/index.wxss
@@ -754,12 +754,16 @@ margin-right: 29rpx;
 }
 .pro-list{
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   align-items: center;
   flex-wrap: wrap;
 }
 .proitem{
     width: 213rpx;
+    margin-right: 15rpx;
+}
+.proitem:last-of-type{
+    margin-right: 0;
 }
 .item-hd image{
     width: 213rpx;
diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js
index 668cd36..c326a4e 100644
--- a/pages/list/theatre/index.js
+++ b/pages/list/theatre/index.js
@@ -9,9 +9,9 @@ Page({
    */
   data: {
     list:[],
-    tagList: [], // 父标签278
+    tagList: [], // 父标签477
     total:1,
-    type:278,
+    type:477,
     sort:["","weight","distance","weight","price"],
     order:['','desc',"asc","desc","asc"],
     lat:"",
@@ -107,7 +107,7 @@ Page({
   // 获取子标签
   getTags () {
     commonApi._post("product/tag_list",{
-        pid:"278",
+        pid:"477",
       }).then(res=>{
           let resData = res.data || []
         this.setData({
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index ff6ce3e..097052b 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -5,7 +5,7 @@
     <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
 
     <view class="sale-types no-scrollbar">
-        <view class="sale-type{{type==278?' active':''}}" bindtap="changeType" data-type="278">全部</view>
+        <view class="sale-type{{type==477?' active':''}}" bindtap="changeType" data-type="477">全部</view>
         <view wx:for="{{tagList}}" wx:key="id" class="sale-type{{type==item.id?' active':''}}" 
         bindtap="changeType" data-type="{{item.id}}">{{item.name}}</view>
 
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index eba7e5b..309b28d 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -255,9 +255,10 @@ Page({
                 // app.globalData.retailId = this.data.retailId;
                 
                 app.globalData.product = {
-                    product: product,
+                    product: {...product, price: skuSelect.price},
                     sku: sku
-                  }
+                }
+                
                 date.price = skuSelect.price
                 app.globalData.product.date = date
                 app.globalData.product.time = time
diff --git a/utils/https.js b/utils/https.js
index 58ee3a1..50f43f4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 817290aaf2468386ace4ed7a9cf9af790bb3bade Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 9 Dec 2024 19:13:58 +0800
Subject: [PATCH 229/471] =?UTF-8?q?=E5=89=A7=E5=9C=BA=E6=BC=94=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/calendarTheatre/index.js   |  8 ++-
 pages/component/calendarTheatre/index.wxml |  3 +
 pages/component/calendarTheatre/index.wxss |  5 ++
 pages/info/showInfo/index.wxml             |  8 +--
 pages/info/showInfo/index.wxss             | 13 ++--
 pages/list/theatre/index.wxss              |  8 +--
 pages/order/show/index.js                  | 31 ++++++++++
 pages/pbService/web/index.js               | 72 +++++++++++++++++++---
 project.private.config.json                | 21 +++++++
 9 files changed, 147 insertions(+), 22 deletions(-)

diff --git a/pages/component/calendarTheatre/index.js b/pages/component/calendarTheatre/index.js
index a08d93e..3a4bcdf 100644
--- a/pages/component/calendarTheatre/index.js
+++ b/pages/component/calendarTheatre/index.js
@@ -80,15 +80,19 @@ Component({
         dayNums = new Date(nextYear, nextMonth, 0).getDate();
       }
       arrLen = startWeek + dayNums;
+      console.log(this.data.dates)
       for (let i = 0; i < arrLen; i++) {
         if (i >= startWeek) {
+            
           num = i - startWeek + 1;
           let date =util.formatDate(new Date(year +'/' + (month + 1) +'/' + num));
+          let day = this.properties.datelist.find(x=>x.date==date)
           obj = {
             isToday: '' + year + (month + 1) + num,
             dateNum: num,
             weight: 5,
-            date:date
+            date:date,
+            haveStock: day?day.haveStock:false
           }
         } else {
           obj = {};
@@ -101,6 +105,8 @@ Component({
       this.setData({
         dateArr: dateArr
       })
+
+      console.log(dateArr)
   
       let nowDate = new Date();
       let nowYear = nowDate.getFullYear();
diff --git a/pages/component/calendarTheatre/index.wxml b/pages/component/calendarTheatre/index.wxml
index 0c84684..02fa0a2 100644
--- a/pages/component/calendarTheatre/index.wxml
+++ b/pages/component/calendarTheatre/index.wxml
@@ -15,6 +15,9 @@
             <view class="date-head{{dates[item.date]?'':' disable'}}" >
                 <view>{{item.dateNum}}</view>
             </view>
+            
+            <view class="date-dot-tip" wx:if="{{item.haveStock}}">·</view>
+
         </view>
     </view>
 </view>
\ No newline at end of file
diff --git a/pages/component/calendarTheatre/index.wxss b/pages/component/calendarTheatre/index.wxss
index a3d0095..6d5f88d 100644
--- a/pages/component/calendarTheatre/index.wxss
+++ b/pages/component/calendarTheatre/index.wxss
@@ -72,6 +72,11 @@ padding-right: 0.6rem;
 .date-head.disable {
   color: #999;
 }
+.date-dot-tip{
+    font-size: 40rpx;
+    line-height: 26rpx;
+    color: #D62828;
+}
 .date-tip {
   font-size: 24rpx;
   line-height: 26rpx;
diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml
index acf357a..7cd98ef 100644
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@@ -6,11 +6,11 @@
 <view wx:if="{{info}}">
     <view class="top-info">
         <view class="product-base-info">
-            <image class="headImg" src="{{info.headimg}}"></image>
+            <image class="headImg" src="{{info.listimg[0]}}" mode="aspectFill"></image>
             <view class="base-info">
                 <view class="title textOver2">{{info.title}}</view>
                 <view class="tags-box textOver">
-                    <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+                    <view class="tag textOver" wx:for="{{info.display_tags}}" wx:key="index">{{item}}<view class="line"></view>
                     </view>
                 </view>
                 <view class="subtitle">演出时间：<text>{{info.subtitle}}</text></view>
@@ -82,10 +82,10 @@
 
     <view class="info-box" id="box3">
         <view class="info-title">推荐演出</view>
-        <view class="pro-list">
+        <view class="pro-list no-scrollbar">
             <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
             <view class="item-hd">
-            <image src="{{item.headimg}}"></image>
+            <image src="{{item.headimg}}" mode="aspectFill"></image>
             </view>
             <view class="item-bm">
             <view class="protitle textOver">{{item.title}}</view>
diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss
index 1ad32cd..8007d4d 100644
--- a/pages/info/showInfo/index.wxss
+++ b/pages/info/showInfo/index.wxss
@@ -756,18 +756,21 @@ margin-right: 29rpx;
   display: flex;
   /* justify-content: space-between; */
   align-items: center;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
+  width: 100%;
+  overflow-x: auto;
+  overflow-y: hidden;
 }
 .proitem{
-    width: 213rpx;
-    margin-right: 15rpx;
+    width: 227rpx;
+    margin-right: 10rpx;
 }
 .proitem:last-of-type{
     margin-right: 0;
 }
 .item-hd image{
-    width: 213rpx;
-    height: 273rpx;
+    width: 227rpx;
+    height: 200rpx;
     background: #D1D7CB;
     border-radius: 13rpx;
 }
diff --git a/pages/list/theatre/index.wxss b/pages/list/theatre/index.wxss
index 5fded7d..e78d75e 100644
--- a/pages/list/theatre/index.wxss
+++ b/pages/list/theatre/index.wxss
@@ -53,8 +53,8 @@ page{
   justify-content: space-between;
 }
 .item image {
-    width: 187rpx;
-    height: 240rpx;
+    width: 227rpx;
+    height: 200rpx;
     background: #D1D7CB;
     border-radius: 13rpx;
     margin-right: 30rpx;
@@ -104,12 +104,12 @@ page{
   font-weight: 500;
   font-size: 31rpx;
   color: #000;
-  margin-bottom: 32rpx;
+  margin-bottom: 9rpx;
 }
 .info .subtitle {
   font-size: 24rpx;
   color: #999999;
-  margin-bottom: 19rpx;
+  margin-bottom: 9rpx;
 }
 
 
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index 309b28d..5817c23 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -95,6 +95,7 @@ Page({
     },
     // 初始化日期
     initDate () {
+        let _this = this
         //  设置90天日期
         let dateArr = []
         let now = new Date().getTime()
@@ -110,6 +111,10 @@ Page({
         // 默认选中第一天
         let param = {currentTarget: {dataset: {date: 0}}}
         this.changeDate(param)
+        // console.log(dateArr)
+        setTimeout(() => {
+            this.setPriceCalendar()
+        }, 500);
     },
 
     // 选择日期
@@ -273,6 +278,32 @@ Page({
 
         // })
     },
+
+
+    setPriceCalendar () {
+        let _this = this
+        let skus = this.data.product.sku || []
+        wx.showLoading()
+        Promise.all(skus.map(x=>commonApi.user_post("product/product_date_price", {
+            start_date: _this.data.dateArr[0].date,
+            end_date: _this.data.dateArr[this.data.dateArr.length-1].date,
+            sku_id: x.id
+          }))).then((res)=>{
+              let timData = res.map(v=>v.data)
+
+              _this.data.dateArr.forEach((item,i)=>{
+                  item.haveStock = timData.some(x=>x[i].stock>0)
+              })
+              console.log(_this.data.dateArr)
+              _this.setData({
+                  dateArr: _this.data.dateArr
+              })
+          }).finally(()=>{
+            wx.hideLoading();
+          })
+
+    },
+    
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 606ae97..68aa73e 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -1,6 +1,8 @@
 // pages/pbService/web/index.js
 let app = getApp()
+import commonApi from "../../../utils/https/common"
 import userApi from "../../../utils/https/user"
+import https from "../../../utils/https.js"
 Page({
 
   /**
@@ -16,10 +18,52 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-	options.weburl = decodeURIComponent(options.weburl)
-  // if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
+    let weburl = decodeURIComponent(options.weburl)
+    weburl = 'https://test.m.cloud.sz-trip.com/petYou2024?cnylCode=oK7OHccT'
+    console.log(weburl)
+    // 获取路径参数
+    let webParam = {}
+    try {
+        let paramStr = weburl.split('?')[1]
+        if (paramStr) {
+            paramStr.split('&').forEach((param) => {
+                let parts = param.split('=');
+                webParam[(parts[0])] = (parts[1]);
+            });
+        }
+        
+    } catch(e) {
+        console.log(e)
+    }
+    console.log(webParam)
+    let lowerUrl = weburl.toLowerCase()
+    // 宠你有礼 市民卡授权
+    if (lowerUrl.indexOf('petyou2024') && webParam.cnylCode) {
+        commonApi._get("uservice/user/loginByCnyl", {
+            cnylCode: webParam.cnylCode
+        }).then(res => {
+
+            if(res.data && res.data.id && res.data.token) {
+                wx.setStorageSync("jstrip_userid", res.data.id)
+                wx.setStorageSync("jstrip_token", res.data.token)
+                wx.setStorageSync("jstrip_userInfo", res.data)
+
+                weburl += '&token='+res.data.token
+            }
+        }).finally(()=>{
+            this.setData({
+                webUrl:weburl
+            })
+        })
+    } else {
+        this.setData({
+            webUrl:weburl
+        })
+    }
+
+  // if(weburl.indexOf('m.cloud.sz-trip.com')!=-1){
   //   userApi.user_post("user/getMyInfo").then(res=>{
-  //     let weburl = options.weburl
+  //     let weburl = weburl
   //     if(weburl.indexOf('?')!=-1){
   //         weburl += '&token='+res.data.token;
   //       }
@@ -32,10 +76,10 @@ Page({
   //       })
   //     })
   //   }
-  //   else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
+  //   else if(weburl.indexOf('m.jszhwlpt.com')!=-1 || weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
   //     // 如果是去苏心游或者镇江的话
   //     userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
-  //       let weburl = options.weburl
+  //       let weburl = weburl
   //       if(weburl.indexOf('?')!=-1){
   //         weburl += '&original_sys_name=jdsz&auth_code='+res.data;
   //       }
@@ -49,9 +93,7 @@ Page({
   //     })
   //   }
   //   else {
-      this.setData({
-        webUrl:options.weburl
-      })
+     
   //   }
   },
   handleMessage(data) {
@@ -61,6 +103,20 @@ Page({
 	// })
 	console.log('打印22222',data);
   },
+
+  loginByCode () {
+      // 市民卡
+      if(options && options.cnylCode) {
+        commonApi._post("uservice/user/loginByCnyl", {
+            cnylCode: options.cnylCode
+        }).then(res => {
+            if(res.data && res.data.id && res.data.token) {
+              https.set_logininfo(res);
+            }
+        })
+    }
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/project.private.config.json b/project.private.config.json
index 3284060..b5b645b 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,27 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FpetYou2024%253FcnylCode%253D123456=",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "https%3A%2F%2Fm.cloud.sz-trip.com%2FpetYou2024%3FcnylCode%3D123456",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FaiPlay",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/info/showInfo/index",
           "pathName": "pages/info/showInfo/index",

From 9a50d77223681d82ab2fa7eb776deacacc36294a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 10 Dec 2024 10:11:08 +0800
Subject: [PATCH 230/471] isTest

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 215d2b7..2d8e4ba 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.isTest150? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From e3c364e410e57ec3da11b8c7b5080bf00683f731 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 11 Dec 2024 17:30:23 +0800
Subject: [PATCH 231/471] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=85=92=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.js | 2 +-
 pages/order/show/index.js       | 3 +--
 pages/pbService/web/index.js    | 2 +-
 pages/search/list/index.js      | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 381f693..2aef5ab 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -46,7 +46,7 @@ Page({
     let month = d.getMonth() + 1,
       day = d.getDate();
     month = month > 10 ? month : ("0" + month);
-    day = day > 10 ? day : ("0" + day);
+    day = day >= 10 ? day : ("0" + day);
     this.setData({
       selectDay: d.getTime(),
       date: d.getFullYear() + "-" + month + "-" + day
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index 5817c23..91cfb4e 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -290,9 +290,8 @@ Page({
             sku_id: x.id
           }))).then((res)=>{
               let timData = res.map(v=>v.data)
-
               _this.data.dateArr.forEach((item,i)=>{
-                  item.haveStock = timData.some(x=>x[i].stock>0)
+                  item.haveStock = timData.some(x=>x[i]&&x[i].stock>0)
               })
               console.log(_this.data.dateArr)
               _this.setData({
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 68aa73e..6d8fc89 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -19,7 +19,7 @@ Page({
    */
   onLoad: function (options) {
     let weburl = decodeURIComponent(options.weburl)
-    weburl = 'https://test.m.cloud.sz-trip.com/petYou2024?cnylCode=oK7OHccT'
+    // weburl = 'https://test.m.cloud.sz-trip.com/petYou2024?cnylCode=oK7OHccT'
     console.log(weburl)
     // 获取路径参数
     let webParam = {}
diff --git a/pages/search/list/index.js b/pages/search/list/index.js
index bc6bd62..faf550f 100644
--- a/pages/search/list/index.js
+++ b/pages/search/list/index.js
@@ -39,10 +39,10 @@ Page({
       name:"美食",
       key:"food"
     },
-    // {
-    //   name:"酒店",
-    //   key:"room"
-    // },
+    {
+      name:"酒店",
+      key:"room"
+    },
     {
       name:"活动",
       key:"activity"

From d8316561868ed894f84bb4e5e188d643805d68f4 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 16 Dec 2024 13:47:47 +0800
Subject: [PATCH 232/471] =?UTF-8?q?=E5=89=A7=E5=9C=BA=E6=BC=94=E5=87=BA?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      |  2 +-
 app.wxss                    | 12 ++++++++++++
 pages/order/show/index.js   | 24 ++++++++++++++++++++----
 pages/order/show/index.wxml | 22 ++++++++++++++++------
 pages/order/show/index.wxss |  6 ++++++
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/app.js b/app.js
index 2d8e4ba..215d2b7 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.isTest149? true : false;
+      data.isTest = data.isTest150? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.wxss b/app.wxss
index 19c1009..d45f572 100644
--- a/app.wxss
+++ b/app.wxss
@@ -2,6 +2,18 @@
 @import './iconfont/iconfont.wxss';
 @import "./utils/wxParse/wxParse.wxss";
 
+/* 公祭日置灰  需手动发布 */
+/* page::before{
+    content: "";
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    inset: 0;
+    backdrop-filter: grayscale(100%);
+    pointer-events: none;
+    z-index: 99999;
+} */
+
 .container {
   height: 100%;
   display: flex;
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index 91cfb4e..c773207 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -9,6 +9,9 @@ Page({
    */
   data: {
     productId: null,
+    dateArrPage: [], // 页面日期
+    showMore: false,
+    initFinsih: false,
     dateArr: [],
     times:[],
     skuArr: [],
@@ -99,7 +102,7 @@ Page({
         //  设置90天日期
         let dateArr = []
         let now = new Date().getTime()
-        for(let i=0 ;i<=90;i++) {
+        for(let i=0 ;i<=60;i++) {
             let date = now+i*24*60*60*1000
             dateArr.push({date: util.formatDate(new Date(date))})
         }
@@ -109,8 +112,8 @@ Page({
         })
         this.setData({dateArr: dateArr})
         // 默认选中第一天
-        let param = {currentTarget: {dataset: {date: 0}}}
-        this.changeDate(param)
+        // let param = {currentTarget: {dataset: {date: 0}}}
+        // this.changeDate(param)
         // console.log(dateArr)
         setTimeout(() => {
             this.setPriceCalendar()
@@ -292,11 +295,24 @@ Page({
               let timData = res.map(v=>v.data)
               _this.data.dateArr.forEach((item,i)=>{
                   item.haveStock = timData.some(x=>x[i]&&x[i].stock>0)
+                  item.itemIndex = i
               })
+
+              let dateArrPage = _this.data.dateArr.filter(v=>v.haveStock)
               console.log(_this.data.dateArr)
               _this.setData({
-                  dateArr: _this.data.dateArr
+                  dateArr: _this.data.dateArr,
+                  dateArrPage: dateArrPage.slice(0,3),
+                  showMore: dateArrPage.length>3,
+                  initFinsih: true,
+                  dateindex: dateArrPage[0]?dateArrPage[0].itemIndex:0,
               })
+                // 默认选中第一天
+                if (dateArrPage[0]) {
+                    let param = {currentTarget: {dataset: {date: dateArrPage[0].itemIndex}}}
+                    _this.changeDate(param)
+                }
+
           }).finally(()=>{
             wx.hideLoading();
           })
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index c8dba60..dd5b7cc 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -5,13 +5,19 @@
   <view class="order-name">{{product.title}}</view>
 </view>
 <view class="box">
-  <view class="box-content">
+  <view class="box-content" wx:if="{{dateArrPage.length>0}}">
     <view class="box-title">选择日期</view>
-    <view class="flex-between">
-        <view class="tag {{dateindex==0?'active':''}}" bindtap="changeDate" data-date="0">今天 {{dateArr[0].short_date}}</view>
-        <view class="tag {{dateindex==1?'active':''}}" bindtap="changeDate" data-date="1">明天 {{dateArr[1].short_date}}</view>
-        <view class="tag {{dateindex==2?'active':''}}" bindtap="changeDate" data-date="2">后天 {{dateArr[2].short_date}}</view>
-        <view class="tag {{dateindex>2?'active':''}}" bindtap="showMoreDate">{{dateindex>2?dateArr[dateindex].short_date:'更多'}}</view>
+    <view class="date-box-page-sadsdsd">
+        <view wx:for="{{dateArrPage}}" date-item="{{item}}" 
+        class="tag {{dateindex==item.itemIndex?'active':''}}" bindtap="changeDate" data-date="{{item.itemIndex}}">
+            {{dateArr[item.itemIndex].short_date}}
+        </view>
+        <!-- <view class="tag {{dateindex==1?'active':''}}" bindtap="changeDate" data-date="1">明天 {{dateArr[1].short_date}}</view>
+        <view class="tag {{dateindex==2?'active':''}}" bindtap="changeDate" data-date="2">后天 {{dateArr[2].short_date}}</view> -->
+        <view wx:if="{{showMore}}"  class="tag {{(dateindex!=dateArrPage[0].itemIndex)&&(dateindex!=dateArrPage[1].itemIndex)&&(dateindex!=dateArrPage[2].itemIndex)?'active':''}}" bindtap="showMoreDate">
+            {{(dateindex!=dateArrPage[0].itemIndex)&&(dateindex!=dateArrPage[1].itemIndex)&&(dateindex!=dateArrPage[2].itemIndex)?
+            dateArr[dateindex].short_date:'更多'}}
+        </view>
     </view>
   </view>
 
@@ -45,6 +51,10 @@
   </view>
 
 
+  <view wx:if="{{initFinsih && dateArrPage.length<=0}}">
+        <image  class="no-data" src="https://static.ticket.sz-trip.com/uploads/20241129/894f45acb51cffcdddd5a2ddd695660b.png"></image>
+        <view style="text-align: center;color: #666;padding-top: 40rpx;">暂无场次</view>
+    </view>
     
     <!-- <view class="number-box box-content">
       <text>数量</text>
diff --git a/pages/order/show/index.wxss b/pages/order/show/index.wxss
index 71a92e9..3e80075 100644
--- a/pages/order/show/index.wxss
+++ b/pages/order/show/index.wxss
@@ -56,6 +56,7 @@ page {
     font-size: 27rpx;
     color: #333333;
     margin-bottom: 17rpx;
+    margin-right: 20rpx;
 }
 
 .tag.active{
@@ -222,4 +223,9 @@ page {
       height: 129.33rpx;
       display: block;
       margin: 198rpx auto 0;
+  }
+
+  .date-box-page-sadsdsd{
+      display: flex;
+      flex-wrap: nowrap;
   }
\ No newline at end of file

From 55e721bb650e2acc00070a05dd20f494f62d0f13 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 18 Dec 2024 09:18:18 +0800
Subject: [PATCH 233/471] =?UTF-8?q?=E5=89=A7=E5=9C=BA=E6=BC=94=E5=87=BA?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/calendarTheatre/index.js   | 5 +++--
 pages/component/calendarTheatre/index.wxml | 5 +++--
 pages/order/show/index.js                  | 5 ++++-
 pages/order/show/index.wxss                | 6 ++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pages/component/calendarTheatre/index.js b/pages/component/calendarTheatre/index.js
index 3a4bcdf..1981d0b 100644
--- a/pages/component/calendarTheatre/index.js
+++ b/pages/component/calendarTheatre/index.js
@@ -149,9 +149,10 @@ Component({
     },
     onTapDay:function(e){
       let date = e.currentTarget.dataset.date;
-      console.log(date)
+      let item = e.currentTarget.dataset.item;
+      console.log(date, item)
       
-      if (date) {
+      if (date && item.haveStock) {
           console.log('trigger')
         this.triggerEvent("onTapDay",date)
       }
diff --git a/pages/component/calendarTheatre/index.wxml b/pages/component/calendarTheatre/index.wxml
index 02fa0a2..81ede25 100644
--- a/pages/component/calendarTheatre/index.wxml
+++ b/pages/component/calendarTheatre/index.wxml
@@ -11,8 +11,9 @@
         <view wx:for='{{date}}' class='{{(index == todayIndex) && isTodayWeek ? "weekMark" : ""}}'>{{item}}<view></view></view>
     </view>
     <view class='date-box'>
-        <view bindtap="onTapDay" wx:for='{{dateArr}}' class='{{activeDay == item.date ? "nowDay" : ""}}' data-date='{{dates[item.date]}}' style="flex-direction:column">
-            <view class="date-head{{dates[item.date]?'':' disable'}}" >
+        <view bindtap="onTapDay" wx:for='{{dateArr}}' class='{{activeDay == item.date ? "nowDay" : ""}}' data-date='{{dates[item.date]}}'
+            data-item="{{item}}" style="flex-direction:column">
+            <view class="date-head{{dates[item.date]&&item.haveStock?'':' disable'}}" >
                 <view>{{item.dateNum}}</view>
             </view>
             
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index c773207..51c71e2 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -107,8 +107,11 @@ Page({
             dateArr.push({date: util.formatDate(new Date(date))})
         }
 
-        dateArr.forEach(v=>{
+        dateArr.forEach((v,index)=>{
             v.short_date = v.date.split("-").splice(1, 2).join("-")
+            if (index == 0) v.short_date = "今天 "+v.short_date
+            if (index == 1) v.short_date = "明天 "+v.short_date
+            if (index == 2) v.short_date = "后天 "+v.short_date
         })
         this.setData({dateArr: dateArr})
         // 默认选中第一天
diff --git a/pages/order/show/index.wxss b/pages/order/show/index.wxss
index 3e80075..a79a32a 100644
--- a/pages/order/show/index.wxss
+++ b/pages/order/show/index.wxss
@@ -46,6 +46,7 @@ page {
 .sku-box .tag{
     width: fit-content;
 }
+
 .tag{
     padding: 15rpx 19rpx;
     border: 1px solid #999999;
@@ -64,6 +65,11 @@ page {
     border: none;
     color: #FFFFFF;
 }
+.date-box-page-sadsdsd .tag{
+    padding: 15rpx 0rpx;
+    text-align: center;
+    width: 220rpx;
+}
 
 .tag.disabled{
     background: #CCCCCC;

From 1f668d787f734d0e87ade92b8afdf88dc1814c19 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 20 Dec 2024 13:58:46 +0800
Subject: [PATCH 234/471] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=8A=A0=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |    2 +-
 miniprogram_npm/chinese-workday/index.js      |    4 +-
 miniprogram_npm/chinese-workday/index.js.map  |    2 +-
 miniprogram_npm/crypto-js/index.js            | 7365 +++++++++++++++++
 miniprogram_npm/crypto-js/index.js.map        |    1 +
 miniprogram_npm/dayjs/index.js                |    4 +-
 node_modules/crypto-js/CONTRIBUTING.md        |   28 +
 node_modules/crypto-js/LICENSE                |   24 +
 node_modules/crypto-js/README.md              |  275 +
 node_modules/crypto-js/aes.js                 |  234 +
 node_modules/crypto-js/blowfish.js            |  471 ++
 node_modules/crypto-js/bower.json             |   39 +
 node_modules/crypto-js/cipher-core.js         |  895 ++
 node_modules/crypto-js/core.js                |  807 ++
 node_modules/crypto-js/crypto-js.js           | 6657 +++++++++++++++
 .../crypto-js/docs/QuickStartGuide.wiki       |  470 ++
 node_modules/crypto-js/enc-base64.js          |  136 +
 node_modules/crypto-js/enc-base64url.js       |  148 +
 node_modules/crypto-js/enc-hex.js             |   18 +
 node_modules/crypto-js/enc-latin1.js          |   18 +
 node_modules/crypto-js/enc-utf16.js           |  149 +
 node_modules/crypto-js/enc-utf8.js            |   18 +
 node_modules/crypto-js/evpkdf.js              |  134 +
 node_modules/crypto-js/format-hex.js          |   66 +
 node_modules/crypto-js/format-openssl.js      |   18 +
 node_modules/crypto-js/hmac-md5.js            |   18 +
 node_modules/crypto-js/hmac-ripemd160.js      |   18 +
 node_modules/crypto-js/hmac-sha1.js           |   18 +
 node_modules/crypto-js/hmac-sha224.js         |   18 +
 node_modules/crypto-js/hmac-sha256.js         |   18 +
 node_modules/crypto-js/hmac-sha3.js           |   18 +
 node_modules/crypto-js/hmac-sha384.js         |   18 +
 node_modules/crypto-js/hmac-sha512.js         |   18 +
 node_modules/crypto-js/hmac.js                |  143 +
 node_modules/crypto-js/index.js               |   18 +
 node_modules/crypto-js/lib-typedarrays.js     |   76 +
 node_modules/crypto-js/md5.js                 |  268 +
 node_modules/crypto-js/mode-cfb.js            |   80 +
 node_modules/crypto-js/mode-ctr-gladman.js    |  116 +
 node_modules/crypto-js/mode-ctr.js            |   58 +
 node_modules/crypto-js/mode-ecb.js            |   40 +
 node_modules/crypto-js/mode-ofb.js            |   54 +
 node_modules/crypto-js/package.json           |   71 +
 node_modules/crypto-js/pad-ansix923.js        |   49 +
 node_modules/crypto-js/pad-iso10126.js        |   44 +
 node_modules/crypto-js/pad-iso97971.js        |   40 +
 node_modules/crypto-js/pad-nopadding.js       |   30 +
 node_modules/crypto-js/pad-pkcs7.js           |   18 +
 node_modules/crypto-js/pad-zeropadding.js     |   47 +
 node_modules/crypto-js/pbkdf2.js              |  145 +
 node_modules/crypto-js/rabbit-legacy.js       |  190 +
 node_modules/crypto-js/rabbit.js              |  192 +
 node_modules/crypto-js/rc4.js                 |  139 +
 node_modules/crypto-js/ripemd160.js           |  267 +
 node_modules/crypto-js/sha1.js                |  150 +
 node_modules/crypto-js/sha224.js              |   80 +
 node_modules/crypto-js/sha256.js              |  199 +
 node_modules/crypto-js/sha3.js                |  326 +
 node_modules/crypto-js/sha384.js              |   83 +
 node_modules/crypto-js/sha512.js              |  326 +
 node_modules/crypto-js/tripledes.js           |  779 ++
 node_modules/crypto-js/x64-core.js            |  304 +
 package-lock.json                             |    5 +
 package.json                                  |    1 +
 pages/index/index.js                          |    1 +
 utils/https.js                                |    4 +-
 utils/https/common.js                         |    8 +
 utils/https/myCropto.js                       |   36 +
 utils/util.js                                 |    1 +
 69 files changed, 22507 insertions(+), 8 deletions(-)
 create mode 100644 miniprogram_npm/crypto-js/index.js
 create mode 100644 miniprogram_npm/crypto-js/index.js.map
 create mode 100644 node_modules/crypto-js/CONTRIBUTING.md
 create mode 100644 node_modules/crypto-js/LICENSE
 create mode 100644 node_modules/crypto-js/README.md
 create mode 100644 node_modules/crypto-js/aes.js
 create mode 100644 node_modules/crypto-js/blowfish.js
 create mode 100644 node_modules/crypto-js/bower.json
 create mode 100644 node_modules/crypto-js/cipher-core.js
 create mode 100644 node_modules/crypto-js/core.js
 create mode 100644 node_modules/crypto-js/crypto-js.js
 create mode 100644 node_modules/crypto-js/docs/QuickStartGuide.wiki
 create mode 100644 node_modules/crypto-js/enc-base64.js
 create mode 100644 node_modules/crypto-js/enc-base64url.js
 create mode 100644 node_modules/crypto-js/enc-hex.js
 create mode 100644 node_modules/crypto-js/enc-latin1.js
 create mode 100644 node_modules/crypto-js/enc-utf16.js
 create mode 100644 node_modules/crypto-js/enc-utf8.js
 create mode 100644 node_modules/crypto-js/evpkdf.js
 create mode 100644 node_modules/crypto-js/format-hex.js
 create mode 100644 node_modules/crypto-js/format-openssl.js
 create mode 100644 node_modules/crypto-js/hmac-md5.js
 create mode 100644 node_modules/crypto-js/hmac-ripemd160.js
 create mode 100644 node_modules/crypto-js/hmac-sha1.js
 create mode 100644 node_modules/crypto-js/hmac-sha224.js
 create mode 100644 node_modules/crypto-js/hmac-sha256.js
 create mode 100644 node_modules/crypto-js/hmac-sha3.js
 create mode 100644 node_modules/crypto-js/hmac-sha384.js
 create mode 100644 node_modules/crypto-js/hmac-sha512.js
 create mode 100644 node_modules/crypto-js/hmac.js
 create mode 100644 node_modules/crypto-js/index.js
 create mode 100644 node_modules/crypto-js/lib-typedarrays.js
 create mode 100644 node_modules/crypto-js/md5.js
 create mode 100644 node_modules/crypto-js/mode-cfb.js
 create mode 100644 node_modules/crypto-js/mode-ctr-gladman.js
 create mode 100644 node_modules/crypto-js/mode-ctr.js
 create mode 100644 node_modules/crypto-js/mode-ecb.js
 create mode 100644 node_modules/crypto-js/mode-ofb.js
 create mode 100644 node_modules/crypto-js/package.json
 create mode 100644 node_modules/crypto-js/pad-ansix923.js
 create mode 100644 node_modules/crypto-js/pad-iso10126.js
 create mode 100644 node_modules/crypto-js/pad-iso97971.js
 create mode 100644 node_modules/crypto-js/pad-nopadding.js
 create mode 100644 node_modules/crypto-js/pad-pkcs7.js
 create mode 100644 node_modules/crypto-js/pad-zeropadding.js
 create mode 100644 node_modules/crypto-js/pbkdf2.js
 create mode 100644 node_modules/crypto-js/rabbit-legacy.js
 create mode 100644 node_modules/crypto-js/rabbit.js
 create mode 100644 node_modules/crypto-js/rc4.js
 create mode 100644 node_modules/crypto-js/ripemd160.js
 create mode 100644 node_modules/crypto-js/sha1.js
 create mode 100644 node_modules/crypto-js/sha224.js
 create mode 100644 node_modules/crypto-js/sha256.js
 create mode 100644 node_modules/crypto-js/sha3.js
 create mode 100644 node_modules/crypto-js/sha384.js
 create mode 100644 node_modules/crypto-js/sha512.js
 create mode 100644 node_modules/crypto-js/tripledes.js
 create mode 100644 node_modules/crypto-js/x64-core.js
 create mode 100644 utils/https/myCropto.js

diff --git a/app.js b/app.js
index 215d2b7..2d8e4ba 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.isTest150? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/miniprogram_npm/chinese-workday/index.js b/miniprogram_npm/chinese-workday/index.js
index 4ed1a51..e7632a3 100644
--- a/miniprogram_npm/chinese-workday/index.js
+++ b/miniprogram_npm/chinese-workday/index.js
@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1711522529462, function(require, module, exports) {
+__DEFINE__(1734585676993, function(require, module, exports) {
 // from
 // - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm
 // - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm
@@ -320,7 +320,7 @@ function formatDate(day) {
 }
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1711522529462);
+return __REQUIRE__(1734585676993);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/chinese-workday/index.js.map b/miniprogram_npm/chinese-workday/index.js.map
index 7c2f519..68c6f33 100644
--- a/miniprogram_npm/chinese-workday/index.js.map
+++ b/miniprogram_npm/chinese-workday/index.js.map
@@ -1 +1 @@
-{"version":3,"sources":["index.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["// from\n// - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm\n// - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm\n// - 2019调整 https://www.gov.cn/zhengce/content/2019-03/22/content_5375877.htm\n// - 2020 https://www.gov.cn/zhengce/content/2019-11/21/content_5454164.htm\n// - 2021 https://www.gov.cn/zhengce/content/2020-11/25/content_5564127.htm\n// - 2022 https://www.gov.cn/zhengce/content/2021-10/25/content_5644835.htm\n// - 2023 https://www.gov.cn/zhengce/zhengceku/2022-12/08/content_5730844.htm\n// - 2024 https://www.gov.cn/zhengce/zhengceku/202310/content_6911528.htm\n\n\nmodule.exports = {\n  isWorkday: isWorkday,\n  isHoliday: isHoliday,\n  getFestival: getFestival,\n  isAddtionalWorkday: isAddtionalWorkday,\n};\n\nvar HOLIDAYS = {\n  \"2018-02-15\": \"春节\",\n  \"2018-02-16\": \"春节\",\n  \"2018-02-17\": \"春节\",\n  \"2018-02-18\": \"春节\",\n  \"2018-02-19\": \"春节\",\n  \"2018-02-20\": \"春节\",\n  \"2018-02-21\": \"春节\",\n  \"2018-04-05\": \"清明节\",\n  \"2018-04-06\": \"清明节\",\n  \"2018-04-07\": \"清明节\",\n  \"2018-04-29\": \"劳动节\",\n  \"2018-04-30\": \"劳动节\",\n  \"2018-05-01\": \"劳动节\",\n  \"2018-06-18\": \"端午节\",\n  \"2018-09-24\": \"中秋节\",\n  \"2018-10-01\": \"国庆节\",\n  \"2018-10-02\": \"国庆节\",\n  \"2018-10-03\": \"国庆节\",\n  \"2018-10-04\": \"国庆节\",\n  \"2018-10-05\": \"国庆节\",\n  \"2018-10-06\": \"国庆节\",\n  \"2018-10-07\": \"国庆节\",\n  \"2018-12-30\": \"元旦\",\n  \"2018-12-31\": \"元旦\",\n  \"2019-01-01\": \"元旦\",\n  \"2019-02-04\": \"春节\",\n  \"2019-02-05\": \"春节\",\n  \"2019-02-06\": \"春节\",\n  \"2019-02-07\": \"春节\",\n  \"2019-02-08\": \"春节\",\n  \"2019-02-09\": \"春节\",\n  \"2019-02-10\": \"春节\",\n  \"2019-04-05\": \"清明节\",\n  \"2019-04-06\": \"清明节\",\n  \"2019-04-07\": \"清明节\",\n  \"2019-05-01\": \"劳动节\",\n  \"2019-05-02\": \"劳动节\",\n  \"2019-05-03\": \"劳动节\",\n  \"2019-05-04\": \"劳动节\",\n  \"2019-06-07\": \"端午节\",\n  \"2019-06-08\": \"端午节\",\n  \"2019-06-09\": \"端午节\",\n  \"2019-09-13\": \"中秋节\",\n  \"2019-09-14\": \"中秋节\",\n  \"2019-09-15\": \"中秋节\",\n  \"2019-10-01\": \"国庆节\",\n  \"2019-10-02\": \"国庆节\",\n  \"2019-10-03\": \"国庆节\",\n  \"2019-10-04\": \"国庆节\",\n  \"2019-10-05\": \"国庆节\",\n  \"2019-10-06\": \"国庆节\",\n  \"2019-10-07\": \"国庆节\",\n  \"2020-01-01\": \"元旦\",\n  \"2020-01-24\": \"春节\",\n  \"2020-01-25\": \"春节\",\n  \"2020-01-26\": \"春节\",\n  \"2020-01-27\": \"春节\",\n  \"2020-01-28\": \"春节\",\n  \"2020-01-29\": \"春节\",\n  \"2020-01-30\": \"春节\",\n  \"2020-04-04\": \"清明节\",\n  \"2020-04-05\": \"清明节\",\n  \"2020-04-06\": \"清明节\",\n  \"2020-05-01\": \"劳动节\",\n  \"2020-05-02\": \"劳动节\",\n  \"2020-05-03\": \"劳动节\",\n  \"2020-05-04\": \"劳动节\",\n  \"2020-05-05\": \"劳动节\",\n  \"2020-06-25\": \"端午节\",\n  \"2020-06-26\": \"端午节\",\n  \"2020-06-27\": \"端午节\",\n  \"2020-10-01\": \"国庆节\",\n  \"2020-10-02\": \"国庆节\",\n  \"2020-10-03\": \"国庆节\",\n  \"2020-10-04\": \"国庆节\",\n  \"2020-10-05\": \"国庆节\",\n  \"2020-10-06\": \"国庆节\",\n  \"2020-10-07\": \"国庆节\",\n  \"2020-10-08\": \"国庆节\",\n  \"2021-01-01\": \"元旦\",\n  \"2021-02-11\": \"春节\",\n  \"2021-02-12\": \"春节\",\n  \"2021-02-13\": \"春节\",\n  \"2021-02-14\": \"春节\",\n  \"2021-02-15\": \"春节\",\n  \"2021-02-16\": \"春节\",\n  \"2021-02-17\": \"春节\",\n  \"2021-04-03\": \"清明节\",\n  \"2021-04-04\": \"清明节\",\n  \"2021-04-05\": \"清明节\",\n  \"2021-05-01\": \"劳动节\",\n  \"2021-05-02\": \"劳动节\",\n  \"2021-05-03\": \"劳动节\",\n  \"2021-05-04\": \"劳动节\",\n  \"2021-05-05\": \"劳动节\",\n  \"2021-06-12\": \"端午节\",\n  \"2021-06-13\": \"端午节\",\n  \"2021-06-14\": \"端午节\",\n  \"2021-09-19\": \"中秋节\",\n  \"2021-09-20\": \"中秋节\",\n  \"2021-09-21\": \"中秋节\",\n  \"2021-10-01\": \"国庆节\",\n  \"2021-10-02\": \"国庆节\",\n  \"2021-10-03\": \"国庆节\",\n  \"2021-10-04\": \"国庆节\",\n  \"2021-10-05\": \"国庆节\",\n  \"2021-10-06\": \"国庆节\",\n  \"2021-10-07\": \"国庆节\",\n  \"2022-01-01\": \"元旦\",\n  \"2022-01-02\": \"元旦\",\n  \"2022-01-03\": \"元旦\",\n  \"2022-01-31\": \"春节\",\n  \"2022-02-01\": \"春节\",\n  \"2022-02-02\": \"春节\",\n  \"2022-02-03\": \"春节\",\n  \"2022-02-04\": \"春节\",\n  \"2022-02-05\": \"春节\",\n  \"2022-02-06\": \"春节\",\n  \"2022-04-03\": \"清明节\",\n  \"2022-04-04\": \"清明节\",\n  \"2022-04-05\": \"清明节\",\n  \"2022-04-30\": \"劳动节\",\n  \"2022-05-01\": \"劳动节\",\n  \"2022-05-02\": \"劳动节\",\n  \"2022-05-03\": \"劳动节\",\n  \"2022-05-04\": \"劳动节\",\n  \"2022-06-03\": \"端午节\",\n  \"2022-06-04\": \"端午节\",\n  \"2022-06-05\": \"端午节\",\n  \"2022-09-10\": \"中秋节\",\n  \"2022-09-11\": \"中秋节\",\n  \"2022-09-12\": \"中秋节\",\n  \"2022-10-01\": \"国庆节\",\n  \"2022-10-02\": \"国庆节\",\n  \"2022-10-03\": \"国庆节\",\n  \"2022-10-04\": \"国庆节\",\n  \"2022-10-05\": \"国庆节\",\n  \"2022-10-06\": \"国庆节\",\n  \"2022-10-07\": \"国庆节\",\n  \"2022-12-31\": \"元旦\",\n  \"2023-01-01\": \"元旦\",\n  \"2023-01-02\": \"元旦\",\n  \"2023-01-21\": \"春节\",\n  \"2023-01-22\": \"春节\",\n  \"2023-01-23\": \"春节\",\n  \"2023-01-24\": \"春节\",\n  \"2023-01-25\": \"春节\",\n  \"2023-01-26\": \"春节\",\n  \"2023-01-27\": \"春节\",\n  \"2023-04-05\": \"清明节\",\n  \"2023-04-29\": \"劳动节\",\n  \"2023-04-30\": \"劳动节\",\n  \"2023-05-01\": \"劳动节\",\n  \"2023-05-02\": \"劳动节\",\n  \"2023-05-03\": \"劳动节\",\n  \"2023-06-22\": \"端午节\",\n  \"2023-06-23\": \"端午节\",\n  \"2023-06-24\": \"端午节\",\n  \"2023-09-29\": \"中秋节\",\n  \"2023-09-30\": \"中秋节\",\n  \"2023-10-01\": \"国庆节\",\n  \"2023-10-02\": \"国庆节\",\n  \"2023-10-03\": \"国庆节\",\n  \"2023-10-04\": \"国庆节\",\n  \"2023-10-05\": \"国庆节\",\n  \"2023-10-06\": \"国庆节\",\n  \"2024-01-01\": \"元旦\",\n  \"2024-02-10\": \"春节\",\n  \"2024-02-11\": \"春节\",\n  \"2024-02-12\": \"春节\",\n  \"2024-02-13\": \"春节\",\n  \"2024-02-14\": \"春节\",\n  \"2024-02-15\": \"春节\",\n  \"2024-02-16\": \"春节\",\n  \"2024-02-17\": \"春节\",\n  \"2024-04-04\": \"清明节\",\n  \"2024-04-05\": \"清明节\",\n  \"2024-04-06\": \"清明节\",\n  \"2024-05-01\": \"劳动节\",\n  \"2024-05-02\": \"劳动节\",\n  \"2024-05-03\": \"劳动节\",\n  \"2024-05-04\": \"劳动节\",\n  \"2024-05-05\": \"劳动节\",\n  \"2024-06-10\": \"端午节\",\n  \"2024-09-15\": \"中秋节\",\n  \"2024-09-16\": \"中秋节\",\n  \"2024-09-17\": \"中秋节\",\n  \"2024-10-01\": \"国庆节\",\n  \"2024-10-02\": \"国庆节\",\n  \"2024-10-03\": \"国庆节\",\n  \"2024-10-04\": \"国庆节\",\n  \"2024-10-05\": \"国庆节\",\n  \"2024-10-06\": \"国庆节\",\n  \"2024-10-07\": \"国庆节\",\n};\n\nvar WEEKENDS_WORKDAY = {\n  \"2018-02-11\": \"补春节\",\n  \"2018-02-24\": \"补春节\",\n  \"2018-04-08\": \"补清明节\",\n  \"2018-04-28\": \"补劳动节\",\n  \"2018-09-29\": \"补国庆节\",\n  \"2018-09-30\": \"补国庆节\",\n  \"2018-12-29\": \"补元旦\",\n  \"2019-02-02\": \"补春节\",\n  \"2019-02-03\": \"补春节\",\n  \"2019-04-28\": \"补劳动节\",\n  \"2019-05-05\": \"补劳动节\",\n  \"2019-09-29\": \"补国庆节\",\n  \"2019-10-12\": \"补国庆节\",\n  \"2020-01-19\": \"补春节\",\n  \"2020-02-01\": \"补春节\",\n  \"2020-04-26\": \"补劳动节\",\n  \"2020-05-09\": \"补劳动节\",\n  \"2020-06-28\": \"补端午节\",\n  \"2020-09-27\": \"补国庆节\",\n  \"2020-10-10\": \"补国庆节\",\n  \"2021-02-07\": \"补春节\",\n  \"2021-02-20\": \"补春节\",  \n  \"2021-04-25\": \"补劳动节\", \n  \"2021-05-08\": \"补劳动节\", \n  \"2021-09-18\": \"补中秋节\", \n  \"2021-09-26\": \"补国庆节\", \n  \"2021-10-09\": \"补国庆节\", \n  \"2022-01-29\": \"补春节\",\n  \"2022-01-30\": \"补春节\",\n  \"2022-04-02\": \"补清明节\",\n  \"2022-04-24\": \"补劳动节\", \n  \"2022-05-07\": \"补劳动节\", \n  \"2022-10-08\": \"补国庆节\", \n  \"2022-10-09\": \"补国庆节\", \n  \"2023-01-28\": \"补春节\",\n  \"2023-01-29\": \"补春节\",\n  \"2023-04-23\": \"补劳动节\", \n  \"2023-05-06\": \"补劳动节\", \n  \"2023-06-25\": \"补端午节\", \n  \"2023-10-07\": \"补国庆节\", \n  \"2023-10-08\": \"补国庆节\", \n  \"2024-02-04\": \"补春节\",\n  \"2024-02-18\": \"补春节\",\n  \"2024-04-07\": \"补清明节\", \n  \"2024-04-28\": \"补劳动节\", \n  \"2024-05-11\": \"补劳动节\", \n  \"2024-09-14\": \"补中秋节\", \n  \"2024-09-29\": \"补国庆节\", \n  \"2024-10-12\": \"补国庆节\", \n};\n\nfunction isWorkday(day) {\n  var fd = formatDate(day);\n  if (WEEKENDS_WORKDAY[fd.date]) {\n    return true;\n  } else if (HOLIDAYS[fd.date]) {\n    return false;\n  }\n  return !fd.weekends;\n}\n\nfunction isHoliday(day) {\n  return !isWorkday(day);\n}\n\nfunction isAddtionalWorkday(day) {\n  var fd = formatDate(day);\n  return !!WEEKENDS_WORKDAY[fd.date];\n}\n\nfunction getFestival(day) {\n  var fd = formatDate(day);\n  if (WEEKENDS_WORKDAY[fd.date]) {\n    return WEEKENDS_WORKDAY[fd.date];\n  } else if (HOLIDAYS[fd.date]) {\n    return HOLIDAYS[fd.date]\n  }\n  return fd.weekends ? '周末' : '工作日';\n}\n\nfunction formatDate(day) {\n  var d = new Date(day),\n    month = \"\" + (d.getMonth() + 1),\n    day = \"\" + d.getDate(),\n    year = d.getFullYear();\n  if (month.length < 2) {\n    month = \"0\" + month\n  };\n  if (day.length < 2) {\n    day = \"0\" + day\n  };\n\n  return {\n    date: [year, month, day].join(\"-\"),\n    weekends: [0, 6].indexOf(d.getDay()) > -1\n  };\n}\n"]}
\ No newline at end of file
+{"version":3,"sources":["index.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["// from\r\n// - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm\r\n// - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm\r\n// - 2019调整 https://www.gov.cn/zhengce/content/2019-03/22/content_5375877.htm\r\n// - 2020 https://www.gov.cn/zhengce/content/2019-11/21/content_5454164.htm\r\n// - 2021 https://www.gov.cn/zhengce/content/2020-11/25/content_5564127.htm\r\n// - 2022 https://www.gov.cn/zhengce/content/2021-10/25/content_5644835.htm\r\n// - 2023 https://www.gov.cn/zhengce/zhengceku/2022-12/08/content_5730844.htm\r\n// - 2024 https://www.gov.cn/zhengce/zhengceku/202310/content_6911528.htm\r\n\r\n\r\nmodule.exports = {\r\n  isWorkday: isWorkday,\r\n  isHoliday: isHoliday,\r\n  getFestival: getFestival,\r\n  isAddtionalWorkday: isAddtionalWorkday,\r\n};\r\n\r\nvar HOLIDAYS = {\r\n  \"2018-02-15\": \"春节\",\r\n  \"2018-02-16\": \"春节\",\r\n  \"2018-02-17\": \"春节\",\r\n  \"2018-02-18\": \"春节\",\r\n  \"2018-02-19\": \"春节\",\r\n  \"2018-02-20\": \"春节\",\r\n  \"2018-02-21\": \"春节\",\r\n  \"2018-04-05\": \"清明节\",\r\n  \"2018-04-06\": \"清明节\",\r\n  \"2018-04-07\": \"清明节\",\r\n  \"2018-04-29\": \"劳动节\",\r\n  \"2018-04-30\": \"劳动节\",\r\n  \"2018-05-01\": \"劳动节\",\r\n  \"2018-06-18\": \"端午节\",\r\n  \"2018-09-24\": \"中秋节\",\r\n  \"2018-10-01\": \"国庆节\",\r\n  \"2018-10-02\": \"国庆节\",\r\n  \"2018-10-03\": \"国庆节\",\r\n  \"2018-10-04\": \"国庆节\",\r\n  \"2018-10-05\": \"国庆节\",\r\n  \"2018-10-06\": \"国庆节\",\r\n  \"2018-10-07\": \"国庆节\",\r\n  \"2018-12-30\": \"元旦\",\r\n  \"2018-12-31\": \"元旦\",\r\n  \"2019-01-01\": \"元旦\",\r\n  \"2019-02-04\": \"春节\",\r\n  \"2019-02-05\": \"春节\",\r\n  \"2019-02-06\": \"春节\",\r\n  \"2019-02-07\": \"春节\",\r\n  \"2019-02-08\": \"春节\",\r\n  \"2019-02-09\": \"春节\",\r\n  \"2019-02-10\": \"春节\",\r\n  \"2019-04-05\": \"清明节\",\r\n  \"2019-04-06\": \"清明节\",\r\n  \"2019-04-07\": \"清明节\",\r\n  \"2019-05-01\": \"劳动节\",\r\n  \"2019-05-02\": \"劳动节\",\r\n  \"2019-05-03\": \"劳动节\",\r\n  \"2019-05-04\": \"劳动节\",\r\n  \"2019-06-07\": \"端午节\",\r\n  \"2019-06-08\": \"端午节\",\r\n  \"2019-06-09\": \"端午节\",\r\n  \"2019-09-13\": \"中秋节\",\r\n  \"2019-09-14\": \"中秋节\",\r\n  \"2019-09-15\": \"中秋节\",\r\n  \"2019-10-01\": \"国庆节\",\r\n  \"2019-10-02\": \"国庆节\",\r\n  \"2019-10-03\": \"国庆节\",\r\n  \"2019-10-04\": \"国庆节\",\r\n  \"2019-10-05\": \"国庆节\",\r\n  \"2019-10-06\": \"国庆节\",\r\n  \"2019-10-07\": \"国庆节\",\r\n  \"2020-01-01\": \"元旦\",\r\n  \"2020-01-24\": \"春节\",\r\n  \"2020-01-25\": \"春节\",\r\n  \"2020-01-26\": \"春节\",\r\n  \"2020-01-27\": \"春节\",\r\n  \"2020-01-28\": \"春节\",\r\n  \"2020-01-29\": \"春节\",\r\n  \"2020-01-30\": \"春节\",\r\n  \"2020-04-04\": \"清明节\",\r\n  \"2020-04-05\": \"清明节\",\r\n  \"2020-04-06\": \"清明节\",\r\n  \"2020-05-01\": \"劳动节\",\r\n  \"2020-05-02\": \"劳动节\",\r\n  \"2020-05-03\": \"劳动节\",\r\n  \"2020-05-04\": \"劳动节\",\r\n  \"2020-05-05\": \"劳动节\",\r\n  \"2020-06-25\": \"端午节\",\r\n  \"2020-06-26\": \"端午节\",\r\n  \"2020-06-27\": \"端午节\",\r\n  \"2020-10-01\": \"国庆节\",\r\n  \"2020-10-02\": \"国庆节\",\r\n  \"2020-10-03\": \"国庆节\",\r\n  \"2020-10-04\": \"国庆节\",\r\n  \"2020-10-05\": \"国庆节\",\r\n  \"2020-10-06\": \"国庆节\",\r\n  \"2020-10-07\": \"国庆节\",\r\n  \"2020-10-08\": \"国庆节\",\r\n  \"2021-01-01\": \"元旦\",\r\n  \"2021-02-11\": \"春节\",\r\n  \"2021-02-12\": \"春节\",\r\n  \"2021-02-13\": \"春节\",\r\n  \"2021-02-14\": \"春节\",\r\n  \"2021-02-15\": \"春节\",\r\n  \"2021-02-16\": \"春节\",\r\n  \"2021-02-17\": \"春节\",\r\n  \"2021-04-03\": \"清明节\",\r\n  \"2021-04-04\": \"清明节\",\r\n  \"2021-04-05\": \"清明节\",\r\n  \"2021-05-01\": \"劳动节\",\r\n  \"2021-05-02\": \"劳动节\",\r\n  \"2021-05-03\": \"劳动节\",\r\n  \"2021-05-04\": \"劳动节\",\r\n  \"2021-05-05\": \"劳动节\",\r\n  \"2021-06-12\": \"端午节\",\r\n  \"2021-06-13\": \"端午节\",\r\n  \"2021-06-14\": \"端午节\",\r\n  \"2021-09-19\": \"中秋节\",\r\n  \"2021-09-20\": \"中秋节\",\r\n  \"2021-09-21\": \"中秋节\",\r\n  \"2021-10-01\": \"国庆节\",\r\n  \"2021-10-02\": \"国庆节\",\r\n  \"2021-10-03\": \"国庆节\",\r\n  \"2021-10-04\": \"国庆节\",\r\n  \"2021-10-05\": \"国庆节\",\r\n  \"2021-10-06\": \"国庆节\",\r\n  \"2021-10-07\": \"国庆节\",\r\n  \"2022-01-01\": \"元旦\",\r\n  \"2022-01-02\": \"元旦\",\r\n  \"2022-01-03\": \"元旦\",\r\n  \"2022-01-31\": \"春节\",\r\n  \"2022-02-01\": \"春节\",\r\n  \"2022-02-02\": \"春节\",\r\n  \"2022-02-03\": \"春节\",\r\n  \"2022-02-04\": \"春节\",\r\n  \"2022-02-05\": \"春节\",\r\n  \"2022-02-06\": \"春节\",\r\n  \"2022-04-03\": \"清明节\",\r\n  \"2022-04-04\": \"清明节\",\r\n  \"2022-04-05\": \"清明节\",\r\n  \"2022-04-30\": \"劳动节\",\r\n  \"2022-05-01\": \"劳动节\",\r\n  \"2022-05-02\": \"劳动节\",\r\n  \"2022-05-03\": \"劳动节\",\r\n  \"2022-05-04\": \"劳动节\",\r\n  \"2022-06-03\": \"端午节\",\r\n  \"2022-06-04\": \"端午节\",\r\n  \"2022-06-05\": \"端午节\",\r\n  \"2022-09-10\": \"中秋节\",\r\n  \"2022-09-11\": \"中秋节\",\r\n  \"2022-09-12\": \"中秋节\",\r\n  \"2022-10-01\": \"国庆节\",\r\n  \"2022-10-02\": \"国庆节\",\r\n  \"2022-10-03\": \"国庆节\",\r\n  \"2022-10-04\": \"国庆节\",\r\n  \"2022-10-05\": \"国庆节\",\r\n  \"2022-10-06\": \"国庆节\",\r\n  \"2022-10-07\": \"国庆节\",\r\n  \"2022-12-31\": \"元旦\",\r\n  \"2023-01-01\": \"元旦\",\r\n  \"2023-01-02\": \"元旦\",\r\n  \"2023-01-21\": \"春节\",\r\n  \"2023-01-22\": \"春节\",\r\n  \"2023-01-23\": \"春节\",\r\n  \"2023-01-24\": \"春节\",\r\n  \"2023-01-25\": \"春节\",\r\n  \"2023-01-26\": \"春节\",\r\n  \"2023-01-27\": \"春节\",\r\n  \"2023-04-05\": \"清明节\",\r\n  \"2023-04-29\": \"劳动节\",\r\n  \"2023-04-30\": \"劳动节\",\r\n  \"2023-05-01\": \"劳动节\",\r\n  \"2023-05-02\": \"劳动节\",\r\n  \"2023-05-03\": \"劳动节\",\r\n  \"2023-06-22\": \"端午节\",\r\n  \"2023-06-23\": \"端午节\",\r\n  \"2023-06-24\": \"端午节\",\r\n  \"2023-09-29\": \"中秋节\",\r\n  \"2023-09-30\": \"中秋节\",\r\n  \"2023-10-01\": \"国庆节\",\r\n  \"2023-10-02\": \"国庆节\",\r\n  \"2023-10-03\": \"国庆节\",\r\n  \"2023-10-04\": \"国庆节\",\r\n  \"2023-10-05\": \"国庆节\",\r\n  \"2023-10-06\": \"国庆节\",\r\n  \"2024-01-01\": \"元旦\",\r\n  \"2024-02-10\": \"春节\",\r\n  \"2024-02-11\": \"春节\",\r\n  \"2024-02-12\": \"春节\",\r\n  \"2024-02-13\": \"春节\",\r\n  \"2024-02-14\": \"春节\",\r\n  \"2024-02-15\": \"春节\",\r\n  \"2024-02-16\": \"春节\",\r\n  \"2024-02-17\": \"春节\",\r\n  \"2024-04-04\": \"清明节\",\r\n  \"2024-04-05\": \"清明节\",\r\n  \"2024-04-06\": \"清明节\",\r\n  \"2024-05-01\": \"劳动节\",\r\n  \"2024-05-02\": \"劳动节\",\r\n  \"2024-05-03\": \"劳动节\",\r\n  \"2024-05-04\": \"劳动节\",\r\n  \"2024-05-05\": \"劳动节\",\r\n  \"2024-06-10\": \"端午节\",\r\n  \"2024-09-15\": \"中秋节\",\r\n  \"2024-09-16\": \"中秋节\",\r\n  \"2024-09-17\": \"中秋节\",\r\n  \"2024-10-01\": \"国庆节\",\r\n  \"2024-10-02\": \"国庆节\",\r\n  \"2024-10-03\": \"国庆节\",\r\n  \"2024-10-04\": \"国庆节\",\r\n  \"2024-10-05\": \"国庆节\",\r\n  \"2024-10-06\": \"国庆节\",\r\n  \"2024-10-07\": \"国庆节\",\r\n};\r\n\r\nvar WEEKENDS_WORKDAY = {\r\n  \"2018-02-11\": \"补春节\",\r\n  \"2018-02-24\": \"补春节\",\r\n  \"2018-04-08\": \"补清明节\",\r\n  \"2018-04-28\": \"补劳动节\",\r\n  \"2018-09-29\": \"补国庆节\",\r\n  \"2018-09-30\": \"补国庆节\",\r\n  \"2018-12-29\": \"补元旦\",\r\n  \"2019-02-02\": \"补春节\",\r\n  \"2019-02-03\": \"补春节\",\r\n  \"2019-04-28\": \"补劳动节\",\r\n  \"2019-05-05\": \"补劳动节\",\r\n  \"2019-09-29\": \"补国庆节\",\r\n  \"2019-10-12\": \"补国庆节\",\r\n  \"2020-01-19\": \"补春节\",\r\n  \"2020-02-01\": \"补春节\",\r\n  \"2020-04-26\": \"补劳动节\",\r\n  \"2020-05-09\": \"补劳动节\",\r\n  \"2020-06-28\": \"补端午节\",\r\n  \"2020-09-27\": \"补国庆节\",\r\n  \"2020-10-10\": \"补国庆节\",\r\n  \"2021-02-07\": \"补春节\",\r\n  \"2021-02-20\": \"补春节\",  \r\n  \"2021-04-25\": \"补劳动节\", \r\n  \"2021-05-08\": \"补劳动节\", \r\n  \"2021-09-18\": \"补中秋节\", \r\n  \"2021-09-26\": \"补国庆节\", \r\n  \"2021-10-09\": \"补国庆节\", \r\n  \"2022-01-29\": \"补春节\",\r\n  \"2022-01-30\": \"补春节\",\r\n  \"2022-04-02\": \"补清明节\",\r\n  \"2022-04-24\": \"补劳动节\", \r\n  \"2022-05-07\": \"补劳动节\", \r\n  \"2022-10-08\": \"补国庆节\", \r\n  \"2022-10-09\": \"补国庆节\", \r\n  \"2023-01-28\": \"补春节\",\r\n  \"2023-01-29\": \"补春节\",\r\n  \"2023-04-23\": \"补劳动节\", \r\n  \"2023-05-06\": \"补劳动节\", \r\n  \"2023-06-25\": \"补端午节\", \r\n  \"2023-10-07\": \"补国庆节\", \r\n  \"2023-10-08\": \"补国庆节\", \r\n  \"2024-02-04\": \"补春节\",\r\n  \"2024-02-18\": \"补春节\",\r\n  \"2024-04-07\": \"补清明节\", \r\n  \"2024-04-28\": \"补劳动节\", \r\n  \"2024-05-11\": \"补劳动节\", \r\n  \"2024-09-14\": \"补中秋节\", \r\n  \"2024-09-29\": \"补国庆节\", \r\n  \"2024-10-12\": \"补国庆节\", \r\n};\r\n\r\nfunction isWorkday(day) {\r\n  var fd = formatDate(day);\r\n  if (WEEKENDS_WORKDAY[fd.date]) {\r\n    return true;\r\n  } else if (HOLIDAYS[fd.date]) {\r\n    return false;\r\n  }\r\n  return !fd.weekends;\r\n}\r\n\r\nfunction isHoliday(day) {\r\n  return !isWorkday(day);\r\n}\r\n\r\nfunction isAddtionalWorkday(day) {\r\n  var fd = formatDate(day);\r\n  return !!WEEKENDS_WORKDAY[fd.date];\r\n}\r\n\r\nfunction getFestival(day) {\r\n  var fd = formatDate(day);\r\n  if (WEEKENDS_WORKDAY[fd.date]) {\r\n    return WEEKENDS_WORKDAY[fd.date];\r\n  } else if (HOLIDAYS[fd.date]) {\r\n    return HOLIDAYS[fd.date]\r\n  }\r\n  return fd.weekends ? '周末' : '工作日';\r\n}\r\n\r\nfunction formatDate(day) {\r\n  var d = new Date(day),\r\n    month = \"\" + (d.getMonth() + 1),\r\n    day = \"\" + d.getDate(),\r\n    year = d.getFullYear();\r\n  if (month.length < 2) {\r\n    month = \"0\" + month\r\n  };\r\n  if (day.length < 2) {\r\n    day = \"0\" + day\r\n  };\r\n\r\n  return {\r\n    date: [year, month, day].join(\"-\"),\r\n    weekends: [0, 6].indexOf(d.getDay()) > -1\r\n  };\r\n}\r\n"]}
\ No newline at end of file
diff --git a/miniprogram_npm/crypto-js/index.js b/miniprogram_npm/crypto-js/index.js
new file mode 100644
index 0000000..cfc53de
--- /dev/null
+++ b/miniprogram_npm/crypto-js/index.js
@@ -0,0 +1,7365 @@
+module.exports = (function() {
+var __MODS__ = {};
+var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexports: {} }; __MODS__[modId] = { status: 0, func: func, req: req, m: m }; };
+var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
+var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
+var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
+__DEFINE__(1734585676994, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./lib-typedarrays"), require("./enc-utf16"), require("./enc-base64"), require("./enc-base64url"), require("./md5"), require("./sha1"), require("./sha256"), require("./sha224"), require("./sha512"), require("./sha384"), require("./sha3"), require("./ripemd160"), require("./hmac"), require("./pbkdf2"), require("./evpkdf"), require("./cipher-core"), require("./mode-cfb"), require("./mode-ctr"), require("./mode-ctr-gladman"), require("./mode-ofb"), require("./mode-ecb"), require("./pad-ansix923"), require("./pad-iso10126"), require("./pad-iso97971"), require("./pad-zeropadding"), require("./pad-nopadding"), require("./format-hex"), require("./aes"), require("./tripledes"), require("./rc4"), require("./rabbit"), require("./rabbit-legacy"), require("./blowfish"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./lib-typedarrays", "./enc-utf16", "./enc-base64", "./enc-base64url", "./md5", "./sha1", "./sha256", "./sha224", "./sha512", "./sha384", "./sha3", "./ripemd160", "./hmac", "./pbkdf2", "./evpkdf", "./cipher-core", "./mode-cfb", "./mode-ctr", "./mode-ctr-gladman", "./mode-ofb", "./mode-ecb", "./pad-ansix923", "./pad-iso10126", "./pad-iso97971", "./pad-zeropadding", "./pad-nopadding", "./format-hex", "./aes", "./tripledes", "./rc4", "./rabbit", "./rabbit-legacy", "./blowfish"], factory);
+	}
+	else {
+		// Global (browser)
+		root.CryptoJS = factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS;
+
+}));
+}, function(modId) {var map = {"./core":1734585676995,"./x64-core":1734585676996,"./lib-typedarrays":1734585676997,"./enc-utf16":1734585676998,"./enc-base64":1734585676999,"./enc-base64url":1734585677000,"./md5":1734585677001,"./sha1":1734585677002,"./sha256":1734585677003,"./sha224":1734585677004,"./sha512":1734585677005,"./sha384":1734585677006,"./sha3":1734585677007,"./ripemd160":1734585677008,"./hmac":1734585677009,"./pbkdf2":1734585677010,"./evpkdf":1734585677011,"./cipher-core":1734585677012,"./mode-cfb":1734585677013,"./mode-ctr":1734585677014,"./mode-ctr-gladman":1734585677015,"./mode-ofb":1734585677016,"./mode-ecb":1734585677017,"./pad-ansix923":1734585677018,"./pad-iso10126":1734585677019,"./pad-iso97971":1734585677020,"./pad-zeropadding":1734585677021,"./pad-nopadding":1734585677022,"./format-hex":1734585677023,"./aes":1734585677024,"./tripledes":1734585677025,"./rc4":1734585677026,"./rabbit":1734585677027,"./rabbit-legacy":1734585677028,"./blowfish":1734585677029}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585676995, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory();
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define([], factory);
+	}
+	else {
+		// Global (browser)
+		root.CryptoJS = factory();
+	}
+}(this, function () {
+
+	/*globals window, global, require*/
+
+	/**
+	 * CryptoJS core components.
+	 */
+	var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+	    var crypto;
+
+	    // Native crypto from window (Browser)
+	    if (typeof window !== 'undefined' && window.crypto) {
+	        crypto = window.crypto;
+	    }
+
+	    // Native crypto in web worker (Browser)
+	    if (typeof self !== 'undefined' && self.crypto) {
+	        crypto = self.crypto;
+	    }
+
+	    // Native crypto from worker
+	    if (typeof globalThis !== 'undefined' && globalThis.crypto) {
+	        crypto = globalThis.crypto;
+	    }
+
+	    // Native (experimental IE 11) crypto from window (Browser)
+	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+	        crypto = window.msCrypto;
+	    }
+
+	    // Native crypto from global (NodeJS)
+	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
+	        crypto = global.crypto;
+	    }
+
+	    // Native crypto import via require (NodeJS)
+	    if (!crypto && typeof require === 'function') {
+	        try {
+	            crypto = require('crypto');
+	        } catch (err) {}
+	    }
+
+	    /*
+	     * Cryptographically secure pseudorandom number generator
+	     *
+	     * As Math.random() is cryptographically not safe to use
+	     */
+	    var cryptoSecureRandomInt = function () {
+	        if (crypto) {
+	            // Use getRandomValues method (Browser)
+	            if (typeof crypto.getRandomValues === 'function') {
+	                try {
+	                    return crypto.getRandomValues(new Uint32Array(1))[0];
+	                } catch (err) {}
+	            }
+
+	            // Use randomBytes method (NodeJS)
+	            if (typeof crypto.randomBytes === 'function') {
+	                try {
+	                    return crypto.randomBytes(4).readInt32LE();
+	                } catch (err) {}
+	            }
+	        }
+
+	        throw new Error('Native crypto module could not be used to get secure random number.');
+	    };
+
+	    /*
+	     * Local polyfill of Object.create
+
+	     */
+	    var create = Object.create || (function () {
+	        function F() {}
+
+	        return function (obj) {
+	            var subtype;
+
+	            F.prototype = obj;
+
+	            subtype = new F();
+
+	            F.prototype = null;
+
+	            return subtype;
+	        };
+	    }());
+
+	    /**
+	     * CryptoJS namespace.
+	     */
+	    var C = {};
+
+	    /**
+	     * Library namespace.
+	     */
+	    var C_lib = C.lib = {};
+
+	    /**
+	     * Base object for prototypal inheritance.
+	     */
+	    var Base = C_lib.Base = (function () {
+
+
+	        return {
+	            /**
+	             * Creates a new object that inherits from this object.
+	             *
+	             * @param {Object} overrides Properties to copy into the new object.
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         field: 'value',
+	             *
+	             *         method: function () {
+	             *         }
+	             *     });
+	             */
+	            extend: function (overrides) {
+	                // Spawn
+	                var subtype = create(this);
+
+	                // Augment
+	                if (overrides) {
+	                    subtype.mixIn(overrides);
+	                }
+
+	                // Create default initializer
+	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+	                    subtype.init = function () {
+	                        subtype.$super.init.apply(this, arguments);
+	                    };
+	                }
+
+	                // Initializer's prototype is the subtype object
+	                subtype.init.prototype = subtype;
+
+	                // Reference supertype
+	                subtype.$super = this;
+
+	                return subtype;
+	            },
+
+	            /**
+	             * Extends this object and runs the init method.
+	             * Arguments to create() will be passed to init().
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var instance = MyType.create();
+	             */
+	            create: function () {
+	                var instance = this.extend();
+	                instance.init.apply(instance, arguments);
+
+	                return instance;
+	            },
+
+	            /**
+	             * Initializes a newly created object.
+	             * Override this method to add some logic when your objects are created.
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         init: function () {
+	             *             // ...
+	             *         }
+	             *     });
+	             */
+	            init: function () {
+	            },
+
+	            /**
+	             * Copies properties into this object.
+	             *
+	             * @param {Object} properties The properties to mix in.
+	             *
+	             * @example
+	             *
+	             *     MyType.mixIn({
+	             *         field: 'value'
+	             *     });
+	             */
+	            mixIn: function (properties) {
+	                for (var propertyName in properties) {
+	                    if (properties.hasOwnProperty(propertyName)) {
+	                        this[propertyName] = properties[propertyName];
+	                    }
+	                }
+
+	                // IE won't copy toString using the loop above
+	                if (properties.hasOwnProperty('toString')) {
+	                    this.toString = properties.toString;
+	                }
+	            },
+
+	            /**
+	             * Creates a copy of this object.
+	             *
+	             * @return {Object} The clone.
+	             *
+	             * @example
+	             *
+	             *     var clone = instance.clone();
+	             */
+	            clone: function () {
+	                return this.init.prototype.extend(this);
+	            }
+	        };
+	    }());
+
+	    /**
+	     * An array of 32-bit words.
+	     *
+	     * @property {Array} words The array of 32-bit words.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var WordArray = C_lib.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of 32-bit words.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.create();
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 4;
+	            }
+	        },
+
+	        /**
+	         * Converts this word array to a string.
+	         *
+	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+	         *
+	         * @return {string} The stringified word array.
+	         *
+	         * @example
+	         *
+	         *     var string = wordArray + '';
+	         *     var string = wordArray.toString();
+	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
+	         */
+	        toString: function (encoder) {
+	            return (encoder || Hex).stringify(this);
+	        },
+
+	        /**
+	         * Concatenates a word array to this word array.
+	         *
+	         * @param {WordArray} wordArray The word array to append.
+	         *
+	         * @return {WordArray} This word array.
+	         *
+	         * @example
+	         *
+	         *     wordArray1.concat(wordArray2);
+	         */
+	        concat: function (wordArray) {
+	            // Shortcuts
+	            var thisWords = this.words;
+	            var thatWords = wordArray.words;
+	            var thisSigBytes = this.sigBytes;
+	            var thatSigBytes = wordArray.sigBytes;
+
+	            // Clamp excess bits
+	            this.clamp();
+
+	            // Concat
+	            if (thisSigBytes % 4) {
+	                // Copy one byte at a time
+	                for (var i = 0; i < thatSigBytes; i++) {
+	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+	                }
+	            } else {
+	                // Copy one word at a time
+	                for (var j = 0; j < thatSigBytes; j += 4) {
+	                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
+	                }
+	            }
+	            this.sigBytes += thatSigBytes;
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Removes insignificant bits.
+	         *
+	         * @example
+	         *
+	         *     wordArray.clamp();
+	         */
+	        clamp: function () {
+	            // Shortcuts
+	            var words = this.words;
+	            var sigBytes = this.sigBytes;
+
+	            // Clamp
+	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+	            words.length = Math.ceil(sigBytes / 4);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = wordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone.words = this.words.slice(0);
+
+	            return clone;
+	        },
+
+	        /**
+	         * Creates a word array filled with random bytes.
+	         *
+	         * @param {number} nBytes The number of random bytes to generate.
+	         *
+	         * @return {WordArray} The random word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
+	         */
+	        random: function (nBytes) {
+	            var words = [];
+
+	            for (var i = 0; i < nBytes; i += 4) {
+	                words.push(cryptoSecureRandomInt());
+	            }
+
+	            return new WordArray.init(words, nBytes);
+	        }
+	    });
+
+	    /**
+	     * Encoder namespace.
+	     */
+	    var C_enc = C.enc = {};
+
+	    /**
+	     * Hex encoding strategy.
+	     */
+	    var Hex = C_enc.Hex = {
+	        /**
+	         * Converts a word array to a hex string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The hex string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var hexChars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                hexChars.push((bite >>> 4).toString(16));
+	                hexChars.push((bite & 0x0f).toString(16));
+	            }
+
+	            return hexChars.join('');
+	        },
+
+	        /**
+	         * Converts a hex string to a word array.
+	         *
+	         * @param {string} hexStr The hex string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
+	         */
+	        parse: function (hexStr) {
+	            // Shortcut
+	            var hexStrLength = hexStr.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < hexStrLength; i += 2) {
+	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+	            }
+
+	            return new WordArray.init(words, hexStrLength / 2);
+	        }
+	    };
+
+	    /**
+	     * Latin1 encoding strategy.
+	     */
+	    var Latin1 = C_enc.Latin1 = {
+	        /**
+	         * Converts a word array to a Latin1 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Latin1 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var latin1Chars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                latin1Chars.push(String.fromCharCode(bite));
+	            }
+
+	            return latin1Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Latin1 string to a word array.
+	         *
+	         * @param {string} latin1Str The Latin1 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+	         */
+	        parse: function (latin1Str) {
+	            // Shortcut
+	            var latin1StrLength = latin1Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < latin1StrLength; i++) {
+	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+	            }
+
+	            return new WordArray.init(words, latin1StrLength);
+	        }
+	    };
+
+	    /**
+	     * UTF-8 encoding strategy.
+	     */
+	    var Utf8 = C_enc.Utf8 = {
+	        /**
+	         * Converts a word array to a UTF-8 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-8 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            try {
+	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+	            } catch (e) {
+	                throw new Error('Malformed UTF-8 data');
+	            }
+	        },
+
+	        /**
+	         * Converts a UTF-8 string to a word array.
+	         *
+	         * @param {string} utf8Str The UTF-8 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+	         */
+	        parse: function (utf8Str) {
+	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+	        }
+	    };
+
+	    /**
+	     * Abstract buffered block algorithm template.
+	     *
+	     * The property blockSize must be implemented in a concrete subtype.
+	     *
+	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+	     */
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+	        /**
+	         * Resets this block algorithm's data buffer to its initial state.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm.reset();
+	         */
+	        reset: function () {
+	            // Initial values
+	            this._data = new WordArray.init();
+	            this._nDataBytes = 0;
+	        },
+
+	        /**
+	         * Adds new data to this block algorithm's buffer.
+	         *
+	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm._append('data');
+	         *     bufferedBlockAlgorithm._append(wordArray);
+	         */
+	        _append: function (data) {
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof data == 'string') {
+	                data = Utf8.parse(data);
+	            }
+
+	            // Append
+	            this._data.concat(data);
+	            this._nDataBytes += data.sigBytes;
+	        },
+
+	        /**
+	         * Processes available data blocks.
+	         *
+	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+	         *
+	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+	         *
+	         * @return {WordArray} The processed data.
+	         *
+	         * @example
+	         *
+	         *     var processedData = bufferedBlockAlgorithm._process();
+	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
+	         */
+	        _process: function (doFlush) {
+	            var processedWords;
+
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var dataSigBytes = data.sigBytes;
+	            var blockSize = this.blockSize;
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count blocks ready
+	            var nBlocksReady = dataSigBytes / blockSizeBytes;
+	            if (doFlush) {
+	                // Round up to include partial blocks
+	                nBlocksReady = Math.ceil(nBlocksReady);
+	            } else {
+	                // Round down to include only full blocks,
+	                // less the number of blocks that must remain in the buffer
+	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+	            }
+
+	            // Count words ready
+	            var nWordsReady = nBlocksReady * blockSize;
+
+	            // Count bytes ready
+	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+	            // Process blocks
+	            if (nWordsReady) {
+	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+	                    // Perform concrete-algorithm logic
+	                    this._doProcessBlock(dataWords, offset);
+	                }
+
+	                // Remove processed words
+	                processedWords = dataWords.splice(0, nWordsReady);
+	                data.sigBytes -= nBytesReady;
+	            }
+
+	            // Return processed words
+	            return new WordArray.init(processedWords, nBytesReady);
+	        },
+
+	        /**
+	         * Creates a copy of this object.
+	         *
+	         * @return {Object} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = bufferedBlockAlgorithm.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone._data = this._data.clone();
+
+	            return clone;
+	        },
+
+	        _minBufferSize: 0
+	    });
+
+	    /**
+	     * Abstract hasher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+	     */
+	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Initializes a newly created hasher.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+	         *
+	         * @example
+	         *
+	         *     var hasher = CryptoJS.algo.SHA256.create();
+	         */
+	        init: function (cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this hasher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hasher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-hasher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Updates this hasher with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {Hasher} This hasher.
+	         *
+	         * @example
+	         *
+	         *     hasher.update('message');
+	         *     hasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            // Append
+	            this._append(messageUpdate);
+
+	            // Update the hash
+	            this._process();
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the hash computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The hash.
+	         *
+	         * @example
+	         *
+	         *     var hash = hasher.finalize();
+	         *     var hash = hasher.finalize('message');
+	         *     var hash = hasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Final message update
+	            if (messageUpdate) {
+	                this._append(messageUpdate);
+	            }
+
+	            // Perform concrete-hasher logic
+	            var hash = this._doFinalize();
+
+	            return hash;
+	        },
+
+	        blockSize: 512/32,
+
+	        /**
+	         * Creates a shortcut function to a hasher's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to create a helper for.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHelper: function (hasher) {
+	            return function (message, cfg) {
+	                return new hasher.init(cfg).finalize(message);
+	            };
+	        },
+
+	        /**
+	         * Creates a shortcut function to the HMAC's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHmacHelper: function (hasher) {
+	            return function (message, key) {
+	                return new C_algo.HMAC.init(hasher, key).finalize(message);
+	            };
+	        }
+	    });
+
+	    /**
+	     * Algorithm namespace.
+	     */
+	    var C_algo = C.algo = {};
+
+	    return C;
+	}(Math));
+
+
+	return CryptoJS;
+
+}));
+}, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585676996, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var X32WordArray = C_lib.WordArray;
+
+	    /**
+	     * x64 namespace.
+	     */
+	    var C_x64 = C.x64 = {};
+
+	    /**
+	     * A 64-bit word.
+	     */
+	    var X64Word = C_x64.Word = Base.extend({
+	        /**
+	         * Initializes a newly created 64-bit word.
+	         *
+	         * @param {number} high The high 32 bits.
+	         * @param {number} low The low 32 bits.
+	         *
+	         * @example
+	         *
+	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+	         */
+	        init: function (high, low) {
+	            this.high = high;
+	            this.low = low;
+	        }
+
+	        /**
+	         * Bitwise NOTs this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after negating.
+	         *
+	         * @example
+	         *
+	         *     var negated = x64Word.not();
+	         */
+	        // not: function () {
+	            // var high = ~this.high;
+	            // var low = ~this.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ANDs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to AND with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ANDing.
+	         *
+	         * @example
+	         *
+	         *     var anded = x64Word.and(anotherX64Word);
+	         */
+	        // and: function (word) {
+	            // var high = this.high & word.high;
+	            // var low = this.low & word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to OR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ORing.
+	         *
+	         * @example
+	         *
+	         *     var ored = x64Word.or(anotherX64Word);
+	         */
+	        // or: function (word) {
+	            // var high = this.high | word.high;
+	            // var low = this.low | word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise XORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to XOR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after XORing.
+	         *
+	         * @example
+	         *
+	         *     var xored = x64Word.xor(anotherX64Word);
+	         */
+	        // xor: function (word) {
+	            // var high = this.high ^ word.high;
+	            // var low = this.low ^ word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftL(25);
+	         */
+	        // shiftL: function (n) {
+	            // if (n < 32) {
+	                // var high = (this.high << n) | (this.low >>> (32 - n));
+	                // var low = this.low << n;
+	            // } else {
+	                // var high = this.low << (n - 32);
+	                // var low = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftR(7);
+	         */
+	        // shiftR: function (n) {
+	            // if (n < 32) {
+	                // var low = (this.low >>> n) | (this.high << (32 - n));
+	                // var high = this.high >>> n;
+	            // } else {
+	                // var low = this.high >>> (n - 32);
+	                // var high = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotL(25);
+	         */
+	        // rotL: function (n) {
+	            // return this.shiftL(n).or(this.shiftR(64 - n));
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotR(7);
+	         */
+	        // rotR: function (n) {
+	            // return this.shiftR(n).or(this.shiftL(64 - n));
+	        // },
+
+	        /**
+	         * Adds this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to add with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after adding.
+	         *
+	         * @example
+	         *
+	         *     var added = x64Word.add(anotherX64Word);
+	         */
+	        // add: function (word) {
+	            // var low = (this.low + word.low) | 0;
+	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+	            // var high = (this.high + word.high + carry) | 0;
+
+	            // return X64Word.create(high, low);
+	        // }
+	    });
+
+	    /**
+	     * An array of 64-bit words.
+	     *
+	     * @property {Array} words The array of CryptoJS.x64.Word objects.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var X64WordArray = C_x64.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create();
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ]);
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ], 10);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 8;
+	            }
+	        },
+
+	        /**
+	         * Converts this 64-bit word array to a 32-bit word array.
+	         *
+	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+	         *
+	         * @example
+	         *
+	         *     var x32WordArray = x64WordArray.toX32();
+	         */
+	        toX32: function () {
+	            // Shortcuts
+	            var x64Words = this.words;
+	            var x64WordsLength = x64Words.length;
+
+	            // Convert
+	            var x32Words = [];
+	            for (var i = 0; i < x64WordsLength; i++) {
+	                var x64Word = x64Words[i];
+	                x32Words.push(x64Word.high);
+	                x32Words.push(x64Word.low);
+	            }
+
+	            return X32WordArray.create(x32Words, this.sigBytes);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {X64WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = x64WordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+
+	            // Clone "words" array
+	            var words = clone.words = this.words.slice(0);
+
+	            // Clone each X64Word object
+	            var wordsLength = words.length;
+	            for (var i = 0; i < wordsLength; i++) {
+	                words[i] = words[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+	}());
+
+
+	return CryptoJS;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585676997, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Check if typed arrays are supported
+	    if (typeof ArrayBuffer != 'function') {
+	        return;
+	    }
+
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+
+	    // Reference original init
+	    var superInit = WordArray.init;
+
+	    // Augment WordArray.init to handle typed arrays
+	    var subInit = WordArray.init = function (typedArray) {
+	        // Convert buffers to uint8
+	        if (typedArray instanceof ArrayBuffer) {
+	            typedArray = new Uint8Array(typedArray);
+	        }
+
+	        // Convert other array views to uint8
+	        if (
+	            typedArray instanceof Int8Array ||
+	            (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+	            typedArray instanceof Int16Array ||
+	            typedArray instanceof Uint16Array ||
+	            typedArray instanceof Int32Array ||
+	            typedArray instanceof Uint32Array ||
+	            typedArray instanceof Float32Array ||
+	            typedArray instanceof Float64Array
+	        ) {
+	            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+	        }
+
+	        // Handle Uint8Array
+	        if (typedArray instanceof Uint8Array) {
+	            // Shortcut
+	            var typedArrayByteLength = typedArray.byteLength;
+
+	            // Extract bytes
+	            var words = [];
+	            for (var i = 0; i < typedArrayByteLength; i++) {
+	                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+	            }
+
+	            // Initialize this word array
+	            superInit.call(this, words, typedArrayByteLength);
+	        } else {
+	            // Else call normal init
+	            superInit.apply(this, arguments);
+	        }
+	    };
+
+	    subInit.prototype = WordArray;
+	}());
+
+
+	return CryptoJS.lib.WordArray;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585676998, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * UTF-16 BE encoding strategy.
+	     */
+	    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+	        /**
+	         * Converts a word array to a UTF-16 BE string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-16 BE string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var utf16Chars = [];
+	            for (var i = 0; i < sigBytes; i += 2) {
+	                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+	                utf16Chars.push(String.fromCharCode(codePoint));
+	            }
+
+	            return utf16Chars.join('');
+	        },
+
+	        /**
+	         * Converts a UTF-16 BE string to a word array.
+	         *
+	         * @param {string} utf16Str The UTF-16 BE string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+	         */
+	        parse: function (utf16Str) {
+	            // Shortcut
+	            var utf16StrLength = utf16Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < utf16StrLength; i++) {
+	                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+	            }
+
+	            return WordArray.create(words, utf16StrLength * 2);
+	        }
+	    };
+
+	    /**
+	     * UTF-16 LE encoding strategy.
+	     */
+	    C_enc.Utf16LE = {
+	        /**
+	         * Converts a word array to a UTF-16 LE string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-16 LE string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var utf16Chars = [];
+	            for (var i = 0; i < sigBytes; i += 2) {
+	                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+	                utf16Chars.push(String.fromCharCode(codePoint));
+	            }
+
+	            return utf16Chars.join('');
+	        },
+
+	        /**
+	         * Converts a UTF-16 LE string to a word array.
+	         *
+	         * @param {string} utf16Str The UTF-16 LE string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+	         */
+	        parse: function (utf16Str) {
+	            // Shortcut
+	            var utf16StrLength = utf16Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < utf16StrLength; i++) {
+	                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+	            }
+
+	            return WordArray.create(words, utf16StrLength * 2);
+	        }
+	    };
+
+	    function swapEndian(word) {
+	        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+	    }
+	}());
+
+
+	return CryptoJS.enc.Utf16;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585676999, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * Base64 encoding strategy.
+	     */
+	    var Base64 = C_enc.Base64 = {
+	        /**
+	         * Converts a word array to a Base64 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Base64 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+	            var map = this._map;
+
+	            // Clamp excess bits
+	            wordArray.clamp();
+
+	            // Convert
+	            var base64Chars = [];
+	            for (var i = 0; i < sigBytes; i += 3) {
+	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
+	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+	                }
+	            }
+
+	            // Add padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                while (base64Chars.length % 4) {
+	                    base64Chars.push(paddingChar);
+	                }
+	            }
+
+	            return base64Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Base64 string to a word array.
+	         *
+	         * @param {string} base64Str The Base64 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
+	         */
+	        parse: function (base64Str) {
+	            // Shortcuts
+	            var base64StrLength = base64Str.length;
+	            var map = this._map;
+	            var reverseMap = this._reverseMap;
+
+	            if (!reverseMap) {
+	                    reverseMap = this._reverseMap = [];
+	                    for (var j = 0; j < map.length; j++) {
+	                        reverseMap[map.charCodeAt(j)] = j;
+	                    }
+	            }
+
+	            // Ignore padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                var paddingIndex = base64Str.indexOf(paddingChar);
+	                if (paddingIndex !== -1) {
+	                    base64StrLength = paddingIndex;
+	                }
+	            }
+
+	            // Convert
+	            return parseLoop(base64Str, base64StrLength, reverseMap);
+
+	        },
+
+	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+	    };
+
+	    function parseLoop(base64Str, base64StrLength, reverseMap) {
+	      var words = [];
+	      var nBytes = 0;
+	      for (var i = 0; i < base64StrLength; i++) {
+	          if (i % 4) {
+	              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+	              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+	              var bitsCombined = bits1 | bits2;
+	              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+	              nBytes++;
+	          }
+	      }
+	      return WordArray.create(words, nBytes);
+	    }
+	}());
+
+
+	return CryptoJS.enc.Base64;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677000, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * Base64url encoding strategy.
+	     */
+	    var Base64url = C_enc.Base64url = {
+	        /**
+	         * Converts a word array to a Base64url string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @param {boolean} urlSafe Whether to use url safe
+	         *
+	         * @return {string} The Base64url string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
+	         */
+	        stringify: function (wordArray, urlSafe) {
+	            if (urlSafe === undefined) {
+	                urlSafe = true
+	            }
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+	            var map = urlSafe ? this._safe_map : this._map;
+
+	            // Clamp excess bits
+	            wordArray.clamp();
+
+	            // Convert
+	            var base64Chars = [];
+	            for (var i = 0; i < sigBytes; i += 3) {
+	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
+	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+	                }
+	            }
+
+	            // Add padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                while (base64Chars.length % 4) {
+	                    base64Chars.push(paddingChar);
+	                }
+	            }
+
+	            return base64Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Base64url string to a word array.
+	         *
+	         * @param {string} base64Str The Base64url string.
+	         *
+	         * @param {boolean} urlSafe Whether to use url safe
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);
+	         */
+	        parse: function (base64Str, urlSafe) {
+	            if (urlSafe === undefined) {
+	                urlSafe = true
+	            }
+
+	            // Shortcuts
+	            var base64StrLength = base64Str.length;
+	            var map = urlSafe ? this._safe_map : this._map;
+	            var reverseMap = this._reverseMap;
+
+	            if (!reverseMap) {
+	                reverseMap = this._reverseMap = [];
+	                for (var j = 0; j < map.length; j++) {
+	                    reverseMap[map.charCodeAt(j)] = j;
+	                }
+	            }
+
+	            // Ignore padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                var paddingIndex = base64Str.indexOf(paddingChar);
+	                if (paddingIndex !== -1) {
+	                    base64StrLength = paddingIndex;
+	                }
+	            }
+
+	            // Convert
+	            return parseLoop(base64Str, base64StrLength, reverseMap);
+
+	        },
+
+	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+	        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+	    };
+
+	    function parseLoop(base64Str, base64StrLength, reverseMap) {
+	        var words = [];
+	        var nBytes = 0;
+	        for (var i = 0; i < base64StrLength; i++) {
+	            if (i % 4) {
+	                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+	                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+	                var bitsCombined = bits1 | bits2;
+	                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+	                nBytes++;
+	            }
+	        }
+	        return WordArray.create(words, nBytes);
+	    }
+	}());
+
+
+	return CryptoJS.enc.Base64url;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677001, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var T = [];
+
+	    // Compute constants
+	    (function () {
+	        for (var i = 0; i < 64; i++) {
+	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+	        }
+	    }());
+
+	    /**
+	     * MD5 hash algorithm.
+	     */
+	    var MD5 = C_algo.MD5 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var M_offset_0  = M[offset + 0];
+	            var M_offset_1  = M[offset + 1];
+	            var M_offset_2  = M[offset + 2];
+	            var M_offset_3  = M[offset + 3];
+	            var M_offset_4  = M[offset + 4];
+	            var M_offset_5  = M[offset + 5];
+	            var M_offset_6  = M[offset + 6];
+	            var M_offset_7  = M[offset + 7];
+	            var M_offset_8  = M[offset + 8];
+	            var M_offset_9  = M[offset + 9];
+	            var M_offset_10 = M[offset + 10];
+	            var M_offset_11 = M[offset + 11];
+	            var M_offset_12 = M[offset + 12];
+	            var M_offset_13 = M[offset + 13];
+	            var M_offset_14 = M[offset + 14];
+	            var M_offset_15 = M[offset + 15];
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+
+	            // Computation
+	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
+	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
+	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
+	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
+	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
+	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
+	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
+	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
+	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
+	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
+	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
+	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
+	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
+	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
+	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
+	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
+	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
+	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
+	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
+	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
+	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
+	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
+	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
+	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
+	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
+	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
+	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
+	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
+	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
+	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
+	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
+	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
+	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
+	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
+	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
+
+	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
+	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
+	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
+	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
+	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
+	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
+	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
+	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
+	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
+	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
+	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
+	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
+	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
+	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
+	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
+	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+	            var nBitsTotalL = nBitsTotal;
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
+	            );
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
+	            );
+
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    function FF(a, b, c, d, x, s, t) {
+	        var n = a + ((b & c) | (~b & d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function GG(a, b, c, d, x, s, t) {
+	        var n = a + ((b & d) | (c & ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function HH(a, b, c, d, x, s, t) {
+	        var n = a + (b ^ c ^ d) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function II(a, b, c, d, x, s, t) {
+	        var n = a + (c ^ (b | ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.MD5('message');
+	     *     var hash = CryptoJS.MD5(wordArray);
+	     */
+	    C.MD5 = Hasher._createHelper(MD5);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacMD5(message, key);
+	     */
+	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
+	}(Math));
+
+
+	return CryptoJS.MD5;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677002, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-1 hash algorithm.
+	     */
+	    var SHA1 = C_algo.SHA1 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476,
+	                0xc3d2e1f0
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+
+	            // Computation
+	            for (var i = 0; i < 80; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+	                    W[i] = (n << 1) | (n >>> 31);
+	                }
+
+	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
+	                if (i < 20) {
+	                    t += ((b & c) | (~b & d)) + 0x5a827999;
+	                } else if (i < 40) {
+	                    t += (b ^ c ^ d) + 0x6ed9eba1;
+	                } else if (i < 60) {
+	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+	                } else /* if (i < 80) */ {
+	                    t += (b ^ c ^ d) - 0x359d3e2a;
+	                }
+
+	                e = d;
+	                d = c;
+	                c = (b << 30) | (b >>> 2);
+	                b = a;
+	                a = t;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA1('message');
+	     *     var hash = CryptoJS.SHA1(wordArray);
+	     */
+	    C.SHA1 = Hasher._createHelper(SHA1);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA1(message, key);
+	     */
+	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+	}());
+
+
+	return CryptoJS.SHA1;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677003, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Initialization and round constants tables
+	    var H = [];
+	    var K = [];
+
+	    // Compute constants
+	    (function () {
+	        function isPrime(n) {
+	            var sqrtN = Math.sqrt(n);
+	            for (var factor = 2; factor <= sqrtN; factor++) {
+	                if (!(n % factor)) {
+	                    return false;
+	                }
+	            }
+
+	            return true;
+	        }
+
+	        function getFractionalBits(n) {
+	            return ((n - (n | 0)) * 0x100000000) | 0;
+	        }
+
+	        var n = 2;
+	        var nPrime = 0;
+	        while (nPrime < 64) {
+	            if (isPrime(n)) {
+	                if (nPrime < 8) {
+	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+	                }
+	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+	                nPrime++;
+	            }
+
+	            n++;
+	        }
+	    }());
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-256 hash algorithm.
+	     */
+	    var SHA256 = C_algo.SHA256 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init(H.slice(0));
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+	            var f = H[5];
+	            var g = H[6];
+	            var h = H[7];
+
+	            // Computation
+	            for (var i = 0; i < 64; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var gamma0x = W[i - 15];
+	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
+	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
+	                                   (gamma0x >>> 3);
+
+	                    var gamma1x = W[i - 2];
+	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
+	                                   (gamma1x >>> 10);
+
+	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+	                }
+
+	                var ch  = (e & f) ^ (~e & g);
+	                var maj = (a & b) ^ (a & c) ^ (b & c);
+
+	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
+
+	                var t1 = h + sigma1 + ch + K[i] + W[i];
+	                var t2 = sigma0 + maj;
+
+	                h = g;
+	                g = f;
+	                f = e;
+	                e = (d + t1) | 0;
+	                d = c;
+	                c = b;
+	                b = a;
+	                a = (t1 + t2) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	            H[5] = (H[5] + f) | 0;
+	            H[6] = (H[6] + g) | 0;
+	            H[7] = (H[7] + h) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA256('message');
+	     *     var hash = CryptoJS.SHA256(wordArray);
+	     */
+	    C.SHA256 = Hasher._createHelper(SHA256);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA256(message, key);
+	     */
+	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+	}(Math));
+
+
+	return CryptoJS.SHA256;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677004, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha256"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha256"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var SHA256 = C_algo.SHA256;
+
+	    /**
+	     * SHA-224 hash algorithm.
+	     */
+	    var SHA224 = C_algo.SHA224 = SHA256.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+	                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+	            ]);
+	        },
+
+	        _doFinalize: function () {
+	            var hash = SHA256._doFinalize.call(this);
+
+	            hash.sigBytes -= 4;
+
+	            return hash;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA224('message');
+	     *     var hash = CryptoJS.SHA224(wordArray);
+	     */
+	    C.SHA224 = SHA256._createHelper(SHA224);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA224(message, key);
+	     */
+	    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+	}());
+
+
+	return CryptoJS.SHA224;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./sha256":1734585677003}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677005, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+
+	    function X64Word_create() {
+	        return X64Word.create.apply(X64Word, arguments);
+	    }
+
+	    // Constants
+	    var K = [
+	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+	    ];
+
+	    // Reusable objects
+	    var W = [];
+	    (function () {
+	        for (var i = 0; i < 80; i++) {
+	            W[i] = X64Word_create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-512 hash algorithm.
+	     */
+	    var SHA512 = C_algo.SHA512 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var H0 = H[0];
+	            var H1 = H[1];
+	            var H2 = H[2];
+	            var H3 = H[3];
+	            var H4 = H[4];
+	            var H5 = H[5];
+	            var H6 = H[6];
+	            var H7 = H[7];
+
+	            var H0h = H0.high;
+	            var H0l = H0.low;
+	            var H1h = H1.high;
+	            var H1l = H1.low;
+	            var H2h = H2.high;
+	            var H2l = H2.low;
+	            var H3h = H3.high;
+	            var H3l = H3.low;
+	            var H4h = H4.high;
+	            var H4l = H4.low;
+	            var H5h = H5.high;
+	            var H5l = H5.low;
+	            var H6h = H6.high;
+	            var H6l = H6.low;
+	            var H7h = H7.high;
+	            var H7l = H7.low;
+
+	            // Working variables
+	            var ah = H0h;
+	            var al = H0l;
+	            var bh = H1h;
+	            var bl = H1l;
+	            var ch = H2h;
+	            var cl = H2l;
+	            var dh = H3h;
+	            var dl = H3l;
+	            var eh = H4h;
+	            var el = H4l;
+	            var fh = H5h;
+	            var fl = H5l;
+	            var gh = H6h;
+	            var gl = H6l;
+	            var hh = H7h;
+	            var hl = H7l;
+
+	            // Rounds
+	            for (var i = 0; i < 80; i++) {
+	                var Wil;
+	                var Wih;
+
+	                // Shortcut
+	                var Wi = W[i];
+
+	                // Extend message
+	                if (i < 16) {
+	                    Wih = Wi.high = M[offset + i * 2]     | 0;
+	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
+	                } else {
+	                    // Gamma0
+	                    var gamma0x  = W[i - 15];
+	                    var gamma0xh = gamma0x.high;
+	                    var gamma0xl = gamma0x.low;
+	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+	                    // Gamma1
+	                    var gamma1x  = W[i - 2];
+	                    var gamma1xh = gamma1x.high;
+	                    var gamma1xl = gamma1x.low;
+	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+	                    var Wi7  = W[i - 7];
+	                    var Wi7h = Wi7.high;
+	                    var Wi7l = Wi7.low;
+
+	                    var Wi16  = W[i - 16];
+	                    var Wi16h = Wi16.high;
+	                    var Wi16l = Wi16.low;
+
+	                    Wil = gamma0l + Wi7l;
+	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+	                    Wil = Wil + gamma1l;
+	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+	                    Wil = Wil + Wi16l;
+	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+	                    Wi.high = Wih;
+	                    Wi.low  = Wil;
+	                }
+
+	                var chh  = (eh & fh) ^ (~eh & gh);
+	                var chl  = (el & fl) ^ (~el & gl);
+	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+	                // t1 = h + sigma1 + ch + K[i] + W[i]
+	                var Ki  = K[i];
+	                var Kih = Ki.high;
+	                var Kil = Ki.low;
+
+	                var t1l = hl + sigma1l;
+	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+	                var t1l = t1l + chl;
+	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+	                var t1l = t1l + Kil;
+	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+	                var t1l = t1l + Wil;
+	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+	                // t2 = sigma0 + maj
+	                var t2l = sigma0l + majl;
+	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+	                // Update working variables
+	                hh = gh;
+	                hl = gl;
+	                gh = fh;
+	                gl = fl;
+	                fh = eh;
+	                fl = el;
+	                el = (dl + t1l) | 0;
+	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+	                dh = ch;
+	                dl = cl;
+	                ch = bh;
+	                cl = bl;
+	                bh = ah;
+	                bl = al;
+	                al = (t1l + t2l) | 0;
+	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H0l = H0.low  = (H0l + al);
+	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+	            H1l = H1.low  = (H1l + bl);
+	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+	            H2l = H2.low  = (H2l + cl);
+	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+	            H3l = H3.low  = (H3l + dl);
+	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+	            H4l = H4.low  = (H4l + el);
+	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+	            H5l = H5.low  = (H5l + fl);
+	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+	            H6l = H6.low  = (H6l + gl);
+	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+	            H7l = H7.low  = (H7l + hl);
+	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Convert hash to 32-bit word array before returning
+	            var hash = this._hash.toX32();
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        },
+
+	        blockSize: 1024/32
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA512('message');
+	     *     var hash = CryptoJS.SHA512(wordArray);
+	     */
+	    C.SHA512 = Hasher._createHelper(SHA512);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA512(message, key);
+	     */
+	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+	}());
+
+
+	return CryptoJS.SHA512;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./x64-core":1734585676996}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677006, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./sha512"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+	    var SHA512 = C_algo.SHA512;
+
+	    /**
+	     * SHA-384 hash algorithm.
+	     */
+	    var SHA384 = C_algo.SHA384 = SHA512.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+	                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+	                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+	                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+	            ]);
+	        },
+
+	        _doFinalize: function () {
+	            var hash = SHA512._doFinalize.call(this);
+
+	            hash.sigBytes -= 16;
+
+	            return hash;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA384('message');
+	     *     var hash = CryptoJS.SHA384(wordArray);
+	     */
+	    C.SHA384 = SHA512._createHelper(SHA384);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA384(message, key);
+	     */
+	    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+	}());
+
+
+	return CryptoJS.SHA384;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./x64-core":1734585676996,"./sha512":1734585677005}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677007, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var C_algo = C.algo;
+
+	    // Constants tables
+	    var RHO_OFFSETS = [];
+	    var PI_INDEXES  = [];
+	    var ROUND_CONSTANTS = [];
+
+	    // Compute Constants
+	    (function () {
+	        // Compute rho offset constants
+	        var x = 1, y = 0;
+	        for (var t = 0; t < 24; t++) {
+	            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+	            var newX = y % 5;
+	            var newY = (2 * x + 3 * y) % 5;
+	            x = newX;
+	            y = newY;
+	        }
+
+	        // Compute pi index constants
+	        for (var x = 0; x < 5; x++) {
+	            for (var y = 0; y < 5; y++) {
+	                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+	            }
+	        }
+
+	        // Compute round constants
+	        var LFSR = 0x01;
+	        for (var i = 0; i < 24; i++) {
+	            var roundConstantMsw = 0;
+	            var roundConstantLsw = 0;
+
+	            for (var j = 0; j < 7; j++) {
+	                if (LFSR & 0x01) {
+	                    var bitPosition = (1 << j) - 1;
+	                    if (bitPosition < 32) {
+	                        roundConstantLsw ^= 1 << bitPosition;
+	                    } else /* if (bitPosition >= 32) */ {
+	                        roundConstantMsw ^= 1 << (bitPosition - 32);
+	                    }
+	                }
+
+	                // Compute next LFSR
+	                if (LFSR & 0x80) {
+	                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+	                    LFSR = (LFSR << 1) ^ 0x71;
+	                } else {
+	                    LFSR <<= 1;
+	                }
+	            }
+
+	            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+	        }
+	    }());
+
+	    // Reusable objects for temporary values
+	    var T = [];
+	    (function () {
+	        for (var i = 0; i < 25; i++) {
+	            T[i] = X64Word.create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-3 hash algorithm.
+	     */
+	    var SHA3 = C_algo.SHA3 = Hasher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} outputLength
+	         *   The desired number of bits in the output hash.
+	         *   Only values permitted are: 224, 256, 384, 512.
+	         *   Default: 512
+	         */
+	        cfg: Hasher.cfg.extend({
+	            outputLength: 512
+	        }),
+
+	        _doReset: function () {
+	            var state = this._state = []
+	            for (var i = 0; i < 25; i++) {
+	                state[i] = new X64Word.init();
+	            }
+
+	            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var state = this._state;
+	            var nBlockSizeLanes = this.blockSize / 2;
+
+	            // Absorb
+	            for (var i = 0; i < nBlockSizeLanes; i++) {
+	                // Shortcuts
+	                var M2i  = M[offset + 2 * i];
+	                var M2i1 = M[offset + 2 * i + 1];
+
+	                // Swap endian
+	                M2i = (
+	                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
+	                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
+	                );
+	                M2i1 = (
+	                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
+	                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
+	                );
+
+	                // Absorb message into state
+	                var lane = state[i];
+	                lane.high ^= M2i1;
+	                lane.low  ^= M2i;
+	            }
+
+	            // Rounds
+	            for (var round = 0; round < 24; round++) {
+	                // Theta
+	                for (var x = 0; x < 5; x++) {
+	                    // Mix column lanes
+	                    var tMsw = 0, tLsw = 0;
+	                    for (var y = 0; y < 5; y++) {
+	                        var lane = state[x + 5 * y];
+	                        tMsw ^= lane.high;
+	                        tLsw ^= lane.low;
+	                    }
+
+	                    // Temporary values
+	                    var Tx = T[x];
+	                    Tx.high = tMsw;
+	                    Tx.low  = tLsw;
+	                }
+	                for (var x = 0; x < 5; x++) {
+	                    // Shortcuts
+	                    var Tx4 = T[(x + 4) % 5];
+	                    var Tx1 = T[(x + 1) % 5];
+	                    var Tx1Msw = Tx1.high;
+	                    var Tx1Lsw = Tx1.low;
+
+	                    // Mix surrounding columns
+	                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+	                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+	                    for (var y = 0; y < 5; y++) {
+	                        var lane = state[x + 5 * y];
+	                        lane.high ^= tMsw;
+	                        lane.low  ^= tLsw;
+	                    }
+	                }
+
+	                // Rho Pi
+	                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+	                    var tMsw;
+	                    var tLsw;
+
+	                    // Shortcuts
+	                    var lane = state[laneIndex];
+	                    var laneMsw = lane.high;
+	                    var laneLsw = lane.low;
+	                    var rhoOffset = RHO_OFFSETS[laneIndex];
+
+	                    // Rotate lanes
+	                    if (rhoOffset < 32) {
+	                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+	                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+	                    } else /* if (rhoOffset >= 32) */ {
+	                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+	                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+	                    }
+
+	                    // Transpose lanes
+	                    var TPiLane = T[PI_INDEXES[laneIndex]];
+	                    TPiLane.high = tMsw;
+	                    TPiLane.low  = tLsw;
+	                }
+
+	                // Rho pi at x = y = 0
+	                var T0 = T[0];
+	                var state0 = state[0];
+	                T0.high = state0.high;
+	                T0.low  = state0.low;
+
+	                // Chi
+	                for (var x = 0; x < 5; x++) {
+	                    for (var y = 0; y < 5; y++) {
+	                        // Shortcuts
+	                        var laneIndex = x + 5 * y;
+	                        var lane = state[laneIndex];
+	                        var TLane = T[laneIndex];
+	                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+	                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+	                        // Mix rows
+	                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+	                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
+	                    }
+	                }
+
+	                // Iota
+	                var lane = state[0];
+	                var roundConstant = ROUND_CONSTANTS[round];
+	                lane.high ^= roundConstant.high;
+	                lane.low  ^= roundConstant.low;
+	            }
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+	            var blockSizeBits = this.blockSize * 32;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+	            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var state = this._state;
+	            var outputLengthBytes = this.cfg.outputLength / 8;
+	            var outputLengthLanes = outputLengthBytes / 8;
+
+	            // Squeeze
+	            var hashWords = [];
+	            for (var i = 0; i < outputLengthLanes; i++) {
+	                // Shortcuts
+	                var lane = state[i];
+	                var laneMsw = lane.high;
+	                var laneLsw = lane.low;
+
+	                // Swap endian
+	                laneMsw = (
+	                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
+	                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
+	                );
+	                laneLsw = (
+	                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
+	                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
+	                );
+
+	                // Squeeze state to retrieve hash
+	                hashWords.push(laneLsw);
+	                hashWords.push(laneMsw);
+	            }
+
+	            // Return final computed hash
+	            return new WordArray.init(hashWords, outputLengthBytes);
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+
+	            var state = clone._state = this._state.slice(0);
+	            for (var i = 0; i < 25; i++) {
+	                state[i] = state[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA3('message');
+	     *     var hash = CryptoJS.SHA3(wordArray);
+	     */
+	    C.SHA3 = Hasher._createHelper(SHA3);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA3(message, key);
+	     */
+	    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+	}(Math));
+
+
+	return CryptoJS.SHA3;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./x64-core":1734585676996}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677008, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/** @preserve
+	(c) 2012 by Cédric Mesnil. All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var _zl = WordArray.create([
+	        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+	        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
+	        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
+	        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
+	        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
+	    var _zr = WordArray.create([
+	        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
+	        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
+	        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
+	        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
+	        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
+	    var _sl = WordArray.create([
+	         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
+	        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
+	        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
+	          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
+	        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
+	    var _sr = WordArray.create([
+	        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
+	        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
+	        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
+	        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
+	        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
+
+	    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+	    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+	    /**
+	     * RIPEMD160 hash algorithm.
+	     */
+	    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                // Swap
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+	            // Shortcut
+	            var H  = this._hash.words;
+	            var hl = _hl.words;
+	            var hr = _hr.words;
+	            var zl = _zl.words;
+	            var zr = _zr.words;
+	            var sl = _sl.words;
+	            var sr = _sr.words;
+
+	            // Working variables
+	            var al, bl, cl, dl, el;
+	            var ar, br, cr, dr, er;
+
+	            ar = al = H[0];
+	            br = bl = H[1];
+	            cr = cl = H[2];
+	            dr = dl = H[3];
+	            er = el = H[4];
+	            // Computation
+	            var t;
+	            for (var i = 0; i < 80; i += 1) {
+	                t = (al +  M[offset+zl[i]])|0;
+	                if (i<16){
+		            t +=  f1(bl,cl,dl) + hl[0];
+	                } else if (i<32) {
+		            t +=  f2(bl,cl,dl) + hl[1];
+	                } else if (i<48) {
+		            t +=  f3(bl,cl,dl) + hl[2];
+	                } else if (i<64) {
+		            t +=  f4(bl,cl,dl) + hl[3];
+	                } else {// if (i<80) {
+		            t +=  f5(bl,cl,dl) + hl[4];
+	                }
+	                t = t|0;
+	                t =  rotl(t,sl[i]);
+	                t = (t+el)|0;
+	                al = el;
+	                el = dl;
+	                dl = rotl(cl, 10);
+	                cl = bl;
+	                bl = t;
+
+	                t = (ar + M[offset+zr[i]])|0;
+	                if (i<16){
+		            t +=  f5(br,cr,dr) + hr[0];
+	                } else if (i<32) {
+		            t +=  f4(br,cr,dr) + hr[1];
+	                } else if (i<48) {
+		            t +=  f3(br,cr,dr) + hr[2];
+	                } else if (i<64) {
+		            t +=  f2(br,cr,dr) + hr[3];
+	                } else {// if (i<80) {
+		            t +=  f1(br,cr,dr) + hr[4];
+	                }
+	                t = t|0;
+	                t =  rotl(t,sr[i]) ;
+	                t = (t+er)|0;
+	                ar = er;
+	                er = dr;
+	                dr = rotl(cr, 10);
+	                cr = br;
+	                br = t;
+	            }
+	            // Intermediate hash value
+	            t    = (H[1] + cl + dr)|0;
+	            H[1] = (H[2] + dl + er)|0;
+	            H[2] = (H[3] + el + ar)|0;
+	            H[3] = (H[4] + al + br)|0;
+	            H[4] = (H[0] + bl + cr)|0;
+	            H[0] =  t;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
+	            );
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 5; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                // Swap
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+
+	    function f1(x, y, z) {
+	        return ((x) ^ (y) ^ (z));
+
+	    }
+
+	    function f2(x, y, z) {
+	        return (((x)&(y)) | ((~x)&(z)));
+	    }
+
+	    function f3(x, y, z) {
+	        return (((x) | (~(y))) ^ (z));
+	    }
+
+	    function f4(x, y, z) {
+	        return (((x) & (z)) | ((y)&(~(z))));
+	    }
+
+	    function f5(x, y, z) {
+	        return ((x) ^ ((y) |(~(z))));
+
+	    }
+
+	    function rotl(x,n) {
+	        return (x<<n) | (x>>>(32-n));
+	    }
+
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.RIPEMD160('message');
+	     *     var hash = CryptoJS.RIPEMD160(wordArray);
+	     */
+	    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
+	     */
+	    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+	}(Math));
+
+
+	return CryptoJS.RIPEMD160;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677009, function(require, module, exports) {
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var C_enc = C.enc;
+	    var Utf8 = C_enc.Utf8;
+	    var C_algo = C.algo;
+
+	    /**
+	     * HMAC algorithm.
+	     */
+	    var HMAC = C_algo.HMAC = Base.extend({
+	        /**
+	         * Initializes a newly created HMAC.
+	         *
+	         * @param {Hasher} hasher The hash algorithm to use.
+	         * @param {WordArray|string} key The secret key.
+	         *
+	         * @example
+	         *
+	         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+	         */
+	        init: function (hasher, key) {
+	            // Init hasher
+	            hasher = this._hasher = new hasher.init();
+
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof key == 'string') {
+	                key = Utf8.parse(key);
+	            }
+
+	            // Shortcuts
+	            var hasherBlockSize = hasher.blockSize;
+	            var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+	            // Allow arbitrary length keys
+	            if (key.sigBytes > hasherBlockSizeBytes) {
+	                key = hasher.finalize(key);
+	            }
+
+	            // Clamp excess bits
+	            key.clamp();
+
+	            // Clone key for inner and outer pads
+	            var oKey = this._oKey = key.clone();
+	            var iKey = this._iKey = key.clone();
+
+	            // Shortcuts
+	            var oKeyWords = oKey.words;
+	            var iKeyWords = iKey.words;
+
+	            // XOR keys with pad constants
+	            for (var i = 0; i < hasherBlockSize; i++) {
+	                oKeyWords[i] ^= 0x5c5c5c5c;
+	                iKeyWords[i] ^= 0x36363636;
+	            }
+	            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this HMAC to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hmacHasher.reset();
+	         */
+	        reset: function () {
+	            // Shortcut
+	            var hasher = this._hasher;
+
+	            // Reset
+	            hasher.reset();
+	            hasher.update(this._iKey);
+	        },
+
+	        /**
+	         * Updates this HMAC with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {HMAC} This HMAC instance.
+	         *
+	         * @example
+	         *
+	         *     hmacHasher.update('message');
+	         *     hmacHasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            this._hasher.update(messageUpdate);
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the HMAC computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The HMAC.
+	         *
+	         * @example
+	         *
+	         *     var hmac = hmacHasher.finalize();
+	         *     var hmac = hmacHasher.finalize('message');
+	         *     var hmac = hmacHasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Shortcut
+	            var hasher = this._hasher;
+
+	            // Compute HMAC
+	            var innerHash = hasher.finalize(messageUpdate);
+	            hasher.reset();
+	            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+	            return hmac;
+	        }
+	    });
+	}());
+
+
+}));
+}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677010, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha256"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha256", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var SHA256 = C_algo.SHA256;
+	    var HMAC = C_algo.HMAC;
+
+	    /**
+	     * Password-Based Key Derivation Function 2 algorithm.
+	     */
+	    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+	         * @property {Hasher} hasher The hasher to use. Default: SHA256
+	         * @property {number} iterations The number of iterations to perform. Default: 250000
+	         */
+	        cfg: Base.extend({
+	            keySize: 128/32,
+	            hasher: SHA256,
+	            iterations: 250000
+	        }),
+
+	        /**
+	         * Initializes a newly created key derivation function.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+	         *
+	         * @example
+	         *
+	         *     var kdf = CryptoJS.algo.PBKDF2.create();
+	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+	         */
+	        init: function (cfg) {
+	            this.cfg = this.cfg.extend(cfg);
+	        },
+
+	        /**
+	         * Computes the Password-Based Key Derivation Function 2.
+	         *
+	         * @param {WordArray|string} password The password.
+	         * @param {WordArray|string} salt A salt.
+	         *
+	         * @return {WordArray} The derived key.
+	         *
+	         * @example
+	         *
+	         *     var key = kdf.compute(password, salt);
+	         */
+	        compute: function (password, salt) {
+	            // Shortcut
+	            var cfg = this.cfg;
+
+	            // Init HMAC
+	            var hmac = HMAC.create(cfg.hasher, password);
+
+	            // Initial values
+	            var derivedKey = WordArray.create();
+	            var blockIndex = WordArray.create([0x00000001]);
+
+	            // Shortcuts
+	            var derivedKeyWords = derivedKey.words;
+	            var blockIndexWords = blockIndex.words;
+	            var keySize = cfg.keySize;
+	            var iterations = cfg.iterations;
+
+	            // Generate key
+	            while (derivedKeyWords.length < keySize) {
+	                var block = hmac.update(salt).finalize(blockIndex);
+	                hmac.reset();
+
+	                // Shortcuts
+	                var blockWords = block.words;
+	                var blockWordsLength = blockWords.length;
+
+	                // Iterations
+	                var intermediate = block;
+	                for (var i = 1; i < iterations; i++) {
+	                    intermediate = hmac.finalize(intermediate);
+	                    hmac.reset();
+
+	                    // Shortcut
+	                    var intermediateWords = intermediate.words;
+
+	                    // XOR intermediate with block
+	                    for (var j = 0; j < blockWordsLength; j++) {
+	                        blockWords[j] ^= intermediateWords[j];
+	                    }
+	                }
+
+	                derivedKey.concat(block);
+	                blockIndexWords[0]++;
+	            }
+	            derivedKey.sigBytes = keySize * 4;
+
+	            return derivedKey;
+	        }
+	    });
+
+	    /**
+	     * Computes the Password-Based Key Derivation Function 2.
+	     *
+	     * @param {WordArray|string} password The password.
+	     * @param {WordArray|string} salt A salt.
+	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+	     *
+	     * @return {WordArray} The derived key.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var key = CryptoJS.PBKDF2(password, salt);
+	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+	     */
+	    C.PBKDF2 = function (password, salt, cfg) {
+	        return PBKDF2.create(cfg).compute(password, salt);
+	    };
+	}());
+
+
+	return CryptoJS.PBKDF2;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./sha256":1734585677003,"./hmac":1734585677009}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677011, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha1", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var MD5 = C_algo.MD5;
+
+	    /**
+	     * This key derivation function is meant to conform with EVP_BytesToKey.
+	     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+	     */
+	    var EvpKDF = C_algo.EvpKDF = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+	         * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+	         * @property {number} iterations The number of iterations to perform. Default: 1
+	         */
+	        cfg: Base.extend({
+	            keySize: 128/32,
+	            hasher: MD5,
+	            iterations: 1
+	        }),
+
+	        /**
+	         * Initializes a newly created key derivation function.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+	         *
+	         * @example
+	         *
+	         *     var kdf = CryptoJS.algo.EvpKDF.create();
+	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+	         */
+	        init: function (cfg) {
+	            this.cfg = this.cfg.extend(cfg);
+	        },
+
+	        /**
+	         * Derives a key from a password.
+	         *
+	         * @param {WordArray|string} password The password.
+	         * @param {WordArray|string} salt A salt.
+	         *
+	         * @return {WordArray} The derived key.
+	         *
+	         * @example
+	         *
+	         *     var key = kdf.compute(password, salt);
+	         */
+	        compute: function (password, salt) {
+	            var block;
+
+	            // Shortcut
+	            var cfg = this.cfg;
+
+	            // Init hasher
+	            var hasher = cfg.hasher.create();
+
+	            // Initial values
+	            var derivedKey = WordArray.create();
+
+	            // Shortcuts
+	            var derivedKeyWords = derivedKey.words;
+	            var keySize = cfg.keySize;
+	            var iterations = cfg.iterations;
+
+	            // Generate key
+	            while (derivedKeyWords.length < keySize) {
+	                if (block) {
+	                    hasher.update(block);
+	                }
+	                block = hasher.update(password).finalize(salt);
+	                hasher.reset();
+
+	                // Iterations
+	                for (var i = 1; i < iterations; i++) {
+	                    block = hasher.finalize(block);
+	                    hasher.reset();
+	                }
+
+	                derivedKey.concat(block);
+	            }
+	            derivedKey.sigBytes = keySize * 4;
+
+	            return derivedKey;
+	        }
+	    });
+
+	    /**
+	     * Derives a key from a password.
+	     *
+	     * @param {WordArray|string} password The password.
+	     * @param {WordArray|string} salt A salt.
+	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+	     *
+	     * @return {WordArray} The derived key.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var key = CryptoJS.EvpKDF(password, salt);
+	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+	     */
+	    C.EvpKDF = function (password, salt, cfg) {
+	        return EvpKDF.create(cfg).compute(password, salt);
+	    };
+	}());
+
+
+	return CryptoJS.EvpKDF;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./sha1":1734585677002,"./hmac":1734585677009}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677012, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./evpkdf"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./evpkdf"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Cipher core components.
+	 */
+	CryptoJS.lib.Cipher || (function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+	    var C_enc = C.enc;
+	    var Utf8 = C_enc.Utf8;
+	    var Base64 = C_enc.Base64;
+	    var C_algo = C.algo;
+	    var EvpKDF = C_algo.EvpKDF;
+
+	    /**
+	     * Abstract base cipher template.
+	     *
+	     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+	     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+	     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+	     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+	     */
+	    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {WordArray} iv The IV to use for this operation.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Creates this cipher in encryption mode.
+	         *
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {Cipher} A cipher instance.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+	         */
+	        createEncryptor: function (key, cfg) {
+	            return this.create(this._ENC_XFORM_MODE, key, cfg);
+	        },
+
+	        /**
+	         * Creates this cipher in decryption mode.
+	         *
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {Cipher} A cipher instance.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+	         */
+	        createDecryptor: function (key, cfg) {
+	            return this.create(this._DEC_XFORM_MODE, key, cfg);
+	        },
+
+	        /**
+	         * Initializes a newly created cipher.
+	         *
+	         * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+	         */
+	        init: function (xformMode, key, cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Store transform mode and key
+	            this._xformMode = xformMode;
+	            this._key = key;
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this cipher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     cipher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-cipher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Adds data to be encrypted or decrypted.
+	         *
+	         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+	         *
+	         * @return {WordArray} The data after processing.
+	         *
+	         * @example
+	         *
+	         *     var encrypted = cipher.process('data');
+	         *     var encrypted = cipher.process(wordArray);
+	         */
+	        process: function (dataUpdate) {
+	            // Append
+	            this._append(dataUpdate);
+
+	            // Process available blocks
+	            return this._process();
+	        },
+
+	        /**
+	         * Finalizes the encryption or decryption process.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+	         *
+	         * @return {WordArray} The data after final processing.
+	         *
+	         * @example
+	         *
+	         *     var encrypted = cipher.finalize();
+	         *     var encrypted = cipher.finalize('data');
+	         *     var encrypted = cipher.finalize(wordArray);
+	         */
+	        finalize: function (dataUpdate) {
+	            // Final data update
+	            if (dataUpdate) {
+	                this._append(dataUpdate);
+	            }
+
+	            // Perform concrete-cipher logic
+	            var finalProcessedData = this._doFinalize();
+
+	            return finalProcessedData;
+	        },
+
+	        keySize: 128/32,
+
+	        ivSize: 128/32,
+
+	        _ENC_XFORM_MODE: 1,
+
+	        _DEC_XFORM_MODE: 2,
+
+	        /**
+	         * Creates shortcut functions to a cipher's object interface.
+	         *
+	         * @param {Cipher} cipher The cipher to create a helper for.
+	         *
+	         * @return {Object} An object with encrypt and decrypt shortcut functions.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+	         */
+	        _createHelper: (function () {
+	            function selectCipherStrategy(key) {
+	                if (typeof key == 'string') {
+	                    return PasswordBasedCipher;
+	                } else {
+	                    return SerializableCipher;
+	                }
+	            }
+
+	            return function (cipher) {
+	                return {
+	                    encrypt: function (message, key, cfg) {
+	                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+	                    },
+
+	                    decrypt: function (ciphertext, key, cfg) {
+	                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+	                    }
+	                };
+	            };
+	        }())
+	    });
+
+	    /**
+	     * Abstract base stream cipher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+	     */
+	    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+	        _doFinalize: function () {
+	            // Process partial blocks
+	            var finalProcessedBlocks = this._process(!!'flush');
+
+	            return finalProcessedBlocks;
+	        },
+
+	        blockSize: 1
+	    });
+
+	    /**
+	     * Mode namespace.
+	     */
+	    var C_mode = C.mode = {};
+
+	    /**
+	     * Abstract base block cipher mode template.
+	     */
+	    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+	        /**
+	         * Creates this mode for encryption.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+	         */
+	        createEncryptor: function (cipher, iv) {
+	            return this.Encryptor.create(cipher, iv);
+	        },
+
+	        /**
+	         * Creates this mode for decryption.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+	         */
+	        createDecryptor: function (cipher, iv) {
+	            return this.Decryptor.create(cipher, iv);
+	        },
+
+	        /**
+	         * Initializes a newly created mode.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+	         */
+	        init: function (cipher, iv) {
+	            this._cipher = cipher;
+	            this._iv = iv;
+	        }
+	    });
+
+	    /**
+	     * Cipher Block Chaining mode.
+	     */
+	    var CBC = C_mode.CBC = (function () {
+	        /**
+	         * Abstract base CBC mode.
+	         */
+	        var CBC = BlockCipherMode.extend();
+
+	        /**
+	         * CBC encryptor.
+	         */
+	        CBC.Encryptor = CBC.extend({
+	            /**
+	             * Processes the data block at offset.
+	             *
+	             * @param {Array} words The data words to operate on.
+	             * @param {number} offset The offset where the block starts.
+	             *
+	             * @example
+	             *
+	             *     mode.processBlock(data.words, offset);
+	             */
+	            processBlock: function (words, offset) {
+	                // Shortcuts
+	                var cipher = this._cipher;
+	                var blockSize = cipher.blockSize;
+
+	                // XOR and encrypt
+	                xorBlock.call(this, words, offset, blockSize);
+	                cipher.encryptBlock(words, offset);
+
+	                // Remember this block to use with next block
+	                this._prevBlock = words.slice(offset, offset + blockSize);
+	            }
+	        });
+
+	        /**
+	         * CBC decryptor.
+	         */
+	        CBC.Decryptor = CBC.extend({
+	            /**
+	             * Processes the data block at offset.
+	             *
+	             * @param {Array} words The data words to operate on.
+	             * @param {number} offset The offset where the block starts.
+	             *
+	             * @example
+	             *
+	             *     mode.processBlock(data.words, offset);
+	             */
+	            processBlock: function (words, offset) {
+	                // Shortcuts
+	                var cipher = this._cipher;
+	                var blockSize = cipher.blockSize;
+
+	                // Remember this block to use with next block
+	                var thisBlock = words.slice(offset, offset + blockSize);
+
+	                // Decrypt and XOR
+	                cipher.decryptBlock(words, offset);
+	                xorBlock.call(this, words, offset, blockSize);
+
+	                // This block becomes the previous block
+	                this._prevBlock = thisBlock;
+	            }
+	        });
+
+	        function xorBlock(words, offset, blockSize) {
+	            var block;
+
+	            // Shortcut
+	            var iv = this._iv;
+
+	            // Choose mixing block
+	            if (iv) {
+	                block = iv;
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            } else {
+	                block = this._prevBlock;
+	            }
+
+	            // XOR blocks
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= block[i];
+	            }
+	        }
+
+	        return CBC;
+	    }());
+
+	    /**
+	     * Padding namespace.
+	     */
+	    var C_pad = C.pad = {};
+
+	    /**
+	     * PKCS #5/7 padding strategy.
+	     */
+	    var Pkcs7 = C_pad.Pkcs7 = {
+	        /**
+	         * Pads data using the algorithm defined in PKCS #5/7.
+	         *
+	         * @param {WordArray} data The data to pad.
+	         * @param {number} blockSize The multiple that the data should be padded to.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+	         */
+	        pad: function (data, blockSize) {
+	            // Shortcut
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count padding bytes
+	            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+	            // Create padding word
+	            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+	            // Create padding
+	            var paddingWords = [];
+	            for (var i = 0; i < nPaddingBytes; i += 4) {
+	                paddingWords.push(paddingWord);
+	            }
+	            var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+	            // Add padding
+	            data.concat(padding);
+	        },
+
+	        /**
+	         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+	         *
+	         * @param {WordArray} data The data to unpad.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+	         */
+	        unpad: function (data) {
+	            // Get number of padding bytes from last byte
+	            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	            // Remove padding
+	            data.sigBytes -= nPaddingBytes;
+	        }
+	    };
+
+	    /**
+	     * Abstract base block cipher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+	     */
+	    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {Mode} mode The block mode to use. Default: CBC
+	         * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+	         */
+	        cfg: Cipher.cfg.extend({
+	            mode: CBC,
+	            padding: Pkcs7
+	        }),
+
+	        reset: function () {
+	            var modeCreator;
+
+	            // Reset cipher
+	            Cipher.reset.call(this);
+
+	            // Shortcuts
+	            var cfg = this.cfg;
+	            var iv = cfg.iv;
+	            var mode = cfg.mode;
+
+	            // Reset block mode
+	            if (this._xformMode == this._ENC_XFORM_MODE) {
+	                modeCreator = mode.createEncryptor;
+	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+	                modeCreator = mode.createDecryptor;
+	                // Keep at least one block in the buffer for unpadding
+	                this._minBufferSize = 1;
+	            }
+
+	            if (this._mode && this._mode.__creator == modeCreator) {
+	                this._mode.init(this, iv && iv.words);
+	            } else {
+	                this._mode = modeCreator.call(mode, this, iv && iv.words);
+	                this._mode.__creator = modeCreator;
+	            }
+	        },
+
+	        _doProcessBlock: function (words, offset) {
+	            this._mode.processBlock(words, offset);
+	        },
+
+	        _doFinalize: function () {
+	            var finalProcessedBlocks;
+
+	            // Shortcut
+	            var padding = this.cfg.padding;
+
+	            // Finalize
+	            if (this._xformMode == this._ENC_XFORM_MODE) {
+	                // Pad data
+	                padding.pad(this._data, this.blockSize);
+
+	                // Process final blocks
+	                finalProcessedBlocks = this._process(!!'flush');
+	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+	                // Process final blocks
+	                finalProcessedBlocks = this._process(!!'flush');
+
+	                // Unpad data
+	                padding.unpad(finalProcessedBlocks);
+	            }
+
+	            return finalProcessedBlocks;
+	        },
+
+	        blockSize: 128/32
+	    });
+
+	    /**
+	     * A collection of cipher parameters.
+	     *
+	     * @property {WordArray} ciphertext The raw ciphertext.
+	     * @property {WordArray} key The key to this ciphertext.
+	     * @property {WordArray} iv The IV used in the ciphering operation.
+	     * @property {WordArray} salt The salt used with a key derivation function.
+	     * @property {Cipher} algorithm The cipher algorithm.
+	     * @property {Mode} mode The block mode used in the ciphering operation.
+	     * @property {Padding} padding The padding scheme used in the ciphering operation.
+	     * @property {number} blockSize The block size of the cipher.
+	     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+	     */
+	    var CipherParams = C_lib.CipherParams = Base.extend({
+	        /**
+	         * Initializes a newly created cipher params object.
+	         *
+	         * @param {Object} cipherParams An object with any of the possible cipher parameters.
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.lib.CipherParams.create({
+	         *         ciphertext: ciphertextWordArray,
+	         *         key: keyWordArray,
+	         *         iv: ivWordArray,
+	         *         salt: saltWordArray,
+	         *         algorithm: CryptoJS.algo.AES,
+	         *         mode: CryptoJS.mode.CBC,
+	         *         padding: CryptoJS.pad.PKCS7,
+	         *         blockSize: 4,
+	         *         formatter: CryptoJS.format.OpenSSL
+	         *     });
+	         */
+	        init: function (cipherParams) {
+	            this.mixIn(cipherParams);
+	        },
+
+	        /**
+	         * Converts this cipher params object to a string.
+	         *
+	         * @param {Format} formatter (Optional) The formatting strategy to use.
+	         *
+	         * @return {string} The stringified cipher params.
+	         *
+	         * @throws Error If neither the formatter nor the default formatter is set.
+	         *
+	         * @example
+	         *
+	         *     var string = cipherParams + '';
+	         *     var string = cipherParams.toString();
+	         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+	         */
+	        toString: function (formatter) {
+	            return (formatter || this.formatter).stringify(this);
+	        }
+	    });
+
+	    /**
+	     * Format namespace.
+	     */
+	    var C_format = C.format = {};
+
+	    /**
+	     * OpenSSL formatting strategy.
+	     */
+	    var OpenSSLFormatter = C_format.OpenSSL = {
+	        /**
+	         * Converts a cipher params object to an OpenSSL-compatible string.
+	         *
+	         * @param {CipherParams} cipherParams The cipher params object.
+	         *
+	         * @return {string} The OpenSSL-compatible string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+	         */
+	        stringify: function (cipherParams) {
+	            var wordArray;
+
+	            // Shortcuts
+	            var ciphertext = cipherParams.ciphertext;
+	            var salt = cipherParams.salt;
+
+	            // Format
+	            if (salt) {
+	                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+	            } else {
+	                wordArray = ciphertext;
+	            }
+
+	            return wordArray.toString(Base64);
+	        },
+
+	        /**
+	         * Converts an OpenSSL-compatible string to a cipher params object.
+	         *
+	         * @param {string} openSSLStr The OpenSSL-compatible string.
+	         *
+	         * @return {CipherParams} The cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+	         */
+	        parse: function (openSSLStr) {
+	            var salt;
+
+	            // Parse base64
+	            var ciphertext = Base64.parse(openSSLStr);
+
+	            // Shortcut
+	            var ciphertextWords = ciphertext.words;
+
+	            // Test for salt
+	            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+	                // Extract salt
+	                salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+	                // Remove salt from ciphertext
+	                ciphertextWords.splice(0, 4);
+	                ciphertext.sigBytes -= 16;
+	            }
+
+	            return CipherParams.create({ ciphertext: ciphertext, salt: salt });
+	        }
+	    };
+
+	    /**
+	     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+	     */
+	    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+	         */
+	        cfg: Base.extend({
+	            format: OpenSSLFormatter
+	        }),
+
+	        /**
+	         * Encrypts a message.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {WordArray|string} message The message to encrypt.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {CipherParams} A cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         */
+	        encrypt: function (cipher, message, key, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Encrypt
+	            var encryptor = cipher.createEncryptor(key, cfg);
+	            var ciphertext = encryptor.finalize(message);
+
+	            // Shortcut
+	            var cipherCfg = encryptor.cfg;
+
+	            // Create and return serializable cipher params
+	            return CipherParams.create({
+	                ciphertext: ciphertext,
+	                key: key,
+	                iv: cipherCfg.iv,
+	                algorithm: cipher,
+	                mode: cipherCfg.mode,
+	                padding: cipherCfg.padding,
+	                blockSize: cipher.blockSize,
+	                formatter: cfg.format
+	            });
+	        },
+
+	        /**
+	         * Decrypts serialized ciphertext.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {WordArray} The plaintext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         */
+	        decrypt: function (cipher, ciphertext, key, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Convert string to CipherParams
+	            ciphertext = this._parse(ciphertext, cfg.format);
+
+	            // Decrypt
+	            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+	            return plaintext;
+	        },
+
+	        /**
+	         * Converts serialized ciphertext to CipherParams,
+	         * else assumed CipherParams already and returns ciphertext unchanged.
+	         *
+	         * @param {CipherParams|string} ciphertext The ciphertext.
+	         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+	         *
+	         * @return {CipherParams} The unserialized ciphertext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+	         */
+	        _parse: function (ciphertext, format) {
+	            if (typeof ciphertext == 'string') {
+	                return format.parse(ciphertext, this);
+	            } else {
+	                return ciphertext;
+	            }
+	        }
+	    });
+
+	    /**
+	     * Key derivation function namespace.
+	     */
+	    var C_kdf = C.kdf = {};
+
+	    /**
+	     * OpenSSL key derivation function.
+	     */
+	    var OpenSSLKdf = C_kdf.OpenSSL = {
+	        /**
+	         * Derives a key and IV from a password.
+	         *
+	         * @param {string} password The password to derive from.
+	         * @param {number} keySize The size in words of the key to generate.
+	         * @param {number} ivSize The size in words of the IV to generate.
+	         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+	         *
+	         * @return {CipherParams} A cipher params object with the key, IV, and salt.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+	         */
+	        execute: function (password, keySize, ivSize, salt, hasher) {
+	            // Generate random salt
+	            if (!salt) {
+	                salt = WordArray.random(64/8);
+	            }
+
+	            // Derive key and IV
+	            if (!hasher) {
+	                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
+	            } else {
+	                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
+	            }
+
+
+	            // Separate key and IV
+	            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+	            key.sigBytes = keySize * 4;
+
+	            // Return params
+	            return CipherParams.create({ key: key, iv: iv, salt: salt });
+	        }
+	    };
+
+	    /**
+	     * A serializable cipher wrapper that derives the key from a password,
+	     * and returns ciphertext as a serializable cipher params object.
+	     */
+	    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+	         */
+	        cfg: SerializableCipher.cfg.extend({
+	            kdf: OpenSSLKdf
+	        }),
+
+	        /**
+	         * Encrypts a message using a password.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {WordArray|string} message The message to encrypt.
+	         * @param {string} password The password.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {CipherParams} A cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+	         */
+	        encrypt: function (cipher, message, password, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Derive key and other params
+	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);
+
+	            // Add IV to config
+	            cfg.iv = derivedParams.iv;
+
+	            // Encrypt
+	            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+	            // Mix in derived params
+	            ciphertext.mixIn(derivedParams);
+
+	            return ciphertext;
+	        },
+
+	        /**
+	         * Decrypts serialized ciphertext using a password.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+	         * @param {string} password The password.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {WordArray} The plaintext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+	         */
+	        decrypt: function (cipher, ciphertext, password, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Convert string to CipherParams
+	            ciphertext = this._parse(ciphertext, cfg.format);
+
+	            // Derive key and other params
+	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);
+
+	            // Add IV to config
+	            cfg.iv = derivedParams.iv;
+
+	            // Decrypt
+	            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+	            return plaintext;
+	        }
+	    });
+	}());
+
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./evpkdf":1734585677011}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677013, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Cipher Feedback block mode.
+	 */
+	CryptoJS.mode.CFB = (function () {
+	    var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    CFB.Encryptor = CFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher;
+	            var blockSize = cipher.blockSize;
+
+	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+	            // Remember this block to use with next block
+	            this._prevBlock = words.slice(offset, offset + blockSize);
+	        }
+	    });
+
+	    CFB.Decryptor = CFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher;
+	            var blockSize = cipher.blockSize;
+
+	            // Remember this block to use with next block
+	            var thisBlock = words.slice(offset, offset + blockSize);
+
+	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+	            // This block becomes the previous block
+	            this._prevBlock = thisBlock;
+	        }
+	    });
+
+	    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+	        var keystream;
+
+	        // Shortcut
+	        var iv = this._iv;
+
+	        // Generate keystream
+	        if (iv) {
+	            keystream = iv.slice(0);
+
+	            // Remove IV for subsequent blocks
+	            this._iv = undefined;
+	        } else {
+	            keystream = this._prevBlock;
+	        }
+	        cipher.encryptBlock(keystream, 0);
+
+	        // Encrypt
+	        for (var i = 0; i < blockSize; i++) {
+	            words[offset + i] ^= keystream[i];
+	        }
+	    }
+
+	    return CFB;
+	}());
+
+
+	return CryptoJS.mode.CFB;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677014, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Counter block mode.
+	 */
+	CryptoJS.mode.CTR = (function () {
+	    var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+	    var Encryptor = CTR.Encryptor = CTR.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var counter = this._counter;
+
+	            // Generate keystream
+	            if (iv) {
+	                counter = this._counter = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+	            var keystream = counter.slice(0);
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Increment counter
+	            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    CTR.Decryptor = Encryptor;
+
+	    return CTR;
+	}());
+
+
+	return CryptoJS.mode.CTR;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677015, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/** @preserve
+	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
+	 * derived from CryptoJS.mode.CTR
+	 * Jan Hruby jhruby.web@gmail.com
+	 */
+	CryptoJS.mode.CTRGladman = (function () {
+	    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+		function incWord(word)
+		{
+			if (((word >> 24) & 0xff) === 0xff) { //overflow
+			var b1 = (word >> 16)&0xff;
+			var b2 = (word >> 8)&0xff;
+			var b3 = word & 0xff;
+
+			if (b1 === 0xff) // overflow b1
+			{
+			b1 = 0;
+			if (b2 === 0xff)
+			{
+				b2 = 0;
+				if (b3 === 0xff)
+				{
+					b3 = 0;
+				}
+				else
+				{
+					++b3;
+				}
+			}
+			else
+			{
+				++b2;
+			}
+			}
+			else
+			{
+			++b1;
+			}
+
+			word = 0;
+			word += (b1 << 16);
+			word += (b2 << 8);
+			word += b3;
+			}
+			else
+			{
+			word += (0x01 << 24);
+			}
+			return word;
+		}
+
+		function incCounter(counter)
+		{
+			if ((counter[0] = incWord(counter[0])) === 0)
+			{
+				// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
+				counter[1] = incWord(counter[1]);
+			}
+			return counter;
+		}
+
+	    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var counter = this._counter;
+
+	            // Generate keystream
+	            if (iv) {
+	                counter = this._counter = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+
+				incCounter(counter);
+
+				var keystream = counter.slice(0);
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    CTRGladman.Decryptor = Encryptor;
+
+	    return CTRGladman;
+	}());
+
+
+
+
+	return CryptoJS.mode.CTRGladman;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677016, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Output Feedback block mode.
+	 */
+	CryptoJS.mode.OFB = (function () {
+	    var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    var Encryptor = OFB.Encryptor = OFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var keystream = this._keystream;
+
+	            // Generate keystream
+	            if (iv) {
+	                keystream = this._keystream = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    OFB.Decryptor = Encryptor;
+
+	    return OFB;
+	}());
+
+
+	return CryptoJS.mode.OFB;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677017, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Electronic Codebook block mode.
+	 */
+	CryptoJS.mode.ECB = (function () {
+	    var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    ECB.Encryptor = ECB.extend({
+	        processBlock: function (words, offset) {
+	            this._cipher.encryptBlock(words, offset);
+	        }
+	    });
+
+	    ECB.Decryptor = ECB.extend({
+	        processBlock: function (words, offset) {
+	            this._cipher.decryptBlock(words, offset);
+	        }
+	    });
+
+	    return ECB;
+	}());
+
+
+	return CryptoJS.mode.ECB;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677018, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * ANSI X.923 padding strategy.
+	 */
+	CryptoJS.pad.AnsiX923 = {
+	    pad: function (data, blockSize) {
+	        // Shortcuts
+	        var dataSigBytes = data.sigBytes;
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Count padding bytes
+	        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+	        // Compute last byte position
+	        var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+	        // Pad
+	        data.clamp();
+	        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+	        data.sigBytes += nPaddingBytes;
+	    },
+
+	    unpad: function (data) {
+	        // Get number of padding bytes from last byte
+	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	        // Remove padding
+	        data.sigBytes -= nPaddingBytes;
+	    }
+	};
+
+
+	return CryptoJS.pad.Ansix923;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677019, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * ISO 10126 padding strategy.
+	 */
+	CryptoJS.pad.Iso10126 = {
+	    pad: function (data, blockSize) {
+	        // Shortcut
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Count padding bytes
+	        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+	        // Pad
+	        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
+	             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+	    },
+
+	    unpad: function (data) {
+	        // Get number of padding bytes from last byte
+	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	        // Remove padding
+	        data.sigBytes -= nPaddingBytes;
+	    }
+	};
+
+
+	return CryptoJS.pad.Iso10126;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677020, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * ISO/IEC 9797-1 Padding Method 2.
+	 */
+	CryptoJS.pad.Iso97971 = {
+	    pad: function (data, blockSize) {
+	        // Add 0x80 byte
+	        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+	        // Zero pad the rest
+	        CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+	    },
+
+	    unpad: function (data) {
+	        // Remove zero padding
+	        CryptoJS.pad.ZeroPadding.unpad(data);
+
+	        // Remove one more byte -- the 0x80 byte
+	        data.sigBytes--;
+	    }
+	};
+
+
+	return CryptoJS.pad.Iso97971;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677021, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Zero padding strategy.
+	 */
+	CryptoJS.pad.ZeroPadding = {
+	    pad: function (data, blockSize) {
+	        // Shortcut
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Pad
+	        data.clamp();
+	        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+	    },
+
+	    unpad: function (data) {
+	        // Shortcut
+	        var dataWords = data.words;
+
+	        // Unpad
+	        var i = data.sigBytes - 1;
+	        for (var i = data.sigBytes - 1; i >= 0; i--) {
+	            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+	                data.sigBytes = i + 1;
+	                break;
+	            }
+	        }
+	    }
+	};
+
+
+	return CryptoJS.pad.ZeroPadding;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677022, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * A noop padding strategy.
+	 */
+	CryptoJS.pad.NoPadding = {
+	    pad: function () {
+	    },
+
+	    unpad: function () {
+	    }
+	};
+
+
+	return CryptoJS.pad.NoPadding;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677023, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var CipherParams = C_lib.CipherParams;
+	    var C_enc = C.enc;
+	    var Hex = C_enc.Hex;
+	    var C_format = C.format;
+
+	    var HexFormatter = C_format.Hex = {
+	        /**
+	         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+	         *
+	         * @param {CipherParams} cipherParams The cipher params object.
+	         *
+	         * @return {string} The hexadecimally encoded string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+	         */
+	        stringify: function (cipherParams) {
+	            return cipherParams.ciphertext.toString(Hex);
+	        },
+
+	        /**
+	         * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+	         *
+	         * @param {string} input The hexadecimally encoded string.
+	         *
+	         * @return {CipherParams} The cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
+	         */
+	        parse: function (input) {
+	            var ciphertext = Hex.parse(input);
+	            return CipherParams.create({ ciphertext: ciphertext });
+	        }
+	    };
+	}());
+
+
+	return CryptoJS.format.Hex;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677024, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Lookup tables
+	    var SBOX = [];
+	    var INV_SBOX = [];
+	    var SUB_MIX_0 = [];
+	    var SUB_MIX_1 = [];
+	    var SUB_MIX_2 = [];
+	    var SUB_MIX_3 = [];
+	    var INV_SUB_MIX_0 = [];
+	    var INV_SUB_MIX_1 = [];
+	    var INV_SUB_MIX_2 = [];
+	    var INV_SUB_MIX_3 = [];
+
+	    // Compute lookup tables
+	    (function () {
+	        // Compute double table
+	        var d = [];
+	        for (var i = 0; i < 256; i++) {
+	            if (i < 128) {
+	                d[i] = i << 1;
+	            } else {
+	                d[i] = (i << 1) ^ 0x11b;
+	            }
+	        }
+
+	        // Walk GF(2^8)
+	        var x = 0;
+	        var xi = 0;
+	        for (var i = 0; i < 256; i++) {
+	            // Compute sbox
+	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+	            SBOX[x] = sx;
+	            INV_SBOX[sx] = x;
+
+	            // Compute multiplication
+	            var x2 = d[x];
+	            var x4 = d[x2];
+	            var x8 = d[x4];
+
+	            // Compute sub bytes, mix columns tables
+	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
+	            SUB_MIX_3[x] = t;
+
+	            // Compute inv sub bytes, inv mix columns tables
+	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
+	            INV_SUB_MIX_3[sx] = t;
+
+	            // Compute next counter
+	            if (!x) {
+	                x = xi = 1;
+	            } else {
+	                x = x2 ^ d[d[d[x8 ^ x2]]];
+	                xi ^= d[d[xi]];
+	            }
+	        }
+	    }());
+
+	    // Precomputed Rcon lookup
+	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+	    /**
+	     * AES block cipher algorithm.
+	     */
+	    var AES = C_algo.AES = BlockCipher.extend({
+	        _doReset: function () {
+	            var t;
+
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._nRounds && this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            // Compute number of rounds
+	            var nRounds = this._nRounds = keySize + 6;
+
+	            // Compute number of key schedule rows
+	            var ksRows = (nRounds + 1) * 4;
+
+	            // Compute key schedule
+	            var keySchedule = this._keySchedule = [];
+	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+	                if (ksRow < keySize) {
+	                    keySchedule[ksRow] = keyWords[ksRow];
+	                } else {
+	                    t = keySchedule[ksRow - 1];
+
+	                    if (!(ksRow % keySize)) {
+	                        // Rot word
+	                        t = (t << 8) | (t >>> 24);
+
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+	                        // Mix Rcon
+	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
+	                    } else if (keySize > 6 && ksRow % keySize == 4) {
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+	                    }
+
+	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+	                }
+	            }
+
+	            // Compute inv key schedule
+	            var invKeySchedule = this._invKeySchedule = [];
+	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+	                var ksRow = ksRows - invKsRow;
+
+	                if (invKsRow % 4) {
+	                    var t = keySchedule[ksRow];
+	                } else {
+	                    var t = keySchedule[ksRow - 4];
+	                }
+
+	                if (invKsRow < 4 || ksRow <= 4) {
+	                    invKeySchedule[invKsRow] = t;
+	                } else {
+	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+	                }
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            // Swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+
+	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+	            // Inv swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+	        },
+
+	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+	            // Shortcut
+	            var nRounds = this._nRounds;
+
+	            // Get input, add round key
+	            var s0 = M[offset]     ^ keySchedule[0];
+	            var s1 = M[offset + 1] ^ keySchedule[1];
+	            var s2 = M[offset + 2] ^ keySchedule[2];
+	            var s3 = M[offset + 3] ^ keySchedule[3];
+
+	            // Key schedule row counter
+	            var ksRow = 4;
+
+	            // Rounds
+	            for (var round = 1; round < nRounds; round++) {
+	                // Shift rows, sub bytes, mix columns, add round key
+	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+	                // Update state
+	                s0 = t0;
+	                s1 = t1;
+	                s2 = t2;
+	                s3 = t3;
+	            }
+
+	            // Shift rows, sub bytes, add round key
+	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+	            // Set output
+	            M[offset]     = t0;
+	            M[offset + 1] = t1;
+	            M[offset + 2] = t2;
+	            M[offset + 3] = t3;
+	        },
+
+	        keySize: 256/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.AES = BlockCipher._createHelper(AES);
+	}());
+
+
+	return CryptoJS.AES;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677025, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Permuted Choice 1 constants
+	    var PC1 = [
+	        57, 49, 41, 33, 25, 17, 9,  1,
+	        58, 50, 42, 34, 26, 18, 10, 2,
+	        59, 51, 43, 35, 27, 19, 11, 3,
+	        60, 52, 44, 36, 63, 55, 47, 39,
+	        31, 23, 15, 7,  62, 54, 46, 38,
+	        30, 22, 14, 6,  61, 53, 45, 37,
+	        29, 21, 13, 5,  28, 20, 12, 4
+	    ];
+
+	    // Permuted Choice 2 constants
+	    var PC2 = [
+	        14, 17, 11, 24, 1,  5,
+	        3,  28, 15, 6,  21, 10,
+	        23, 19, 12, 4,  26, 8,
+	        16, 7,  27, 20, 13, 2,
+	        41, 52, 31, 37, 47, 55,
+	        30, 40, 51, 45, 33, 48,
+	        44, 49, 39, 56, 34, 53,
+	        46, 42, 50, 36, 29, 32
+	    ];
+
+	    // Cumulative bit shift constants
+	    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+	    // SBOXes and round permutation constants
+	    var SBOX_P = [
+	        {
+	            0x0: 0x808200,
+	            0x10000000: 0x8000,
+	            0x20000000: 0x808002,
+	            0x30000000: 0x2,
+	            0x40000000: 0x200,
+	            0x50000000: 0x808202,
+	            0x60000000: 0x800202,
+	            0x70000000: 0x800000,
+	            0x80000000: 0x202,
+	            0x90000000: 0x800200,
+	            0xa0000000: 0x8200,
+	            0xb0000000: 0x808000,
+	            0xc0000000: 0x8002,
+	            0xd0000000: 0x800002,
+	            0xe0000000: 0x0,
+	            0xf0000000: 0x8202,
+	            0x8000000: 0x0,
+	            0x18000000: 0x808202,
+	            0x28000000: 0x8202,
+	            0x38000000: 0x8000,
+	            0x48000000: 0x808200,
+	            0x58000000: 0x200,
+	            0x68000000: 0x808002,
+	            0x78000000: 0x2,
+	            0x88000000: 0x800200,
+	            0x98000000: 0x8200,
+	            0xa8000000: 0x808000,
+	            0xb8000000: 0x800202,
+	            0xc8000000: 0x800002,
+	            0xd8000000: 0x8002,
+	            0xe8000000: 0x202,
+	            0xf8000000: 0x800000,
+	            0x1: 0x8000,
+	            0x10000001: 0x2,
+	            0x20000001: 0x808200,
+	            0x30000001: 0x800000,
+	            0x40000001: 0x808002,
+	            0x50000001: 0x8200,
+	            0x60000001: 0x200,
+	            0x70000001: 0x800202,
+	            0x80000001: 0x808202,
+	            0x90000001: 0x808000,
+	            0xa0000001: 0x800002,
+	            0xb0000001: 0x8202,
+	            0xc0000001: 0x202,
+	            0xd0000001: 0x800200,
+	            0xe0000001: 0x8002,
+	            0xf0000001: 0x0,
+	            0x8000001: 0x808202,
+	            0x18000001: 0x808000,
+	            0x28000001: 0x800000,
+	            0x38000001: 0x200,
+	            0x48000001: 0x8000,
+	            0x58000001: 0x800002,
+	            0x68000001: 0x2,
+	            0x78000001: 0x8202,
+	            0x88000001: 0x8002,
+	            0x98000001: 0x800202,
+	            0xa8000001: 0x202,
+	            0xb8000001: 0x808200,
+	            0xc8000001: 0x800200,
+	            0xd8000001: 0x0,
+	            0xe8000001: 0x8200,
+	            0xf8000001: 0x808002
+	        },
+	        {
+	            0x0: 0x40084010,
+	            0x1000000: 0x4000,
+	            0x2000000: 0x80000,
+	            0x3000000: 0x40080010,
+	            0x4000000: 0x40000010,
+	            0x5000000: 0x40084000,
+	            0x6000000: 0x40004000,
+	            0x7000000: 0x10,
+	            0x8000000: 0x84000,
+	            0x9000000: 0x40004010,
+	            0xa000000: 0x40000000,
+	            0xb000000: 0x84010,
+	            0xc000000: 0x80010,
+	            0xd000000: 0x0,
+	            0xe000000: 0x4010,
+	            0xf000000: 0x40080000,
+	            0x800000: 0x40004000,
+	            0x1800000: 0x84010,
+	            0x2800000: 0x10,
+	            0x3800000: 0x40004010,
+	            0x4800000: 0x40084010,
+	            0x5800000: 0x40000000,
+	            0x6800000: 0x80000,
+	            0x7800000: 0x40080010,
+	            0x8800000: 0x80010,
+	            0x9800000: 0x0,
+	            0xa800000: 0x4000,
+	            0xb800000: 0x40080000,
+	            0xc800000: 0x40000010,
+	            0xd800000: 0x84000,
+	            0xe800000: 0x40084000,
+	            0xf800000: 0x4010,
+	            0x10000000: 0x0,
+	            0x11000000: 0x40080010,
+	            0x12000000: 0x40004010,
+	            0x13000000: 0x40084000,
+	            0x14000000: 0x40080000,
+	            0x15000000: 0x10,
+	            0x16000000: 0x84010,
+	            0x17000000: 0x4000,
+	            0x18000000: 0x4010,
+	            0x19000000: 0x80000,
+	            0x1a000000: 0x80010,
+	            0x1b000000: 0x40000010,
+	            0x1c000000: 0x84000,
+	            0x1d000000: 0x40004000,
+	            0x1e000000: 0x40000000,
+	            0x1f000000: 0x40084010,
+	            0x10800000: 0x84010,
+	            0x11800000: 0x80000,
+	            0x12800000: 0x40080000,
+	            0x13800000: 0x4000,
+	            0x14800000: 0x40004000,
+	            0x15800000: 0x40084010,
+	            0x16800000: 0x10,
+	            0x17800000: 0x40000000,
+	            0x18800000: 0x40084000,
+	            0x19800000: 0x40000010,
+	            0x1a800000: 0x40004010,
+	            0x1b800000: 0x80010,
+	            0x1c800000: 0x0,
+	            0x1d800000: 0x4010,
+	            0x1e800000: 0x40080010,
+	            0x1f800000: 0x84000
+	        },
+	        {
+	            0x0: 0x104,
+	            0x100000: 0x0,
+	            0x200000: 0x4000100,
+	            0x300000: 0x10104,
+	            0x400000: 0x10004,
+	            0x500000: 0x4000004,
+	            0x600000: 0x4010104,
+	            0x700000: 0x4010000,
+	            0x800000: 0x4000000,
+	            0x900000: 0x4010100,
+	            0xa00000: 0x10100,
+	            0xb00000: 0x4010004,
+	            0xc00000: 0x4000104,
+	            0xd00000: 0x10000,
+	            0xe00000: 0x4,
+	            0xf00000: 0x100,
+	            0x80000: 0x4010100,
+	            0x180000: 0x4010004,
+	            0x280000: 0x0,
+	            0x380000: 0x4000100,
+	            0x480000: 0x4000004,
+	            0x580000: 0x10000,
+	            0x680000: 0x10004,
+	            0x780000: 0x104,
+	            0x880000: 0x4,
+	            0x980000: 0x100,
+	            0xa80000: 0x4010000,
+	            0xb80000: 0x10104,
+	            0xc80000: 0x10100,
+	            0xd80000: 0x4000104,
+	            0xe80000: 0x4010104,
+	            0xf80000: 0x4000000,
+	            0x1000000: 0x4010100,
+	            0x1100000: 0x10004,
+	            0x1200000: 0x10000,
+	            0x1300000: 0x4000100,
+	            0x1400000: 0x100,
+	            0x1500000: 0x4010104,
+	            0x1600000: 0x4000004,
+	            0x1700000: 0x0,
+	            0x1800000: 0x4000104,
+	            0x1900000: 0x4000000,
+	            0x1a00000: 0x4,
+	            0x1b00000: 0x10100,
+	            0x1c00000: 0x4010000,
+	            0x1d00000: 0x104,
+	            0x1e00000: 0x10104,
+	            0x1f00000: 0x4010004,
+	            0x1080000: 0x4000000,
+	            0x1180000: 0x104,
+	            0x1280000: 0x4010100,
+	            0x1380000: 0x0,
+	            0x1480000: 0x10004,
+	            0x1580000: 0x4000100,
+	            0x1680000: 0x100,
+	            0x1780000: 0x4010004,
+	            0x1880000: 0x10000,
+	            0x1980000: 0x4010104,
+	            0x1a80000: 0x10104,
+	            0x1b80000: 0x4000004,
+	            0x1c80000: 0x4000104,
+	            0x1d80000: 0x4010000,
+	            0x1e80000: 0x4,
+	            0x1f80000: 0x10100
+	        },
+	        {
+	            0x0: 0x80401000,
+	            0x10000: 0x80001040,
+	            0x20000: 0x401040,
+	            0x30000: 0x80400000,
+	            0x40000: 0x0,
+	            0x50000: 0x401000,
+	            0x60000: 0x80000040,
+	            0x70000: 0x400040,
+	            0x80000: 0x80000000,
+	            0x90000: 0x400000,
+	            0xa0000: 0x40,
+	            0xb0000: 0x80001000,
+	            0xc0000: 0x80400040,
+	            0xd0000: 0x1040,
+	            0xe0000: 0x1000,
+	            0xf0000: 0x80401040,
+	            0x8000: 0x80001040,
+	            0x18000: 0x40,
+	            0x28000: 0x80400040,
+	            0x38000: 0x80001000,
+	            0x48000: 0x401000,
+	            0x58000: 0x80401040,
+	            0x68000: 0x0,
+	            0x78000: 0x80400000,
+	            0x88000: 0x1000,
+	            0x98000: 0x80401000,
+	            0xa8000: 0x400000,
+	            0xb8000: 0x1040,
+	            0xc8000: 0x80000000,
+	            0xd8000: 0x400040,
+	            0xe8000: 0x401040,
+	            0xf8000: 0x80000040,
+	            0x100000: 0x400040,
+	            0x110000: 0x401000,
+	            0x120000: 0x80000040,
+	            0x130000: 0x0,
+	            0x140000: 0x1040,
+	            0x150000: 0x80400040,
+	            0x160000: 0x80401000,
+	            0x170000: 0x80001040,
+	            0x180000: 0x80401040,
+	            0x190000: 0x80000000,
+	            0x1a0000: 0x80400000,
+	            0x1b0000: 0x401040,
+	            0x1c0000: 0x80001000,
+	            0x1d0000: 0x400000,
+	            0x1e0000: 0x40,
+	            0x1f0000: 0x1000,
+	            0x108000: 0x80400000,
+	            0x118000: 0x80401040,
+	            0x128000: 0x0,
+	            0x138000: 0x401000,
+	            0x148000: 0x400040,
+	            0x158000: 0x80000000,
+	            0x168000: 0x80001040,
+	            0x178000: 0x40,
+	            0x188000: 0x80000040,
+	            0x198000: 0x1000,
+	            0x1a8000: 0x80001000,
+	            0x1b8000: 0x80400040,
+	            0x1c8000: 0x1040,
+	            0x1d8000: 0x80401000,
+	            0x1e8000: 0x400000,
+	            0x1f8000: 0x401040
+	        },
+	        {
+	            0x0: 0x80,
+	            0x1000: 0x1040000,
+	            0x2000: 0x40000,
+	            0x3000: 0x20000000,
+	            0x4000: 0x20040080,
+	            0x5000: 0x1000080,
+	            0x6000: 0x21000080,
+	            0x7000: 0x40080,
+	            0x8000: 0x1000000,
+	            0x9000: 0x20040000,
+	            0xa000: 0x20000080,
+	            0xb000: 0x21040080,
+	            0xc000: 0x21040000,
+	            0xd000: 0x0,
+	            0xe000: 0x1040080,
+	            0xf000: 0x21000000,
+	            0x800: 0x1040080,
+	            0x1800: 0x21000080,
+	            0x2800: 0x80,
+	            0x3800: 0x1040000,
+	            0x4800: 0x40000,
+	            0x5800: 0x20040080,
+	            0x6800: 0x21040000,
+	            0x7800: 0x20000000,
+	            0x8800: 0x20040000,
+	            0x9800: 0x0,
+	            0xa800: 0x21040080,
+	            0xb800: 0x1000080,
+	            0xc800: 0x20000080,
+	            0xd800: 0x21000000,
+	            0xe800: 0x1000000,
+	            0xf800: 0x40080,
+	            0x10000: 0x40000,
+	            0x11000: 0x80,
+	            0x12000: 0x20000000,
+	            0x13000: 0x21000080,
+	            0x14000: 0x1000080,
+	            0x15000: 0x21040000,
+	            0x16000: 0x20040080,
+	            0x17000: 0x1000000,
+	            0x18000: 0x21040080,
+	            0x19000: 0x21000000,
+	            0x1a000: 0x1040000,
+	            0x1b000: 0x20040000,
+	            0x1c000: 0x40080,
+	            0x1d000: 0x20000080,
+	            0x1e000: 0x0,
+	            0x1f000: 0x1040080,
+	            0x10800: 0x21000080,
+	            0x11800: 0x1000000,
+	            0x12800: 0x1040000,
+	            0x13800: 0x20040080,
+	            0x14800: 0x20000000,
+	            0x15800: 0x1040080,
+	            0x16800: 0x80,
+	            0x17800: 0x21040000,
+	            0x18800: 0x40080,
+	            0x19800: 0x21040080,
+	            0x1a800: 0x0,
+	            0x1b800: 0x21000000,
+	            0x1c800: 0x1000080,
+	            0x1d800: 0x40000,
+	            0x1e800: 0x20040000,
+	            0x1f800: 0x20000080
+	        },
+	        {
+	            0x0: 0x10000008,
+	            0x100: 0x2000,
+	            0x200: 0x10200000,
+	            0x300: 0x10202008,
+	            0x400: 0x10002000,
+	            0x500: 0x200000,
+	            0x600: 0x200008,
+	            0x700: 0x10000000,
+	            0x800: 0x0,
+	            0x900: 0x10002008,
+	            0xa00: 0x202000,
+	            0xb00: 0x8,
+	            0xc00: 0x10200008,
+	            0xd00: 0x202008,
+	            0xe00: 0x2008,
+	            0xf00: 0x10202000,
+	            0x80: 0x10200000,
+	            0x180: 0x10202008,
+	            0x280: 0x8,
+	            0x380: 0x200000,
+	            0x480: 0x202008,
+	            0x580: 0x10000008,
+	            0x680: 0x10002000,
+	            0x780: 0x2008,
+	            0x880: 0x200008,
+	            0x980: 0x2000,
+	            0xa80: 0x10002008,
+	            0xb80: 0x10200008,
+	            0xc80: 0x0,
+	            0xd80: 0x10202000,
+	            0xe80: 0x202000,
+	            0xf80: 0x10000000,
+	            0x1000: 0x10002000,
+	            0x1100: 0x10200008,
+	            0x1200: 0x10202008,
+	            0x1300: 0x2008,
+	            0x1400: 0x200000,
+	            0x1500: 0x10000000,
+	            0x1600: 0x10000008,
+	            0x1700: 0x202000,
+	            0x1800: 0x202008,
+	            0x1900: 0x0,
+	            0x1a00: 0x8,
+	            0x1b00: 0x10200000,
+	            0x1c00: 0x2000,
+	            0x1d00: 0x10002008,
+	            0x1e00: 0x10202000,
+	            0x1f00: 0x200008,
+	            0x1080: 0x8,
+	            0x1180: 0x202000,
+	            0x1280: 0x200000,
+	            0x1380: 0x10000008,
+	            0x1480: 0x10002000,
+	            0x1580: 0x2008,
+	            0x1680: 0x10202008,
+	            0x1780: 0x10200000,
+	            0x1880: 0x10202000,
+	            0x1980: 0x10200008,
+	            0x1a80: 0x2000,
+	            0x1b80: 0x202008,
+	            0x1c80: 0x200008,
+	            0x1d80: 0x0,
+	            0x1e80: 0x10000000,
+	            0x1f80: 0x10002008
+	        },
+	        {
+	            0x0: 0x100000,
+	            0x10: 0x2000401,
+	            0x20: 0x400,
+	            0x30: 0x100401,
+	            0x40: 0x2100401,
+	            0x50: 0x0,
+	            0x60: 0x1,
+	            0x70: 0x2100001,
+	            0x80: 0x2000400,
+	            0x90: 0x100001,
+	            0xa0: 0x2000001,
+	            0xb0: 0x2100400,
+	            0xc0: 0x2100000,
+	            0xd0: 0x401,
+	            0xe0: 0x100400,
+	            0xf0: 0x2000000,
+	            0x8: 0x2100001,
+	            0x18: 0x0,
+	            0x28: 0x2000401,
+	            0x38: 0x2100400,
+	            0x48: 0x100000,
+	            0x58: 0x2000001,
+	            0x68: 0x2000000,
+	            0x78: 0x401,
+	            0x88: 0x100401,
+	            0x98: 0x2000400,
+	            0xa8: 0x2100000,
+	            0xb8: 0x100001,
+	            0xc8: 0x400,
+	            0xd8: 0x2100401,
+	            0xe8: 0x1,
+	            0xf8: 0x100400,
+	            0x100: 0x2000000,
+	            0x110: 0x100000,
+	            0x120: 0x2000401,
+	            0x130: 0x2100001,
+	            0x140: 0x100001,
+	            0x150: 0x2000400,
+	            0x160: 0x2100400,
+	            0x170: 0x100401,
+	            0x180: 0x401,
+	            0x190: 0x2100401,
+	            0x1a0: 0x100400,
+	            0x1b0: 0x1,
+	            0x1c0: 0x0,
+	            0x1d0: 0x2100000,
+	            0x1e0: 0x2000001,
+	            0x1f0: 0x400,
+	            0x108: 0x100400,
+	            0x118: 0x2000401,
+	            0x128: 0x2100001,
+	            0x138: 0x1,
+	            0x148: 0x2000000,
+	            0x158: 0x100000,
+	            0x168: 0x401,
+	            0x178: 0x2100400,
+	            0x188: 0x2000001,
+	            0x198: 0x2100000,
+	            0x1a8: 0x0,
+	            0x1b8: 0x2100401,
+	            0x1c8: 0x100401,
+	            0x1d8: 0x400,
+	            0x1e8: 0x2000400,
+	            0x1f8: 0x100001
+	        },
+	        {
+	            0x0: 0x8000820,
+	            0x1: 0x20000,
+	            0x2: 0x8000000,
+	            0x3: 0x20,
+	            0x4: 0x20020,
+	            0x5: 0x8020820,
+	            0x6: 0x8020800,
+	            0x7: 0x800,
+	            0x8: 0x8020000,
+	            0x9: 0x8000800,
+	            0xa: 0x20800,
+	            0xb: 0x8020020,
+	            0xc: 0x820,
+	            0xd: 0x0,
+	            0xe: 0x8000020,
+	            0xf: 0x20820,
+	            0x80000000: 0x800,
+	            0x80000001: 0x8020820,
+	            0x80000002: 0x8000820,
+	            0x80000003: 0x8000000,
+	            0x80000004: 0x8020000,
+	            0x80000005: 0x20800,
+	            0x80000006: 0x20820,
+	            0x80000007: 0x20,
+	            0x80000008: 0x8000020,
+	            0x80000009: 0x820,
+	            0x8000000a: 0x20020,
+	            0x8000000b: 0x8020800,
+	            0x8000000c: 0x0,
+	            0x8000000d: 0x8020020,
+	            0x8000000e: 0x8000800,
+	            0x8000000f: 0x20000,
+	            0x10: 0x20820,
+	            0x11: 0x8020800,
+	            0x12: 0x20,
+	            0x13: 0x800,
+	            0x14: 0x8000800,
+	            0x15: 0x8000020,
+	            0x16: 0x8020020,
+	            0x17: 0x20000,
+	            0x18: 0x0,
+	            0x19: 0x20020,
+	            0x1a: 0x8020000,
+	            0x1b: 0x8000820,
+	            0x1c: 0x8020820,
+	            0x1d: 0x20800,
+	            0x1e: 0x820,
+	            0x1f: 0x8000000,
+	            0x80000010: 0x20000,
+	            0x80000011: 0x800,
+	            0x80000012: 0x8020020,
+	            0x80000013: 0x20820,
+	            0x80000014: 0x20,
+	            0x80000015: 0x8020000,
+	            0x80000016: 0x8000000,
+	            0x80000017: 0x8000820,
+	            0x80000018: 0x8020820,
+	            0x80000019: 0x8000020,
+	            0x8000001a: 0x8000800,
+	            0x8000001b: 0x0,
+	            0x8000001c: 0x20800,
+	            0x8000001d: 0x820,
+	            0x8000001e: 0x20020,
+	            0x8000001f: 0x8020800
+	        }
+	    ];
+
+	    // Masks that select the SBOX input
+	    var SBOX_MASK = [
+	        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+	        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+	    ];
+
+	    /**
+	     * DES block cipher algorithm.
+	     */
+	    var DES = C_algo.DES = BlockCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+
+	            // Select 56 bits according to PC1
+	            var keyBits = [];
+	            for (var i = 0; i < 56; i++) {
+	                var keyBitPos = PC1[i] - 1;
+	                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+	            }
+
+	            // Assemble 16 subkeys
+	            var subKeys = this._subKeys = [];
+	            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+	                // Create subkey
+	                var subKey = subKeys[nSubKey] = [];
+
+	                // Shortcut
+	                var bitShift = BIT_SHIFTS[nSubKey];
+
+	                // Select 48 bits according to PC2
+	                for (var i = 0; i < 24; i++) {
+	                    // Select from the left 28 key bits
+	                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+	                    // Select from the right 28 key bits
+	                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+	                }
+
+	                // Since each subkey is applied to an expanded 32-bit input,
+	                // the subkey can be broken into 8 values scaled to 32-bits,
+	                // which allows the key to be used without expansion
+	                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+	                for (var i = 1; i < 7; i++) {
+	                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+	                }
+	                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+	            }
+
+	            // Compute inverse subkeys
+	            var invSubKeys = this._invSubKeys = [];
+	            for (var i = 0; i < 16; i++) {
+	                invSubKeys[i] = subKeys[15 - i];
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._subKeys);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._invSubKeys);
+	        },
+
+	        _doCryptBlock: function (M, offset, subKeys) {
+	            // Get input
+	            this._lBlock = M[offset];
+	            this._rBlock = M[offset + 1];
+
+	            // Initial permutation
+	            exchangeLR.call(this, 4,  0x0f0f0f0f);
+	            exchangeLR.call(this, 16, 0x0000ffff);
+	            exchangeRL.call(this, 2,  0x33333333);
+	            exchangeRL.call(this, 8,  0x00ff00ff);
+	            exchangeLR.call(this, 1,  0x55555555);
+
+	            // Rounds
+	            for (var round = 0; round < 16; round++) {
+	                // Shortcuts
+	                var subKey = subKeys[round];
+	                var lBlock = this._lBlock;
+	                var rBlock = this._rBlock;
+
+	                // Feistel function
+	                var f = 0;
+	                for (var i = 0; i < 8; i++) {
+	                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+	                }
+	                this._lBlock = rBlock;
+	                this._rBlock = lBlock ^ f;
+	            }
+
+	            // Undo swap from last round
+	            var t = this._lBlock;
+	            this._lBlock = this._rBlock;
+	            this._rBlock = t;
+
+	            // Final permutation
+	            exchangeLR.call(this, 1,  0x55555555);
+	            exchangeRL.call(this, 8,  0x00ff00ff);
+	            exchangeRL.call(this, 2,  0x33333333);
+	            exchangeLR.call(this, 16, 0x0000ffff);
+	            exchangeLR.call(this, 4,  0x0f0f0f0f);
+
+	            // Set output
+	            M[offset] = this._lBlock;
+	            M[offset + 1] = this._rBlock;
+	        },
+
+	        keySize: 64/32,
+
+	        ivSize: 64/32,
+
+	        blockSize: 64/32
+	    });
+
+	    // Swap bits across the left and right words
+	    function exchangeLR(offset, mask) {
+	        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+	        this._rBlock ^= t;
+	        this._lBlock ^= t << offset;
+	    }
+
+	    function exchangeRL(offset, mask) {
+	        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+	        this._lBlock ^= t;
+	        this._rBlock ^= t << offset;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.DES = BlockCipher._createHelper(DES);
+
+	    /**
+	     * Triple-DES block cipher algorithm.
+	     */
+	    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+	            // Make sure the key length is valid (64, 128 or >= 192 bit)
+	            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+	                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+	            }
+
+	            // Extend the key according to the keying options defined in 3DES standard
+	            var key1 = keyWords.slice(0, 2);
+	            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+	            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+	            // Create DES instances
+	            this._des1 = DES.createEncryptor(WordArray.create(key1));
+	            this._des2 = DES.createEncryptor(WordArray.create(key2));
+	            this._des3 = DES.createEncryptor(WordArray.create(key3));
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._des1.encryptBlock(M, offset);
+	            this._des2.decryptBlock(M, offset);
+	            this._des3.encryptBlock(M, offset);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            this._des3.decryptBlock(M, offset);
+	            this._des2.encryptBlock(M, offset);
+	            this._des1.decryptBlock(M, offset);
+	        },
+
+	        keySize: 192/32,
+
+	        ivSize: 64/32,
+
+	        blockSize: 64/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.TripleDES = BlockCipher._createHelper(TripleDES);
+	}());
+
+
+	return CryptoJS.TripleDES;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677026, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    /**
+	     * RC4 stream cipher algorithm.
+	     */
+	    var RC4 = C_algo.RC4 = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+	            var keySigBytes = key.sigBytes;
+
+	            // Init sbox
+	            var S = this._S = [];
+	            for (var i = 0; i < 256; i++) {
+	                S[i] = i;
+	            }
+
+	            // Key setup
+	            for (var i = 0, j = 0; i < 256; i++) {
+	                var keyByteIndex = i % keySigBytes;
+	                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+	                j = (j + S[i] + keyByte) % 256;
+
+	                // Swap
+	                var t = S[i];
+	                S[i] = S[j];
+	                S[j] = t;
+	            }
+
+	            // Counters
+	            this._i = this._j = 0;
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            M[offset] ^= generateKeystreamWord.call(this);
+	        },
+
+	        keySize: 256/32,
+
+	        ivSize: 0
+	    });
+
+	    function generateKeystreamWord() {
+	        // Shortcuts
+	        var S = this._S;
+	        var i = this._i;
+	        var j = this._j;
+
+	        // Generate keystream word
+	        var keystreamWord = 0;
+	        for (var n = 0; n < 4; n++) {
+	            i = (i + 1) % 256;
+	            j = (j + S[i]) % 256;
+
+	            // Swap
+	            var t = S[i];
+	            S[i] = S[j];
+	            S[j] = t;
+
+	            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+	        }
+
+	        // Update counters
+	        this._i = i;
+	        this._j = j;
+
+	        return keystreamWord;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RC4 = StreamCipher._createHelper(RC4);
+
+	    /**
+	     * Modified RC4 stream cipher algorithm.
+	     */
+	    var RC4Drop = C_algo.RC4Drop = RC4.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} drop The number of keystream words to drop. Default 192
+	         */
+	        cfg: RC4.cfg.extend({
+	            drop: 192
+	        }),
+
+	        _doReset: function () {
+	            RC4._doReset.call(this);
+
+	            // Drop
+	            for (var i = this.cfg.drop; i > 0; i--) {
+	                generateKeystreamWord.call(this);
+	            }
+	        }
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+	}());
+
+
+	return CryptoJS.RC4;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677027, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    // Reusable objects
+	    var S  = [];
+	    var C_ = [];
+	    var G  = [];
+
+	    /**
+	     * Rabbit stream cipher algorithm
+	     */
+	    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var K = this._key.words;
+	            var iv = this.cfg.iv;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
+	                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Generate initial state values
+	            var X = this._X = [
+	                K[0], (K[3] << 16) | (K[2] >>> 16),
+	                K[1], (K[0] << 16) | (K[3] >>> 16),
+	                K[2], (K[1] << 16) | (K[0] >>> 16),
+	                K[3], (K[2] << 16) | (K[1] >>> 16)
+	            ];
+
+	            // Generate initial counter values
+	            var C = this._C = [
+	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+	            ];
+
+	            // Carry bit
+	            this._b = 0;
+
+	            // Iterate the system four times
+	            for (var i = 0; i < 4; i++) {
+	                nextState.call(this);
+	            }
+
+	            // Modify the counters
+	            for (var i = 0; i < 8; i++) {
+	                C[i] ^= X[(i + 4) & 7];
+	            }
+
+	            // IV setup
+	            if (iv) {
+	                // Shortcuts
+	                var IV = iv.words;
+	                var IV_0 = IV[0];
+	                var IV_1 = IV[1];
+
+	                // Generate four subvectors
+	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+
+	                // Modify counter values
+	                C[0] ^= i0;
+	                C[1] ^= i1;
+	                C[2] ^= i2;
+	                C[3] ^= i3;
+	                C[4] ^= i0;
+	                C[5] ^= i1;
+	                C[6] ^= i2;
+	                C[7] ^= i3;
+
+	                // Iterate the system four times
+	                for (var i = 0; i < 4; i++) {
+	                    nextState.call(this);
+	                }
+	            }
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var X = this._X;
+
+	            // Iterate the system
+	            nextState.call(this);
+
+	            // Generate four keystream words
+	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+	            for (var i = 0; i < 4; i++) {
+	                // Swap endian
+	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
+	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+
+	                // Encrypt
+	                M[offset + i] ^= S[i];
+	            }
+	        },
+
+	        blockSize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    function nextState() {
+	        // Shortcuts
+	        var X = this._X;
+	        var C = this._C;
+
+	        // Save old counter values
+	        for (var i = 0; i < 8; i++) {
+	            C_[i] = C[i];
+	        }
+
+	        // Calculate new counter values
+	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+	        // Calculate the g-values
+	        for (var i = 0; i < 8; i++) {
+	            var gx = X[i] + C[i];
+
+	            // Construct high and low argument for squaring
+	            var ga = gx & 0xffff;
+	            var gb = gx >>> 16;
+
+	            // Calculate high and low result of squaring
+	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+	            // High XOR low
+	            G[i] = gh ^ gl;
+	        }
+
+	        // Calculate new state values
+	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
+	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
+	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
+	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+	     */
+	    C.Rabbit = StreamCipher._createHelper(Rabbit);
+	}());
+
+
+	return CryptoJS.Rabbit;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677028, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    // Reusable objects
+	    var S  = [];
+	    var C_ = [];
+	    var G  = [];
+
+	    /**
+	     * Rabbit stream cipher algorithm.
+	     *
+	     * This is a legacy version that neglected to convert the key to little-endian.
+	     * This error doesn't affect the cipher's security,
+	     * but it does affect its compatibility with other implementations.
+	     */
+	    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var K = this._key.words;
+	            var iv = this.cfg.iv;
+
+	            // Generate initial state values
+	            var X = this._X = [
+	                K[0], (K[3] << 16) | (K[2] >>> 16),
+	                K[1], (K[0] << 16) | (K[3] >>> 16),
+	                K[2], (K[1] << 16) | (K[0] >>> 16),
+	                K[3], (K[2] << 16) | (K[1] >>> 16)
+	            ];
+
+	            // Generate initial counter values
+	            var C = this._C = [
+	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+	            ];
+
+	            // Carry bit
+	            this._b = 0;
+
+	            // Iterate the system four times
+	            for (var i = 0; i < 4; i++) {
+	                nextState.call(this);
+	            }
+
+	            // Modify the counters
+	            for (var i = 0; i < 8; i++) {
+	                C[i] ^= X[(i + 4) & 7];
+	            }
+
+	            // IV setup
+	            if (iv) {
+	                // Shortcuts
+	                var IV = iv.words;
+	                var IV_0 = IV[0];
+	                var IV_1 = IV[1];
+
+	                // Generate four subvectors
+	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+
+	                // Modify counter values
+	                C[0] ^= i0;
+	                C[1] ^= i1;
+	                C[2] ^= i2;
+	                C[3] ^= i3;
+	                C[4] ^= i0;
+	                C[5] ^= i1;
+	                C[6] ^= i2;
+	                C[7] ^= i3;
+
+	                // Iterate the system four times
+	                for (var i = 0; i < 4; i++) {
+	                    nextState.call(this);
+	                }
+	            }
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var X = this._X;
+
+	            // Iterate the system
+	            nextState.call(this);
+
+	            // Generate four keystream words
+	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+	            for (var i = 0; i < 4; i++) {
+	                // Swap endian
+	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
+	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+
+	                // Encrypt
+	                M[offset + i] ^= S[i];
+	            }
+	        },
+
+	        blockSize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    function nextState() {
+	        // Shortcuts
+	        var X = this._X;
+	        var C = this._C;
+
+	        // Save old counter values
+	        for (var i = 0; i < 8; i++) {
+	            C_[i] = C[i];
+	        }
+
+	        // Calculate new counter values
+	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+	        // Calculate the g-values
+	        for (var i = 0; i < 8; i++) {
+	            var gx = X[i] + C[i];
+
+	            // Construct high and low argument for squaring
+	            var ga = gx & 0xffff;
+	            var gb = gx >>> 16;
+
+	            // Calculate high and low result of squaring
+	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+	            // High XOR low
+	            G[i] = gh ^ gl;
+	        }
+
+	        // Calculate new state values
+	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
+	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
+	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
+	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+	}());
+
+
+	return CryptoJS.RabbitLegacy;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1734585677029, function(require, module, exports) {
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    const N = 16;
+
+	    //Origin pbox and sbox, derived from PI
+	    const ORIG_P = [
+	        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+	        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+	        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+	        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+	        0x9216D5D9, 0x8979FB1B
+	    ];
+
+	    const ORIG_S = [
+	        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+	            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+	            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+	            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+	            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+	            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+	            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+	            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+	            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+	            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+	            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+	            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+	            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+	            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+	            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+	            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+	            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+	            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+	            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+	            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+	            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+	            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+	            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+	            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+	            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+	            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+	            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+	            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+	            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+	            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+	            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+	            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+	            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+	            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+	            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+	            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+	            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+	            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+	            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+	            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+	            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+	            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+	            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+	            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+	            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+	            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+	            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+	            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+	            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+	            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+	            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+	            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+	            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+	            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+	            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+	            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+	            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+	            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+	            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+	            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+	            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+	            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+	            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+	            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],
+	        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+	            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+	            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+	            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+	            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+	            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+	            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+	            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+	            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+	            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+	            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+	            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+	            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+	            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+	            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+	            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+	            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+	            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+	            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+	            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+	            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+	            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+	            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+	            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+	            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+	            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+	            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+	            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+	            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+	            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+	            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+	            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+	            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+	            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+	            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+	            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+	            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+	            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+	            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+	            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+	            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+	            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+	            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+	            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+	            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+	            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+	            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+	            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+	            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+	            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+	            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+	            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+	            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+	            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+	            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+	            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+	            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+	            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+	            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+	            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+	            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+	            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+	            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+	            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],
+	        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+	            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+	            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+	            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+	            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+	            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+	            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+	            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+	            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+	            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+	            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+	            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+	            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+	            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+	            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+	            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+	            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+	            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+	            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+	            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+	            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+	            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+	            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+	            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+	            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+	            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+	            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+	            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+	            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+	            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+	            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+	            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+	            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+	            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+	            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+	            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+	            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+	            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+	            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+	            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+	            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+	            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+	            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+	            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+	            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+	            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+	            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+	            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+	            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+	            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+	            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+	            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+	            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+	            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+	            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+	            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+	            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+	            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+	            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+	            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+	            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+	            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+	            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+	            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],
+	        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+	            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+	            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+	            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+	            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+	            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+	            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+	            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+	            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+	            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+	            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+	            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+	            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+	            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+	            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+	            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+	            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+	            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+	            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+	            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+	            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+	            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+	            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+	            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+	            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+	            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+	            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+	            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+	            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+	            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+	            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+	            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+	            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+	            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+	            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+	            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+	            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+	            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+	            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+	            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+	            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+	            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+	            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+	            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+	            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+	            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+	            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+	            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+	            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+	            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+	            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+	            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+	            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+	            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+	            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+	            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+	            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+	            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+	            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+	            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+	            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+	            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+	            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+	            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]
+	    ];
+
+	    var BLOWFISH_CTX = {
+	        pbox: [],
+	        sbox: []
+	    }
+
+	    function F(ctx, x){
+	        let a = (x >> 24) & 0xFF;
+	        let b = (x >> 16) & 0xFF;
+	        let c = (x >> 8) & 0xFF;
+	        let d = x & 0xFF;
+
+	        let y = ctx.sbox[0][a] + ctx.sbox[1][b];
+	        y = y ^ ctx.sbox[2][c];
+	        y = y + ctx.sbox[3][d];
+
+	        return y;
+	    }
+
+	    function BlowFish_Encrypt(ctx, left, right){
+	        let Xl = left;
+	        let Xr = right;
+	        let temp;
+
+	        for(let i = 0; i < N; ++i){
+	            Xl = Xl ^ ctx.pbox[i];
+	            Xr = F(ctx, Xl) ^ Xr;
+
+	            temp = Xl;
+	            Xl = Xr;
+	            Xr = temp;
+	        }
+
+	        temp = Xl;
+	        Xl = Xr;
+	        Xr = temp;
+
+	        Xr = Xr ^ ctx.pbox[N];
+	        Xl = Xl ^ ctx.pbox[N + 1];
+
+	        return {left: Xl, right: Xr};
+	    }
+
+	    function BlowFish_Decrypt(ctx, left, right){
+	        let Xl = left;
+	        let Xr = right;
+	        let temp;
+
+	        for(let i = N + 1; i > 1; --i){
+	            Xl = Xl ^ ctx.pbox[i];
+	            Xr = F(ctx, Xl) ^ Xr;
+
+	            temp = Xl;
+	            Xl = Xr;
+	            Xr = temp;
+	        }
+
+	        temp = Xl;
+	        Xl = Xr;
+	        Xr = temp;
+
+	        Xr = Xr ^ ctx.pbox[1];
+	        Xl = Xl ^ ctx.pbox[0];
+
+	        return {left: Xl, right: Xr};
+	    }
+
+	    /**
+	     * Initialization ctx's pbox and sbox.
+	     *
+	     * @param {Object} ctx The object has pbox and sbox.
+	     * @param {Array} key An array of 32-bit words.
+	     * @param {int} keysize The length of the key.
+	     *
+	     * @example
+	     *
+	     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);
+	     */
+	    function BlowFishInit(ctx, key, keysize)
+	    {
+	        for(let Row = 0; Row < 4; Row++)
+	        {
+	            ctx.sbox[Row] = [];
+	            for(let Col = 0; Col < 256; Col++)
+	            {
+	                ctx.sbox[Row][Col] = ORIG_S[Row][Col];
+	            }
+	        }
+
+	        let keyIndex = 0;
+	        for(let index = 0; index < N + 2; index++)
+	        {
+	            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];
+	            keyIndex++;
+	            if(keyIndex >= keysize)
+	            {
+	                keyIndex = 0;
+	            }
+	        }
+
+	        let Data1 = 0;
+	        let Data2 = 0;
+	        let res = 0;
+	        for(let i = 0; i < N + 2; i += 2)
+	        {
+	            res = BlowFish_Encrypt(ctx, Data1, Data2);
+	            Data1 = res.left;
+	            Data2 = res.right;
+	            ctx.pbox[i] = Data1;
+	            ctx.pbox[i + 1] = Data2;
+	        }
+
+	        for(let i = 0; i < 4; i++)
+	        {
+	            for(let j = 0; j < 256; j += 2)
+	            {
+	                res = BlowFish_Encrypt(ctx, Data1, Data2);
+	                Data1 = res.left;
+	                Data2 = res.right;
+	                ctx.sbox[i][j] = Data1;
+	                ctx.sbox[i][j + 1] = Data2;
+	            }
+	        }
+
+	        return true;
+	    }
+
+	    /**
+	     * Blowfish block cipher algorithm.
+	     */
+	    var Blowfish = C_algo.Blowfish = BlockCipher.extend({
+	        _doReset: function () {
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            //Initialization pbox and sbox
+	            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
+	            M[offset] = res.left;
+	            M[offset + 1] = res.right;
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
+	            M[offset] = res.left;
+	            M[offset + 1] = res.right;
+	        },
+
+	        blockSize: 64/32,
+
+	        keySize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);
+	     */
+	    C.Blowfish = BlockCipher._createHelper(Blowfish);
+	}());
+
+
+	return CryptoJS.Blowfish;
+
+}));
+}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
+return __REQUIRE__(1734585676994);
+})()
+//miniprogram-npm-outsideDeps=["crypto"]
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/crypto-js/index.js.map b/miniprogram_npm/crypto-js/index.js.map
new file mode 100644
index 0000000..c54bf84
--- /dev/null
+++ b/miniprogram_npm/crypto-js/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["index.js","core.js","x64-core.js","lib-typedarrays.js","enc-utf16.js","enc-base64.js","enc-base64url.js","md5.js","sha1.js","sha256.js","sha224.js","sha512.js","sha384.js","sha3.js","ripemd160.js","hmac.js","pbkdf2.js","evpkdf.js","cipher-core.js","mode-cfb.js","mode-ctr.js","mode-ctr-gladman.js","mode-ofb.js","mode-ecb.js","pad-ansix923.js","pad-iso10126.js","pad-iso97971.js","pad-zeropadding.js","pad-nopadding.js","format-hex.js","aes.js","tripledes.js","rc4.js","rabbit.js","rabbit-legacy.js","blowfish.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;ACFA,ADGA;ACFA,ADGA;ACFA,ADGA;ACFA,ADGA,AENA;ADIA,ADGA,AENA;ADIA,ADGA,AENA;ADIA,ADGA,AGTA,ADGA;ADIA,ADGA,AGTA,ADGA;ADIA,ADGA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ACHA,AENA,ACHA,AENA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ACHA,AENA,AGTA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AGTA,AGTA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ApB4DA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":[";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"), require(\"./lib-typedarrays\"), require(\"./enc-utf16\"), require(\"./enc-base64\"), require(\"./enc-base64url\"), require(\"./md5\"), require(\"./sha1\"), require(\"./sha256\"), require(\"./sha224\"), require(\"./sha512\"), require(\"./sha384\"), require(\"./sha3\"), require(\"./ripemd160\"), require(\"./hmac\"), require(\"./pbkdf2\"), require(\"./evpkdf\"), require(\"./cipher-core\"), require(\"./mode-cfb\"), require(\"./mode-ctr\"), require(\"./mode-ctr-gladman\"), require(\"./mode-ofb\"), require(\"./mode-ecb\"), require(\"./pad-ansix923\"), require(\"./pad-iso10126\"), require(\"./pad-iso97971\"), require(\"./pad-zeropadding\"), require(\"./pad-nopadding\"), require(\"./format-hex\"), require(\"./aes\"), require(\"./tripledes\"), require(\"./rc4\"), require(\"./rabbit\"), require(\"./rabbit-legacy\"), require(\"./blowfish\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\", \"./lib-typedarrays\", \"./enc-utf16\", \"./enc-base64\", \"./enc-base64url\", \"./md5\", \"./sha1\", \"./sha256\", \"./sha224\", \"./sha512\", \"./sha384\", \"./sha3\", \"./ripemd160\", \"./hmac\", \"./pbkdf2\", \"./evpkdf\", \"./cipher-core\", \"./mode-cfb\", \"./mode-ctr\", \"./mode-ctr-gladman\", \"./mode-ofb\", \"./mode-ecb\", \"./pad-ansix923\", \"./pad-iso10126\", \"./pad-iso97971\", \"./pad-zeropadding\", \"./pad-nopadding\", \"./format-hex\", \"./aes\", \"./tripledes\", \"./rc4\", \"./rabbit\", \"./rabbit-legacy\", \"./blowfish\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\troot.CryptoJS = factory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\treturn CryptoJS;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory();\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\troot.CryptoJS = factory();\n\t}\n}(this, function () {\n\n\t/*globals window, global, require*/\n\n\t/**\n\t * CryptoJS core components.\n\t */\n\tvar CryptoJS = CryptoJS || (function (Math, undefined) {\n\n\t    var crypto;\n\n\t    // Native crypto from window (Browser)\n\t    if (typeof window !== 'undefined' && window.crypto) {\n\t        crypto = window.crypto;\n\t    }\n\n\t    // Native crypto in web worker (Browser)\n\t    if (typeof self !== 'undefined' && self.crypto) {\n\t        crypto = self.crypto;\n\t    }\n\n\t    // Native crypto from worker\n\t    if (typeof globalThis !== 'undefined' && globalThis.crypto) {\n\t        crypto = globalThis.crypto;\n\t    }\n\n\t    // Native (experimental IE 11) crypto from window (Browser)\n\t    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {\n\t        crypto = window.msCrypto;\n\t    }\n\n\t    // Native crypto from global (NodeJS)\n\t    if (!crypto && typeof global !== 'undefined' && global.crypto) {\n\t        crypto = global.crypto;\n\t    }\n\n\t    // Native crypto import via require (NodeJS)\n\t    if (!crypto && typeof require === 'function') {\n\t        try {\n\t            crypto = require('crypto');\n\t        } catch (err) {}\n\t    }\n\n\t    /*\n\t     * Cryptographically secure pseudorandom number generator\n\t     *\n\t     * As Math.random() is cryptographically not safe to use\n\t     */\n\t    var cryptoSecureRandomInt = function () {\n\t        if (crypto) {\n\t            // Use getRandomValues method (Browser)\n\t            if (typeof crypto.getRandomValues === 'function') {\n\t                try {\n\t                    return crypto.getRandomValues(new Uint32Array(1))[0];\n\t                } catch (err) {}\n\t            }\n\n\t            // Use randomBytes method (NodeJS)\n\t            if (typeof crypto.randomBytes === 'function') {\n\t                try {\n\t                    return crypto.randomBytes(4).readInt32LE();\n\t                } catch (err) {}\n\t            }\n\t        }\n\n\t        throw new Error('Native crypto module could not be used to get secure random number.');\n\t    };\n\n\t    /*\n\t     * Local polyfill of Object.create\n\n\t     */\n\t    var create = Object.create || (function () {\n\t        function F() {}\n\n\t        return function (obj) {\n\t            var subtype;\n\n\t            F.prototype = obj;\n\n\t            subtype = new F();\n\n\t            F.prototype = null;\n\n\t            return subtype;\n\t        };\n\t    }());\n\n\t    /**\n\t     * CryptoJS namespace.\n\t     */\n\t    var C = {};\n\n\t    /**\n\t     * Library namespace.\n\t     */\n\t    var C_lib = C.lib = {};\n\n\t    /**\n\t     * Base object for prototypal inheritance.\n\t     */\n\t    var Base = C_lib.Base = (function () {\n\n\n\t        return {\n\t            /**\n\t             * Creates a new object that inherits from this object.\n\t             *\n\t             * @param {Object} overrides Properties to copy into the new object.\n\t             *\n\t             * @return {Object} The new object.\n\t             *\n\t             * @static\n\t             *\n\t             * @example\n\t             *\n\t             *     var MyType = CryptoJS.lib.Base.extend({\n\t             *         field: 'value',\n\t             *\n\t             *         method: function () {\n\t             *         }\n\t             *     });\n\t             */\n\t            extend: function (overrides) {\n\t                // Spawn\n\t                var subtype = create(this);\n\n\t                // Augment\n\t                if (overrides) {\n\t                    subtype.mixIn(overrides);\n\t                }\n\n\t                // Create default initializer\n\t                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {\n\t                    subtype.init = function () {\n\t                        subtype.$super.init.apply(this, arguments);\n\t                    };\n\t                }\n\n\t                // Initializer's prototype is the subtype object\n\t                subtype.init.prototype = subtype;\n\n\t                // Reference supertype\n\t                subtype.$super = this;\n\n\t                return subtype;\n\t            },\n\n\t            /**\n\t             * Extends this object and runs the init method.\n\t             * Arguments to create() will be passed to init().\n\t             *\n\t             * @return {Object} The new object.\n\t             *\n\t             * @static\n\t             *\n\t             * @example\n\t             *\n\t             *     var instance = MyType.create();\n\t             */\n\t            create: function () {\n\t                var instance = this.extend();\n\t                instance.init.apply(instance, arguments);\n\n\t                return instance;\n\t            },\n\n\t            /**\n\t             * Initializes a newly created object.\n\t             * Override this method to add some logic when your objects are created.\n\t             *\n\t             * @example\n\t             *\n\t             *     var MyType = CryptoJS.lib.Base.extend({\n\t             *         init: function () {\n\t             *             // ...\n\t             *         }\n\t             *     });\n\t             */\n\t            init: function () {\n\t            },\n\n\t            /**\n\t             * Copies properties into this object.\n\t             *\n\t             * @param {Object} properties The properties to mix in.\n\t             *\n\t             * @example\n\t             *\n\t             *     MyType.mixIn({\n\t             *         field: 'value'\n\t             *     });\n\t             */\n\t            mixIn: function (properties) {\n\t                for (var propertyName in properties) {\n\t                    if (properties.hasOwnProperty(propertyName)) {\n\t                        this[propertyName] = properties[propertyName];\n\t                    }\n\t                }\n\n\t                // IE won't copy toString using the loop above\n\t                if (properties.hasOwnProperty('toString')) {\n\t                    this.toString = properties.toString;\n\t                }\n\t            },\n\n\t            /**\n\t             * Creates a copy of this object.\n\t             *\n\t             * @return {Object} The clone.\n\t             *\n\t             * @example\n\t             *\n\t             *     var clone = instance.clone();\n\t             */\n\t            clone: function () {\n\t                return this.init.prototype.extend(this);\n\t            }\n\t        };\n\t    }());\n\n\t    /**\n\t     * An array of 32-bit words.\n\t     *\n\t     * @property {Array} words The array of 32-bit words.\n\t     * @property {number} sigBytes The number of significant bytes in this word array.\n\t     */\n\t    var WordArray = C_lib.WordArray = Base.extend({\n\t        /**\n\t         * Initializes a newly created word array.\n\t         *\n\t         * @param {Array} words (Optional) An array of 32-bit words.\n\t         * @param {number} sigBytes (Optional) The number of significant bytes in the words.\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.lib.WordArray.create();\n\t         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);\n\t         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);\n\t         */\n\t        init: function (words, sigBytes) {\n\t            words = this.words = words || [];\n\n\t            if (sigBytes != undefined) {\n\t                this.sigBytes = sigBytes;\n\t            } else {\n\t                this.sigBytes = words.length * 4;\n\t            }\n\t        },\n\n\t        /**\n\t         * Converts this word array to a string.\n\t         *\n\t         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex\n\t         *\n\t         * @return {string} The stringified word array.\n\t         *\n\t         * @example\n\t         *\n\t         *     var string = wordArray + '';\n\t         *     var string = wordArray.toString();\n\t         *     var string = wordArray.toString(CryptoJS.enc.Utf8);\n\t         */\n\t        toString: function (encoder) {\n\t            return (encoder || Hex).stringify(this);\n\t        },\n\n\t        /**\n\t         * Concatenates a word array to this word array.\n\t         *\n\t         * @param {WordArray} wordArray The word array to append.\n\t         *\n\t         * @return {WordArray} This word array.\n\t         *\n\t         * @example\n\t         *\n\t         *     wordArray1.concat(wordArray2);\n\t         */\n\t        concat: function (wordArray) {\n\t            // Shortcuts\n\t            var thisWords = this.words;\n\t            var thatWords = wordArray.words;\n\t            var thisSigBytes = this.sigBytes;\n\t            var thatSigBytes = wordArray.sigBytes;\n\n\t            // Clamp excess bits\n\t            this.clamp();\n\n\t            // Concat\n\t            if (thisSigBytes % 4) {\n\t                // Copy one byte at a time\n\t                for (var i = 0; i < thatSigBytes; i++) {\n\t                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\n\t                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);\n\t                }\n\t            } else {\n\t                // Copy one word at a time\n\t                for (var j = 0; j < thatSigBytes; j += 4) {\n\t                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];\n\t                }\n\t            }\n\t            this.sigBytes += thatSigBytes;\n\n\t            // Chainable\n\t            return this;\n\t        },\n\n\t        /**\n\t         * Removes insignificant bits.\n\t         *\n\t         * @example\n\t         *\n\t         *     wordArray.clamp();\n\t         */\n\t        clamp: function () {\n\t            // Shortcuts\n\t            var words = this.words;\n\t            var sigBytes = this.sigBytes;\n\n\t            // Clamp\n\t            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);\n\t            words.length = Math.ceil(sigBytes / 4);\n\t        },\n\n\t        /**\n\t         * Creates a copy of this word array.\n\t         *\n\t         * @return {WordArray} The clone.\n\t         *\n\t         * @example\n\t         *\n\t         *     var clone = wordArray.clone();\n\t         */\n\t        clone: function () {\n\t            var clone = Base.clone.call(this);\n\t            clone.words = this.words.slice(0);\n\n\t            return clone;\n\t        },\n\n\t        /**\n\t         * Creates a word array filled with random bytes.\n\t         *\n\t         * @param {number} nBytes The number of random bytes to generate.\n\t         *\n\t         * @return {WordArray} The random word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.lib.WordArray.random(16);\n\t         */\n\t        random: function (nBytes) {\n\t            var words = [];\n\n\t            for (var i = 0; i < nBytes; i += 4) {\n\t                words.push(cryptoSecureRandomInt());\n\t            }\n\n\t            return new WordArray.init(words, nBytes);\n\t        }\n\t    });\n\n\t    /**\n\t     * Encoder namespace.\n\t     */\n\t    var C_enc = C.enc = {};\n\n\t    /**\n\t     * Hex encoding strategy.\n\t     */\n\t    var Hex = C_enc.Hex = {\n\t        /**\n\t         * Converts a word array to a hex string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The hex string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var hexChars = [];\n\t            for (var i = 0; i < sigBytes; i++) {\n\t                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\n\t                hexChars.push((bite >>> 4).toString(16));\n\t                hexChars.push((bite & 0x0f).toString(16));\n\t            }\n\n\t            return hexChars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a hex string to a word array.\n\t         *\n\t         * @param {string} hexStr The hex string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);\n\t         */\n\t        parse: function (hexStr) {\n\t            // Shortcut\n\t            var hexStrLength = hexStr.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < hexStrLength; i += 2) {\n\t                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);\n\t            }\n\n\t            return new WordArray.init(words, hexStrLength / 2);\n\t        }\n\t    };\n\n\t    /**\n\t     * Latin1 encoding strategy.\n\t     */\n\t    var Latin1 = C_enc.Latin1 = {\n\t        /**\n\t         * Converts a word array to a Latin1 string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The Latin1 string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var latin1Chars = [];\n\t            for (var i = 0; i < sigBytes; i++) {\n\t                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\n\t                latin1Chars.push(String.fromCharCode(bite));\n\t            }\n\n\t            return latin1Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a Latin1 string to a word array.\n\t         *\n\t         * @param {string} latin1Str The Latin1 string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);\n\t         */\n\t        parse: function (latin1Str) {\n\t            // Shortcut\n\t            var latin1StrLength = latin1Str.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < latin1StrLength; i++) {\n\t                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);\n\t            }\n\n\t            return new WordArray.init(words, latin1StrLength);\n\t        }\n\t    };\n\n\t    /**\n\t     * UTF-8 encoding strategy.\n\t     */\n\t    var Utf8 = C_enc.Utf8 = {\n\t        /**\n\t         * Converts a word array to a UTF-8 string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The UTF-8 string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            try {\n\t                return decodeURIComponent(escape(Latin1.stringify(wordArray)));\n\t            } catch (e) {\n\t                throw new Error('Malformed UTF-8 data');\n\t            }\n\t        },\n\n\t        /**\n\t         * Converts a UTF-8 string to a word array.\n\t         *\n\t         * @param {string} utf8Str The UTF-8 string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);\n\t         */\n\t        parse: function (utf8Str) {\n\t            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));\n\t        }\n\t    };\n\n\t    /**\n\t     * Abstract buffered block algorithm template.\n\t     *\n\t     * The property blockSize must be implemented in a concrete subtype.\n\t     *\n\t     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0\n\t     */\n\t    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({\n\t        /**\n\t         * Resets this block algorithm's data buffer to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     bufferedBlockAlgorithm.reset();\n\t         */\n\t        reset: function () {\n\t            // Initial values\n\t            this._data = new WordArray.init();\n\t            this._nDataBytes = 0;\n\t        },\n\n\t        /**\n\t         * Adds new data to this block algorithm's buffer.\n\t         *\n\t         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.\n\t         *\n\t         * @example\n\t         *\n\t         *     bufferedBlockAlgorithm._append('data');\n\t         *     bufferedBlockAlgorithm._append(wordArray);\n\t         */\n\t        _append: function (data) {\n\t            // Convert string to WordArray, else assume WordArray already\n\t            if (typeof data == 'string') {\n\t                data = Utf8.parse(data);\n\t            }\n\n\t            // Append\n\t            this._data.concat(data);\n\t            this._nDataBytes += data.sigBytes;\n\t        },\n\n\t        /**\n\t         * Processes available data blocks.\n\t         *\n\t         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.\n\t         *\n\t         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.\n\t         *\n\t         * @return {WordArray} The processed data.\n\t         *\n\t         * @example\n\t         *\n\t         *     var processedData = bufferedBlockAlgorithm._process();\n\t         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');\n\t         */\n\t        _process: function (doFlush) {\n\t            var processedWords;\n\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\t            var dataSigBytes = data.sigBytes;\n\t            var blockSize = this.blockSize;\n\t            var blockSizeBytes = blockSize * 4;\n\n\t            // Count blocks ready\n\t            var nBlocksReady = dataSigBytes / blockSizeBytes;\n\t            if (doFlush) {\n\t                // Round up to include partial blocks\n\t                nBlocksReady = Math.ceil(nBlocksReady);\n\t            } else {\n\t                // Round down to include only full blocks,\n\t                // less the number of blocks that must remain in the buffer\n\t                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);\n\t            }\n\n\t            // Count words ready\n\t            var nWordsReady = nBlocksReady * blockSize;\n\n\t            // Count bytes ready\n\t            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);\n\n\t            // Process blocks\n\t            if (nWordsReady) {\n\t                for (var offset = 0; offset < nWordsReady; offset += blockSize) {\n\t                    // Perform concrete-algorithm logic\n\t                    this._doProcessBlock(dataWords, offset);\n\t                }\n\n\t                // Remove processed words\n\t                processedWords = dataWords.splice(0, nWordsReady);\n\t                data.sigBytes -= nBytesReady;\n\t            }\n\n\t            // Return processed words\n\t            return new WordArray.init(processedWords, nBytesReady);\n\t        },\n\n\t        /**\n\t         * Creates a copy of this object.\n\t         *\n\t         * @return {Object} The clone.\n\t         *\n\t         * @example\n\t         *\n\t         *     var clone = bufferedBlockAlgorithm.clone();\n\t         */\n\t        clone: function () {\n\t            var clone = Base.clone.call(this);\n\t            clone._data = this._data.clone();\n\n\t            return clone;\n\t        },\n\n\t        _minBufferSize: 0\n\t    });\n\n\t    /**\n\t     * Abstract hasher template.\n\t     *\n\t     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)\n\t     */\n\t    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({\n\t        /**\n\t         * Configuration options.\n\t         */\n\t        cfg: Base.extend(),\n\n\t        /**\n\t         * Initializes a newly created hasher.\n\t         *\n\t         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hasher = CryptoJS.algo.SHA256.create();\n\t         */\n\t        init: function (cfg) {\n\t            // Apply config defaults\n\t            this.cfg = this.cfg.extend(cfg);\n\n\t            // Set initial values\n\t            this.reset();\n\t        },\n\n\t        /**\n\t         * Resets this hasher to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     hasher.reset();\n\t         */\n\t        reset: function () {\n\t            // Reset data buffer\n\t            BufferedBlockAlgorithm.reset.call(this);\n\n\t            // Perform concrete-hasher logic\n\t            this._doReset();\n\t        },\n\n\t        /**\n\t         * Updates this hasher with a message.\n\t         *\n\t         * @param {WordArray|string} messageUpdate The message to append.\n\t         *\n\t         * @return {Hasher} This hasher.\n\t         *\n\t         * @example\n\t         *\n\t         *     hasher.update('message');\n\t         *     hasher.update(wordArray);\n\t         */\n\t        update: function (messageUpdate) {\n\t            // Append\n\t            this._append(messageUpdate);\n\n\t            // Update the hash\n\t            this._process();\n\n\t            // Chainable\n\t            return this;\n\t        },\n\n\t        /**\n\t         * Finalizes the hash computation.\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\n\t         *\n\t         * @param {WordArray|string} messageUpdate (Optional) A final message update.\n\t         *\n\t         * @return {WordArray} The hash.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hash = hasher.finalize();\n\t         *     var hash = hasher.finalize('message');\n\t         *     var hash = hasher.finalize(wordArray);\n\t         */\n\t        finalize: function (messageUpdate) {\n\t            // Final message update\n\t            if (messageUpdate) {\n\t                this._append(messageUpdate);\n\t            }\n\n\t            // Perform concrete-hasher logic\n\t            var hash = this._doFinalize();\n\n\t            return hash;\n\t        },\n\n\t        blockSize: 512/32,\n\n\t        /**\n\t         * Creates a shortcut function to a hasher's object interface.\n\t         *\n\t         * @param {Hasher} hasher The hasher to create a helper for.\n\t         *\n\t         * @return {Function} The shortcut function.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);\n\t         */\n\t        _createHelper: function (hasher) {\n\t            return function (message, cfg) {\n\t                return new hasher.init(cfg).finalize(message);\n\t            };\n\t        },\n\n\t        /**\n\t         * Creates a shortcut function to the HMAC's object interface.\n\t         *\n\t         * @param {Hasher} hasher The hasher to use in this HMAC helper.\n\t         *\n\t         * @return {Function} The shortcut function.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);\n\t         */\n\t        _createHmacHelper: function (hasher) {\n\t            return function (message, key) {\n\t                return new C_algo.HMAC.init(hasher, key).finalize(message);\n\t            };\n\t        }\n\t    });\n\n\t    /**\n\t     * Algorithm namespace.\n\t     */\n\t    var C_algo = C.algo = {};\n\n\t    return C;\n\t}(Math));\n\n\n\treturn CryptoJS;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (undefined) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var X32WordArray = C_lib.WordArray;\n\n\t    /**\n\t     * x64 namespace.\n\t     */\n\t    var C_x64 = C.x64 = {};\n\n\t    /**\n\t     * A 64-bit word.\n\t     */\n\t    var X64Word = C_x64.Word = Base.extend({\n\t        /**\n\t         * Initializes a newly created 64-bit word.\n\t         *\n\t         * @param {number} high The high 32 bits.\n\t         * @param {number} low The low 32 bits.\n\t         *\n\t         * @example\n\t         *\n\t         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);\n\t         */\n\t        init: function (high, low) {\n\t            this.high = high;\n\t            this.low = low;\n\t        }\n\n\t        /**\n\t         * Bitwise NOTs this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after negating.\n\t         *\n\t         * @example\n\t         *\n\t         *     var negated = x64Word.not();\n\t         */\n\t        // not: function () {\n\t            // var high = ~this.high;\n\t            // var low = ~this.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Bitwise ANDs this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to AND with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after ANDing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var anded = x64Word.and(anotherX64Word);\n\t         */\n\t        // and: function (word) {\n\t            // var high = this.high & word.high;\n\t            // var low = this.low & word.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Bitwise ORs this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to OR with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after ORing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var ored = x64Word.or(anotherX64Word);\n\t         */\n\t        // or: function (word) {\n\t            // var high = this.high | word.high;\n\t            // var low = this.low | word.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Bitwise XORs this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to XOR with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after XORing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var xored = x64Word.xor(anotherX64Word);\n\t         */\n\t        // xor: function (word) {\n\t            // var high = this.high ^ word.high;\n\t            // var low = this.low ^ word.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Shifts this word n bits to the left.\n\t         *\n\t         * @param {number} n The number of bits to shift.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after shifting.\n\t         *\n\t         * @example\n\t         *\n\t         *     var shifted = x64Word.shiftL(25);\n\t         */\n\t        // shiftL: function (n) {\n\t            // if (n < 32) {\n\t                // var high = (this.high << n) | (this.low >>> (32 - n));\n\t                // var low = this.low << n;\n\t            // } else {\n\t                // var high = this.low << (n - 32);\n\t                // var low = 0;\n\t            // }\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Shifts this word n bits to the right.\n\t         *\n\t         * @param {number} n The number of bits to shift.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after shifting.\n\t         *\n\t         * @example\n\t         *\n\t         *     var shifted = x64Word.shiftR(7);\n\t         */\n\t        // shiftR: function (n) {\n\t            // if (n < 32) {\n\t                // var low = (this.low >>> n) | (this.high << (32 - n));\n\t                // var high = this.high >>> n;\n\t            // } else {\n\t                // var low = this.high >>> (n - 32);\n\t                // var high = 0;\n\t            // }\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Rotates this word n bits to the left.\n\t         *\n\t         * @param {number} n The number of bits to rotate.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after rotating.\n\t         *\n\t         * @example\n\t         *\n\t         *     var rotated = x64Word.rotL(25);\n\t         */\n\t        // rotL: function (n) {\n\t            // return this.shiftL(n).or(this.shiftR(64 - n));\n\t        // },\n\n\t        /**\n\t         * Rotates this word n bits to the right.\n\t         *\n\t         * @param {number} n The number of bits to rotate.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after rotating.\n\t         *\n\t         * @example\n\t         *\n\t         *     var rotated = x64Word.rotR(7);\n\t         */\n\t        // rotR: function (n) {\n\t            // return this.shiftR(n).or(this.shiftL(64 - n));\n\t        // },\n\n\t        /**\n\t         * Adds this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to add with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after adding.\n\t         *\n\t         * @example\n\t         *\n\t         *     var added = x64Word.add(anotherX64Word);\n\t         */\n\t        // add: function (word) {\n\t            // var low = (this.low + word.low) | 0;\n\t            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;\n\t            // var high = (this.high + word.high + carry) | 0;\n\n\t            // return X64Word.create(high, low);\n\t        // }\n\t    });\n\n\t    /**\n\t     * An array of 64-bit words.\n\t     *\n\t     * @property {Array} words The array of CryptoJS.x64.Word objects.\n\t     * @property {number} sigBytes The number of significant bytes in this word array.\n\t     */\n\t    var X64WordArray = C_x64.WordArray = Base.extend({\n\t        /**\n\t         * Initializes a newly created word array.\n\t         *\n\t         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.\n\t         * @param {number} sigBytes (Optional) The number of significant bytes in the words.\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.x64.WordArray.create();\n\t         *\n\t         *     var wordArray = CryptoJS.x64.WordArray.create([\n\t         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),\n\t         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)\n\t         *     ]);\n\t         *\n\t         *     var wordArray = CryptoJS.x64.WordArray.create([\n\t         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),\n\t         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)\n\t         *     ], 10);\n\t         */\n\t        init: function (words, sigBytes) {\n\t            words = this.words = words || [];\n\n\t            if (sigBytes != undefined) {\n\t                this.sigBytes = sigBytes;\n\t            } else {\n\t                this.sigBytes = words.length * 8;\n\t            }\n\t        },\n\n\t        /**\n\t         * Converts this 64-bit word array to a 32-bit word array.\n\t         *\n\t         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.\n\t         *\n\t         * @example\n\t         *\n\t         *     var x32WordArray = x64WordArray.toX32();\n\t         */\n\t        toX32: function () {\n\t            // Shortcuts\n\t            var x64Words = this.words;\n\t            var x64WordsLength = x64Words.length;\n\n\t            // Convert\n\t            var x32Words = [];\n\t            for (var i = 0; i < x64WordsLength; i++) {\n\t                var x64Word = x64Words[i];\n\t                x32Words.push(x64Word.high);\n\t                x32Words.push(x64Word.low);\n\t            }\n\n\t            return X32WordArray.create(x32Words, this.sigBytes);\n\t        },\n\n\t        /**\n\t         * Creates a copy of this word array.\n\t         *\n\t         * @return {X64WordArray} The clone.\n\t         *\n\t         * @example\n\t         *\n\t         *     var clone = x64WordArray.clone();\n\t         */\n\t        clone: function () {\n\t            var clone = Base.clone.call(this);\n\n\t            // Clone \"words\" array\n\t            var words = clone.words = this.words.slice(0);\n\n\t            // Clone each X64Word object\n\t            var wordsLength = words.length;\n\t            for (var i = 0; i < wordsLength; i++) {\n\t                words[i] = words[i].clone();\n\t            }\n\n\t            return clone;\n\t        }\n\t    });\n\t}());\n\n\n\treturn CryptoJS;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Check if typed arrays are supported\n\t    if (typeof ArrayBuffer != 'function') {\n\t        return;\n\t    }\n\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\n\t    // Reference original init\n\t    var superInit = WordArray.init;\n\n\t    // Augment WordArray.init to handle typed arrays\n\t    var subInit = WordArray.init = function (typedArray) {\n\t        // Convert buffers to uint8\n\t        if (typedArray instanceof ArrayBuffer) {\n\t            typedArray = new Uint8Array(typedArray);\n\t        }\n\n\t        // Convert other array views to uint8\n\t        if (\n\t            typedArray instanceof Int8Array ||\n\t            (typeof Uint8ClampedArray !== \"undefined\" && typedArray instanceof Uint8ClampedArray) ||\n\t            typedArray instanceof Int16Array ||\n\t            typedArray instanceof Uint16Array ||\n\t            typedArray instanceof Int32Array ||\n\t            typedArray instanceof Uint32Array ||\n\t            typedArray instanceof Float32Array ||\n\t            typedArray instanceof Float64Array\n\t        ) {\n\t            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);\n\t        }\n\n\t        // Handle Uint8Array\n\t        if (typedArray instanceof Uint8Array) {\n\t            // Shortcut\n\t            var typedArrayByteLength = typedArray.byteLength;\n\n\t            // Extract bytes\n\t            var words = [];\n\t            for (var i = 0; i < typedArrayByteLength; i++) {\n\t                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);\n\t            }\n\n\t            // Initialize this word array\n\t            superInit.call(this, words, typedArrayByteLength);\n\t        } else {\n\t            // Else call normal init\n\t            superInit.apply(this, arguments);\n\t        }\n\t    };\n\n\t    subInit.prototype = WordArray;\n\t}());\n\n\n\treturn CryptoJS.lib.WordArray;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_enc = C.enc;\n\n\t    /**\n\t     * UTF-16 BE encoding strategy.\n\t     */\n\t    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {\n\t        /**\n\t         * Converts a word array to a UTF-16 BE string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The UTF-16 BE string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var utf16Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 2) {\n\t                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;\n\t                utf16Chars.push(String.fromCharCode(codePoint));\n\t            }\n\n\t            return utf16Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a UTF-16 BE string to a word array.\n\t         *\n\t         * @param {string} utf16Str The UTF-16 BE string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);\n\t         */\n\t        parse: function (utf16Str) {\n\t            // Shortcut\n\t            var utf16StrLength = utf16Str.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < utf16StrLength; i++) {\n\t                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);\n\t            }\n\n\t            return WordArray.create(words, utf16StrLength * 2);\n\t        }\n\t    };\n\n\t    /**\n\t     * UTF-16 LE encoding strategy.\n\t     */\n\t    C_enc.Utf16LE = {\n\t        /**\n\t         * Converts a word array to a UTF-16 LE string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The UTF-16 LE string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var utf16Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 2) {\n\t                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);\n\t                utf16Chars.push(String.fromCharCode(codePoint));\n\t            }\n\n\t            return utf16Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a UTF-16 LE string to a word array.\n\t         *\n\t         * @param {string} utf16Str The UTF-16 LE string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);\n\t         */\n\t        parse: function (utf16Str) {\n\t            // Shortcut\n\t            var utf16StrLength = utf16Str.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < utf16StrLength; i++) {\n\t                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));\n\t            }\n\n\t            return WordArray.create(words, utf16StrLength * 2);\n\t        }\n\t    };\n\n\t    function swapEndian(word) {\n\t        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);\n\t    }\n\t}());\n\n\n\treturn CryptoJS.enc.Utf16;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_enc = C.enc;\n\n\t    /**\n\t     * Base64 encoding strategy.\n\t     */\n\t    var Base64 = C_enc.Base64 = {\n\t        /**\n\t         * Converts a word array to a Base64 string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The Base64 string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\t            var map = this._map;\n\n\t            // Clamp excess bits\n\t            wordArray.clamp();\n\n\t            // Convert\n\t            var base64Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 3) {\n\t                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;\n\t                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;\n\t                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;\n\n\t                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;\n\n\t                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {\n\t                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));\n\t                }\n\t            }\n\n\t            // Add padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                while (base64Chars.length % 4) {\n\t                    base64Chars.push(paddingChar);\n\t                }\n\t            }\n\n\t            return base64Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a Base64 string to a word array.\n\t         *\n\t         * @param {string} base64Str The Base64 string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);\n\t         */\n\t        parse: function (base64Str) {\n\t            // Shortcuts\n\t            var base64StrLength = base64Str.length;\n\t            var map = this._map;\n\t            var reverseMap = this._reverseMap;\n\n\t            if (!reverseMap) {\n\t                    reverseMap = this._reverseMap = [];\n\t                    for (var j = 0; j < map.length; j++) {\n\t                        reverseMap[map.charCodeAt(j)] = j;\n\t                    }\n\t            }\n\n\t            // Ignore padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                var paddingIndex = base64Str.indexOf(paddingChar);\n\t                if (paddingIndex !== -1) {\n\t                    base64StrLength = paddingIndex;\n\t                }\n\t            }\n\n\t            // Convert\n\t            return parseLoop(base64Str, base64StrLength, reverseMap);\n\n\t        },\n\n\t        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='\n\t    };\n\n\t    function parseLoop(base64Str, base64StrLength, reverseMap) {\n\t      var words = [];\n\t      var nBytes = 0;\n\t      for (var i = 0; i < base64StrLength; i++) {\n\t          if (i % 4) {\n\t              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);\n\t              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);\n\t              var bitsCombined = bits1 | bits2;\n\t              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);\n\t              nBytes++;\n\t          }\n\t      }\n\t      return WordArray.create(words, nBytes);\n\t    }\n\t}());\n\n\n\treturn CryptoJS.enc.Base64;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_enc = C.enc;\n\n\t    /**\n\t     * Base64url encoding strategy.\n\t     */\n\t    var Base64url = C_enc.Base64url = {\n\t        /**\n\t         * Converts a word array to a Base64url string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @param {boolean} urlSafe Whether to use url safe\n\t         *\n\t         * @return {string} The Base64url string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray, urlSafe) {\n\t            if (urlSafe === undefined) {\n\t                urlSafe = true\n\t            }\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\t            var map = urlSafe ? this._safe_map : this._map;\n\n\t            // Clamp excess bits\n\t            wordArray.clamp();\n\n\t            // Convert\n\t            var base64Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 3) {\n\t                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;\n\t                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;\n\t                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;\n\n\t                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;\n\n\t                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {\n\t                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));\n\t                }\n\t            }\n\n\t            // Add padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                while (base64Chars.length % 4) {\n\t                    base64Chars.push(paddingChar);\n\t                }\n\t            }\n\n\t            return base64Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a Base64url string to a word array.\n\t         *\n\t         * @param {string} base64Str The Base64url string.\n\t         *\n\t         * @param {boolean} urlSafe Whether to use url safe\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);\n\t         */\n\t        parse: function (base64Str, urlSafe) {\n\t            if (urlSafe === undefined) {\n\t                urlSafe = true\n\t            }\n\n\t            // Shortcuts\n\t            var base64StrLength = base64Str.length;\n\t            var map = urlSafe ? this._safe_map : this._map;\n\t            var reverseMap = this._reverseMap;\n\n\t            if (!reverseMap) {\n\t                reverseMap = this._reverseMap = [];\n\t                for (var j = 0; j < map.length; j++) {\n\t                    reverseMap[map.charCodeAt(j)] = j;\n\t                }\n\t            }\n\n\t            // Ignore padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                var paddingIndex = base64Str.indexOf(paddingChar);\n\t                if (paddingIndex !== -1) {\n\t                    base64StrLength = paddingIndex;\n\t                }\n\t            }\n\n\t            // Convert\n\t            return parseLoop(base64Str, base64StrLength, reverseMap);\n\n\t        },\n\n\t        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',\n\t        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',\n\t    };\n\n\t    function parseLoop(base64Str, base64StrLength, reverseMap) {\n\t        var words = [];\n\t        var nBytes = 0;\n\t        for (var i = 0; i < base64StrLength; i++) {\n\t            if (i % 4) {\n\t                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);\n\t                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);\n\t                var bitsCombined = bits1 | bits2;\n\t                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);\n\t                nBytes++;\n\t            }\n\t        }\n\t        return WordArray.create(words, nBytes);\n\t    }\n\t}());\n\n\n\treturn CryptoJS.enc.Base64url;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Constants table\n\t    var T = [];\n\n\t    // Compute constants\n\t    (function () {\n\t        for (var i = 0; i < 64; i++) {\n\t            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;\n\t        }\n\t    }());\n\n\t    /**\n\t     * MD5 hash algorithm.\n\t     */\n\t    var MD5 = C_algo.MD5 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init([\n\t                0x67452301, 0xefcdab89,\n\t                0x98badcfe, 0x10325476\n\t            ]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Swap endian\n\t            for (var i = 0; i < 16; i++) {\n\t                // Shortcuts\n\t                var offset_i = offset + i;\n\t                var M_offset_i = M[offset_i];\n\n\t                M[offset_i] = (\n\t                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |\n\t                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)\n\t                );\n\t            }\n\n\t            // Shortcuts\n\t            var H = this._hash.words;\n\n\t            var M_offset_0  = M[offset + 0];\n\t            var M_offset_1  = M[offset + 1];\n\t            var M_offset_2  = M[offset + 2];\n\t            var M_offset_3  = M[offset + 3];\n\t            var M_offset_4  = M[offset + 4];\n\t            var M_offset_5  = M[offset + 5];\n\t            var M_offset_6  = M[offset + 6];\n\t            var M_offset_7  = M[offset + 7];\n\t            var M_offset_8  = M[offset + 8];\n\t            var M_offset_9  = M[offset + 9];\n\t            var M_offset_10 = M[offset + 10];\n\t            var M_offset_11 = M[offset + 11];\n\t            var M_offset_12 = M[offset + 12];\n\t            var M_offset_13 = M[offset + 13];\n\t            var M_offset_14 = M[offset + 14];\n\t            var M_offset_15 = M[offset + 15];\n\n\t            // Working variables\n\t            var a = H[0];\n\t            var b = H[1];\n\t            var c = H[2];\n\t            var d = H[3];\n\n\t            // Computation\n\t            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);\n\t            d = FF(d, a, b, c, M_offset_1,  12, T[1]);\n\t            c = FF(c, d, a, b, M_offset_2,  17, T[2]);\n\t            b = FF(b, c, d, a, M_offset_3,  22, T[3]);\n\t            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);\n\t            d = FF(d, a, b, c, M_offset_5,  12, T[5]);\n\t            c = FF(c, d, a, b, M_offset_6,  17, T[6]);\n\t            b = FF(b, c, d, a, M_offset_7,  22, T[7]);\n\t            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);\n\t            d = FF(d, a, b, c, M_offset_9,  12, T[9]);\n\t            c = FF(c, d, a, b, M_offset_10, 17, T[10]);\n\t            b = FF(b, c, d, a, M_offset_11, 22, T[11]);\n\t            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);\n\t            d = FF(d, a, b, c, M_offset_13, 12, T[13]);\n\t            c = FF(c, d, a, b, M_offset_14, 17, T[14]);\n\t            b = FF(b, c, d, a, M_offset_15, 22, T[15]);\n\n\t            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);\n\t            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);\n\t            c = GG(c, d, a, b, M_offset_11, 14, T[18]);\n\t            b = GG(b, c, d, a, M_offset_0,  20, T[19]);\n\t            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);\n\t            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);\n\t            c = GG(c, d, a, b, M_offset_15, 14, T[22]);\n\t            b = GG(b, c, d, a, M_offset_4,  20, T[23]);\n\t            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);\n\t            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);\n\t            c = GG(c, d, a, b, M_offset_3,  14, T[26]);\n\t            b = GG(b, c, d, a, M_offset_8,  20, T[27]);\n\t            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);\n\t            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);\n\t            c = GG(c, d, a, b, M_offset_7,  14, T[30]);\n\t            b = GG(b, c, d, a, M_offset_12, 20, T[31]);\n\n\t            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);\n\t            d = HH(d, a, b, c, M_offset_8,  11, T[33]);\n\t            c = HH(c, d, a, b, M_offset_11, 16, T[34]);\n\t            b = HH(b, c, d, a, M_offset_14, 23, T[35]);\n\t            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);\n\t            d = HH(d, a, b, c, M_offset_4,  11, T[37]);\n\t            c = HH(c, d, a, b, M_offset_7,  16, T[38]);\n\t            b = HH(b, c, d, a, M_offset_10, 23, T[39]);\n\t            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);\n\t            d = HH(d, a, b, c, M_offset_0,  11, T[41]);\n\t            c = HH(c, d, a, b, M_offset_3,  16, T[42]);\n\t            b = HH(b, c, d, a, M_offset_6,  23, T[43]);\n\t            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);\n\t            d = HH(d, a, b, c, M_offset_12, 11, T[45]);\n\t            c = HH(c, d, a, b, M_offset_15, 16, T[46]);\n\t            b = HH(b, c, d, a, M_offset_2,  23, T[47]);\n\n\t            a = II(a, b, c, d, M_offset_0,  6,  T[48]);\n\t            d = II(d, a, b, c, M_offset_7,  10, T[49]);\n\t            c = II(c, d, a, b, M_offset_14, 15, T[50]);\n\t            b = II(b, c, d, a, M_offset_5,  21, T[51]);\n\t            a = II(a, b, c, d, M_offset_12, 6,  T[52]);\n\t            d = II(d, a, b, c, M_offset_3,  10, T[53]);\n\t            c = II(c, d, a, b, M_offset_10, 15, T[54]);\n\t            b = II(b, c, d, a, M_offset_1,  21, T[55]);\n\t            a = II(a, b, c, d, M_offset_8,  6,  T[56]);\n\t            d = II(d, a, b, c, M_offset_15, 10, T[57]);\n\t            c = II(c, d, a, b, M_offset_6,  15, T[58]);\n\t            b = II(b, c, d, a, M_offset_13, 21, T[59]);\n\t            a = II(a, b, c, d, M_offset_4,  6,  T[60]);\n\t            d = II(d, a, b, c, M_offset_11, 10, T[61]);\n\t            c = II(c, d, a, b, M_offset_2,  15, T[62]);\n\t            b = II(b, c, d, a, M_offset_9,  21, T[63]);\n\n\t            // Intermediate hash value\n\t            H[0] = (H[0] + a) | 0;\n\t            H[1] = (H[1] + b) | 0;\n\t            H[2] = (H[2] + c) | 0;\n\t            H[3] = (H[3] + d) | 0;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\n\t            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);\n\t            var nBitsTotalL = nBitsTotal;\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (\n\t                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |\n\t                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)\n\t            );\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (\n\t                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |\n\t                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)\n\t            );\n\n\t            data.sigBytes = (dataWords.length + 1) * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Shortcuts\n\t            var hash = this._hash;\n\t            var H = hash.words;\n\n\t            // Swap endian\n\t            for (var i = 0; i < 4; i++) {\n\t                // Shortcut\n\t                var H_i = H[i];\n\n\t                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |\n\t                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);\n\t            }\n\n\t            // Return final computed hash\n\t            return hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    function FF(a, b, c, d, x, s, t) {\n\t        var n = a + ((b & c) | (~b & d)) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    function GG(a, b, c, d, x, s, t) {\n\t        var n = a + ((b & d) | (c & ~d)) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    function HH(a, b, c, d, x, s, t) {\n\t        var n = a + (b ^ c ^ d) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    function II(a, b, c, d, x, s, t) {\n\t        var n = a + (c ^ (b | ~d)) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.MD5('message');\n\t     *     var hash = CryptoJS.MD5(wordArray);\n\t     */\n\t    C.MD5 = Hasher._createHelper(MD5);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacMD5(message, key);\n\t     */\n\t    C.HmacMD5 = Hasher._createHmacHelper(MD5);\n\t}(Math));\n\n\n\treturn CryptoJS.MD5;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Reusable object\n\t    var W = [];\n\n\t    /**\n\t     * SHA-1 hash algorithm.\n\t     */\n\t    var SHA1 = C_algo.SHA1 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init([\n\t                0x67452301, 0xefcdab89,\n\t                0x98badcfe, 0x10325476,\n\t                0xc3d2e1f0\n\t            ]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var H = this._hash.words;\n\n\t            // Working variables\n\t            var a = H[0];\n\t            var b = H[1];\n\t            var c = H[2];\n\t            var d = H[3];\n\t            var e = H[4];\n\n\t            // Computation\n\t            for (var i = 0; i < 80; i++) {\n\t                if (i < 16) {\n\t                    W[i] = M[offset + i] | 0;\n\t                } else {\n\t                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];\n\t                    W[i] = (n << 1) | (n >>> 31);\n\t                }\n\n\t                var t = ((a << 5) | (a >>> 27)) + e + W[i];\n\t                if (i < 20) {\n\t                    t += ((b & c) | (~b & d)) + 0x5a827999;\n\t                } else if (i < 40) {\n\t                    t += (b ^ c ^ d) + 0x6ed9eba1;\n\t                } else if (i < 60) {\n\t                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;\n\t                } else /* if (i < 80) */ {\n\t                    t += (b ^ c ^ d) - 0x359d3e2a;\n\t                }\n\n\t                e = d;\n\t                d = c;\n\t                c = (b << 30) | (b >>> 2);\n\t                b = a;\n\t                a = t;\n\t            }\n\n\t            // Intermediate hash value\n\t            H[0] = (H[0] + a) | 0;\n\t            H[1] = (H[1] + b) | 0;\n\t            H[2] = (H[2] + c) | 0;\n\t            H[3] = (H[3] + d) | 0;\n\t            H[4] = (H[4] + e) | 0;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Return final computed hash\n\t            return this._hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA1('message');\n\t     *     var hash = CryptoJS.SHA1(wordArray);\n\t     */\n\t    C.SHA1 = Hasher._createHelper(SHA1);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA1(message, key);\n\t     */\n\t    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);\n\t}());\n\n\n\treturn CryptoJS.SHA1;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Initialization and round constants tables\n\t    var H = [];\n\t    var K = [];\n\n\t    // Compute constants\n\t    (function () {\n\t        function isPrime(n) {\n\t            var sqrtN = Math.sqrt(n);\n\t            for (var factor = 2; factor <= sqrtN; factor++) {\n\t                if (!(n % factor)) {\n\t                    return false;\n\t                }\n\t            }\n\n\t            return true;\n\t        }\n\n\t        function getFractionalBits(n) {\n\t            return ((n - (n | 0)) * 0x100000000) | 0;\n\t        }\n\n\t        var n = 2;\n\t        var nPrime = 0;\n\t        while (nPrime < 64) {\n\t            if (isPrime(n)) {\n\t                if (nPrime < 8) {\n\t                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));\n\t                }\n\t                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));\n\n\t                nPrime++;\n\t            }\n\n\t            n++;\n\t        }\n\t    }());\n\n\t    // Reusable object\n\t    var W = [];\n\n\t    /**\n\t     * SHA-256 hash algorithm.\n\t     */\n\t    var SHA256 = C_algo.SHA256 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init(H.slice(0));\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var H = this._hash.words;\n\n\t            // Working variables\n\t            var a = H[0];\n\t            var b = H[1];\n\t            var c = H[2];\n\t            var d = H[3];\n\t            var e = H[4];\n\t            var f = H[5];\n\t            var g = H[6];\n\t            var h = H[7];\n\n\t            // Computation\n\t            for (var i = 0; i < 64; i++) {\n\t                if (i < 16) {\n\t                    W[i] = M[offset + i] | 0;\n\t                } else {\n\t                    var gamma0x = W[i - 15];\n\t                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^\n\t                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^\n\t                                   (gamma0x >>> 3);\n\n\t                    var gamma1x = W[i - 2];\n\t                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^\n\t                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^\n\t                                   (gamma1x >>> 10);\n\n\t                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];\n\t                }\n\n\t                var ch  = (e & f) ^ (~e & g);\n\t                var maj = (a & b) ^ (a & c) ^ (b & c);\n\n\t                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));\n\t                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));\n\n\t                var t1 = h + sigma1 + ch + K[i] + W[i];\n\t                var t2 = sigma0 + maj;\n\n\t                h = g;\n\t                g = f;\n\t                f = e;\n\t                e = (d + t1) | 0;\n\t                d = c;\n\t                c = b;\n\t                b = a;\n\t                a = (t1 + t2) | 0;\n\t            }\n\n\t            // Intermediate hash value\n\t            H[0] = (H[0] + a) | 0;\n\t            H[1] = (H[1] + b) | 0;\n\t            H[2] = (H[2] + c) | 0;\n\t            H[3] = (H[3] + d) | 0;\n\t            H[4] = (H[4] + e) | 0;\n\t            H[5] = (H[5] + f) | 0;\n\t            H[6] = (H[6] + g) | 0;\n\t            H[7] = (H[7] + h) | 0;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Return final computed hash\n\t            return this._hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA256('message');\n\t     *     var hash = CryptoJS.SHA256(wordArray);\n\t     */\n\t    C.SHA256 = Hasher._createHelper(SHA256);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA256(message, key);\n\t     */\n\t    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);\n\t}(Math));\n\n\n\treturn CryptoJS.SHA256;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha256\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./sha256\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_algo = C.algo;\n\t    var SHA256 = C_algo.SHA256;\n\n\t    /**\n\t     * SHA-224 hash algorithm.\n\t     */\n\t    var SHA224 = C_algo.SHA224 = SHA256.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init([\n\t                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,\n\t                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4\n\t            ]);\n\t        },\n\n\t        _doFinalize: function () {\n\t            var hash = SHA256._doFinalize.call(this);\n\n\t            hash.sigBytes -= 4;\n\n\t            return hash;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA224('message');\n\t     *     var hash = CryptoJS.SHA224(wordArray);\n\t     */\n\t    C.SHA224 = SHA256._createHelper(SHA224);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA224(message, key);\n\t     */\n\t    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);\n\t}());\n\n\n\treturn CryptoJS.SHA224;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_x64 = C.x64;\n\t    var X64Word = C_x64.Word;\n\t    var X64WordArray = C_x64.WordArray;\n\t    var C_algo = C.algo;\n\n\t    function X64Word_create() {\n\t        return X64Word.create.apply(X64Word, arguments);\n\t    }\n\n\t    // Constants\n\t    var K = [\n\t        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),\n\t        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),\n\t        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),\n\t        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),\n\t        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),\n\t        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),\n\t        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),\n\t        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),\n\t        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),\n\t        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),\n\t        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),\n\t        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),\n\t        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),\n\t        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),\n\t        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),\n\t        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),\n\t        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),\n\t        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),\n\t        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),\n\t        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),\n\t        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),\n\t        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),\n\t        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),\n\t        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),\n\t        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),\n\t        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),\n\t        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),\n\t        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),\n\t        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),\n\t        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),\n\t        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),\n\t        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),\n\t        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),\n\t        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),\n\t        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),\n\t        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),\n\t        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),\n\t        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),\n\t        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),\n\t        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)\n\t    ];\n\n\t    // Reusable objects\n\t    var W = [];\n\t    (function () {\n\t        for (var i = 0; i < 80; i++) {\n\t            W[i] = X64Word_create();\n\t        }\n\t    }());\n\n\t    /**\n\t     * SHA-512 hash algorithm.\n\t     */\n\t    var SHA512 = C_algo.SHA512 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new X64WordArray.init([\n\t                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),\n\t                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),\n\t                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),\n\t                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)\n\t            ]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcuts\n\t            var H = this._hash.words;\n\n\t            var H0 = H[0];\n\t            var H1 = H[1];\n\t            var H2 = H[2];\n\t            var H3 = H[3];\n\t            var H4 = H[4];\n\t            var H5 = H[5];\n\t            var H6 = H[6];\n\t            var H7 = H[7];\n\n\t            var H0h = H0.high;\n\t            var H0l = H0.low;\n\t            var H1h = H1.high;\n\t            var H1l = H1.low;\n\t            var H2h = H2.high;\n\t            var H2l = H2.low;\n\t            var H3h = H3.high;\n\t            var H3l = H3.low;\n\t            var H4h = H4.high;\n\t            var H4l = H4.low;\n\t            var H5h = H5.high;\n\t            var H5l = H5.low;\n\t            var H6h = H6.high;\n\t            var H6l = H6.low;\n\t            var H7h = H7.high;\n\t            var H7l = H7.low;\n\n\t            // Working variables\n\t            var ah = H0h;\n\t            var al = H0l;\n\t            var bh = H1h;\n\t            var bl = H1l;\n\t            var ch = H2h;\n\t            var cl = H2l;\n\t            var dh = H3h;\n\t            var dl = H3l;\n\t            var eh = H4h;\n\t            var el = H4l;\n\t            var fh = H5h;\n\t            var fl = H5l;\n\t            var gh = H6h;\n\t            var gl = H6l;\n\t            var hh = H7h;\n\t            var hl = H7l;\n\n\t            // Rounds\n\t            for (var i = 0; i < 80; i++) {\n\t                var Wil;\n\t                var Wih;\n\n\t                // Shortcut\n\t                var Wi = W[i];\n\n\t                // Extend message\n\t                if (i < 16) {\n\t                    Wih = Wi.high = M[offset + i * 2]     | 0;\n\t                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;\n\t                } else {\n\t                    // Gamma0\n\t                    var gamma0x  = W[i - 15];\n\t                    var gamma0xh = gamma0x.high;\n\t                    var gamma0xl = gamma0x.low;\n\t                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);\n\t                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));\n\n\t                    // Gamma1\n\t                    var gamma1x  = W[i - 2];\n\t                    var gamma1xh = gamma1x.high;\n\t                    var gamma1xl = gamma1x.low;\n\t                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);\n\t                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));\n\n\t                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]\n\t                    var Wi7  = W[i - 7];\n\t                    var Wi7h = Wi7.high;\n\t                    var Wi7l = Wi7.low;\n\n\t                    var Wi16  = W[i - 16];\n\t                    var Wi16h = Wi16.high;\n\t                    var Wi16l = Wi16.low;\n\n\t                    Wil = gamma0l + Wi7l;\n\t                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);\n\t                    Wil = Wil + gamma1l;\n\t                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);\n\t                    Wil = Wil + Wi16l;\n\t                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);\n\n\t                    Wi.high = Wih;\n\t                    Wi.low  = Wil;\n\t                }\n\n\t                var chh  = (eh & fh) ^ (~eh & gh);\n\t                var chl  = (el & fl) ^ (~el & gl);\n\t                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);\n\t                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);\n\n\t                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));\n\t                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));\n\t                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));\n\t                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));\n\n\t                // t1 = h + sigma1 + ch + K[i] + W[i]\n\t                var Ki  = K[i];\n\t                var Kih = Ki.high;\n\t                var Kil = Ki.low;\n\n\t                var t1l = hl + sigma1l;\n\t                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);\n\t                var t1l = t1l + chl;\n\t                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);\n\t                var t1l = t1l + Kil;\n\t                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);\n\t                var t1l = t1l + Wil;\n\t                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);\n\n\t                // t2 = sigma0 + maj\n\t                var t2l = sigma0l + majl;\n\t                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);\n\n\t                // Update working variables\n\t                hh = gh;\n\t                hl = gl;\n\t                gh = fh;\n\t                gl = fl;\n\t                fh = eh;\n\t                fl = el;\n\t                el = (dl + t1l) | 0;\n\t                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;\n\t                dh = ch;\n\t                dl = cl;\n\t                ch = bh;\n\t                cl = bl;\n\t                bh = ah;\n\t                bl = al;\n\t                al = (t1l + t2l) | 0;\n\t                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;\n\t            }\n\n\t            // Intermediate hash value\n\t            H0l = H0.low  = (H0l + al);\n\t            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));\n\t            H1l = H1.low  = (H1l + bl);\n\t            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));\n\t            H2l = H2.low  = (H2l + cl);\n\t            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));\n\t            H3l = H3.low  = (H3l + dl);\n\t            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));\n\t            H4l = H4.low  = (H4l + el);\n\t            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));\n\t            H5l = H5.low  = (H5l + fl);\n\t            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));\n\t            H6l = H6.low  = (H6l + gl);\n\t            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));\n\t            H7l = H7.low  = (H7l + hl);\n\t            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);\n\t            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Convert hash to 32-bit word array before returning\n\t            var hash = this._hash.toX32();\n\n\t            // Return final computed hash\n\t            return hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        },\n\n\t        blockSize: 1024/32\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA512('message');\n\t     *     var hash = CryptoJS.SHA512(wordArray);\n\t     */\n\t    C.SHA512 = Hasher._createHelper(SHA512);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA512(message, key);\n\t     */\n\t    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);\n\t}());\n\n\n\treturn CryptoJS.SHA512;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"), require(\"./sha512\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\", \"./sha512\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_x64 = C.x64;\n\t    var X64Word = C_x64.Word;\n\t    var X64WordArray = C_x64.WordArray;\n\t    var C_algo = C.algo;\n\t    var SHA512 = C_algo.SHA512;\n\n\t    /**\n\t     * SHA-384 hash algorithm.\n\t     */\n\t    var SHA384 = C_algo.SHA384 = SHA512.extend({\n\t        _doReset: function () {\n\t            this._hash = new X64WordArray.init([\n\t                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),\n\t                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),\n\t                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),\n\t                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)\n\t            ]);\n\t        },\n\n\t        _doFinalize: function () {\n\t            var hash = SHA512._doFinalize.call(this);\n\n\t            hash.sigBytes -= 16;\n\n\t            return hash;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA384('message');\n\t     *     var hash = CryptoJS.SHA384(wordArray);\n\t     */\n\t    C.SHA384 = SHA512._createHelper(SHA384);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA384(message, key);\n\t     */\n\t    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);\n\t}());\n\n\n\treturn CryptoJS.SHA384;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_x64 = C.x64;\n\t    var X64Word = C_x64.Word;\n\t    var C_algo = C.algo;\n\n\t    // Constants tables\n\t    var RHO_OFFSETS = [];\n\t    var PI_INDEXES  = [];\n\t    var ROUND_CONSTANTS = [];\n\n\t    // Compute Constants\n\t    (function () {\n\t        // Compute rho offset constants\n\t        var x = 1, y = 0;\n\t        for (var t = 0; t < 24; t++) {\n\t            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;\n\n\t            var newX = y % 5;\n\t            var newY = (2 * x + 3 * y) % 5;\n\t            x = newX;\n\t            y = newY;\n\t        }\n\n\t        // Compute pi index constants\n\t        for (var x = 0; x < 5; x++) {\n\t            for (var y = 0; y < 5; y++) {\n\t                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;\n\t            }\n\t        }\n\n\t        // Compute round constants\n\t        var LFSR = 0x01;\n\t        for (var i = 0; i < 24; i++) {\n\t            var roundConstantMsw = 0;\n\t            var roundConstantLsw = 0;\n\n\t            for (var j = 0; j < 7; j++) {\n\t                if (LFSR & 0x01) {\n\t                    var bitPosition = (1 << j) - 1;\n\t                    if (bitPosition < 32) {\n\t                        roundConstantLsw ^= 1 << bitPosition;\n\t                    } else /* if (bitPosition >= 32) */ {\n\t                        roundConstantMsw ^= 1 << (bitPosition - 32);\n\t                    }\n\t                }\n\n\t                // Compute next LFSR\n\t                if (LFSR & 0x80) {\n\t                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1\n\t                    LFSR = (LFSR << 1) ^ 0x71;\n\t                } else {\n\t                    LFSR <<= 1;\n\t                }\n\t            }\n\n\t            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);\n\t        }\n\t    }());\n\n\t    // Reusable objects for temporary values\n\t    var T = [];\n\t    (function () {\n\t        for (var i = 0; i < 25; i++) {\n\t            T[i] = X64Word.create();\n\t        }\n\t    }());\n\n\t    /**\n\t     * SHA-3 hash algorithm.\n\t     */\n\t    var SHA3 = C_algo.SHA3 = Hasher.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} outputLength\n\t         *   The desired number of bits in the output hash.\n\t         *   Only values permitted are: 224, 256, 384, 512.\n\t         *   Default: 512\n\t         */\n\t        cfg: Hasher.cfg.extend({\n\t            outputLength: 512\n\t        }),\n\n\t        _doReset: function () {\n\t            var state = this._state = []\n\t            for (var i = 0; i < 25; i++) {\n\t                state[i] = new X64Word.init();\n\t            }\n\n\t            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcuts\n\t            var state = this._state;\n\t            var nBlockSizeLanes = this.blockSize / 2;\n\n\t            // Absorb\n\t            for (var i = 0; i < nBlockSizeLanes; i++) {\n\t                // Shortcuts\n\t                var M2i  = M[offset + 2 * i];\n\t                var M2i1 = M[offset + 2 * i + 1];\n\n\t                // Swap endian\n\t                M2i = (\n\t                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |\n\t                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)\n\t                );\n\t                M2i1 = (\n\t                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |\n\t                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)\n\t                );\n\n\t                // Absorb message into state\n\t                var lane = state[i];\n\t                lane.high ^= M2i1;\n\t                lane.low  ^= M2i;\n\t            }\n\n\t            // Rounds\n\t            for (var round = 0; round < 24; round++) {\n\t                // Theta\n\t                for (var x = 0; x < 5; x++) {\n\t                    // Mix column lanes\n\t                    var tMsw = 0, tLsw = 0;\n\t                    for (var y = 0; y < 5; y++) {\n\t                        var lane = state[x + 5 * y];\n\t                        tMsw ^= lane.high;\n\t                        tLsw ^= lane.low;\n\t                    }\n\n\t                    // Temporary values\n\t                    var Tx = T[x];\n\t                    Tx.high = tMsw;\n\t                    Tx.low  = tLsw;\n\t                }\n\t                for (var x = 0; x < 5; x++) {\n\t                    // Shortcuts\n\t                    var Tx4 = T[(x + 4) % 5];\n\t                    var Tx1 = T[(x + 1) % 5];\n\t                    var Tx1Msw = Tx1.high;\n\t                    var Tx1Lsw = Tx1.low;\n\n\t                    // Mix surrounding columns\n\t                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));\n\t                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));\n\t                    for (var y = 0; y < 5; y++) {\n\t                        var lane = state[x + 5 * y];\n\t                        lane.high ^= tMsw;\n\t                        lane.low  ^= tLsw;\n\t                    }\n\t                }\n\n\t                // Rho Pi\n\t                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {\n\t                    var tMsw;\n\t                    var tLsw;\n\n\t                    // Shortcuts\n\t                    var lane = state[laneIndex];\n\t                    var laneMsw = lane.high;\n\t                    var laneLsw = lane.low;\n\t                    var rhoOffset = RHO_OFFSETS[laneIndex];\n\n\t                    // Rotate lanes\n\t                    if (rhoOffset < 32) {\n\t                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));\n\t                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));\n\t                    } else /* if (rhoOffset >= 32) */ {\n\t                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));\n\t                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));\n\t                    }\n\n\t                    // Transpose lanes\n\t                    var TPiLane = T[PI_INDEXES[laneIndex]];\n\t                    TPiLane.high = tMsw;\n\t                    TPiLane.low  = tLsw;\n\t                }\n\n\t                // Rho pi at x = y = 0\n\t                var T0 = T[0];\n\t                var state0 = state[0];\n\t                T0.high = state0.high;\n\t                T0.low  = state0.low;\n\n\t                // Chi\n\t                for (var x = 0; x < 5; x++) {\n\t                    for (var y = 0; y < 5; y++) {\n\t                        // Shortcuts\n\t                        var laneIndex = x + 5 * y;\n\t                        var lane = state[laneIndex];\n\t                        var TLane = T[laneIndex];\n\t                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];\n\t                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];\n\n\t                        // Mix rows\n\t                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);\n\t                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);\n\t                    }\n\t                }\n\n\t                // Iota\n\t                var lane = state[0];\n\t                var roundConstant = ROUND_CONSTANTS[round];\n\t                lane.high ^= roundConstant.high;\n\t                lane.low  ^= roundConstant.low;\n\t            }\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\t            var blockSizeBits = this.blockSize * 32;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);\n\t            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Shortcuts\n\t            var state = this._state;\n\t            var outputLengthBytes = this.cfg.outputLength / 8;\n\t            var outputLengthLanes = outputLengthBytes / 8;\n\n\t            // Squeeze\n\t            var hashWords = [];\n\t            for (var i = 0; i < outputLengthLanes; i++) {\n\t                // Shortcuts\n\t                var lane = state[i];\n\t                var laneMsw = lane.high;\n\t                var laneLsw = lane.low;\n\n\t                // Swap endian\n\t                laneMsw = (\n\t                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |\n\t                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)\n\t                );\n\t                laneLsw = (\n\t                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |\n\t                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)\n\t                );\n\n\t                // Squeeze state to retrieve hash\n\t                hashWords.push(laneLsw);\n\t                hashWords.push(laneMsw);\n\t            }\n\n\t            // Return final computed hash\n\t            return new WordArray.init(hashWords, outputLengthBytes);\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\n\t            var state = clone._state = this._state.slice(0);\n\t            for (var i = 0; i < 25; i++) {\n\t                state[i] = state[i].clone();\n\t            }\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA3('message');\n\t     *     var hash = CryptoJS.SHA3(wordArray);\n\t     */\n\t    C.SHA3 = Hasher._createHelper(SHA3);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA3(message, key);\n\t     */\n\t    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);\n\t}(Math));\n\n\n\treturn CryptoJS.SHA3;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/** @preserve\n\t(c) 2012 by Cédric Mesnil. All rights reserved.\n\n\tRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n\t    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\t    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n\tTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\t*/\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Constants table\n\t    var _zl = WordArray.create([\n\t        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,\n\t        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,\n\t        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,\n\t        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,\n\t        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);\n\t    var _zr = WordArray.create([\n\t        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,\n\t        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,\n\t        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,\n\t        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,\n\t        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);\n\t    var _sl = WordArray.create([\n\t         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,\n\t        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,\n\t        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,\n\t          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,\n\t        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);\n\t    var _sr = WordArray.create([\n\t        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,\n\t        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,\n\t        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,\n\t        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,\n\t        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);\n\n\t    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);\n\t    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);\n\n\t    /**\n\t     * RIPEMD160 hash algorithm.\n\t     */\n\t    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\n\t            // Swap endian\n\t            for (var i = 0; i < 16; i++) {\n\t                // Shortcuts\n\t                var offset_i = offset + i;\n\t                var M_offset_i = M[offset_i];\n\n\t                // Swap\n\t                M[offset_i] = (\n\t                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |\n\t                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)\n\t                );\n\t            }\n\t            // Shortcut\n\t            var H  = this._hash.words;\n\t            var hl = _hl.words;\n\t            var hr = _hr.words;\n\t            var zl = _zl.words;\n\t            var zr = _zr.words;\n\t            var sl = _sl.words;\n\t            var sr = _sr.words;\n\n\t            // Working variables\n\t            var al, bl, cl, dl, el;\n\t            var ar, br, cr, dr, er;\n\n\t            ar = al = H[0];\n\t            br = bl = H[1];\n\t            cr = cl = H[2];\n\t            dr = dl = H[3];\n\t            er = el = H[4];\n\t            // Computation\n\t            var t;\n\t            for (var i = 0; i < 80; i += 1) {\n\t                t = (al +  M[offset+zl[i]])|0;\n\t                if (i<16){\n\t\t            t +=  f1(bl,cl,dl) + hl[0];\n\t                } else if (i<32) {\n\t\t            t +=  f2(bl,cl,dl) + hl[1];\n\t                } else if (i<48) {\n\t\t            t +=  f3(bl,cl,dl) + hl[2];\n\t                } else if (i<64) {\n\t\t            t +=  f4(bl,cl,dl) + hl[3];\n\t                } else {// if (i<80) {\n\t\t            t +=  f5(bl,cl,dl) + hl[4];\n\t                }\n\t                t = t|0;\n\t                t =  rotl(t,sl[i]);\n\t                t = (t+el)|0;\n\t                al = el;\n\t                el = dl;\n\t                dl = rotl(cl, 10);\n\t                cl = bl;\n\t                bl = t;\n\n\t                t = (ar + M[offset+zr[i]])|0;\n\t                if (i<16){\n\t\t            t +=  f5(br,cr,dr) + hr[0];\n\t                } else if (i<32) {\n\t\t            t +=  f4(br,cr,dr) + hr[1];\n\t                } else if (i<48) {\n\t\t            t +=  f3(br,cr,dr) + hr[2];\n\t                } else if (i<64) {\n\t\t            t +=  f2(br,cr,dr) + hr[3];\n\t                } else {// if (i<80) {\n\t\t            t +=  f1(br,cr,dr) + hr[4];\n\t                }\n\t                t = t|0;\n\t                t =  rotl(t,sr[i]) ;\n\t                t = (t+er)|0;\n\t                ar = er;\n\t                er = dr;\n\t                dr = rotl(cr, 10);\n\t                cr = br;\n\t                br = t;\n\t            }\n\t            // Intermediate hash value\n\t            t    = (H[1] + cl + dr)|0;\n\t            H[1] = (H[2] + dl + er)|0;\n\t            H[2] = (H[3] + el + ar)|0;\n\t            H[3] = (H[4] + al + br)|0;\n\t            H[4] = (H[0] + bl + cr)|0;\n\t            H[0] =  t;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (\n\t                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |\n\t                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)\n\t            );\n\t            data.sigBytes = (dataWords.length + 1) * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Shortcuts\n\t            var hash = this._hash;\n\t            var H = hash.words;\n\n\t            // Swap endian\n\t            for (var i = 0; i < 5; i++) {\n\t                // Shortcut\n\t                var H_i = H[i];\n\n\t                // Swap\n\t                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |\n\t                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);\n\t            }\n\n\t            // Return final computed hash\n\t            return hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\n\t    function f1(x, y, z) {\n\t        return ((x) ^ (y) ^ (z));\n\n\t    }\n\n\t    function f2(x, y, z) {\n\t        return (((x)&(y)) | ((~x)&(z)));\n\t    }\n\n\t    function f3(x, y, z) {\n\t        return (((x) | (~(y))) ^ (z));\n\t    }\n\n\t    function f4(x, y, z) {\n\t        return (((x) & (z)) | ((y)&(~(z))));\n\t    }\n\n\t    function f5(x, y, z) {\n\t        return ((x) ^ ((y) |(~(z))));\n\n\t    }\n\n\t    function rotl(x,n) {\n\t        return (x<<n) | (x>>>(32-n));\n\t    }\n\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.RIPEMD160('message');\n\t     *     var hash = CryptoJS.RIPEMD160(wordArray);\n\t     */\n\t    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);\n\t     */\n\t    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);\n\t}(Math));\n\n\n\treturn CryptoJS.RIPEMD160;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var C_enc = C.enc;\n\t    var Utf8 = C_enc.Utf8;\n\t    var C_algo = C.algo;\n\n\t    /**\n\t     * HMAC algorithm.\n\t     */\n\t    var HMAC = C_algo.HMAC = Base.extend({\n\t        /**\n\t         * Initializes a newly created HMAC.\n\t         *\n\t         * @param {Hasher} hasher The hash algorithm to use.\n\t         * @param {WordArray|string} key The secret key.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);\n\t         */\n\t        init: function (hasher, key) {\n\t            // Init hasher\n\t            hasher = this._hasher = new hasher.init();\n\n\t            // Convert string to WordArray, else assume WordArray already\n\t            if (typeof key == 'string') {\n\t                key = Utf8.parse(key);\n\t            }\n\n\t            // Shortcuts\n\t            var hasherBlockSize = hasher.blockSize;\n\t            var hasherBlockSizeBytes = hasherBlockSize * 4;\n\n\t            // Allow arbitrary length keys\n\t            if (key.sigBytes > hasherBlockSizeBytes) {\n\t                key = hasher.finalize(key);\n\t            }\n\n\t            // Clamp excess bits\n\t            key.clamp();\n\n\t            // Clone key for inner and outer pads\n\t            var oKey = this._oKey = key.clone();\n\t            var iKey = this._iKey = key.clone();\n\n\t            // Shortcuts\n\t            var oKeyWords = oKey.words;\n\t            var iKeyWords = iKey.words;\n\n\t            // XOR keys with pad constants\n\t            for (var i = 0; i < hasherBlockSize; i++) {\n\t                oKeyWords[i] ^= 0x5c5c5c5c;\n\t                iKeyWords[i] ^= 0x36363636;\n\t            }\n\t            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;\n\n\t            // Set initial values\n\t            this.reset();\n\t        },\n\n\t        /**\n\t         * Resets this HMAC to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     hmacHasher.reset();\n\t         */\n\t        reset: function () {\n\t            // Shortcut\n\t            var hasher = this._hasher;\n\n\t            // Reset\n\t            hasher.reset();\n\t            hasher.update(this._iKey);\n\t        },\n\n\t        /**\n\t         * Updates this HMAC with a message.\n\t         *\n\t         * @param {WordArray|string} messageUpdate The message to append.\n\t         *\n\t         * @return {HMAC} This HMAC instance.\n\t         *\n\t         * @example\n\t         *\n\t         *     hmacHasher.update('message');\n\t         *     hmacHasher.update(wordArray);\n\t         */\n\t        update: function (messageUpdate) {\n\t            this._hasher.update(messageUpdate);\n\n\t            // Chainable\n\t            return this;\n\t        },\n\n\t        /**\n\t         * Finalizes the HMAC computation.\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\n\t         *\n\t         * @param {WordArray|string} messageUpdate (Optional) A final message update.\n\t         *\n\t         * @return {WordArray} The HMAC.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hmac = hmacHasher.finalize();\n\t         *     var hmac = hmacHasher.finalize('message');\n\t         *     var hmac = hmacHasher.finalize(wordArray);\n\t         */\n\t        finalize: function (messageUpdate) {\n\t            // Shortcut\n\t            var hasher = this._hasher;\n\n\t            // Compute HMAC\n\t            var innerHash = hasher.finalize(messageUpdate);\n\t            hasher.reset();\n\t            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));\n\n\t            return hmac;\n\t        }\n\t    });\n\t}());\n\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha256\"), require(\"./hmac\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./sha256\", \"./hmac\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_algo = C.algo;\n\t    var SHA256 = C_algo.SHA256;\n\t    var HMAC = C_algo.HMAC;\n\n\t    /**\n\t     * Password-Based Key Derivation Function 2 algorithm.\n\t     */\n\t    var PBKDF2 = C_algo.PBKDF2 = Base.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)\n\t         * @property {Hasher} hasher The hasher to use. Default: SHA256\n\t         * @property {number} iterations The number of iterations to perform. Default: 250000\n\t         */\n\t        cfg: Base.extend({\n\t            keySize: 128/32,\n\t            hasher: SHA256,\n\t            iterations: 250000\n\t        }),\n\n\t        /**\n\t         * Initializes a newly created key derivation function.\n\t         *\n\t         * @param {Object} cfg (Optional) The configuration options to use for the derivation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create();\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });\n\t         */\n\t        init: function (cfg) {\n\t            this.cfg = this.cfg.extend(cfg);\n\t        },\n\n\t        /**\n\t         * Computes the Password-Based Key Derivation Function 2.\n\t         *\n\t         * @param {WordArray|string} password The password.\n\t         * @param {WordArray|string} salt A salt.\n\t         *\n\t         * @return {WordArray} The derived key.\n\t         *\n\t         * @example\n\t         *\n\t         *     var key = kdf.compute(password, salt);\n\t         */\n\t        compute: function (password, salt) {\n\t            // Shortcut\n\t            var cfg = this.cfg;\n\n\t            // Init HMAC\n\t            var hmac = HMAC.create(cfg.hasher, password);\n\n\t            // Initial values\n\t            var derivedKey = WordArray.create();\n\t            var blockIndex = WordArray.create([0x00000001]);\n\n\t            // Shortcuts\n\t            var derivedKeyWords = derivedKey.words;\n\t            var blockIndexWords = blockIndex.words;\n\t            var keySize = cfg.keySize;\n\t            var iterations = cfg.iterations;\n\n\t            // Generate key\n\t            while (derivedKeyWords.length < keySize) {\n\t                var block = hmac.update(salt).finalize(blockIndex);\n\t                hmac.reset();\n\n\t                // Shortcuts\n\t                var blockWords = block.words;\n\t                var blockWordsLength = blockWords.length;\n\n\t                // Iterations\n\t                var intermediate = block;\n\t                for (var i = 1; i < iterations; i++) {\n\t                    intermediate = hmac.finalize(intermediate);\n\t                    hmac.reset();\n\n\t                    // Shortcut\n\t                    var intermediateWords = intermediate.words;\n\n\t                    // XOR intermediate with block\n\t                    for (var j = 0; j < blockWordsLength; j++) {\n\t                        blockWords[j] ^= intermediateWords[j];\n\t                    }\n\t                }\n\n\t                derivedKey.concat(block);\n\t                blockIndexWords[0]++;\n\t            }\n\t            derivedKey.sigBytes = keySize * 4;\n\n\t            return derivedKey;\n\t        }\n\t    });\n\n\t    /**\n\t     * Computes the Password-Based Key Derivation Function 2.\n\t     *\n\t     * @param {WordArray|string} password The password.\n\t     * @param {WordArray|string} salt A salt.\n\t     * @param {Object} cfg (Optional) The configuration options to use for this computation.\n\t     *\n\t     * @return {WordArray} The derived key.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var key = CryptoJS.PBKDF2(password, salt);\n\t     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });\n\t     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });\n\t     */\n\t    C.PBKDF2 = function (password, salt, cfg) {\n\t        return PBKDF2.create(cfg).compute(password, salt);\n\t    };\n\t}());\n\n\n\treturn CryptoJS.PBKDF2;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha1\"), require(\"./hmac\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./sha1\", \"./hmac\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_algo = C.algo;\n\t    var MD5 = C_algo.MD5;\n\n\t    /**\n\t     * This key derivation function is meant to conform with EVP_BytesToKey.\n\t     * www.openssl.org/docs/crypto/EVP_BytesToKey.html\n\t     */\n\t    var EvpKDF = C_algo.EvpKDF = Base.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)\n\t         * @property {Hasher} hasher The hash algorithm to use. Default: MD5\n\t         * @property {number} iterations The number of iterations to perform. Default: 1\n\t         */\n\t        cfg: Base.extend({\n\t            keySize: 128/32,\n\t            hasher: MD5,\n\t            iterations: 1\n\t        }),\n\n\t        /**\n\t         * Initializes a newly created key derivation function.\n\t         *\n\t         * @param {Object} cfg (Optional) The configuration options to use for the derivation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create();\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });\n\t         */\n\t        init: function (cfg) {\n\t            this.cfg = this.cfg.extend(cfg);\n\t        },\n\n\t        /**\n\t         * Derives a key from a password.\n\t         *\n\t         * @param {WordArray|string} password The password.\n\t         * @param {WordArray|string} salt A salt.\n\t         *\n\t         * @return {WordArray} The derived key.\n\t         *\n\t         * @example\n\t         *\n\t         *     var key = kdf.compute(password, salt);\n\t         */\n\t        compute: function (password, salt) {\n\t            var block;\n\n\t            // Shortcut\n\t            var cfg = this.cfg;\n\n\t            // Init hasher\n\t            var hasher = cfg.hasher.create();\n\n\t            // Initial values\n\t            var derivedKey = WordArray.create();\n\n\t            // Shortcuts\n\t            var derivedKeyWords = derivedKey.words;\n\t            var keySize = cfg.keySize;\n\t            var iterations = cfg.iterations;\n\n\t            // Generate key\n\t            while (derivedKeyWords.length < keySize) {\n\t                if (block) {\n\t                    hasher.update(block);\n\t                }\n\t                block = hasher.update(password).finalize(salt);\n\t                hasher.reset();\n\n\t                // Iterations\n\t                for (var i = 1; i < iterations; i++) {\n\t                    block = hasher.finalize(block);\n\t                    hasher.reset();\n\t                }\n\n\t                derivedKey.concat(block);\n\t            }\n\t            derivedKey.sigBytes = keySize * 4;\n\n\t            return derivedKey;\n\t        }\n\t    });\n\n\t    /**\n\t     * Derives a key from a password.\n\t     *\n\t     * @param {WordArray|string} password The password.\n\t     * @param {WordArray|string} salt A salt.\n\t     * @param {Object} cfg (Optional) The configuration options to use for this computation.\n\t     *\n\t     * @return {WordArray} The derived key.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var key = CryptoJS.EvpKDF(password, salt);\n\t     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });\n\t     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });\n\t     */\n\t    C.EvpKDF = function (password, salt, cfg) {\n\t        return EvpKDF.create(cfg).compute(password, salt);\n\t    };\n\t}());\n\n\n\treturn CryptoJS.EvpKDF;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./evpkdf\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./evpkdf\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Cipher core components.\n\t */\n\tCryptoJS.lib.Cipher || (function (undefined) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var WordArray = C_lib.WordArray;\n\t    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;\n\t    var C_enc = C.enc;\n\t    var Utf8 = C_enc.Utf8;\n\t    var Base64 = C_enc.Base64;\n\t    var C_algo = C.algo;\n\t    var EvpKDF = C_algo.EvpKDF;\n\n\t    /**\n\t     * Abstract base cipher template.\n\t     *\n\t     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)\n\t     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)\n\t     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.\n\t     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.\n\t     */\n\t    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {WordArray} iv The IV to use for this operation.\n\t         */\n\t        cfg: Base.extend(),\n\n\t        /**\n\t         * Creates this cipher in encryption mode.\n\t         *\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {Cipher} A cipher instance.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });\n\t         */\n\t        createEncryptor: function (key, cfg) {\n\t            return this.create(this._ENC_XFORM_MODE, key, cfg);\n\t        },\n\n\t        /**\n\t         * Creates this cipher in decryption mode.\n\t         *\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {Cipher} A cipher instance.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });\n\t         */\n\t        createDecryptor: function (key, cfg) {\n\t            return this.create(this._DEC_XFORM_MODE, key, cfg);\n\t        },\n\n\t        /**\n\t         * Initializes a newly created cipher.\n\t         *\n\t         * @param {number} xformMode Either the encryption or decryption transormation mode constant.\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });\n\t         */\n\t        init: function (xformMode, key, cfg) {\n\t            // Apply config defaults\n\t            this.cfg = this.cfg.extend(cfg);\n\n\t            // Store transform mode and key\n\t            this._xformMode = xformMode;\n\t            this._key = key;\n\n\t            // Set initial values\n\t            this.reset();\n\t        },\n\n\t        /**\n\t         * Resets this cipher to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     cipher.reset();\n\t         */\n\t        reset: function () {\n\t            // Reset data buffer\n\t            BufferedBlockAlgorithm.reset.call(this);\n\n\t            // Perform concrete-cipher logic\n\t            this._doReset();\n\t        },\n\n\t        /**\n\t         * Adds data to be encrypted or decrypted.\n\t         *\n\t         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.\n\t         *\n\t         * @return {WordArray} The data after processing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var encrypted = cipher.process('data');\n\t         *     var encrypted = cipher.process(wordArray);\n\t         */\n\t        process: function (dataUpdate) {\n\t            // Append\n\t            this._append(dataUpdate);\n\n\t            // Process available blocks\n\t            return this._process();\n\t        },\n\n\t        /**\n\t         * Finalizes the encryption or decryption process.\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\n\t         *\n\t         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.\n\t         *\n\t         * @return {WordArray} The data after final processing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var encrypted = cipher.finalize();\n\t         *     var encrypted = cipher.finalize('data');\n\t         *     var encrypted = cipher.finalize(wordArray);\n\t         */\n\t        finalize: function (dataUpdate) {\n\t            // Final data update\n\t            if (dataUpdate) {\n\t                this._append(dataUpdate);\n\t            }\n\n\t            // Perform concrete-cipher logic\n\t            var finalProcessedData = this._doFinalize();\n\n\t            return finalProcessedData;\n\t        },\n\n\t        keySize: 128/32,\n\n\t        ivSize: 128/32,\n\n\t        _ENC_XFORM_MODE: 1,\n\n\t        _DEC_XFORM_MODE: 2,\n\n\t        /**\n\t         * Creates shortcut functions to a cipher's object interface.\n\t         *\n\t         * @param {Cipher} cipher The cipher to create a helper for.\n\t         *\n\t         * @return {Object} An object with encrypt and decrypt shortcut functions.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);\n\t         */\n\t        _createHelper: (function () {\n\t            function selectCipherStrategy(key) {\n\t                if (typeof key == 'string') {\n\t                    return PasswordBasedCipher;\n\t                } else {\n\t                    return SerializableCipher;\n\t                }\n\t            }\n\n\t            return function (cipher) {\n\t                return {\n\t                    encrypt: function (message, key, cfg) {\n\t                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);\n\t                    },\n\n\t                    decrypt: function (ciphertext, key, cfg) {\n\t                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);\n\t                    }\n\t                };\n\t            };\n\t        }())\n\t    });\n\n\t    /**\n\t     * Abstract base stream cipher template.\n\t     *\n\t     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)\n\t     */\n\t    var StreamCipher = C_lib.StreamCipher = Cipher.extend({\n\t        _doFinalize: function () {\n\t            // Process partial blocks\n\t            var finalProcessedBlocks = this._process(!!'flush');\n\n\t            return finalProcessedBlocks;\n\t        },\n\n\t        blockSize: 1\n\t    });\n\n\t    /**\n\t     * Mode namespace.\n\t     */\n\t    var C_mode = C.mode = {};\n\n\t    /**\n\t     * Abstract base block cipher mode template.\n\t     */\n\t    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({\n\t        /**\n\t         * Creates this mode for encryption.\n\t         *\n\t         * @param {Cipher} cipher A block cipher instance.\n\t         * @param {Array} iv The IV words.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);\n\t         */\n\t        createEncryptor: function (cipher, iv) {\n\t            return this.Encryptor.create(cipher, iv);\n\t        },\n\n\t        /**\n\t         * Creates this mode for decryption.\n\t         *\n\t         * @param {Cipher} cipher A block cipher instance.\n\t         * @param {Array} iv The IV words.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);\n\t         */\n\t        createDecryptor: function (cipher, iv) {\n\t            return this.Decryptor.create(cipher, iv);\n\t        },\n\n\t        /**\n\t         * Initializes a newly created mode.\n\t         *\n\t         * @param {Cipher} cipher A block cipher instance.\n\t         * @param {Array} iv The IV words.\n\t         *\n\t         * @example\n\t         *\n\t         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);\n\t         */\n\t        init: function (cipher, iv) {\n\t            this._cipher = cipher;\n\t            this._iv = iv;\n\t        }\n\t    });\n\n\t    /**\n\t     * Cipher Block Chaining mode.\n\t     */\n\t    var CBC = C_mode.CBC = (function () {\n\t        /**\n\t         * Abstract base CBC mode.\n\t         */\n\t        var CBC = BlockCipherMode.extend();\n\n\t        /**\n\t         * CBC encryptor.\n\t         */\n\t        CBC.Encryptor = CBC.extend({\n\t            /**\n\t             * Processes the data block at offset.\n\t             *\n\t             * @param {Array} words The data words to operate on.\n\t             * @param {number} offset The offset where the block starts.\n\t             *\n\t             * @example\n\t             *\n\t             *     mode.processBlock(data.words, offset);\n\t             */\n\t            processBlock: function (words, offset) {\n\t                // Shortcuts\n\t                var cipher = this._cipher;\n\t                var blockSize = cipher.blockSize;\n\n\t                // XOR and encrypt\n\t                xorBlock.call(this, words, offset, blockSize);\n\t                cipher.encryptBlock(words, offset);\n\n\t                // Remember this block to use with next block\n\t                this._prevBlock = words.slice(offset, offset + blockSize);\n\t            }\n\t        });\n\n\t        /**\n\t         * CBC decryptor.\n\t         */\n\t        CBC.Decryptor = CBC.extend({\n\t            /**\n\t             * Processes the data block at offset.\n\t             *\n\t             * @param {Array} words The data words to operate on.\n\t             * @param {number} offset The offset where the block starts.\n\t             *\n\t             * @example\n\t             *\n\t             *     mode.processBlock(data.words, offset);\n\t             */\n\t            processBlock: function (words, offset) {\n\t                // Shortcuts\n\t                var cipher = this._cipher;\n\t                var blockSize = cipher.blockSize;\n\n\t                // Remember this block to use with next block\n\t                var thisBlock = words.slice(offset, offset + blockSize);\n\n\t                // Decrypt and XOR\n\t                cipher.decryptBlock(words, offset);\n\t                xorBlock.call(this, words, offset, blockSize);\n\n\t                // This block becomes the previous block\n\t                this._prevBlock = thisBlock;\n\t            }\n\t        });\n\n\t        function xorBlock(words, offset, blockSize) {\n\t            var block;\n\n\t            // Shortcut\n\t            var iv = this._iv;\n\n\t            // Choose mixing block\n\t            if (iv) {\n\t                block = iv;\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            } else {\n\t                block = this._prevBlock;\n\t            }\n\n\t            // XOR blocks\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= block[i];\n\t            }\n\t        }\n\n\t        return CBC;\n\t    }());\n\n\t    /**\n\t     * Padding namespace.\n\t     */\n\t    var C_pad = C.pad = {};\n\n\t    /**\n\t     * PKCS #5/7 padding strategy.\n\t     */\n\t    var Pkcs7 = C_pad.Pkcs7 = {\n\t        /**\n\t         * Pads data using the algorithm defined in PKCS #5/7.\n\t         *\n\t         * @param {WordArray} data The data to pad.\n\t         * @param {number} blockSize The multiple that the data should be padded to.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);\n\t         */\n\t        pad: function (data, blockSize) {\n\t            // Shortcut\n\t            var blockSizeBytes = blockSize * 4;\n\n\t            // Count padding bytes\n\t            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;\n\n\t            // Create padding word\n\t            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;\n\n\t            // Create padding\n\t            var paddingWords = [];\n\t            for (var i = 0; i < nPaddingBytes; i += 4) {\n\t                paddingWords.push(paddingWord);\n\t            }\n\t            var padding = WordArray.create(paddingWords, nPaddingBytes);\n\n\t            // Add padding\n\t            data.concat(padding);\n\t        },\n\n\t        /**\n\t         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.\n\t         *\n\t         * @param {WordArray} data The data to unpad.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     CryptoJS.pad.Pkcs7.unpad(wordArray);\n\t         */\n\t        unpad: function (data) {\n\t            // Get number of padding bytes from last byte\n\t            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\n\n\t            // Remove padding\n\t            data.sigBytes -= nPaddingBytes;\n\t        }\n\t    };\n\n\t    /**\n\t     * Abstract base block cipher template.\n\t     *\n\t     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)\n\t     */\n\t    var BlockCipher = C_lib.BlockCipher = Cipher.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {Mode} mode The block mode to use. Default: CBC\n\t         * @property {Padding} padding The padding strategy to use. Default: Pkcs7\n\t         */\n\t        cfg: Cipher.cfg.extend({\n\t            mode: CBC,\n\t            padding: Pkcs7\n\t        }),\n\n\t        reset: function () {\n\t            var modeCreator;\n\n\t            // Reset cipher\n\t            Cipher.reset.call(this);\n\n\t            // Shortcuts\n\t            var cfg = this.cfg;\n\t            var iv = cfg.iv;\n\t            var mode = cfg.mode;\n\n\t            // Reset block mode\n\t            if (this._xformMode == this._ENC_XFORM_MODE) {\n\t                modeCreator = mode.createEncryptor;\n\t            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {\n\t                modeCreator = mode.createDecryptor;\n\t                // Keep at least one block in the buffer for unpadding\n\t                this._minBufferSize = 1;\n\t            }\n\n\t            if (this._mode && this._mode.__creator == modeCreator) {\n\t                this._mode.init(this, iv && iv.words);\n\t            } else {\n\t                this._mode = modeCreator.call(mode, this, iv && iv.words);\n\t                this._mode.__creator = modeCreator;\n\t            }\n\t        },\n\n\t        _doProcessBlock: function (words, offset) {\n\t            this._mode.processBlock(words, offset);\n\t        },\n\n\t        _doFinalize: function () {\n\t            var finalProcessedBlocks;\n\n\t            // Shortcut\n\t            var padding = this.cfg.padding;\n\n\t            // Finalize\n\t            if (this._xformMode == this._ENC_XFORM_MODE) {\n\t                // Pad data\n\t                padding.pad(this._data, this.blockSize);\n\n\t                // Process final blocks\n\t                finalProcessedBlocks = this._process(!!'flush');\n\t            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {\n\t                // Process final blocks\n\t                finalProcessedBlocks = this._process(!!'flush');\n\n\t                // Unpad data\n\t                padding.unpad(finalProcessedBlocks);\n\t            }\n\n\t            return finalProcessedBlocks;\n\t        },\n\n\t        blockSize: 128/32\n\t    });\n\n\t    /**\n\t     * A collection of cipher parameters.\n\t     *\n\t     * @property {WordArray} ciphertext The raw ciphertext.\n\t     * @property {WordArray} key The key to this ciphertext.\n\t     * @property {WordArray} iv The IV used in the ciphering operation.\n\t     * @property {WordArray} salt The salt used with a key derivation function.\n\t     * @property {Cipher} algorithm The cipher algorithm.\n\t     * @property {Mode} mode The block mode used in the ciphering operation.\n\t     * @property {Padding} padding The padding scheme used in the ciphering operation.\n\t     * @property {number} blockSize The block size of the cipher.\n\t     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.\n\t     */\n\t    var CipherParams = C_lib.CipherParams = Base.extend({\n\t        /**\n\t         * Initializes a newly created cipher params object.\n\t         *\n\t         * @param {Object} cipherParams An object with any of the possible cipher parameters.\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipherParams = CryptoJS.lib.CipherParams.create({\n\t         *         ciphertext: ciphertextWordArray,\n\t         *         key: keyWordArray,\n\t         *         iv: ivWordArray,\n\t         *         salt: saltWordArray,\n\t         *         algorithm: CryptoJS.algo.AES,\n\t         *         mode: CryptoJS.mode.CBC,\n\t         *         padding: CryptoJS.pad.PKCS7,\n\t         *         blockSize: 4,\n\t         *         formatter: CryptoJS.format.OpenSSL\n\t         *     });\n\t         */\n\t        init: function (cipherParams) {\n\t            this.mixIn(cipherParams);\n\t        },\n\n\t        /**\n\t         * Converts this cipher params object to a string.\n\t         *\n\t         * @param {Format} formatter (Optional) The formatting strategy to use.\n\t         *\n\t         * @return {string} The stringified cipher params.\n\t         *\n\t         * @throws Error If neither the formatter nor the default formatter is set.\n\t         *\n\t         * @example\n\t         *\n\t         *     var string = cipherParams + '';\n\t         *     var string = cipherParams.toString();\n\t         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);\n\t         */\n\t        toString: function (formatter) {\n\t            return (formatter || this.formatter).stringify(this);\n\t        }\n\t    });\n\n\t    /**\n\t     * Format namespace.\n\t     */\n\t    var C_format = C.format = {};\n\n\t    /**\n\t     * OpenSSL formatting strategy.\n\t     */\n\t    var OpenSSLFormatter = C_format.OpenSSL = {\n\t        /**\n\t         * Converts a cipher params object to an OpenSSL-compatible string.\n\t         *\n\t         * @param {CipherParams} cipherParams The cipher params object.\n\t         *\n\t         * @return {string} The OpenSSL-compatible string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);\n\t         */\n\t        stringify: function (cipherParams) {\n\t            var wordArray;\n\n\t            // Shortcuts\n\t            var ciphertext = cipherParams.ciphertext;\n\t            var salt = cipherParams.salt;\n\n\t            // Format\n\t            if (salt) {\n\t                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);\n\t            } else {\n\t                wordArray = ciphertext;\n\t            }\n\n\t            return wordArray.toString(Base64);\n\t        },\n\n\t        /**\n\t         * Converts an OpenSSL-compatible string to a cipher params object.\n\t         *\n\t         * @param {string} openSSLStr The OpenSSL-compatible string.\n\t         *\n\t         * @return {CipherParams} The cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);\n\t         */\n\t        parse: function (openSSLStr) {\n\t            var salt;\n\n\t            // Parse base64\n\t            var ciphertext = Base64.parse(openSSLStr);\n\n\t            // Shortcut\n\t            var ciphertextWords = ciphertext.words;\n\n\t            // Test for salt\n\t            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {\n\t                // Extract salt\n\t                salt = WordArray.create(ciphertextWords.slice(2, 4));\n\n\t                // Remove salt from ciphertext\n\t                ciphertextWords.splice(0, 4);\n\t                ciphertext.sigBytes -= 16;\n\t            }\n\n\t            return CipherParams.create({ ciphertext: ciphertext, salt: salt });\n\t        }\n\t    };\n\n\t    /**\n\t     * A cipher wrapper that returns ciphertext as a serializable cipher params object.\n\t     */\n\t    var SerializableCipher = C_lib.SerializableCipher = Base.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL\n\t         */\n\t        cfg: Base.extend({\n\t            format: OpenSSLFormatter\n\t        }),\n\n\t        /**\n\t         * Encrypts a message.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {WordArray|string} message The message to encrypt.\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {CipherParams} A cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });\n\t         */\n\t        encrypt: function (cipher, message, key, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Encrypt\n\t            var encryptor = cipher.createEncryptor(key, cfg);\n\t            var ciphertext = encryptor.finalize(message);\n\n\t            // Shortcut\n\t            var cipherCfg = encryptor.cfg;\n\n\t            // Create and return serializable cipher params\n\t            return CipherParams.create({\n\t                ciphertext: ciphertext,\n\t                key: key,\n\t                iv: cipherCfg.iv,\n\t                algorithm: cipher,\n\t                mode: cipherCfg.mode,\n\t                padding: cipherCfg.padding,\n\t                blockSize: cipher.blockSize,\n\t                formatter: cfg.format\n\t            });\n\t        },\n\n\t        /**\n\t         * Decrypts serialized ciphertext.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {WordArray} The plaintext.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });\n\t         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });\n\t         */\n\t        decrypt: function (cipher, ciphertext, key, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Convert string to CipherParams\n\t            ciphertext = this._parse(ciphertext, cfg.format);\n\n\t            // Decrypt\n\t            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);\n\n\t            return plaintext;\n\t        },\n\n\t        /**\n\t         * Converts serialized ciphertext to CipherParams,\n\t         * else assumed CipherParams already and returns ciphertext unchanged.\n\t         *\n\t         * @param {CipherParams|string} ciphertext The ciphertext.\n\t         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.\n\t         *\n\t         * @return {CipherParams} The unserialized ciphertext.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);\n\t         */\n\t        _parse: function (ciphertext, format) {\n\t            if (typeof ciphertext == 'string') {\n\t                return format.parse(ciphertext, this);\n\t            } else {\n\t                return ciphertext;\n\t            }\n\t        }\n\t    });\n\n\t    /**\n\t     * Key derivation function namespace.\n\t     */\n\t    var C_kdf = C.kdf = {};\n\n\t    /**\n\t     * OpenSSL key derivation function.\n\t     */\n\t    var OpenSSLKdf = C_kdf.OpenSSL = {\n\t        /**\n\t         * Derives a key and IV from a password.\n\t         *\n\t         * @param {string} password The password to derive from.\n\t         * @param {number} keySize The size in words of the key to generate.\n\t         * @param {number} ivSize The size in words of the IV to generate.\n\t         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.\n\t         *\n\t         * @return {CipherParams} A cipher params object with the key, IV, and salt.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);\n\t         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');\n\t         */\n\t        execute: function (password, keySize, ivSize, salt, hasher) {\n\t            // Generate random salt\n\t            if (!salt) {\n\t                salt = WordArray.random(64/8);\n\t            }\n\n\t            // Derive key and IV\n\t            if (!hasher) {\n\t                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);\n\t            } else {\n\t                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);\n\t            }\n\n\n\t            // Separate key and IV\n\t            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);\n\t            key.sigBytes = keySize * 4;\n\n\t            // Return params\n\t            return CipherParams.create({ key: key, iv: iv, salt: salt });\n\t        }\n\t    };\n\n\t    /**\n\t     * A serializable cipher wrapper that derives the key from a password,\n\t     * and returns ciphertext as a serializable cipher params object.\n\t     */\n\t    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL\n\t         */\n\t        cfg: SerializableCipher.cfg.extend({\n\t            kdf: OpenSSLKdf\n\t        }),\n\n\t        /**\n\t         * Encrypts a message using a password.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {WordArray|string} message The message to encrypt.\n\t         * @param {string} password The password.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {CipherParams} A cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');\n\t         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });\n\t         */\n\t        encrypt: function (cipher, message, password, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Derive key and other params\n\t            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);\n\n\t            // Add IV to config\n\t            cfg.iv = derivedParams.iv;\n\n\t            // Encrypt\n\t            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);\n\n\t            // Mix in derived params\n\t            ciphertext.mixIn(derivedParams);\n\n\t            return ciphertext;\n\t        },\n\n\t        /**\n\t         * Decrypts serialized ciphertext using a password.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.\n\t         * @param {string} password The password.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {WordArray} The plaintext.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });\n\t         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });\n\t         */\n\t        decrypt: function (cipher, ciphertext, password, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Convert string to CipherParams\n\t            ciphertext = this._parse(ciphertext, cfg.format);\n\n\t            // Derive key and other params\n\t            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);\n\n\t            // Add IV to config\n\t            cfg.iv = derivedParams.iv;\n\n\t            // Decrypt\n\t            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);\n\n\t            return plaintext;\n\t        }\n\t    });\n\t}());\n\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Cipher Feedback block mode.\n\t */\n\tCryptoJS.mode.CFB = (function () {\n\t    var CFB = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    CFB.Encryptor = CFB.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher;\n\t            var blockSize = cipher.blockSize;\n\n\t            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);\n\n\t            // Remember this block to use with next block\n\t            this._prevBlock = words.slice(offset, offset + blockSize);\n\t        }\n\t    });\n\n\t    CFB.Decryptor = CFB.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher;\n\t            var blockSize = cipher.blockSize;\n\n\t            // Remember this block to use with next block\n\t            var thisBlock = words.slice(offset, offset + blockSize);\n\n\t            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);\n\n\t            // This block becomes the previous block\n\t            this._prevBlock = thisBlock;\n\t        }\n\t    });\n\n\t    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {\n\t        var keystream;\n\n\t        // Shortcut\n\t        var iv = this._iv;\n\n\t        // Generate keystream\n\t        if (iv) {\n\t            keystream = iv.slice(0);\n\n\t            // Remove IV for subsequent blocks\n\t            this._iv = undefined;\n\t        } else {\n\t            keystream = this._prevBlock;\n\t        }\n\t        cipher.encryptBlock(keystream, 0);\n\n\t        // Encrypt\n\t        for (var i = 0; i < blockSize; i++) {\n\t            words[offset + i] ^= keystream[i];\n\t        }\n\t    }\n\n\t    return CFB;\n\t}());\n\n\n\treturn CryptoJS.mode.CFB;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Counter block mode.\n\t */\n\tCryptoJS.mode.CTR = (function () {\n\t    var CTR = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    var Encryptor = CTR.Encryptor = CTR.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher\n\t            var blockSize = cipher.blockSize;\n\t            var iv = this._iv;\n\t            var counter = this._counter;\n\n\t            // Generate keystream\n\t            if (iv) {\n\t                counter = this._counter = iv.slice(0);\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            }\n\t            var keystream = counter.slice(0);\n\t            cipher.encryptBlock(keystream, 0);\n\n\t            // Increment counter\n\t            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0\n\n\t            // Encrypt\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= keystream[i];\n\t            }\n\t        }\n\t    });\n\n\t    CTR.Decryptor = Encryptor;\n\n\t    return CTR;\n\t}());\n\n\n\treturn CryptoJS.mode.CTR;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/** @preserve\n\t * Counter block mode compatible with  Dr Brian Gladman fileenc.c\n\t * derived from CryptoJS.mode.CTR\n\t * Jan Hruby jhruby.web@gmail.com\n\t */\n\tCryptoJS.mode.CTRGladman = (function () {\n\t    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();\n\n\t\tfunction incWord(word)\n\t\t{\n\t\t\tif (((word >> 24) & 0xff) === 0xff) { //overflow\n\t\t\tvar b1 = (word >> 16)&0xff;\n\t\t\tvar b2 = (word >> 8)&0xff;\n\t\t\tvar b3 = word & 0xff;\n\n\t\t\tif (b1 === 0xff) // overflow b1\n\t\t\t{\n\t\t\tb1 = 0;\n\t\t\tif (b2 === 0xff)\n\t\t\t{\n\t\t\t\tb2 = 0;\n\t\t\t\tif (b3 === 0xff)\n\t\t\t\t{\n\t\t\t\t\tb3 = 0;\n\t\t\t\t}\n\t\t\t\telse\n\t\t\t\t{\n\t\t\t\t\t++b3;\n\t\t\t\t}\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t\t++b2;\n\t\t\t}\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t++b1;\n\t\t\t}\n\n\t\t\tword = 0;\n\t\t\tword += (b1 << 16);\n\t\t\tword += (b2 << 8);\n\t\t\tword += b3;\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\tword += (0x01 << 24);\n\t\t\t}\n\t\t\treturn word;\n\t\t}\n\n\t\tfunction incCounter(counter)\n\t\t{\n\t\t\tif ((counter[0] = incWord(counter[0])) === 0)\n\t\t\t{\n\t\t\t\t// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8\n\t\t\t\tcounter[1] = incWord(counter[1]);\n\t\t\t}\n\t\t\treturn counter;\n\t\t}\n\n\t    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher\n\t            var blockSize = cipher.blockSize;\n\t            var iv = this._iv;\n\t            var counter = this._counter;\n\n\t            // Generate keystream\n\t            if (iv) {\n\t                counter = this._counter = iv.slice(0);\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            }\n\n\t\t\t\tincCounter(counter);\n\n\t\t\t\tvar keystream = counter.slice(0);\n\t            cipher.encryptBlock(keystream, 0);\n\n\t            // Encrypt\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= keystream[i];\n\t            }\n\t        }\n\t    });\n\n\t    CTRGladman.Decryptor = Encryptor;\n\n\t    return CTRGladman;\n\t}());\n\n\n\n\n\treturn CryptoJS.mode.CTRGladman;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Output Feedback block mode.\n\t */\n\tCryptoJS.mode.OFB = (function () {\n\t    var OFB = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    var Encryptor = OFB.Encryptor = OFB.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher\n\t            var blockSize = cipher.blockSize;\n\t            var iv = this._iv;\n\t            var keystream = this._keystream;\n\n\t            // Generate keystream\n\t            if (iv) {\n\t                keystream = this._keystream = iv.slice(0);\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            }\n\t            cipher.encryptBlock(keystream, 0);\n\n\t            // Encrypt\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= keystream[i];\n\t            }\n\t        }\n\t    });\n\n\t    OFB.Decryptor = Encryptor;\n\n\t    return OFB;\n\t}());\n\n\n\treturn CryptoJS.mode.OFB;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Electronic Codebook block mode.\n\t */\n\tCryptoJS.mode.ECB = (function () {\n\t    var ECB = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    ECB.Encryptor = ECB.extend({\n\t        processBlock: function (words, offset) {\n\t            this._cipher.encryptBlock(words, offset);\n\t        }\n\t    });\n\n\t    ECB.Decryptor = ECB.extend({\n\t        processBlock: function (words, offset) {\n\t            this._cipher.decryptBlock(words, offset);\n\t        }\n\t    });\n\n\t    return ECB;\n\t}());\n\n\n\treturn CryptoJS.mode.ECB;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * ANSI X.923 padding strategy.\n\t */\n\tCryptoJS.pad.AnsiX923 = {\n\t    pad: function (data, blockSize) {\n\t        // Shortcuts\n\t        var dataSigBytes = data.sigBytes;\n\t        var blockSizeBytes = blockSize * 4;\n\n\t        // Count padding bytes\n\t        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;\n\n\t        // Compute last byte position\n\t        var lastBytePos = dataSigBytes + nPaddingBytes - 1;\n\n\t        // Pad\n\t        data.clamp();\n\t        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);\n\t        data.sigBytes += nPaddingBytes;\n\t    },\n\n\t    unpad: function (data) {\n\t        // Get number of padding bytes from last byte\n\t        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\n\n\t        // Remove padding\n\t        data.sigBytes -= nPaddingBytes;\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.Ansix923;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * ISO 10126 padding strategy.\n\t */\n\tCryptoJS.pad.Iso10126 = {\n\t    pad: function (data, blockSize) {\n\t        // Shortcut\n\t        var blockSizeBytes = blockSize * 4;\n\n\t        // Count padding bytes\n\t        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;\n\n\t        // Pad\n\t        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).\n\t             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));\n\t    },\n\n\t    unpad: function (data) {\n\t        // Get number of padding bytes from last byte\n\t        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\n\n\t        // Remove padding\n\t        data.sigBytes -= nPaddingBytes;\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.Iso10126;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * ISO/IEC 9797-1 Padding Method 2.\n\t */\n\tCryptoJS.pad.Iso97971 = {\n\t    pad: function (data, blockSize) {\n\t        // Add 0x80 byte\n\t        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));\n\n\t        // Zero pad the rest\n\t        CryptoJS.pad.ZeroPadding.pad(data, blockSize);\n\t    },\n\n\t    unpad: function (data) {\n\t        // Remove zero padding\n\t        CryptoJS.pad.ZeroPadding.unpad(data);\n\n\t        // Remove one more byte -- the 0x80 byte\n\t        data.sigBytes--;\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.Iso97971;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Zero padding strategy.\n\t */\n\tCryptoJS.pad.ZeroPadding = {\n\t    pad: function (data, blockSize) {\n\t        // Shortcut\n\t        var blockSizeBytes = blockSize * 4;\n\n\t        // Pad\n\t        data.clamp();\n\t        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);\n\t    },\n\n\t    unpad: function (data) {\n\t        // Shortcut\n\t        var dataWords = data.words;\n\n\t        // Unpad\n\t        var i = data.sigBytes - 1;\n\t        for (var i = data.sigBytes - 1; i >= 0; i--) {\n\t            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {\n\t                data.sigBytes = i + 1;\n\t                break;\n\t            }\n\t        }\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.ZeroPadding;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * A noop padding strategy.\n\t */\n\tCryptoJS.pad.NoPadding = {\n\t    pad: function () {\n\t    },\n\n\t    unpad: function () {\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.NoPadding;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (undefined) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var CipherParams = C_lib.CipherParams;\n\t    var C_enc = C.enc;\n\t    var Hex = C_enc.Hex;\n\t    var C_format = C.format;\n\n\t    var HexFormatter = C_format.Hex = {\n\t        /**\n\t         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.\n\t         *\n\t         * @param {CipherParams} cipherParams The cipher params object.\n\t         *\n\t         * @return {string} The hexadecimally encoded string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);\n\t         */\n\t        stringify: function (cipherParams) {\n\t            return cipherParams.ciphertext.toString(Hex);\n\t        },\n\n\t        /**\n\t         * Converts a hexadecimally encoded ciphertext string to a cipher params object.\n\t         *\n\t         * @param {string} input The hexadecimally encoded string.\n\t         *\n\t         * @return {CipherParams} The cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);\n\t         */\n\t        parse: function (input) {\n\t            var ciphertext = Hex.parse(input);\n\t            return CipherParams.create({ ciphertext: ciphertext });\n\t        }\n\t    };\n\t}());\n\n\n\treturn CryptoJS.format.Hex;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var BlockCipher = C_lib.BlockCipher;\n\t    var C_algo = C.algo;\n\n\t    // Lookup tables\n\t    var SBOX = [];\n\t    var INV_SBOX = [];\n\t    var SUB_MIX_0 = [];\n\t    var SUB_MIX_1 = [];\n\t    var SUB_MIX_2 = [];\n\t    var SUB_MIX_3 = [];\n\t    var INV_SUB_MIX_0 = [];\n\t    var INV_SUB_MIX_1 = [];\n\t    var INV_SUB_MIX_2 = [];\n\t    var INV_SUB_MIX_3 = [];\n\n\t    // Compute lookup tables\n\t    (function () {\n\t        // Compute double table\n\t        var d = [];\n\t        for (var i = 0; i < 256; i++) {\n\t            if (i < 128) {\n\t                d[i] = i << 1;\n\t            } else {\n\t                d[i] = (i << 1) ^ 0x11b;\n\t            }\n\t        }\n\n\t        // Walk GF(2^8)\n\t        var x = 0;\n\t        var xi = 0;\n\t        for (var i = 0; i < 256; i++) {\n\t            // Compute sbox\n\t            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);\n\t            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;\n\t            SBOX[x] = sx;\n\t            INV_SBOX[sx] = x;\n\n\t            // Compute multiplication\n\t            var x2 = d[x];\n\t            var x4 = d[x2];\n\t            var x8 = d[x4];\n\n\t            // Compute sub bytes, mix columns tables\n\t            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);\n\t            SUB_MIX_0[x] = (t << 24) | (t >>> 8);\n\t            SUB_MIX_1[x] = (t << 16) | (t >>> 16);\n\t            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);\n\t            SUB_MIX_3[x] = t;\n\n\t            // Compute inv sub bytes, inv mix columns tables\n\t            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);\n\t            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);\n\t            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);\n\t            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);\n\t            INV_SUB_MIX_3[sx] = t;\n\n\t            // Compute next counter\n\t            if (!x) {\n\t                x = xi = 1;\n\t            } else {\n\t                x = x2 ^ d[d[d[x8 ^ x2]]];\n\t                xi ^= d[d[xi]];\n\t            }\n\t        }\n\t    }());\n\n\t    // Precomputed Rcon lookup\n\t    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];\n\n\t    /**\n\t     * AES block cipher algorithm.\n\t     */\n\t    var AES = C_algo.AES = BlockCipher.extend({\n\t        _doReset: function () {\n\t            var t;\n\n\t            // Skip reset of nRounds has been set before and key did not change\n\t            if (this._nRounds && this._keyPriorReset === this._key) {\n\t                return;\n\t            }\n\n\t            // Shortcuts\n\t            var key = this._keyPriorReset = this._key;\n\t            var keyWords = key.words;\n\t            var keySize = key.sigBytes / 4;\n\n\t            // Compute number of rounds\n\t            var nRounds = this._nRounds = keySize + 6;\n\n\t            // Compute number of key schedule rows\n\t            var ksRows = (nRounds + 1) * 4;\n\n\t            // Compute key schedule\n\t            var keySchedule = this._keySchedule = [];\n\t            for (var ksRow = 0; ksRow < ksRows; ksRow++) {\n\t                if (ksRow < keySize) {\n\t                    keySchedule[ksRow] = keyWords[ksRow];\n\t                } else {\n\t                    t = keySchedule[ksRow - 1];\n\n\t                    if (!(ksRow % keySize)) {\n\t                        // Rot word\n\t                        t = (t << 8) | (t >>> 24);\n\n\t                        // Sub word\n\t                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];\n\n\t                        // Mix Rcon\n\t                        t ^= RCON[(ksRow / keySize) | 0] << 24;\n\t                    } else if (keySize > 6 && ksRow % keySize == 4) {\n\t                        // Sub word\n\t                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];\n\t                    }\n\n\t                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;\n\t                }\n\t            }\n\n\t            // Compute inv key schedule\n\t            var invKeySchedule = this._invKeySchedule = [];\n\t            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {\n\t                var ksRow = ksRows - invKsRow;\n\n\t                if (invKsRow % 4) {\n\t                    var t = keySchedule[ksRow];\n\t                } else {\n\t                    var t = keySchedule[ksRow - 4];\n\t                }\n\n\t                if (invKsRow < 4 || ksRow <= 4) {\n\t                    invKeySchedule[invKsRow] = t;\n\t                } else {\n\t                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^\n\t                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];\n\t                }\n\t            }\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            // Swap 2nd and 4th rows\n\t            var t = M[offset + 1];\n\t            M[offset + 1] = M[offset + 3];\n\t            M[offset + 3] = t;\n\n\t            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);\n\n\t            // Inv swap 2nd and 4th rows\n\t            var t = M[offset + 1];\n\t            M[offset + 1] = M[offset + 3];\n\t            M[offset + 3] = t;\n\t        },\n\n\t        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {\n\t            // Shortcut\n\t            var nRounds = this._nRounds;\n\n\t            // Get input, add round key\n\t            var s0 = M[offset]     ^ keySchedule[0];\n\t            var s1 = M[offset + 1] ^ keySchedule[1];\n\t            var s2 = M[offset + 2] ^ keySchedule[2];\n\t            var s3 = M[offset + 3] ^ keySchedule[3];\n\n\t            // Key schedule row counter\n\t            var ksRow = 4;\n\n\t            // Rounds\n\t            for (var round = 1; round < nRounds; round++) {\n\t                // Shift rows, sub bytes, mix columns, add round key\n\t                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];\n\t                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];\n\t                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];\n\t                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];\n\n\t                // Update state\n\t                s0 = t0;\n\t                s1 = t1;\n\t                s2 = t2;\n\t                s3 = t3;\n\t            }\n\n\t            // Shift rows, sub bytes, add round key\n\t            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];\n\t            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];\n\t            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];\n\t            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];\n\n\t            // Set output\n\t            M[offset]     = t0;\n\t            M[offset + 1] = t1;\n\t            M[offset + 2] = t2;\n\t            M[offset + 3] = t3;\n\t        },\n\n\t        keySize: 256/32\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.AES = BlockCipher._createHelper(AES);\n\t}());\n\n\n\treturn CryptoJS.AES;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var BlockCipher = C_lib.BlockCipher;\n\t    var C_algo = C.algo;\n\n\t    // Permuted Choice 1 constants\n\t    var PC1 = [\n\t        57, 49, 41, 33, 25, 17, 9,  1,\n\t        58, 50, 42, 34, 26, 18, 10, 2,\n\t        59, 51, 43, 35, 27, 19, 11, 3,\n\t        60, 52, 44, 36, 63, 55, 47, 39,\n\t        31, 23, 15, 7,  62, 54, 46, 38,\n\t        30, 22, 14, 6,  61, 53, 45, 37,\n\t        29, 21, 13, 5,  28, 20, 12, 4\n\t    ];\n\n\t    // Permuted Choice 2 constants\n\t    var PC2 = [\n\t        14, 17, 11, 24, 1,  5,\n\t        3,  28, 15, 6,  21, 10,\n\t        23, 19, 12, 4,  26, 8,\n\t        16, 7,  27, 20, 13, 2,\n\t        41, 52, 31, 37, 47, 55,\n\t        30, 40, 51, 45, 33, 48,\n\t        44, 49, 39, 56, 34, 53,\n\t        46, 42, 50, 36, 29, 32\n\t    ];\n\n\t    // Cumulative bit shift constants\n\t    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];\n\n\t    // SBOXes and round permutation constants\n\t    var SBOX_P = [\n\t        {\n\t            0x0: 0x808200,\n\t            0x10000000: 0x8000,\n\t            0x20000000: 0x808002,\n\t            0x30000000: 0x2,\n\t            0x40000000: 0x200,\n\t            0x50000000: 0x808202,\n\t            0x60000000: 0x800202,\n\t            0x70000000: 0x800000,\n\t            0x80000000: 0x202,\n\t            0x90000000: 0x800200,\n\t            0xa0000000: 0x8200,\n\t            0xb0000000: 0x808000,\n\t            0xc0000000: 0x8002,\n\t            0xd0000000: 0x800002,\n\t            0xe0000000: 0x0,\n\t            0xf0000000: 0x8202,\n\t            0x8000000: 0x0,\n\t            0x18000000: 0x808202,\n\t            0x28000000: 0x8202,\n\t            0x38000000: 0x8000,\n\t            0x48000000: 0x808200,\n\t            0x58000000: 0x200,\n\t            0x68000000: 0x808002,\n\t            0x78000000: 0x2,\n\t            0x88000000: 0x800200,\n\t            0x98000000: 0x8200,\n\t            0xa8000000: 0x808000,\n\t            0xb8000000: 0x800202,\n\t            0xc8000000: 0x800002,\n\t            0xd8000000: 0x8002,\n\t            0xe8000000: 0x202,\n\t            0xf8000000: 0x800000,\n\t            0x1: 0x8000,\n\t            0x10000001: 0x2,\n\t            0x20000001: 0x808200,\n\t            0x30000001: 0x800000,\n\t            0x40000001: 0x808002,\n\t            0x50000001: 0x8200,\n\t            0x60000001: 0x200,\n\t            0x70000001: 0x800202,\n\t            0x80000001: 0x808202,\n\t            0x90000001: 0x808000,\n\t            0xa0000001: 0x800002,\n\t            0xb0000001: 0x8202,\n\t            0xc0000001: 0x202,\n\t            0xd0000001: 0x800200,\n\t            0xe0000001: 0x8002,\n\t            0xf0000001: 0x0,\n\t            0x8000001: 0x808202,\n\t            0x18000001: 0x808000,\n\t            0x28000001: 0x800000,\n\t            0x38000001: 0x200,\n\t            0x48000001: 0x8000,\n\t            0x58000001: 0x800002,\n\t            0x68000001: 0x2,\n\t            0x78000001: 0x8202,\n\t            0x88000001: 0x8002,\n\t            0x98000001: 0x800202,\n\t            0xa8000001: 0x202,\n\t            0xb8000001: 0x808200,\n\t            0xc8000001: 0x800200,\n\t            0xd8000001: 0x0,\n\t            0xe8000001: 0x8200,\n\t            0xf8000001: 0x808002\n\t        },\n\t        {\n\t            0x0: 0x40084010,\n\t            0x1000000: 0x4000,\n\t            0x2000000: 0x80000,\n\t            0x3000000: 0x40080010,\n\t            0x4000000: 0x40000010,\n\t            0x5000000: 0x40084000,\n\t            0x6000000: 0x40004000,\n\t            0x7000000: 0x10,\n\t            0x8000000: 0x84000,\n\t            0x9000000: 0x40004010,\n\t            0xa000000: 0x40000000,\n\t            0xb000000: 0x84010,\n\t            0xc000000: 0x80010,\n\t            0xd000000: 0x0,\n\t            0xe000000: 0x4010,\n\t            0xf000000: 0x40080000,\n\t            0x800000: 0x40004000,\n\t            0x1800000: 0x84010,\n\t            0x2800000: 0x10,\n\t            0x3800000: 0x40004010,\n\t            0x4800000: 0x40084010,\n\t            0x5800000: 0x40000000,\n\t            0x6800000: 0x80000,\n\t            0x7800000: 0x40080010,\n\t            0x8800000: 0x80010,\n\t            0x9800000: 0x0,\n\t            0xa800000: 0x4000,\n\t            0xb800000: 0x40080000,\n\t            0xc800000: 0x40000010,\n\t            0xd800000: 0x84000,\n\t            0xe800000: 0x40084000,\n\t            0xf800000: 0x4010,\n\t            0x10000000: 0x0,\n\t            0x11000000: 0x40080010,\n\t            0x12000000: 0x40004010,\n\t            0x13000000: 0x40084000,\n\t            0x14000000: 0x40080000,\n\t            0x15000000: 0x10,\n\t            0x16000000: 0x84010,\n\t            0x17000000: 0x4000,\n\t            0x18000000: 0x4010,\n\t            0x19000000: 0x80000,\n\t            0x1a000000: 0x80010,\n\t            0x1b000000: 0x40000010,\n\t            0x1c000000: 0x84000,\n\t            0x1d000000: 0x40004000,\n\t            0x1e000000: 0x40000000,\n\t            0x1f000000: 0x40084010,\n\t            0x10800000: 0x84010,\n\t            0x11800000: 0x80000,\n\t            0x12800000: 0x40080000,\n\t            0x13800000: 0x4000,\n\t            0x14800000: 0x40004000,\n\t            0x15800000: 0x40084010,\n\t            0x16800000: 0x10,\n\t            0x17800000: 0x40000000,\n\t            0x18800000: 0x40084000,\n\t            0x19800000: 0x40000010,\n\t            0x1a800000: 0x40004010,\n\t            0x1b800000: 0x80010,\n\t            0x1c800000: 0x0,\n\t            0x1d800000: 0x4010,\n\t            0x1e800000: 0x40080010,\n\t            0x1f800000: 0x84000\n\t        },\n\t        {\n\t            0x0: 0x104,\n\t            0x100000: 0x0,\n\t            0x200000: 0x4000100,\n\t            0x300000: 0x10104,\n\t            0x400000: 0x10004,\n\t            0x500000: 0x4000004,\n\t            0x600000: 0x4010104,\n\t            0x700000: 0x4010000,\n\t            0x800000: 0x4000000,\n\t            0x900000: 0x4010100,\n\t            0xa00000: 0x10100,\n\t            0xb00000: 0x4010004,\n\t            0xc00000: 0x4000104,\n\t            0xd00000: 0x10000,\n\t            0xe00000: 0x4,\n\t            0xf00000: 0x100,\n\t            0x80000: 0x4010100,\n\t            0x180000: 0x4010004,\n\t            0x280000: 0x0,\n\t            0x380000: 0x4000100,\n\t            0x480000: 0x4000004,\n\t            0x580000: 0x10000,\n\t            0x680000: 0x10004,\n\t            0x780000: 0x104,\n\t            0x880000: 0x4,\n\t            0x980000: 0x100,\n\t            0xa80000: 0x4010000,\n\t            0xb80000: 0x10104,\n\t            0xc80000: 0x10100,\n\t            0xd80000: 0x4000104,\n\t            0xe80000: 0x4010104,\n\t            0xf80000: 0x4000000,\n\t            0x1000000: 0x4010100,\n\t            0x1100000: 0x10004,\n\t            0x1200000: 0x10000,\n\t            0x1300000: 0x4000100,\n\t            0x1400000: 0x100,\n\t            0x1500000: 0x4010104,\n\t            0x1600000: 0x4000004,\n\t            0x1700000: 0x0,\n\t            0x1800000: 0x4000104,\n\t            0x1900000: 0x4000000,\n\t            0x1a00000: 0x4,\n\t            0x1b00000: 0x10100,\n\t            0x1c00000: 0x4010000,\n\t            0x1d00000: 0x104,\n\t            0x1e00000: 0x10104,\n\t            0x1f00000: 0x4010004,\n\t            0x1080000: 0x4000000,\n\t            0x1180000: 0x104,\n\t            0x1280000: 0x4010100,\n\t            0x1380000: 0x0,\n\t            0x1480000: 0x10004,\n\t            0x1580000: 0x4000100,\n\t            0x1680000: 0x100,\n\t            0x1780000: 0x4010004,\n\t            0x1880000: 0x10000,\n\t            0x1980000: 0x4010104,\n\t            0x1a80000: 0x10104,\n\t            0x1b80000: 0x4000004,\n\t            0x1c80000: 0x4000104,\n\t            0x1d80000: 0x4010000,\n\t            0x1e80000: 0x4,\n\t            0x1f80000: 0x10100\n\t        },\n\t        {\n\t            0x0: 0x80401000,\n\t            0x10000: 0x80001040,\n\t            0x20000: 0x401040,\n\t            0x30000: 0x80400000,\n\t            0x40000: 0x0,\n\t            0x50000: 0x401000,\n\t            0x60000: 0x80000040,\n\t            0x70000: 0x400040,\n\t            0x80000: 0x80000000,\n\t            0x90000: 0x400000,\n\t            0xa0000: 0x40,\n\t            0xb0000: 0x80001000,\n\t            0xc0000: 0x80400040,\n\t            0xd0000: 0x1040,\n\t            0xe0000: 0x1000,\n\t            0xf0000: 0x80401040,\n\t            0x8000: 0x80001040,\n\t            0x18000: 0x40,\n\t            0x28000: 0x80400040,\n\t            0x38000: 0x80001000,\n\t            0x48000: 0x401000,\n\t            0x58000: 0x80401040,\n\t            0x68000: 0x0,\n\t            0x78000: 0x80400000,\n\t            0x88000: 0x1000,\n\t            0x98000: 0x80401000,\n\t            0xa8000: 0x400000,\n\t            0xb8000: 0x1040,\n\t            0xc8000: 0x80000000,\n\t            0xd8000: 0x400040,\n\t            0xe8000: 0x401040,\n\t            0xf8000: 0x80000040,\n\t            0x100000: 0x400040,\n\t            0x110000: 0x401000,\n\t            0x120000: 0x80000040,\n\t            0x130000: 0x0,\n\t            0x140000: 0x1040,\n\t            0x150000: 0x80400040,\n\t            0x160000: 0x80401000,\n\t            0x170000: 0x80001040,\n\t            0x180000: 0x80401040,\n\t            0x190000: 0x80000000,\n\t            0x1a0000: 0x80400000,\n\t            0x1b0000: 0x401040,\n\t            0x1c0000: 0x80001000,\n\t            0x1d0000: 0x400000,\n\t            0x1e0000: 0x40,\n\t            0x1f0000: 0x1000,\n\t            0x108000: 0x80400000,\n\t            0x118000: 0x80401040,\n\t            0x128000: 0x0,\n\t            0x138000: 0x401000,\n\t            0x148000: 0x400040,\n\t            0x158000: 0x80000000,\n\t            0x168000: 0x80001040,\n\t            0x178000: 0x40,\n\t            0x188000: 0x80000040,\n\t            0x198000: 0x1000,\n\t            0x1a8000: 0x80001000,\n\t            0x1b8000: 0x80400040,\n\t            0x1c8000: 0x1040,\n\t            0x1d8000: 0x80401000,\n\t            0x1e8000: 0x400000,\n\t            0x1f8000: 0x401040\n\t        },\n\t        {\n\t            0x0: 0x80,\n\t            0x1000: 0x1040000,\n\t            0x2000: 0x40000,\n\t            0x3000: 0x20000000,\n\t            0x4000: 0x20040080,\n\t            0x5000: 0x1000080,\n\t            0x6000: 0x21000080,\n\t            0x7000: 0x40080,\n\t            0x8000: 0x1000000,\n\t            0x9000: 0x20040000,\n\t            0xa000: 0x20000080,\n\t            0xb000: 0x21040080,\n\t            0xc000: 0x21040000,\n\t            0xd000: 0x0,\n\t            0xe000: 0x1040080,\n\t            0xf000: 0x21000000,\n\t            0x800: 0x1040080,\n\t            0x1800: 0x21000080,\n\t            0x2800: 0x80,\n\t            0x3800: 0x1040000,\n\t            0x4800: 0x40000,\n\t            0x5800: 0x20040080,\n\t            0x6800: 0x21040000,\n\t            0x7800: 0x20000000,\n\t            0x8800: 0x20040000,\n\t            0x9800: 0x0,\n\t            0xa800: 0x21040080,\n\t            0xb800: 0x1000080,\n\t            0xc800: 0x20000080,\n\t            0xd800: 0x21000000,\n\t            0xe800: 0x1000000,\n\t            0xf800: 0x40080,\n\t            0x10000: 0x40000,\n\t            0x11000: 0x80,\n\t            0x12000: 0x20000000,\n\t            0x13000: 0x21000080,\n\t            0x14000: 0x1000080,\n\t            0x15000: 0x21040000,\n\t            0x16000: 0x20040080,\n\t            0x17000: 0x1000000,\n\t            0x18000: 0x21040080,\n\t            0x19000: 0x21000000,\n\t            0x1a000: 0x1040000,\n\t            0x1b000: 0x20040000,\n\t            0x1c000: 0x40080,\n\t            0x1d000: 0x20000080,\n\t            0x1e000: 0x0,\n\t            0x1f000: 0x1040080,\n\t            0x10800: 0x21000080,\n\t            0x11800: 0x1000000,\n\t            0x12800: 0x1040000,\n\t            0x13800: 0x20040080,\n\t            0x14800: 0x20000000,\n\t            0x15800: 0x1040080,\n\t            0x16800: 0x80,\n\t            0x17800: 0x21040000,\n\t            0x18800: 0x40080,\n\t            0x19800: 0x21040080,\n\t            0x1a800: 0x0,\n\t            0x1b800: 0x21000000,\n\t            0x1c800: 0x1000080,\n\t            0x1d800: 0x40000,\n\t            0x1e800: 0x20040000,\n\t            0x1f800: 0x20000080\n\t        },\n\t        {\n\t            0x0: 0x10000008,\n\t            0x100: 0x2000,\n\t            0x200: 0x10200000,\n\t            0x300: 0x10202008,\n\t            0x400: 0x10002000,\n\t            0x500: 0x200000,\n\t            0x600: 0x200008,\n\t            0x700: 0x10000000,\n\t            0x800: 0x0,\n\t            0x900: 0x10002008,\n\t            0xa00: 0x202000,\n\t            0xb00: 0x8,\n\t            0xc00: 0x10200008,\n\t            0xd00: 0x202008,\n\t            0xe00: 0x2008,\n\t            0xf00: 0x10202000,\n\t            0x80: 0x10200000,\n\t            0x180: 0x10202008,\n\t            0x280: 0x8,\n\t            0x380: 0x200000,\n\t            0x480: 0x202008,\n\t            0x580: 0x10000008,\n\t            0x680: 0x10002000,\n\t            0x780: 0x2008,\n\t            0x880: 0x200008,\n\t            0x980: 0x2000,\n\t            0xa80: 0x10002008,\n\t            0xb80: 0x10200008,\n\t            0xc80: 0x0,\n\t            0xd80: 0x10202000,\n\t            0xe80: 0x202000,\n\t            0xf80: 0x10000000,\n\t            0x1000: 0x10002000,\n\t            0x1100: 0x10200008,\n\t            0x1200: 0x10202008,\n\t            0x1300: 0x2008,\n\t            0x1400: 0x200000,\n\t            0x1500: 0x10000000,\n\t            0x1600: 0x10000008,\n\t            0x1700: 0x202000,\n\t            0x1800: 0x202008,\n\t            0x1900: 0x0,\n\t            0x1a00: 0x8,\n\t            0x1b00: 0x10200000,\n\t            0x1c00: 0x2000,\n\t            0x1d00: 0x10002008,\n\t            0x1e00: 0x10202000,\n\t            0x1f00: 0x200008,\n\t            0x1080: 0x8,\n\t            0x1180: 0x202000,\n\t            0x1280: 0x200000,\n\t            0x1380: 0x10000008,\n\t            0x1480: 0x10002000,\n\t            0x1580: 0x2008,\n\t            0x1680: 0x10202008,\n\t            0x1780: 0x10200000,\n\t            0x1880: 0x10202000,\n\t            0x1980: 0x10200008,\n\t            0x1a80: 0x2000,\n\t            0x1b80: 0x202008,\n\t            0x1c80: 0x200008,\n\t            0x1d80: 0x0,\n\t            0x1e80: 0x10000000,\n\t            0x1f80: 0x10002008\n\t        },\n\t        {\n\t            0x0: 0x100000,\n\t            0x10: 0x2000401,\n\t            0x20: 0x400,\n\t            0x30: 0x100401,\n\t            0x40: 0x2100401,\n\t            0x50: 0x0,\n\t            0x60: 0x1,\n\t            0x70: 0x2100001,\n\t            0x80: 0x2000400,\n\t            0x90: 0x100001,\n\t            0xa0: 0x2000001,\n\t            0xb0: 0x2100400,\n\t            0xc0: 0x2100000,\n\t            0xd0: 0x401,\n\t            0xe0: 0x100400,\n\t            0xf0: 0x2000000,\n\t            0x8: 0x2100001,\n\t            0x18: 0x0,\n\t            0x28: 0x2000401,\n\t            0x38: 0x2100400,\n\t            0x48: 0x100000,\n\t            0x58: 0x2000001,\n\t            0x68: 0x2000000,\n\t            0x78: 0x401,\n\t            0x88: 0x100401,\n\t            0x98: 0x2000400,\n\t            0xa8: 0x2100000,\n\t            0xb8: 0x100001,\n\t            0xc8: 0x400,\n\t            0xd8: 0x2100401,\n\t            0xe8: 0x1,\n\t            0xf8: 0x100400,\n\t            0x100: 0x2000000,\n\t            0x110: 0x100000,\n\t            0x120: 0x2000401,\n\t            0x130: 0x2100001,\n\t            0x140: 0x100001,\n\t            0x150: 0x2000400,\n\t            0x160: 0x2100400,\n\t            0x170: 0x100401,\n\t            0x180: 0x401,\n\t            0x190: 0x2100401,\n\t            0x1a0: 0x100400,\n\t            0x1b0: 0x1,\n\t            0x1c0: 0x0,\n\t            0x1d0: 0x2100000,\n\t            0x1e0: 0x2000001,\n\t            0x1f0: 0x400,\n\t            0x108: 0x100400,\n\t            0x118: 0x2000401,\n\t            0x128: 0x2100001,\n\t            0x138: 0x1,\n\t            0x148: 0x2000000,\n\t            0x158: 0x100000,\n\t            0x168: 0x401,\n\t            0x178: 0x2100400,\n\t            0x188: 0x2000001,\n\t            0x198: 0x2100000,\n\t            0x1a8: 0x0,\n\t            0x1b8: 0x2100401,\n\t            0x1c8: 0x100401,\n\t            0x1d8: 0x400,\n\t            0x1e8: 0x2000400,\n\t            0x1f8: 0x100001\n\t        },\n\t        {\n\t            0x0: 0x8000820,\n\t            0x1: 0x20000,\n\t            0x2: 0x8000000,\n\t            0x3: 0x20,\n\t            0x4: 0x20020,\n\t            0x5: 0x8020820,\n\t            0x6: 0x8020800,\n\t            0x7: 0x800,\n\t            0x8: 0x8020000,\n\t            0x9: 0x8000800,\n\t            0xa: 0x20800,\n\t            0xb: 0x8020020,\n\t            0xc: 0x820,\n\t            0xd: 0x0,\n\t            0xe: 0x8000020,\n\t            0xf: 0x20820,\n\t            0x80000000: 0x800,\n\t            0x80000001: 0x8020820,\n\t            0x80000002: 0x8000820,\n\t            0x80000003: 0x8000000,\n\t            0x80000004: 0x8020000,\n\t            0x80000005: 0x20800,\n\t            0x80000006: 0x20820,\n\t            0x80000007: 0x20,\n\t            0x80000008: 0x8000020,\n\t            0x80000009: 0x820,\n\t            0x8000000a: 0x20020,\n\t            0x8000000b: 0x8020800,\n\t            0x8000000c: 0x0,\n\t            0x8000000d: 0x8020020,\n\t            0x8000000e: 0x8000800,\n\t            0x8000000f: 0x20000,\n\t            0x10: 0x20820,\n\t            0x11: 0x8020800,\n\t            0x12: 0x20,\n\t            0x13: 0x800,\n\t            0x14: 0x8000800,\n\t            0x15: 0x8000020,\n\t            0x16: 0x8020020,\n\t            0x17: 0x20000,\n\t            0x18: 0x0,\n\t            0x19: 0x20020,\n\t            0x1a: 0x8020000,\n\t            0x1b: 0x8000820,\n\t            0x1c: 0x8020820,\n\t            0x1d: 0x20800,\n\t            0x1e: 0x820,\n\t            0x1f: 0x8000000,\n\t            0x80000010: 0x20000,\n\t            0x80000011: 0x800,\n\t            0x80000012: 0x8020020,\n\t            0x80000013: 0x20820,\n\t            0x80000014: 0x20,\n\t            0x80000015: 0x8020000,\n\t            0x80000016: 0x8000000,\n\t            0x80000017: 0x8000820,\n\t            0x80000018: 0x8020820,\n\t            0x80000019: 0x8000020,\n\t            0x8000001a: 0x8000800,\n\t            0x8000001b: 0x0,\n\t            0x8000001c: 0x20800,\n\t            0x8000001d: 0x820,\n\t            0x8000001e: 0x20020,\n\t            0x8000001f: 0x8020800\n\t        }\n\t    ];\n\n\t    // Masks that select the SBOX input\n\t    var SBOX_MASK = [\n\t        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,\n\t        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f\n\t    ];\n\n\t    /**\n\t     * DES block cipher algorithm.\n\t     */\n\t    var DES = C_algo.DES = BlockCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var key = this._key;\n\t            var keyWords = key.words;\n\n\t            // Select 56 bits according to PC1\n\t            var keyBits = [];\n\t            for (var i = 0; i < 56; i++) {\n\t                var keyBitPos = PC1[i] - 1;\n\t                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;\n\t            }\n\n\t            // Assemble 16 subkeys\n\t            var subKeys = this._subKeys = [];\n\t            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {\n\t                // Create subkey\n\t                var subKey = subKeys[nSubKey] = [];\n\n\t                // Shortcut\n\t                var bitShift = BIT_SHIFTS[nSubKey];\n\n\t                // Select 48 bits according to PC2\n\t                for (var i = 0; i < 24; i++) {\n\t                    // Select from the left 28 key bits\n\t                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);\n\n\t                    // Select from the right 28 key bits\n\t                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);\n\t                }\n\n\t                // Since each subkey is applied to an expanded 32-bit input,\n\t                // the subkey can be broken into 8 values scaled to 32-bits,\n\t                // which allows the key to be used without expansion\n\t                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);\n\t                for (var i = 1; i < 7; i++) {\n\t                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);\n\t                }\n\t                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);\n\t            }\n\n\t            // Compute inverse subkeys\n\t            var invSubKeys = this._invSubKeys = [];\n\t            for (var i = 0; i < 16; i++) {\n\t                invSubKeys[i] = subKeys[15 - i];\n\t            }\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            this._doCryptBlock(M, offset, this._subKeys);\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            this._doCryptBlock(M, offset, this._invSubKeys);\n\t        },\n\n\t        _doCryptBlock: function (M, offset, subKeys) {\n\t            // Get input\n\t            this._lBlock = M[offset];\n\t            this._rBlock = M[offset + 1];\n\n\t            // Initial permutation\n\t            exchangeLR.call(this, 4,  0x0f0f0f0f);\n\t            exchangeLR.call(this, 16, 0x0000ffff);\n\t            exchangeRL.call(this, 2,  0x33333333);\n\t            exchangeRL.call(this, 8,  0x00ff00ff);\n\t            exchangeLR.call(this, 1,  0x55555555);\n\n\t            // Rounds\n\t            for (var round = 0; round < 16; round++) {\n\t                // Shortcuts\n\t                var subKey = subKeys[round];\n\t                var lBlock = this._lBlock;\n\t                var rBlock = this._rBlock;\n\n\t                // Feistel function\n\t                var f = 0;\n\t                for (var i = 0; i < 8; i++) {\n\t                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];\n\t                }\n\t                this._lBlock = rBlock;\n\t                this._rBlock = lBlock ^ f;\n\t            }\n\n\t            // Undo swap from last round\n\t            var t = this._lBlock;\n\t            this._lBlock = this._rBlock;\n\t            this._rBlock = t;\n\n\t            // Final permutation\n\t            exchangeLR.call(this, 1,  0x55555555);\n\t            exchangeRL.call(this, 8,  0x00ff00ff);\n\t            exchangeRL.call(this, 2,  0x33333333);\n\t            exchangeLR.call(this, 16, 0x0000ffff);\n\t            exchangeLR.call(this, 4,  0x0f0f0f0f);\n\n\t            // Set output\n\t            M[offset] = this._lBlock;\n\t            M[offset + 1] = this._rBlock;\n\t        },\n\n\t        keySize: 64/32,\n\n\t        ivSize: 64/32,\n\n\t        blockSize: 64/32\n\t    });\n\n\t    // Swap bits across the left and right words\n\t    function exchangeLR(offset, mask) {\n\t        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;\n\t        this._rBlock ^= t;\n\t        this._lBlock ^= t << offset;\n\t    }\n\n\t    function exchangeRL(offset, mask) {\n\t        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;\n\t        this._lBlock ^= t;\n\t        this._rBlock ^= t << offset;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.DES = BlockCipher._createHelper(DES);\n\n\t    /**\n\t     * Triple-DES block cipher algorithm.\n\t     */\n\t    var TripleDES = C_algo.TripleDES = BlockCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var key = this._key;\n\t            var keyWords = key.words;\n\t            // Make sure the key length is valid (64, 128 or >= 192 bit)\n\t            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {\n\t                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');\n\t            }\n\n\t            // Extend the key according to the keying options defined in 3DES standard\n\t            var key1 = keyWords.slice(0, 2);\n\t            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);\n\t            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);\n\n\t            // Create DES instances\n\t            this._des1 = DES.createEncryptor(WordArray.create(key1));\n\t            this._des2 = DES.createEncryptor(WordArray.create(key2));\n\t            this._des3 = DES.createEncryptor(WordArray.create(key3));\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            this._des1.encryptBlock(M, offset);\n\t            this._des2.decryptBlock(M, offset);\n\t            this._des3.encryptBlock(M, offset);\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            this._des3.decryptBlock(M, offset);\n\t            this._des2.encryptBlock(M, offset);\n\t            this._des1.decryptBlock(M, offset);\n\t        },\n\n\t        keySize: 192/32,\n\n\t        ivSize: 64/32,\n\n\t        blockSize: 64/32\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.TripleDES = BlockCipher._createHelper(TripleDES);\n\t}());\n\n\n\treturn CryptoJS.TripleDES;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var StreamCipher = C_lib.StreamCipher;\n\t    var C_algo = C.algo;\n\n\t    /**\n\t     * RC4 stream cipher algorithm.\n\t     */\n\t    var RC4 = C_algo.RC4 = StreamCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var key = this._key;\n\t            var keyWords = key.words;\n\t            var keySigBytes = key.sigBytes;\n\n\t            // Init sbox\n\t            var S = this._S = [];\n\t            for (var i = 0; i < 256; i++) {\n\t                S[i] = i;\n\t            }\n\n\t            // Key setup\n\t            for (var i = 0, j = 0; i < 256; i++) {\n\t                var keyByteIndex = i % keySigBytes;\n\t                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;\n\n\t                j = (j + S[i] + keyByte) % 256;\n\n\t                // Swap\n\t                var t = S[i];\n\t                S[i] = S[j];\n\t                S[j] = t;\n\t            }\n\n\t            // Counters\n\t            this._i = this._j = 0;\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            M[offset] ^= generateKeystreamWord.call(this);\n\t        },\n\n\t        keySize: 256/32,\n\n\t        ivSize: 0\n\t    });\n\n\t    function generateKeystreamWord() {\n\t        // Shortcuts\n\t        var S = this._S;\n\t        var i = this._i;\n\t        var j = this._j;\n\n\t        // Generate keystream word\n\t        var keystreamWord = 0;\n\t        for (var n = 0; n < 4; n++) {\n\t            i = (i + 1) % 256;\n\t            j = (j + S[i]) % 256;\n\n\t            // Swap\n\t            var t = S[i];\n\t            S[i] = S[j];\n\t            S[j] = t;\n\n\t            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);\n\t        }\n\n\t        // Update counters\n\t        this._i = i;\n\t        this._j = j;\n\n\t        return keystreamWord;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.RC4 = StreamCipher._createHelper(RC4);\n\n\t    /**\n\t     * Modified RC4 stream cipher algorithm.\n\t     */\n\t    var RC4Drop = C_algo.RC4Drop = RC4.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} drop The number of keystream words to drop. Default 192\n\t         */\n\t        cfg: RC4.cfg.extend({\n\t            drop: 192\n\t        }),\n\n\t        _doReset: function () {\n\t            RC4._doReset.call(this);\n\n\t            // Drop\n\t            for (var i = this.cfg.drop; i > 0; i--) {\n\t                generateKeystreamWord.call(this);\n\t            }\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.RC4Drop = StreamCipher._createHelper(RC4Drop);\n\t}());\n\n\n\treturn CryptoJS.RC4;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var StreamCipher = C_lib.StreamCipher;\n\t    var C_algo = C.algo;\n\n\t    // Reusable objects\n\t    var S  = [];\n\t    var C_ = [];\n\t    var G  = [];\n\n\t    /**\n\t     * Rabbit stream cipher algorithm\n\t     */\n\t    var Rabbit = C_algo.Rabbit = StreamCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var K = this._key.words;\n\t            var iv = this.cfg.iv;\n\n\t            // Swap endian\n\t            for (var i = 0; i < 4; i++) {\n\t                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |\n\t                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);\n\t            }\n\n\t            // Generate initial state values\n\t            var X = this._X = [\n\t                K[0], (K[3] << 16) | (K[2] >>> 16),\n\t                K[1], (K[0] << 16) | (K[3] >>> 16),\n\t                K[2], (K[1] << 16) | (K[0] >>> 16),\n\t                K[3], (K[2] << 16) | (K[1] >>> 16)\n\t            ];\n\n\t            // Generate initial counter values\n\t            var C = this._C = [\n\t                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),\n\t                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),\n\t                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),\n\t                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)\n\t            ];\n\n\t            // Carry bit\n\t            this._b = 0;\n\n\t            // Iterate the system four times\n\t            for (var i = 0; i < 4; i++) {\n\t                nextState.call(this);\n\t            }\n\n\t            // Modify the counters\n\t            for (var i = 0; i < 8; i++) {\n\t                C[i] ^= X[(i + 4) & 7];\n\t            }\n\n\t            // IV setup\n\t            if (iv) {\n\t                // Shortcuts\n\t                var IV = iv.words;\n\t                var IV_0 = IV[0];\n\t                var IV_1 = IV[1];\n\n\t                // Generate four subvectors\n\t                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);\n\t                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);\n\t                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);\n\t                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);\n\n\t                // Modify counter values\n\t                C[0] ^= i0;\n\t                C[1] ^= i1;\n\t                C[2] ^= i2;\n\t                C[3] ^= i3;\n\t                C[4] ^= i0;\n\t                C[5] ^= i1;\n\t                C[6] ^= i2;\n\t                C[7] ^= i3;\n\n\t                // Iterate the system four times\n\t                for (var i = 0; i < 4; i++) {\n\t                    nextState.call(this);\n\t                }\n\t            }\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var X = this._X;\n\n\t            // Iterate the system\n\t            nextState.call(this);\n\n\t            // Generate four keystream words\n\t            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);\n\t            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);\n\t            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);\n\t            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);\n\n\t            for (var i = 0; i < 4; i++) {\n\t                // Swap endian\n\t                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |\n\t                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);\n\n\t                // Encrypt\n\t                M[offset + i] ^= S[i];\n\t            }\n\t        },\n\n\t        blockSize: 128/32,\n\n\t        ivSize: 64/32\n\t    });\n\n\t    function nextState() {\n\t        // Shortcuts\n\t        var X = this._X;\n\t        var C = this._C;\n\n\t        // Save old counter values\n\t        for (var i = 0; i < 8; i++) {\n\t            C_[i] = C[i];\n\t        }\n\n\t        // Calculate new counter values\n\t        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;\n\t        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;\n\t        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;\n\t        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;\n\t        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;\n\t        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;\n\t        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;\n\t        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;\n\t        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;\n\n\t        // Calculate the g-values\n\t        for (var i = 0; i < 8; i++) {\n\t            var gx = X[i] + C[i];\n\n\t            // Construct high and low argument for squaring\n\t            var ga = gx & 0xffff;\n\t            var gb = gx >>> 16;\n\n\t            // Calculate high and low result of squaring\n\t            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;\n\t            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);\n\n\t            // High XOR low\n\t            G[i] = gh ^ gl;\n\t        }\n\n\t        // Calculate new state values\n\t        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;\n\t        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;\n\t        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;\n\t        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;\n\t        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;\n\t        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;\n\t        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;\n\t        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.Rabbit = StreamCipher._createHelper(Rabbit);\n\t}());\n\n\n\treturn CryptoJS.Rabbit;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var StreamCipher = C_lib.StreamCipher;\n\t    var C_algo = C.algo;\n\n\t    // Reusable objects\n\t    var S  = [];\n\t    var C_ = [];\n\t    var G  = [];\n\n\t    /**\n\t     * Rabbit stream cipher algorithm.\n\t     *\n\t     * This is a legacy version that neglected to convert the key to little-endian.\n\t     * This error doesn't affect the cipher's security,\n\t     * but it does affect its compatibility with other implementations.\n\t     */\n\t    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var K = this._key.words;\n\t            var iv = this.cfg.iv;\n\n\t            // Generate initial state values\n\t            var X = this._X = [\n\t                K[0], (K[3] << 16) | (K[2] >>> 16),\n\t                K[1], (K[0] << 16) | (K[3] >>> 16),\n\t                K[2], (K[1] << 16) | (K[0] >>> 16),\n\t                K[3], (K[2] << 16) | (K[1] >>> 16)\n\t            ];\n\n\t            // Generate initial counter values\n\t            var C = this._C = [\n\t                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),\n\t                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),\n\t                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),\n\t                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)\n\t            ];\n\n\t            // Carry bit\n\t            this._b = 0;\n\n\t            // Iterate the system four times\n\t            for (var i = 0; i < 4; i++) {\n\t                nextState.call(this);\n\t            }\n\n\t            // Modify the counters\n\t            for (var i = 0; i < 8; i++) {\n\t                C[i] ^= X[(i + 4) & 7];\n\t            }\n\n\t            // IV setup\n\t            if (iv) {\n\t                // Shortcuts\n\t                var IV = iv.words;\n\t                var IV_0 = IV[0];\n\t                var IV_1 = IV[1];\n\n\t                // Generate four subvectors\n\t                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);\n\t                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);\n\t                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);\n\t                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);\n\n\t                // Modify counter values\n\t                C[0] ^= i0;\n\t                C[1] ^= i1;\n\t                C[2] ^= i2;\n\t                C[3] ^= i3;\n\t                C[4] ^= i0;\n\t                C[5] ^= i1;\n\t                C[6] ^= i2;\n\t                C[7] ^= i3;\n\n\t                // Iterate the system four times\n\t                for (var i = 0; i < 4; i++) {\n\t                    nextState.call(this);\n\t                }\n\t            }\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var X = this._X;\n\n\t            // Iterate the system\n\t            nextState.call(this);\n\n\t            // Generate four keystream words\n\t            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);\n\t            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);\n\t            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);\n\t            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);\n\n\t            for (var i = 0; i < 4; i++) {\n\t                // Swap endian\n\t                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |\n\t                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);\n\n\t                // Encrypt\n\t                M[offset + i] ^= S[i];\n\t            }\n\t        },\n\n\t        blockSize: 128/32,\n\n\t        ivSize: 64/32\n\t    });\n\n\t    function nextState() {\n\t        // Shortcuts\n\t        var X = this._X;\n\t        var C = this._C;\n\n\t        // Save old counter values\n\t        for (var i = 0; i < 8; i++) {\n\t            C_[i] = C[i];\n\t        }\n\n\t        // Calculate new counter values\n\t        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;\n\t        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;\n\t        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;\n\t        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;\n\t        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;\n\t        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;\n\t        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;\n\t        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;\n\t        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;\n\n\t        // Calculate the g-values\n\t        for (var i = 0; i < 8; i++) {\n\t            var gx = X[i] + C[i];\n\n\t            // Construct high and low argument for squaring\n\t            var ga = gx & 0xffff;\n\t            var gb = gx >>> 16;\n\n\t            // Calculate high and low result of squaring\n\t            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;\n\t            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);\n\n\t            // High XOR low\n\t            G[i] = gh ^ gl;\n\t        }\n\n\t        // Calculate new state values\n\t        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;\n\t        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;\n\t        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;\n\t        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;\n\t        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;\n\t        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;\n\t        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;\n\t        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);\n\t}());\n\n\n\treturn CryptoJS.RabbitLegacy;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var BlockCipher = C_lib.BlockCipher;\n\t    var C_algo = C.algo;\n\n\t    const N = 16;\n\n\t    //Origin pbox and sbox, derived from PI\n\t    const ORIG_P = [\n\t        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,\n\t        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,\n\t        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,\n\t        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,\n\t        0x9216D5D9, 0x8979FB1B\n\t    ];\n\n\t    const ORIG_S = [\n\t        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,\n\t            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,\n\t            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,\n\t            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,\n\t            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,\n\t            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,\n\t            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,\n\t            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,\n\t            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,\n\t            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,\n\t            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,\n\t            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,\n\t            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,\n\t            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,\n\t            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,\n\t            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,\n\t            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,\n\t            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,\n\t            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,\n\t            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,\n\t            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,\n\t            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,\n\t            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,\n\t            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,\n\t            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,\n\t            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,\n\t            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,\n\t            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,\n\t            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,\n\t            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,\n\t            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,\n\t            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,\n\t            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,\n\t            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,\n\t            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,\n\t            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,\n\t            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,\n\t            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,\n\t            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,\n\t            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,\n\t            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,\n\t            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,\n\t            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,\n\t            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,\n\t            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,\n\t            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,\n\t            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,\n\t            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,\n\t            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,\n\t            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,\n\t            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,\n\t            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,\n\t            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,\n\t            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,\n\t            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,\n\t            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,\n\t            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,\n\t            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,\n\t            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,\n\t            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,\n\t            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,\n\t            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,\n\t            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,\n\t            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],\n\t        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,\n\t            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,\n\t            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,\n\t            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,\n\t            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,\n\t            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,\n\t            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,\n\t            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,\n\t            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,\n\t            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,\n\t            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,\n\t            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,\n\t            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,\n\t            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,\n\t            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,\n\t            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,\n\t            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,\n\t            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,\n\t            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,\n\t            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,\n\t            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,\n\t            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,\n\t            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,\n\t            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,\n\t            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,\n\t            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,\n\t            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,\n\t            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,\n\t            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,\n\t            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,\n\t            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,\n\t            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,\n\t            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,\n\t            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,\n\t            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,\n\t            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,\n\t            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,\n\t            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,\n\t            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,\n\t            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,\n\t            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,\n\t            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,\n\t            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,\n\t            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,\n\t            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,\n\t            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,\n\t            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,\n\t            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,\n\t            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,\n\t            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,\n\t            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,\n\t            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,\n\t            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,\n\t            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,\n\t            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,\n\t            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,\n\t            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,\n\t            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,\n\t            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,\n\t            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,\n\t            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,\n\t            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,\n\t            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,\n\t            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],\n\t        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,\n\t            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,\n\t            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,\n\t            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,\n\t            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,\n\t            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,\n\t            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,\n\t            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,\n\t            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,\n\t            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,\n\t            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,\n\t            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,\n\t            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,\n\t            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,\n\t            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,\n\t            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,\n\t            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,\n\t            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,\n\t            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,\n\t            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,\n\t            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,\n\t            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,\n\t            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,\n\t            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,\n\t            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,\n\t            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,\n\t            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,\n\t            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,\n\t            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,\n\t            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,\n\t            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,\n\t            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,\n\t            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,\n\t            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,\n\t            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,\n\t            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,\n\t            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,\n\t            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,\n\t            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,\n\t            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,\n\t            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,\n\t            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,\n\t            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,\n\t            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,\n\t            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,\n\t            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,\n\t            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,\n\t            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,\n\t            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,\n\t            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,\n\t            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,\n\t            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,\n\t            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,\n\t            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,\n\t            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,\n\t            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,\n\t            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,\n\t            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,\n\t            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,\n\t            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,\n\t            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,\n\t            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,\n\t            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,\n\t            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],\n\t        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,\n\t            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,\n\t            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,\n\t            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,\n\t            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,\n\t            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,\n\t            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,\n\t            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,\n\t            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,\n\t            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,\n\t            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,\n\t            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,\n\t            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,\n\t            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,\n\t            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,\n\t            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,\n\t            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,\n\t            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,\n\t            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,\n\t            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,\n\t            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,\n\t            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,\n\t            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,\n\t            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,\n\t            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,\n\t            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,\n\t            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,\n\t            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,\n\t            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,\n\t            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,\n\t            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,\n\t            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,\n\t            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,\n\t            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,\n\t            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,\n\t            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,\n\t            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,\n\t            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,\n\t            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,\n\t            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,\n\t            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,\n\t            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,\n\t            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,\n\t            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,\n\t            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,\n\t            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,\n\t            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,\n\t            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,\n\t            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,\n\t            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,\n\t            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,\n\t            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,\n\t            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,\n\t            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,\n\t            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,\n\t            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,\n\t            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,\n\t            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,\n\t            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,\n\t            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,\n\t            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,\n\t            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,\n\t            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,\n\t            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]\n\t    ];\n\n\t    var BLOWFISH_CTX = {\n\t        pbox: [],\n\t        sbox: []\n\t    }\n\n\t    function F(ctx, x){\n\t        let a = (x >> 24) & 0xFF;\n\t        let b = (x >> 16) & 0xFF;\n\t        let c = (x >> 8) & 0xFF;\n\t        let d = x & 0xFF;\n\n\t        let y = ctx.sbox[0][a] + ctx.sbox[1][b];\n\t        y = y ^ ctx.sbox[2][c];\n\t        y = y + ctx.sbox[3][d];\n\n\t        return y;\n\t    }\n\n\t    function BlowFish_Encrypt(ctx, left, right){\n\t        let Xl = left;\n\t        let Xr = right;\n\t        let temp;\n\n\t        for(let i = 0; i < N; ++i){\n\t            Xl = Xl ^ ctx.pbox[i];\n\t            Xr = F(ctx, Xl) ^ Xr;\n\n\t            temp = Xl;\n\t            Xl = Xr;\n\t            Xr = temp;\n\t        }\n\n\t        temp = Xl;\n\t        Xl = Xr;\n\t        Xr = temp;\n\n\t        Xr = Xr ^ ctx.pbox[N];\n\t        Xl = Xl ^ ctx.pbox[N + 1];\n\n\t        return {left: Xl, right: Xr};\n\t    }\n\n\t    function BlowFish_Decrypt(ctx, left, right){\n\t        let Xl = left;\n\t        let Xr = right;\n\t        let temp;\n\n\t        for(let i = N + 1; i > 1; --i){\n\t            Xl = Xl ^ ctx.pbox[i];\n\t            Xr = F(ctx, Xl) ^ Xr;\n\n\t            temp = Xl;\n\t            Xl = Xr;\n\t            Xr = temp;\n\t        }\n\n\t        temp = Xl;\n\t        Xl = Xr;\n\t        Xr = temp;\n\n\t        Xr = Xr ^ ctx.pbox[1];\n\t        Xl = Xl ^ ctx.pbox[0];\n\n\t        return {left: Xl, right: Xr};\n\t    }\n\n\t    /**\n\t     * Initialization ctx's pbox and sbox.\n\t     *\n\t     * @param {Object} ctx The object has pbox and sbox.\n\t     * @param {Array} key An array of 32-bit words.\n\t     * @param {int} keysize The length of the key.\n\t     *\n\t     * @example\n\t     *\n\t     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);\n\t     */\n\t    function BlowFishInit(ctx, key, keysize)\n\t    {\n\t        for(let Row = 0; Row < 4; Row++)\n\t        {\n\t            ctx.sbox[Row] = [];\n\t            for(let Col = 0; Col < 256; Col++)\n\t            {\n\t                ctx.sbox[Row][Col] = ORIG_S[Row][Col];\n\t            }\n\t        }\n\n\t        let keyIndex = 0;\n\t        for(let index = 0; index < N + 2; index++)\n\t        {\n\t            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];\n\t            keyIndex++;\n\t            if(keyIndex >= keysize)\n\t            {\n\t                keyIndex = 0;\n\t            }\n\t        }\n\n\t        let Data1 = 0;\n\t        let Data2 = 0;\n\t        let res = 0;\n\t        for(let i = 0; i < N + 2; i += 2)\n\t        {\n\t            res = BlowFish_Encrypt(ctx, Data1, Data2);\n\t            Data1 = res.left;\n\t            Data2 = res.right;\n\t            ctx.pbox[i] = Data1;\n\t            ctx.pbox[i + 1] = Data2;\n\t        }\n\n\t        for(let i = 0; i < 4; i++)\n\t        {\n\t            for(let j = 0; j < 256; j += 2)\n\t            {\n\t                res = BlowFish_Encrypt(ctx, Data1, Data2);\n\t                Data1 = res.left;\n\t                Data2 = res.right;\n\t                ctx.sbox[i][j] = Data1;\n\t                ctx.sbox[i][j + 1] = Data2;\n\t            }\n\t        }\n\n\t        return true;\n\t    }\n\n\t    /**\n\t     * Blowfish block cipher algorithm.\n\t     */\n\t    var Blowfish = C_algo.Blowfish = BlockCipher.extend({\n\t        _doReset: function () {\n\t            // Skip reset of nRounds has been set before and key did not change\n\t            if (this._keyPriorReset === this._key) {\n\t                return;\n\t            }\n\n\t            // Shortcuts\n\t            var key = this._keyPriorReset = this._key;\n\t            var keyWords = key.words;\n\t            var keySize = key.sigBytes / 4;\n\n\t            //Initialization pbox and sbox\n\t            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);\n\t            M[offset] = res.left;\n\t            M[offset + 1] = res.right;\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);\n\t            M[offset] = res.left;\n\t            M[offset + 1] = res.right;\n\t        },\n\n\t        blockSize: 64/32,\n\n\t        keySize: 128/32,\n\n\t        ivSize: 64/32\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.Blowfish = BlockCipher._createHelper(Blowfish);\n\t}());\n\n\n\treturn CryptoJS.Blowfish;\n\n}));"]}
\ No newline at end of file
diff --git a/miniprogram_npm/dayjs/index.js b/miniprogram_npm/dayjs/index.js
index 6b4d9f9..d7f36a7 100644
--- a/miniprogram_npm/dayjs/index.js
+++ b/miniprogram_npm/dayjs/index.js
@@ -4,10 +4,10 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1711522529463, function(require, module, exports) {
+__DEFINE__(1734585677030, function(require, module, exports) {
 !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1711522529463);
+return __REQUIRE__(1734585677030);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/node_modules/crypto-js/CONTRIBUTING.md b/node_modules/crypto-js/CONTRIBUTING.md
new file mode 100644
index 0000000..09bf774
--- /dev/null
+++ b/node_modules/crypto-js/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+# Contribution
+
+# Git Flow 
+
+The crypto-js project uses [git flow](https://github.com/nvie/gitflow) to manage branches. 
+Do your changes on the `develop` or even better on a `feature/*` branch. Don't do any changes on the `master` branch.
+
+# Pull request
+
+Target your pull request on `develop` branch. Other pull request won't be accepted.
+
+# How to build
+
+1. Clone
+
+2. Run
+
+    ```sh
+    npm install
+    ```
+
+3. Run
+
+    ```sh
+    npm run build
+    ```
+    
+4. Check `build` folder
\ No newline at end of file
diff --git a/node_modules/crypto-js/LICENSE b/node_modules/crypto-js/LICENSE
new file mode 100644
index 0000000..b0828e5
--- /dev/null
+++ b/node_modules/crypto-js/LICENSE
@@ -0,0 +1,24 @@
+# License
+
+[The MIT License (MIT)](http://opensource.org/licenses/MIT)
+
+Copyright (c) 2009-2013 Jeff Mott  
+Copyright (c) 2013-2016 Evan Vosberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/node_modules/crypto-js/README.md b/node_modules/crypto-js/README.md
new file mode 100644
index 0000000..6a9bcdf
--- /dev/null
+++ b/node_modules/crypto-js/README.md
@@ -0,0 +1,275 @@
+# crypto-js
+
+JavaScript library of crypto standards.
+
+## Discontinued
+
+Active development of CryptoJS has been discontinued. This library is no longer maintained.
+
+Nowadays, NodeJS and modern browsers have a native `Crypto` module. The latest version of CryptoJS already uses the native Crypto module for random number generation, since `Math.random()` is not crypto-safe. Further development of CryptoJS would result in it only being a wrapper of native Crypto. Therefore, development and maintenance has been discontinued, it is time to go for the native `crypto` module.
+
+## Node.js (Install)
+
+Requirements:
+
+- Node.js
+- npm (Node.js package manager)
+
+```bash
+npm install crypto-js
+```
+
+### Usage
+
+ES6 import for typical API call signing use case:
+
+```javascript
+import sha256 from 'crypto-js/sha256';
+import hmacSHA512 from 'crypto-js/hmac-sha512';
+import Base64 from 'crypto-js/enc-base64';
+
+const message, nonce, path, privateKey; // ...
+const hashDigest = sha256(nonce + message);
+const hmacDigest = Base64.stringify(hmacSHA512(path + hashDigest, privateKey));
+```
+
+Modular include:
+
+```javascript
+var AES = require("crypto-js/aes");
+var SHA256 = require("crypto-js/sha256");
+...
+console.log(SHA256("Message"));
+```
+
+Including all libraries, for access to extra methods:
+
+```javascript
+var CryptoJS = require("crypto-js");
+console.log(CryptoJS.HmacSHA1("Message", "Key"));
+```
+
+## Client (browser)
+
+Requirements:
+
+- Node.js
+- Bower (package manager for frontend)
+
+```bash
+bower install crypto-js
+```
+
+### Usage
+
+Modular include:
+
+```javascript
+require.config({
+    packages: [
+        {
+            name: 'crypto-js',
+            location: 'path-to/bower_components/crypto-js',
+            main: 'index'
+        }
+    ]
+});
+
+require(["crypto-js/aes", "crypto-js/sha256"], function (AES, SHA256) {
+    console.log(SHA256("Message"));
+});
+```
+
+Including all libraries, for access to extra methods:
+
+```javascript
+// Above-mentioned will work or use this simple form
+require.config({
+    paths: {
+        'crypto-js': 'path-to/bower_components/crypto-js/crypto-js'
+    }
+});
+
+require(["crypto-js"], function (CryptoJS) {
+    console.log(CryptoJS.HmacSHA1("Message", "Key"));
+});
+```
+
+### Usage without RequireJS
+
+```html
+<script type="text/javascript" src="path-to/bower_components/crypto-js/crypto-js.js"></script>
+<script type="text/javascript">
+    var encrypted = CryptoJS.AES(...);
+    var encrypted = CryptoJS.SHA256(...);
+</script>
+```
+
+## API
+
+See: https://cryptojs.gitbook.io/docs/
+
+### AES Encryption
+
+#### Plain text encryption
+
+```javascript
+var CryptoJS = require("crypto-js");
+
+// Encrypt
+var ciphertext = CryptoJS.AES.encrypt('my message', 'secret key 123').toString();
+
+// Decrypt
+var bytes  = CryptoJS.AES.decrypt(ciphertext, 'secret key 123');
+var originalText = bytes.toString(CryptoJS.enc.Utf8);
+
+console.log(originalText); // 'my message'
+```
+
+#### Object encryption
+
+```javascript
+var CryptoJS = require("crypto-js");
+
+var data = [{id: 1}, {id: 2}]
+
+// Encrypt
+var ciphertext = CryptoJS.AES.encrypt(JSON.stringify(data), 'secret key 123').toString();
+
+// Decrypt
+var bytes  = CryptoJS.AES.decrypt(ciphertext, 'secret key 123');
+var decryptedData = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
+
+console.log(decryptedData); // [{id: 1}, {id: 2}]
+```
+
+### List of modules
+
+
+- ```crypto-js/core```
+- ```crypto-js/x64-core```
+- ```crypto-js/lib-typedarrays```
+
+---
+
+- ```crypto-js/md5```
+- ```crypto-js/sha1```
+- ```crypto-js/sha256```
+- ```crypto-js/sha224```
+- ```crypto-js/sha512```
+- ```crypto-js/sha384```
+- ```crypto-js/sha3```
+- ```crypto-js/ripemd160```
+
+---
+
+- ```crypto-js/hmac-md5```
+- ```crypto-js/hmac-sha1```
+- ```crypto-js/hmac-sha256```
+- ```crypto-js/hmac-sha224```
+- ```crypto-js/hmac-sha512```
+- ```crypto-js/hmac-sha384```
+- ```crypto-js/hmac-sha3```
+- ```crypto-js/hmac-ripemd160```
+
+---
+
+- ```crypto-js/pbkdf2```
+
+---
+
+- ```crypto-js/aes```
+- ```crypto-js/tripledes```
+- ```crypto-js/rc4```
+- ```crypto-js/rabbit```
+- ```crypto-js/rabbit-legacy```
+- ```crypto-js/evpkdf```
+
+---
+
+- ```crypto-js/format-openssl```
+- ```crypto-js/format-hex```
+
+---
+
+- ```crypto-js/enc-latin1```
+- ```crypto-js/enc-utf8```
+- ```crypto-js/enc-hex```
+- ```crypto-js/enc-utf16```
+- ```crypto-js/enc-base64```
+
+---
+
+- ```crypto-js/mode-cfb```
+- ```crypto-js/mode-ctr```
+- ```crypto-js/mode-ctr-gladman```
+- ```crypto-js/mode-ofb```
+- ```crypto-js/mode-ecb```
+
+---
+
+- ```crypto-js/pad-pkcs7```
+- ```crypto-js/pad-ansix923```
+- ```crypto-js/pad-iso10126```
+- ```crypto-js/pad-iso97971```
+- ```crypto-js/pad-zeropadding```
+- ```crypto-js/pad-nopadding```
+
+
+## Release notes
+
+### 4.2.0
+
+Change default hash algorithm and iteration's for PBKDF2 to prevent weak security by using the default configuration.
+
+Custom KDF Hasher
+
+Blowfish support
+
+### 4.1.1
+
+Fix module order in bundled release.
+
+Include the browser field in the released package.json.
+
+### 4.1.0
+
+Added url safe variant of base64 encoding. [357](https://github.com/brix/crypto-js/pull/357)
+
+Avoid webpack to add crypto-browser package. [364](https://github.com/brix/crypto-js/pull/364)
+
+### 4.0.0
+
+This is an update including breaking changes for some environments.
+
+In this version `Math.random()` has been replaced by the random methods of the native crypto module.
+
+For this reason CryptoJS might not run in some JavaScript environments without native crypto module. Such as IE 10 or before or React Native.
+
+### 3.3.0
+
+Rollback, `3.3.0` is the same as `3.1.9-1`.
+
+The move of using native secure crypto module will be shifted to a new `4.x.x` version. As it is a breaking change the impact is too big for a minor release.
+
+### 3.2.1
+
+The usage of the native crypto module has been fixed. The import and access of the native crypto module has been improved.
+
+### 3.2.0
+
+In this version `Math.random()` has been replaced by the random methods of the native crypto module.
+
+For this reason CryptoJS might does not run in some JavaScript environments without native crypto module. Such as IE 10 or before.
+
+If it's absolute required to run CryptoJS in such an environment, stay with `3.1.x` version. Encrypting and decrypting stays compatible. But keep in mind `3.1.x` versions still use `Math.random()` which is cryptographically not secure, as it's not random enough. 
+
+This version came along with `CRITICAL` `BUG`. 
+
+DO NOT USE THIS VERSION! Please, go for a newer version!
+
+### 3.1.x
+
+The `3.1.x` are based on the original CryptoJS, wrapped in CommonJS modules.
+
+
diff --git a/node_modules/crypto-js/aes.js b/node_modules/crypto-js/aes.js
new file mode 100644
index 0000000..166e3ea
--- /dev/null
+++ b/node_modules/crypto-js/aes.js
@@ -0,0 +1,234 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Lookup tables
+	    var SBOX = [];
+	    var INV_SBOX = [];
+	    var SUB_MIX_0 = [];
+	    var SUB_MIX_1 = [];
+	    var SUB_MIX_2 = [];
+	    var SUB_MIX_3 = [];
+	    var INV_SUB_MIX_0 = [];
+	    var INV_SUB_MIX_1 = [];
+	    var INV_SUB_MIX_2 = [];
+	    var INV_SUB_MIX_3 = [];
+
+	    // Compute lookup tables
+	    (function () {
+	        // Compute double table
+	        var d = [];
+	        for (var i = 0; i < 256; i++) {
+	            if (i < 128) {
+	                d[i] = i << 1;
+	            } else {
+	                d[i] = (i << 1) ^ 0x11b;
+	            }
+	        }
+
+	        // Walk GF(2^8)
+	        var x = 0;
+	        var xi = 0;
+	        for (var i = 0; i < 256; i++) {
+	            // Compute sbox
+	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+	            SBOX[x] = sx;
+	            INV_SBOX[sx] = x;
+
+	            // Compute multiplication
+	            var x2 = d[x];
+	            var x4 = d[x2];
+	            var x8 = d[x4];
+
+	            // Compute sub bytes, mix columns tables
+	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
+	            SUB_MIX_3[x] = t;
+
+	            // Compute inv sub bytes, inv mix columns tables
+	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
+	            INV_SUB_MIX_3[sx] = t;
+
+	            // Compute next counter
+	            if (!x) {
+	                x = xi = 1;
+	            } else {
+	                x = x2 ^ d[d[d[x8 ^ x2]]];
+	                xi ^= d[d[xi]];
+	            }
+	        }
+	    }());
+
+	    // Precomputed Rcon lookup
+	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+	    /**
+	     * AES block cipher algorithm.
+	     */
+	    var AES = C_algo.AES = BlockCipher.extend({
+	        _doReset: function () {
+	            var t;
+
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._nRounds && this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            // Compute number of rounds
+	            var nRounds = this._nRounds = keySize + 6;
+
+	            // Compute number of key schedule rows
+	            var ksRows = (nRounds + 1) * 4;
+
+	            // Compute key schedule
+	            var keySchedule = this._keySchedule = [];
+	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+	                if (ksRow < keySize) {
+	                    keySchedule[ksRow] = keyWords[ksRow];
+	                } else {
+	                    t = keySchedule[ksRow - 1];
+
+	                    if (!(ksRow % keySize)) {
+	                        // Rot word
+	                        t = (t << 8) | (t >>> 24);
+
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+	                        // Mix Rcon
+	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
+	                    } else if (keySize > 6 && ksRow % keySize == 4) {
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+	                    }
+
+	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+	                }
+	            }
+
+	            // Compute inv key schedule
+	            var invKeySchedule = this._invKeySchedule = [];
+	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+	                var ksRow = ksRows - invKsRow;
+
+	                if (invKsRow % 4) {
+	                    var t = keySchedule[ksRow];
+	                } else {
+	                    var t = keySchedule[ksRow - 4];
+	                }
+
+	                if (invKsRow < 4 || ksRow <= 4) {
+	                    invKeySchedule[invKsRow] = t;
+	                } else {
+	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+	                }
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            // Swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+
+	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+	            // Inv swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+	        },
+
+	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+	            // Shortcut
+	            var nRounds = this._nRounds;
+
+	            // Get input, add round key
+	            var s0 = M[offset]     ^ keySchedule[0];
+	            var s1 = M[offset + 1] ^ keySchedule[1];
+	            var s2 = M[offset + 2] ^ keySchedule[2];
+	            var s3 = M[offset + 3] ^ keySchedule[3];
+
+	            // Key schedule row counter
+	            var ksRow = 4;
+
+	            // Rounds
+	            for (var round = 1; round < nRounds; round++) {
+	                // Shift rows, sub bytes, mix columns, add round key
+	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+	                // Update state
+	                s0 = t0;
+	                s1 = t1;
+	                s2 = t2;
+	                s3 = t3;
+	            }
+
+	            // Shift rows, sub bytes, add round key
+	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+	            // Set output
+	            M[offset]     = t0;
+	            M[offset + 1] = t1;
+	            M[offset + 2] = t2;
+	            M[offset + 3] = t3;
+	        },
+
+	        keySize: 256/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.AES = BlockCipher._createHelper(AES);
+	}());
+
+
+	return CryptoJS.AES;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/blowfish.js b/node_modules/crypto-js/blowfish.js
new file mode 100644
index 0000000..149812f
--- /dev/null
+++ b/node_modules/crypto-js/blowfish.js
@@ -0,0 +1,471 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    const N = 16;
+
+	    //Origin pbox and sbox, derived from PI
+	    const ORIG_P = [
+	        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+	        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+	        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+	        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+	        0x9216D5D9, 0x8979FB1B
+	    ];
+
+	    const ORIG_S = [
+	        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+	            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+	            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+	            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+	            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+	            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+	            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+	            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+	            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+	            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+	            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+	            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+	            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+	            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+	            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+	            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+	            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+	            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+	            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+	            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+	            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+	            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+	            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+	            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+	            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+	            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+	            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+	            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+	            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+	            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+	            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+	            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+	            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+	            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+	            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+	            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+	            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+	            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+	            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+	            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+	            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+	            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+	            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+	            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+	            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+	            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+	            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+	            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+	            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+	            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+	            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+	            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+	            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+	            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+	            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+	            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+	            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+	            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+	            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+	            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+	            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+	            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+	            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+	            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],
+	        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+	            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+	            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+	            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+	            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+	            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+	            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+	            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+	            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+	            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+	            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+	            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+	            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+	            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+	            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+	            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+	            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+	            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+	            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+	            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+	            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+	            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+	            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+	            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+	            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+	            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+	            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+	            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+	            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+	            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+	            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+	            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+	            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+	            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+	            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+	            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+	            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+	            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+	            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+	            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+	            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+	            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+	            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+	            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+	            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+	            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+	            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+	            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+	            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+	            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+	            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+	            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+	            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+	            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+	            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+	            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+	            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+	            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+	            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+	            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+	            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+	            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+	            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+	            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],
+	        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+	            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+	            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+	            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+	            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+	            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+	            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+	            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+	            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+	            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+	            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+	            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+	            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+	            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+	            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+	            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+	            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+	            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+	            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+	            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+	            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+	            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+	            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+	            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+	            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+	            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+	            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+	            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+	            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+	            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+	            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+	            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+	            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+	            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+	            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+	            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+	            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+	            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+	            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+	            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+	            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+	            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+	            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+	            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+	            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+	            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+	            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+	            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+	            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+	            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+	            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+	            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+	            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+	            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+	            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+	            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+	            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+	            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+	            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+	            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+	            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+	            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+	            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+	            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],
+	        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+	            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+	            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+	            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+	            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+	            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+	            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+	            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+	            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+	            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+	            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+	            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+	            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+	            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+	            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+	            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+	            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+	            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+	            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+	            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+	            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+	            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+	            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+	            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+	            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+	            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+	            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+	            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+	            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+	            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+	            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+	            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+	            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+	            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+	            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+	            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+	            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+	            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+	            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+	            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+	            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+	            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+	            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+	            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+	            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+	            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+	            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+	            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+	            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+	            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+	            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+	            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+	            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+	            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+	            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+	            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+	            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+	            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+	            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+	            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+	            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+	            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+	            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+	            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]
+	    ];
+
+	    var BLOWFISH_CTX = {
+	        pbox: [],
+	        sbox: []
+	    }
+
+	    function F(ctx, x){
+	        let a = (x >> 24) & 0xFF;
+	        let b = (x >> 16) & 0xFF;
+	        let c = (x >> 8) & 0xFF;
+	        let d = x & 0xFF;
+
+	        let y = ctx.sbox[0][a] + ctx.sbox[1][b];
+	        y = y ^ ctx.sbox[2][c];
+	        y = y + ctx.sbox[3][d];
+
+	        return y;
+	    }
+
+	    function BlowFish_Encrypt(ctx, left, right){
+	        let Xl = left;
+	        let Xr = right;
+	        let temp;
+
+	        for(let i = 0; i < N; ++i){
+	            Xl = Xl ^ ctx.pbox[i];
+	            Xr = F(ctx, Xl) ^ Xr;
+
+	            temp = Xl;
+	            Xl = Xr;
+	            Xr = temp;
+	        }
+
+	        temp = Xl;
+	        Xl = Xr;
+	        Xr = temp;
+
+	        Xr = Xr ^ ctx.pbox[N];
+	        Xl = Xl ^ ctx.pbox[N + 1];
+
+	        return {left: Xl, right: Xr};
+	    }
+
+	    function BlowFish_Decrypt(ctx, left, right){
+	        let Xl = left;
+	        let Xr = right;
+	        let temp;
+
+	        for(let i = N + 1; i > 1; --i){
+	            Xl = Xl ^ ctx.pbox[i];
+	            Xr = F(ctx, Xl) ^ Xr;
+
+	            temp = Xl;
+	            Xl = Xr;
+	            Xr = temp;
+	        }
+
+	        temp = Xl;
+	        Xl = Xr;
+	        Xr = temp;
+
+	        Xr = Xr ^ ctx.pbox[1];
+	        Xl = Xl ^ ctx.pbox[0];
+
+	        return {left: Xl, right: Xr};
+	    }
+
+	    /**
+	     * Initialization ctx's pbox and sbox.
+	     *
+	     * @param {Object} ctx The object has pbox and sbox.
+	     * @param {Array} key An array of 32-bit words.
+	     * @param {int} keysize The length of the key.
+	     *
+	     * @example
+	     *
+	     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);
+	     */
+	    function BlowFishInit(ctx, key, keysize)
+	    {
+	        for(let Row = 0; Row < 4; Row++)
+	        {
+	            ctx.sbox[Row] = [];
+	            for(let Col = 0; Col < 256; Col++)
+	            {
+	                ctx.sbox[Row][Col] = ORIG_S[Row][Col];
+	            }
+	        }
+
+	        let keyIndex = 0;
+	        for(let index = 0; index < N + 2; index++)
+	        {
+	            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];
+	            keyIndex++;
+	            if(keyIndex >= keysize)
+	            {
+	                keyIndex = 0;
+	            }
+	        }
+
+	        let Data1 = 0;
+	        let Data2 = 0;
+	        let res = 0;
+	        for(let i = 0; i < N + 2; i += 2)
+	        {
+	            res = BlowFish_Encrypt(ctx, Data1, Data2);
+	            Data1 = res.left;
+	            Data2 = res.right;
+	            ctx.pbox[i] = Data1;
+	            ctx.pbox[i + 1] = Data2;
+	        }
+
+	        for(let i = 0; i < 4; i++)
+	        {
+	            for(let j = 0; j < 256; j += 2)
+	            {
+	                res = BlowFish_Encrypt(ctx, Data1, Data2);
+	                Data1 = res.left;
+	                Data2 = res.right;
+	                ctx.sbox[i][j] = Data1;
+	                ctx.sbox[i][j + 1] = Data2;
+	            }
+	        }
+
+	        return true;
+	    }
+
+	    /**
+	     * Blowfish block cipher algorithm.
+	     */
+	    var Blowfish = C_algo.Blowfish = BlockCipher.extend({
+	        _doReset: function () {
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            //Initialization pbox and sbox
+	            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
+	            M[offset] = res.left;
+	            M[offset + 1] = res.right;
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
+	            M[offset] = res.left;
+	            M[offset + 1] = res.right;
+	        },
+
+	        blockSize: 64/32,
+
+	        keySize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);
+	     */
+	    C.Blowfish = BlockCipher._createHelper(Blowfish);
+	}());
+
+
+	return CryptoJS.Blowfish;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/bower.json b/node_modules/crypto-js/bower.json
new file mode 100644
index 0000000..4dee617
--- /dev/null
+++ b/node_modules/crypto-js/bower.json
@@ -0,0 +1,39 @@
+{
+  "name": "crypto-js",
+  "version": "4.2.0",
+  "description": "JavaScript library of crypto standards.",
+  "license": "MIT",
+  "homepage": "http://github.com/brix/crypto-js",
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/brix/crypto-js.git"
+  },
+  "keywords": [
+    "security",
+    "crypto",
+    "Hash",
+    "MD5",
+    "SHA1",
+    "SHA-1",
+    "SHA256",
+    "SHA-256",
+    "RC4",
+    "Rabbit",
+    "AES",
+    "DES",
+    "PBKDF2",
+    "HMAC",
+    "OFB",
+    "CFB",
+    "CTR",
+    "CBC",
+    "Base64",
+    "Base64url"
+  ],
+  "main": "index.js",
+  "dependencies": {},
+  "browser": {
+    "crypto": false
+  },
+  "ignore": []
+}
diff --git a/node_modules/crypto-js/cipher-core.js b/node_modules/crypto-js/cipher-core.js
new file mode 100644
index 0000000..903f462
--- /dev/null
+++ b/node_modules/crypto-js/cipher-core.js
@@ -0,0 +1,895 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./evpkdf"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./evpkdf"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Cipher core components.
+	 */
+	CryptoJS.lib.Cipher || (function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+	    var C_enc = C.enc;
+	    var Utf8 = C_enc.Utf8;
+	    var Base64 = C_enc.Base64;
+	    var C_algo = C.algo;
+	    var EvpKDF = C_algo.EvpKDF;
+
+	    /**
+	     * Abstract base cipher template.
+	     *
+	     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+	     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+	     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+	     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+	     */
+	    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {WordArray} iv The IV to use for this operation.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Creates this cipher in encryption mode.
+	         *
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {Cipher} A cipher instance.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+	         */
+	        createEncryptor: function (key, cfg) {
+	            return this.create(this._ENC_XFORM_MODE, key, cfg);
+	        },
+
+	        /**
+	         * Creates this cipher in decryption mode.
+	         *
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {Cipher} A cipher instance.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+	         */
+	        createDecryptor: function (key, cfg) {
+	            return this.create(this._DEC_XFORM_MODE, key, cfg);
+	        },
+
+	        /**
+	         * Initializes a newly created cipher.
+	         *
+	         * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+	         */
+	        init: function (xformMode, key, cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Store transform mode and key
+	            this._xformMode = xformMode;
+	            this._key = key;
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this cipher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     cipher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-cipher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Adds data to be encrypted or decrypted.
+	         *
+	         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+	         *
+	         * @return {WordArray} The data after processing.
+	         *
+	         * @example
+	         *
+	         *     var encrypted = cipher.process('data');
+	         *     var encrypted = cipher.process(wordArray);
+	         */
+	        process: function (dataUpdate) {
+	            // Append
+	            this._append(dataUpdate);
+
+	            // Process available blocks
+	            return this._process();
+	        },
+
+	        /**
+	         * Finalizes the encryption or decryption process.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+	         *
+	         * @return {WordArray} The data after final processing.
+	         *
+	         * @example
+	         *
+	         *     var encrypted = cipher.finalize();
+	         *     var encrypted = cipher.finalize('data');
+	         *     var encrypted = cipher.finalize(wordArray);
+	         */
+	        finalize: function (dataUpdate) {
+	            // Final data update
+	            if (dataUpdate) {
+	                this._append(dataUpdate);
+	            }
+
+	            // Perform concrete-cipher logic
+	            var finalProcessedData = this._doFinalize();
+
+	            return finalProcessedData;
+	        },
+
+	        keySize: 128/32,
+
+	        ivSize: 128/32,
+
+	        _ENC_XFORM_MODE: 1,
+
+	        _DEC_XFORM_MODE: 2,
+
+	        /**
+	         * Creates shortcut functions to a cipher's object interface.
+	         *
+	         * @param {Cipher} cipher The cipher to create a helper for.
+	         *
+	         * @return {Object} An object with encrypt and decrypt shortcut functions.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+	         */
+	        _createHelper: (function () {
+	            function selectCipherStrategy(key) {
+	                if (typeof key == 'string') {
+	                    return PasswordBasedCipher;
+	                } else {
+	                    return SerializableCipher;
+	                }
+	            }
+
+	            return function (cipher) {
+	                return {
+	                    encrypt: function (message, key, cfg) {
+	                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+	                    },
+
+	                    decrypt: function (ciphertext, key, cfg) {
+	                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+	                    }
+	                };
+	            };
+	        }())
+	    });
+
+	    /**
+	     * Abstract base stream cipher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+	     */
+	    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+	        _doFinalize: function () {
+	            // Process partial blocks
+	            var finalProcessedBlocks = this._process(!!'flush');
+
+	            return finalProcessedBlocks;
+	        },
+
+	        blockSize: 1
+	    });
+
+	    /**
+	     * Mode namespace.
+	     */
+	    var C_mode = C.mode = {};
+
+	    /**
+	     * Abstract base block cipher mode template.
+	     */
+	    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+	        /**
+	         * Creates this mode for encryption.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+	         */
+	        createEncryptor: function (cipher, iv) {
+	            return this.Encryptor.create(cipher, iv);
+	        },
+
+	        /**
+	         * Creates this mode for decryption.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+	         */
+	        createDecryptor: function (cipher, iv) {
+	            return this.Decryptor.create(cipher, iv);
+	        },
+
+	        /**
+	         * Initializes a newly created mode.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+	         */
+	        init: function (cipher, iv) {
+	            this._cipher = cipher;
+	            this._iv = iv;
+	        }
+	    });
+
+	    /**
+	     * Cipher Block Chaining mode.
+	     */
+	    var CBC = C_mode.CBC = (function () {
+	        /**
+	         * Abstract base CBC mode.
+	         */
+	        var CBC = BlockCipherMode.extend();
+
+	        /**
+	         * CBC encryptor.
+	         */
+	        CBC.Encryptor = CBC.extend({
+	            /**
+	             * Processes the data block at offset.
+	             *
+	             * @param {Array} words The data words to operate on.
+	             * @param {number} offset The offset where the block starts.
+	             *
+	             * @example
+	             *
+	             *     mode.processBlock(data.words, offset);
+	             */
+	            processBlock: function (words, offset) {
+	                // Shortcuts
+	                var cipher = this._cipher;
+	                var blockSize = cipher.blockSize;
+
+	                // XOR and encrypt
+	                xorBlock.call(this, words, offset, blockSize);
+	                cipher.encryptBlock(words, offset);
+
+	                // Remember this block to use with next block
+	                this._prevBlock = words.slice(offset, offset + blockSize);
+	            }
+	        });
+
+	        /**
+	         * CBC decryptor.
+	         */
+	        CBC.Decryptor = CBC.extend({
+	            /**
+	             * Processes the data block at offset.
+	             *
+	             * @param {Array} words The data words to operate on.
+	             * @param {number} offset The offset where the block starts.
+	             *
+	             * @example
+	             *
+	             *     mode.processBlock(data.words, offset);
+	             */
+	            processBlock: function (words, offset) {
+	                // Shortcuts
+	                var cipher = this._cipher;
+	                var blockSize = cipher.blockSize;
+
+	                // Remember this block to use with next block
+	                var thisBlock = words.slice(offset, offset + blockSize);
+
+	                // Decrypt and XOR
+	                cipher.decryptBlock(words, offset);
+	                xorBlock.call(this, words, offset, blockSize);
+
+	                // This block becomes the previous block
+	                this._prevBlock = thisBlock;
+	            }
+	        });
+
+	        function xorBlock(words, offset, blockSize) {
+	            var block;
+
+	            // Shortcut
+	            var iv = this._iv;
+
+	            // Choose mixing block
+	            if (iv) {
+	                block = iv;
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            } else {
+	                block = this._prevBlock;
+	            }
+
+	            // XOR blocks
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= block[i];
+	            }
+	        }
+
+	        return CBC;
+	    }());
+
+	    /**
+	     * Padding namespace.
+	     */
+	    var C_pad = C.pad = {};
+
+	    /**
+	     * PKCS #5/7 padding strategy.
+	     */
+	    var Pkcs7 = C_pad.Pkcs7 = {
+	        /**
+	         * Pads data using the algorithm defined in PKCS #5/7.
+	         *
+	         * @param {WordArray} data The data to pad.
+	         * @param {number} blockSize The multiple that the data should be padded to.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+	         */
+	        pad: function (data, blockSize) {
+	            // Shortcut
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count padding bytes
+	            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+	            // Create padding word
+	            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+	            // Create padding
+	            var paddingWords = [];
+	            for (var i = 0; i < nPaddingBytes; i += 4) {
+	                paddingWords.push(paddingWord);
+	            }
+	            var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+	            // Add padding
+	            data.concat(padding);
+	        },
+
+	        /**
+	         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+	         *
+	         * @param {WordArray} data The data to unpad.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+	         */
+	        unpad: function (data) {
+	            // Get number of padding bytes from last byte
+	            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	            // Remove padding
+	            data.sigBytes -= nPaddingBytes;
+	        }
+	    };
+
+	    /**
+	     * Abstract base block cipher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+	     */
+	    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {Mode} mode The block mode to use. Default: CBC
+	         * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+	         */
+	        cfg: Cipher.cfg.extend({
+	            mode: CBC,
+	            padding: Pkcs7
+	        }),
+
+	        reset: function () {
+	            var modeCreator;
+
+	            // Reset cipher
+	            Cipher.reset.call(this);
+
+	            // Shortcuts
+	            var cfg = this.cfg;
+	            var iv = cfg.iv;
+	            var mode = cfg.mode;
+
+	            // Reset block mode
+	            if (this._xformMode == this._ENC_XFORM_MODE) {
+	                modeCreator = mode.createEncryptor;
+	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+	                modeCreator = mode.createDecryptor;
+	                // Keep at least one block in the buffer for unpadding
+	                this._minBufferSize = 1;
+	            }
+
+	            if (this._mode && this._mode.__creator == modeCreator) {
+	                this._mode.init(this, iv && iv.words);
+	            } else {
+	                this._mode = modeCreator.call(mode, this, iv && iv.words);
+	                this._mode.__creator = modeCreator;
+	            }
+	        },
+
+	        _doProcessBlock: function (words, offset) {
+	            this._mode.processBlock(words, offset);
+	        },
+
+	        _doFinalize: function () {
+	            var finalProcessedBlocks;
+
+	            // Shortcut
+	            var padding = this.cfg.padding;
+
+	            // Finalize
+	            if (this._xformMode == this._ENC_XFORM_MODE) {
+	                // Pad data
+	                padding.pad(this._data, this.blockSize);
+
+	                // Process final blocks
+	                finalProcessedBlocks = this._process(!!'flush');
+	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+	                // Process final blocks
+	                finalProcessedBlocks = this._process(!!'flush');
+
+	                // Unpad data
+	                padding.unpad(finalProcessedBlocks);
+	            }
+
+	            return finalProcessedBlocks;
+	        },
+
+	        blockSize: 128/32
+	    });
+
+	    /**
+	     * A collection of cipher parameters.
+	     *
+	     * @property {WordArray} ciphertext The raw ciphertext.
+	     * @property {WordArray} key The key to this ciphertext.
+	     * @property {WordArray} iv The IV used in the ciphering operation.
+	     * @property {WordArray} salt The salt used with a key derivation function.
+	     * @property {Cipher} algorithm The cipher algorithm.
+	     * @property {Mode} mode The block mode used in the ciphering operation.
+	     * @property {Padding} padding The padding scheme used in the ciphering operation.
+	     * @property {number} blockSize The block size of the cipher.
+	     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+	     */
+	    var CipherParams = C_lib.CipherParams = Base.extend({
+	        /**
+	         * Initializes a newly created cipher params object.
+	         *
+	         * @param {Object} cipherParams An object with any of the possible cipher parameters.
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.lib.CipherParams.create({
+	         *         ciphertext: ciphertextWordArray,
+	         *         key: keyWordArray,
+	         *         iv: ivWordArray,
+	         *         salt: saltWordArray,
+	         *         algorithm: CryptoJS.algo.AES,
+	         *         mode: CryptoJS.mode.CBC,
+	         *         padding: CryptoJS.pad.PKCS7,
+	         *         blockSize: 4,
+	         *         formatter: CryptoJS.format.OpenSSL
+	         *     });
+	         */
+	        init: function (cipherParams) {
+	            this.mixIn(cipherParams);
+	        },
+
+	        /**
+	         * Converts this cipher params object to a string.
+	         *
+	         * @param {Format} formatter (Optional) The formatting strategy to use.
+	         *
+	         * @return {string} The stringified cipher params.
+	         *
+	         * @throws Error If neither the formatter nor the default formatter is set.
+	         *
+	         * @example
+	         *
+	         *     var string = cipherParams + '';
+	         *     var string = cipherParams.toString();
+	         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+	         */
+	        toString: function (formatter) {
+	            return (formatter || this.formatter).stringify(this);
+	        }
+	    });
+
+	    /**
+	     * Format namespace.
+	     */
+	    var C_format = C.format = {};
+
+	    /**
+	     * OpenSSL formatting strategy.
+	     */
+	    var OpenSSLFormatter = C_format.OpenSSL = {
+	        /**
+	         * Converts a cipher params object to an OpenSSL-compatible string.
+	         *
+	         * @param {CipherParams} cipherParams The cipher params object.
+	         *
+	         * @return {string} The OpenSSL-compatible string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+	         */
+	        stringify: function (cipherParams) {
+	            var wordArray;
+
+	            // Shortcuts
+	            var ciphertext = cipherParams.ciphertext;
+	            var salt = cipherParams.salt;
+
+	            // Format
+	            if (salt) {
+	                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+	            } else {
+	                wordArray = ciphertext;
+	            }
+
+	            return wordArray.toString(Base64);
+	        },
+
+	        /**
+	         * Converts an OpenSSL-compatible string to a cipher params object.
+	         *
+	         * @param {string} openSSLStr The OpenSSL-compatible string.
+	         *
+	         * @return {CipherParams} The cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+	         */
+	        parse: function (openSSLStr) {
+	            var salt;
+
+	            // Parse base64
+	            var ciphertext = Base64.parse(openSSLStr);
+
+	            // Shortcut
+	            var ciphertextWords = ciphertext.words;
+
+	            // Test for salt
+	            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+	                // Extract salt
+	                salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+	                // Remove salt from ciphertext
+	                ciphertextWords.splice(0, 4);
+	                ciphertext.sigBytes -= 16;
+	            }
+
+	            return CipherParams.create({ ciphertext: ciphertext, salt: salt });
+	        }
+	    };
+
+	    /**
+	     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+	     */
+	    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+	         */
+	        cfg: Base.extend({
+	            format: OpenSSLFormatter
+	        }),
+
+	        /**
+	         * Encrypts a message.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {WordArray|string} message The message to encrypt.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {CipherParams} A cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         */
+	        encrypt: function (cipher, message, key, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Encrypt
+	            var encryptor = cipher.createEncryptor(key, cfg);
+	            var ciphertext = encryptor.finalize(message);
+
+	            // Shortcut
+	            var cipherCfg = encryptor.cfg;
+
+	            // Create and return serializable cipher params
+	            return CipherParams.create({
+	                ciphertext: ciphertext,
+	                key: key,
+	                iv: cipherCfg.iv,
+	                algorithm: cipher,
+	                mode: cipherCfg.mode,
+	                padding: cipherCfg.padding,
+	                blockSize: cipher.blockSize,
+	                formatter: cfg.format
+	            });
+	        },
+
+	        /**
+	         * Decrypts serialized ciphertext.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {WordArray} The plaintext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         */
+	        decrypt: function (cipher, ciphertext, key, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Convert string to CipherParams
+	            ciphertext = this._parse(ciphertext, cfg.format);
+
+	            // Decrypt
+	            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+	            return plaintext;
+	        },
+
+	        /**
+	         * Converts serialized ciphertext to CipherParams,
+	         * else assumed CipherParams already and returns ciphertext unchanged.
+	         *
+	         * @param {CipherParams|string} ciphertext The ciphertext.
+	         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+	         *
+	         * @return {CipherParams} The unserialized ciphertext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+	         */
+	        _parse: function (ciphertext, format) {
+	            if (typeof ciphertext == 'string') {
+	                return format.parse(ciphertext, this);
+	            } else {
+	                return ciphertext;
+	            }
+	        }
+	    });
+
+	    /**
+	     * Key derivation function namespace.
+	     */
+	    var C_kdf = C.kdf = {};
+
+	    /**
+	     * OpenSSL key derivation function.
+	     */
+	    var OpenSSLKdf = C_kdf.OpenSSL = {
+	        /**
+	         * Derives a key and IV from a password.
+	         *
+	         * @param {string} password The password to derive from.
+	         * @param {number} keySize The size in words of the key to generate.
+	         * @param {number} ivSize The size in words of the IV to generate.
+	         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+	         *
+	         * @return {CipherParams} A cipher params object with the key, IV, and salt.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+	         */
+	        execute: function (password, keySize, ivSize, salt, hasher) {
+	            // Generate random salt
+	            if (!salt) {
+	                salt = WordArray.random(64/8);
+	            }
+
+	            // Derive key and IV
+	            if (!hasher) {
+	                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
+	            } else {
+	                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
+	            }
+
+
+	            // Separate key and IV
+	            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+	            key.sigBytes = keySize * 4;
+
+	            // Return params
+	            return CipherParams.create({ key: key, iv: iv, salt: salt });
+	        }
+	    };
+
+	    /**
+	     * A serializable cipher wrapper that derives the key from a password,
+	     * and returns ciphertext as a serializable cipher params object.
+	     */
+	    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+	         */
+	        cfg: SerializableCipher.cfg.extend({
+	            kdf: OpenSSLKdf
+	        }),
+
+	        /**
+	         * Encrypts a message using a password.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {WordArray|string} message The message to encrypt.
+	         * @param {string} password The password.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {CipherParams} A cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+	         */
+	        encrypt: function (cipher, message, password, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Derive key and other params
+	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);
+
+	            // Add IV to config
+	            cfg.iv = derivedParams.iv;
+
+	            // Encrypt
+	            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+	            // Mix in derived params
+	            ciphertext.mixIn(derivedParams);
+
+	            return ciphertext;
+	        },
+
+	        /**
+	         * Decrypts serialized ciphertext using a password.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+	         * @param {string} password The password.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {WordArray} The plaintext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+	         */
+	        decrypt: function (cipher, ciphertext, password, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Convert string to CipherParams
+	            ciphertext = this._parse(ciphertext, cfg.format);
+
+	            // Derive key and other params
+	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);
+
+	            // Add IV to config
+	            cfg.iv = derivedParams.iv;
+
+	            // Decrypt
+	            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+	            return plaintext;
+	        }
+	    });
+	}());
+
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/core.js b/node_modules/crypto-js/core.js
new file mode 100644
index 0000000..e3a498b
--- /dev/null
+++ b/node_modules/crypto-js/core.js
@@ -0,0 +1,807 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory();
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define([], factory);
+	}
+	else {
+		// Global (browser)
+		root.CryptoJS = factory();
+	}
+}(this, function () {
+
+	/*globals window, global, require*/
+
+	/**
+	 * CryptoJS core components.
+	 */
+	var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+	    var crypto;
+
+	    // Native crypto from window (Browser)
+	    if (typeof window !== 'undefined' && window.crypto) {
+	        crypto = window.crypto;
+	    }
+
+	    // Native crypto in web worker (Browser)
+	    if (typeof self !== 'undefined' && self.crypto) {
+	        crypto = self.crypto;
+	    }
+
+	    // Native crypto from worker
+	    if (typeof globalThis !== 'undefined' && globalThis.crypto) {
+	        crypto = globalThis.crypto;
+	    }
+
+	    // Native (experimental IE 11) crypto from window (Browser)
+	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+	        crypto = window.msCrypto;
+	    }
+
+	    // Native crypto from global (NodeJS)
+	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
+	        crypto = global.crypto;
+	    }
+
+	    // Native crypto import via require (NodeJS)
+	    if (!crypto && typeof require === 'function') {
+	        try {
+	            crypto = require('crypto');
+	        } catch (err) {}
+	    }
+
+	    /*
+	     * Cryptographically secure pseudorandom number generator
+	     *
+	     * As Math.random() is cryptographically not safe to use
+	     */
+	    var cryptoSecureRandomInt = function () {
+	        if (crypto) {
+	            // Use getRandomValues method (Browser)
+	            if (typeof crypto.getRandomValues === 'function') {
+	                try {
+	                    return crypto.getRandomValues(new Uint32Array(1))[0];
+	                } catch (err) {}
+	            }
+
+	            // Use randomBytes method (NodeJS)
+	            if (typeof crypto.randomBytes === 'function') {
+	                try {
+	                    return crypto.randomBytes(4).readInt32LE();
+	                } catch (err) {}
+	            }
+	        }
+
+	        throw new Error('Native crypto module could not be used to get secure random number.');
+	    };
+
+	    /*
+	     * Local polyfill of Object.create
+
+	     */
+	    var create = Object.create || (function () {
+	        function F() {}
+
+	        return function (obj) {
+	            var subtype;
+
+	            F.prototype = obj;
+
+	            subtype = new F();
+
+	            F.prototype = null;
+
+	            return subtype;
+	        };
+	    }());
+
+	    /**
+	     * CryptoJS namespace.
+	     */
+	    var C = {};
+
+	    /**
+	     * Library namespace.
+	     */
+	    var C_lib = C.lib = {};
+
+	    /**
+	     * Base object for prototypal inheritance.
+	     */
+	    var Base = C_lib.Base = (function () {
+
+
+	        return {
+	            /**
+	             * Creates a new object that inherits from this object.
+	             *
+	             * @param {Object} overrides Properties to copy into the new object.
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         field: 'value',
+	             *
+	             *         method: function () {
+	             *         }
+	             *     });
+	             */
+	            extend: function (overrides) {
+	                // Spawn
+	                var subtype = create(this);
+
+	                // Augment
+	                if (overrides) {
+	                    subtype.mixIn(overrides);
+	                }
+
+	                // Create default initializer
+	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+	                    subtype.init = function () {
+	                        subtype.$super.init.apply(this, arguments);
+	                    };
+	                }
+
+	                // Initializer's prototype is the subtype object
+	                subtype.init.prototype = subtype;
+
+	                // Reference supertype
+	                subtype.$super = this;
+
+	                return subtype;
+	            },
+
+	            /**
+	             * Extends this object and runs the init method.
+	             * Arguments to create() will be passed to init().
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var instance = MyType.create();
+	             */
+	            create: function () {
+	                var instance = this.extend();
+	                instance.init.apply(instance, arguments);
+
+	                return instance;
+	            },
+
+	            /**
+	             * Initializes a newly created object.
+	             * Override this method to add some logic when your objects are created.
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         init: function () {
+	             *             // ...
+	             *         }
+	             *     });
+	             */
+	            init: function () {
+	            },
+
+	            /**
+	             * Copies properties into this object.
+	             *
+	             * @param {Object} properties The properties to mix in.
+	             *
+	             * @example
+	             *
+	             *     MyType.mixIn({
+	             *         field: 'value'
+	             *     });
+	             */
+	            mixIn: function (properties) {
+	                for (var propertyName in properties) {
+	                    if (properties.hasOwnProperty(propertyName)) {
+	                        this[propertyName] = properties[propertyName];
+	                    }
+	                }
+
+	                // IE won't copy toString using the loop above
+	                if (properties.hasOwnProperty('toString')) {
+	                    this.toString = properties.toString;
+	                }
+	            },
+
+	            /**
+	             * Creates a copy of this object.
+	             *
+	             * @return {Object} The clone.
+	             *
+	             * @example
+	             *
+	             *     var clone = instance.clone();
+	             */
+	            clone: function () {
+	                return this.init.prototype.extend(this);
+	            }
+	        };
+	    }());
+
+	    /**
+	     * An array of 32-bit words.
+	     *
+	     * @property {Array} words The array of 32-bit words.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var WordArray = C_lib.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of 32-bit words.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.create();
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 4;
+	            }
+	        },
+
+	        /**
+	         * Converts this word array to a string.
+	         *
+	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+	         *
+	         * @return {string} The stringified word array.
+	         *
+	         * @example
+	         *
+	         *     var string = wordArray + '';
+	         *     var string = wordArray.toString();
+	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
+	         */
+	        toString: function (encoder) {
+	            return (encoder || Hex).stringify(this);
+	        },
+
+	        /**
+	         * Concatenates a word array to this word array.
+	         *
+	         * @param {WordArray} wordArray The word array to append.
+	         *
+	         * @return {WordArray} This word array.
+	         *
+	         * @example
+	         *
+	         *     wordArray1.concat(wordArray2);
+	         */
+	        concat: function (wordArray) {
+	            // Shortcuts
+	            var thisWords = this.words;
+	            var thatWords = wordArray.words;
+	            var thisSigBytes = this.sigBytes;
+	            var thatSigBytes = wordArray.sigBytes;
+
+	            // Clamp excess bits
+	            this.clamp();
+
+	            // Concat
+	            if (thisSigBytes % 4) {
+	                // Copy one byte at a time
+	                for (var i = 0; i < thatSigBytes; i++) {
+	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+	                }
+	            } else {
+	                // Copy one word at a time
+	                for (var j = 0; j < thatSigBytes; j += 4) {
+	                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
+	                }
+	            }
+	            this.sigBytes += thatSigBytes;
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Removes insignificant bits.
+	         *
+	         * @example
+	         *
+	         *     wordArray.clamp();
+	         */
+	        clamp: function () {
+	            // Shortcuts
+	            var words = this.words;
+	            var sigBytes = this.sigBytes;
+
+	            // Clamp
+	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+	            words.length = Math.ceil(sigBytes / 4);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = wordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone.words = this.words.slice(0);
+
+	            return clone;
+	        },
+
+	        /**
+	         * Creates a word array filled with random bytes.
+	         *
+	         * @param {number} nBytes The number of random bytes to generate.
+	         *
+	         * @return {WordArray} The random word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
+	         */
+	        random: function (nBytes) {
+	            var words = [];
+
+	            for (var i = 0; i < nBytes; i += 4) {
+	                words.push(cryptoSecureRandomInt());
+	            }
+
+	            return new WordArray.init(words, nBytes);
+	        }
+	    });
+
+	    /**
+	     * Encoder namespace.
+	     */
+	    var C_enc = C.enc = {};
+
+	    /**
+	     * Hex encoding strategy.
+	     */
+	    var Hex = C_enc.Hex = {
+	        /**
+	         * Converts a word array to a hex string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The hex string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var hexChars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                hexChars.push((bite >>> 4).toString(16));
+	                hexChars.push((bite & 0x0f).toString(16));
+	            }
+
+	            return hexChars.join('');
+	        },
+
+	        /**
+	         * Converts a hex string to a word array.
+	         *
+	         * @param {string} hexStr The hex string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
+	         */
+	        parse: function (hexStr) {
+	            // Shortcut
+	            var hexStrLength = hexStr.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < hexStrLength; i += 2) {
+	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+	            }
+
+	            return new WordArray.init(words, hexStrLength / 2);
+	        }
+	    };
+
+	    /**
+	     * Latin1 encoding strategy.
+	     */
+	    var Latin1 = C_enc.Latin1 = {
+	        /**
+	         * Converts a word array to a Latin1 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Latin1 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var latin1Chars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                latin1Chars.push(String.fromCharCode(bite));
+	            }
+
+	            return latin1Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Latin1 string to a word array.
+	         *
+	         * @param {string} latin1Str The Latin1 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+	         */
+	        parse: function (latin1Str) {
+	            // Shortcut
+	            var latin1StrLength = latin1Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < latin1StrLength; i++) {
+	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+	            }
+
+	            return new WordArray.init(words, latin1StrLength);
+	        }
+	    };
+
+	    /**
+	     * UTF-8 encoding strategy.
+	     */
+	    var Utf8 = C_enc.Utf8 = {
+	        /**
+	         * Converts a word array to a UTF-8 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-8 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            try {
+	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+	            } catch (e) {
+	                throw new Error('Malformed UTF-8 data');
+	            }
+	        },
+
+	        /**
+	         * Converts a UTF-8 string to a word array.
+	         *
+	         * @param {string} utf8Str The UTF-8 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+	         */
+	        parse: function (utf8Str) {
+	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+	        }
+	    };
+
+	    /**
+	     * Abstract buffered block algorithm template.
+	     *
+	     * The property blockSize must be implemented in a concrete subtype.
+	     *
+	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+	     */
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+	        /**
+	         * Resets this block algorithm's data buffer to its initial state.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm.reset();
+	         */
+	        reset: function () {
+	            // Initial values
+	            this._data = new WordArray.init();
+	            this._nDataBytes = 0;
+	        },
+
+	        /**
+	         * Adds new data to this block algorithm's buffer.
+	         *
+	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm._append('data');
+	         *     bufferedBlockAlgorithm._append(wordArray);
+	         */
+	        _append: function (data) {
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof data == 'string') {
+	                data = Utf8.parse(data);
+	            }
+
+	            // Append
+	            this._data.concat(data);
+	            this._nDataBytes += data.sigBytes;
+	        },
+
+	        /**
+	         * Processes available data blocks.
+	         *
+	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+	         *
+	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+	         *
+	         * @return {WordArray} The processed data.
+	         *
+	         * @example
+	         *
+	         *     var processedData = bufferedBlockAlgorithm._process();
+	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
+	         */
+	        _process: function (doFlush) {
+	            var processedWords;
+
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var dataSigBytes = data.sigBytes;
+	            var blockSize = this.blockSize;
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count blocks ready
+	            var nBlocksReady = dataSigBytes / blockSizeBytes;
+	            if (doFlush) {
+	                // Round up to include partial blocks
+	                nBlocksReady = Math.ceil(nBlocksReady);
+	            } else {
+	                // Round down to include only full blocks,
+	                // less the number of blocks that must remain in the buffer
+	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+	            }
+
+	            // Count words ready
+	            var nWordsReady = nBlocksReady * blockSize;
+
+	            // Count bytes ready
+	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+	            // Process blocks
+	            if (nWordsReady) {
+	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+	                    // Perform concrete-algorithm logic
+	                    this._doProcessBlock(dataWords, offset);
+	                }
+
+	                // Remove processed words
+	                processedWords = dataWords.splice(0, nWordsReady);
+	                data.sigBytes -= nBytesReady;
+	            }
+
+	            // Return processed words
+	            return new WordArray.init(processedWords, nBytesReady);
+	        },
+
+	        /**
+	         * Creates a copy of this object.
+	         *
+	         * @return {Object} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = bufferedBlockAlgorithm.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone._data = this._data.clone();
+
+	            return clone;
+	        },
+
+	        _minBufferSize: 0
+	    });
+
+	    /**
+	     * Abstract hasher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+	     */
+	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Initializes a newly created hasher.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+	         *
+	         * @example
+	         *
+	         *     var hasher = CryptoJS.algo.SHA256.create();
+	         */
+	        init: function (cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this hasher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hasher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-hasher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Updates this hasher with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {Hasher} This hasher.
+	         *
+	         * @example
+	         *
+	         *     hasher.update('message');
+	         *     hasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            // Append
+	            this._append(messageUpdate);
+
+	            // Update the hash
+	            this._process();
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the hash computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The hash.
+	         *
+	         * @example
+	         *
+	         *     var hash = hasher.finalize();
+	         *     var hash = hasher.finalize('message');
+	         *     var hash = hasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Final message update
+	            if (messageUpdate) {
+	                this._append(messageUpdate);
+	            }
+
+	            // Perform concrete-hasher logic
+	            var hash = this._doFinalize();
+
+	            return hash;
+	        },
+
+	        blockSize: 512/32,
+
+	        /**
+	         * Creates a shortcut function to a hasher's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to create a helper for.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHelper: function (hasher) {
+	            return function (message, cfg) {
+	                return new hasher.init(cfg).finalize(message);
+	            };
+	        },
+
+	        /**
+	         * Creates a shortcut function to the HMAC's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHmacHelper: function (hasher) {
+	            return function (message, key) {
+	                return new C_algo.HMAC.init(hasher, key).finalize(message);
+	            };
+	        }
+	    });
+
+	    /**
+	     * Algorithm namespace.
+	     */
+	    var C_algo = C.algo = {};
+
+	    return C;
+	}(Math));
+
+
+	return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/crypto-js.js b/node_modules/crypto-js/crypto-js.js
new file mode 100644
index 0000000..958ee53
--- /dev/null
+++ b/node_modules/crypto-js/crypto-js.js
@@ -0,0 +1,6657 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory();
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define([], factory);
+	}
+	else {
+		// Global (browser)
+		root.CryptoJS = factory();
+	}
+}(this, function () {
+
+	/*globals window, global, require*/
+
+	/**
+	 * CryptoJS core components.
+	 */
+	var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+	    var crypto;
+
+	    // Native crypto from window (Browser)
+	    if (typeof window !== 'undefined' && window.crypto) {
+	        crypto = window.crypto;
+	    }
+
+	    // Native crypto in web worker (Browser)
+	    if (typeof self !== 'undefined' && self.crypto) {
+	        crypto = self.crypto;
+	    }
+
+	    // Native crypto from worker
+	    if (typeof globalThis !== 'undefined' && globalThis.crypto) {
+	        crypto = globalThis.crypto;
+	    }
+
+	    // Native (experimental IE 11) crypto from window (Browser)
+	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+	        crypto = window.msCrypto;
+	    }
+
+	    // Native crypto from global (NodeJS)
+	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
+	        crypto = global.crypto;
+	    }
+
+	    // Native crypto import via require (NodeJS)
+	    if (!crypto && typeof require === 'function') {
+	        try {
+	            crypto = require('crypto');
+	        } catch (err) {}
+	    }
+
+	    /*
+	     * Cryptographically secure pseudorandom number generator
+	     *
+	     * As Math.random() is cryptographically not safe to use
+	     */
+	    var cryptoSecureRandomInt = function () {
+	        if (crypto) {
+	            // Use getRandomValues method (Browser)
+	            if (typeof crypto.getRandomValues === 'function') {
+	                try {
+	                    return crypto.getRandomValues(new Uint32Array(1))[0];
+	                } catch (err) {}
+	            }
+
+	            // Use randomBytes method (NodeJS)
+	            if (typeof crypto.randomBytes === 'function') {
+	                try {
+	                    return crypto.randomBytes(4).readInt32LE();
+	                } catch (err) {}
+	            }
+	        }
+
+	        throw new Error('Native crypto module could not be used to get secure random number.');
+	    };
+
+	    /*
+	     * Local polyfill of Object.create
+
+	     */
+	    var create = Object.create || (function () {
+	        function F() {}
+
+	        return function (obj) {
+	            var subtype;
+
+	            F.prototype = obj;
+
+	            subtype = new F();
+
+	            F.prototype = null;
+
+	            return subtype;
+	        };
+	    }());
+
+	    /**
+	     * CryptoJS namespace.
+	     */
+	    var C = {};
+
+	    /**
+	     * Library namespace.
+	     */
+	    var C_lib = C.lib = {};
+
+	    /**
+	     * Base object for prototypal inheritance.
+	     */
+	    var Base = C_lib.Base = (function () {
+
+
+	        return {
+	            /**
+	             * Creates a new object that inherits from this object.
+	             *
+	             * @param {Object} overrides Properties to copy into the new object.
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         field: 'value',
+	             *
+	             *         method: function () {
+	             *         }
+	             *     });
+	             */
+	            extend: function (overrides) {
+	                // Spawn
+	                var subtype = create(this);
+
+	                // Augment
+	                if (overrides) {
+	                    subtype.mixIn(overrides);
+	                }
+
+	                // Create default initializer
+	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+	                    subtype.init = function () {
+	                        subtype.$super.init.apply(this, arguments);
+	                    };
+	                }
+
+	                // Initializer's prototype is the subtype object
+	                subtype.init.prototype = subtype;
+
+	                // Reference supertype
+	                subtype.$super = this;
+
+	                return subtype;
+	            },
+
+	            /**
+	             * Extends this object and runs the init method.
+	             * Arguments to create() will be passed to init().
+	             *
+	             * @return {Object} The new object.
+	             *
+	             * @static
+	             *
+	             * @example
+	             *
+	             *     var instance = MyType.create();
+	             */
+	            create: function () {
+	                var instance = this.extend();
+	                instance.init.apply(instance, arguments);
+
+	                return instance;
+	            },
+
+	            /**
+	             * Initializes a newly created object.
+	             * Override this method to add some logic when your objects are created.
+	             *
+	             * @example
+	             *
+	             *     var MyType = CryptoJS.lib.Base.extend({
+	             *         init: function () {
+	             *             // ...
+	             *         }
+	             *     });
+	             */
+	            init: function () {
+	            },
+
+	            /**
+	             * Copies properties into this object.
+	             *
+	             * @param {Object} properties The properties to mix in.
+	             *
+	             * @example
+	             *
+	             *     MyType.mixIn({
+	             *         field: 'value'
+	             *     });
+	             */
+	            mixIn: function (properties) {
+	                for (var propertyName in properties) {
+	                    if (properties.hasOwnProperty(propertyName)) {
+	                        this[propertyName] = properties[propertyName];
+	                    }
+	                }
+
+	                // IE won't copy toString using the loop above
+	                if (properties.hasOwnProperty('toString')) {
+	                    this.toString = properties.toString;
+	                }
+	            },
+
+	            /**
+	             * Creates a copy of this object.
+	             *
+	             * @return {Object} The clone.
+	             *
+	             * @example
+	             *
+	             *     var clone = instance.clone();
+	             */
+	            clone: function () {
+	                return this.init.prototype.extend(this);
+	            }
+	        };
+	    }());
+
+	    /**
+	     * An array of 32-bit words.
+	     *
+	     * @property {Array} words The array of 32-bit words.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var WordArray = C_lib.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of 32-bit words.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.create();
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 4;
+	            }
+	        },
+
+	        /**
+	         * Converts this word array to a string.
+	         *
+	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+	         *
+	         * @return {string} The stringified word array.
+	         *
+	         * @example
+	         *
+	         *     var string = wordArray + '';
+	         *     var string = wordArray.toString();
+	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
+	         */
+	        toString: function (encoder) {
+	            return (encoder || Hex).stringify(this);
+	        },
+
+	        /**
+	         * Concatenates a word array to this word array.
+	         *
+	         * @param {WordArray} wordArray The word array to append.
+	         *
+	         * @return {WordArray} This word array.
+	         *
+	         * @example
+	         *
+	         *     wordArray1.concat(wordArray2);
+	         */
+	        concat: function (wordArray) {
+	            // Shortcuts
+	            var thisWords = this.words;
+	            var thatWords = wordArray.words;
+	            var thisSigBytes = this.sigBytes;
+	            var thatSigBytes = wordArray.sigBytes;
+
+	            // Clamp excess bits
+	            this.clamp();
+
+	            // Concat
+	            if (thisSigBytes % 4) {
+	                // Copy one byte at a time
+	                for (var i = 0; i < thatSigBytes; i++) {
+	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+	                }
+	            } else {
+	                // Copy one word at a time
+	                for (var j = 0; j < thatSigBytes; j += 4) {
+	                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
+	                }
+	            }
+	            this.sigBytes += thatSigBytes;
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Removes insignificant bits.
+	         *
+	         * @example
+	         *
+	         *     wordArray.clamp();
+	         */
+	        clamp: function () {
+	            // Shortcuts
+	            var words = this.words;
+	            var sigBytes = this.sigBytes;
+
+	            // Clamp
+	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+	            words.length = Math.ceil(sigBytes / 4);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = wordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone.words = this.words.slice(0);
+
+	            return clone;
+	        },
+
+	        /**
+	         * Creates a word array filled with random bytes.
+	         *
+	         * @param {number} nBytes The number of random bytes to generate.
+	         *
+	         * @return {WordArray} The random word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
+	         */
+	        random: function (nBytes) {
+	            var words = [];
+
+	            for (var i = 0; i < nBytes; i += 4) {
+	                words.push(cryptoSecureRandomInt());
+	            }
+
+	            return new WordArray.init(words, nBytes);
+	        }
+	    });
+
+	    /**
+	     * Encoder namespace.
+	     */
+	    var C_enc = C.enc = {};
+
+	    /**
+	     * Hex encoding strategy.
+	     */
+	    var Hex = C_enc.Hex = {
+	        /**
+	         * Converts a word array to a hex string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The hex string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var hexChars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                hexChars.push((bite >>> 4).toString(16));
+	                hexChars.push((bite & 0x0f).toString(16));
+	            }
+
+	            return hexChars.join('');
+	        },
+
+	        /**
+	         * Converts a hex string to a word array.
+	         *
+	         * @param {string} hexStr The hex string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
+	         */
+	        parse: function (hexStr) {
+	            // Shortcut
+	            var hexStrLength = hexStr.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < hexStrLength; i += 2) {
+	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+	            }
+
+	            return new WordArray.init(words, hexStrLength / 2);
+	        }
+	    };
+
+	    /**
+	     * Latin1 encoding strategy.
+	     */
+	    var Latin1 = C_enc.Latin1 = {
+	        /**
+	         * Converts a word array to a Latin1 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Latin1 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var latin1Chars = [];
+	            for (var i = 0; i < sigBytes; i++) {
+	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+	                latin1Chars.push(String.fromCharCode(bite));
+	            }
+
+	            return latin1Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Latin1 string to a word array.
+	         *
+	         * @param {string} latin1Str The Latin1 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+	         */
+	        parse: function (latin1Str) {
+	            // Shortcut
+	            var latin1StrLength = latin1Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < latin1StrLength; i++) {
+	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+	            }
+
+	            return new WordArray.init(words, latin1StrLength);
+	        }
+	    };
+
+	    /**
+	     * UTF-8 encoding strategy.
+	     */
+	    var Utf8 = C_enc.Utf8 = {
+	        /**
+	         * Converts a word array to a UTF-8 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-8 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            try {
+	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+	            } catch (e) {
+	                throw new Error('Malformed UTF-8 data');
+	            }
+	        },
+
+	        /**
+	         * Converts a UTF-8 string to a word array.
+	         *
+	         * @param {string} utf8Str The UTF-8 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+	         */
+	        parse: function (utf8Str) {
+	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+	        }
+	    };
+
+	    /**
+	     * Abstract buffered block algorithm template.
+	     *
+	     * The property blockSize must be implemented in a concrete subtype.
+	     *
+	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+	     */
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+	        /**
+	         * Resets this block algorithm's data buffer to its initial state.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm.reset();
+	         */
+	        reset: function () {
+	            // Initial values
+	            this._data = new WordArray.init();
+	            this._nDataBytes = 0;
+	        },
+
+	        /**
+	         * Adds new data to this block algorithm's buffer.
+	         *
+	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+	         *
+	         * @example
+	         *
+	         *     bufferedBlockAlgorithm._append('data');
+	         *     bufferedBlockAlgorithm._append(wordArray);
+	         */
+	        _append: function (data) {
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof data == 'string') {
+	                data = Utf8.parse(data);
+	            }
+
+	            // Append
+	            this._data.concat(data);
+	            this._nDataBytes += data.sigBytes;
+	        },
+
+	        /**
+	         * Processes available data blocks.
+	         *
+	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+	         *
+	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+	         *
+	         * @return {WordArray} The processed data.
+	         *
+	         * @example
+	         *
+	         *     var processedData = bufferedBlockAlgorithm._process();
+	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
+	         */
+	        _process: function (doFlush) {
+	            var processedWords;
+
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var dataSigBytes = data.sigBytes;
+	            var blockSize = this.blockSize;
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count blocks ready
+	            var nBlocksReady = dataSigBytes / blockSizeBytes;
+	            if (doFlush) {
+	                // Round up to include partial blocks
+	                nBlocksReady = Math.ceil(nBlocksReady);
+	            } else {
+	                // Round down to include only full blocks,
+	                // less the number of blocks that must remain in the buffer
+	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+	            }
+
+	            // Count words ready
+	            var nWordsReady = nBlocksReady * blockSize;
+
+	            // Count bytes ready
+	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+	            // Process blocks
+	            if (nWordsReady) {
+	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+	                    // Perform concrete-algorithm logic
+	                    this._doProcessBlock(dataWords, offset);
+	                }
+
+	                // Remove processed words
+	                processedWords = dataWords.splice(0, nWordsReady);
+	                data.sigBytes -= nBytesReady;
+	            }
+
+	            // Return processed words
+	            return new WordArray.init(processedWords, nBytesReady);
+	        },
+
+	        /**
+	         * Creates a copy of this object.
+	         *
+	         * @return {Object} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = bufferedBlockAlgorithm.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+	            clone._data = this._data.clone();
+
+	            return clone;
+	        },
+
+	        _minBufferSize: 0
+	    });
+
+	    /**
+	     * Abstract hasher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+	     */
+	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Initializes a newly created hasher.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+	         *
+	         * @example
+	         *
+	         *     var hasher = CryptoJS.algo.SHA256.create();
+	         */
+	        init: function (cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this hasher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hasher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-hasher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Updates this hasher with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {Hasher} This hasher.
+	         *
+	         * @example
+	         *
+	         *     hasher.update('message');
+	         *     hasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            // Append
+	            this._append(messageUpdate);
+
+	            // Update the hash
+	            this._process();
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the hash computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The hash.
+	         *
+	         * @example
+	         *
+	         *     var hash = hasher.finalize();
+	         *     var hash = hasher.finalize('message');
+	         *     var hash = hasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Final message update
+	            if (messageUpdate) {
+	                this._append(messageUpdate);
+	            }
+
+	            // Perform concrete-hasher logic
+	            var hash = this._doFinalize();
+
+	            return hash;
+	        },
+
+	        blockSize: 512/32,
+
+	        /**
+	         * Creates a shortcut function to a hasher's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to create a helper for.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHelper: function (hasher) {
+	            return function (message, cfg) {
+	                return new hasher.init(cfg).finalize(message);
+	            };
+	        },
+
+	        /**
+	         * Creates a shortcut function to the HMAC's object interface.
+	         *
+	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
+	         *
+	         * @return {Function} The shortcut function.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+	         */
+	        _createHmacHelper: function (hasher) {
+	            return function (message, key) {
+	                return new C_algo.HMAC.init(hasher, key).finalize(message);
+	            };
+	        }
+	    });
+
+	    /**
+	     * Algorithm namespace.
+	     */
+	    var C_algo = C.algo = {};
+
+	    return C;
+	}(Math));
+
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var X32WordArray = C_lib.WordArray;
+
+	    /**
+	     * x64 namespace.
+	     */
+	    var C_x64 = C.x64 = {};
+
+	    /**
+	     * A 64-bit word.
+	     */
+	    var X64Word = C_x64.Word = Base.extend({
+	        /**
+	         * Initializes a newly created 64-bit word.
+	         *
+	         * @param {number} high The high 32 bits.
+	         * @param {number} low The low 32 bits.
+	         *
+	         * @example
+	         *
+	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+	         */
+	        init: function (high, low) {
+	            this.high = high;
+	            this.low = low;
+	        }
+
+	        /**
+	         * Bitwise NOTs this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after negating.
+	         *
+	         * @example
+	         *
+	         *     var negated = x64Word.not();
+	         */
+	        // not: function () {
+	            // var high = ~this.high;
+	            // var low = ~this.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ANDs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to AND with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ANDing.
+	         *
+	         * @example
+	         *
+	         *     var anded = x64Word.and(anotherX64Word);
+	         */
+	        // and: function (word) {
+	            // var high = this.high & word.high;
+	            // var low = this.low & word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to OR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ORing.
+	         *
+	         * @example
+	         *
+	         *     var ored = x64Word.or(anotherX64Word);
+	         */
+	        // or: function (word) {
+	            // var high = this.high | word.high;
+	            // var low = this.low | word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise XORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to XOR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after XORing.
+	         *
+	         * @example
+	         *
+	         *     var xored = x64Word.xor(anotherX64Word);
+	         */
+	        // xor: function (word) {
+	            // var high = this.high ^ word.high;
+	            // var low = this.low ^ word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftL(25);
+	         */
+	        // shiftL: function (n) {
+	            // if (n < 32) {
+	                // var high = (this.high << n) | (this.low >>> (32 - n));
+	                // var low = this.low << n;
+	            // } else {
+	                // var high = this.low << (n - 32);
+	                // var low = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftR(7);
+	         */
+	        // shiftR: function (n) {
+	            // if (n < 32) {
+	                // var low = (this.low >>> n) | (this.high << (32 - n));
+	                // var high = this.high >>> n;
+	            // } else {
+	                // var low = this.high >>> (n - 32);
+	                // var high = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotL(25);
+	         */
+	        // rotL: function (n) {
+	            // return this.shiftL(n).or(this.shiftR(64 - n));
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotR(7);
+	         */
+	        // rotR: function (n) {
+	            // return this.shiftR(n).or(this.shiftL(64 - n));
+	        // },
+
+	        /**
+	         * Adds this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to add with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after adding.
+	         *
+	         * @example
+	         *
+	         *     var added = x64Word.add(anotherX64Word);
+	         */
+	        // add: function (word) {
+	            // var low = (this.low + word.low) | 0;
+	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+	            // var high = (this.high + word.high + carry) | 0;
+
+	            // return X64Word.create(high, low);
+	        // }
+	    });
+
+	    /**
+	     * An array of 64-bit words.
+	     *
+	     * @property {Array} words The array of CryptoJS.x64.Word objects.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var X64WordArray = C_x64.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create();
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ]);
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ], 10);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 8;
+	            }
+	        },
+
+	        /**
+	         * Converts this 64-bit word array to a 32-bit word array.
+	         *
+	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+	         *
+	         * @example
+	         *
+	         *     var x32WordArray = x64WordArray.toX32();
+	         */
+	        toX32: function () {
+	            // Shortcuts
+	            var x64Words = this.words;
+	            var x64WordsLength = x64Words.length;
+
+	            // Convert
+	            var x32Words = [];
+	            for (var i = 0; i < x64WordsLength; i++) {
+	                var x64Word = x64Words[i];
+	                x32Words.push(x64Word.high);
+	                x32Words.push(x64Word.low);
+	            }
+
+	            return X32WordArray.create(x32Words, this.sigBytes);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {X64WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = x64WordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+
+	            // Clone "words" array
+	            var words = clone.words = this.words.slice(0);
+
+	            // Clone each X64Word object
+	            var wordsLength = words.length;
+	            for (var i = 0; i < wordsLength; i++) {
+	                words[i] = words[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+	}());
+
+
+	(function () {
+	    // Check if typed arrays are supported
+	    if (typeof ArrayBuffer != 'function') {
+	        return;
+	    }
+
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+
+	    // Reference original init
+	    var superInit = WordArray.init;
+
+	    // Augment WordArray.init to handle typed arrays
+	    var subInit = WordArray.init = function (typedArray) {
+	        // Convert buffers to uint8
+	        if (typedArray instanceof ArrayBuffer) {
+	            typedArray = new Uint8Array(typedArray);
+	        }
+
+	        // Convert other array views to uint8
+	        if (
+	            typedArray instanceof Int8Array ||
+	            (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+	            typedArray instanceof Int16Array ||
+	            typedArray instanceof Uint16Array ||
+	            typedArray instanceof Int32Array ||
+	            typedArray instanceof Uint32Array ||
+	            typedArray instanceof Float32Array ||
+	            typedArray instanceof Float64Array
+	        ) {
+	            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+	        }
+
+	        // Handle Uint8Array
+	        if (typedArray instanceof Uint8Array) {
+	            // Shortcut
+	            var typedArrayByteLength = typedArray.byteLength;
+
+	            // Extract bytes
+	            var words = [];
+	            for (var i = 0; i < typedArrayByteLength; i++) {
+	                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+	            }
+
+	            // Initialize this word array
+	            superInit.call(this, words, typedArrayByteLength);
+	        } else {
+	            // Else call normal init
+	            superInit.apply(this, arguments);
+	        }
+	    };
+
+	    subInit.prototype = WordArray;
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * UTF-16 BE encoding strategy.
+	     */
+	    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+	        /**
+	         * Converts a word array to a UTF-16 BE string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-16 BE string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var utf16Chars = [];
+	            for (var i = 0; i < sigBytes; i += 2) {
+	                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+	                utf16Chars.push(String.fromCharCode(codePoint));
+	            }
+
+	            return utf16Chars.join('');
+	        },
+
+	        /**
+	         * Converts a UTF-16 BE string to a word array.
+	         *
+	         * @param {string} utf16Str The UTF-16 BE string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+	         */
+	        parse: function (utf16Str) {
+	            // Shortcut
+	            var utf16StrLength = utf16Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < utf16StrLength; i++) {
+	                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+	            }
+
+	            return WordArray.create(words, utf16StrLength * 2);
+	        }
+	    };
+
+	    /**
+	     * UTF-16 LE encoding strategy.
+	     */
+	    C_enc.Utf16LE = {
+	        /**
+	         * Converts a word array to a UTF-16 LE string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-16 LE string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var utf16Chars = [];
+	            for (var i = 0; i < sigBytes; i += 2) {
+	                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+	                utf16Chars.push(String.fromCharCode(codePoint));
+	            }
+
+	            return utf16Chars.join('');
+	        },
+
+	        /**
+	         * Converts a UTF-16 LE string to a word array.
+	         *
+	         * @param {string} utf16Str The UTF-16 LE string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+	         */
+	        parse: function (utf16Str) {
+	            // Shortcut
+	            var utf16StrLength = utf16Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < utf16StrLength; i++) {
+	                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+	            }
+
+	            return WordArray.create(words, utf16StrLength * 2);
+	        }
+	    };
+
+	    function swapEndian(word) {
+	        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+	    }
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * Base64 encoding strategy.
+	     */
+	    var Base64 = C_enc.Base64 = {
+	        /**
+	         * Converts a word array to a Base64 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Base64 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+	            var map = this._map;
+
+	            // Clamp excess bits
+	            wordArray.clamp();
+
+	            // Convert
+	            var base64Chars = [];
+	            for (var i = 0; i < sigBytes; i += 3) {
+	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
+	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+	                }
+	            }
+
+	            // Add padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                while (base64Chars.length % 4) {
+	                    base64Chars.push(paddingChar);
+	                }
+	            }
+
+	            return base64Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Base64 string to a word array.
+	         *
+	         * @param {string} base64Str The Base64 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
+	         */
+	        parse: function (base64Str) {
+	            // Shortcuts
+	            var base64StrLength = base64Str.length;
+	            var map = this._map;
+	            var reverseMap = this._reverseMap;
+
+	            if (!reverseMap) {
+	                    reverseMap = this._reverseMap = [];
+	                    for (var j = 0; j < map.length; j++) {
+	                        reverseMap[map.charCodeAt(j)] = j;
+	                    }
+	            }
+
+	            // Ignore padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                var paddingIndex = base64Str.indexOf(paddingChar);
+	                if (paddingIndex !== -1) {
+	                    base64StrLength = paddingIndex;
+	                }
+	            }
+
+	            // Convert
+	            return parseLoop(base64Str, base64StrLength, reverseMap);
+
+	        },
+
+	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+	    };
+
+	    function parseLoop(base64Str, base64StrLength, reverseMap) {
+	      var words = [];
+	      var nBytes = 0;
+	      for (var i = 0; i < base64StrLength; i++) {
+	          if (i % 4) {
+	              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+	              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+	              var bitsCombined = bits1 | bits2;
+	              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+	              nBytes++;
+	          }
+	      }
+	      return WordArray.create(words, nBytes);
+	    }
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * Base64url encoding strategy.
+	     */
+	    var Base64url = C_enc.Base64url = {
+	        /**
+	         * Converts a word array to a Base64url string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @param {boolean} urlSafe Whether to use url safe
+	         *
+	         * @return {string} The Base64url string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
+	         */
+	        stringify: function (wordArray, urlSafe) {
+	            if (urlSafe === undefined) {
+	                urlSafe = true
+	            }
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+	            var map = urlSafe ? this._safe_map : this._map;
+
+	            // Clamp excess bits
+	            wordArray.clamp();
+
+	            // Convert
+	            var base64Chars = [];
+	            for (var i = 0; i < sigBytes; i += 3) {
+	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
+	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+	                }
+	            }
+
+	            // Add padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                while (base64Chars.length % 4) {
+	                    base64Chars.push(paddingChar);
+	                }
+	            }
+
+	            return base64Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Base64url string to a word array.
+	         *
+	         * @param {string} base64Str The Base64url string.
+	         *
+	         * @param {boolean} urlSafe Whether to use url safe
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);
+	         */
+	        parse: function (base64Str, urlSafe) {
+	            if (urlSafe === undefined) {
+	                urlSafe = true
+	            }
+
+	            // Shortcuts
+	            var base64StrLength = base64Str.length;
+	            var map = urlSafe ? this._safe_map : this._map;
+	            var reverseMap = this._reverseMap;
+
+	            if (!reverseMap) {
+	                reverseMap = this._reverseMap = [];
+	                for (var j = 0; j < map.length; j++) {
+	                    reverseMap[map.charCodeAt(j)] = j;
+	                }
+	            }
+
+	            // Ignore padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                var paddingIndex = base64Str.indexOf(paddingChar);
+	                if (paddingIndex !== -1) {
+	                    base64StrLength = paddingIndex;
+	                }
+	            }
+
+	            // Convert
+	            return parseLoop(base64Str, base64StrLength, reverseMap);
+
+	        },
+
+	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+	        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+	    };
+
+	    function parseLoop(base64Str, base64StrLength, reverseMap) {
+	        var words = [];
+	        var nBytes = 0;
+	        for (var i = 0; i < base64StrLength; i++) {
+	            if (i % 4) {
+	                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+	                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+	                var bitsCombined = bits1 | bits2;
+	                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+	                nBytes++;
+	            }
+	        }
+	        return WordArray.create(words, nBytes);
+	    }
+	}());
+
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var T = [];
+
+	    // Compute constants
+	    (function () {
+	        for (var i = 0; i < 64; i++) {
+	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+	        }
+	    }());
+
+	    /**
+	     * MD5 hash algorithm.
+	     */
+	    var MD5 = C_algo.MD5 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var M_offset_0  = M[offset + 0];
+	            var M_offset_1  = M[offset + 1];
+	            var M_offset_2  = M[offset + 2];
+	            var M_offset_3  = M[offset + 3];
+	            var M_offset_4  = M[offset + 4];
+	            var M_offset_5  = M[offset + 5];
+	            var M_offset_6  = M[offset + 6];
+	            var M_offset_7  = M[offset + 7];
+	            var M_offset_8  = M[offset + 8];
+	            var M_offset_9  = M[offset + 9];
+	            var M_offset_10 = M[offset + 10];
+	            var M_offset_11 = M[offset + 11];
+	            var M_offset_12 = M[offset + 12];
+	            var M_offset_13 = M[offset + 13];
+	            var M_offset_14 = M[offset + 14];
+	            var M_offset_15 = M[offset + 15];
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+
+	            // Computation
+	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
+	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
+	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
+	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
+	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
+	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
+	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
+	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
+	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
+	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
+	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
+	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
+	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
+	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
+	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
+	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
+	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
+	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
+	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
+	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
+	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
+	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
+	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
+	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
+	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
+	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
+	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
+	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
+	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
+	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
+	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
+	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
+	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
+	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
+	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
+
+	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
+	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
+	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
+	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
+	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
+	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
+	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
+	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
+	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
+	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
+	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
+	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
+	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
+	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
+	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
+	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+	            var nBitsTotalL = nBitsTotal;
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
+	            );
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
+	            );
+
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    function FF(a, b, c, d, x, s, t) {
+	        var n = a + ((b & c) | (~b & d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function GG(a, b, c, d, x, s, t) {
+	        var n = a + ((b & d) | (c & ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function HH(a, b, c, d, x, s, t) {
+	        var n = a + (b ^ c ^ d) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function II(a, b, c, d, x, s, t) {
+	        var n = a + (c ^ (b | ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.MD5('message');
+	     *     var hash = CryptoJS.MD5(wordArray);
+	     */
+	    C.MD5 = Hasher._createHelper(MD5);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacMD5(message, key);
+	     */
+	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
+	}(Math));
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-1 hash algorithm.
+	     */
+	    var SHA1 = C_algo.SHA1 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476,
+	                0xc3d2e1f0
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+
+	            // Computation
+	            for (var i = 0; i < 80; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+	                    W[i] = (n << 1) | (n >>> 31);
+	                }
+
+	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
+	                if (i < 20) {
+	                    t += ((b & c) | (~b & d)) + 0x5a827999;
+	                } else if (i < 40) {
+	                    t += (b ^ c ^ d) + 0x6ed9eba1;
+	                } else if (i < 60) {
+	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+	                } else /* if (i < 80) */ {
+	                    t += (b ^ c ^ d) - 0x359d3e2a;
+	                }
+
+	                e = d;
+	                d = c;
+	                c = (b << 30) | (b >>> 2);
+	                b = a;
+	                a = t;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA1('message');
+	     *     var hash = CryptoJS.SHA1(wordArray);
+	     */
+	    C.SHA1 = Hasher._createHelper(SHA1);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA1(message, key);
+	     */
+	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+	}());
+
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Initialization and round constants tables
+	    var H = [];
+	    var K = [];
+
+	    // Compute constants
+	    (function () {
+	        function isPrime(n) {
+	            var sqrtN = Math.sqrt(n);
+	            for (var factor = 2; factor <= sqrtN; factor++) {
+	                if (!(n % factor)) {
+	                    return false;
+	                }
+	            }
+
+	            return true;
+	        }
+
+	        function getFractionalBits(n) {
+	            return ((n - (n | 0)) * 0x100000000) | 0;
+	        }
+
+	        var n = 2;
+	        var nPrime = 0;
+	        while (nPrime < 64) {
+	            if (isPrime(n)) {
+	                if (nPrime < 8) {
+	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+	                }
+	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+	                nPrime++;
+	            }
+
+	            n++;
+	        }
+	    }());
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-256 hash algorithm.
+	     */
+	    var SHA256 = C_algo.SHA256 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init(H.slice(0));
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+	            var f = H[5];
+	            var g = H[6];
+	            var h = H[7];
+
+	            // Computation
+	            for (var i = 0; i < 64; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var gamma0x = W[i - 15];
+	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
+	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
+	                                   (gamma0x >>> 3);
+
+	                    var gamma1x = W[i - 2];
+	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
+	                                   (gamma1x >>> 10);
+
+	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+	                }
+
+	                var ch  = (e & f) ^ (~e & g);
+	                var maj = (a & b) ^ (a & c) ^ (b & c);
+
+	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
+
+	                var t1 = h + sigma1 + ch + K[i] + W[i];
+	                var t2 = sigma0 + maj;
+
+	                h = g;
+	                g = f;
+	                f = e;
+	                e = (d + t1) | 0;
+	                d = c;
+	                c = b;
+	                b = a;
+	                a = (t1 + t2) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	            H[5] = (H[5] + f) | 0;
+	            H[6] = (H[6] + g) | 0;
+	            H[7] = (H[7] + h) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA256('message');
+	     *     var hash = CryptoJS.SHA256(wordArray);
+	     */
+	    C.SHA256 = Hasher._createHelper(SHA256);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA256(message, key);
+	     */
+	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+	}(Math));
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var SHA256 = C_algo.SHA256;
+
+	    /**
+	     * SHA-224 hash algorithm.
+	     */
+	    var SHA224 = C_algo.SHA224 = SHA256.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+	                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+	            ]);
+	        },
+
+	        _doFinalize: function () {
+	            var hash = SHA256._doFinalize.call(this);
+
+	            hash.sigBytes -= 4;
+
+	            return hash;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA224('message');
+	     *     var hash = CryptoJS.SHA224(wordArray);
+	     */
+	    C.SHA224 = SHA256._createHelper(SHA224);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA224(message, key);
+	     */
+	    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+
+	    function X64Word_create() {
+	        return X64Word.create.apply(X64Word, arguments);
+	    }
+
+	    // Constants
+	    var K = [
+	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+	    ];
+
+	    // Reusable objects
+	    var W = [];
+	    (function () {
+	        for (var i = 0; i < 80; i++) {
+	            W[i] = X64Word_create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-512 hash algorithm.
+	     */
+	    var SHA512 = C_algo.SHA512 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var H0 = H[0];
+	            var H1 = H[1];
+	            var H2 = H[2];
+	            var H3 = H[3];
+	            var H4 = H[4];
+	            var H5 = H[5];
+	            var H6 = H[6];
+	            var H7 = H[7];
+
+	            var H0h = H0.high;
+	            var H0l = H0.low;
+	            var H1h = H1.high;
+	            var H1l = H1.low;
+	            var H2h = H2.high;
+	            var H2l = H2.low;
+	            var H3h = H3.high;
+	            var H3l = H3.low;
+	            var H4h = H4.high;
+	            var H4l = H4.low;
+	            var H5h = H5.high;
+	            var H5l = H5.low;
+	            var H6h = H6.high;
+	            var H6l = H6.low;
+	            var H7h = H7.high;
+	            var H7l = H7.low;
+
+	            // Working variables
+	            var ah = H0h;
+	            var al = H0l;
+	            var bh = H1h;
+	            var bl = H1l;
+	            var ch = H2h;
+	            var cl = H2l;
+	            var dh = H3h;
+	            var dl = H3l;
+	            var eh = H4h;
+	            var el = H4l;
+	            var fh = H5h;
+	            var fl = H5l;
+	            var gh = H6h;
+	            var gl = H6l;
+	            var hh = H7h;
+	            var hl = H7l;
+
+	            // Rounds
+	            for (var i = 0; i < 80; i++) {
+	                var Wil;
+	                var Wih;
+
+	                // Shortcut
+	                var Wi = W[i];
+
+	                // Extend message
+	                if (i < 16) {
+	                    Wih = Wi.high = M[offset + i * 2]     | 0;
+	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
+	                } else {
+	                    // Gamma0
+	                    var gamma0x  = W[i - 15];
+	                    var gamma0xh = gamma0x.high;
+	                    var gamma0xl = gamma0x.low;
+	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+	                    // Gamma1
+	                    var gamma1x  = W[i - 2];
+	                    var gamma1xh = gamma1x.high;
+	                    var gamma1xl = gamma1x.low;
+	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+	                    var Wi7  = W[i - 7];
+	                    var Wi7h = Wi7.high;
+	                    var Wi7l = Wi7.low;
+
+	                    var Wi16  = W[i - 16];
+	                    var Wi16h = Wi16.high;
+	                    var Wi16l = Wi16.low;
+
+	                    Wil = gamma0l + Wi7l;
+	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+	                    Wil = Wil + gamma1l;
+	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+	                    Wil = Wil + Wi16l;
+	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+	                    Wi.high = Wih;
+	                    Wi.low  = Wil;
+	                }
+
+	                var chh  = (eh & fh) ^ (~eh & gh);
+	                var chl  = (el & fl) ^ (~el & gl);
+	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+	                // t1 = h + sigma1 + ch + K[i] + W[i]
+	                var Ki  = K[i];
+	                var Kih = Ki.high;
+	                var Kil = Ki.low;
+
+	                var t1l = hl + sigma1l;
+	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+	                var t1l = t1l + chl;
+	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+	                var t1l = t1l + Kil;
+	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+	                var t1l = t1l + Wil;
+	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+	                // t2 = sigma0 + maj
+	                var t2l = sigma0l + majl;
+	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+	                // Update working variables
+	                hh = gh;
+	                hl = gl;
+	                gh = fh;
+	                gl = fl;
+	                fh = eh;
+	                fl = el;
+	                el = (dl + t1l) | 0;
+	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+	                dh = ch;
+	                dl = cl;
+	                ch = bh;
+	                cl = bl;
+	                bh = ah;
+	                bl = al;
+	                al = (t1l + t2l) | 0;
+	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H0l = H0.low  = (H0l + al);
+	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+	            H1l = H1.low  = (H1l + bl);
+	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+	            H2l = H2.low  = (H2l + cl);
+	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+	            H3l = H3.low  = (H3l + dl);
+	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+	            H4l = H4.low  = (H4l + el);
+	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+	            H5l = H5.low  = (H5l + fl);
+	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+	            H6l = H6.low  = (H6l + gl);
+	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+	            H7l = H7.low  = (H7l + hl);
+	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Convert hash to 32-bit word array before returning
+	            var hash = this._hash.toX32();
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        },
+
+	        blockSize: 1024/32
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA512('message');
+	     *     var hash = CryptoJS.SHA512(wordArray);
+	     */
+	    C.SHA512 = Hasher._createHelper(SHA512);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA512(message, key);
+	     */
+	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+	    var SHA512 = C_algo.SHA512;
+
+	    /**
+	     * SHA-384 hash algorithm.
+	     */
+	    var SHA384 = C_algo.SHA384 = SHA512.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+	                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+	                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+	                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+	            ]);
+	        },
+
+	        _doFinalize: function () {
+	            var hash = SHA512._doFinalize.call(this);
+
+	            hash.sigBytes -= 16;
+
+	            return hash;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA384('message');
+	     *     var hash = CryptoJS.SHA384(wordArray);
+	     */
+	    C.SHA384 = SHA512._createHelper(SHA384);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA384(message, key);
+	     */
+	    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+	}());
+
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var C_algo = C.algo;
+
+	    // Constants tables
+	    var RHO_OFFSETS = [];
+	    var PI_INDEXES  = [];
+	    var ROUND_CONSTANTS = [];
+
+	    // Compute Constants
+	    (function () {
+	        // Compute rho offset constants
+	        var x = 1, y = 0;
+	        for (var t = 0; t < 24; t++) {
+	            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+	            var newX = y % 5;
+	            var newY = (2 * x + 3 * y) % 5;
+	            x = newX;
+	            y = newY;
+	        }
+
+	        // Compute pi index constants
+	        for (var x = 0; x < 5; x++) {
+	            for (var y = 0; y < 5; y++) {
+	                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+	            }
+	        }
+
+	        // Compute round constants
+	        var LFSR = 0x01;
+	        for (var i = 0; i < 24; i++) {
+	            var roundConstantMsw = 0;
+	            var roundConstantLsw = 0;
+
+	            for (var j = 0; j < 7; j++) {
+	                if (LFSR & 0x01) {
+	                    var bitPosition = (1 << j) - 1;
+	                    if (bitPosition < 32) {
+	                        roundConstantLsw ^= 1 << bitPosition;
+	                    } else /* if (bitPosition >= 32) */ {
+	                        roundConstantMsw ^= 1 << (bitPosition - 32);
+	                    }
+	                }
+
+	                // Compute next LFSR
+	                if (LFSR & 0x80) {
+	                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+	                    LFSR = (LFSR << 1) ^ 0x71;
+	                } else {
+	                    LFSR <<= 1;
+	                }
+	            }
+
+	            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+	        }
+	    }());
+
+	    // Reusable objects for temporary values
+	    var T = [];
+	    (function () {
+	        for (var i = 0; i < 25; i++) {
+	            T[i] = X64Word.create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-3 hash algorithm.
+	     */
+	    var SHA3 = C_algo.SHA3 = Hasher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} outputLength
+	         *   The desired number of bits in the output hash.
+	         *   Only values permitted are: 224, 256, 384, 512.
+	         *   Default: 512
+	         */
+	        cfg: Hasher.cfg.extend({
+	            outputLength: 512
+	        }),
+
+	        _doReset: function () {
+	            var state = this._state = []
+	            for (var i = 0; i < 25; i++) {
+	                state[i] = new X64Word.init();
+	            }
+
+	            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var state = this._state;
+	            var nBlockSizeLanes = this.blockSize / 2;
+
+	            // Absorb
+	            for (var i = 0; i < nBlockSizeLanes; i++) {
+	                // Shortcuts
+	                var M2i  = M[offset + 2 * i];
+	                var M2i1 = M[offset + 2 * i + 1];
+
+	                // Swap endian
+	                M2i = (
+	                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
+	                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
+	                );
+	                M2i1 = (
+	                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
+	                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
+	                );
+
+	                // Absorb message into state
+	                var lane = state[i];
+	                lane.high ^= M2i1;
+	                lane.low  ^= M2i;
+	            }
+
+	            // Rounds
+	            for (var round = 0; round < 24; round++) {
+	                // Theta
+	                for (var x = 0; x < 5; x++) {
+	                    // Mix column lanes
+	                    var tMsw = 0, tLsw = 0;
+	                    for (var y = 0; y < 5; y++) {
+	                        var lane = state[x + 5 * y];
+	                        tMsw ^= lane.high;
+	                        tLsw ^= lane.low;
+	                    }
+
+	                    // Temporary values
+	                    var Tx = T[x];
+	                    Tx.high = tMsw;
+	                    Tx.low  = tLsw;
+	                }
+	                for (var x = 0; x < 5; x++) {
+	                    // Shortcuts
+	                    var Tx4 = T[(x + 4) % 5];
+	                    var Tx1 = T[(x + 1) % 5];
+	                    var Tx1Msw = Tx1.high;
+	                    var Tx1Lsw = Tx1.low;
+
+	                    // Mix surrounding columns
+	                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+	                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+	                    for (var y = 0; y < 5; y++) {
+	                        var lane = state[x + 5 * y];
+	                        lane.high ^= tMsw;
+	                        lane.low  ^= tLsw;
+	                    }
+	                }
+
+	                // Rho Pi
+	                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+	                    var tMsw;
+	                    var tLsw;
+
+	                    // Shortcuts
+	                    var lane = state[laneIndex];
+	                    var laneMsw = lane.high;
+	                    var laneLsw = lane.low;
+	                    var rhoOffset = RHO_OFFSETS[laneIndex];
+
+	                    // Rotate lanes
+	                    if (rhoOffset < 32) {
+	                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+	                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+	                    } else /* if (rhoOffset >= 32) */ {
+	                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+	                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+	                    }
+
+	                    // Transpose lanes
+	                    var TPiLane = T[PI_INDEXES[laneIndex]];
+	                    TPiLane.high = tMsw;
+	                    TPiLane.low  = tLsw;
+	                }
+
+	                // Rho pi at x = y = 0
+	                var T0 = T[0];
+	                var state0 = state[0];
+	                T0.high = state0.high;
+	                T0.low  = state0.low;
+
+	                // Chi
+	                for (var x = 0; x < 5; x++) {
+	                    for (var y = 0; y < 5; y++) {
+	                        // Shortcuts
+	                        var laneIndex = x + 5 * y;
+	                        var lane = state[laneIndex];
+	                        var TLane = T[laneIndex];
+	                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+	                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+	                        // Mix rows
+	                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+	                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
+	                    }
+	                }
+
+	                // Iota
+	                var lane = state[0];
+	                var roundConstant = ROUND_CONSTANTS[round];
+	                lane.high ^= roundConstant.high;
+	                lane.low  ^= roundConstant.low;
+	            }
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+	            var blockSizeBits = this.blockSize * 32;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+	            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var state = this._state;
+	            var outputLengthBytes = this.cfg.outputLength / 8;
+	            var outputLengthLanes = outputLengthBytes / 8;
+
+	            // Squeeze
+	            var hashWords = [];
+	            for (var i = 0; i < outputLengthLanes; i++) {
+	                // Shortcuts
+	                var lane = state[i];
+	                var laneMsw = lane.high;
+	                var laneLsw = lane.low;
+
+	                // Swap endian
+	                laneMsw = (
+	                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
+	                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
+	                );
+	                laneLsw = (
+	                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
+	                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
+	                );
+
+	                // Squeeze state to retrieve hash
+	                hashWords.push(laneLsw);
+	                hashWords.push(laneMsw);
+	            }
+
+	            // Return final computed hash
+	            return new WordArray.init(hashWords, outputLengthBytes);
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+
+	            var state = clone._state = this._state.slice(0);
+	            for (var i = 0; i < 25; i++) {
+	                state[i] = state[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA3('message');
+	     *     var hash = CryptoJS.SHA3(wordArray);
+	     */
+	    C.SHA3 = Hasher._createHelper(SHA3);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA3(message, key);
+	     */
+	    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+	}(Math));
+
+
+	/** @preserve
+	(c) 2012 by Cédric Mesnil. All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var _zl = WordArray.create([
+	        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+	        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
+	        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
+	        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
+	        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
+	    var _zr = WordArray.create([
+	        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
+	        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
+	        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
+	        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
+	        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
+	    var _sl = WordArray.create([
+	         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
+	        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
+	        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
+	          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
+	        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
+	    var _sr = WordArray.create([
+	        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
+	        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
+	        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
+	        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
+	        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
+
+	    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+	    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+	    /**
+	     * RIPEMD160 hash algorithm.
+	     */
+	    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                // Swap
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+	            // Shortcut
+	            var H  = this._hash.words;
+	            var hl = _hl.words;
+	            var hr = _hr.words;
+	            var zl = _zl.words;
+	            var zr = _zr.words;
+	            var sl = _sl.words;
+	            var sr = _sr.words;
+
+	            // Working variables
+	            var al, bl, cl, dl, el;
+	            var ar, br, cr, dr, er;
+
+	            ar = al = H[0];
+	            br = bl = H[1];
+	            cr = cl = H[2];
+	            dr = dl = H[3];
+	            er = el = H[4];
+	            // Computation
+	            var t;
+	            for (var i = 0; i < 80; i += 1) {
+	                t = (al +  M[offset+zl[i]])|0;
+	                if (i<16){
+		            t +=  f1(bl,cl,dl) + hl[0];
+	                } else if (i<32) {
+		            t +=  f2(bl,cl,dl) + hl[1];
+	                } else if (i<48) {
+		            t +=  f3(bl,cl,dl) + hl[2];
+	                } else if (i<64) {
+		            t +=  f4(bl,cl,dl) + hl[3];
+	                } else {// if (i<80) {
+		            t +=  f5(bl,cl,dl) + hl[4];
+	                }
+	                t = t|0;
+	                t =  rotl(t,sl[i]);
+	                t = (t+el)|0;
+	                al = el;
+	                el = dl;
+	                dl = rotl(cl, 10);
+	                cl = bl;
+	                bl = t;
+
+	                t = (ar + M[offset+zr[i]])|0;
+	                if (i<16){
+		            t +=  f5(br,cr,dr) + hr[0];
+	                } else if (i<32) {
+		            t +=  f4(br,cr,dr) + hr[1];
+	                } else if (i<48) {
+		            t +=  f3(br,cr,dr) + hr[2];
+	                } else if (i<64) {
+		            t +=  f2(br,cr,dr) + hr[3];
+	                } else {// if (i<80) {
+		            t +=  f1(br,cr,dr) + hr[4];
+	                }
+	                t = t|0;
+	                t =  rotl(t,sr[i]) ;
+	                t = (t+er)|0;
+	                ar = er;
+	                er = dr;
+	                dr = rotl(cr, 10);
+	                cr = br;
+	                br = t;
+	            }
+	            // Intermediate hash value
+	            t    = (H[1] + cl + dr)|0;
+	            H[1] = (H[2] + dl + er)|0;
+	            H[2] = (H[3] + el + ar)|0;
+	            H[3] = (H[4] + al + br)|0;
+	            H[4] = (H[0] + bl + cr)|0;
+	            H[0] =  t;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
+	            );
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 5; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                // Swap
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+
+	    function f1(x, y, z) {
+	        return ((x) ^ (y) ^ (z));
+
+	    }
+
+	    function f2(x, y, z) {
+	        return (((x)&(y)) | ((~x)&(z)));
+	    }
+
+	    function f3(x, y, z) {
+	        return (((x) | (~(y))) ^ (z));
+	    }
+
+	    function f4(x, y, z) {
+	        return (((x) & (z)) | ((y)&(~(z))));
+	    }
+
+	    function f5(x, y, z) {
+	        return ((x) ^ ((y) |(~(z))));
+
+	    }
+
+	    function rotl(x,n) {
+	        return (x<<n) | (x>>>(32-n));
+	    }
+
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.RIPEMD160('message');
+	     *     var hash = CryptoJS.RIPEMD160(wordArray);
+	     */
+	    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
+	     */
+	    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+	}(Math));
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var C_enc = C.enc;
+	    var Utf8 = C_enc.Utf8;
+	    var C_algo = C.algo;
+
+	    /**
+	     * HMAC algorithm.
+	     */
+	    var HMAC = C_algo.HMAC = Base.extend({
+	        /**
+	         * Initializes a newly created HMAC.
+	         *
+	         * @param {Hasher} hasher The hash algorithm to use.
+	         * @param {WordArray|string} key The secret key.
+	         *
+	         * @example
+	         *
+	         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+	         */
+	        init: function (hasher, key) {
+	            // Init hasher
+	            hasher = this._hasher = new hasher.init();
+
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof key == 'string') {
+	                key = Utf8.parse(key);
+	            }
+
+	            // Shortcuts
+	            var hasherBlockSize = hasher.blockSize;
+	            var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+	            // Allow arbitrary length keys
+	            if (key.sigBytes > hasherBlockSizeBytes) {
+	                key = hasher.finalize(key);
+	            }
+
+	            // Clamp excess bits
+	            key.clamp();
+
+	            // Clone key for inner and outer pads
+	            var oKey = this._oKey = key.clone();
+	            var iKey = this._iKey = key.clone();
+
+	            // Shortcuts
+	            var oKeyWords = oKey.words;
+	            var iKeyWords = iKey.words;
+
+	            // XOR keys with pad constants
+	            for (var i = 0; i < hasherBlockSize; i++) {
+	                oKeyWords[i] ^= 0x5c5c5c5c;
+	                iKeyWords[i] ^= 0x36363636;
+	            }
+	            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this HMAC to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hmacHasher.reset();
+	         */
+	        reset: function () {
+	            // Shortcut
+	            var hasher = this._hasher;
+
+	            // Reset
+	            hasher.reset();
+	            hasher.update(this._iKey);
+	        },
+
+	        /**
+	         * Updates this HMAC with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {HMAC} This HMAC instance.
+	         *
+	         * @example
+	         *
+	         *     hmacHasher.update('message');
+	         *     hmacHasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            this._hasher.update(messageUpdate);
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the HMAC computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The HMAC.
+	         *
+	         * @example
+	         *
+	         *     var hmac = hmacHasher.finalize();
+	         *     var hmac = hmacHasher.finalize('message');
+	         *     var hmac = hmacHasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Shortcut
+	            var hasher = this._hasher;
+
+	            // Compute HMAC
+	            var innerHash = hasher.finalize(messageUpdate);
+	            hasher.reset();
+	            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+	            return hmac;
+	        }
+	    });
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var SHA256 = C_algo.SHA256;
+	    var HMAC = C_algo.HMAC;
+
+	    /**
+	     * Password-Based Key Derivation Function 2 algorithm.
+	     */
+	    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+	         * @property {Hasher} hasher The hasher to use. Default: SHA256
+	         * @property {number} iterations The number of iterations to perform. Default: 250000
+	         */
+	        cfg: Base.extend({
+	            keySize: 128/32,
+	            hasher: SHA256,
+	            iterations: 250000
+	        }),
+
+	        /**
+	         * Initializes a newly created key derivation function.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+	         *
+	         * @example
+	         *
+	         *     var kdf = CryptoJS.algo.PBKDF2.create();
+	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+	         */
+	        init: function (cfg) {
+	            this.cfg = this.cfg.extend(cfg);
+	        },
+
+	        /**
+	         * Computes the Password-Based Key Derivation Function 2.
+	         *
+	         * @param {WordArray|string} password The password.
+	         * @param {WordArray|string} salt A salt.
+	         *
+	         * @return {WordArray} The derived key.
+	         *
+	         * @example
+	         *
+	         *     var key = kdf.compute(password, salt);
+	         */
+	        compute: function (password, salt) {
+	            // Shortcut
+	            var cfg = this.cfg;
+
+	            // Init HMAC
+	            var hmac = HMAC.create(cfg.hasher, password);
+
+	            // Initial values
+	            var derivedKey = WordArray.create();
+	            var blockIndex = WordArray.create([0x00000001]);
+
+	            // Shortcuts
+	            var derivedKeyWords = derivedKey.words;
+	            var blockIndexWords = blockIndex.words;
+	            var keySize = cfg.keySize;
+	            var iterations = cfg.iterations;
+
+	            // Generate key
+	            while (derivedKeyWords.length < keySize) {
+	                var block = hmac.update(salt).finalize(blockIndex);
+	                hmac.reset();
+
+	                // Shortcuts
+	                var blockWords = block.words;
+	                var blockWordsLength = blockWords.length;
+
+	                // Iterations
+	                var intermediate = block;
+	                for (var i = 1; i < iterations; i++) {
+	                    intermediate = hmac.finalize(intermediate);
+	                    hmac.reset();
+
+	                    // Shortcut
+	                    var intermediateWords = intermediate.words;
+
+	                    // XOR intermediate with block
+	                    for (var j = 0; j < blockWordsLength; j++) {
+	                        blockWords[j] ^= intermediateWords[j];
+	                    }
+	                }
+
+	                derivedKey.concat(block);
+	                blockIndexWords[0]++;
+	            }
+	            derivedKey.sigBytes = keySize * 4;
+
+	            return derivedKey;
+	        }
+	    });
+
+	    /**
+	     * Computes the Password-Based Key Derivation Function 2.
+	     *
+	     * @param {WordArray|string} password The password.
+	     * @param {WordArray|string} salt A salt.
+	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+	     *
+	     * @return {WordArray} The derived key.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var key = CryptoJS.PBKDF2(password, salt);
+	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+	     */
+	    C.PBKDF2 = function (password, salt, cfg) {
+	        return PBKDF2.create(cfg).compute(password, salt);
+	    };
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var MD5 = C_algo.MD5;
+
+	    /**
+	     * This key derivation function is meant to conform with EVP_BytesToKey.
+	     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+	     */
+	    var EvpKDF = C_algo.EvpKDF = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+	         * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+	         * @property {number} iterations The number of iterations to perform. Default: 1
+	         */
+	        cfg: Base.extend({
+	            keySize: 128/32,
+	            hasher: MD5,
+	            iterations: 1
+	        }),
+
+	        /**
+	         * Initializes a newly created key derivation function.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+	         *
+	         * @example
+	         *
+	         *     var kdf = CryptoJS.algo.EvpKDF.create();
+	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+	         */
+	        init: function (cfg) {
+	            this.cfg = this.cfg.extend(cfg);
+	        },
+
+	        /**
+	         * Derives a key from a password.
+	         *
+	         * @param {WordArray|string} password The password.
+	         * @param {WordArray|string} salt A salt.
+	         *
+	         * @return {WordArray} The derived key.
+	         *
+	         * @example
+	         *
+	         *     var key = kdf.compute(password, salt);
+	         */
+	        compute: function (password, salt) {
+	            var block;
+
+	            // Shortcut
+	            var cfg = this.cfg;
+
+	            // Init hasher
+	            var hasher = cfg.hasher.create();
+
+	            // Initial values
+	            var derivedKey = WordArray.create();
+
+	            // Shortcuts
+	            var derivedKeyWords = derivedKey.words;
+	            var keySize = cfg.keySize;
+	            var iterations = cfg.iterations;
+
+	            // Generate key
+	            while (derivedKeyWords.length < keySize) {
+	                if (block) {
+	                    hasher.update(block);
+	                }
+	                block = hasher.update(password).finalize(salt);
+	                hasher.reset();
+
+	                // Iterations
+	                for (var i = 1; i < iterations; i++) {
+	                    block = hasher.finalize(block);
+	                    hasher.reset();
+	                }
+
+	                derivedKey.concat(block);
+	            }
+	            derivedKey.sigBytes = keySize * 4;
+
+	            return derivedKey;
+	        }
+	    });
+
+	    /**
+	     * Derives a key from a password.
+	     *
+	     * @param {WordArray|string} password The password.
+	     * @param {WordArray|string} salt A salt.
+	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+	     *
+	     * @return {WordArray} The derived key.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var key = CryptoJS.EvpKDF(password, salt);
+	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+	     */
+	    C.EvpKDF = function (password, salt, cfg) {
+	        return EvpKDF.create(cfg).compute(password, salt);
+	    };
+	}());
+
+
+	/**
+	 * Cipher core components.
+	 */
+	CryptoJS.lib.Cipher || (function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+	    var C_enc = C.enc;
+	    var Utf8 = C_enc.Utf8;
+	    var Base64 = C_enc.Base64;
+	    var C_algo = C.algo;
+	    var EvpKDF = C_algo.EvpKDF;
+
+	    /**
+	     * Abstract base cipher template.
+	     *
+	     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+	     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+	     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+	     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+	     */
+	    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {WordArray} iv The IV to use for this operation.
+	         */
+	        cfg: Base.extend(),
+
+	        /**
+	         * Creates this cipher in encryption mode.
+	         *
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {Cipher} A cipher instance.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+	         */
+	        createEncryptor: function (key, cfg) {
+	            return this.create(this._ENC_XFORM_MODE, key, cfg);
+	        },
+
+	        /**
+	         * Creates this cipher in decryption mode.
+	         *
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {Cipher} A cipher instance.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+	         */
+	        createDecryptor: function (key, cfg) {
+	            return this.create(this._DEC_XFORM_MODE, key, cfg);
+	        },
+
+	        /**
+	         * Initializes a newly created cipher.
+	         *
+	         * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @example
+	         *
+	         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+	         */
+	        init: function (xformMode, key, cfg) {
+	            // Apply config defaults
+	            this.cfg = this.cfg.extend(cfg);
+
+	            // Store transform mode and key
+	            this._xformMode = xformMode;
+	            this._key = key;
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this cipher to its initial state.
+	         *
+	         * @example
+	         *
+	         *     cipher.reset();
+	         */
+	        reset: function () {
+	            // Reset data buffer
+	            BufferedBlockAlgorithm.reset.call(this);
+
+	            // Perform concrete-cipher logic
+	            this._doReset();
+	        },
+
+	        /**
+	         * Adds data to be encrypted or decrypted.
+	         *
+	         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+	         *
+	         * @return {WordArray} The data after processing.
+	         *
+	         * @example
+	         *
+	         *     var encrypted = cipher.process('data');
+	         *     var encrypted = cipher.process(wordArray);
+	         */
+	        process: function (dataUpdate) {
+	            // Append
+	            this._append(dataUpdate);
+
+	            // Process available blocks
+	            return this._process();
+	        },
+
+	        /**
+	         * Finalizes the encryption or decryption process.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+	         *
+	         * @return {WordArray} The data after final processing.
+	         *
+	         * @example
+	         *
+	         *     var encrypted = cipher.finalize();
+	         *     var encrypted = cipher.finalize('data');
+	         *     var encrypted = cipher.finalize(wordArray);
+	         */
+	        finalize: function (dataUpdate) {
+	            // Final data update
+	            if (dataUpdate) {
+	                this._append(dataUpdate);
+	            }
+
+	            // Perform concrete-cipher logic
+	            var finalProcessedData = this._doFinalize();
+
+	            return finalProcessedData;
+	        },
+
+	        keySize: 128/32,
+
+	        ivSize: 128/32,
+
+	        _ENC_XFORM_MODE: 1,
+
+	        _DEC_XFORM_MODE: 2,
+
+	        /**
+	         * Creates shortcut functions to a cipher's object interface.
+	         *
+	         * @param {Cipher} cipher The cipher to create a helper for.
+	         *
+	         * @return {Object} An object with encrypt and decrypt shortcut functions.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+	         */
+	        _createHelper: (function () {
+	            function selectCipherStrategy(key) {
+	                if (typeof key == 'string') {
+	                    return PasswordBasedCipher;
+	                } else {
+	                    return SerializableCipher;
+	                }
+	            }
+
+	            return function (cipher) {
+	                return {
+	                    encrypt: function (message, key, cfg) {
+	                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+	                    },
+
+	                    decrypt: function (ciphertext, key, cfg) {
+	                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+	                    }
+	                };
+	            };
+	        }())
+	    });
+
+	    /**
+	     * Abstract base stream cipher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+	     */
+	    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+	        _doFinalize: function () {
+	            // Process partial blocks
+	            var finalProcessedBlocks = this._process(!!'flush');
+
+	            return finalProcessedBlocks;
+	        },
+
+	        blockSize: 1
+	    });
+
+	    /**
+	     * Mode namespace.
+	     */
+	    var C_mode = C.mode = {};
+
+	    /**
+	     * Abstract base block cipher mode template.
+	     */
+	    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+	        /**
+	         * Creates this mode for encryption.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+	         */
+	        createEncryptor: function (cipher, iv) {
+	            return this.Encryptor.create(cipher, iv);
+	        },
+
+	        /**
+	         * Creates this mode for decryption.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+	         */
+	        createDecryptor: function (cipher, iv) {
+	            return this.Decryptor.create(cipher, iv);
+	        },
+
+	        /**
+	         * Initializes a newly created mode.
+	         *
+	         * @param {Cipher} cipher A block cipher instance.
+	         * @param {Array} iv The IV words.
+	         *
+	         * @example
+	         *
+	         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+	         */
+	        init: function (cipher, iv) {
+	            this._cipher = cipher;
+	            this._iv = iv;
+	        }
+	    });
+
+	    /**
+	     * Cipher Block Chaining mode.
+	     */
+	    var CBC = C_mode.CBC = (function () {
+	        /**
+	         * Abstract base CBC mode.
+	         */
+	        var CBC = BlockCipherMode.extend();
+
+	        /**
+	         * CBC encryptor.
+	         */
+	        CBC.Encryptor = CBC.extend({
+	            /**
+	             * Processes the data block at offset.
+	             *
+	             * @param {Array} words The data words to operate on.
+	             * @param {number} offset The offset where the block starts.
+	             *
+	             * @example
+	             *
+	             *     mode.processBlock(data.words, offset);
+	             */
+	            processBlock: function (words, offset) {
+	                // Shortcuts
+	                var cipher = this._cipher;
+	                var blockSize = cipher.blockSize;
+
+	                // XOR and encrypt
+	                xorBlock.call(this, words, offset, blockSize);
+	                cipher.encryptBlock(words, offset);
+
+	                // Remember this block to use with next block
+	                this._prevBlock = words.slice(offset, offset + blockSize);
+	            }
+	        });
+
+	        /**
+	         * CBC decryptor.
+	         */
+	        CBC.Decryptor = CBC.extend({
+	            /**
+	             * Processes the data block at offset.
+	             *
+	             * @param {Array} words The data words to operate on.
+	             * @param {number} offset The offset where the block starts.
+	             *
+	             * @example
+	             *
+	             *     mode.processBlock(data.words, offset);
+	             */
+	            processBlock: function (words, offset) {
+	                // Shortcuts
+	                var cipher = this._cipher;
+	                var blockSize = cipher.blockSize;
+
+	                // Remember this block to use with next block
+	                var thisBlock = words.slice(offset, offset + blockSize);
+
+	                // Decrypt and XOR
+	                cipher.decryptBlock(words, offset);
+	                xorBlock.call(this, words, offset, blockSize);
+
+	                // This block becomes the previous block
+	                this._prevBlock = thisBlock;
+	            }
+	        });
+
+	        function xorBlock(words, offset, blockSize) {
+	            var block;
+
+	            // Shortcut
+	            var iv = this._iv;
+
+	            // Choose mixing block
+	            if (iv) {
+	                block = iv;
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            } else {
+	                block = this._prevBlock;
+	            }
+
+	            // XOR blocks
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= block[i];
+	            }
+	        }
+
+	        return CBC;
+	    }());
+
+	    /**
+	     * Padding namespace.
+	     */
+	    var C_pad = C.pad = {};
+
+	    /**
+	     * PKCS #5/7 padding strategy.
+	     */
+	    var Pkcs7 = C_pad.Pkcs7 = {
+	        /**
+	         * Pads data using the algorithm defined in PKCS #5/7.
+	         *
+	         * @param {WordArray} data The data to pad.
+	         * @param {number} blockSize The multiple that the data should be padded to.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+	         */
+	        pad: function (data, blockSize) {
+	            // Shortcut
+	            var blockSizeBytes = blockSize * 4;
+
+	            // Count padding bytes
+	            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+	            // Create padding word
+	            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+	            // Create padding
+	            var paddingWords = [];
+	            for (var i = 0; i < nPaddingBytes; i += 4) {
+	                paddingWords.push(paddingWord);
+	            }
+	            var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+	            // Add padding
+	            data.concat(padding);
+	        },
+
+	        /**
+	         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+	         *
+	         * @param {WordArray} data The data to unpad.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+	         */
+	        unpad: function (data) {
+	            // Get number of padding bytes from last byte
+	            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	            // Remove padding
+	            data.sigBytes -= nPaddingBytes;
+	        }
+	    };
+
+	    /**
+	     * Abstract base block cipher template.
+	     *
+	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+	     */
+	    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {Mode} mode The block mode to use. Default: CBC
+	         * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+	         */
+	        cfg: Cipher.cfg.extend({
+	            mode: CBC,
+	            padding: Pkcs7
+	        }),
+
+	        reset: function () {
+	            var modeCreator;
+
+	            // Reset cipher
+	            Cipher.reset.call(this);
+
+	            // Shortcuts
+	            var cfg = this.cfg;
+	            var iv = cfg.iv;
+	            var mode = cfg.mode;
+
+	            // Reset block mode
+	            if (this._xformMode == this._ENC_XFORM_MODE) {
+	                modeCreator = mode.createEncryptor;
+	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+	                modeCreator = mode.createDecryptor;
+	                // Keep at least one block in the buffer for unpadding
+	                this._minBufferSize = 1;
+	            }
+
+	            if (this._mode && this._mode.__creator == modeCreator) {
+	                this._mode.init(this, iv && iv.words);
+	            } else {
+	                this._mode = modeCreator.call(mode, this, iv && iv.words);
+	                this._mode.__creator = modeCreator;
+	            }
+	        },
+
+	        _doProcessBlock: function (words, offset) {
+	            this._mode.processBlock(words, offset);
+	        },
+
+	        _doFinalize: function () {
+	            var finalProcessedBlocks;
+
+	            // Shortcut
+	            var padding = this.cfg.padding;
+
+	            // Finalize
+	            if (this._xformMode == this._ENC_XFORM_MODE) {
+	                // Pad data
+	                padding.pad(this._data, this.blockSize);
+
+	                // Process final blocks
+	                finalProcessedBlocks = this._process(!!'flush');
+	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+	                // Process final blocks
+	                finalProcessedBlocks = this._process(!!'flush');
+
+	                // Unpad data
+	                padding.unpad(finalProcessedBlocks);
+	            }
+
+	            return finalProcessedBlocks;
+	        },
+
+	        blockSize: 128/32
+	    });
+
+	    /**
+	     * A collection of cipher parameters.
+	     *
+	     * @property {WordArray} ciphertext The raw ciphertext.
+	     * @property {WordArray} key The key to this ciphertext.
+	     * @property {WordArray} iv The IV used in the ciphering operation.
+	     * @property {WordArray} salt The salt used with a key derivation function.
+	     * @property {Cipher} algorithm The cipher algorithm.
+	     * @property {Mode} mode The block mode used in the ciphering operation.
+	     * @property {Padding} padding The padding scheme used in the ciphering operation.
+	     * @property {number} blockSize The block size of the cipher.
+	     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+	     */
+	    var CipherParams = C_lib.CipherParams = Base.extend({
+	        /**
+	         * Initializes a newly created cipher params object.
+	         *
+	         * @param {Object} cipherParams An object with any of the possible cipher parameters.
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.lib.CipherParams.create({
+	         *         ciphertext: ciphertextWordArray,
+	         *         key: keyWordArray,
+	         *         iv: ivWordArray,
+	         *         salt: saltWordArray,
+	         *         algorithm: CryptoJS.algo.AES,
+	         *         mode: CryptoJS.mode.CBC,
+	         *         padding: CryptoJS.pad.PKCS7,
+	         *         blockSize: 4,
+	         *         formatter: CryptoJS.format.OpenSSL
+	         *     });
+	         */
+	        init: function (cipherParams) {
+	            this.mixIn(cipherParams);
+	        },
+
+	        /**
+	         * Converts this cipher params object to a string.
+	         *
+	         * @param {Format} formatter (Optional) The formatting strategy to use.
+	         *
+	         * @return {string} The stringified cipher params.
+	         *
+	         * @throws Error If neither the formatter nor the default formatter is set.
+	         *
+	         * @example
+	         *
+	         *     var string = cipherParams + '';
+	         *     var string = cipherParams.toString();
+	         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+	         */
+	        toString: function (formatter) {
+	            return (formatter || this.formatter).stringify(this);
+	        }
+	    });
+
+	    /**
+	     * Format namespace.
+	     */
+	    var C_format = C.format = {};
+
+	    /**
+	     * OpenSSL formatting strategy.
+	     */
+	    var OpenSSLFormatter = C_format.OpenSSL = {
+	        /**
+	         * Converts a cipher params object to an OpenSSL-compatible string.
+	         *
+	         * @param {CipherParams} cipherParams The cipher params object.
+	         *
+	         * @return {string} The OpenSSL-compatible string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+	         */
+	        stringify: function (cipherParams) {
+	            var wordArray;
+
+	            // Shortcuts
+	            var ciphertext = cipherParams.ciphertext;
+	            var salt = cipherParams.salt;
+
+	            // Format
+	            if (salt) {
+	                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+	            } else {
+	                wordArray = ciphertext;
+	            }
+
+	            return wordArray.toString(Base64);
+	        },
+
+	        /**
+	         * Converts an OpenSSL-compatible string to a cipher params object.
+	         *
+	         * @param {string} openSSLStr The OpenSSL-compatible string.
+	         *
+	         * @return {CipherParams} The cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+	         */
+	        parse: function (openSSLStr) {
+	            var salt;
+
+	            // Parse base64
+	            var ciphertext = Base64.parse(openSSLStr);
+
+	            // Shortcut
+	            var ciphertextWords = ciphertext.words;
+
+	            // Test for salt
+	            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+	                // Extract salt
+	                salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+	                // Remove salt from ciphertext
+	                ciphertextWords.splice(0, 4);
+	                ciphertext.sigBytes -= 16;
+	            }
+
+	            return CipherParams.create({ ciphertext: ciphertext, salt: salt });
+	        }
+	    };
+
+	    /**
+	     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+	     */
+	    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+	         */
+	        cfg: Base.extend({
+	            format: OpenSSLFormatter
+	        }),
+
+	        /**
+	         * Encrypts a message.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {WordArray|string} message The message to encrypt.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {CipherParams} A cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         */
+	        encrypt: function (cipher, message, key, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Encrypt
+	            var encryptor = cipher.createEncryptor(key, cfg);
+	            var ciphertext = encryptor.finalize(message);
+
+	            // Shortcut
+	            var cipherCfg = encryptor.cfg;
+
+	            // Create and return serializable cipher params
+	            return CipherParams.create({
+	                ciphertext: ciphertext,
+	                key: key,
+	                iv: cipherCfg.iv,
+	                algorithm: cipher,
+	                mode: cipherCfg.mode,
+	                padding: cipherCfg.padding,
+	                blockSize: cipher.blockSize,
+	                formatter: cfg.format
+	            });
+	        },
+
+	        /**
+	         * Decrypts serialized ciphertext.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+	         * @param {WordArray} key The key.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {WordArray} The plaintext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+	         */
+	        decrypt: function (cipher, ciphertext, key, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Convert string to CipherParams
+	            ciphertext = this._parse(ciphertext, cfg.format);
+
+	            // Decrypt
+	            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+	            return plaintext;
+	        },
+
+	        /**
+	         * Converts serialized ciphertext to CipherParams,
+	         * else assumed CipherParams already and returns ciphertext unchanged.
+	         *
+	         * @param {CipherParams|string} ciphertext The ciphertext.
+	         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+	         *
+	         * @return {CipherParams} The unserialized ciphertext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+	         */
+	        _parse: function (ciphertext, format) {
+	            if (typeof ciphertext == 'string') {
+	                return format.parse(ciphertext, this);
+	            } else {
+	                return ciphertext;
+	            }
+	        }
+	    });
+
+	    /**
+	     * Key derivation function namespace.
+	     */
+	    var C_kdf = C.kdf = {};
+
+	    /**
+	     * OpenSSL key derivation function.
+	     */
+	    var OpenSSLKdf = C_kdf.OpenSSL = {
+	        /**
+	         * Derives a key and IV from a password.
+	         *
+	         * @param {string} password The password to derive from.
+	         * @param {number} keySize The size in words of the key to generate.
+	         * @param {number} ivSize The size in words of the IV to generate.
+	         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+	         *
+	         * @return {CipherParams} A cipher params object with the key, IV, and salt.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+	         */
+	        execute: function (password, keySize, ivSize, salt, hasher) {
+	            // Generate random salt
+	            if (!salt) {
+	                salt = WordArray.random(64/8);
+	            }
+
+	            // Derive key and IV
+	            if (!hasher) {
+	                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
+	            } else {
+	                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
+	            }
+
+
+	            // Separate key and IV
+	            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+	            key.sigBytes = keySize * 4;
+
+	            // Return params
+	            return CipherParams.create({ key: key, iv: iv, salt: salt });
+	        }
+	    };
+
+	    /**
+	     * A serializable cipher wrapper that derives the key from a password,
+	     * and returns ciphertext as a serializable cipher params object.
+	     */
+	    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+	         */
+	        cfg: SerializableCipher.cfg.extend({
+	            kdf: OpenSSLKdf
+	        }),
+
+	        /**
+	         * Encrypts a message using a password.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {WordArray|string} message The message to encrypt.
+	         * @param {string} password The password.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {CipherParams} A cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+	         */
+	        encrypt: function (cipher, message, password, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Derive key and other params
+	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);
+
+	            // Add IV to config
+	            cfg.iv = derivedParams.iv;
+
+	            // Encrypt
+	            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+	            // Mix in derived params
+	            ciphertext.mixIn(derivedParams);
+
+	            return ciphertext;
+	        },
+
+	        /**
+	         * Decrypts serialized ciphertext using a password.
+	         *
+	         * @param {Cipher} cipher The cipher algorithm to use.
+	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+	         * @param {string} password The password.
+	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
+	         *
+	         * @return {WordArray} The plaintext.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+	         */
+	        decrypt: function (cipher, ciphertext, password, cfg) {
+	            // Apply config defaults
+	            cfg = this.cfg.extend(cfg);
+
+	            // Convert string to CipherParams
+	            ciphertext = this._parse(ciphertext, cfg.format);
+
+	            // Derive key and other params
+	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);
+
+	            // Add IV to config
+	            cfg.iv = derivedParams.iv;
+
+	            // Decrypt
+	            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+	            return plaintext;
+	        }
+	    });
+	}());
+
+
+	/**
+	 * Cipher Feedback block mode.
+	 */
+	CryptoJS.mode.CFB = (function () {
+	    var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    CFB.Encryptor = CFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher;
+	            var blockSize = cipher.blockSize;
+
+	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+	            // Remember this block to use with next block
+	            this._prevBlock = words.slice(offset, offset + blockSize);
+	        }
+	    });
+
+	    CFB.Decryptor = CFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher;
+	            var blockSize = cipher.blockSize;
+
+	            // Remember this block to use with next block
+	            var thisBlock = words.slice(offset, offset + blockSize);
+
+	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+	            // This block becomes the previous block
+	            this._prevBlock = thisBlock;
+	        }
+	    });
+
+	    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+	        var keystream;
+
+	        // Shortcut
+	        var iv = this._iv;
+
+	        // Generate keystream
+	        if (iv) {
+	            keystream = iv.slice(0);
+
+	            // Remove IV for subsequent blocks
+	            this._iv = undefined;
+	        } else {
+	            keystream = this._prevBlock;
+	        }
+	        cipher.encryptBlock(keystream, 0);
+
+	        // Encrypt
+	        for (var i = 0; i < blockSize; i++) {
+	            words[offset + i] ^= keystream[i];
+	        }
+	    }
+
+	    return CFB;
+	}());
+
+
+	/**
+	 * Counter block mode.
+	 */
+	CryptoJS.mode.CTR = (function () {
+	    var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+	    var Encryptor = CTR.Encryptor = CTR.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var counter = this._counter;
+
+	            // Generate keystream
+	            if (iv) {
+	                counter = this._counter = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+	            var keystream = counter.slice(0);
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Increment counter
+	            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    CTR.Decryptor = Encryptor;
+
+	    return CTR;
+	}());
+
+
+	/** @preserve
+	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
+	 * derived from CryptoJS.mode.CTR
+	 * Jan Hruby jhruby.web@gmail.com
+	 */
+	CryptoJS.mode.CTRGladman = (function () {
+	    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+		function incWord(word)
+		{
+			if (((word >> 24) & 0xff) === 0xff) { //overflow
+			var b1 = (word >> 16)&0xff;
+			var b2 = (word >> 8)&0xff;
+			var b3 = word & 0xff;
+
+			if (b1 === 0xff) // overflow b1
+			{
+			b1 = 0;
+			if (b2 === 0xff)
+			{
+				b2 = 0;
+				if (b3 === 0xff)
+				{
+					b3 = 0;
+				}
+				else
+				{
+					++b3;
+				}
+			}
+			else
+			{
+				++b2;
+			}
+			}
+			else
+			{
+			++b1;
+			}
+
+			word = 0;
+			word += (b1 << 16);
+			word += (b2 << 8);
+			word += b3;
+			}
+			else
+			{
+			word += (0x01 << 24);
+			}
+			return word;
+		}
+
+		function incCounter(counter)
+		{
+			if ((counter[0] = incWord(counter[0])) === 0)
+			{
+				// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
+				counter[1] = incWord(counter[1]);
+			}
+			return counter;
+		}
+
+	    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var counter = this._counter;
+
+	            // Generate keystream
+	            if (iv) {
+	                counter = this._counter = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+
+				incCounter(counter);
+
+				var keystream = counter.slice(0);
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    CTRGladman.Decryptor = Encryptor;
+
+	    return CTRGladman;
+	}());
+
+
+
+
+	/**
+	 * Output Feedback block mode.
+	 */
+	CryptoJS.mode.OFB = (function () {
+	    var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    var Encryptor = OFB.Encryptor = OFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var keystream = this._keystream;
+
+	            // Generate keystream
+	            if (iv) {
+	                keystream = this._keystream = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    OFB.Decryptor = Encryptor;
+
+	    return OFB;
+	}());
+
+
+	/**
+	 * Electronic Codebook block mode.
+	 */
+	CryptoJS.mode.ECB = (function () {
+	    var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    ECB.Encryptor = ECB.extend({
+	        processBlock: function (words, offset) {
+	            this._cipher.encryptBlock(words, offset);
+	        }
+	    });
+
+	    ECB.Decryptor = ECB.extend({
+	        processBlock: function (words, offset) {
+	            this._cipher.decryptBlock(words, offset);
+	        }
+	    });
+
+	    return ECB;
+	}());
+
+
+	/**
+	 * ANSI X.923 padding strategy.
+	 */
+	CryptoJS.pad.AnsiX923 = {
+	    pad: function (data, blockSize) {
+	        // Shortcuts
+	        var dataSigBytes = data.sigBytes;
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Count padding bytes
+	        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+	        // Compute last byte position
+	        var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+	        // Pad
+	        data.clamp();
+	        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+	        data.sigBytes += nPaddingBytes;
+	    },
+
+	    unpad: function (data) {
+	        // Get number of padding bytes from last byte
+	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	        // Remove padding
+	        data.sigBytes -= nPaddingBytes;
+	    }
+	};
+
+
+	/**
+	 * ISO 10126 padding strategy.
+	 */
+	CryptoJS.pad.Iso10126 = {
+	    pad: function (data, blockSize) {
+	        // Shortcut
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Count padding bytes
+	        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+	        // Pad
+	        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
+	             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+	    },
+
+	    unpad: function (data) {
+	        // Get number of padding bytes from last byte
+	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	        // Remove padding
+	        data.sigBytes -= nPaddingBytes;
+	    }
+	};
+
+
+	/**
+	 * ISO/IEC 9797-1 Padding Method 2.
+	 */
+	CryptoJS.pad.Iso97971 = {
+	    pad: function (data, blockSize) {
+	        // Add 0x80 byte
+	        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+	        // Zero pad the rest
+	        CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+	    },
+
+	    unpad: function (data) {
+	        // Remove zero padding
+	        CryptoJS.pad.ZeroPadding.unpad(data);
+
+	        // Remove one more byte -- the 0x80 byte
+	        data.sigBytes--;
+	    }
+	};
+
+
+	/**
+	 * Zero padding strategy.
+	 */
+	CryptoJS.pad.ZeroPadding = {
+	    pad: function (data, blockSize) {
+	        // Shortcut
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Pad
+	        data.clamp();
+	        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+	    },
+
+	    unpad: function (data) {
+	        // Shortcut
+	        var dataWords = data.words;
+
+	        // Unpad
+	        var i = data.sigBytes - 1;
+	        for (var i = data.sigBytes - 1; i >= 0; i--) {
+	            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+	                data.sigBytes = i + 1;
+	                break;
+	            }
+	        }
+	    }
+	};
+
+
+	/**
+	 * A noop padding strategy.
+	 */
+	CryptoJS.pad.NoPadding = {
+	    pad: function () {
+	    },
+
+	    unpad: function () {
+	    }
+	};
+
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var CipherParams = C_lib.CipherParams;
+	    var C_enc = C.enc;
+	    var Hex = C_enc.Hex;
+	    var C_format = C.format;
+
+	    var HexFormatter = C_format.Hex = {
+	        /**
+	         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+	         *
+	         * @param {CipherParams} cipherParams The cipher params object.
+	         *
+	         * @return {string} The hexadecimally encoded string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+	         */
+	        stringify: function (cipherParams) {
+	            return cipherParams.ciphertext.toString(Hex);
+	        },
+
+	        /**
+	         * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+	         *
+	         * @param {string} input The hexadecimally encoded string.
+	         *
+	         * @return {CipherParams} The cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
+	         */
+	        parse: function (input) {
+	            var ciphertext = Hex.parse(input);
+	            return CipherParams.create({ ciphertext: ciphertext });
+	        }
+	    };
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Lookup tables
+	    var SBOX = [];
+	    var INV_SBOX = [];
+	    var SUB_MIX_0 = [];
+	    var SUB_MIX_1 = [];
+	    var SUB_MIX_2 = [];
+	    var SUB_MIX_3 = [];
+	    var INV_SUB_MIX_0 = [];
+	    var INV_SUB_MIX_1 = [];
+	    var INV_SUB_MIX_2 = [];
+	    var INV_SUB_MIX_3 = [];
+
+	    // Compute lookup tables
+	    (function () {
+	        // Compute double table
+	        var d = [];
+	        for (var i = 0; i < 256; i++) {
+	            if (i < 128) {
+	                d[i] = i << 1;
+	            } else {
+	                d[i] = (i << 1) ^ 0x11b;
+	            }
+	        }
+
+	        // Walk GF(2^8)
+	        var x = 0;
+	        var xi = 0;
+	        for (var i = 0; i < 256; i++) {
+	            // Compute sbox
+	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+	            SBOX[x] = sx;
+	            INV_SBOX[sx] = x;
+
+	            // Compute multiplication
+	            var x2 = d[x];
+	            var x4 = d[x2];
+	            var x8 = d[x4];
+
+	            // Compute sub bytes, mix columns tables
+	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
+	            SUB_MIX_3[x] = t;
+
+	            // Compute inv sub bytes, inv mix columns tables
+	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
+	            INV_SUB_MIX_3[sx] = t;
+
+	            // Compute next counter
+	            if (!x) {
+	                x = xi = 1;
+	            } else {
+	                x = x2 ^ d[d[d[x8 ^ x2]]];
+	                xi ^= d[d[xi]];
+	            }
+	        }
+	    }());
+
+	    // Precomputed Rcon lookup
+	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+	    /**
+	     * AES block cipher algorithm.
+	     */
+	    var AES = C_algo.AES = BlockCipher.extend({
+	        _doReset: function () {
+	            var t;
+
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._nRounds && this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            // Compute number of rounds
+	            var nRounds = this._nRounds = keySize + 6;
+
+	            // Compute number of key schedule rows
+	            var ksRows = (nRounds + 1) * 4;
+
+	            // Compute key schedule
+	            var keySchedule = this._keySchedule = [];
+	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+	                if (ksRow < keySize) {
+	                    keySchedule[ksRow] = keyWords[ksRow];
+	                } else {
+	                    t = keySchedule[ksRow - 1];
+
+	                    if (!(ksRow % keySize)) {
+	                        // Rot word
+	                        t = (t << 8) | (t >>> 24);
+
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+	                        // Mix Rcon
+	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
+	                    } else if (keySize > 6 && ksRow % keySize == 4) {
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+	                    }
+
+	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+	                }
+	            }
+
+	            // Compute inv key schedule
+	            var invKeySchedule = this._invKeySchedule = [];
+	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+	                var ksRow = ksRows - invKsRow;
+
+	                if (invKsRow % 4) {
+	                    var t = keySchedule[ksRow];
+	                } else {
+	                    var t = keySchedule[ksRow - 4];
+	                }
+
+	                if (invKsRow < 4 || ksRow <= 4) {
+	                    invKeySchedule[invKsRow] = t;
+	                } else {
+	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+	                }
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            // Swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+
+	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+	            // Inv swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+	        },
+
+	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+	            // Shortcut
+	            var nRounds = this._nRounds;
+
+	            // Get input, add round key
+	            var s0 = M[offset]     ^ keySchedule[0];
+	            var s1 = M[offset + 1] ^ keySchedule[1];
+	            var s2 = M[offset + 2] ^ keySchedule[2];
+	            var s3 = M[offset + 3] ^ keySchedule[3];
+
+	            // Key schedule row counter
+	            var ksRow = 4;
+
+	            // Rounds
+	            for (var round = 1; round < nRounds; round++) {
+	                // Shift rows, sub bytes, mix columns, add round key
+	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+	                // Update state
+	                s0 = t0;
+	                s1 = t1;
+	                s2 = t2;
+	                s3 = t3;
+	            }
+
+	            // Shift rows, sub bytes, add round key
+	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+	            // Set output
+	            M[offset]     = t0;
+	            M[offset + 1] = t1;
+	            M[offset + 2] = t2;
+	            M[offset + 3] = t3;
+	        },
+
+	        keySize: 256/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.AES = BlockCipher._createHelper(AES);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Permuted Choice 1 constants
+	    var PC1 = [
+	        57, 49, 41, 33, 25, 17, 9,  1,
+	        58, 50, 42, 34, 26, 18, 10, 2,
+	        59, 51, 43, 35, 27, 19, 11, 3,
+	        60, 52, 44, 36, 63, 55, 47, 39,
+	        31, 23, 15, 7,  62, 54, 46, 38,
+	        30, 22, 14, 6,  61, 53, 45, 37,
+	        29, 21, 13, 5,  28, 20, 12, 4
+	    ];
+
+	    // Permuted Choice 2 constants
+	    var PC2 = [
+	        14, 17, 11, 24, 1,  5,
+	        3,  28, 15, 6,  21, 10,
+	        23, 19, 12, 4,  26, 8,
+	        16, 7,  27, 20, 13, 2,
+	        41, 52, 31, 37, 47, 55,
+	        30, 40, 51, 45, 33, 48,
+	        44, 49, 39, 56, 34, 53,
+	        46, 42, 50, 36, 29, 32
+	    ];
+
+	    // Cumulative bit shift constants
+	    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+	    // SBOXes and round permutation constants
+	    var SBOX_P = [
+	        {
+	            0x0: 0x808200,
+	            0x10000000: 0x8000,
+	            0x20000000: 0x808002,
+	            0x30000000: 0x2,
+	            0x40000000: 0x200,
+	            0x50000000: 0x808202,
+	            0x60000000: 0x800202,
+	            0x70000000: 0x800000,
+	            0x80000000: 0x202,
+	            0x90000000: 0x800200,
+	            0xa0000000: 0x8200,
+	            0xb0000000: 0x808000,
+	            0xc0000000: 0x8002,
+	            0xd0000000: 0x800002,
+	            0xe0000000: 0x0,
+	            0xf0000000: 0x8202,
+	            0x8000000: 0x0,
+	            0x18000000: 0x808202,
+	            0x28000000: 0x8202,
+	            0x38000000: 0x8000,
+	            0x48000000: 0x808200,
+	            0x58000000: 0x200,
+	            0x68000000: 0x808002,
+	            0x78000000: 0x2,
+	            0x88000000: 0x800200,
+	            0x98000000: 0x8200,
+	            0xa8000000: 0x808000,
+	            0xb8000000: 0x800202,
+	            0xc8000000: 0x800002,
+	            0xd8000000: 0x8002,
+	            0xe8000000: 0x202,
+	            0xf8000000: 0x800000,
+	            0x1: 0x8000,
+	            0x10000001: 0x2,
+	            0x20000001: 0x808200,
+	            0x30000001: 0x800000,
+	            0x40000001: 0x808002,
+	            0x50000001: 0x8200,
+	            0x60000001: 0x200,
+	            0x70000001: 0x800202,
+	            0x80000001: 0x808202,
+	            0x90000001: 0x808000,
+	            0xa0000001: 0x800002,
+	            0xb0000001: 0x8202,
+	            0xc0000001: 0x202,
+	            0xd0000001: 0x800200,
+	            0xe0000001: 0x8002,
+	            0xf0000001: 0x0,
+	            0x8000001: 0x808202,
+	            0x18000001: 0x808000,
+	            0x28000001: 0x800000,
+	            0x38000001: 0x200,
+	            0x48000001: 0x8000,
+	            0x58000001: 0x800002,
+	            0x68000001: 0x2,
+	            0x78000001: 0x8202,
+	            0x88000001: 0x8002,
+	            0x98000001: 0x800202,
+	            0xa8000001: 0x202,
+	            0xb8000001: 0x808200,
+	            0xc8000001: 0x800200,
+	            0xd8000001: 0x0,
+	            0xe8000001: 0x8200,
+	            0xf8000001: 0x808002
+	        },
+	        {
+	            0x0: 0x40084010,
+	            0x1000000: 0x4000,
+	            0x2000000: 0x80000,
+	            0x3000000: 0x40080010,
+	            0x4000000: 0x40000010,
+	            0x5000000: 0x40084000,
+	            0x6000000: 0x40004000,
+	            0x7000000: 0x10,
+	            0x8000000: 0x84000,
+	            0x9000000: 0x40004010,
+	            0xa000000: 0x40000000,
+	            0xb000000: 0x84010,
+	            0xc000000: 0x80010,
+	            0xd000000: 0x0,
+	            0xe000000: 0x4010,
+	            0xf000000: 0x40080000,
+	            0x800000: 0x40004000,
+	            0x1800000: 0x84010,
+	            0x2800000: 0x10,
+	            0x3800000: 0x40004010,
+	            0x4800000: 0x40084010,
+	            0x5800000: 0x40000000,
+	            0x6800000: 0x80000,
+	            0x7800000: 0x40080010,
+	            0x8800000: 0x80010,
+	            0x9800000: 0x0,
+	            0xa800000: 0x4000,
+	            0xb800000: 0x40080000,
+	            0xc800000: 0x40000010,
+	            0xd800000: 0x84000,
+	            0xe800000: 0x40084000,
+	            0xf800000: 0x4010,
+	            0x10000000: 0x0,
+	            0x11000000: 0x40080010,
+	            0x12000000: 0x40004010,
+	            0x13000000: 0x40084000,
+	            0x14000000: 0x40080000,
+	            0x15000000: 0x10,
+	            0x16000000: 0x84010,
+	            0x17000000: 0x4000,
+	            0x18000000: 0x4010,
+	            0x19000000: 0x80000,
+	            0x1a000000: 0x80010,
+	            0x1b000000: 0x40000010,
+	            0x1c000000: 0x84000,
+	            0x1d000000: 0x40004000,
+	            0x1e000000: 0x40000000,
+	            0x1f000000: 0x40084010,
+	            0x10800000: 0x84010,
+	            0x11800000: 0x80000,
+	            0x12800000: 0x40080000,
+	            0x13800000: 0x4000,
+	            0x14800000: 0x40004000,
+	            0x15800000: 0x40084010,
+	            0x16800000: 0x10,
+	            0x17800000: 0x40000000,
+	            0x18800000: 0x40084000,
+	            0x19800000: 0x40000010,
+	            0x1a800000: 0x40004010,
+	            0x1b800000: 0x80010,
+	            0x1c800000: 0x0,
+	            0x1d800000: 0x4010,
+	            0x1e800000: 0x40080010,
+	            0x1f800000: 0x84000
+	        },
+	        {
+	            0x0: 0x104,
+	            0x100000: 0x0,
+	            0x200000: 0x4000100,
+	            0x300000: 0x10104,
+	            0x400000: 0x10004,
+	            0x500000: 0x4000004,
+	            0x600000: 0x4010104,
+	            0x700000: 0x4010000,
+	            0x800000: 0x4000000,
+	            0x900000: 0x4010100,
+	            0xa00000: 0x10100,
+	            0xb00000: 0x4010004,
+	            0xc00000: 0x4000104,
+	            0xd00000: 0x10000,
+	            0xe00000: 0x4,
+	            0xf00000: 0x100,
+	            0x80000: 0x4010100,
+	            0x180000: 0x4010004,
+	            0x280000: 0x0,
+	            0x380000: 0x4000100,
+	            0x480000: 0x4000004,
+	            0x580000: 0x10000,
+	            0x680000: 0x10004,
+	            0x780000: 0x104,
+	            0x880000: 0x4,
+	            0x980000: 0x100,
+	            0xa80000: 0x4010000,
+	            0xb80000: 0x10104,
+	            0xc80000: 0x10100,
+	            0xd80000: 0x4000104,
+	            0xe80000: 0x4010104,
+	            0xf80000: 0x4000000,
+	            0x1000000: 0x4010100,
+	            0x1100000: 0x10004,
+	            0x1200000: 0x10000,
+	            0x1300000: 0x4000100,
+	            0x1400000: 0x100,
+	            0x1500000: 0x4010104,
+	            0x1600000: 0x4000004,
+	            0x1700000: 0x0,
+	            0x1800000: 0x4000104,
+	            0x1900000: 0x4000000,
+	            0x1a00000: 0x4,
+	            0x1b00000: 0x10100,
+	            0x1c00000: 0x4010000,
+	            0x1d00000: 0x104,
+	            0x1e00000: 0x10104,
+	            0x1f00000: 0x4010004,
+	            0x1080000: 0x4000000,
+	            0x1180000: 0x104,
+	            0x1280000: 0x4010100,
+	            0x1380000: 0x0,
+	            0x1480000: 0x10004,
+	            0x1580000: 0x4000100,
+	            0x1680000: 0x100,
+	            0x1780000: 0x4010004,
+	            0x1880000: 0x10000,
+	            0x1980000: 0x4010104,
+	            0x1a80000: 0x10104,
+	            0x1b80000: 0x4000004,
+	            0x1c80000: 0x4000104,
+	            0x1d80000: 0x4010000,
+	            0x1e80000: 0x4,
+	            0x1f80000: 0x10100
+	        },
+	        {
+	            0x0: 0x80401000,
+	            0x10000: 0x80001040,
+	            0x20000: 0x401040,
+	            0x30000: 0x80400000,
+	            0x40000: 0x0,
+	            0x50000: 0x401000,
+	            0x60000: 0x80000040,
+	            0x70000: 0x400040,
+	            0x80000: 0x80000000,
+	            0x90000: 0x400000,
+	            0xa0000: 0x40,
+	            0xb0000: 0x80001000,
+	            0xc0000: 0x80400040,
+	            0xd0000: 0x1040,
+	            0xe0000: 0x1000,
+	            0xf0000: 0x80401040,
+	            0x8000: 0x80001040,
+	            0x18000: 0x40,
+	            0x28000: 0x80400040,
+	            0x38000: 0x80001000,
+	            0x48000: 0x401000,
+	            0x58000: 0x80401040,
+	            0x68000: 0x0,
+	            0x78000: 0x80400000,
+	            0x88000: 0x1000,
+	            0x98000: 0x80401000,
+	            0xa8000: 0x400000,
+	            0xb8000: 0x1040,
+	            0xc8000: 0x80000000,
+	            0xd8000: 0x400040,
+	            0xe8000: 0x401040,
+	            0xf8000: 0x80000040,
+	            0x100000: 0x400040,
+	            0x110000: 0x401000,
+	            0x120000: 0x80000040,
+	            0x130000: 0x0,
+	            0x140000: 0x1040,
+	            0x150000: 0x80400040,
+	            0x160000: 0x80401000,
+	            0x170000: 0x80001040,
+	            0x180000: 0x80401040,
+	            0x190000: 0x80000000,
+	            0x1a0000: 0x80400000,
+	            0x1b0000: 0x401040,
+	            0x1c0000: 0x80001000,
+	            0x1d0000: 0x400000,
+	            0x1e0000: 0x40,
+	            0x1f0000: 0x1000,
+	            0x108000: 0x80400000,
+	            0x118000: 0x80401040,
+	            0x128000: 0x0,
+	            0x138000: 0x401000,
+	            0x148000: 0x400040,
+	            0x158000: 0x80000000,
+	            0x168000: 0x80001040,
+	            0x178000: 0x40,
+	            0x188000: 0x80000040,
+	            0x198000: 0x1000,
+	            0x1a8000: 0x80001000,
+	            0x1b8000: 0x80400040,
+	            0x1c8000: 0x1040,
+	            0x1d8000: 0x80401000,
+	            0x1e8000: 0x400000,
+	            0x1f8000: 0x401040
+	        },
+	        {
+	            0x0: 0x80,
+	            0x1000: 0x1040000,
+	            0x2000: 0x40000,
+	            0x3000: 0x20000000,
+	            0x4000: 0x20040080,
+	            0x5000: 0x1000080,
+	            0x6000: 0x21000080,
+	            0x7000: 0x40080,
+	            0x8000: 0x1000000,
+	            0x9000: 0x20040000,
+	            0xa000: 0x20000080,
+	            0xb000: 0x21040080,
+	            0xc000: 0x21040000,
+	            0xd000: 0x0,
+	            0xe000: 0x1040080,
+	            0xf000: 0x21000000,
+	            0x800: 0x1040080,
+	            0x1800: 0x21000080,
+	            0x2800: 0x80,
+	            0x3800: 0x1040000,
+	            0x4800: 0x40000,
+	            0x5800: 0x20040080,
+	            0x6800: 0x21040000,
+	            0x7800: 0x20000000,
+	            0x8800: 0x20040000,
+	            0x9800: 0x0,
+	            0xa800: 0x21040080,
+	            0xb800: 0x1000080,
+	            0xc800: 0x20000080,
+	            0xd800: 0x21000000,
+	            0xe800: 0x1000000,
+	            0xf800: 0x40080,
+	            0x10000: 0x40000,
+	            0x11000: 0x80,
+	            0x12000: 0x20000000,
+	            0x13000: 0x21000080,
+	            0x14000: 0x1000080,
+	            0x15000: 0x21040000,
+	            0x16000: 0x20040080,
+	            0x17000: 0x1000000,
+	            0x18000: 0x21040080,
+	            0x19000: 0x21000000,
+	            0x1a000: 0x1040000,
+	            0x1b000: 0x20040000,
+	            0x1c000: 0x40080,
+	            0x1d000: 0x20000080,
+	            0x1e000: 0x0,
+	            0x1f000: 0x1040080,
+	            0x10800: 0x21000080,
+	            0x11800: 0x1000000,
+	            0x12800: 0x1040000,
+	            0x13800: 0x20040080,
+	            0x14800: 0x20000000,
+	            0x15800: 0x1040080,
+	            0x16800: 0x80,
+	            0x17800: 0x21040000,
+	            0x18800: 0x40080,
+	            0x19800: 0x21040080,
+	            0x1a800: 0x0,
+	            0x1b800: 0x21000000,
+	            0x1c800: 0x1000080,
+	            0x1d800: 0x40000,
+	            0x1e800: 0x20040000,
+	            0x1f800: 0x20000080
+	        },
+	        {
+	            0x0: 0x10000008,
+	            0x100: 0x2000,
+	            0x200: 0x10200000,
+	            0x300: 0x10202008,
+	            0x400: 0x10002000,
+	            0x500: 0x200000,
+	            0x600: 0x200008,
+	            0x700: 0x10000000,
+	            0x800: 0x0,
+	            0x900: 0x10002008,
+	            0xa00: 0x202000,
+	            0xb00: 0x8,
+	            0xc00: 0x10200008,
+	            0xd00: 0x202008,
+	            0xe00: 0x2008,
+	            0xf00: 0x10202000,
+	            0x80: 0x10200000,
+	            0x180: 0x10202008,
+	            0x280: 0x8,
+	            0x380: 0x200000,
+	            0x480: 0x202008,
+	            0x580: 0x10000008,
+	            0x680: 0x10002000,
+	            0x780: 0x2008,
+	            0x880: 0x200008,
+	            0x980: 0x2000,
+	            0xa80: 0x10002008,
+	            0xb80: 0x10200008,
+	            0xc80: 0x0,
+	            0xd80: 0x10202000,
+	            0xe80: 0x202000,
+	            0xf80: 0x10000000,
+	            0x1000: 0x10002000,
+	            0x1100: 0x10200008,
+	            0x1200: 0x10202008,
+	            0x1300: 0x2008,
+	            0x1400: 0x200000,
+	            0x1500: 0x10000000,
+	            0x1600: 0x10000008,
+	            0x1700: 0x202000,
+	            0x1800: 0x202008,
+	            0x1900: 0x0,
+	            0x1a00: 0x8,
+	            0x1b00: 0x10200000,
+	            0x1c00: 0x2000,
+	            0x1d00: 0x10002008,
+	            0x1e00: 0x10202000,
+	            0x1f00: 0x200008,
+	            0x1080: 0x8,
+	            0x1180: 0x202000,
+	            0x1280: 0x200000,
+	            0x1380: 0x10000008,
+	            0x1480: 0x10002000,
+	            0x1580: 0x2008,
+	            0x1680: 0x10202008,
+	            0x1780: 0x10200000,
+	            0x1880: 0x10202000,
+	            0x1980: 0x10200008,
+	            0x1a80: 0x2000,
+	            0x1b80: 0x202008,
+	            0x1c80: 0x200008,
+	            0x1d80: 0x0,
+	            0x1e80: 0x10000000,
+	            0x1f80: 0x10002008
+	        },
+	        {
+	            0x0: 0x100000,
+	            0x10: 0x2000401,
+	            0x20: 0x400,
+	            0x30: 0x100401,
+	            0x40: 0x2100401,
+	            0x50: 0x0,
+	            0x60: 0x1,
+	            0x70: 0x2100001,
+	            0x80: 0x2000400,
+	            0x90: 0x100001,
+	            0xa0: 0x2000001,
+	            0xb0: 0x2100400,
+	            0xc0: 0x2100000,
+	            0xd0: 0x401,
+	            0xe0: 0x100400,
+	            0xf0: 0x2000000,
+	            0x8: 0x2100001,
+	            0x18: 0x0,
+	            0x28: 0x2000401,
+	            0x38: 0x2100400,
+	            0x48: 0x100000,
+	            0x58: 0x2000001,
+	            0x68: 0x2000000,
+	            0x78: 0x401,
+	            0x88: 0x100401,
+	            0x98: 0x2000400,
+	            0xa8: 0x2100000,
+	            0xb8: 0x100001,
+	            0xc8: 0x400,
+	            0xd8: 0x2100401,
+	            0xe8: 0x1,
+	            0xf8: 0x100400,
+	            0x100: 0x2000000,
+	            0x110: 0x100000,
+	            0x120: 0x2000401,
+	            0x130: 0x2100001,
+	            0x140: 0x100001,
+	            0x150: 0x2000400,
+	            0x160: 0x2100400,
+	            0x170: 0x100401,
+	            0x180: 0x401,
+	            0x190: 0x2100401,
+	            0x1a0: 0x100400,
+	            0x1b0: 0x1,
+	            0x1c0: 0x0,
+	            0x1d0: 0x2100000,
+	            0x1e0: 0x2000001,
+	            0x1f0: 0x400,
+	            0x108: 0x100400,
+	            0x118: 0x2000401,
+	            0x128: 0x2100001,
+	            0x138: 0x1,
+	            0x148: 0x2000000,
+	            0x158: 0x100000,
+	            0x168: 0x401,
+	            0x178: 0x2100400,
+	            0x188: 0x2000001,
+	            0x198: 0x2100000,
+	            0x1a8: 0x0,
+	            0x1b8: 0x2100401,
+	            0x1c8: 0x100401,
+	            0x1d8: 0x400,
+	            0x1e8: 0x2000400,
+	            0x1f8: 0x100001
+	        },
+	        {
+	            0x0: 0x8000820,
+	            0x1: 0x20000,
+	            0x2: 0x8000000,
+	            0x3: 0x20,
+	            0x4: 0x20020,
+	            0x5: 0x8020820,
+	            0x6: 0x8020800,
+	            0x7: 0x800,
+	            0x8: 0x8020000,
+	            0x9: 0x8000800,
+	            0xa: 0x20800,
+	            0xb: 0x8020020,
+	            0xc: 0x820,
+	            0xd: 0x0,
+	            0xe: 0x8000020,
+	            0xf: 0x20820,
+	            0x80000000: 0x800,
+	            0x80000001: 0x8020820,
+	            0x80000002: 0x8000820,
+	            0x80000003: 0x8000000,
+	            0x80000004: 0x8020000,
+	            0x80000005: 0x20800,
+	            0x80000006: 0x20820,
+	            0x80000007: 0x20,
+	            0x80000008: 0x8000020,
+	            0x80000009: 0x820,
+	            0x8000000a: 0x20020,
+	            0x8000000b: 0x8020800,
+	            0x8000000c: 0x0,
+	            0x8000000d: 0x8020020,
+	            0x8000000e: 0x8000800,
+	            0x8000000f: 0x20000,
+	            0x10: 0x20820,
+	            0x11: 0x8020800,
+	            0x12: 0x20,
+	            0x13: 0x800,
+	            0x14: 0x8000800,
+	            0x15: 0x8000020,
+	            0x16: 0x8020020,
+	            0x17: 0x20000,
+	            0x18: 0x0,
+	            0x19: 0x20020,
+	            0x1a: 0x8020000,
+	            0x1b: 0x8000820,
+	            0x1c: 0x8020820,
+	            0x1d: 0x20800,
+	            0x1e: 0x820,
+	            0x1f: 0x8000000,
+	            0x80000010: 0x20000,
+	            0x80000011: 0x800,
+	            0x80000012: 0x8020020,
+	            0x80000013: 0x20820,
+	            0x80000014: 0x20,
+	            0x80000015: 0x8020000,
+	            0x80000016: 0x8000000,
+	            0x80000017: 0x8000820,
+	            0x80000018: 0x8020820,
+	            0x80000019: 0x8000020,
+	            0x8000001a: 0x8000800,
+	            0x8000001b: 0x0,
+	            0x8000001c: 0x20800,
+	            0x8000001d: 0x820,
+	            0x8000001e: 0x20020,
+	            0x8000001f: 0x8020800
+	        }
+	    ];
+
+	    // Masks that select the SBOX input
+	    var SBOX_MASK = [
+	        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+	        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+	    ];
+
+	    /**
+	     * DES block cipher algorithm.
+	     */
+	    var DES = C_algo.DES = BlockCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+
+	            // Select 56 bits according to PC1
+	            var keyBits = [];
+	            for (var i = 0; i < 56; i++) {
+	                var keyBitPos = PC1[i] - 1;
+	                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+	            }
+
+	            // Assemble 16 subkeys
+	            var subKeys = this._subKeys = [];
+	            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+	                // Create subkey
+	                var subKey = subKeys[nSubKey] = [];
+
+	                // Shortcut
+	                var bitShift = BIT_SHIFTS[nSubKey];
+
+	                // Select 48 bits according to PC2
+	                for (var i = 0; i < 24; i++) {
+	                    // Select from the left 28 key bits
+	                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+	                    // Select from the right 28 key bits
+	                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+	                }
+
+	                // Since each subkey is applied to an expanded 32-bit input,
+	                // the subkey can be broken into 8 values scaled to 32-bits,
+	                // which allows the key to be used without expansion
+	                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+	                for (var i = 1; i < 7; i++) {
+	                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+	                }
+	                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+	            }
+
+	            // Compute inverse subkeys
+	            var invSubKeys = this._invSubKeys = [];
+	            for (var i = 0; i < 16; i++) {
+	                invSubKeys[i] = subKeys[15 - i];
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._subKeys);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._invSubKeys);
+	        },
+
+	        _doCryptBlock: function (M, offset, subKeys) {
+	            // Get input
+	            this._lBlock = M[offset];
+	            this._rBlock = M[offset + 1];
+
+	            // Initial permutation
+	            exchangeLR.call(this, 4,  0x0f0f0f0f);
+	            exchangeLR.call(this, 16, 0x0000ffff);
+	            exchangeRL.call(this, 2,  0x33333333);
+	            exchangeRL.call(this, 8,  0x00ff00ff);
+	            exchangeLR.call(this, 1,  0x55555555);
+
+	            // Rounds
+	            for (var round = 0; round < 16; round++) {
+	                // Shortcuts
+	                var subKey = subKeys[round];
+	                var lBlock = this._lBlock;
+	                var rBlock = this._rBlock;
+
+	                // Feistel function
+	                var f = 0;
+	                for (var i = 0; i < 8; i++) {
+	                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+	                }
+	                this._lBlock = rBlock;
+	                this._rBlock = lBlock ^ f;
+	            }
+
+	            // Undo swap from last round
+	            var t = this._lBlock;
+	            this._lBlock = this._rBlock;
+	            this._rBlock = t;
+
+	            // Final permutation
+	            exchangeLR.call(this, 1,  0x55555555);
+	            exchangeRL.call(this, 8,  0x00ff00ff);
+	            exchangeRL.call(this, 2,  0x33333333);
+	            exchangeLR.call(this, 16, 0x0000ffff);
+	            exchangeLR.call(this, 4,  0x0f0f0f0f);
+
+	            // Set output
+	            M[offset] = this._lBlock;
+	            M[offset + 1] = this._rBlock;
+	        },
+
+	        keySize: 64/32,
+
+	        ivSize: 64/32,
+
+	        blockSize: 64/32
+	    });
+
+	    // Swap bits across the left and right words
+	    function exchangeLR(offset, mask) {
+	        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+	        this._rBlock ^= t;
+	        this._lBlock ^= t << offset;
+	    }
+
+	    function exchangeRL(offset, mask) {
+	        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+	        this._lBlock ^= t;
+	        this._rBlock ^= t << offset;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.DES = BlockCipher._createHelper(DES);
+
+	    /**
+	     * Triple-DES block cipher algorithm.
+	     */
+	    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+	            // Make sure the key length is valid (64, 128 or >= 192 bit)
+	            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+	                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+	            }
+
+	            // Extend the key according to the keying options defined in 3DES standard
+	            var key1 = keyWords.slice(0, 2);
+	            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+	            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+	            // Create DES instances
+	            this._des1 = DES.createEncryptor(WordArray.create(key1));
+	            this._des2 = DES.createEncryptor(WordArray.create(key2));
+	            this._des3 = DES.createEncryptor(WordArray.create(key3));
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._des1.encryptBlock(M, offset);
+	            this._des2.decryptBlock(M, offset);
+	            this._des3.encryptBlock(M, offset);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            this._des3.decryptBlock(M, offset);
+	            this._des2.encryptBlock(M, offset);
+	            this._des1.decryptBlock(M, offset);
+	        },
+
+	        keySize: 192/32,
+
+	        ivSize: 64/32,
+
+	        blockSize: 64/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.TripleDES = BlockCipher._createHelper(TripleDES);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    /**
+	     * RC4 stream cipher algorithm.
+	     */
+	    var RC4 = C_algo.RC4 = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+	            var keySigBytes = key.sigBytes;
+
+	            // Init sbox
+	            var S = this._S = [];
+	            for (var i = 0; i < 256; i++) {
+	                S[i] = i;
+	            }
+
+	            // Key setup
+	            for (var i = 0, j = 0; i < 256; i++) {
+	                var keyByteIndex = i % keySigBytes;
+	                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+	                j = (j + S[i] + keyByte) % 256;
+
+	                // Swap
+	                var t = S[i];
+	                S[i] = S[j];
+	                S[j] = t;
+	            }
+
+	            // Counters
+	            this._i = this._j = 0;
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            M[offset] ^= generateKeystreamWord.call(this);
+	        },
+
+	        keySize: 256/32,
+
+	        ivSize: 0
+	    });
+
+	    function generateKeystreamWord() {
+	        // Shortcuts
+	        var S = this._S;
+	        var i = this._i;
+	        var j = this._j;
+
+	        // Generate keystream word
+	        var keystreamWord = 0;
+	        for (var n = 0; n < 4; n++) {
+	            i = (i + 1) % 256;
+	            j = (j + S[i]) % 256;
+
+	            // Swap
+	            var t = S[i];
+	            S[i] = S[j];
+	            S[j] = t;
+
+	            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+	        }
+
+	        // Update counters
+	        this._i = i;
+	        this._j = j;
+
+	        return keystreamWord;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RC4 = StreamCipher._createHelper(RC4);
+
+	    /**
+	     * Modified RC4 stream cipher algorithm.
+	     */
+	    var RC4Drop = C_algo.RC4Drop = RC4.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} drop The number of keystream words to drop. Default 192
+	         */
+	        cfg: RC4.cfg.extend({
+	            drop: 192
+	        }),
+
+	        _doReset: function () {
+	            RC4._doReset.call(this);
+
+	            // Drop
+	            for (var i = this.cfg.drop; i > 0; i--) {
+	                generateKeystreamWord.call(this);
+	            }
+	        }
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    // Reusable objects
+	    var S  = [];
+	    var C_ = [];
+	    var G  = [];
+
+	    /**
+	     * Rabbit stream cipher algorithm
+	     */
+	    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var K = this._key.words;
+	            var iv = this.cfg.iv;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
+	                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Generate initial state values
+	            var X = this._X = [
+	                K[0], (K[3] << 16) | (K[2] >>> 16),
+	                K[1], (K[0] << 16) | (K[3] >>> 16),
+	                K[2], (K[1] << 16) | (K[0] >>> 16),
+	                K[3], (K[2] << 16) | (K[1] >>> 16)
+	            ];
+
+	            // Generate initial counter values
+	            var C = this._C = [
+	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+	            ];
+
+	            // Carry bit
+	            this._b = 0;
+
+	            // Iterate the system four times
+	            for (var i = 0; i < 4; i++) {
+	                nextState.call(this);
+	            }
+
+	            // Modify the counters
+	            for (var i = 0; i < 8; i++) {
+	                C[i] ^= X[(i + 4) & 7];
+	            }
+
+	            // IV setup
+	            if (iv) {
+	                // Shortcuts
+	                var IV = iv.words;
+	                var IV_0 = IV[0];
+	                var IV_1 = IV[1];
+
+	                // Generate four subvectors
+	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+
+	                // Modify counter values
+	                C[0] ^= i0;
+	                C[1] ^= i1;
+	                C[2] ^= i2;
+	                C[3] ^= i3;
+	                C[4] ^= i0;
+	                C[5] ^= i1;
+	                C[6] ^= i2;
+	                C[7] ^= i3;
+
+	                // Iterate the system four times
+	                for (var i = 0; i < 4; i++) {
+	                    nextState.call(this);
+	                }
+	            }
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var X = this._X;
+
+	            // Iterate the system
+	            nextState.call(this);
+
+	            // Generate four keystream words
+	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+	            for (var i = 0; i < 4; i++) {
+	                // Swap endian
+	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
+	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+
+	                // Encrypt
+	                M[offset + i] ^= S[i];
+	            }
+	        },
+
+	        blockSize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    function nextState() {
+	        // Shortcuts
+	        var X = this._X;
+	        var C = this._C;
+
+	        // Save old counter values
+	        for (var i = 0; i < 8; i++) {
+	            C_[i] = C[i];
+	        }
+
+	        // Calculate new counter values
+	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+	        // Calculate the g-values
+	        for (var i = 0; i < 8; i++) {
+	            var gx = X[i] + C[i];
+
+	            // Construct high and low argument for squaring
+	            var ga = gx & 0xffff;
+	            var gb = gx >>> 16;
+
+	            // Calculate high and low result of squaring
+	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+	            // High XOR low
+	            G[i] = gh ^ gl;
+	        }
+
+	        // Calculate new state values
+	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
+	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
+	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
+	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+	     */
+	    C.Rabbit = StreamCipher._createHelper(Rabbit);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    // Reusable objects
+	    var S  = [];
+	    var C_ = [];
+	    var G  = [];
+
+	    /**
+	     * Rabbit stream cipher algorithm.
+	     *
+	     * This is a legacy version that neglected to convert the key to little-endian.
+	     * This error doesn't affect the cipher's security,
+	     * but it does affect its compatibility with other implementations.
+	     */
+	    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var K = this._key.words;
+	            var iv = this.cfg.iv;
+
+	            // Generate initial state values
+	            var X = this._X = [
+	                K[0], (K[3] << 16) | (K[2] >>> 16),
+	                K[1], (K[0] << 16) | (K[3] >>> 16),
+	                K[2], (K[1] << 16) | (K[0] >>> 16),
+	                K[3], (K[2] << 16) | (K[1] >>> 16)
+	            ];
+
+	            // Generate initial counter values
+	            var C = this._C = [
+	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+	            ];
+
+	            // Carry bit
+	            this._b = 0;
+
+	            // Iterate the system four times
+	            for (var i = 0; i < 4; i++) {
+	                nextState.call(this);
+	            }
+
+	            // Modify the counters
+	            for (var i = 0; i < 8; i++) {
+	                C[i] ^= X[(i + 4) & 7];
+	            }
+
+	            // IV setup
+	            if (iv) {
+	                // Shortcuts
+	                var IV = iv.words;
+	                var IV_0 = IV[0];
+	                var IV_1 = IV[1];
+
+	                // Generate four subvectors
+	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+
+	                // Modify counter values
+	                C[0] ^= i0;
+	                C[1] ^= i1;
+	                C[2] ^= i2;
+	                C[3] ^= i3;
+	                C[4] ^= i0;
+	                C[5] ^= i1;
+	                C[6] ^= i2;
+	                C[7] ^= i3;
+
+	                // Iterate the system four times
+	                for (var i = 0; i < 4; i++) {
+	                    nextState.call(this);
+	                }
+	            }
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var X = this._X;
+
+	            // Iterate the system
+	            nextState.call(this);
+
+	            // Generate four keystream words
+	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+	            for (var i = 0; i < 4; i++) {
+	                // Swap endian
+	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
+	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+
+	                // Encrypt
+	                M[offset + i] ^= S[i];
+	            }
+	        },
+
+	        blockSize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    function nextState() {
+	        // Shortcuts
+	        var X = this._X;
+	        var C = this._C;
+
+	        // Save old counter values
+	        for (var i = 0; i < 8; i++) {
+	            C_[i] = C[i];
+	        }
+
+	        // Calculate new counter values
+	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+	        // Calculate the g-values
+	        for (var i = 0; i < 8; i++) {
+	            var gx = X[i] + C[i];
+
+	            // Construct high and low argument for squaring
+	            var ga = gx & 0xffff;
+	            var gb = gx >>> 16;
+
+	            // Calculate high and low result of squaring
+	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+	            // High XOR low
+	            G[i] = gh ^ gl;
+	        }
+
+	        // Calculate new state values
+	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
+	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
+	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
+	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+	}());
+
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    const N = 16;
+
+	    //Origin pbox and sbox, derived from PI
+	    const ORIG_P = [
+	        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+	        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+	        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+	        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+	        0x9216D5D9, 0x8979FB1B
+	    ];
+
+	    const ORIG_S = [
+	        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+	            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+	            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+	            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+	            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+	            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+	            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+	            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+	            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+	            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+	            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+	            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+	            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+	            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+	            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+	            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+	            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+	            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+	            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+	            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+	            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+	            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+	            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+	            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+	            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+	            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+	            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+	            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+	            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+	            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+	            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+	            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+	            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+	            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+	            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+	            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+	            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+	            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+	            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+	            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+	            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+	            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+	            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+	            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+	            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+	            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+	            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+	            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+	            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+	            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+	            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+	            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+	            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+	            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+	            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+	            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+	            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+	            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+	            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+	            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+	            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+	            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+	            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+	            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],
+	        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+	            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+	            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+	            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+	            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+	            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+	            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+	            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+	            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+	            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+	            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+	            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+	            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+	            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+	            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+	            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+	            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+	            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+	            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+	            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+	            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+	            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+	            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+	            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+	            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+	            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+	            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+	            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+	            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+	            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+	            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+	            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+	            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+	            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+	            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+	            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+	            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+	            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+	            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+	            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+	            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+	            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+	            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+	            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+	            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+	            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+	            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+	            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+	            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+	            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+	            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+	            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+	            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+	            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+	            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+	            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+	            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+	            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+	            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+	            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+	            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+	            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+	            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+	            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],
+	        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+	            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+	            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+	            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+	            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+	            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+	            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+	            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+	            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+	            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+	            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+	            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+	            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+	            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+	            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+	            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+	            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+	            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+	            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+	            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+	            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+	            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+	            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+	            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+	            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+	            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+	            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+	            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+	            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+	            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+	            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+	            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+	            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+	            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+	            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+	            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+	            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+	            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+	            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+	            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+	            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+	            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+	            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+	            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+	            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+	            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+	            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+	            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+	            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+	            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+	            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+	            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+	            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+	            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+	            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+	            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+	            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+	            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+	            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+	            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+	            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+	            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+	            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+	            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],
+	        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+	            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+	            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+	            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+	            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+	            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+	            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+	            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+	            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+	            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+	            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+	            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+	            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+	            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+	            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+	            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+	            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+	            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+	            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+	            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+	            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+	            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+	            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+	            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+	            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+	            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+	            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+	            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+	            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+	            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+	            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+	            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+	            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+	            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+	            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+	            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+	            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+	            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+	            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+	            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+	            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+	            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+	            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+	            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+	            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+	            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+	            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+	            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+	            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+	            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+	            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+	            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+	            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+	            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+	            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+	            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+	            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+	            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+	            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+	            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+	            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+	            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+	            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+	            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]
+	    ];
+
+	    var BLOWFISH_CTX = {
+	        pbox: [],
+	        sbox: []
+	    }
+
+	    function F(ctx, x){
+	        let a = (x >> 24) & 0xFF;
+	        let b = (x >> 16) & 0xFF;
+	        let c = (x >> 8) & 0xFF;
+	        let d = x & 0xFF;
+
+	        let y = ctx.sbox[0][a] + ctx.sbox[1][b];
+	        y = y ^ ctx.sbox[2][c];
+	        y = y + ctx.sbox[3][d];
+
+	        return y;
+	    }
+
+	    function BlowFish_Encrypt(ctx, left, right){
+	        let Xl = left;
+	        let Xr = right;
+	        let temp;
+
+	        for(let i = 0; i < N; ++i){
+	            Xl = Xl ^ ctx.pbox[i];
+	            Xr = F(ctx, Xl) ^ Xr;
+
+	            temp = Xl;
+	            Xl = Xr;
+	            Xr = temp;
+	        }
+
+	        temp = Xl;
+	        Xl = Xr;
+	        Xr = temp;
+
+	        Xr = Xr ^ ctx.pbox[N];
+	        Xl = Xl ^ ctx.pbox[N + 1];
+
+	        return {left: Xl, right: Xr};
+	    }
+
+	    function BlowFish_Decrypt(ctx, left, right){
+	        let Xl = left;
+	        let Xr = right;
+	        let temp;
+
+	        for(let i = N + 1; i > 1; --i){
+	            Xl = Xl ^ ctx.pbox[i];
+	            Xr = F(ctx, Xl) ^ Xr;
+
+	            temp = Xl;
+	            Xl = Xr;
+	            Xr = temp;
+	        }
+
+	        temp = Xl;
+	        Xl = Xr;
+	        Xr = temp;
+
+	        Xr = Xr ^ ctx.pbox[1];
+	        Xl = Xl ^ ctx.pbox[0];
+
+	        return {left: Xl, right: Xr};
+	    }
+
+	    /**
+	     * Initialization ctx's pbox and sbox.
+	     *
+	     * @param {Object} ctx The object has pbox and sbox.
+	     * @param {Array} key An array of 32-bit words.
+	     * @param {int} keysize The length of the key.
+	     *
+	     * @example
+	     *
+	     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);
+	     */
+	    function BlowFishInit(ctx, key, keysize)
+	    {
+	        for(let Row = 0; Row < 4; Row++)
+	        {
+	            ctx.sbox[Row] = [];
+	            for(let Col = 0; Col < 256; Col++)
+	            {
+	                ctx.sbox[Row][Col] = ORIG_S[Row][Col];
+	            }
+	        }
+
+	        let keyIndex = 0;
+	        for(let index = 0; index < N + 2; index++)
+	        {
+	            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];
+	            keyIndex++;
+	            if(keyIndex >= keysize)
+	            {
+	                keyIndex = 0;
+	            }
+	        }
+
+	        let Data1 = 0;
+	        let Data2 = 0;
+	        let res = 0;
+	        for(let i = 0; i < N + 2; i += 2)
+	        {
+	            res = BlowFish_Encrypt(ctx, Data1, Data2);
+	            Data1 = res.left;
+	            Data2 = res.right;
+	            ctx.pbox[i] = Data1;
+	            ctx.pbox[i + 1] = Data2;
+	        }
+
+	        for(let i = 0; i < 4; i++)
+	        {
+	            for(let j = 0; j < 256; j += 2)
+	            {
+	                res = BlowFish_Encrypt(ctx, Data1, Data2);
+	                Data1 = res.left;
+	                Data2 = res.right;
+	                ctx.sbox[i][j] = Data1;
+	                ctx.sbox[i][j + 1] = Data2;
+	            }
+	        }
+
+	        return true;
+	    }
+
+	    /**
+	     * Blowfish block cipher algorithm.
+	     */
+	    var Blowfish = C_algo.Blowfish = BlockCipher.extend({
+	        _doReset: function () {
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            //Initialization pbox and sbox
+	            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
+	            M[offset] = res.left;
+	            M[offset + 1] = res.right;
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);
+	            M[offset] = res.left;
+	            M[offset + 1] = res.right;
+	        },
+
+	        blockSize: 64/32,
+
+	        keySize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);
+	     */
+	    C.Blowfish = BlockCipher._createHelper(Blowfish);
+	}());
+
+
+	return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/docs/QuickStartGuide.wiki b/node_modules/crypto-js/docs/QuickStartGuide.wiki
new file mode 100644
index 0000000..2bee35d
--- /dev/null
+++ b/node_modules/crypto-js/docs/QuickStartGuide.wiki
@@ -0,0 +1,470 @@
+<wiki:toc/>
+
+----
+
+= Quick-start Guide =
+
+== Hashers ==
+
+=== The Hasher Algorithms ===
+
+==== MD5 ====
+
+MD5 is a widely used hash function. It's been used in a variety of security applications and is also commonly used to check the integrity of files. Though, MD5 is not collision resistant, and it isn't suitable for applications like SSL certificates or digital signatures that rely on this property.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/md5.js"></script>
+<script>
+    var hash = CryptoJS.MD5("Message");
+</script>
+}}}
+
+==== SHA-1 ====
+
+The SHA hash functions were designed by the National Security Agency (NSA). SHA-1 is the most established of the existing SHA hash functions, and it's used in a variety of security applications and protocols. Though, SHA-1's collision resistance has been weakening as new attacks are discovered or improved.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha1.js"></script>
+<script>
+    var hash = CryptoJS.SHA1("Message");
+</script>
+}}}
+
+==== SHA-2 ====
+
+SHA-256 is one of the four variants in the SHA-2 set. It isn't as widely used as SHA-1, though it appears to provide much better security.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
+<script>
+    var hash = CryptoJS.SHA256("Message");
+</script>
+}}}
+
+SHA-512 is largely identical to SHA-256 but operates on 64-bit words rather than 32.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha512.js"></script>
+<script>
+    var hash = CryptoJS.SHA512("Message");
+</script>
+}}}
+
+CryptoJS also supports SHA-224 and SHA-384, which are largely identical but truncated versions of SHA-256 and SHA-512 respectively.
+
+==== SHA-3 ====
+
+SHA-3 is the winner of a five-year competition to select a new cryptographic hash algorithm where 64 competing designs were evaluated.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha3.js"></script>
+<script>
+    var hash = CryptoJS.SHA3("Message");
+</script>
+}}}
+
+SHA-3 can be configured to output hash lengths of one of 224, 256, 384, or 512 bits. The default is 512 bits.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha3.js"></script>
+<script>
+    var hash = CryptoJS.SHA3("Message", { outputLength: 512 });
+    var hash = CryptoJS.SHA3("Message", { outputLength: 384 });
+    var hash = CryptoJS.SHA3("Message", { outputLength: 256 });
+    var hash = CryptoJS.SHA3("Message", { outputLength: 224 });
+</script>
+}}}
+
+==== RIPEMD-160 ====
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/ripemd160.js"></script>
+<script>
+    var hash = CryptoJS.RIPEMD160("Message");
+</script>
+}}}
+
+=== The Hasher Input ===
+
+The hash algorithms accept either strings or instances of CryptoJS.lib.WordArray. A WordArray object represents an array of 32-bit words. When you pass a string, it's automatically converted to a WordArray encoded as UTF-8.
+
+=== The Hasher Output ===
+
+The hash you get back isn't a string yet. It's a WordArray object. When you use a WordArray object in a string context, it's automatically converted to a hex string.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
+<script>
+    var hash = CryptoJS.SHA256("Message");
+
+    alert(typeof hash); // object
+
+    alert(hash); // 2f77668a9dfbf8d5848b9eeb4a7145ca94c6ed9236e4a773f6dcafa5132b2f91
+</script>
+}}}
+
+You can convert a WordArray object to other formats by explicitly calling the toString method and passing an encoder.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/enc-base64-min.js"></script>
+<script>
+    var hash = CryptoJS.SHA256("Message");
+
+    alert(hash.toString(CryptoJS.enc.Base64)); // L3dmip37+NWEi57rSnFFypTG7ZI25Kdz9tyvpRMrL5E=
+
+    alert(hash.toString(CryptoJS.enc.Latin1)); // /wf��ûøÕ���ëJqEÊ�Æí�6ä§söܯ¥+/�
+
+    alert(hash.toString(CryptoJS.enc.Hex)); // 2f77668a9dfbf8d5848b9eeb4a7145ca94c6ed9236e4a773f6dcafa5132b2f91
+</script>
+}}}
+
+=== Progressive Hashing ===
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/sha256.js"></script>
+<script>
+    var sha256 = CryptoJS.algo.SHA256.create();
+
+    sha256.update("Message Part 1");
+    sha256.update("Message Part 2");
+    sha256.update("Message Part 3");
+
+    var hash = sha256.finalize();
+</script>
+}}}
+
+== HMAC ==
+
+Keyed-hash message authentication codes (HMAC) is a mechanism for message authentication using cryptographic hash functions.
+
+HMAC can be used in combination with any iterated cryptographic hash function.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-md5.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha256.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha512.js"></script>
+<script>
+    var hash = CryptoJS.HmacMD5("Message", "Secret Passphrase");
+    var hash = CryptoJS.HmacSHA1("Message", "Secret Passphrase");
+    var hash = CryptoJS.HmacSHA256("Message", "Secret Passphrase");
+    var hash = CryptoJS.HmacSHA512("Message", "Secret Passphrase");
+</script>
+}}}
+
+=== Progressive HMAC Hashing ===
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/hmac-sha256.js"></script>
+<script>
+    var hmac = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, "Secret Passphrase");
+
+    hmac.update("Message Part 1");
+    hmac.update("Message Part 2");
+    hmac.update("Message Part 3");
+
+    var hash = hmac.finalize();
+</script>
+}}}
+
+== PBKDF2 ==
+
+PBKDF2 is a password-based key derivation function. In many applications of cryptography, user security is ultimately dependent on a password, and because a password usually can't be used directly as a cryptographic key, some processing is required.
+
+A salt provides a large set of keys for any given password, and an iteration count increases the cost of producing keys from a password, thereby also increasing the difficulty of attack.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/pbkdf2.js"></script>
+<script>
+    var salt = CryptoJS.lib.WordArray.random(128/8);
+
+    var key128Bits = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 128/32 });
+    var key256Bits = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 256/32 });
+    var key512Bits = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 512/32 });
+
+    var key512Bits1000Iterations = CryptoJS.PBKDF2("Secret Passphrase", salt, { keySize: 512/32, iterations: 1000 });
+</script>
+}}}
+
+== Ciphers ==
+
+=== The Cipher Algorithms ===
+
+==== AES ====
+
+The Advanced Encryption Standard (AES) is a U.S. Federal Information Processing Standard (FIPS). It was selected after a 5-year process where 15 competing designs were evaluated.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script>
+    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase");
+
+    var decrypted = CryptoJS.AES.decrypt(encrypted, "Secret Passphrase");
+</script>
+}}}
+
+CryptoJS supports AES-128, AES-192, and AES-256. It will pick the variant by the size of the key you pass in. If you use a passphrase, then it will generate a 256-bit key.
+
+==== DES, Triple DES ====
+
+DES is a previously dominant algorithm for encryption, and was published as an official Federal Information Processing Standard (FIPS). DES is now considered to be insecure due to the small key size.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/tripledes.js"></script>
+<script>
+    var encrypted = CryptoJS.DES.encrypt("Message", "Secret Passphrase");
+
+    var decrypted = CryptoJS.DES.decrypt(encrypted, "Secret Passphrase");
+</script>
+}}}
+
+Triple DES applies DES three times to each block to increase the key size. The algorithm is believed to be secure in this form.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/tripledes.js"></script>
+<script>
+    var encrypted = CryptoJS.TripleDES.encrypt("Message", "Secret Passphrase");
+
+    var decrypted = CryptoJS.TripleDES.decrypt(encrypted, "Secret Passphrase");
+</script>
+}}}
+
+==== Rabbit ====
+
+Rabbit is a high-performance stream cipher and a finalist in the eSTREAM Portfolio. It is one of the four designs selected after a 3 1/2-year process where 22 designs were evaluated.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/rabbit.js"></script>
+<script>
+    var encrypted = CryptoJS.Rabbit.encrypt("Message", "Secret Passphrase");
+
+    var decrypted = CryptoJS.Rabbit.decrypt(encrypted, "Secret Passphrase");
+</script>
+}}}
+
+==== RC4, RC4Drop ====
+
+RC4 is a widely-used stream cipher. It's used in popular protocols such as SSL and WEP. Although remarkable for its simplicity and speed, the algorithm's history doesn't inspire confidence in its security.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/rc4.js"></script>
+<script>
+    var encrypted = CryptoJS.RC4.encrypt("Message", "Secret Passphrase");
+
+    var decrypted = CryptoJS.RC4.decrypt(encrypted, "Secret Passphrase");
+</script>
+}}}
+
+It was discovered that the first few bytes of keystream are strongly non-random and leak information about the key. We can defend against this attack by discarding the initial portion of the keystream. This modified algorithm is traditionally called RC4-drop.
+
+By default, 192 words (768 bytes) are dropped, but you can configure the algorithm to drop any number of words.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/rc4.js"></script>
+<script>
+    var encrypted = CryptoJS.RC4Drop.encrypt("Message", "Secret Passphrase");
+
+    var encrypted = CryptoJS.RC4Drop.encrypt("Message", "Secret Passphrase", { drop: 3072/4 });
+
+    var decrypted = CryptoJS.RC4Drop.decrypt(encrypted, "Secret Passphrase", { drop: 3072/4 });
+</script>
+}}}
+
+=== Custom Key and IV ===
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script>
+    var key = CryptoJS.enc.Hex.parse('000102030405060708090a0b0c0d0e0f');
+    var iv  = CryptoJS.enc.Hex.parse('101112131415161718191a1b1c1d1e1f');
+
+    var encrypted = CryptoJS.AES.encrypt("Message", key, { iv: iv });
+</script>
+}}}
+
+=== Block Modes and Padding ===
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/mode-cfb-min.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/pad-ansix923-min.js"></script>
+<script>
+    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase", { mode: CryptoJS.mode.CFB, padding: CryptoJS.pad.AnsiX923 });
+</script>
+}}}
+
+CryptoJS supports the following modes:
+
+  * CBC (the default)
+  * CFB
+  * CTR
+  * OFB
+  * ECB
+
+And CryptoJS supports the following padding schemes:
+
+  * Pkcs7 (the default)
+  * Iso97971
+  * AnsiX923
+  * Iso10126
+  * ZeroPadding
+  * NoPadding
+
+=== The Cipher Input ===
+
+For the plaintext message, the cipher algorithms accept either strings or instances of CryptoJS.lib.WordArray.
+
+For the key, when you pass a string, it's treated as a passphrase and used to derive an actual key and IV. Or you can pass a WordArray that represents the actual key. If you pass the actual key, you must also pass the actual IV.
+
+For the ciphertext, the cipher algorithms accept either strings or instances of CryptoJS.lib.CipherParams. A CipherParams object represents a collection of parameters such as the IV, a salt, and the raw ciphertext itself. When you pass a string, it's automatically converted to a CipherParams object according to a configurable format strategy.
+
+=== The Cipher Output ===
+
+The plaintext you get back after decryption is a WordArray object. See Hashers' Output for more detail.
+
+The ciphertext you get back after encryption isn't a string yet. It's a CipherParams object. A CipherParams object gives you access to all the parameters used during encryption. When you use a CipherParams object in a string context, it's automatically converted to a string according to a format strategy. The default is an OpenSSL-compatible format.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script>
+    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase");
+
+    alert(encrypted.key);        // 74eb593087a982e2a6f5dded54ecd96d1fd0f3d44a58728cdcd40c55227522223
+    alert(encrypted.iv);         // 7781157e2629b094f0e3dd48c4d786115
+    alert(encrypted.salt);       // 7a25f9132ec6a8b34
+    alert(encrypted.ciphertext); // 73e54154a15d1beeb509d9e12f1e462a0
+
+    alert(encrypted);            // U2FsdGVkX1+iX5Ey7GqLND5UFUoV0b7rUJ2eEvHkYqA=
+</script>
+}}}
+
+You can define your own formats in order to be compatible with other crypto implementations. A format is an object with two methods—stringify and parse—that converts between CipherParams objects and ciphertext strings.
+
+Here's how you might write a JSON formatter:
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script>
+    var JsonFormatter = {
+        stringify: function (cipherParams) {
+            // create json object with ciphertext
+            var jsonObj = {
+                ct: cipherParams.ciphertext.toString(CryptoJS.enc.Base64)
+            };
+
+            // optionally add iv and salt
+            if (cipherParams.iv) {
+                jsonObj.iv = cipherParams.iv.toString();
+            }
+            if (cipherParams.salt) {
+                jsonObj.s = cipherParams.salt.toString();
+            }
+
+            // stringify json object
+            return JSON.stringify(jsonObj);
+        },
+
+        parse: function (jsonStr) {
+            // parse json string
+            var jsonObj = JSON.parse(jsonStr);
+
+            // extract ciphertext from json object, and create cipher params object
+            var cipherParams = CryptoJS.lib.CipherParams.create({
+                ciphertext: CryptoJS.enc.Base64.parse(jsonObj.ct)
+            });
+
+            // optionally extract iv and salt
+            if (jsonObj.iv) {
+                cipherParams.iv = CryptoJS.enc.Hex.parse(jsonObj.iv)
+            }
+            if (jsonObj.s) {
+                cipherParams.salt = CryptoJS.enc.Hex.parse(jsonObj.s)
+            }
+
+            return cipherParams;
+        }
+    };
+
+    var encrypted = CryptoJS.AES.encrypt("Message", "Secret Passphrase", { format: JsonFormatter });
+
+    alert(encrypted); // {"ct":"tZ4MsEnfbcDOwqau68aOrQ==","iv":"8a8c8fd8fe33743d3638737ea4a00698","s":"ba06373c8f57179c"}
+
+    var decrypted = CryptoJS.AES.decrypt(encrypted, "Secret Passphrase", { format: JsonFormatter });
+
+    alert(decrypted.toString(CryptoJS.enc.Utf8)); // Message
+</script>
+}}}
+
+=== Progressive Ciphering ===
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script>
+    var key = CryptoJS.enc.Hex.parse('000102030405060708090a0b0c0d0e0f');
+    var iv  = CryptoJS.enc.Hex.parse('101112131415161718191a1b1c1d1e1f');
+
+    var aesEncryptor = CryptoJS.algo.AES.createEncryptor(key, { iv: iv });
+
+    var ciphertextPart1 = aesEncryptor.process("Message Part 1");
+    var ciphertextPart2 = aesEncryptor.process("Message Part 2");
+    var ciphertextPart3 = aesEncryptor.process("Message Part 3");
+    var ciphertextPart4 = aesEncryptor.finalize();
+
+    var aesDecryptor = CryptoJS.algo.AES.createDecryptor(key, { iv: iv });
+
+    var plaintextPart1 = aesDecryptor.process(ciphertextPart1);
+    var plaintextPart2 = aesDecryptor.process(ciphertextPart2);
+    var plaintextPart3 = aesDecryptor.process(ciphertextPart3);
+    var plaintextPart4 = aesDecryptor.process(ciphertextPart4);
+    var plaintextPart5 = aesDecryptor.finalize();
+</script>
+}}}
+
+=== Interoperability ===
+
+==== With OpenSSL ====
+
+Encrypt with OpenSSL:
+
+{{{
+openssl enc -aes-256-cbc -in infile -out outfile -pass pass:"Secret Passphrase" -e -base64
+}}}
+
+Decrypt with CryptoJS:
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/rollups/aes.js"></script>
+<script>
+    var decrypted = CryptoJS.AES.decrypt(openSSLEncrypted, "Secret Passphrase");
+</script>
+}}}
+
+== Encoders ==
+
+CryptoJS can convert from encoding formats such as Base64, Latin1 or Hex to WordArray objects and vica versa.
+
+{{{
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/core-min.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/enc-utf16-min.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1/build/components/enc-base64-min.js"></script>
+<script>
+    var words  = CryptoJS.enc.Base64.parse('SGVsbG8sIFdvcmxkIQ==');
+    var base64 = CryptoJS.enc.Base64.stringify(words);
+
+    var words  = CryptoJS.enc.Latin1.parse('Hello, World!');
+    var latin1 = CryptoJS.enc.Latin1.stringify(words);
+
+    var words = CryptoJS.enc.Hex.parse('48656c6c6f2c20576f726c6421');
+    var hex   = CryptoJS.enc.Hex.stringify(words);
+
+    var words = CryptoJS.enc.Utf8.parse('𤭢');
+    var utf8  = CryptoJS.enc.Utf8.stringify(words);
+
+    var words = CryptoJS.enc.Utf16.parse('Hello, World!');
+    var utf16 = CryptoJS.enc.Utf16.stringify(words);
+
+    var words = CryptoJS.enc.Utf16LE.parse('Hello, World!');
+    var utf16 = CryptoJS.enc.Utf16LE.stringify(words);
+</script>
+}}}
\ No newline at end of file
diff --git a/node_modules/crypto-js/enc-base64.js b/node_modules/crypto-js/enc-base64.js
new file mode 100644
index 0000000..0ffcd53
--- /dev/null
+++ b/node_modules/crypto-js/enc-base64.js
@@ -0,0 +1,136 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * Base64 encoding strategy.
+	     */
+	    var Base64 = C_enc.Base64 = {
+	        /**
+	         * Converts a word array to a Base64 string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The Base64 string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+	            var map = this._map;
+
+	            // Clamp excess bits
+	            wordArray.clamp();
+
+	            // Convert
+	            var base64Chars = [];
+	            for (var i = 0; i < sigBytes; i += 3) {
+	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
+	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+	                }
+	            }
+
+	            // Add padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                while (base64Chars.length % 4) {
+	                    base64Chars.push(paddingChar);
+	                }
+	            }
+
+	            return base64Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Base64 string to a word array.
+	         *
+	         * @param {string} base64Str The Base64 string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
+	         */
+	        parse: function (base64Str) {
+	            // Shortcuts
+	            var base64StrLength = base64Str.length;
+	            var map = this._map;
+	            var reverseMap = this._reverseMap;
+
+	            if (!reverseMap) {
+	                    reverseMap = this._reverseMap = [];
+	                    for (var j = 0; j < map.length; j++) {
+	                        reverseMap[map.charCodeAt(j)] = j;
+	                    }
+	            }
+
+	            // Ignore padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                var paddingIndex = base64Str.indexOf(paddingChar);
+	                if (paddingIndex !== -1) {
+	                    base64StrLength = paddingIndex;
+	                }
+	            }
+
+	            // Convert
+	            return parseLoop(base64Str, base64StrLength, reverseMap);
+
+	        },
+
+	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+	    };
+
+	    function parseLoop(base64Str, base64StrLength, reverseMap) {
+	      var words = [];
+	      var nBytes = 0;
+	      for (var i = 0; i < base64StrLength; i++) {
+	          if (i % 4) {
+	              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+	              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+	              var bitsCombined = bits1 | bits2;
+	              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+	              nBytes++;
+	          }
+	      }
+	      return WordArray.create(words, nBytes);
+	    }
+	}());
+
+
+	return CryptoJS.enc.Base64;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/enc-base64url.js b/node_modules/crypto-js/enc-base64url.js
new file mode 100644
index 0000000..af682e3
--- /dev/null
+++ b/node_modules/crypto-js/enc-base64url.js
@@ -0,0 +1,148 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * Base64url encoding strategy.
+	     */
+	    var Base64url = C_enc.Base64url = {
+	        /**
+	         * Converts a word array to a Base64url string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @param {boolean} urlSafe Whether to use url safe
+	         *
+	         * @return {string} The Base64url string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
+	         */
+	        stringify: function (wordArray, urlSafe) {
+	            if (urlSafe === undefined) {
+	                urlSafe = true
+	            }
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+	            var map = urlSafe ? this._safe_map : this._map;
+
+	            // Clamp excess bits
+	            wordArray.clamp();
+
+	            // Convert
+	            var base64Chars = [];
+	            for (var i = 0; i < sigBytes; i += 3) {
+	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
+	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+	                }
+	            }
+
+	            // Add padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                while (base64Chars.length % 4) {
+	                    base64Chars.push(paddingChar);
+	                }
+	            }
+
+	            return base64Chars.join('');
+	        },
+
+	        /**
+	         * Converts a Base64url string to a word array.
+	         *
+	         * @param {string} base64Str The Base64url string.
+	         *
+	         * @param {boolean} urlSafe Whether to use url safe
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);
+	         */
+	        parse: function (base64Str, urlSafe) {
+	            if (urlSafe === undefined) {
+	                urlSafe = true
+	            }
+
+	            // Shortcuts
+	            var base64StrLength = base64Str.length;
+	            var map = urlSafe ? this._safe_map : this._map;
+	            var reverseMap = this._reverseMap;
+
+	            if (!reverseMap) {
+	                reverseMap = this._reverseMap = [];
+	                for (var j = 0; j < map.length; j++) {
+	                    reverseMap[map.charCodeAt(j)] = j;
+	                }
+	            }
+
+	            // Ignore padding
+	            var paddingChar = map.charAt(64);
+	            if (paddingChar) {
+	                var paddingIndex = base64Str.indexOf(paddingChar);
+	                if (paddingIndex !== -1) {
+	                    base64StrLength = paddingIndex;
+	                }
+	            }
+
+	            // Convert
+	            return parseLoop(base64Str, base64StrLength, reverseMap);
+
+	        },
+
+	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+	        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+	    };
+
+	    function parseLoop(base64Str, base64StrLength, reverseMap) {
+	        var words = [];
+	        var nBytes = 0;
+	        for (var i = 0; i < base64StrLength; i++) {
+	            if (i % 4) {
+	                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+	                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+	                var bitsCombined = bits1 | bits2;
+	                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+	                nBytes++;
+	            }
+	        }
+	        return WordArray.create(words, nBytes);
+	    }
+	}());
+
+
+	return CryptoJS.enc.Base64url;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/enc-hex.js b/node_modules/crypto-js/enc-hex.js
new file mode 100644
index 0000000..88161ff
--- /dev/null
+++ b/node_modules/crypto-js/enc-hex.js
@@ -0,0 +1,18 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.enc.Hex;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/enc-latin1.js b/node_modules/crypto-js/enc-latin1.js
new file mode 100644
index 0000000..ade56dc
--- /dev/null
+++ b/node_modules/crypto-js/enc-latin1.js
@@ -0,0 +1,18 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.enc.Latin1;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/enc-utf16.js b/node_modules/crypto-js/enc-utf16.js
new file mode 100644
index 0000000..7de6245
--- /dev/null
+++ b/node_modules/crypto-js/enc-utf16.js
@@ -0,0 +1,149 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_enc = C.enc;
+
+	    /**
+	     * UTF-16 BE encoding strategy.
+	     */
+	    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+	        /**
+	         * Converts a word array to a UTF-16 BE string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-16 BE string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var utf16Chars = [];
+	            for (var i = 0; i < sigBytes; i += 2) {
+	                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+	                utf16Chars.push(String.fromCharCode(codePoint));
+	            }
+
+	            return utf16Chars.join('');
+	        },
+
+	        /**
+	         * Converts a UTF-16 BE string to a word array.
+	         *
+	         * @param {string} utf16Str The UTF-16 BE string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+	         */
+	        parse: function (utf16Str) {
+	            // Shortcut
+	            var utf16StrLength = utf16Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < utf16StrLength; i++) {
+	                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+	            }
+
+	            return WordArray.create(words, utf16StrLength * 2);
+	        }
+	    };
+
+	    /**
+	     * UTF-16 LE encoding strategy.
+	     */
+	    C_enc.Utf16LE = {
+	        /**
+	         * Converts a word array to a UTF-16 LE string.
+	         *
+	         * @param {WordArray} wordArray The word array.
+	         *
+	         * @return {string} The UTF-16 LE string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+	         */
+	        stringify: function (wordArray) {
+	            // Shortcuts
+	            var words = wordArray.words;
+	            var sigBytes = wordArray.sigBytes;
+
+	            // Convert
+	            var utf16Chars = [];
+	            for (var i = 0; i < sigBytes; i += 2) {
+	                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+	                utf16Chars.push(String.fromCharCode(codePoint));
+	            }
+
+	            return utf16Chars.join('');
+	        },
+
+	        /**
+	         * Converts a UTF-16 LE string to a word array.
+	         *
+	         * @param {string} utf16Str The UTF-16 LE string.
+	         *
+	         * @return {WordArray} The word array.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+	         */
+	        parse: function (utf16Str) {
+	            // Shortcut
+	            var utf16StrLength = utf16Str.length;
+
+	            // Convert
+	            var words = [];
+	            for (var i = 0; i < utf16StrLength; i++) {
+	                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+	            }
+
+	            return WordArray.create(words, utf16StrLength * 2);
+	        }
+	    };
+
+	    function swapEndian(word) {
+	        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+	    }
+	}());
+
+
+	return CryptoJS.enc.Utf16;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/enc-utf8.js b/node_modules/crypto-js/enc-utf8.js
new file mode 100644
index 0000000..e7a251d
--- /dev/null
+++ b/node_modules/crypto-js/enc-utf8.js
@@ -0,0 +1,18 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.enc.Utf8;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/evpkdf.js b/node_modules/crypto-js/evpkdf.js
new file mode 100644
index 0000000..578974a
--- /dev/null
+++ b/node_modules/crypto-js/evpkdf.js
@@ -0,0 +1,134 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha1", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var MD5 = C_algo.MD5;
+
+	    /**
+	     * This key derivation function is meant to conform with EVP_BytesToKey.
+	     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+	     */
+	    var EvpKDF = C_algo.EvpKDF = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+	         * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+	         * @property {number} iterations The number of iterations to perform. Default: 1
+	         */
+	        cfg: Base.extend({
+	            keySize: 128/32,
+	            hasher: MD5,
+	            iterations: 1
+	        }),
+
+	        /**
+	         * Initializes a newly created key derivation function.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+	         *
+	         * @example
+	         *
+	         *     var kdf = CryptoJS.algo.EvpKDF.create();
+	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+	         */
+	        init: function (cfg) {
+	            this.cfg = this.cfg.extend(cfg);
+	        },
+
+	        /**
+	         * Derives a key from a password.
+	         *
+	         * @param {WordArray|string} password The password.
+	         * @param {WordArray|string} salt A salt.
+	         *
+	         * @return {WordArray} The derived key.
+	         *
+	         * @example
+	         *
+	         *     var key = kdf.compute(password, salt);
+	         */
+	        compute: function (password, salt) {
+	            var block;
+
+	            // Shortcut
+	            var cfg = this.cfg;
+
+	            // Init hasher
+	            var hasher = cfg.hasher.create();
+
+	            // Initial values
+	            var derivedKey = WordArray.create();
+
+	            // Shortcuts
+	            var derivedKeyWords = derivedKey.words;
+	            var keySize = cfg.keySize;
+	            var iterations = cfg.iterations;
+
+	            // Generate key
+	            while (derivedKeyWords.length < keySize) {
+	                if (block) {
+	                    hasher.update(block);
+	                }
+	                block = hasher.update(password).finalize(salt);
+	                hasher.reset();
+
+	                // Iterations
+	                for (var i = 1; i < iterations; i++) {
+	                    block = hasher.finalize(block);
+	                    hasher.reset();
+	                }
+
+	                derivedKey.concat(block);
+	            }
+	            derivedKey.sigBytes = keySize * 4;
+
+	            return derivedKey;
+	        }
+	    });
+
+	    /**
+	     * Derives a key from a password.
+	     *
+	     * @param {WordArray|string} password The password.
+	     * @param {WordArray|string} salt A salt.
+	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+	     *
+	     * @return {WordArray} The derived key.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var key = CryptoJS.EvpKDF(password, salt);
+	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+	     */
+	    C.EvpKDF = function (password, salt, cfg) {
+	        return EvpKDF.create(cfg).compute(password, salt);
+	    };
+	}());
+
+
+	return CryptoJS.EvpKDF;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/format-hex.js b/node_modules/crypto-js/format-hex.js
new file mode 100644
index 0000000..2e9a861
--- /dev/null
+++ b/node_modules/crypto-js/format-hex.js
@@ -0,0 +1,66 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var CipherParams = C_lib.CipherParams;
+	    var C_enc = C.enc;
+	    var Hex = C_enc.Hex;
+	    var C_format = C.format;
+
+	    var HexFormatter = C_format.Hex = {
+	        /**
+	         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+	         *
+	         * @param {CipherParams} cipherParams The cipher params object.
+	         *
+	         * @return {string} The hexadecimally encoded string.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+	         */
+	        stringify: function (cipherParams) {
+	            return cipherParams.ciphertext.toString(Hex);
+	        },
+
+	        /**
+	         * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+	         *
+	         * @param {string} input The hexadecimally encoded string.
+	         *
+	         * @return {CipherParams} The cipher params object.
+	         *
+	         * @static
+	         *
+	         * @example
+	         *
+	         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
+	         */
+	        parse: function (input) {
+	            var ciphertext = Hex.parse(input);
+	            return CipherParams.create({ ciphertext: ciphertext });
+	        }
+	    };
+	}());
+
+
+	return CryptoJS.format.Hex;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/format-openssl.js b/node_modules/crypto-js/format-openssl.js
new file mode 100644
index 0000000..3373edc
--- /dev/null
+++ b/node_modules/crypto-js/format-openssl.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.format.OpenSSL;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-md5.js b/node_modules/crypto-js/hmac-md5.js
new file mode 100644
index 0000000..ad7a90a
--- /dev/null
+++ b/node_modules/crypto-js/hmac-md5.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./md5"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./md5", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacMD5;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-ripemd160.js b/node_modules/crypto-js/hmac-ripemd160.js
new file mode 100644
index 0000000..73d55a7
--- /dev/null
+++ b/node_modules/crypto-js/hmac-ripemd160.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./ripemd160"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./ripemd160", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacRIPEMD160;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-sha1.js b/node_modules/crypto-js/hmac-sha1.js
new file mode 100644
index 0000000..0b570cb
--- /dev/null
+++ b/node_modules/crypto-js/hmac-sha1.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha1", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacSHA1;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-sha224.js b/node_modules/crypto-js/hmac-sha224.js
new file mode 100644
index 0000000..3778863
--- /dev/null
+++ b/node_modules/crypto-js/hmac-sha224.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha256"), require("./sha224"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha256", "./sha224", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacSHA224;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-sha256.js b/node_modules/crypto-js/hmac-sha256.js
new file mode 100644
index 0000000..33b0c9f
--- /dev/null
+++ b/node_modules/crypto-js/hmac-sha256.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha256"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha256", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacSHA256;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-sha3.js b/node_modules/crypto-js/hmac-sha3.js
new file mode 100644
index 0000000..1248804
--- /dev/null
+++ b/node_modules/crypto-js/hmac-sha3.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha3"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./sha3", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacSHA3;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-sha384.js b/node_modules/crypto-js/hmac-sha384.js
new file mode 100644
index 0000000..0036e2b
--- /dev/null
+++ b/node_modules/crypto-js/hmac-sha384.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"), require("./sha384"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./sha512", "./sha384", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacSHA384;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac-sha512.js b/node_modules/crypto-js/hmac-sha512.js
new file mode 100644
index 0000000..c1005b6
--- /dev/null
+++ b/node_modules/crypto-js/hmac-sha512.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./sha512", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.HmacSHA512;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/hmac.js b/node_modules/crypto-js/hmac.js
new file mode 100644
index 0000000..8c09851
--- /dev/null
+++ b/node_modules/crypto-js/hmac.js
@@ -0,0 +1,143 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var C_enc = C.enc;
+	    var Utf8 = C_enc.Utf8;
+	    var C_algo = C.algo;
+
+	    /**
+	     * HMAC algorithm.
+	     */
+	    var HMAC = C_algo.HMAC = Base.extend({
+	        /**
+	         * Initializes a newly created HMAC.
+	         *
+	         * @param {Hasher} hasher The hash algorithm to use.
+	         * @param {WordArray|string} key The secret key.
+	         *
+	         * @example
+	         *
+	         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+	         */
+	        init: function (hasher, key) {
+	            // Init hasher
+	            hasher = this._hasher = new hasher.init();
+
+	            // Convert string to WordArray, else assume WordArray already
+	            if (typeof key == 'string') {
+	                key = Utf8.parse(key);
+	            }
+
+	            // Shortcuts
+	            var hasherBlockSize = hasher.blockSize;
+	            var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+	            // Allow arbitrary length keys
+	            if (key.sigBytes > hasherBlockSizeBytes) {
+	                key = hasher.finalize(key);
+	            }
+
+	            // Clamp excess bits
+	            key.clamp();
+
+	            // Clone key for inner and outer pads
+	            var oKey = this._oKey = key.clone();
+	            var iKey = this._iKey = key.clone();
+
+	            // Shortcuts
+	            var oKeyWords = oKey.words;
+	            var iKeyWords = iKey.words;
+
+	            // XOR keys with pad constants
+	            for (var i = 0; i < hasherBlockSize; i++) {
+	                oKeyWords[i] ^= 0x5c5c5c5c;
+	                iKeyWords[i] ^= 0x36363636;
+	            }
+	            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+	            // Set initial values
+	            this.reset();
+	        },
+
+	        /**
+	         * Resets this HMAC to its initial state.
+	         *
+	         * @example
+	         *
+	         *     hmacHasher.reset();
+	         */
+	        reset: function () {
+	            // Shortcut
+	            var hasher = this._hasher;
+
+	            // Reset
+	            hasher.reset();
+	            hasher.update(this._iKey);
+	        },
+
+	        /**
+	         * Updates this HMAC with a message.
+	         *
+	         * @param {WordArray|string} messageUpdate The message to append.
+	         *
+	         * @return {HMAC} This HMAC instance.
+	         *
+	         * @example
+	         *
+	         *     hmacHasher.update('message');
+	         *     hmacHasher.update(wordArray);
+	         */
+	        update: function (messageUpdate) {
+	            this._hasher.update(messageUpdate);
+
+	            // Chainable
+	            return this;
+	        },
+
+	        /**
+	         * Finalizes the HMAC computation.
+	         * Note that the finalize operation is effectively a destructive, read-once operation.
+	         *
+	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
+	         *
+	         * @return {WordArray} The HMAC.
+	         *
+	         * @example
+	         *
+	         *     var hmac = hmacHasher.finalize();
+	         *     var hmac = hmacHasher.finalize('message');
+	         *     var hmac = hmacHasher.finalize(wordArray);
+	         */
+	        finalize: function (messageUpdate) {
+	            // Shortcut
+	            var hasher = this._hasher;
+
+	            // Compute HMAC
+	            var innerHash = hasher.finalize(messageUpdate);
+	            hasher.reset();
+	            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+	            return hmac;
+	        }
+	    });
+	}());
+
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/index.js b/node_modules/crypto-js/index.js
new file mode 100644
index 0000000..b696646
--- /dev/null
+++ b/node_modules/crypto-js/index.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./lib-typedarrays"), require("./enc-utf16"), require("./enc-base64"), require("./enc-base64url"), require("./md5"), require("./sha1"), require("./sha256"), require("./sha224"), require("./sha512"), require("./sha384"), require("./sha3"), require("./ripemd160"), require("./hmac"), require("./pbkdf2"), require("./evpkdf"), require("./cipher-core"), require("./mode-cfb"), require("./mode-ctr"), require("./mode-ctr-gladman"), require("./mode-ofb"), require("./mode-ecb"), require("./pad-ansix923"), require("./pad-iso10126"), require("./pad-iso97971"), require("./pad-zeropadding"), require("./pad-nopadding"), require("./format-hex"), require("./aes"), require("./tripledes"), require("./rc4"), require("./rabbit"), require("./rabbit-legacy"), require("./blowfish"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./lib-typedarrays", "./enc-utf16", "./enc-base64", "./enc-base64url", "./md5", "./sha1", "./sha256", "./sha224", "./sha512", "./sha384", "./sha3", "./ripemd160", "./hmac", "./pbkdf2", "./evpkdf", "./cipher-core", "./mode-cfb", "./mode-ctr", "./mode-ctr-gladman", "./mode-ofb", "./mode-ecb", "./pad-ansix923", "./pad-iso10126", "./pad-iso97971", "./pad-zeropadding", "./pad-nopadding", "./format-hex", "./aes", "./tripledes", "./rc4", "./rabbit", "./rabbit-legacy", "./blowfish"], factory);
+	}
+	else {
+		// Global (browser)
+		root.CryptoJS = factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/lib-typedarrays.js b/node_modules/crypto-js/lib-typedarrays.js
new file mode 100644
index 0000000..264b210
--- /dev/null
+++ b/node_modules/crypto-js/lib-typedarrays.js
@@ -0,0 +1,76 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Check if typed arrays are supported
+	    if (typeof ArrayBuffer != 'function') {
+	        return;
+	    }
+
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+
+	    // Reference original init
+	    var superInit = WordArray.init;
+
+	    // Augment WordArray.init to handle typed arrays
+	    var subInit = WordArray.init = function (typedArray) {
+	        // Convert buffers to uint8
+	        if (typedArray instanceof ArrayBuffer) {
+	            typedArray = new Uint8Array(typedArray);
+	        }
+
+	        // Convert other array views to uint8
+	        if (
+	            typedArray instanceof Int8Array ||
+	            (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+	            typedArray instanceof Int16Array ||
+	            typedArray instanceof Uint16Array ||
+	            typedArray instanceof Int32Array ||
+	            typedArray instanceof Uint32Array ||
+	            typedArray instanceof Float32Array ||
+	            typedArray instanceof Float64Array
+	        ) {
+	            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+	        }
+
+	        // Handle Uint8Array
+	        if (typedArray instanceof Uint8Array) {
+	            // Shortcut
+	            var typedArrayByteLength = typedArray.byteLength;
+
+	            // Extract bytes
+	            var words = [];
+	            for (var i = 0; i < typedArrayByteLength; i++) {
+	                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+	            }
+
+	            // Initialize this word array
+	            superInit.call(this, words, typedArrayByteLength);
+	        } else {
+	            // Else call normal init
+	            superInit.apply(this, arguments);
+	        }
+	    };
+
+	    subInit.prototype = WordArray;
+	}());
+
+
+	return CryptoJS.lib.WordArray;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/md5.js b/node_modules/crypto-js/md5.js
new file mode 100644
index 0000000..72fce03
--- /dev/null
+++ b/node_modules/crypto-js/md5.js
@@ -0,0 +1,268 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var T = [];
+
+	    // Compute constants
+	    (function () {
+	        for (var i = 0; i < 64; i++) {
+	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+	        }
+	    }());
+
+	    /**
+	     * MD5 hash algorithm.
+	     */
+	    var MD5 = C_algo.MD5 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var M_offset_0  = M[offset + 0];
+	            var M_offset_1  = M[offset + 1];
+	            var M_offset_2  = M[offset + 2];
+	            var M_offset_3  = M[offset + 3];
+	            var M_offset_4  = M[offset + 4];
+	            var M_offset_5  = M[offset + 5];
+	            var M_offset_6  = M[offset + 6];
+	            var M_offset_7  = M[offset + 7];
+	            var M_offset_8  = M[offset + 8];
+	            var M_offset_9  = M[offset + 9];
+	            var M_offset_10 = M[offset + 10];
+	            var M_offset_11 = M[offset + 11];
+	            var M_offset_12 = M[offset + 12];
+	            var M_offset_13 = M[offset + 13];
+	            var M_offset_14 = M[offset + 14];
+	            var M_offset_15 = M[offset + 15];
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+
+	            // Computation
+	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
+	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
+	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
+	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
+	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
+	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
+	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
+	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
+	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
+	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
+	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
+	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
+	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
+	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
+	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
+	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
+	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
+	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
+	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
+	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
+	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
+	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
+	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
+	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
+	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
+	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
+	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
+	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
+	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
+	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
+	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
+	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
+	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
+	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
+	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
+
+	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
+	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
+	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
+	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
+	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
+	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
+	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
+	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
+	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
+	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
+	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
+	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
+	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
+	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
+	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
+	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+	            var nBitsTotalL = nBitsTotal;
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
+	            );
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
+	            );
+
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    function FF(a, b, c, d, x, s, t) {
+	        var n = a + ((b & c) | (~b & d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function GG(a, b, c, d, x, s, t) {
+	        var n = a + ((b & d) | (c & ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function HH(a, b, c, d, x, s, t) {
+	        var n = a + (b ^ c ^ d) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    function II(a, b, c, d, x, s, t) {
+	        var n = a + (c ^ (b | ~d)) + x + t;
+	        return ((n << s) | (n >>> (32 - s))) + b;
+	    }
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.MD5('message');
+	     *     var hash = CryptoJS.MD5(wordArray);
+	     */
+	    C.MD5 = Hasher._createHelper(MD5);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacMD5(message, key);
+	     */
+	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
+	}(Math));
+
+
+	return CryptoJS.MD5;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/mode-cfb.js b/node_modules/crypto-js/mode-cfb.js
new file mode 100644
index 0000000..444c9cb
--- /dev/null
+++ b/node_modules/crypto-js/mode-cfb.js
@@ -0,0 +1,80 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Cipher Feedback block mode.
+	 */
+	CryptoJS.mode.CFB = (function () {
+	    var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    CFB.Encryptor = CFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher;
+	            var blockSize = cipher.blockSize;
+
+	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+	            // Remember this block to use with next block
+	            this._prevBlock = words.slice(offset, offset + blockSize);
+	        }
+	    });
+
+	    CFB.Decryptor = CFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher;
+	            var blockSize = cipher.blockSize;
+
+	            // Remember this block to use with next block
+	            var thisBlock = words.slice(offset, offset + blockSize);
+
+	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+	            // This block becomes the previous block
+	            this._prevBlock = thisBlock;
+	        }
+	    });
+
+	    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+	        var keystream;
+
+	        // Shortcut
+	        var iv = this._iv;
+
+	        // Generate keystream
+	        if (iv) {
+	            keystream = iv.slice(0);
+
+	            // Remove IV for subsequent blocks
+	            this._iv = undefined;
+	        } else {
+	            keystream = this._prevBlock;
+	        }
+	        cipher.encryptBlock(keystream, 0);
+
+	        // Encrypt
+	        for (var i = 0; i < blockSize; i++) {
+	            words[offset + i] ^= keystream[i];
+	        }
+	    }
+
+	    return CFB;
+	}());
+
+
+	return CryptoJS.mode.CFB;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/mode-ctr-gladman.js b/node_modules/crypto-js/mode-ctr-gladman.js
new file mode 100644
index 0000000..bbc5687
--- /dev/null
+++ b/node_modules/crypto-js/mode-ctr-gladman.js
@@ -0,0 +1,116 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/** @preserve
+	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
+	 * derived from CryptoJS.mode.CTR
+	 * Jan Hruby jhruby.web@gmail.com
+	 */
+	CryptoJS.mode.CTRGladman = (function () {
+	    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+		function incWord(word)
+		{
+			if (((word >> 24) & 0xff) === 0xff) { //overflow
+			var b1 = (word >> 16)&0xff;
+			var b2 = (word >> 8)&0xff;
+			var b3 = word & 0xff;
+
+			if (b1 === 0xff) // overflow b1
+			{
+			b1 = 0;
+			if (b2 === 0xff)
+			{
+				b2 = 0;
+				if (b3 === 0xff)
+				{
+					b3 = 0;
+				}
+				else
+				{
+					++b3;
+				}
+			}
+			else
+			{
+				++b2;
+			}
+			}
+			else
+			{
+			++b1;
+			}
+
+			word = 0;
+			word += (b1 << 16);
+			word += (b2 << 8);
+			word += b3;
+			}
+			else
+			{
+			word += (0x01 << 24);
+			}
+			return word;
+		}
+
+		function incCounter(counter)
+		{
+			if ((counter[0] = incWord(counter[0])) === 0)
+			{
+				// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
+				counter[1] = incWord(counter[1]);
+			}
+			return counter;
+		}
+
+	    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var counter = this._counter;
+
+	            // Generate keystream
+	            if (iv) {
+	                counter = this._counter = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+
+				incCounter(counter);
+
+				var keystream = counter.slice(0);
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    CTRGladman.Decryptor = Encryptor;
+
+	    return CTRGladman;
+	}());
+
+
+
+
+	return CryptoJS.mode.CTRGladman;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/mode-ctr.js b/node_modules/crypto-js/mode-ctr.js
new file mode 100644
index 0000000..c3d470a
--- /dev/null
+++ b/node_modules/crypto-js/mode-ctr.js
@@ -0,0 +1,58 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Counter block mode.
+	 */
+	CryptoJS.mode.CTR = (function () {
+	    var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+	    var Encryptor = CTR.Encryptor = CTR.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var counter = this._counter;
+
+	            // Generate keystream
+	            if (iv) {
+	                counter = this._counter = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+	            var keystream = counter.slice(0);
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Increment counter
+	            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    CTR.Decryptor = Encryptor;
+
+	    return CTR;
+	}());
+
+
+	return CryptoJS.mode.CTR;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/mode-ecb.js b/node_modules/crypto-js/mode-ecb.js
new file mode 100644
index 0000000..ff06921
--- /dev/null
+++ b/node_modules/crypto-js/mode-ecb.js
@@ -0,0 +1,40 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Electronic Codebook block mode.
+	 */
+	CryptoJS.mode.ECB = (function () {
+	    var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    ECB.Encryptor = ECB.extend({
+	        processBlock: function (words, offset) {
+	            this._cipher.encryptBlock(words, offset);
+	        }
+	    });
+
+	    ECB.Decryptor = ECB.extend({
+	        processBlock: function (words, offset) {
+	            this._cipher.decryptBlock(words, offset);
+	        }
+	    });
+
+	    return ECB;
+	}());
+
+
+	return CryptoJS.mode.ECB;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/mode-ofb.js b/node_modules/crypto-js/mode-ofb.js
new file mode 100644
index 0000000..c01314c
--- /dev/null
+++ b/node_modules/crypto-js/mode-ofb.js
@@ -0,0 +1,54 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Output Feedback block mode.
+	 */
+	CryptoJS.mode.OFB = (function () {
+	    var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+	    var Encryptor = OFB.Encryptor = OFB.extend({
+	        processBlock: function (words, offset) {
+	            // Shortcuts
+	            var cipher = this._cipher
+	            var blockSize = cipher.blockSize;
+	            var iv = this._iv;
+	            var keystream = this._keystream;
+
+	            // Generate keystream
+	            if (iv) {
+	                keystream = this._keystream = iv.slice(0);
+
+	                // Remove IV for subsequent blocks
+	                this._iv = undefined;
+	            }
+	            cipher.encryptBlock(keystream, 0);
+
+	            // Encrypt
+	            for (var i = 0; i < blockSize; i++) {
+	                words[offset + i] ^= keystream[i];
+	            }
+	        }
+	    });
+
+	    OFB.Decryptor = Encryptor;
+
+	    return OFB;
+	}());
+
+
+	return CryptoJS.mode.OFB;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/package.json b/node_modules/crypto-js/package.json
new file mode 100644
index 0000000..32d39df
--- /dev/null
+++ b/node_modules/crypto-js/package.json
@@ -0,0 +1,71 @@
+{
+  "_from": "crypto-js",
+  "_id": "crypto-js@4.2.0",
+  "_inBundle": false,
+  "_integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+  "_location": "/crypto-js",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "crypto-js",
+    "name": "crypto-js",
+    "escapedName": "crypto-js",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+  "_shasum": "4d931639ecdfd12ff80e8186dba6af2c2e856631",
+  "_spec": "crypto-js",
+  "_where": "D:\\Project\\project_wenlv\\jundaosuzhou_wechatxcx",
+  "author": {
+    "name": "Evan Vosberg",
+    "url": "http://github.com/evanvosberg"
+  },
+  "browser": {
+    "crypto": false
+  },
+  "bugs": {
+    "url": "https://github.com/brix/crypto-js/issues"
+  },
+  "bundleDependencies": false,
+  "dependencies": {},
+  "deprecated": false,
+  "description": "JavaScript library of crypto standards.",
+  "homepage": "http://github.com/brix/crypto-js",
+  "keywords": [
+    "security",
+    "crypto",
+    "Hash",
+    "MD5",
+    "SHA1",
+    "SHA-1",
+    "SHA256",
+    "SHA-256",
+    "RC4",
+    "Rabbit",
+    "AES",
+    "DES",
+    "PBKDF2",
+    "HMAC",
+    "OFB",
+    "CFB",
+    "CTR",
+    "CBC",
+    "Base64",
+    "Base64url"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "name": "crypto-js",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/brix/crypto-js.git"
+  },
+  "version": "4.2.0"
+}
diff --git a/node_modules/crypto-js/pad-ansix923.js b/node_modules/crypto-js/pad-ansix923.js
new file mode 100644
index 0000000..f01f21e
--- /dev/null
+++ b/node_modules/crypto-js/pad-ansix923.js
@@ -0,0 +1,49 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * ANSI X.923 padding strategy.
+	 */
+	CryptoJS.pad.AnsiX923 = {
+	    pad: function (data, blockSize) {
+	        // Shortcuts
+	        var dataSigBytes = data.sigBytes;
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Count padding bytes
+	        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+	        // Compute last byte position
+	        var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+	        // Pad
+	        data.clamp();
+	        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+	        data.sigBytes += nPaddingBytes;
+	    },
+
+	    unpad: function (data) {
+	        // Get number of padding bytes from last byte
+	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	        // Remove padding
+	        data.sigBytes -= nPaddingBytes;
+	    }
+	};
+
+
+	return CryptoJS.pad.Ansix923;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/pad-iso10126.js b/node_modules/crypto-js/pad-iso10126.js
new file mode 100644
index 0000000..6e2aefd
--- /dev/null
+++ b/node_modules/crypto-js/pad-iso10126.js
@@ -0,0 +1,44 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * ISO 10126 padding strategy.
+	 */
+	CryptoJS.pad.Iso10126 = {
+	    pad: function (data, blockSize) {
+	        // Shortcut
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Count padding bytes
+	        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+	        // Pad
+	        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
+	             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+	    },
+
+	    unpad: function (data) {
+	        // Get number of padding bytes from last byte
+	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+	        // Remove padding
+	        data.sigBytes -= nPaddingBytes;
+	    }
+	};
+
+
+	return CryptoJS.pad.Iso10126;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/pad-iso97971.js b/node_modules/crypto-js/pad-iso97971.js
new file mode 100644
index 0000000..41049b4
--- /dev/null
+++ b/node_modules/crypto-js/pad-iso97971.js
@@ -0,0 +1,40 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * ISO/IEC 9797-1 Padding Method 2.
+	 */
+	CryptoJS.pad.Iso97971 = {
+	    pad: function (data, blockSize) {
+	        // Add 0x80 byte
+	        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+	        // Zero pad the rest
+	        CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+	    },
+
+	    unpad: function (data) {
+	        // Remove zero padding
+	        CryptoJS.pad.ZeroPadding.unpad(data);
+
+	        // Remove one more byte -- the 0x80 byte
+	        data.sigBytes--;
+	    }
+	};
+
+
+	return CryptoJS.pad.Iso97971;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/pad-nopadding.js b/node_modules/crypto-js/pad-nopadding.js
new file mode 100644
index 0000000..c7787c9
--- /dev/null
+++ b/node_modules/crypto-js/pad-nopadding.js
@@ -0,0 +1,30 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * A noop padding strategy.
+	 */
+	CryptoJS.pad.NoPadding = {
+	    pad: function () {
+	    },
+
+	    unpad: function () {
+	    }
+	};
+
+
+	return CryptoJS.pad.NoPadding;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/pad-pkcs7.js b/node_modules/crypto-js/pad-pkcs7.js
new file mode 100644
index 0000000..3555168
--- /dev/null
+++ b/node_modules/crypto-js/pad-pkcs7.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	return CryptoJS.pad.Pkcs7;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/pad-zeropadding.js b/node_modules/crypto-js/pad-zeropadding.js
new file mode 100644
index 0000000..a1a459e
--- /dev/null
+++ b/node_modules/crypto-js/pad-zeropadding.js
@@ -0,0 +1,47 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/**
+	 * Zero padding strategy.
+	 */
+	CryptoJS.pad.ZeroPadding = {
+	    pad: function (data, blockSize) {
+	        // Shortcut
+	        var blockSizeBytes = blockSize * 4;
+
+	        // Pad
+	        data.clamp();
+	        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+	    },
+
+	    unpad: function (data) {
+	        // Shortcut
+	        var dataWords = data.words;
+
+	        // Unpad
+	        var i = data.sigBytes - 1;
+	        for (var i = data.sigBytes - 1; i >= 0; i--) {
+	            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+	                data.sigBytes = i + 1;
+	                break;
+	            }
+	        }
+	    }
+	};
+
+
+	return CryptoJS.pad.ZeroPadding;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/pbkdf2.js b/node_modules/crypto-js/pbkdf2.js
new file mode 100644
index 0000000..6850934
--- /dev/null
+++ b/node_modules/crypto-js/pbkdf2.js
@@ -0,0 +1,145 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha256"), require("./hmac"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha256", "./hmac"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var SHA256 = C_algo.SHA256;
+	    var HMAC = C_algo.HMAC;
+
+	    /**
+	     * Password-Based Key Derivation Function 2 algorithm.
+	     */
+	    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+	         * @property {Hasher} hasher The hasher to use. Default: SHA256
+	         * @property {number} iterations The number of iterations to perform. Default: 250000
+	         */
+	        cfg: Base.extend({
+	            keySize: 128/32,
+	            hasher: SHA256,
+	            iterations: 250000
+	        }),
+
+	        /**
+	         * Initializes a newly created key derivation function.
+	         *
+	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+	         *
+	         * @example
+	         *
+	         *     var kdf = CryptoJS.algo.PBKDF2.create();
+	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+	         */
+	        init: function (cfg) {
+	            this.cfg = this.cfg.extend(cfg);
+	        },
+
+	        /**
+	         * Computes the Password-Based Key Derivation Function 2.
+	         *
+	         * @param {WordArray|string} password The password.
+	         * @param {WordArray|string} salt A salt.
+	         *
+	         * @return {WordArray} The derived key.
+	         *
+	         * @example
+	         *
+	         *     var key = kdf.compute(password, salt);
+	         */
+	        compute: function (password, salt) {
+	            // Shortcut
+	            var cfg = this.cfg;
+
+	            // Init HMAC
+	            var hmac = HMAC.create(cfg.hasher, password);
+
+	            // Initial values
+	            var derivedKey = WordArray.create();
+	            var blockIndex = WordArray.create([0x00000001]);
+
+	            // Shortcuts
+	            var derivedKeyWords = derivedKey.words;
+	            var blockIndexWords = blockIndex.words;
+	            var keySize = cfg.keySize;
+	            var iterations = cfg.iterations;
+
+	            // Generate key
+	            while (derivedKeyWords.length < keySize) {
+	                var block = hmac.update(salt).finalize(blockIndex);
+	                hmac.reset();
+
+	                // Shortcuts
+	                var blockWords = block.words;
+	                var blockWordsLength = blockWords.length;
+
+	                // Iterations
+	                var intermediate = block;
+	                for (var i = 1; i < iterations; i++) {
+	                    intermediate = hmac.finalize(intermediate);
+	                    hmac.reset();
+
+	                    // Shortcut
+	                    var intermediateWords = intermediate.words;
+
+	                    // XOR intermediate with block
+	                    for (var j = 0; j < blockWordsLength; j++) {
+	                        blockWords[j] ^= intermediateWords[j];
+	                    }
+	                }
+
+	                derivedKey.concat(block);
+	                blockIndexWords[0]++;
+	            }
+	            derivedKey.sigBytes = keySize * 4;
+
+	            return derivedKey;
+	        }
+	    });
+
+	    /**
+	     * Computes the Password-Based Key Derivation Function 2.
+	     *
+	     * @param {WordArray|string} password The password.
+	     * @param {WordArray|string} salt A salt.
+	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+	     *
+	     * @return {WordArray} The derived key.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var key = CryptoJS.PBKDF2(password, salt);
+	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+	     */
+	    C.PBKDF2 = function (password, salt, cfg) {
+	        return PBKDF2.create(cfg).compute(password, salt);
+	    };
+	}());
+
+
+	return CryptoJS.PBKDF2;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/rabbit-legacy.js b/node_modules/crypto-js/rabbit-legacy.js
new file mode 100644
index 0000000..e118b6b
--- /dev/null
+++ b/node_modules/crypto-js/rabbit-legacy.js
@@ -0,0 +1,190 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    // Reusable objects
+	    var S  = [];
+	    var C_ = [];
+	    var G  = [];
+
+	    /**
+	     * Rabbit stream cipher algorithm.
+	     *
+	     * This is a legacy version that neglected to convert the key to little-endian.
+	     * This error doesn't affect the cipher's security,
+	     * but it does affect its compatibility with other implementations.
+	     */
+	    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var K = this._key.words;
+	            var iv = this.cfg.iv;
+
+	            // Generate initial state values
+	            var X = this._X = [
+	                K[0], (K[3] << 16) | (K[2] >>> 16),
+	                K[1], (K[0] << 16) | (K[3] >>> 16),
+	                K[2], (K[1] << 16) | (K[0] >>> 16),
+	                K[3], (K[2] << 16) | (K[1] >>> 16)
+	            ];
+
+	            // Generate initial counter values
+	            var C = this._C = [
+	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+	            ];
+
+	            // Carry bit
+	            this._b = 0;
+
+	            // Iterate the system four times
+	            for (var i = 0; i < 4; i++) {
+	                nextState.call(this);
+	            }
+
+	            // Modify the counters
+	            for (var i = 0; i < 8; i++) {
+	                C[i] ^= X[(i + 4) & 7];
+	            }
+
+	            // IV setup
+	            if (iv) {
+	                // Shortcuts
+	                var IV = iv.words;
+	                var IV_0 = IV[0];
+	                var IV_1 = IV[1];
+
+	                // Generate four subvectors
+	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+
+	                // Modify counter values
+	                C[0] ^= i0;
+	                C[1] ^= i1;
+	                C[2] ^= i2;
+	                C[3] ^= i3;
+	                C[4] ^= i0;
+	                C[5] ^= i1;
+	                C[6] ^= i2;
+	                C[7] ^= i3;
+
+	                // Iterate the system four times
+	                for (var i = 0; i < 4; i++) {
+	                    nextState.call(this);
+	                }
+	            }
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var X = this._X;
+
+	            // Iterate the system
+	            nextState.call(this);
+
+	            // Generate four keystream words
+	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+	            for (var i = 0; i < 4; i++) {
+	                // Swap endian
+	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
+	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+
+	                // Encrypt
+	                M[offset + i] ^= S[i];
+	            }
+	        },
+
+	        blockSize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    function nextState() {
+	        // Shortcuts
+	        var X = this._X;
+	        var C = this._C;
+
+	        // Save old counter values
+	        for (var i = 0; i < 8; i++) {
+	            C_[i] = C[i];
+	        }
+
+	        // Calculate new counter values
+	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+	        // Calculate the g-values
+	        for (var i = 0; i < 8; i++) {
+	            var gx = X[i] + C[i];
+
+	            // Construct high and low argument for squaring
+	            var ga = gx & 0xffff;
+	            var gb = gx >>> 16;
+
+	            // Calculate high and low result of squaring
+	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+	            // High XOR low
+	            G[i] = gh ^ gl;
+	        }
+
+	        // Calculate new state values
+	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
+	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
+	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
+	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+	}());
+
+
+	return CryptoJS.RabbitLegacy;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/rabbit.js b/node_modules/crypto-js/rabbit.js
new file mode 100644
index 0000000..1b06833
--- /dev/null
+++ b/node_modules/crypto-js/rabbit.js
@@ -0,0 +1,192 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    // Reusable objects
+	    var S  = [];
+	    var C_ = [];
+	    var G  = [];
+
+	    /**
+	     * Rabbit stream cipher algorithm
+	     */
+	    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var K = this._key.words;
+	            var iv = this.cfg.iv;
+
+	            // Swap endian
+	            for (var i = 0; i < 4; i++) {
+	                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
+	                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Generate initial state values
+	            var X = this._X = [
+	                K[0], (K[3] << 16) | (K[2] >>> 16),
+	                K[1], (K[0] << 16) | (K[3] >>> 16),
+	                K[2], (K[1] << 16) | (K[0] >>> 16),
+	                K[3], (K[2] << 16) | (K[1] >>> 16)
+	            ];
+
+	            // Generate initial counter values
+	            var C = this._C = [
+	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+	            ];
+
+	            // Carry bit
+	            this._b = 0;
+
+	            // Iterate the system four times
+	            for (var i = 0; i < 4; i++) {
+	                nextState.call(this);
+	            }
+
+	            // Modify the counters
+	            for (var i = 0; i < 8; i++) {
+	                C[i] ^= X[(i + 4) & 7];
+	            }
+
+	            // IV setup
+	            if (iv) {
+	                // Shortcuts
+	                var IV = iv.words;
+	                var IV_0 = IV[0];
+	                var IV_1 = IV[1];
+
+	                // Generate four subvectors
+	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
+
+	                // Modify counter values
+	                C[0] ^= i0;
+	                C[1] ^= i1;
+	                C[2] ^= i2;
+	                C[3] ^= i3;
+	                C[4] ^= i0;
+	                C[5] ^= i1;
+	                C[6] ^= i2;
+	                C[7] ^= i3;
+
+	                // Iterate the system four times
+	                for (var i = 0; i < 4; i++) {
+	                    nextState.call(this);
+	                }
+	            }
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var X = this._X;
+
+	            // Iterate the system
+	            nextState.call(this);
+
+	            // Generate four keystream words
+	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+	            for (var i = 0; i < 4; i++) {
+	                // Swap endian
+	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
+	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
+
+	                // Encrypt
+	                M[offset + i] ^= S[i];
+	            }
+	        },
+
+	        blockSize: 128/32,
+
+	        ivSize: 64/32
+	    });
+
+	    function nextState() {
+	        // Shortcuts
+	        var X = this._X;
+	        var C = this._C;
+
+	        // Save old counter values
+	        for (var i = 0; i < 8; i++) {
+	            C_[i] = C[i];
+	        }
+
+	        // Calculate new counter values
+	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+	        // Calculate the g-values
+	        for (var i = 0; i < 8; i++) {
+	            var gx = X[i] + C[i];
+
+	            // Construct high and low argument for squaring
+	            var ga = gx & 0xffff;
+	            var gb = gx >>> 16;
+
+	            // Calculate high and low result of squaring
+	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+	            // High XOR low
+	            G[i] = gh ^ gl;
+	        }
+
+	        // Calculate new state values
+	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
+	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
+	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
+	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+	     */
+	    C.Rabbit = StreamCipher._createHelper(Rabbit);
+	}());
+
+
+	return CryptoJS.Rabbit;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/rc4.js b/node_modules/crypto-js/rc4.js
new file mode 100644
index 0000000..0e4bdff
--- /dev/null
+++ b/node_modules/crypto-js/rc4.js
@@ -0,0 +1,139 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var StreamCipher = C_lib.StreamCipher;
+	    var C_algo = C.algo;
+
+	    /**
+	     * RC4 stream cipher algorithm.
+	     */
+	    var RC4 = C_algo.RC4 = StreamCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+	            var keySigBytes = key.sigBytes;
+
+	            // Init sbox
+	            var S = this._S = [];
+	            for (var i = 0; i < 256; i++) {
+	                S[i] = i;
+	            }
+
+	            // Key setup
+	            for (var i = 0, j = 0; i < 256; i++) {
+	                var keyByteIndex = i % keySigBytes;
+	                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+	                j = (j + S[i] + keyByte) % 256;
+
+	                // Swap
+	                var t = S[i];
+	                S[i] = S[j];
+	                S[j] = t;
+	            }
+
+	            // Counters
+	            this._i = this._j = 0;
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            M[offset] ^= generateKeystreamWord.call(this);
+	        },
+
+	        keySize: 256/32,
+
+	        ivSize: 0
+	    });
+
+	    function generateKeystreamWord() {
+	        // Shortcuts
+	        var S = this._S;
+	        var i = this._i;
+	        var j = this._j;
+
+	        // Generate keystream word
+	        var keystreamWord = 0;
+	        for (var n = 0; n < 4; n++) {
+	            i = (i + 1) % 256;
+	            j = (j + S[i]) % 256;
+
+	            // Swap
+	            var t = S[i];
+	            S[i] = S[j];
+	            S[j] = t;
+
+	            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+	        }
+
+	        // Update counters
+	        this._i = i;
+	        this._j = j;
+
+	        return keystreamWord;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RC4 = StreamCipher._createHelper(RC4);
+
+	    /**
+	     * Modified RC4 stream cipher algorithm.
+	     */
+	    var RC4Drop = C_algo.RC4Drop = RC4.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} drop The number of keystream words to drop. Default 192
+	         */
+	        cfg: RC4.cfg.extend({
+	            drop: 192
+	        }),
+
+	        _doReset: function () {
+	            RC4._doReset.call(this);
+
+	            // Drop
+	            for (var i = this.cfg.drop; i > 0; i--) {
+	                generateKeystreamWord.call(this);
+	            }
+	        }
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+	     */
+	    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+	}());
+
+
+	return CryptoJS.RC4;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/ripemd160.js b/node_modules/crypto-js/ripemd160.js
new file mode 100644
index 0000000..24feb47
--- /dev/null
+++ b/node_modules/crypto-js/ripemd160.js
@@ -0,0 +1,267 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	/** @preserve
+	(c) 2012 by Cédric Mesnil. All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Constants table
+	    var _zl = WordArray.create([
+	        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+	        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
+	        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
+	        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
+	        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
+	    var _zr = WordArray.create([
+	        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
+	        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
+	        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
+	        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
+	        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
+	    var _sl = WordArray.create([
+	         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
+	        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
+	        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
+	          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
+	        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
+	    var _sr = WordArray.create([
+	        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
+	        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
+	        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
+	        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
+	        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
+
+	    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+	    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+	    /**
+	     * RIPEMD160 hash algorithm.
+	     */
+	    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+
+	            // Swap endian
+	            for (var i = 0; i < 16; i++) {
+	                // Shortcuts
+	                var offset_i = offset + i;
+	                var M_offset_i = M[offset_i];
+
+	                // Swap
+	                M[offset_i] = (
+	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
+	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
+	                );
+	            }
+	            // Shortcut
+	            var H  = this._hash.words;
+	            var hl = _hl.words;
+	            var hr = _hr.words;
+	            var zl = _zl.words;
+	            var zr = _zr.words;
+	            var sl = _sl.words;
+	            var sr = _sr.words;
+
+	            // Working variables
+	            var al, bl, cl, dl, el;
+	            var ar, br, cr, dr, er;
+
+	            ar = al = H[0];
+	            br = bl = H[1];
+	            cr = cl = H[2];
+	            dr = dl = H[3];
+	            er = el = H[4];
+	            // Computation
+	            var t;
+	            for (var i = 0; i < 80; i += 1) {
+	                t = (al +  M[offset+zl[i]])|0;
+	                if (i<16){
+		            t +=  f1(bl,cl,dl) + hl[0];
+	                } else if (i<32) {
+		            t +=  f2(bl,cl,dl) + hl[1];
+	                } else if (i<48) {
+		            t +=  f3(bl,cl,dl) + hl[2];
+	                } else if (i<64) {
+		            t +=  f4(bl,cl,dl) + hl[3];
+	                } else {// if (i<80) {
+		            t +=  f5(bl,cl,dl) + hl[4];
+	                }
+	                t = t|0;
+	                t =  rotl(t,sl[i]);
+	                t = (t+el)|0;
+	                al = el;
+	                el = dl;
+	                dl = rotl(cl, 10);
+	                cl = bl;
+	                bl = t;
+
+	                t = (ar + M[offset+zr[i]])|0;
+	                if (i<16){
+		            t +=  f5(br,cr,dr) + hr[0];
+	                } else if (i<32) {
+		            t +=  f4(br,cr,dr) + hr[1];
+	                } else if (i<48) {
+		            t +=  f3(br,cr,dr) + hr[2];
+	                } else if (i<64) {
+		            t +=  f2(br,cr,dr) + hr[3];
+	                } else {// if (i<80) {
+		            t +=  f1(br,cr,dr) + hr[4];
+	                }
+	                t = t|0;
+	                t =  rotl(t,sr[i]) ;
+	                t = (t+er)|0;
+	                ar = er;
+	                er = dr;
+	                dr = rotl(cr, 10);
+	                cr = br;
+	                br = t;
+	            }
+	            // Intermediate hash value
+	            t    = (H[1] + cl + dr)|0;
+	            H[1] = (H[2] + dl + er)|0;
+	            H[2] = (H[3] + el + ar)|0;
+	            H[3] = (H[4] + al + br)|0;
+	            H[4] = (H[0] + bl + cr)|0;
+	            H[0] =  t;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+	                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+	                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
+	            );
+	            data.sigBytes = (dataWords.length + 1) * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var hash = this._hash;
+	            var H = hash.words;
+
+	            // Swap endian
+	            for (var i = 0; i < 5; i++) {
+	                // Shortcut
+	                var H_i = H[i];
+
+	                // Swap
+	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
+	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
+	            }
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+
+	    function f1(x, y, z) {
+	        return ((x) ^ (y) ^ (z));
+
+	    }
+
+	    function f2(x, y, z) {
+	        return (((x)&(y)) | ((~x)&(z)));
+	    }
+
+	    function f3(x, y, z) {
+	        return (((x) | (~(y))) ^ (z));
+	    }
+
+	    function f4(x, y, z) {
+	        return (((x) & (z)) | ((y)&(~(z))));
+	    }
+
+	    function f5(x, y, z) {
+	        return ((x) ^ ((y) |(~(z))));
+
+	    }
+
+	    function rotl(x,n) {
+	        return (x<<n) | (x>>>(32-n));
+	    }
+
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.RIPEMD160('message');
+	     *     var hash = CryptoJS.RIPEMD160(wordArray);
+	     */
+	    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
+	     */
+	    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+	}(Math));
+
+
+	return CryptoJS.RIPEMD160;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/sha1.js b/node_modules/crypto-js/sha1.js
new file mode 100644
index 0000000..6691149
--- /dev/null
+++ b/node_modules/crypto-js/sha1.js
@@ -0,0 +1,150 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-1 hash algorithm.
+	     */
+	    var SHA1 = C_algo.SHA1 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0x67452301, 0xefcdab89,
+	                0x98badcfe, 0x10325476,
+	                0xc3d2e1f0
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+
+	            // Computation
+	            for (var i = 0; i < 80; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+	                    W[i] = (n << 1) | (n >>> 31);
+	                }
+
+	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
+	                if (i < 20) {
+	                    t += ((b & c) | (~b & d)) + 0x5a827999;
+	                } else if (i < 40) {
+	                    t += (b ^ c ^ d) + 0x6ed9eba1;
+	                } else if (i < 60) {
+	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+	                } else /* if (i < 80) */ {
+	                    t += (b ^ c ^ d) - 0x359d3e2a;
+	                }
+
+	                e = d;
+	                d = c;
+	                c = (b << 30) | (b >>> 2);
+	                b = a;
+	                a = t;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA1('message');
+	     *     var hash = CryptoJS.SHA1(wordArray);
+	     */
+	    C.SHA1 = Hasher._createHelper(SHA1);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA1(message, key);
+	     */
+	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+	}());
+
+
+	return CryptoJS.SHA1;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/sha224.js b/node_modules/crypto-js/sha224.js
new file mode 100644
index 0000000..d8ce988
--- /dev/null
+++ b/node_modules/crypto-js/sha224.js
@@ -0,0 +1,80 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./sha256"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./sha256"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var C_algo = C.algo;
+	    var SHA256 = C_algo.SHA256;
+
+	    /**
+	     * SHA-224 hash algorithm.
+	     */
+	    var SHA224 = C_algo.SHA224 = SHA256.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init([
+	                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+	                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+	            ]);
+	        },
+
+	        _doFinalize: function () {
+	            var hash = SHA256._doFinalize.call(this);
+
+	            hash.sigBytes -= 4;
+
+	            return hash;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA224('message');
+	     *     var hash = CryptoJS.SHA224(wordArray);
+	     */
+	    C.SHA224 = SHA256._createHelper(SHA224);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA224(message, key);
+	     */
+	    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+	}());
+
+
+	return CryptoJS.SHA224;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/sha256.js b/node_modules/crypto-js/sha256.js
new file mode 100644
index 0000000..de2d7fc
--- /dev/null
+++ b/node_modules/crypto-js/sha256.js
@@ -0,0 +1,199 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_algo = C.algo;
+
+	    // Initialization and round constants tables
+	    var H = [];
+	    var K = [];
+
+	    // Compute constants
+	    (function () {
+	        function isPrime(n) {
+	            var sqrtN = Math.sqrt(n);
+	            for (var factor = 2; factor <= sqrtN; factor++) {
+	                if (!(n % factor)) {
+	                    return false;
+	                }
+	            }
+
+	            return true;
+	        }
+
+	        function getFractionalBits(n) {
+	            return ((n - (n | 0)) * 0x100000000) | 0;
+	        }
+
+	        var n = 2;
+	        var nPrime = 0;
+	        while (nPrime < 64) {
+	            if (isPrime(n)) {
+	                if (nPrime < 8) {
+	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+	                }
+	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+	                nPrime++;
+	            }
+
+	            n++;
+	        }
+	    }());
+
+	    // Reusable object
+	    var W = [];
+
+	    /**
+	     * SHA-256 hash algorithm.
+	     */
+	    var SHA256 = C_algo.SHA256 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new WordArray.init(H.slice(0));
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcut
+	            var H = this._hash.words;
+
+	            // Working variables
+	            var a = H[0];
+	            var b = H[1];
+	            var c = H[2];
+	            var d = H[3];
+	            var e = H[4];
+	            var f = H[5];
+	            var g = H[6];
+	            var h = H[7];
+
+	            // Computation
+	            for (var i = 0; i < 64; i++) {
+	                if (i < 16) {
+	                    W[i] = M[offset + i] | 0;
+	                } else {
+	                    var gamma0x = W[i - 15];
+	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
+	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
+	                                   (gamma0x >>> 3);
+
+	                    var gamma1x = W[i - 2];
+	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
+	                                   (gamma1x >>> 10);
+
+	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+	                }
+
+	                var ch  = (e & f) ^ (~e & g);
+	                var maj = (a & b) ^ (a & c) ^ (b & c);
+
+	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
+
+	                var t1 = h + sigma1 + ch + K[i] + W[i];
+	                var t2 = sigma0 + maj;
+
+	                h = g;
+	                g = f;
+	                f = e;
+	                e = (d + t1) | 0;
+	                d = c;
+	                c = b;
+	                b = a;
+	                a = (t1 + t2) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H[0] = (H[0] + a) | 0;
+	            H[1] = (H[1] + b) | 0;
+	            H[2] = (H[2] + c) | 0;
+	            H[3] = (H[3] + d) | 0;
+	            H[4] = (H[4] + e) | 0;
+	            H[5] = (H[5] + f) | 0;
+	            H[6] = (H[6] + g) | 0;
+	            H[7] = (H[7] + h) | 0;
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Return final computed hash
+	            return this._hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA256('message');
+	     *     var hash = CryptoJS.SHA256(wordArray);
+	     */
+	    C.SHA256 = Hasher._createHelper(SHA256);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA256(message, key);
+	     */
+	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+	}(Math));
+
+
+	return CryptoJS.SHA256;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/sha3.js b/node_modules/crypto-js/sha3.js
new file mode 100644
index 0000000..34ad86c
--- /dev/null
+++ b/node_modules/crypto-js/sha3.js
@@ -0,0 +1,326 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (Math) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var C_algo = C.algo;
+
+	    // Constants tables
+	    var RHO_OFFSETS = [];
+	    var PI_INDEXES  = [];
+	    var ROUND_CONSTANTS = [];
+
+	    // Compute Constants
+	    (function () {
+	        // Compute rho offset constants
+	        var x = 1, y = 0;
+	        for (var t = 0; t < 24; t++) {
+	            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+	            var newX = y % 5;
+	            var newY = (2 * x + 3 * y) % 5;
+	            x = newX;
+	            y = newY;
+	        }
+
+	        // Compute pi index constants
+	        for (var x = 0; x < 5; x++) {
+	            for (var y = 0; y < 5; y++) {
+	                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+	            }
+	        }
+
+	        // Compute round constants
+	        var LFSR = 0x01;
+	        for (var i = 0; i < 24; i++) {
+	            var roundConstantMsw = 0;
+	            var roundConstantLsw = 0;
+
+	            for (var j = 0; j < 7; j++) {
+	                if (LFSR & 0x01) {
+	                    var bitPosition = (1 << j) - 1;
+	                    if (bitPosition < 32) {
+	                        roundConstantLsw ^= 1 << bitPosition;
+	                    } else /* if (bitPosition >= 32) */ {
+	                        roundConstantMsw ^= 1 << (bitPosition - 32);
+	                    }
+	                }
+
+	                // Compute next LFSR
+	                if (LFSR & 0x80) {
+	                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+	                    LFSR = (LFSR << 1) ^ 0x71;
+	                } else {
+	                    LFSR <<= 1;
+	                }
+	            }
+
+	            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+	        }
+	    }());
+
+	    // Reusable objects for temporary values
+	    var T = [];
+	    (function () {
+	        for (var i = 0; i < 25; i++) {
+	            T[i] = X64Word.create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-3 hash algorithm.
+	     */
+	    var SHA3 = C_algo.SHA3 = Hasher.extend({
+	        /**
+	         * Configuration options.
+	         *
+	         * @property {number} outputLength
+	         *   The desired number of bits in the output hash.
+	         *   Only values permitted are: 224, 256, 384, 512.
+	         *   Default: 512
+	         */
+	        cfg: Hasher.cfg.extend({
+	            outputLength: 512
+	        }),
+
+	        _doReset: function () {
+	            var state = this._state = []
+	            for (var i = 0; i < 25; i++) {
+	                state[i] = new X64Word.init();
+	            }
+
+	            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var state = this._state;
+	            var nBlockSizeLanes = this.blockSize / 2;
+
+	            // Absorb
+	            for (var i = 0; i < nBlockSizeLanes; i++) {
+	                // Shortcuts
+	                var M2i  = M[offset + 2 * i];
+	                var M2i1 = M[offset + 2 * i + 1];
+
+	                // Swap endian
+	                M2i = (
+	                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
+	                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
+	                );
+	                M2i1 = (
+	                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
+	                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
+	                );
+
+	                // Absorb message into state
+	                var lane = state[i];
+	                lane.high ^= M2i1;
+	                lane.low  ^= M2i;
+	            }
+
+	            // Rounds
+	            for (var round = 0; round < 24; round++) {
+	                // Theta
+	                for (var x = 0; x < 5; x++) {
+	                    // Mix column lanes
+	                    var tMsw = 0, tLsw = 0;
+	                    for (var y = 0; y < 5; y++) {
+	                        var lane = state[x + 5 * y];
+	                        tMsw ^= lane.high;
+	                        tLsw ^= lane.low;
+	                    }
+
+	                    // Temporary values
+	                    var Tx = T[x];
+	                    Tx.high = tMsw;
+	                    Tx.low  = tLsw;
+	                }
+	                for (var x = 0; x < 5; x++) {
+	                    // Shortcuts
+	                    var Tx4 = T[(x + 4) % 5];
+	                    var Tx1 = T[(x + 1) % 5];
+	                    var Tx1Msw = Tx1.high;
+	                    var Tx1Lsw = Tx1.low;
+
+	                    // Mix surrounding columns
+	                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+	                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+	                    for (var y = 0; y < 5; y++) {
+	                        var lane = state[x + 5 * y];
+	                        lane.high ^= tMsw;
+	                        lane.low  ^= tLsw;
+	                    }
+	                }
+
+	                // Rho Pi
+	                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+	                    var tMsw;
+	                    var tLsw;
+
+	                    // Shortcuts
+	                    var lane = state[laneIndex];
+	                    var laneMsw = lane.high;
+	                    var laneLsw = lane.low;
+	                    var rhoOffset = RHO_OFFSETS[laneIndex];
+
+	                    // Rotate lanes
+	                    if (rhoOffset < 32) {
+	                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+	                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+	                    } else /* if (rhoOffset >= 32) */ {
+	                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+	                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+	                    }
+
+	                    // Transpose lanes
+	                    var TPiLane = T[PI_INDEXES[laneIndex]];
+	                    TPiLane.high = tMsw;
+	                    TPiLane.low  = tLsw;
+	                }
+
+	                // Rho pi at x = y = 0
+	                var T0 = T[0];
+	                var state0 = state[0];
+	                T0.high = state0.high;
+	                T0.low  = state0.low;
+
+	                // Chi
+	                for (var x = 0; x < 5; x++) {
+	                    for (var y = 0; y < 5; y++) {
+	                        // Shortcuts
+	                        var laneIndex = x + 5 * y;
+	                        var lane = state[laneIndex];
+	                        var TLane = T[laneIndex];
+	                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+	                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+	                        // Mix rows
+	                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+	                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
+	                    }
+	                }
+
+	                // Iota
+	                var lane = state[0];
+	                var roundConstant = ROUND_CONSTANTS[round];
+	                lane.high ^= roundConstant.high;
+	                lane.low  ^= roundConstant.low;
+	            }
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+	            var blockSizeBits = this.blockSize * 32;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+	            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Shortcuts
+	            var state = this._state;
+	            var outputLengthBytes = this.cfg.outputLength / 8;
+	            var outputLengthLanes = outputLengthBytes / 8;
+
+	            // Squeeze
+	            var hashWords = [];
+	            for (var i = 0; i < outputLengthLanes; i++) {
+	                // Shortcuts
+	                var lane = state[i];
+	                var laneMsw = lane.high;
+	                var laneLsw = lane.low;
+
+	                // Swap endian
+	                laneMsw = (
+	                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
+	                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
+	                );
+	                laneLsw = (
+	                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
+	                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
+	                );
+
+	                // Squeeze state to retrieve hash
+	                hashWords.push(laneLsw);
+	                hashWords.push(laneMsw);
+	            }
+
+	            // Return final computed hash
+	            return new WordArray.init(hashWords, outputLengthBytes);
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+
+	            var state = clone._state = this._state.slice(0);
+	            for (var i = 0; i < 25; i++) {
+	                state[i] = state[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA3('message');
+	     *     var hash = CryptoJS.SHA3(wordArray);
+	     */
+	    C.SHA3 = Hasher._createHelper(SHA3);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA3(message, key);
+	     */
+	    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+	}(Math));
+
+
+	return CryptoJS.SHA3;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/sha384.js b/node_modules/crypto-js/sha384.js
new file mode 100644
index 0000000..a0b95bf
--- /dev/null
+++ b/node_modules/crypto-js/sha384.js
@@ -0,0 +1,83 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core", "./sha512"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+	    var SHA512 = C_algo.SHA512;
+
+	    /**
+	     * SHA-384 hash algorithm.
+	     */
+	    var SHA384 = C_algo.SHA384 = SHA512.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+	                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+	                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+	                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+	            ]);
+	        },
+
+	        _doFinalize: function () {
+	            var hash = SHA512._doFinalize.call(this);
+
+	            hash.sigBytes -= 16;
+
+	            return hash;
+	        }
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA384('message');
+	     *     var hash = CryptoJS.SHA384(wordArray);
+	     */
+	    C.SHA384 = SHA512._createHelper(SHA384);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA384(message, key);
+	     */
+	    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+	}());
+
+
+	return CryptoJS.SHA384;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/sha512.js b/node_modules/crypto-js/sha512.js
new file mode 100644
index 0000000..d274ab0
--- /dev/null
+++ b/node_modules/crypto-js/sha512.js
@@ -0,0 +1,326 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./x64-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./x64-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Hasher = C_lib.Hasher;
+	    var C_x64 = C.x64;
+	    var X64Word = C_x64.Word;
+	    var X64WordArray = C_x64.WordArray;
+	    var C_algo = C.algo;
+
+	    function X64Word_create() {
+	        return X64Word.create.apply(X64Word, arguments);
+	    }
+
+	    // Constants
+	    var K = [
+	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+	    ];
+
+	    // Reusable objects
+	    var W = [];
+	    (function () {
+	        for (var i = 0; i < 80; i++) {
+	            W[i] = X64Word_create();
+	        }
+	    }());
+
+	    /**
+	     * SHA-512 hash algorithm.
+	     */
+	    var SHA512 = C_algo.SHA512 = Hasher.extend({
+	        _doReset: function () {
+	            this._hash = new X64WordArray.init([
+	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+	            ]);
+	        },
+
+	        _doProcessBlock: function (M, offset) {
+	            // Shortcuts
+	            var H = this._hash.words;
+
+	            var H0 = H[0];
+	            var H1 = H[1];
+	            var H2 = H[2];
+	            var H3 = H[3];
+	            var H4 = H[4];
+	            var H5 = H[5];
+	            var H6 = H[6];
+	            var H7 = H[7];
+
+	            var H0h = H0.high;
+	            var H0l = H0.low;
+	            var H1h = H1.high;
+	            var H1l = H1.low;
+	            var H2h = H2.high;
+	            var H2l = H2.low;
+	            var H3h = H3.high;
+	            var H3l = H3.low;
+	            var H4h = H4.high;
+	            var H4l = H4.low;
+	            var H5h = H5.high;
+	            var H5l = H5.low;
+	            var H6h = H6.high;
+	            var H6l = H6.low;
+	            var H7h = H7.high;
+	            var H7l = H7.low;
+
+	            // Working variables
+	            var ah = H0h;
+	            var al = H0l;
+	            var bh = H1h;
+	            var bl = H1l;
+	            var ch = H2h;
+	            var cl = H2l;
+	            var dh = H3h;
+	            var dl = H3l;
+	            var eh = H4h;
+	            var el = H4l;
+	            var fh = H5h;
+	            var fl = H5l;
+	            var gh = H6h;
+	            var gl = H6l;
+	            var hh = H7h;
+	            var hl = H7l;
+
+	            // Rounds
+	            for (var i = 0; i < 80; i++) {
+	                var Wil;
+	                var Wih;
+
+	                // Shortcut
+	                var Wi = W[i];
+
+	                // Extend message
+	                if (i < 16) {
+	                    Wih = Wi.high = M[offset + i * 2]     | 0;
+	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
+	                } else {
+	                    // Gamma0
+	                    var gamma0x  = W[i - 15];
+	                    var gamma0xh = gamma0x.high;
+	                    var gamma0xl = gamma0x.low;
+	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+	                    // Gamma1
+	                    var gamma1x  = W[i - 2];
+	                    var gamma1xh = gamma1x.high;
+	                    var gamma1xl = gamma1x.low;
+	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+	                    var Wi7  = W[i - 7];
+	                    var Wi7h = Wi7.high;
+	                    var Wi7l = Wi7.low;
+
+	                    var Wi16  = W[i - 16];
+	                    var Wi16h = Wi16.high;
+	                    var Wi16l = Wi16.low;
+
+	                    Wil = gamma0l + Wi7l;
+	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+	                    Wil = Wil + gamma1l;
+	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+	                    Wil = Wil + Wi16l;
+	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+	                    Wi.high = Wih;
+	                    Wi.low  = Wil;
+	                }
+
+	                var chh  = (eh & fh) ^ (~eh & gh);
+	                var chl  = (el & fl) ^ (~el & gl);
+	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+	                // t1 = h + sigma1 + ch + K[i] + W[i]
+	                var Ki  = K[i];
+	                var Kih = Ki.high;
+	                var Kil = Ki.low;
+
+	                var t1l = hl + sigma1l;
+	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+	                var t1l = t1l + chl;
+	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+	                var t1l = t1l + Kil;
+	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+	                var t1l = t1l + Wil;
+	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+	                // t2 = sigma0 + maj
+	                var t2l = sigma0l + majl;
+	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+	                // Update working variables
+	                hh = gh;
+	                hl = gl;
+	                gh = fh;
+	                gl = fl;
+	                fh = eh;
+	                fl = el;
+	                el = (dl + t1l) | 0;
+	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+	                dh = ch;
+	                dl = cl;
+	                ch = bh;
+	                cl = bl;
+	                bh = ah;
+	                bl = al;
+	                al = (t1l + t2l) | 0;
+	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+	            }
+
+	            // Intermediate hash value
+	            H0l = H0.low  = (H0l + al);
+	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+	            H1l = H1.low  = (H1l + bl);
+	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+	            H2l = H2.low  = (H2l + cl);
+	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+	            H3l = H3.low  = (H3l + dl);
+	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+	            H4l = H4.low  = (H4l + el);
+	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+	            H5l = H5.low  = (H5l + fl);
+	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+	            H6l = H6.low  = (H6l + gl);
+	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+	            H7l = H7.low  = (H7l + hl);
+	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+	        },
+
+	        _doFinalize: function () {
+	            // Shortcuts
+	            var data = this._data;
+	            var dataWords = data.words;
+
+	            var nBitsTotal = this._nDataBytes * 8;
+	            var nBitsLeft = data.sigBytes * 8;
+
+	            // Add padding
+	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+	            data.sigBytes = dataWords.length * 4;
+
+	            // Hash final blocks
+	            this._process();
+
+	            // Convert hash to 32-bit word array before returning
+	            var hash = this._hash.toX32();
+
+	            // Return final computed hash
+	            return hash;
+	        },
+
+	        clone: function () {
+	            var clone = Hasher.clone.call(this);
+	            clone._hash = this._hash.clone();
+
+	            return clone;
+	        },
+
+	        blockSize: 1024/32
+	    });
+
+	    /**
+	     * Shortcut function to the hasher's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     *
+	     * @return {WordArray} The hash.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hash = CryptoJS.SHA512('message');
+	     *     var hash = CryptoJS.SHA512(wordArray);
+	     */
+	    C.SHA512 = Hasher._createHelper(SHA512);
+
+	    /**
+	     * Shortcut function to the HMAC's object interface.
+	     *
+	     * @param {WordArray|string} message The message to hash.
+	     * @param {WordArray|string} key The secret key.
+	     *
+	     * @return {WordArray} The HMAC.
+	     *
+	     * @static
+	     *
+	     * @example
+	     *
+	     *     var hmac = CryptoJS.HmacSHA512(message, key);
+	     */
+	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+	}());
+
+
+	return CryptoJS.SHA512;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/tripledes.js b/node_modules/crypto-js/tripledes.js
new file mode 100644
index 0000000..1a92477
--- /dev/null
+++ b/node_modules/crypto-js/tripledes.js
@@ -0,0 +1,779 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var WordArray = C_lib.WordArray;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Permuted Choice 1 constants
+	    var PC1 = [
+	        57, 49, 41, 33, 25, 17, 9,  1,
+	        58, 50, 42, 34, 26, 18, 10, 2,
+	        59, 51, 43, 35, 27, 19, 11, 3,
+	        60, 52, 44, 36, 63, 55, 47, 39,
+	        31, 23, 15, 7,  62, 54, 46, 38,
+	        30, 22, 14, 6,  61, 53, 45, 37,
+	        29, 21, 13, 5,  28, 20, 12, 4
+	    ];
+
+	    // Permuted Choice 2 constants
+	    var PC2 = [
+	        14, 17, 11, 24, 1,  5,
+	        3,  28, 15, 6,  21, 10,
+	        23, 19, 12, 4,  26, 8,
+	        16, 7,  27, 20, 13, 2,
+	        41, 52, 31, 37, 47, 55,
+	        30, 40, 51, 45, 33, 48,
+	        44, 49, 39, 56, 34, 53,
+	        46, 42, 50, 36, 29, 32
+	    ];
+
+	    // Cumulative bit shift constants
+	    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+	    // SBOXes and round permutation constants
+	    var SBOX_P = [
+	        {
+	            0x0: 0x808200,
+	            0x10000000: 0x8000,
+	            0x20000000: 0x808002,
+	            0x30000000: 0x2,
+	            0x40000000: 0x200,
+	            0x50000000: 0x808202,
+	            0x60000000: 0x800202,
+	            0x70000000: 0x800000,
+	            0x80000000: 0x202,
+	            0x90000000: 0x800200,
+	            0xa0000000: 0x8200,
+	            0xb0000000: 0x808000,
+	            0xc0000000: 0x8002,
+	            0xd0000000: 0x800002,
+	            0xe0000000: 0x0,
+	            0xf0000000: 0x8202,
+	            0x8000000: 0x0,
+	            0x18000000: 0x808202,
+	            0x28000000: 0x8202,
+	            0x38000000: 0x8000,
+	            0x48000000: 0x808200,
+	            0x58000000: 0x200,
+	            0x68000000: 0x808002,
+	            0x78000000: 0x2,
+	            0x88000000: 0x800200,
+	            0x98000000: 0x8200,
+	            0xa8000000: 0x808000,
+	            0xb8000000: 0x800202,
+	            0xc8000000: 0x800002,
+	            0xd8000000: 0x8002,
+	            0xe8000000: 0x202,
+	            0xf8000000: 0x800000,
+	            0x1: 0x8000,
+	            0x10000001: 0x2,
+	            0x20000001: 0x808200,
+	            0x30000001: 0x800000,
+	            0x40000001: 0x808002,
+	            0x50000001: 0x8200,
+	            0x60000001: 0x200,
+	            0x70000001: 0x800202,
+	            0x80000001: 0x808202,
+	            0x90000001: 0x808000,
+	            0xa0000001: 0x800002,
+	            0xb0000001: 0x8202,
+	            0xc0000001: 0x202,
+	            0xd0000001: 0x800200,
+	            0xe0000001: 0x8002,
+	            0xf0000001: 0x0,
+	            0x8000001: 0x808202,
+	            0x18000001: 0x808000,
+	            0x28000001: 0x800000,
+	            0x38000001: 0x200,
+	            0x48000001: 0x8000,
+	            0x58000001: 0x800002,
+	            0x68000001: 0x2,
+	            0x78000001: 0x8202,
+	            0x88000001: 0x8002,
+	            0x98000001: 0x800202,
+	            0xa8000001: 0x202,
+	            0xb8000001: 0x808200,
+	            0xc8000001: 0x800200,
+	            0xd8000001: 0x0,
+	            0xe8000001: 0x8200,
+	            0xf8000001: 0x808002
+	        },
+	        {
+	            0x0: 0x40084010,
+	            0x1000000: 0x4000,
+	            0x2000000: 0x80000,
+	            0x3000000: 0x40080010,
+	            0x4000000: 0x40000010,
+	            0x5000000: 0x40084000,
+	            0x6000000: 0x40004000,
+	            0x7000000: 0x10,
+	            0x8000000: 0x84000,
+	            0x9000000: 0x40004010,
+	            0xa000000: 0x40000000,
+	            0xb000000: 0x84010,
+	            0xc000000: 0x80010,
+	            0xd000000: 0x0,
+	            0xe000000: 0x4010,
+	            0xf000000: 0x40080000,
+	            0x800000: 0x40004000,
+	            0x1800000: 0x84010,
+	            0x2800000: 0x10,
+	            0x3800000: 0x40004010,
+	            0x4800000: 0x40084010,
+	            0x5800000: 0x40000000,
+	            0x6800000: 0x80000,
+	            0x7800000: 0x40080010,
+	            0x8800000: 0x80010,
+	            0x9800000: 0x0,
+	            0xa800000: 0x4000,
+	            0xb800000: 0x40080000,
+	            0xc800000: 0x40000010,
+	            0xd800000: 0x84000,
+	            0xe800000: 0x40084000,
+	            0xf800000: 0x4010,
+	            0x10000000: 0x0,
+	            0x11000000: 0x40080010,
+	            0x12000000: 0x40004010,
+	            0x13000000: 0x40084000,
+	            0x14000000: 0x40080000,
+	            0x15000000: 0x10,
+	            0x16000000: 0x84010,
+	            0x17000000: 0x4000,
+	            0x18000000: 0x4010,
+	            0x19000000: 0x80000,
+	            0x1a000000: 0x80010,
+	            0x1b000000: 0x40000010,
+	            0x1c000000: 0x84000,
+	            0x1d000000: 0x40004000,
+	            0x1e000000: 0x40000000,
+	            0x1f000000: 0x40084010,
+	            0x10800000: 0x84010,
+	            0x11800000: 0x80000,
+	            0x12800000: 0x40080000,
+	            0x13800000: 0x4000,
+	            0x14800000: 0x40004000,
+	            0x15800000: 0x40084010,
+	            0x16800000: 0x10,
+	            0x17800000: 0x40000000,
+	            0x18800000: 0x40084000,
+	            0x19800000: 0x40000010,
+	            0x1a800000: 0x40004010,
+	            0x1b800000: 0x80010,
+	            0x1c800000: 0x0,
+	            0x1d800000: 0x4010,
+	            0x1e800000: 0x40080010,
+	            0x1f800000: 0x84000
+	        },
+	        {
+	            0x0: 0x104,
+	            0x100000: 0x0,
+	            0x200000: 0x4000100,
+	            0x300000: 0x10104,
+	            0x400000: 0x10004,
+	            0x500000: 0x4000004,
+	            0x600000: 0x4010104,
+	            0x700000: 0x4010000,
+	            0x800000: 0x4000000,
+	            0x900000: 0x4010100,
+	            0xa00000: 0x10100,
+	            0xb00000: 0x4010004,
+	            0xc00000: 0x4000104,
+	            0xd00000: 0x10000,
+	            0xe00000: 0x4,
+	            0xf00000: 0x100,
+	            0x80000: 0x4010100,
+	            0x180000: 0x4010004,
+	            0x280000: 0x0,
+	            0x380000: 0x4000100,
+	            0x480000: 0x4000004,
+	            0x580000: 0x10000,
+	            0x680000: 0x10004,
+	            0x780000: 0x104,
+	            0x880000: 0x4,
+	            0x980000: 0x100,
+	            0xa80000: 0x4010000,
+	            0xb80000: 0x10104,
+	            0xc80000: 0x10100,
+	            0xd80000: 0x4000104,
+	            0xe80000: 0x4010104,
+	            0xf80000: 0x4000000,
+	            0x1000000: 0x4010100,
+	            0x1100000: 0x10004,
+	            0x1200000: 0x10000,
+	            0x1300000: 0x4000100,
+	            0x1400000: 0x100,
+	            0x1500000: 0x4010104,
+	            0x1600000: 0x4000004,
+	            0x1700000: 0x0,
+	            0x1800000: 0x4000104,
+	            0x1900000: 0x4000000,
+	            0x1a00000: 0x4,
+	            0x1b00000: 0x10100,
+	            0x1c00000: 0x4010000,
+	            0x1d00000: 0x104,
+	            0x1e00000: 0x10104,
+	            0x1f00000: 0x4010004,
+	            0x1080000: 0x4000000,
+	            0x1180000: 0x104,
+	            0x1280000: 0x4010100,
+	            0x1380000: 0x0,
+	            0x1480000: 0x10004,
+	            0x1580000: 0x4000100,
+	            0x1680000: 0x100,
+	            0x1780000: 0x4010004,
+	            0x1880000: 0x10000,
+	            0x1980000: 0x4010104,
+	            0x1a80000: 0x10104,
+	            0x1b80000: 0x4000004,
+	            0x1c80000: 0x4000104,
+	            0x1d80000: 0x4010000,
+	            0x1e80000: 0x4,
+	            0x1f80000: 0x10100
+	        },
+	        {
+	            0x0: 0x80401000,
+	            0x10000: 0x80001040,
+	            0x20000: 0x401040,
+	            0x30000: 0x80400000,
+	            0x40000: 0x0,
+	            0x50000: 0x401000,
+	            0x60000: 0x80000040,
+	            0x70000: 0x400040,
+	            0x80000: 0x80000000,
+	            0x90000: 0x400000,
+	            0xa0000: 0x40,
+	            0xb0000: 0x80001000,
+	            0xc0000: 0x80400040,
+	            0xd0000: 0x1040,
+	            0xe0000: 0x1000,
+	            0xf0000: 0x80401040,
+	            0x8000: 0x80001040,
+	            0x18000: 0x40,
+	            0x28000: 0x80400040,
+	            0x38000: 0x80001000,
+	            0x48000: 0x401000,
+	            0x58000: 0x80401040,
+	            0x68000: 0x0,
+	            0x78000: 0x80400000,
+	            0x88000: 0x1000,
+	            0x98000: 0x80401000,
+	            0xa8000: 0x400000,
+	            0xb8000: 0x1040,
+	            0xc8000: 0x80000000,
+	            0xd8000: 0x400040,
+	            0xe8000: 0x401040,
+	            0xf8000: 0x80000040,
+	            0x100000: 0x400040,
+	            0x110000: 0x401000,
+	            0x120000: 0x80000040,
+	            0x130000: 0x0,
+	            0x140000: 0x1040,
+	            0x150000: 0x80400040,
+	            0x160000: 0x80401000,
+	            0x170000: 0x80001040,
+	            0x180000: 0x80401040,
+	            0x190000: 0x80000000,
+	            0x1a0000: 0x80400000,
+	            0x1b0000: 0x401040,
+	            0x1c0000: 0x80001000,
+	            0x1d0000: 0x400000,
+	            0x1e0000: 0x40,
+	            0x1f0000: 0x1000,
+	            0x108000: 0x80400000,
+	            0x118000: 0x80401040,
+	            0x128000: 0x0,
+	            0x138000: 0x401000,
+	            0x148000: 0x400040,
+	            0x158000: 0x80000000,
+	            0x168000: 0x80001040,
+	            0x178000: 0x40,
+	            0x188000: 0x80000040,
+	            0x198000: 0x1000,
+	            0x1a8000: 0x80001000,
+	            0x1b8000: 0x80400040,
+	            0x1c8000: 0x1040,
+	            0x1d8000: 0x80401000,
+	            0x1e8000: 0x400000,
+	            0x1f8000: 0x401040
+	        },
+	        {
+	            0x0: 0x80,
+	            0x1000: 0x1040000,
+	            0x2000: 0x40000,
+	            0x3000: 0x20000000,
+	            0x4000: 0x20040080,
+	            0x5000: 0x1000080,
+	            0x6000: 0x21000080,
+	            0x7000: 0x40080,
+	            0x8000: 0x1000000,
+	            0x9000: 0x20040000,
+	            0xa000: 0x20000080,
+	            0xb000: 0x21040080,
+	            0xc000: 0x21040000,
+	            0xd000: 0x0,
+	            0xe000: 0x1040080,
+	            0xf000: 0x21000000,
+	            0x800: 0x1040080,
+	            0x1800: 0x21000080,
+	            0x2800: 0x80,
+	            0x3800: 0x1040000,
+	            0x4800: 0x40000,
+	            0x5800: 0x20040080,
+	            0x6800: 0x21040000,
+	            0x7800: 0x20000000,
+	            0x8800: 0x20040000,
+	            0x9800: 0x0,
+	            0xa800: 0x21040080,
+	            0xb800: 0x1000080,
+	            0xc800: 0x20000080,
+	            0xd800: 0x21000000,
+	            0xe800: 0x1000000,
+	            0xf800: 0x40080,
+	            0x10000: 0x40000,
+	            0x11000: 0x80,
+	            0x12000: 0x20000000,
+	            0x13000: 0x21000080,
+	            0x14000: 0x1000080,
+	            0x15000: 0x21040000,
+	            0x16000: 0x20040080,
+	            0x17000: 0x1000000,
+	            0x18000: 0x21040080,
+	            0x19000: 0x21000000,
+	            0x1a000: 0x1040000,
+	            0x1b000: 0x20040000,
+	            0x1c000: 0x40080,
+	            0x1d000: 0x20000080,
+	            0x1e000: 0x0,
+	            0x1f000: 0x1040080,
+	            0x10800: 0x21000080,
+	            0x11800: 0x1000000,
+	            0x12800: 0x1040000,
+	            0x13800: 0x20040080,
+	            0x14800: 0x20000000,
+	            0x15800: 0x1040080,
+	            0x16800: 0x80,
+	            0x17800: 0x21040000,
+	            0x18800: 0x40080,
+	            0x19800: 0x21040080,
+	            0x1a800: 0x0,
+	            0x1b800: 0x21000000,
+	            0x1c800: 0x1000080,
+	            0x1d800: 0x40000,
+	            0x1e800: 0x20040000,
+	            0x1f800: 0x20000080
+	        },
+	        {
+	            0x0: 0x10000008,
+	            0x100: 0x2000,
+	            0x200: 0x10200000,
+	            0x300: 0x10202008,
+	            0x400: 0x10002000,
+	            0x500: 0x200000,
+	            0x600: 0x200008,
+	            0x700: 0x10000000,
+	            0x800: 0x0,
+	            0x900: 0x10002008,
+	            0xa00: 0x202000,
+	            0xb00: 0x8,
+	            0xc00: 0x10200008,
+	            0xd00: 0x202008,
+	            0xe00: 0x2008,
+	            0xf00: 0x10202000,
+	            0x80: 0x10200000,
+	            0x180: 0x10202008,
+	            0x280: 0x8,
+	            0x380: 0x200000,
+	            0x480: 0x202008,
+	            0x580: 0x10000008,
+	            0x680: 0x10002000,
+	            0x780: 0x2008,
+	            0x880: 0x200008,
+	            0x980: 0x2000,
+	            0xa80: 0x10002008,
+	            0xb80: 0x10200008,
+	            0xc80: 0x0,
+	            0xd80: 0x10202000,
+	            0xe80: 0x202000,
+	            0xf80: 0x10000000,
+	            0x1000: 0x10002000,
+	            0x1100: 0x10200008,
+	            0x1200: 0x10202008,
+	            0x1300: 0x2008,
+	            0x1400: 0x200000,
+	            0x1500: 0x10000000,
+	            0x1600: 0x10000008,
+	            0x1700: 0x202000,
+	            0x1800: 0x202008,
+	            0x1900: 0x0,
+	            0x1a00: 0x8,
+	            0x1b00: 0x10200000,
+	            0x1c00: 0x2000,
+	            0x1d00: 0x10002008,
+	            0x1e00: 0x10202000,
+	            0x1f00: 0x200008,
+	            0x1080: 0x8,
+	            0x1180: 0x202000,
+	            0x1280: 0x200000,
+	            0x1380: 0x10000008,
+	            0x1480: 0x10002000,
+	            0x1580: 0x2008,
+	            0x1680: 0x10202008,
+	            0x1780: 0x10200000,
+	            0x1880: 0x10202000,
+	            0x1980: 0x10200008,
+	            0x1a80: 0x2000,
+	            0x1b80: 0x202008,
+	            0x1c80: 0x200008,
+	            0x1d80: 0x0,
+	            0x1e80: 0x10000000,
+	            0x1f80: 0x10002008
+	        },
+	        {
+	            0x0: 0x100000,
+	            0x10: 0x2000401,
+	            0x20: 0x400,
+	            0x30: 0x100401,
+	            0x40: 0x2100401,
+	            0x50: 0x0,
+	            0x60: 0x1,
+	            0x70: 0x2100001,
+	            0x80: 0x2000400,
+	            0x90: 0x100001,
+	            0xa0: 0x2000001,
+	            0xb0: 0x2100400,
+	            0xc0: 0x2100000,
+	            0xd0: 0x401,
+	            0xe0: 0x100400,
+	            0xf0: 0x2000000,
+	            0x8: 0x2100001,
+	            0x18: 0x0,
+	            0x28: 0x2000401,
+	            0x38: 0x2100400,
+	            0x48: 0x100000,
+	            0x58: 0x2000001,
+	            0x68: 0x2000000,
+	            0x78: 0x401,
+	            0x88: 0x100401,
+	            0x98: 0x2000400,
+	            0xa8: 0x2100000,
+	            0xb8: 0x100001,
+	            0xc8: 0x400,
+	            0xd8: 0x2100401,
+	            0xe8: 0x1,
+	            0xf8: 0x100400,
+	            0x100: 0x2000000,
+	            0x110: 0x100000,
+	            0x120: 0x2000401,
+	            0x130: 0x2100001,
+	            0x140: 0x100001,
+	            0x150: 0x2000400,
+	            0x160: 0x2100400,
+	            0x170: 0x100401,
+	            0x180: 0x401,
+	            0x190: 0x2100401,
+	            0x1a0: 0x100400,
+	            0x1b0: 0x1,
+	            0x1c0: 0x0,
+	            0x1d0: 0x2100000,
+	            0x1e0: 0x2000001,
+	            0x1f0: 0x400,
+	            0x108: 0x100400,
+	            0x118: 0x2000401,
+	            0x128: 0x2100001,
+	            0x138: 0x1,
+	            0x148: 0x2000000,
+	            0x158: 0x100000,
+	            0x168: 0x401,
+	            0x178: 0x2100400,
+	            0x188: 0x2000001,
+	            0x198: 0x2100000,
+	            0x1a8: 0x0,
+	            0x1b8: 0x2100401,
+	            0x1c8: 0x100401,
+	            0x1d8: 0x400,
+	            0x1e8: 0x2000400,
+	            0x1f8: 0x100001
+	        },
+	        {
+	            0x0: 0x8000820,
+	            0x1: 0x20000,
+	            0x2: 0x8000000,
+	            0x3: 0x20,
+	            0x4: 0x20020,
+	            0x5: 0x8020820,
+	            0x6: 0x8020800,
+	            0x7: 0x800,
+	            0x8: 0x8020000,
+	            0x9: 0x8000800,
+	            0xa: 0x20800,
+	            0xb: 0x8020020,
+	            0xc: 0x820,
+	            0xd: 0x0,
+	            0xe: 0x8000020,
+	            0xf: 0x20820,
+	            0x80000000: 0x800,
+	            0x80000001: 0x8020820,
+	            0x80000002: 0x8000820,
+	            0x80000003: 0x8000000,
+	            0x80000004: 0x8020000,
+	            0x80000005: 0x20800,
+	            0x80000006: 0x20820,
+	            0x80000007: 0x20,
+	            0x80000008: 0x8000020,
+	            0x80000009: 0x820,
+	            0x8000000a: 0x20020,
+	            0x8000000b: 0x8020800,
+	            0x8000000c: 0x0,
+	            0x8000000d: 0x8020020,
+	            0x8000000e: 0x8000800,
+	            0x8000000f: 0x20000,
+	            0x10: 0x20820,
+	            0x11: 0x8020800,
+	            0x12: 0x20,
+	            0x13: 0x800,
+	            0x14: 0x8000800,
+	            0x15: 0x8000020,
+	            0x16: 0x8020020,
+	            0x17: 0x20000,
+	            0x18: 0x0,
+	            0x19: 0x20020,
+	            0x1a: 0x8020000,
+	            0x1b: 0x8000820,
+	            0x1c: 0x8020820,
+	            0x1d: 0x20800,
+	            0x1e: 0x820,
+	            0x1f: 0x8000000,
+	            0x80000010: 0x20000,
+	            0x80000011: 0x800,
+	            0x80000012: 0x8020020,
+	            0x80000013: 0x20820,
+	            0x80000014: 0x20,
+	            0x80000015: 0x8020000,
+	            0x80000016: 0x8000000,
+	            0x80000017: 0x8000820,
+	            0x80000018: 0x8020820,
+	            0x80000019: 0x8000020,
+	            0x8000001a: 0x8000800,
+	            0x8000001b: 0x0,
+	            0x8000001c: 0x20800,
+	            0x8000001d: 0x820,
+	            0x8000001e: 0x20020,
+	            0x8000001f: 0x8020800
+	        }
+	    ];
+
+	    // Masks that select the SBOX input
+	    var SBOX_MASK = [
+	        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+	        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+	    ];
+
+	    /**
+	     * DES block cipher algorithm.
+	     */
+	    var DES = C_algo.DES = BlockCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+
+	            // Select 56 bits according to PC1
+	            var keyBits = [];
+	            for (var i = 0; i < 56; i++) {
+	                var keyBitPos = PC1[i] - 1;
+	                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+	            }
+
+	            // Assemble 16 subkeys
+	            var subKeys = this._subKeys = [];
+	            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+	                // Create subkey
+	                var subKey = subKeys[nSubKey] = [];
+
+	                // Shortcut
+	                var bitShift = BIT_SHIFTS[nSubKey];
+
+	                // Select 48 bits according to PC2
+	                for (var i = 0; i < 24; i++) {
+	                    // Select from the left 28 key bits
+	                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+	                    // Select from the right 28 key bits
+	                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+	                }
+
+	                // Since each subkey is applied to an expanded 32-bit input,
+	                // the subkey can be broken into 8 values scaled to 32-bits,
+	                // which allows the key to be used without expansion
+	                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+	                for (var i = 1; i < 7; i++) {
+	                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+	                }
+	                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+	            }
+
+	            // Compute inverse subkeys
+	            var invSubKeys = this._invSubKeys = [];
+	            for (var i = 0; i < 16; i++) {
+	                invSubKeys[i] = subKeys[15 - i];
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._subKeys);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._invSubKeys);
+	        },
+
+	        _doCryptBlock: function (M, offset, subKeys) {
+	            // Get input
+	            this._lBlock = M[offset];
+	            this._rBlock = M[offset + 1];
+
+	            // Initial permutation
+	            exchangeLR.call(this, 4,  0x0f0f0f0f);
+	            exchangeLR.call(this, 16, 0x0000ffff);
+	            exchangeRL.call(this, 2,  0x33333333);
+	            exchangeRL.call(this, 8,  0x00ff00ff);
+	            exchangeLR.call(this, 1,  0x55555555);
+
+	            // Rounds
+	            for (var round = 0; round < 16; round++) {
+	                // Shortcuts
+	                var subKey = subKeys[round];
+	                var lBlock = this._lBlock;
+	                var rBlock = this._rBlock;
+
+	                // Feistel function
+	                var f = 0;
+	                for (var i = 0; i < 8; i++) {
+	                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+	                }
+	                this._lBlock = rBlock;
+	                this._rBlock = lBlock ^ f;
+	            }
+
+	            // Undo swap from last round
+	            var t = this._lBlock;
+	            this._lBlock = this._rBlock;
+	            this._rBlock = t;
+
+	            // Final permutation
+	            exchangeLR.call(this, 1,  0x55555555);
+	            exchangeRL.call(this, 8,  0x00ff00ff);
+	            exchangeRL.call(this, 2,  0x33333333);
+	            exchangeLR.call(this, 16, 0x0000ffff);
+	            exchangeLR.call(this, 4,  0x0f0f0f0f);
+
+	            // Set output
+	            M[offset] = this._lBlock;
+	            M[offset + 1] = this._rBlock;
+	        },
+
+	        keySize: 64/32,
+
+	        ivSize: 64/32,
+
+	        blockSize: 64/32
+	    });
+
+	    // Swap bits across the left and right words
+	    function exchangeLR(offset, mask) {
+	        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+	        this._rBlock ^= t;
+	        this._lBlock ^= t << offset;
+	    }
+
+	    function exchangeRL(offset, mask) {
+	        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+	        this._lBlock ^= t;
+	        this._rBlock ^= t << offset;
+	    }
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.DES = BlockCipher._createHelper(DES);
+
+	    /**
+	     * Triple-DES block cipher algorithm.
+	     */
+	    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+	        _doReset: function () {
+	            // Shortcuts
+	            var key = this._key;
+	            var keyWords = key.words;
+	            // Make sure the key length is valid (64, 128 or >= 192 bit)
+	            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+	                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+	            }
+
+	            // Extend the key according to the keying options defined in 3DES standard
+	            var key1 = keyWords.slice(0, 2);
+	            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+	            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+	            // Create DES instances
+	            this._des1 = DES.createEncryptor(WordArray.create(key1));
+	            this._des2 = DES.createEncryptor(WordArray.create(key2));
+	            this._des3 = DES.createEncryptor(WordArray.create(key3));
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._des1.encryptBlock(M, offset);
+	            this._des2.decryptBlock(M, offset);
+	            this._des3.encryptBlock(M, offset);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            this._des3.decryptBlock(M, offset);
+	            this._des2.encryptBlock(M, offset);
+	            this._des1.decryptBlock(M, offset);
+	        },
+
+	        keySize: 192/32,
+
+	        ivSize: 64/32,
+
+	        blockSize: 64/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.TripleDES = BlockCipher._createHelper(TripleDES);
+	}());
+
+
+	return CryptoJS.TripleDES;
+
+}));
\ No newline at end of file
diff --git a/node_modules/crypto-js/x64-core.js b/node_modules/crypto-js/x64-core.js
new file mode 100644
index 0000000..57dcc14
--- /dev/null
+++ b/node_modules/crypto-js/x64-core.js
@@ -0,0 +1,304 @@
+;(function (root, factory) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function (undefined) {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var Base = C_lib.Base;
+	    var X32WordArray = C_lib.WordArray;
+
+	    /**
+	     * x64 namespace.
+	     */
+	    var C_x64 = C.x64 = {};
+
+	    /**
+	     * A 64-bit word.
+	     */
+	    var X64Word = C_x64.Word = Base.extend({
+	        /**
+	         * Initializes a newly created 64-bit word.
+	         *
+	         * @param {number} high The high 32 bits.
+	         * @param {number} low The low 32 bits.
+	         *
+	         * @example
+	         *
+	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+	         */
+	        init: function (high, low) {
+	            this.high = high;
+	            this.low = low;
+	        }
+
+	        /**
+	         * Bitwise NOTs this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after negating.
+	         *
+	         * @example
+	         *
+	         *     var negated = x64Word.not();
+	         */
+	        // not: function () {
+	            // var high = ~this.high;
+	            // var low = ~this.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ANDs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to AND with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ANDing.
+	         *
+	         * @example
+	         *
+	         *     var anded = x64Word.and(anotherX64Word);
+	         */
+	        // and: function (word) {
+	            // var high = this.high & word.high;
+	            // var low = this.low & word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise ORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to OR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after ORing.
+	         *
+	         * @example
+	         *
+	         *     var ored = x64Word.or(anotherX64Word);
+	         */
+	        // or: function (word) {
+	            // var high = this.high | word.high;
+	            // var low = this.low | word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Bitwise XORs this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to XOR with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after XORing.
+	         *
+	         * @example
+	         *
+	         *     var xored = x64Word.xor(anotherX64Word);
+	         */
+	        // xor: function (word) {
+	            // var high = this.high ^ word.high;
+	            // var low = this.low ^ word.low;
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftL(25);
+	         */
+	        // shiftL: function (n) {
+	            // if (n < 32) {
+	                // var high = (this.high << n) | (this.low >>> (32 - n));
+	                // var low = this.low << n;
+	            // } else {
+	                // var high = this.low << (n - 32);
+	                // var low = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Shifts this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to shift.
+	         *
+	         * @return {X64Word} A new x64-Word object after shifting.
+	         *
+	         * @example
+	         *
+	         *     var shifted = x64Word.shiftR(7);
+	         */
+	        // shiftR: function (n) {
+	            // if (n < 32) {
+	                // var low = (this.low >>> n) | (this.high << (32 - n));
+	                // var high = this.high >>> n;
+	            // } else {
+	                // var low = this.high >>> (n - 32);
+	                // var high = 0;
+	            // }
+
+	            // return X64Word.create(high, low);
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the left.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotL(25);
+	         */
+	        // rotL: function (n) {
+	            // return this.shiftL(n).or(this.shiftR(64 - n));
+	        // },
+
+	        /**
+	         * Rotates this word n bits to the right.
+	         *
+	         * @param {number} n The number of bits to rotate.
+	         *
+	         * @return {X64Word} A new x64-Word object after rotating.
+	         *
+	         * @example
+	         *
+	         *     var rotated = x64Word.rotR(7);
+	         */
+	        // rotR: function (n) {
+	            // return this.shiftR(n).or(this.shiftL(64 - n));
+	        // },
+
+	        /**
+	         * Adds this word with the passed word.
+	         *
+	         * @param {X64Word} word The x64-Word to add with this word.
+	         *
+	         * @return {X64Word} A new x64-Word object after adding.
+	         *
+	         * @example
+	         *
+	         *     var added = x64Word.add(anotherX64Word);
+	         */
+	        // add: function (word) {
+	            // var low = (this.low + word.low) | 0;
+	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+	            // var high = (this.high + word.high + carry) | 0;
+
+	            // return X64Word.create(high, low);
+	        // }
+	    });
+
+	    /**
+	     * An array of 64-bit words.
+	     *
+	     * @property {Array} words The array of CryptoJS.x64.Word objects.
+	     * @property {number} sigBytes The number of significant bytes in this word array.
+	     */
+	    var X64WordArray = C_x64.WordArray = Base.extend({
+	        /**
+	         * Initializes a newly created word array.
+	         *
+	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+	         *
+	         * @example
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create();
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ]);
+	         *
+	         *     var wordArray = CryptoJS.x64.WordArray.create([
+	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+	         *     ], 10);
+	         */
+	        init: function (words, sigBytes) {
+	            words = this.words = words || [];
+
+	            if (sigBytes != undefined) {
+	                this.sigBytes = sigBytes;
+	            } else {
+	                this.sigBytes = words.length * 8;
+	            }
+	        },
+
+	        /**
+	         * Converts this 64-bit word array to a 32-bit word array.
+	         *
+	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+	         *
+	         * @example
+	         *
+	         *     var x32WordArray = x64WordArray.toX32();
+	         */
+	        toX32: function () {
+	            // Shortcuts
+	            var x64Words = this.words;
+	            var x64WordsLength = x64Words.length;
+
+	            // Convert
+	            var x32Words = [];
+	            for (var i = 0; i < x64WordsLength; i++) {
+	                var x64Word = x64Words[i];
+	                x32Words.push(x64Word.high);
+	                x32Words.push(x64Word.low);
+	            }
+
+	            return X32WordArray.create(x32Words, this.sigBytes);
+	        },
+
+	        /**
+	         * Creates a copy of this word array.
+	         *
+	         * @return {X64WordArray} The clone.
+	         *
+	         * @example
+	         *
+	         *     var clone = x64WordArray.clone();
+	         */
+	        clone: function () {
+	            var clone = Base.clone.call(this);
+
+	            // Clone "words" array
+	            var words = clone.words = this.words.slice(0);
+
+	            // Clone each X64Word object
+	            var wordsLength = words.length;
+	            for (var i = 0; i < wordsLength; i++) {
+	                words[i] = words[i].clone();
+	            }
+
+	            return clone;
+	        }
+	    });
+	}());
+
+
+	return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index aac4a5c..97e18d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,11 @@
       "resolved": "https://registry.npmmirror.com/chinese-workday/-/chinese-workday-1.10.0.tgz",
       "integrity": "sha512-wHar+6Qd/lPDHYHdnCrb1ZJvj8Kjyy3lPrjQEqtlWqw9TRlRLTWnPUi/esB5OJFbEedYGJEP5o5zrrp4wLBCVA=="
     },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "dayjs": {
       "version": "1.11.10",
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
diff --git a/package.json b/package.json
index 4f41f2d..c37973e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "chinese-workday": "^1.10.0",
+    "crypto-js": "^4.2.0",
     "dayjs": "^1.11.10"
   }
 }
diff --git a/pages/index/index.js b/pages/index/index.js
index 64f346e..b82fe47 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -5,6 +5,7 @@ import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 import https from "../../utils/https.js"
+
 Page({
 	data: {
 		banner: [],
diff --git a/utils/https.js b/utils/https.js
index 50f43f4..58ee3a1 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"
diff --git a/utils/https/common.js b/utils/https/common.js
index 87d723e..87c398e 100644
--- a/utils/https/common.js
+++ b/utils/https/common.js
@@ -1,6 +1,7 @@
 const baseUrl = "/";
 const app = getApp();
 import baseHttp from "../https.js";
+import encodeData from "./myCropto.js"
 const _get = (url, data) => {
   return new Promise((resolved, rejected) => {
     baseHttp._get(baseUrl + url, data).then(res => {
@@ -31,6 +32,13 @@ const _post = (url, data) => {
 }
 const user_post = (url, data) => {
   return new Promise((resolved, rejected) => {
+    if (url=='order/create' && data && data.data) {
+        console.log(data.data)
+
+        data = encodeData(data.data)
+    }
+    
+
     baseHttp.user_post(baseUrl + url, data).then(res => {
       resolved(res)
     }).catch((err) => {
diff --git a/utils/https/myCropto.js b/utils/https/myCropto.js
new file mode 100644
index 0000000..c531beb
--- /dev/null
+++ b/utils/https/myCropto.js
@@ -0,0 +1,36 @@
+import CryptoJS from "crypto-js";
+
+const secretKey = "0p88k7EksjnEqcmrWSHawRp7CV";
+
+
+// 参数加密  dataStr 是JSON.stringify()后的字符串
+const encodeData = (dataStr) => {
+    try {
+        // let data = JSON.parse(dataStr)
+        // 对参数进行排序并拼接成字符串
+        // const sortedParams = Object.keys(data).sort().reduce((acc, key) => {
+        //     acc.push(`${key}=${data[key]}`);
+        //     return acc;
+        // }, []).join('&');
+
+        // console.log("sign", sortedParams)
+
+        // 使用CryptoJS库基于HMAC-SHA256算法计算签名
+        const signature = CryptoJS.HmacSHA256(dataStr, secretKey).toString(CryptoJS.enc.Base64);
+
+        // 将签名添加到请求参数中
+        const requestData = {
+            data: dataStr,
+            signature: signature
+        };
+        console.log(requestData)
+        return requestData
+    } catch(e) {
+        console.log(e)
+        return {data: dataStr}
+    }
+
+}
+
+module.exports = encodeData
+
diff --git a/utils/util.js b/utils/util.js
index b31d739..7b5921e 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,5 +1,6 @@
 var app = getApp()
 import commonApi from "./https/common"
+
 const formatTime = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1

From b836a861149b7dfc40cc8aef2f4a16c677dd0dd6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 25 Dec 2024 17:05:46 +0800
Subject: [PATCH 235/471] =?UTF-8?q?=E9=97=A8=E7=A5=A8=E3=80=81=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                               |   4 +-
 images/home.png                        | Bin 3694 -> 3876 bytes
 images/index_seld.png                  | Bin 15587 -> 0 bytes
 images/index_seld_1.png                | Bin 4591 -> 0 bytes
 images/index_seld_2.png                | Bin 5534 -> 3786 bytes
 images/map.png                         | Bin 6225 -> 6407 bytes
 images/map_seld.png                    | Bin 24650 -> 0 bytes
 images/map_seld_1.png                  | Bin 7019 -> 0 bytes
 images/map_seld_2.png                  | Bin 7901 -> 6360 bytes
 images/user.png                        | Bin 4465 -> 4631 bytes
 images/user_seld.png                   | Bin 17562 -> 0 bytes
 images/user_seld_1.png                 | Bin 5070 -> 0 bytes
 images/user_seld_2.png                 | Bin 5879 -> 4547 bytes
 pages/index/imgSource.js               | 113 ++++
 pages/index/index.js                   |  19 +-
 pages/index/index.wxml                 | 200 ++----
 pages/index/index.wxss                 |  95 ++-
 pages/info/sceneProductInfo/index.js   | 117 +++-
 pages/info/sceneProductInfo/index.wxml |  78 ++-
 pages/info/sceneProductInfo/index.wxss |  39 +-
 project.private.config.json            |   4 +-
 subPackages/index/index.js             |  52 +-
 subPackages/index/index.wxml           | 844 ++++++++++++-------------
 subPackages/index/index.wxss           | 150 ++---
 utils/https.js                         |   4 +-
 25 files changed, 947 insertions(+), 772 deletions(-)
 delete mode 100644 images/index_seld.png
 delete mode 100644 images/index_seld_1.png
 delete mode 100644 images/map_seld.png
 delete mode 100644 images/map_seld_1.png
 delete mode 100644 images/user_seld.png
 delete mode 100644 images/user_seld_1.png
 create mode 100644 pages/index/imgSource.js

diff --git a/app.json b/app.json
index 3fa2a3a..9b8bc0d 100644
--- a/app.json
+++ b/app.json
@@ -230,8 +230,8 @@
   "style": "v2",
   "sitemapLocation": "sitemap.json",
   "tabBar": {
-    "color": "#999",
-    "selectedColor": "#F58812",
+    "color": "#97D0EC",
+    "selectedColor": "#5184B0",
     "borderStyle": "white",
     "list": [
       {
diff --git a/images/home.png b/images/home.png
index daff9c315440a9d7cdadfda0b52dbce4c7a8ec44..1b46e083635ee54775468d6f29ed21bbbe2c20cd 100755
GIT binary patch
literal 3876
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

literal 3694
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
M07*qoM6N<$g3svT`Tzg`

diff --git a/images/index_seld.png b/images/index_seld.png
deleted file mode 100644
index a2d23814bf67b118d963ceec7cdd209155caa250..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15587
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

diff --git a/images/index_seld_1.png b/images/index_seld_1.png
deleted file mode 100644
index d8fdc23753c947b1fa3be29e018467c59b152935..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4591
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
Z{|i02`@`H<mQVly002ovPDHLkV1n~M(Ut%J

diff --git a/images/index_seld_2.png b/images/index_seld_2.png
index 99298186d06c97a82076d7edbe4085804da58939..768c5d907de5251a45852bf7c4942fed42f21353 100644
GIT binary patch
literal 3786
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
A4*&oF

literal 5534
zcmV;P6=CX$P)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00001b5ch_0Itp)
z=>Px~SV=@dRCr$Poe7jw)tSft-+i@qHy|n?i?~Ed#Hgr~n0P#iilV4^OmbY}8a3kH
zERBc@*bbSQ1dSm~G(+MNop_v>(MiSu0fA;wF)oQ)451C8vDHIV_U@{B?|uK_-d9!K
z4UOH^-9`6FsKcR(s`u`@@Av-iyWjWS?>+>3US%a9Wo>;=<JbeZ%p%wWcn{z*6DV`@
zdldYS448yq@mXIdf++;P1|ksX5(&duGIq&JWoFYY&G%{r^O-Y_pzux-CmC=rl3=Kx
zl6)rgOl|VCMXS4oLKz$BwSXO5!+!_yby%=U*mr^b45jKK&(n!Aw(iem<kRJ*dnI5l
zKl3mIIvbENsv)4Ta6^EA(z9<MmCE@+Mkl4tTlRLBNtCI9UI&;<&;C5a+z%-@1B6JV
z-faY)fU=KJPX~~;-)p4mc_F>2$#a&xRVGGVYPMGa=JK-+WiI>)3{QnZtjz`KL-Al!
zF1({MhJH%S5bz?6ezS^JkV`z_L^)?=uY=rc0JHA2Ll}Cq#o$a0oK3KQ0)~9l6H_Z=
z7p${V%FI9cb1}vD5b``wjgyzE-C>cJ;{>_j*)?5~TsQCBD*&_Z^aG*hha|s2Qf#NF
z45;C+0_q*9GnW3P<#{*#@0f$)%>6USb3rDZ8F8jW7b!U<dETlwx|vg_o9l7FTt4m~
z`r#aaX95sfF<Rv+f8`n6BBw3-Yg=cRdE$hFV`64Ncp35@1}$a9G8InfEs%Q@Fjt;6
zoVjqeK&)~Lu2@Lw6Q05CGUl23&yr5l<6k={?u9c!oKG_5Y_dg6ERKN_<$@Rf)M@E;
z(~dm`nDf6mOp{G_32?sk7Azc9suBFg&xN-q&sy9eI89F+e}EUFR>%tgq?~zipmhl~
zHYIV<^RIRjt4=l3BY;^qb{IpM4Z$}+8V5w70{yLc;S@P#$=XuRrs=V-9O#MMF2XCF
zk6idmxsv3B#6>Ul806g!m`lzYstE5kA{W@`EQ0Gk&GUS{SvsiP9WOxRV_(`oCgx57
zE&&mli|DVqtRGIQy6pF_mvYg%Yunuln2XOIq$d1<ke7mV$EK=fywD@2$>|GU>&l5W
zK5^WzL=H0uUIe1Th1Je1b2&mYC2{GCFL$N=&g{F}0CUAR2Wyy}B_S^qfpM;@6EGKg
zDidYwf^NwvG(PsV{bR`7BFbx=S5gQ_z~_C@iIo?>x?8hwy9F>8oHkhFv40ilWw6n&
zb*mz?u*5T7jhs5aTm9C?UmiCsCgF4{E*C*OvJ@_ISqY;P5*NL?+iY^#0dvLJ0UF3m
z0j>a}lXWf`xy%b?s*GJw7De%iV+Z>gGaagz0;sgXh@(t>7GO={ve#bh%q?H)K4k^W
zx^M5R-28nz@CcbG<PS(J^CYO2Qx|uua(5c|9zJSl%y`p4Tq}TAG#AA0K%J1d;`QH^
z3ar%a%LbUwePf{dxtXH4Qb>1l*43r*Igh-ts{>j`PjuUV9y>Tr-Ujl!0w(j$1wpKW
z(dxu^-gu>>ZFOe5vH<3S)AmNnyMrp@g-k^jP_3`~f*_nCW1e}gGo9`1K78cJfj+(4
zL0%4`%9>+);!3_?pf&L;-h95ZZMU~yw*$6tH5tEC$SVa*y8+FfOvqIp^hP;tQCStU
zs}tr!U)nD~a1%wVLB_0-^RpwbXc$gRU;Wmz?ZN8I@7)TRb>sF`;dD`2n-|X~ZV2H^
z;^T&L4QL%baXxtTfGopXMR<)sQqCs3sS&<J2`5%uxq4Mc+v@0c-3FL-=j^2t+$zfJ
z1gNx~w+d0^A2ei5{Pcx&9qm*(x7+gI(F5WPrU~#}A^Tdy`GDj_4b4sIYu;GVoyYGM
zz<l=XKAKaT3%FK@J_Wc`{$2v7+-_G!S0HTt`4<Ppff^W0u-;9<T&Utzs!mE@yLwqy
z+HbjUmjQF-nf(#SR0^v_QIU6rtc81Bl-J9cr+4ds)=@B9<{UC0o=n^%f*S-#Terdm
zBjhV;%;fY{Z>{WTTc5REmjLsHv3)h`-6YBz1?Xo7G-nn<{Lz?jlAN;WneOOhx!Txt
z&*6I~t1wld*9g(C*<A4V>W4My8{h7-k~<BU3&&JyGC5VOPYd>Ua1FqKZwhgPjCp!_
zxxjR1yPP{>-yF;&5;Y=77R_6TH#}le{Dw74x^lcu0p>HO^wUIYq9~?_u!>>iih=x7
z80huAWkBmF7(RML|J>G~h72bQCGE_dxJ2J;al=XRYdf#xk^!^s+$xn!wSbca+{ePT
zvy=>3FVIPH>cV*)J+a=j-NyTl=%18ajRCF$+27h^6IBttMx#@b*R5S*PqWlMmjsw~
zC#F>TRtt2B5Ccesh}e3uH6cxP{M301OYJ~!+Mf3xzIV>|t5tck5ja2D)&(f}7DOkd
zu777ysr~IR;7GYmHh{QQfV~Q}Vj$NF^m;jE;et{RUe4|Ff!fZ85PSFUT8W%{aKBt&
zCMh}9K%95s>@s0zL~2siYZsT&?+yXx%i}7v5m$?Hng|9uo9kw8`L2l8$mj+CQ_4Zh
zwJmFF&6dGW?VU>ahmhexqLPlr2Ag`0mP=4|BPeSUef;<2;<q=q)fdh=q;Ezr*$8d`
zbst;R;>-p3M<}Lzf5W;(wY9EduH9F=fceLB6ZklH6{)uhIK+7i;&KZO#>jOzdEQf<
zu}$svti%micVaC2?xr(D!|MPZCPWIbg@VNa*xu__y8d=0Zc*|%qx@0wx<9u$SI7H?
z_s<00^&)b!fK@i7;vf^NL*<l;iSN$0*0H^AekNc(e{LFn(-qq@jdzI10ETv&$GT$z
z2KuJJKS54iys5o|l>2u+bYRLieJ|dgu&XuXP?uk73AW|u{Iou4>#q2k5pQDrnm@G}
z9)B|DkiJ#$Zy?Mq0IQ-P%H0QVg<@)|Cai1MEbbC;1UGXj$?0NbC|$i+)bU8c`mPCi
zjGVsk({clBuYLc)QO7Iv0VDWAzT&dj*JjYJ^U*AJ{ygFy;QOp&Ecj0P>b38+X)f*^
zS(OR5O{8Li5$tPsH{#lP3o6r+tKOS0zec#LKDG(i-foEXyM!9n3Nbuy<fF<PS5xW$
ze_-O-qvWJzAGZgfoWFDa*rfkq!)$_A0>$~aHWi%Do)ya`@@m{{Al31G*Zfk>Ya5gu
z_%cnwwF0r3xIXqGMvzf2p-fHG{PnlHG8a1mX8qVC8WI=M==X#eQcO7#8Bne3Vl4zz
z(O}}4Q9Ta$p;3GJ)Rji?#n76tygG~T1;ys4@LQRVsDjf6`Ear_xKS=&m)VsVc<+F!
ztY2|05Y7Oks*vXfxLO2LQj;3m^#5A{wrW6S;(S79ipX$lbE6<a->33FK-56k-}#2B
z4JMK6alnlaA2rkjy2=ymzms{00Once>xrX(MGBAXsU7*|ZI;Bh2VVcy*3Y`zICn@z
zQ=_>-EC*nq-O-cn$dzk6;^xHg51!ibE+_)FE)Gt7<$OYBituv<Z-J^GX^0vx7QU!~
ztb}quV*m}b!36#&8P~HWqUrvl4=@N;7=z*3mVyhlY6aM>2E3>$1?2o>zsmFF($}}O
zXU?n(*W_o%Zx64gi?FYq$c^r3t_65=dh16|N(&b*@(o`;HjeDjZ_(#0G1%XQzxKik
zKNNDBoc#17Ty)l<3V$WYK~BM;HkdHzdB6`JJ6!ziN>4D{DY#%FiqrJbxRGDik>|Ig
zf-T^x4gq$}-!-T*>&3>0)LH}S+ictU_V(otH&x!e{x^jSCC)5VCB~8Z1M%cw`kK#*
z>3R{Fj=n=5l7IS{&&6kqU>L5T1#GWa5H=VMdmrFpB~K*IW>Zjb-CDvf=738A>>%GW
zEZwBxH6*4Q;ePh8p1rd}{R_!y>Ga>8l4@jyE6+aH`MKob&RdA!ePWE<1~fh_CoOY^
z-vZXqUjan~*ebX;0KWg|1B5xN;K&B&)!Nb>D=N4Eyr}Z%1A(Vg{i@FEh>2)vLhQiT
z)D*jN`znz;Jfr<>HJE2;ZSp$=e)wrD`Jm{Eajy#GDC;eVyWsjaf!tnDZlOU3IIw{8
z3buf$J+9zw4;(!trnyxH99{@8if~&GW;?oP`SH#91M}1U`dm;dV0U@u4ynj)4!^6w
zop!NgbCAOgDl$@Z`MCE4*xyF#8tBIcoCz8DGdbxOty~r^9z8;HVk4eGHe__6GI}1c
z&4Brel}0!+bmg#lFX6N8ZXT`^u&>~w6+v*FOn$$ql|pL~L)DPIw&ql-a$ndWwabFG
z2Elh~4@?cJ*me~m(>$9_i0+FVfrBJme%1t0TmzwzfO8NAzmU@w?KGNl-slkutN<~{
zc@b8@s2U~Xp6b~^<MFSia~n4P6vRaoyNsaVhV2k87hSf<1{du!uvNgR$^F*-tfh;^
z$Kho^7<>vfb_+#4qr5A*{|EDS8I0J0kGv>UonVvo27GLjiOr4%xxVpzuwkoU@FDB%
zfY#PkY6jfGi!kVM6Jdvq%>9R-WK<s^IkY*@*l92;4tNE)(Q+off*`mcHTnHkt3`Rw
zu)Q;oUlBT5T(*+Wr{kHiQvGS088~-YYeyy;)9d%OpDWUPeInIwXWPxD6>adm(IZH%
zP-2iLc@xnK0J{@==)hDqlfG7jw~^c@AI9zwE=S5P<Sp%b5CPUgWzzRIuARSQ`f=;5
z1NSpAf0+=U7kj=cYtv@Smt^whl5#I40aoP-QU}@S#o1s_dR)Op0n8mzk<&hQwURBo
zK3u>!+>*OO1ZUINZm~^BL6Z<GavJ`)&vVDEl3)LNr)166*#`~sLVqcsBcnPt)ca=Z
zSNfF|aH!4?b_%w+h(;MD7xru<x5J=hFks}s4E+%h94vyAOW#DJvJ;aMn}~3AMIU(w
zm#^Ejt6a7PEMa!30Y<t~1P6FqnE?mk3W9^YsF<(8WK6FD+zPf;>($4`Fr-hbr1-8p
zfgQ)4t+NLXk}$T^kRx4eps4q~asqyG^a%CB71V->&<2x@^;*E~<rLcc-2o1~77Av)
z?=_WK!F~{#2zSS6gUQAJ0RS^^gSFoGGGzq(<Ow5GOdfFF5BC4w0h^_U7#VpHsP|*#
zRImjM3s|FUnregRC;q+_?3<+qc?B!${dl<*46LBdMHB!B$u0xt1E24c^HRe_P>F1?
zi&<JfnhQqpt+fetzcoj(aYONACM3g#%D=5!-!ebjp6xCC?rd-ou=OHX@5i!bHW4<^
z&_bZ04PHg6OMY<n=f@mIFSuI-Bki+z3KI;)>{l_rTL=<bObHbe=XoSiwR&?xCn|f|
zAcCKy_Iu~SU4^*20v-XDW-nrQ01k_Ou-FWKgIAI4G+;Zinp?M_X1gDHhp}rp+L~r>
zk+5kyL)Ie4YbRq}OwpY1v1!#n_2m@eqoum-B9qSqoRi2z6l`$3j0(;?dBTWTpphS(
zkL0{cJ7x4rr;<IKb4W5<nYNEJ7!M#>n2ane7>p9-`LgI%nXwisZL8kFi9OmkKb7-r
zqlurnPp1JFA~|b=bLBG;ng2RrM9kP34QnFugIuMZGU_~FzcPInEnp%EVMua46dP<(
zT8w+dLB5uupj5ZMIeHbcW(6}+_%bpT_Bz=h?LAS<Np5;~VX1c5nTQ;UCL$o~!}0?D
z@`#vo(+Ysu;8k@MaK$V@$CF5j4Pk|MGnB`Yaj``L?v*Wk=+Nktbz3FvegQ=TX41pH
z`jMQsbFQJi=C=OJz(Eo(044%OeV8b#g1<Z>X5BP&C*ag95aUVOCzWha$Ze^s-u!8M
zC%-#>cYr-zYU}_EBBbmtz%6Vr!clTzS4>1=7HAw`02>){Msn}N@9T`>x*K`{u=Q|k
zvL~cfuwPCaY!xi6O+=RgTLp7GH4j)ZBe~@8``St$b~nKG+A9Lidl3=fpv-`20dtU>
zp0;k9os;W|g43y@4R#7vosnE}L@xpyE)|=u6gyLl`Y>5`z{o4u<wqMDp`-eC7hrPZ
z_L9<G2sjFrLu!4P)G{krE#UmLy=p_uP8oFta56CqLgz&|1@}6@L8M@3gSk5Z+bN@b
z;fV!Y;T<L4eDRa^>{(mC+d#u_0hrW{+cQWrl69kckBKlAaFlST4VBBSU@zoK0s{+^
zo=qOQW+IZYS%8dJ=S8qr0dD->K11PgDZmkt4d&`f!SQm-rVXVCs>73>nMaR1)I+$8
z#1I>TQgyx3j80zq@|&d`u&^!Xj7|E<cV^j0E^^Z>VD=sb|J&YU1pLMJ+MU5RY7}63
z+KY{on?K%C%K3H}Fdsf@sBhwr8sXPnFsf+UUhg(Dv2ox%QvGxkLY461<0BK<4SJWr
zx@ky(+_=5fUIDoNMkI#}?*C&5zvIGqFiXh2l~o&WwFP}8oMy-WCm23*WM$wbCv9I}
zdWQh9XuX5}+4tq*$}9g+@&n&^F1+mM!|t{VvE3loO8|2&;*A^kITISr6<cH-C6qq#
z$V-y9ZeGxll|?NtK!+9V@&XSZb0h@wV+KP*yH-wIR%Mw@sDuckXZ!}y6aCtL<+J8l
zFO)cwA$5`v=YdREz{be*_|l_(+Sx#ZwI{|hd#xEFS)_Bt4m5v?zDfYt@jD<9%QDO)
zt7yVg1@4J02UxaokMLFIL33AC-q!eGDeAS`mIT-?r49bN`F0YMMGDX3aXH0CyVk)~
z&9s@<&1b*z>BmSFYP}z;T$`J*`)#ykw8`b8?(GcVy4n+C$M>s0Csf`-#pi6ouUK^A
zDo5NwqK7lNSBn)#&53%uK+QhHDQUloN>SxQl9yE7wy9IA?n?sfy7kDB0|R*XQ8`Wo
ziNa!#HWTJ;z~045p9rv68+=Ts+_c6yLx<7lqNKrLIk)=1W!^Xf+VZ>R1b)k;eYBmu
z4)$Gv_XYaT6}c@Bl$!1=D7|FBcE`-4qYgCzYZ&585$-D@DYuHUFm2=dw{v2=#X`Qk
zh@!-JRGP$(B*cx$>bL*9)Z5T*-+0fkq113u%wS}zr387kwt`#eU*WerP+QX$s;vd$
z27qf6GJE6tP5-z5kI<^DwUqvK3b5;+ea3<>CqwZq0AB_$gw&+CLd1Mx+}(~X%SBtL
zrFr#_T^6<tDo+OS+%1(?zgx1MbN!i%cxKyv7eX<ez`=G>t9hYo^Tlp8?`L<6o>6Lt
zlN=}?6S|tjGcnQMCUaZXN^OhT)KbXix9v3GP8{nWa+f`T%Y51Q0Nw+*%mm8Z{2m4G
g0bFJRWp4ie0R@OCt&ED%1ONa407*qoM6N<$f~2v(>;M1&

diff --git a/images/map.png b/images/map.png
index 205703a3b73629bdf602fa2a519b358b3b1b33a5..41f62a8aca77d8336400156b822857e6b599a187 100755
GIT binary patch
literal 6407
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
Vq4C9(quT%g002ovPDHLkV1jxOR@eXl

literal 6225
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

diff --git a/images/map_seld.png b/images/map_seld.png
deleted file mode 100644
index 6c7632ca7906409f851e83209d65b1398ef51787..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24650
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%0DjL(-C0w
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
R)MWqw002ovPDHLkV1j-r&3pg=

diff --git a/images/map_seld_1.png b/images/map_seld_1.png
deleted file mode 100644
index c972214340db3d6566e0a84047e3cb7502591cdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7019
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
JPDHLkV1gwQzd8T_

diff --git a/images/map_seld_2.png b/images/map_seld_2.png
index cb83501da4970f19cb747d05350e027a5f84f48c..3ce5d86242159018299f4818d87a3c42b061555e 100644
GIT binary patch
literal 6360
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
a^nU=H)iv?<_((ti0000<MNUMnLSTZZbudl<

literal 7901
zcmV<39wOn1P)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00001b5ch_0Itp)
z=>Py8mq|oHRCr$PT?d#{)!BZ(bMMT~%<i%@8={h^pr}X$gZ&557*Vjq1vD|ns6SBz
z1v^+)1qB5mC<0=MfJ(p`3&s)=3ravNvBd@!y1*`MnVEaP_uq5x>`K`(3%hFad!L7A
zce!UydCxiD`O15~5&ZNtDFV`@wf|H(ege3O7r{>e{{(OoBhbXv|FnXCEC6#>p@ZF{
zxyaQx%FCi~a}6S@NW+H{@lfKY;YG{Q{Vz!oFq?k!^};xk6}d<xTEh1_0z5#~-%Ehq
zK<)xa0hIZm#%+zHrUlplWr-?RitsD-_=O9;5AoiEYgWMVOVPc1nMjdl(}$)mQ|}56
zfZfg64H4}O!Qp`H2Z0@Y1f&O`0)lU${1T3Q1j@fae<?g~9hSQ5rSEKi(?JBF8ow1B
zcMo`a1i)W{*c)I0sktC6m^mVFzyMW1Ge3iA3+GOKpHL<NRzOh->PAsnLg+$6z7F~y
z!p;3wdd(?mY7pzHzfOSpeqj`4(i?(HA+kRN5fD+BP1mR$d@yPcU>cA#fYqS92H$@U
zQRj6;{WaJSHE_J$p?)tAy#ee8G6paQfT;qLRe;(mgEhDb$o4O4`2V&X2+2%>1oNPz
zGATq#ef<*DIj)h%LGyu}GI#wC0d%bZ^NT;ku(te90EWTH4#6s_dba%3mIA@P*8qW1
zkl%oO2ap7yok8pXNKRPacPldh7WAMNKKk&f5Zb>e7Pw&9+Fv0M6;K^$Ffn$eI}#QP
zaaUU?_}v4!9@GVn>Les}9zK0@qZEZx_kBDy0!%`%u>WshbRxv;81&kR9bg)QwIIp?
zgj-+WLXiVO96&CNxYb+Qs@cY_Z4G}0gU<kK|Fj^2>p)t$x<Um1f{)L9>QYCr66%-0
zAc>TCa1B$bq#Jc5>LpFSD{Q6e?LooMpxRN$JwW7>Z0-ni0<bO6!5mt!xtxl{V)P!z
z(U;}a1>gQ~052>&0AlWiBVFOsf@piW8jz>p=#%ixM-VAS!miPDYnaGxpzZ^jj!<@k
zXa_*taNAdH^Qvtf{46JRwTQe9;&~7Yps8;lj)!zf8r^qDi)=2tw*-SMGMMvb1di_(
zr^})RKntJI1I71`0ok3twgu44_Q8skU<eva=td!)R?%^hVtrc%EV3f4$)2rNaIkvc
z?sq;MGZASG!Bu_@#Z_ol@r3O2w+%J*CK&L7cUr)4&H$V%A#4*&PJnNfIIsdhKLB|r
z9OnhZ6U)$PTA7GlXN~i4N|yw7jy3l^9!8Zj1w4w%d;y(63{`bW`Gq66!z2^;%GpgP
zpSK2hVd3r&a|;~lm)Yt`Q0~Bnl~+oSxmIha@!=b%wuR%I1<3CKwgV6i1`~(~t^v6b
z)P*qaD7@3+T^Vp!ldha#q0BybCy(xd0-gz?JHa*rE7=Lx0G`hh1)h{tdQ4>L$?r;0
z<EwTx0NlSDg!e+wF(Y^12h4eL&_nZU1$S}3gW+R1$X<b_Vdbm^)@K^TTM(T9VjjwM
zqx5+Edp*qqpdaX#??s%>Q14<8$G8UhX+I-2NFT)81{mRd*86Xb4f56iFFO6#fX)O^
z5KgncfL#hsk~VjhZ6yb-j{I}e6W}cn9Qd7D6&&F!LAeWxyKw02W!V}ZjUy;(*=4i3
z6!^Y#8hyQlf_<!(XT_Hhdm!>_Qbt7L757Qs4^oZQj~Z5R-;*ISBhUyU21x5u(&evK
zZ{6$(43M9h6Jan4wzE}-q180VHvx=BEdG)lIK8y7I@=iaa7vd*Su^KA*V9W3c!Ck+
z`${+xh>R5?92JSD?vcJ9Y;277wg&jE{(S&G03t60*#Db!nRU`u059s>7nCs&?pD2W
zfh3d<!01SHee{bT!>X-StUcJJwddgif)^WM3-#@C4ph4J0v+w9qGKCF!>B<-^gRxc
zS%HcZo&<l#XFQ?G<PEfiw>~%)#3TedXhsbKHbOB8K1Ru5v)4Ap>^F5CT-YU&eqXJo
zaXpE)_E0t;e6kea4bgOT-1dT8!wN3^AJ9Ai!LD#Dz<d>gesa*vWdW4$^zVi=?}YH6
z09;#x&vg)tM=Ci^j;L9UYih8zwSK<T-AyfB->*`;xZV-&>G@VBTVs$b1bRi}E6$Xn
zZI{V4$l!hlRXTH~K%{F%6ZjC20n%mWD_nT`J`jH#fL{kHSn!V}5WNMf%f?8rImvAu
z=nwt5<b9pb5b`D?+{4P`z|>a0tH6->dGG&YTl-hD9&DUZFgQKqR9OR+E8#n{5%I2v
z$i>#y&sb<FDDFTyS@fT_a<@8D2ua`5>Gu%cN^%GLJ~)CrKBm4uG=Ba^OST2%tpWb3
zFpgDnIU-I`#*(wsITeuk@Odl1)<Hwo|3aCLBrlbtX0P6s#(!*|;e@?%yhLn}3a$~d
zS>Vtkd;{DON%LwM*l^9FW@pc$!hUd_neeLp5UZfF8bYf(IvLSneFy`j+w3oXY(Q;K
ze|S%a{4|^qpbWMaUl2PWS5f7nobx}l_CbT5ngI?iv*~c9L!jSUSsOT9Ga3W&Zx{}e
zt`9%gpw|9F3iGag+NU669g!2QJPv#qf~RRXD1P3@4O&n&1N>Iu4xqUaf&rO>tlCLp
zJz*e6pk?V;+512DP^)jQD<<#T3&13RyJz%c55%z81s~s9-)A>{U%SJ7VgEBKjfi`~
zs6%z6#tNmEkam72M}%tIf9u0phsKlZ))s*n0wNL`wfdIhnZc1kAHSCExa$D;w+Ddf
zhaqTR?G^L61ge+HA&)$gZ3F+w<x+R;-C2EehhuQK4FQJwv5uR+`qRsM6xk42{ZH)x
zFDl#%6f4vZ0x6-<;XjYkygt(7FBSDy{ohd{IjO_tBuCrBE^v)2-%-V%;)6eZQ@#_N
zwGOt972LN6h=&2T{B8y7zhRt#a`3Dd{yX5Se-z0(J9HxT_K1U{(q5odR6uxrbcfGx
zmA;v<Ssm5Xe8?><EC9`LKram^u1b@zX0bkiX3igFzuArE(yM=%KWvGLJN6n1!7V|6
zH8_v>G~o}54_aEUMp2s{+yyGrVX!a!jMWyZDppnd0zS{d;g8O33~w19?b)hA{CrW*
z<iy-EB(SEg$jJ`@b?NOt@9Kz50q_eeE=jB*IWTe27uG3O=TkGl3x4xEIL`DirWQmE
zL#|H9LGVDi7kRlux5w8Tc;%jYrJD~ukIKU;{QyxYKXO#3Bd5g^()-D+9Q^eSrm5a@
zN}EJ76(0@o0_$+gae!o6N5wB%a#ek8Zfz>hE8GDwDT0Fwg4L@wtd5mIoQ;SD923Ro
z3hzSqh$rXN*FbIW`DBlt9yw8n4%G~va01tpI>uGrCVl5ydcY6<*u9&cxaXO^@^+BT
zq7IPq_^iMi9J}c2PwML6)&MUkwB(SxVbCS`pl_qV<{r{Nl4NfI90^^N4`Juz+1p}l
z@X4e0_Ti3p9Gv2({HmQ1{IvVer+zBF42<-D{YPUdZXDOHv*XAl$KViaLMyq9!iy4v
zzkE1rfCDM}W??S~XMkv)iKDy*<D3THJB$izcr>>F)93O^>fdm;`xEyybcyll9w+%}
z&Jbaq?d+DcDU#|KjC2a;U)#{So2vY>qBe<^EpjHf4$iRwQybG&#ntg4OGjo8FuS{0
z&}vX6v2SER!V4oBGv$y+Pv^W-cTtD881Q$Y6T}iZbiNq&mm{D0vLORYJ<<KFh{0d1
z@*cWALy!ZoLAZ_}ozltC)89D1A@w$O+2r_kSGX=lr92JH0$+JgtiZWY&R$ZhU9g#m
z;KJSscsaL0cy>VYBg-mjQ8&xskB$hmlUMs3OT{!XvNJ>Z?1{)N*np7@Ih4G|x}R)!
ziIBOL-jt!HW`GU@V}RZi>A&FWrUtDc^_Pv`y-*;x8^KO?K`8lmfm{$9^5y5X)w4Ok
zZ~V3yB>7h;kA-EzD3%NKayk5Q8)XJx>K;?4*=0grUq#@6@)IEk$}!J8pKWI=9zCMH
zBW8^2NN+2H1IA>AbrZS=@tGq!Q2H(Sd$x6MS}x#1Ogf->C4nXZlXhTS-Jlf}`OE*k
zc6*3_<>Plhg24EQpiAHmS1wlSh4D+4&9BX>+Z^E63tPhIJdhnjW+*=v!2mhzv6rg`
zQ1L>q_EFc|4dMu^zKOA%NIotVC4ZC?UtO0iAnC`CIL3ImQ>lAbseqX<jpg%>aUC;e
zTeJvH>C!qCN%pMdDW3-FfkLz()lvuEQ{o9~bWZ$F?`#uKqvFqP_g0$QA_gb=p?$E_
zrwmRE{p!iuY=SLB#ObY(N`3%XifJ%I3nhvE()01ps(_=_iC^y1pUT?>+A7f6RFe>n
zHcs-!Y>foVtMHt!4iVp+OYl&tmH7NOgbz9re_Z;`Z4fUZsIUBkqkPY~LZ}CWXz7@Y
zTn`K+T0cUulK(bF#z&LhBQp5Y2E`CLv149Es$^Wm$hm3D|Av-OWpM7sZ>HC_Gqw;B
zeRcxfFM<Ouq?f)T9{Oxacj61Dw1T8Z!04aUBa9)`!{>(HU>x_tGYzruIP1`s6)<`5
zedCkmxf{H-4GooB?I(5j0VhFlvw$6}_|huvBp65)w=j%QsN(BN&sb4pg)_aO5#x$+
zyWJXbaB0#KBY~t54$Uc9HaR<h7ZmP{w71+E6Cv_^v64J}N=*Sx{^Nu$R8AIQSGD|K
zdomF(I_c;ir1w+bWGgBfqg?5|oeqj9ClWZMn$%qdYzEwrSs4NyiXwaj_(Ng?KYO+z
zeJCHh>kUy?u1VT(8r3tDVL7GC#%2X@>8pL(B%+aTnDWC|l=4~lIfc?=c8%NBd*S%g
zM0K)|tuoAVPkl~s^Zen`WA69j(hPVFpRXNWsWV!g*`5ehbb=7KkbJ!fPdNnHT4Twy
z-WQYT;D!V<OULXwEGL4IsQ_U5mAm!2*c;17$?TdvYnzLRSNpU<)Xe}Kh=`}9qN1N1
z_gszqGCt8KAF+ySRB;ig(ZC_?>l#q6cY4pgqaiC}TgxV=?%#<9cN*aEP>-(mnPh&g
z<|c1;Wx;aMd|y8SWKe9-r&((&Wn<f1n&Zl?frt?JmK79xW5rF`101OWI5;5YNJX-+
zHh_b%%=vW(pZ@KR@K`JN0xR0rkKp+O-FN5B-5#|l8_<*Y9eAqv{{5AjM_#oUs1ggC
z+yUA2K1gPX2RCYja#hZt&u+=4En6l4*ukxVhyZ<2Ui;)fSB~zR)e2tFYiA}S%LAW4
zfSx`FjsK=L5mBvK%sJ*bRh?`g?X3D@{Rt$Wb0`Dkl)2kP*vNLksk`?(Hxe~dQ^|}j
zT_qyIOE8<V>%aRwv&tQ@eh(QNyYRD1vu&?@?9SIj9dkp{3+{iU2@H>yuE<UXZ+xN8
zPKhX%2oTGdt}lyMagrSSLUCOku=C+R+4GNpjuS9H*s2<sXj7eayiCq{t;TBy*$%3%
zasj{*Gc}d^&g2g9`|eQN<O;(kfLrYc@I3rEana`&XWN&uF>S^~9bRH(umDLVE=iQF
zn3UBa$A!IHvkV_Vv4g!f5$M4h*-Q_vts{J<TQe^myH1D;K}N$>jB=`uao1Md*ih9g
z+W{x1?tiL)(*SFBhcdW+aD!6e8uvLYe({n~*|f)5h?alZW?YWL3o<Ks1HcPoWvgan
z2k<K=w4iTZ0oYLjOHMx)aDW^=r`nRMb0t4^^qxM_V?a6CI*kJ=sLwS<^%|4k;=ZOJ
z2PW^_zmvFnr+|ltzM=rQ&9#Q=n@-;yg7!f6m7n<P4a&RttLzWCF*^-`Vg!WtQs$yG
zWk|CtR@NE--NMi~z8Nc=*--YheqU0TsfWwm<K{e&%?#Tz=|_${T)^>;L02!W2wa=W
zkA=9@?LYsiZ0pIkoMo)1P&%yAR=d{T2H0Fp+gd%VQrn`gAeGX;#3G474N=p|Zfmux
zrXy#F=$=$OmfLOBi_)X^5dP)>KiNB>d3u`=XWMN~WvK!;M~<CSr_XasFw&16@oVvQ
zDuA|j+uA!2s`w|=zbtabKeO5m*#d0KmEO5e7uU!{Lc3Lmwzgcw)uIE)h`*10;NrZC
zmNdxF2!u;fcNbXV;<_dEUVPsi;3-`qy7x|lgs}eLm^cDW>qE}3o;{->17;CSy5phe
z3OQ1M*5O6bKwP{I-yak`bJ1H3sjt4WfvG%Y-;-2zlmXiZrgD{W@!cK0fL~|N2332#
zSFVq(kKf-=Q@OsrZ25k3fUP$0kK<1?#B`Dc#)$Qly(Z%Km0vyIAga`gX}`*Cl~XdL
z^1krZ4v-TL*!m^$tm``$$(i#%ZD?ofl>bHD-HM%-A7!AIgE&~pmXYB0Zzv|hBaOwh
z#6|Td#MYaKrKomCd1Li$>zLe2y*m3Ir#fI)JLBqMDXBx;<DY-5p^fsf?#;c5iYqIx
zuU;z5+_VftGG_ZQmn44o=GP6av%c~i)4p{o?)OxR)h;>%Xil(<KK~`a6J_E&+j7vS
z-!#M_RbQKRy{`e_-mNv2y1}?|z6Ks6%iokcO)PzJwywxc8!Ua~$X#+$$q^)fYx6(^
zYbm%Cj+vfGU6%OWyNwUBRZ+*aZBdRyTyi~!o-ocx+3c4;T3?&RwLKs<2w+>-d;YlJ
zJHY+cOJ<dE-_w7l#6LCBYwk9IQ8DwE?H$EPs-7C&zYn%+isa0wm@DPXMa!FNfIoD-
zH4;x!PxtETnA8koOb7Zlq$8_HUgDIsd}zxICfN=kIip)gBmPZ7o)q|MgX5TKrB2I{
zoGaw4?<c)Lw*76aay2u1o<F8Q({c@{mt-!xsINLZQsEAezIB_;b#*K`qsswM-YS4i
zIba=Hp%)pr-xFS)IP0D7)sNf|5LpCwW8Ti~#ZT?(r2J1~9g4r)X7XRKxaJ(&Q`Mgh
zqD3GyecF6D1KpG7J=2hmZCN%o?H64^xkZFMs>A<*xWFt`b9MaO#Y?xR{wDgYl#gz8
zv;sGQ*d5?|pk9%C)%wNtwO2cR_1WWg@zd!EHlkryn~iVzKBl=RzkF7GmDcw@HLX)O
zsJYn)dRTE0E@IeQ@3U1gEPmd*^|BW0YojsWTfM$4r{(ZU3*|Z+ZMW)Q(!-7U!`IeJ
zjHw;qq9TJ|%<by~lWj&Q%iHvQT?)uh_tbfhZtnn6_jWl5COw)eJ#42lE>4T|Q}AVY
z&Vcvc+uk-B>+{x-DZ9DV`4El)5qAyYDHjQyfr(+?+KcbCKD7cIh>5=)v%61kf+IZ1
zw{f?S3-Aw@k>5(+xhuAJ0IB;rcUJl%g*eXoKCE_Og}s5i?7_b}{=Xm9$~V~Fwj28S
zjU!uhswCV@b_@@-H;=;bh+LC<)w=AdQ#Cc}J$lrs0A~mgw~<0sEv;lXjc|XS8Y^A5
zKi>_f?!Rx+ksE|Ot(triij236@EZ5L54TI^Hx$Ua%9q~UVnoEja2v9>o<b%5?g%c3
zT~(YNv!|xY`C#|fe%!wSs(+#~$gV^3L%<A-^n2~4#uxx6?b9ypx>o}{9c04d8_Ils
zPQmD$c=Q4J{kuPS-ih*2&5u&W?XE#5FQ5frjTjD&Us*CUE8<CQV5J^D^cO-iUC90H
zft1Nf_LLjp`SP2_F?Y+Rc53Tt`Vs=?ItF>ct#@OCs9Zr}Vk%mCXTiB&|Db6Stg2QT
zX?{!8<&bok)J#R>&++8?VN!$|qv&<Y;3~i^Yo<b%o$VUE4Yau=tCCUa{iU(Q#Vr~s
zs~%_U)ht!&UQn5?@k*Q0riyK8-ONx-qwC%fAMingn4FEV!#1s>?B;?(+FThxt3VJF
z^CIvEMu%;Dzou236~IA7vkq<PlQ$ALzmoiy$!N$F6@QLK{gKjlQJrzSYzN9&9i!=Q
z^(+-$D@5B(c8q0eKW}_oAIT|L)Knp;`ubUNV}1wMF_z?Vbl?^R){(p*ul3%K)YPY}
z0k#b%A3k_L$1`J%;5f_e4LQO#8HbEsvC^5a+t9|L{97_f`Nzvoc9g>icD4hlCXj&d
zdc^oLvtjm*16MbQzg8c3*}P{FV&$=BBdKBor6$L<Ix(-)RD5!N(aKd@*3lq<?T1q{
zyBz|b_XyZAtSnI7))5%DDknN-w?@2Ik(#pCLF!3SkS+}26{<`?vxLff>G-$i4*IG=
ze(G#MtgDPYg33k}oCC^u8)&rvS9o~Papdm!73;S;^cxJYZQPsL%|;K#8?c=X&WCh*
zZXkJk%IEm}KQ3;x{1N4o+O?za3^l+Xgv_@N^pGs6o&laCb#yGg<NWVaWNaAK{3uaQ
zbOig`;HjsWFTw{CSCwqVX4)oz10KYKUHd69$}!j@6c@otE(7^j8gpy(%(p&jET=Xn
z?A0u3*k4tL7+{|&mX5v40pLplljEv0Wa!u5i?fI~H*Z%)PIL`=1r!kCD?%R08@7JP
zc8iEjEAXcOqL0E@vdPb@d10Zsx5x;ub>jYujg{n$v*463YuD8nTt~_=0*zFW`b1b^
zlZ-m>N55L!{>>gmwWomGUJ((9soUDd%gQ(05pnTH&mO&Cg+Tt67*^b`Q31AO?BujA
zCkTSz=Kew&JLnAO;43Ka^2EJ2k-vClHm<#F246N|*S6LNK;nOeXjye1JELtZRpOq6
z$h~O$^@_%7v!;HP-PCMs#F3%)7Fr;(fPdr-EAH8-0B7_-DZjt#VG;4JB=IW)M19pv
z+Dn#JI@lK*#T`i#c_sIp#f@?xeLG>VW^qj(UzyL{`l~w|Fyb@J-ls~N6#Ac@=wv8f
z%D-&ulRcY>tgp<55d|Y-Q4C9YmIh$8DZG(8y!g;Y2e_)jvZ>wLx{->ZRGw`F&8r#a
z0i~Q90lr4cq?|}(9{%ul@%GARdk$<E+pa^@cta`~NT&nH4_z?U3bK?altcJ;AO3{A
zQhiH`);4M`_l-9d+??a!%3uYD<eFD=hnF1LWB><ao7O2eoyKnfUQA;DO3@L>$xP(J
zj@xFtUJQ|kB1T_aW3Z;Rmshbp8i2h=T)shU*4Ik}+KJXFrOX`OfxloK;Lj5yV`4Om
z<+7FA?bEPBD!;k;?XJUtfyr#IYe1gP9lpL#lL8!oJf%w{8S{RIw4MX9P@sDl5o5`g
zfjSrR$JSQfR$onEVP&@Jx$5bngu^w+iIt+HxEw>juE-|Y#U~T?%GnFZ*_hlAi^4h7
z6Al#eXjs>0hHw&QMh^&UOG&<{#0*jMVczgnE9(;jwY~p#bi8d$Ba>Z`6Ea$aRZAbu
z9ad~}-f#A7lbV)I$E?Zgm53#P3>NYj5-l^4i||fz7+Lo1HwHko0+i25EC&6LmGU`6
zR%$v~;`z?Tf`pWpriHl?O0n<fCQ{NoE&eW`*<FmbhvGm$_Z6amU_iaCPDZlH@3uXN
z%@>c?mAEf2m70e=HkQcQH9Kl*8)x~*7H6pV;{>u}n0-=SS8_)Fuwv_@_<jJcYQ-K%
z%@War)zfnn0jaQ=R3}>c?*2r`UkmiwB*`>`@93af5@Zk<txiHpyAf=<aC_}5LLzE}
zZkPx^*h9hO1t+_zO&Vfz>)5Z8FxBrvrjI=rz7X&^f&WY_7w=(hyc}4a!gWa3bVjhK
zU98+)+gS~65lA3!gPZrhOsq^UdUxLN^>2Ug09Q50DeYUQ;p|TOC#v%J${YP{jiA6<
zXCWCcV+L0zS+C)4MdlC->8YFC$H)-<tPk1qSV3TYWp0O6O3XFjmn8oOkY572Q}AU7
z;X!CaDAo!qhrpf<t0{rT^EL&a&@<n-u3v6vNc^bd8h>XM91ZYf0M<=lnPpbwt@c$0
z<Tq>mOilOhnoLC0w!K)?F^U~G=9Z@u`#O%-ozTOn(ouxXN&BTGjM{|ufn$HuYXDVI
zn#>Bd_1hI+N#Rc$FsWpj082r>PLD4nB4#0S@{5u4sjgk#G9HWZNGQ&Q!4U!$R1zE`
znQ!N){?0cWI~N4k0_@S{L10s)+xdtFAuT~P$W5PlY+1nkIUdWsR)&6EV{VJ@9pFuY
zw+G@ntV^^=vw4!-M}2fO!abF;s|a_rhJ@N2k|F5!v0q%W5yEvstW<Ehp)R4A4}B-~
zVO}J*3Mnb8ZLr@KwQLrTrT14lry25i0&OZYb;kvWgsM)p<gWFYsRE2Zij*0G)YZAe
z%W7pN{h$DEISSs_E>^rk<8IuECjDeIp%GUc-wD=^eQaP~j56tYzDcLli>C7<UIi{&
zX;*L6b<TRvV2)~0P(pu)2&FTLo)C1kG+PCl89}bVa_Ba%Ftknsd0q_2Hw35WM)fap
z>4r6RHTa_fxL#x$xq#(66z3Ea<hZckyU{^lx<Pp$1$zpy3&idou`~!PHmtArLjW&B
zWKJSy{YNr1_(q&Mpa0hY*9T5xy#EQ{#z3)-I(`DUi2?pUKfQBU<V#c_00000NkvXX
Hu0mjft?Wfn

diff --git a/images/user.png b/images/user.png
index 0404c5f9b767aeceb1324bb6f5307db6b79d91cf..255798258475e7a125c140b684c897a5c767f9c9 100755
GIT binary patch
literal 4631
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
N002ovPDHLkV1ho1<1qjL

literal 4465
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
D@H?1^

diff --git a/images/user_seld.png b/images/user_seld.png
deleted file mode 100644
index 4a87d317e443a6f37bc1b2d68a10be79e541018b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17562
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
BSwa8+

diff --git a/images/user_seld_1.png b/images/user_seld_1.png
deleted file mode 100644
index 10da26cef647a92e4f15feaa81768dd0c79a0682..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5070
zcmV;<6EW<GP)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00001b5ch_0Itp)
z=>Px|h)G02RCr$Poq3!U#kI%3r~A%|I06c8i6%xxV>CY802d5P1c4}vF$*TfIO5>2
z#C?ln%mRsQGYkW03`#UlM<k*`#0^m)M$x<%^plvx7&IC;P;}ONyU)8-eP<D7={s}#
zPCh>BpJ6`JT~+7Tr%s(Z=XVNWcZ(DOiM03KowFO@h?QVBz`FsC7=ehp|BusPoie2t
zIrT@A;~WRx;fV7Ye2Nh51yYadM>z5?JYL1+1>*V~zpUOapb=x$rSAVD0M@c$G5+1B
zFB%&M&PYVR0J0yd{Se8slBp8x7zRr9P_`kw4g3Rm23J?|E?cF#y0J@0MD$XR1FYXY
zYcKM0&qbMta5S#d--2oM(fn+$HG%B_p8qlMGOBBE{S{Jm->VVfm3Fs13a}QRdm`dr
z1)PFNzZO7^whA~+(`)+K3UC9y-|BbsylO2XFQPJ!C3mk9>3Or!BLFKZT=eyGllJsd
zg#QZGeRE3yH3*yW<$2J*qw+oub;SG}Jm~{+FsjEO3`N-si0#zJR+K6V<4a`0Z$C&|
z?K1d6)&bU8lMATR^H8}4$N4P2-z1Lt$5!AzMAp%$uhA>_EvdM3$IkKweYgYgy#o<7
z+CLfPC`59=2gd>5{}5pbUe3+3>^JXa5VN$p%09psPWUcP>_?!Vu`@L@P-|@O#HWh<
zye(~k+MZN8dUPHK7aoqv*HKDwrFSdS@gY!7O~D*lv7#m|WHR({Rsq%vCk?@oCBT<j
z&3_x{&+!_U%dM-8SJ0(q-Me0O<3N6h=n>ZXTD#14&{Fn&?`|nuZ_H0tTh;*9?~fmV
zo3|X{j8+o<8{r1(dfg$*m)B=PaxI=T3P<N6&QWNSxzN8N{&`Y$-|sUqMml|D1>nGD
zG6U5c5pshGY66kVsoP^orogqm8l!X3Iiqp>TY&uo|JiyN%kgtB&$d0z4!{>rJ{<K|
zfgF+g`W|pQe$JIq2&|JQyY%xf2d+Tq6POF$MV#|kT>Wr1PkoUCtYu{m?`-)&Qphrt
zUMX$*3%*R2Wz~O5XSt>GtQJo$!ts9%jBQ>qupDW)LaH9xo=#ugc{X~0FPqYfkLw-+
zPD^<WHQ>+YJ@;o)U2QZuvZhlfo&$b4$bi%!uY-<}C9AeXHt0?rM-Onxq#^iv7a|9x
zPHL~A&Y7~b`sJvF)Tw9p2f4?7+(6Ps(5VbK=5{G7Yj(h+oJXVpTU)rdZ_LBBKoN=}
zvXWYFs@$>a{U`;q8=l=<z3UKW0R`Aoh<_`woa>~b`rW9<H~mKoaPhc8oZL#_Jivx!
zP_Ce%_u@=?4($PDKkz<{V^C))!hXSXvJrK^Csoyd`4j+bHX3g=BB!RzLmYI1ELrtn
zHiWZUe96Rtc>Y6(d_M3F^-a+6QuW)-*_cDL8hr7YebD?T5x&$6u&bv@<*H5D5YFOh
z?6Bw)h#VQr!36ES5wc|UGufC!v;bc)xi5L%^B|uKgwsZx_+Y7g@P%v$X951+_}=6?
z&)`V#k%Qy&FsWMgWH#myEx;Flvky|Y5oBPq28#@p#rHjz4dE=n7ksrZxdl%m5*(e)
zJ|NC8S-k4$Y|J5AfK9fdKpw`C6M_hr#BrR_QhD!V*$^%;5oaBY`0Eho(3B0{j>BlF
zy#Lv3%pqEUOD6AuCT<5Nq;ir8&|(IBxFTDTEiF0wWYoV4M}qLEuUpW>H)P2}SvhP(
z3-IL0x%6wi5s~RYVc>^SNvzj(>BM}ys%cs}I*&xG7?GQ-A8x%gU5PrgWbys4ceUSi
z-is9A)Dktx%nIv=+7z1p5n+5b1hnypSc8eGO#oaVf$~H0^A^bb>bi7*>gu!616({|
zKV0v3h#Z~D7H`A#FP6#&%n>%yrc=kBfFma0b7(5av;&cGQn`9Vqyx9=JbHi)=i%+5
z3g7}DCpbImBe?NzNyXYokE>cTZXv={)Wo30n5V~a_>L@E{pP0!U~?RwI_`8F=hvY7
z1vxlsK`$rq<}I>pb36)R^`h}3akL6o4oT(c40qx(5^vrX)tGI`5xE9ieVz5yzBJ@5
z1isxo31KUu=gXo89?vwuddaxY;rq9PoYLI4>N7a{J*iytN~Xu_sK2ZLY(c*G%t7GX
zi(@$rsX58BIEf2o(VC0}-nDq#-neQ^!#7(#rXNS0^JVdacV-h@>$GHZKrI=2Npi?C
zpkHcSgY*Vs{x$Ti`9pVnW1Bg7Z}UN@e*^F>l$ed*sj<CUiO&t$%w#m-nq`0|?*Vl`
z2Brc5sV``+pv))c-6a)kcOjZ|rUd%kVfpkb9077Aa1uf+MVeBCHPpvT<<@nEB$)M<
zRe-IjC>?zue(cAn8hdPf)1V0-fIf-(zr<x76>BX^vb_XlbFR4LjN_45G3aQ}13rPE
z@FYGnW$~InW*ymPv3g)+ojUda9K8mZg3vn!a4-|)pTM7iji~+s;Z@?^N8~vPoE!(Q
zz7TQ`0{<A4Q$UXbIRuedGsRUgp2@?g`y&=V@O(D2$UDQCbq#KsfQ@n$#Eh-H6ga2}
zU3(y~Kx+*mA12+onk0{{(Q<-KR>bluv;bsJ#2kMOe5v$W5Q;QpzuWNq3R&{I*LpyI
zc3MOc&!9DJdgq}m@%rt8<8YaQFJ~d-cRrnVIKwvI$5Tl*{CuSDQCYm+_`U5mJFmdb
zM9PehOoOcerK7)$C*MaHkWAU!!IqjevVK>7m^B%$e;hCobU3gFSg>=OHM$uG%hE9_
zZp=Ufh#~bE8+#9~`;?SF_}5N>oi^%B#JSMYUX@!Z@Yl)B>mnfsMgp*^3e(4p#P@#!
zhR5sVfNmk?kCO%MFI$~<c0Ure2a@Xy!q*c}8HmGy7I2?JL>oaqPLiYE!q>k6FW|~1
z8vK8<eb0Bo@GR7%vE2B*IL=oB7Cmo(zXEaRM{#tI2H?^&CZKW?%8|_*n6d-U85$-I
zYkk_fr+ZT)rtl??cy5gRgoEoSAFD?m4aEFfUToOW){5v*gJ+B%fZw<l(PLZDT<Z~C
z1>W^i@%Z06H&fxC$SA;CT%1Gh>l09Zg2*AQYAkA#JN*j$9al@$(^;b}wFQGs<?s8!
zOjLe=NQxY21Mx<me~ZX9vS^+0VlvV)3-GkBehp-9Gq_E46KEA)&U{(&;J-35>uz?U
zrK9&m{js3eBRa6vHfLxB)k(X4xh#4lBN4ZZ0j$%`7>ofDF|`v-&A3=MkyE!+7Od~l
zT8Uje7~}FyA9XAqzd-c#7B>;&5>`>u_!IfnQ{4`yW&~g@Ir9i4aVw4tY0(CKA7LJO
zx-hC8x|@m|xZ5*^AB`__0pq<$DllIUdL`s8m5Q|u-5ICb0BgyZeG$I`M<=yfY7L-2
zBUZRD8&y8mpJpEu+UdC6P#tf}@72-~$0o_z%MgxhbsGF9;#?r*k8~>o-YtN&cu)>`
zdtZ%Wf-Hs2nPZWq$s)HKqi}n6S?ZUJ_!5qe#Fu>#o3&`CnQ{VN#i?B-^EYkVrJrfT
zN8(V4$f2pt*$@TSn#8|Utbe1kZ`a=6y9e;Jk;4%&NyX0v>&@!$TC{$uEZz`l)>h5A
zZTg54K^B4z1kEui<7QiG|Iu1JHNVsX58=7j$>Mdp%ug>leHM;fhtfCbM;Z_=rLVWN
ztD)2`1FTa=^~Y7iHyGZ^9W$KY@5rJ@p6}`x5Br{8HmVnm-nA%Kr_xZJziQJ}>f_59
zQu){;yJ)eIDJO37hvx+N+StY`sQ)clw7yF+bqQcKwA8%D(qxdu1kan|2Mwry5&L*|
zcJ*s_j!?@JT0EkNJih{DN?L{Xraae^NwVnCm2HiurNd4F?n0b^PiLO@nL~r~Gg<bi
zsk=+7bq(O@qmIJ&S0Zv)b6^`?L0;lgnY%tKRh2COGo@pRcZ%g$fOV2AdZKNB&4#%R
za|)e-P>|wsybf}XRIE?C3@mMc?T-Dfdn1mRFk_xwM!vpEOeV^LN3s^!wgBgP<;i%l
zA$NypDWC(5oG2Af+}GYqI&;{;_<9c_$EVC+Bg$+VKAt1XHXA!0x}^_r>F7hC@qXZo
zsZl;cWDfP)f1b^Bc*g*@uEO653#-B2M5)-&F2Hubo_X5U_*@N52?2Qt*PS5q9!o1L
zofg1>_Bxl^oi+$5nvME@@!hjzQFe1)fr*Hl3ZfPb4kJx)zeMK%Pe1k0WL@9gz_BSC
zZ#;@(S-9bj(CV9RR#`6{wl|HAp+OBwEu93&Pl?semie2q!u4trPOltMM18y*H2|j(
zGq)NX0^nJL3-EI1*s3JMNU}{=;wEOu{7s=_Dq+5P(6!OkX(LDDcy}V~m5QalgA*Gg
z<?FIi@6cLvEWovm<wz?HZd0||+~hjfU=uQZ|M3xs{t~e<X+r@pS0s#=g&RV1+rk4p
zZFoN%Ei)97ARBD?26sbZhE#MvD3Z>yv$D1ca0pEfyogQ#4(#x-z3~0j_D%}ZwQIG1
zCiQiT!|pes0Jhp&GGZXEe|K`3G+jkd3;y@%clzDgD(c%+gX86hw&6u|0JH_zco7|M
zau#3{JKpcDAA?Q@DGYpK{cmE<6*4c}Ni`h6W^;QVla#DN+1n1J`Y+<{sZ#Y=k6b|1
zqQPwe+`)QC17HjCjG-g#^)yaX0zpj9Z;C8@I#dZlIDoCe&%YjgLwzzl2BRVm<M551
zit~m8xD8DXPI93%*aBR7;+{CMhj8TNW|pR}=Tp9MWtfa~IDkur?Lmy?rjR;Sl3Iu8
zLh6ccl4TF1<#?xSYuh~xSQ}j5-a*4~C=3N_FB9SYgqIPlzKOEnnGXHnPne?_LslU2
z?Ud(KXH#PJ4Wa!0Z~z-&>f%qNu7ZgrZPGSyuH@wPzmju^v|_$}fCm*(TTp@1`lxI*
z)}(#zMcvhiKLe4IK5_q=wWIzdS-7#yqjFp0>CC}bqtbNfXhh^Uh<|Yy*EAf!vj+FY
z%Y6mZgz?Nf|2FQCEPQg8h*YLDw6lJ+cu*1fc@>BW_B1!+m#;#dYo&a{Uv=h?ui!fi
zl7%lVcLZ6+CFyDK^daXWdNW|SZ>HY*X%cy3J0rIQ=dch>t&0|a8)+u%y@97+lgg*E
zR<XJBG_`n8A%*!@p_poV!_P4*>0Ug)OcrgjSz+t_%osWX)w#CP(==b}LB>e=GiF7G
zYC7|zq4>^ih#r<=z5I>*`0+AlbEna@Z~&K{vJbAj(~3v1m6(o{c~7TxE)OM58V~8r
zla2tn1r>9--TfrEN-8%R^57?$&Ki6g$~+WPak`ZH_)lfo=Fm|;oqnP@HdiAYlj?Xo
z1+hb9cIOm?@Bqi;ouqc8`q$UU(P1)oS7Fk?CnJyQ%##jAoWn?XFH6O<?WT6Lbnvmb
zu|o3lw#c0H;<{=~q_1m|*_snmla7<{_mj#$bb9ASIDkzIB9UlGVXJN>COxjf8TmpX
zI?*c!6;U5E*WwIqHmYu7ADP?vDhLPgv=jQ_=4?f5wWeurBHlT&;P+X%5+DQykv?L5
zVOLj!1osY^BXeUzf2nw}Q{F^4fX$g)<EA?O@YF?|hD34|Z|;9<7{Xno(r2M_z3SvX
z)HfOp9&Cp*s5xE+HP|E=6E#awJv&u%?1A2o@1HLf&!$~dkp)aLI)u(R?r_At2lVJv
z$2Exi*|yUEI}aRAgAM<oSN=Egbw1E1l^x%PC+A7UM)PGq)lFv|e?BU+LHnnu2`}M0
zL&GRnIDpNfxa5R`aot;zEb`$k7jOE%N1Y3$d}CIw2Iz^es58I37n*w~E@M(|Y9qq!
z6!n@eW$Qb=Z!;9YMlc(?+y9LTsNRAjMJ?<X9>n*5NWU?E>WQ#rl%QMpOyk!gQex=|
z!JR*bb5}yqbN5P_y`G`N78+m+vI+X+)c*qI0;DO8Vh>FJ1I}#n>wm}W%{#(GnL3+T
zPyRiigynq}xA6*_F;NY;A3+>rIbQ7gj(qOcb59H40OV6YLr&w;WSP|{(4fvO82AHl
zHX+_U<T{TciI3P$oc-$(@Ny!|*X{{WEd}eMLFS6`916W$Tz6kQ8ILjrha*v2FPgeY
znk{(lg;McsXnsW609%l!A9oaDZ?QfDR|>3cva}>iO)^X9J&?bE{yACjZH}(5<2l=L
zwH{B*?SDp~2wDe)`>qNJ;%F>^_#WnW$H~X@&Gm~1pz?XddI`oAHA#g%n?nPEY%d}H
zWz2iw;dEALmjJdPUpAyajq#a?oS(caecv|FGWN;Ch^59>S?1$T<h<@+93ubLX7??Z
z#s`<Zs}mG4`mU{Sw(;Xs3xJKI`W&uY$LpWpkgng~Wq>WnHq((9g5#8cekD~PnD<FC
zURQx=jZP-|2-#oLN(4hgcpLTaAi-@?`Qk1?q%i8yEr6Q_u-cqxJQ9_$h%Ij&V3UN1
z*&GU6g*j8Nv<FzGfwXF{D-PBfXfmwL1u%68H7KS`>>psRBl8|+&xXHC*~=XkHFgAa
zMgUHUA(Wojn;gFgaR%afUj+FA=wV6M?f@K9l0|R3X-G%^#Y-5y=)yC`K#AS3%!fBW
z&8;i77EpK#OfpknBF3}S)%}hB1v{iHJsw(Hv&tC2T@d;I#Vfl3j`%b026#8X5hD<B
k_q#QCH^31i5OMea2UTmd!qFL8TmS$707*qoM6N<$f?7<q@Bjb+

diff --git a/images/user_seld_2.png b/images/user_seld_2.png
index 5e6e54cf093c091a4a27239270f140df186eaece..29078ccf08a0d5ba65240bed71398bc3dc3456bf 100644
GIT binary patch
literal 4547
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

literal 5879
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
N002ovPDHLkV1hhMQ8WMm

diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
new file mode 100644
index 0000000..588f666
--- /dev/null
+++ b/pages/index/imgSource.js
@@ -0,0 +1,113 @@
+const imageSource = {
+    // 活动日历、场馆预约等
+    mainFunImgs: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
+    ],
+    // 数字文旅
+    SZWL: [
+        // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
+        // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
+        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
+
+    ],
+    // 旅游助手
+    LVZS: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
+    ],
+    // 公共服务
+    GGFW: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
+    ],
+    
+    // 十全十美
+    SQSM: [
+        // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
+
+    ],
+
+    // 长三角文旅平台
+    CSJWLPT: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
+    ],
+
+    // 导航标题侧边图片
+    CBTP: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
+        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+    ],
+
+    // 其他后台配置的图片，开发时使用
+    testImgs: {
+        indexSeason : {
+             // 头图
+             topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
+            // ai伴你游
+            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
+            // ai避高峰
+            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
+            // 新品特惠
+            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            // 文旅鉴赏
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            // 出行助手
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            // 公共服务
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            // 十全十美
+            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            // 长三角文旅平台
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            // 热门推荐
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            
+        }
+    },
+}
+
+
+module.exports = imageSource
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index b82fe47..78aeb41 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,6 +1,8 @@
 //index.js
 //获取应用实例
 let app = getApp()
+import imageSource from "./imgSource"
+
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
@@ -65,7 +67,10 @@ Page({
 		],
 		viewHeight: "0px",
 		isMuted: true,
-		videoPlay: false,
+        videoPlay: false,
+
+        // 页面图片
+        imageSourceList:imageSource,
 	},
 	onLoad: function(options) {
         wx.getLocation({type: 'gcj02'})
@@ -332,10 +337,14 @@ Page({
 		this.setData({
 			indexHot: app.globalData.configJson.indexHot,
 			isTest: app.globalData.configJson.isTest,
-			otherPlat: app.globalData.configJson.otherPlats,
-			indexSeason: app.globalData.configJson.indexSeason
-		})
-		this.getFourProduct()
+            otherPlat: app.globalData.configJson.otherPlats,
+            // 正式数据
+            // indexSeason: app.globalData.configJson.indexSeason,
+            // 开发数据
+            indexSeason: imageSource.testImgs.indexSeason
+		})
+        this.getFourProduct()
+        console.log(this.data)
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8305409..91cdd96 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -20,8 +20,9 @@
     </view>
     <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
     <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <view class="iconfont icon-sousuo"></view>
-        <view class="textOver">搜索想要的旅游产品或服务</view>
+        <!-- <view class="iconfont icon-sousuo"></view> -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20241225/59b88ab6ae2800ebe02f8c25eaf29636.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+        <view class="textOver" style="color:rgba(41, 48, 90, 0.5);">搜索想要的旅游产品或服务</view>
     </navigator>
     </view>
     <view style="position:relative;z-index: 1;">
@@ -37,64 +38,47 @@
     </view>
     </view>
 
-    <!-- <swiper class="swiper" indicator-dots="{{true}}"
-    autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
-    <block wx:for="{{banner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick2" data-item="{{item}}">
-        <image src="{{item.img}}" mode="aspectFill"></image>
-        </swiper-item>
-    </block>
-    </swiper> -->
+ 
     <view class="top-icons" wx:if="{{!isTest}}">
         <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/48059df0ab43af6fd86a7a2f8ca2fa47.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
             <view class="top-icon-text">活动日历</view>
         </view>
         <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/95098baee61e82506860793945970c04.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
             <view class="top-icon-text">场馆预约</view>
         </view>
         <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/af56b9461fc129eeb2076cddc7575b4e.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
             <view class="top-icon-text">非遗专卖</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-            data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-            <view class="top-icon-text">非遗专卖</view>
-        </view> -->
+
         <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/486a7a434f036ffa4e4f3dacec8eedfc.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
             <view class="top-icon-text">剧场演出</view>
         </view>
-        <!-- 2024年7月新版文创特产 -->
         <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/193c7646a95fb88ff1bc2d73bda03e70.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
             <view class="top-icon-text">文创特产</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-            data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-            <view class="top-icon-text">文创特产</view>
-        </view> -->
         <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/bde4344ae2bfe55ff8cd91704904a07b.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
         <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/05c99091489d8eba395075471c5abfd3.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
         </view>
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/32e3894971c3f57f2e86f46c885f4d64.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
             <view class="top-icon-text">夜游苏州</view>
         </view>
         <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/56333c7e1867719fdfbbdd1acd8b8af1.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
             <view class="top-icon-text">一日游</view>
         </view>
         <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/23c1af842453eb981adbc315b2012ff9.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
             <view class="top-icon-text">研学游</view>
         </view>
     </view>
@@ -136,7 +120,7 @@
             </view>
         </view>
         <!-- ai避高峰 -->
-        <view style="display: flex;margin-top: 30rpx;">
+        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
             <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
             <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
             <image src="{{indexSeason.ai}}" mode=""/>
@@ -169,7 +153,7 @@
             <!-- 上方标题部分 -->
             <view class="xsth-title">
             <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
             </view>
             <view class="time-box" style="z-index: 9;flex-shrink: 0;">
                 倒计时
@@ -179,10 +163,7 @@
                 <text>:</text>
                 <view class="xsth-time">{{djs.s}}</view>
             </view>
-            <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-            <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-                更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-            </view> -->
+
             </view>
             <!-- 商品部分 -->
             <view class="xpth-product">
@@ -216,120 +197,69 @@
             <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
             </view>
         </view>
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-        </view>
+
 
         <!-- 数字文旅-->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode="" />
+        </view>
         <view class="slide-out-box">
             <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
             <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
             <view class="pbservice" style="margin-bottom:30rpx">
                 <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/3f386ea45281d642a2692c9e65a2037c.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[0]}}" mode="widthFix"></image>
                 <view class="text">数字非遗</view>
                 </view>
                 <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/d1e0df4aa32de12451228e776a75a882.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[1]}}" mode="widthFix"></image>
                 <view class="text">数字博物馆</view>
                 </view>
                 <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/c3c31a60c94d1fe1292dbe2ffc253519.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[2]}}" mode="widthFix"></image>
                 <view class="text">数字名人馆</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/cc82f9b107f600b444bc4e43f0d06d68.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[3]}}" mode="widthFix"></image>
                 <view>云上观展</view>
                 </view>
                 <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/ba90dbaaf1b833411e517991d0784292.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[4]}}" mode="widthFix"></image>
                 <view class="text">云上文博会</view>
                 </view>
                 <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/b0b3cc6f2ed3ed0fafe9e9f9b9ed3f88.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[5]}}" mode="widthFix"></image>
                 <view class="text">精彩回顾</view>
                 </view>
                 <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/8de0e891c1e8fec7439619d1d6e63db4.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[6]}}" mode="widthFix"></image>
                 <view class="text">文化场馆查询</view>
                 </view>
                 <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/ced5cb9b113d5c37cabf199e2a348b46.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[7]}}" mode="widthFix"></image>
                 <view class="text">苏影通</view>
                 </view>
                 <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/579dd26c8549e7c77cc0edd72bb7d9b9.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[8]}}" mode="widthFix"></image>
                 <view class="text">书仓</view>
                 </view>
                 <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/8dcf8ddf93d276d5009617f77ff26df4.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[9]}}" mode="widthFix"></image>
                 <view class="text">e读书</view>
                 </view>
-
                 <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/640e0ea31fa881e694b93591d4d84b49.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[10]}}" mode="widthFix"></image>
                 <view class="text">数字公共文化</view>
                 </view>
-                <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-                data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-                <view class="text">文旅单位</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-                <view class="text">书仓</view>
-                </view> -->
                 <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/4fc0b988d1d5ced741b585c22ae875f2.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[11]}}" mode="widthFix"></image>
                 <view class="text">云游苏州</view>
                 </view>
                 <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/267db6cc986b61bb3777b70f67cafb47.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[12]}}" mode="widthFix"></image>
                 <view class="text">美图鉴赏</view>
                 </view>
-                <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-                data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-                <view>文物查询</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-                data-path="/pages/pbService/museum/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-                <view>博物馆查询</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-                <view>云上文博会</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-                <view class="text">投资导引图</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-title="数字文物"
-                data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-                <view>数字文物</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-                <view>团体预约</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-                data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-                <view>廉洁地图</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-                <view>文化配送</view>
-                </view> -->
             </view>
             </scroll-view>
             <view class="scroll-line">
@@ -342,75 +272,81 @@
 
         <!-- 旅游助手 -->
         <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" />
         </view>
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-            </image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
+            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
+            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
+            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
         </view>
 
         <!-- 公共服务 -->
         <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
             <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">查看全部</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241012/a3eea8df9bb8347f550d5828bddfc215.png" mode="" />
+                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
             </navigator>
             
         </view>
-        <view style="overflow-x:auto;background: #FFF1C2;border-radius: 20rpx;height: 199.33rpx;">
+        <view style="overflow-x:auto">
             <!-- 元旦修改 ggfw为新增类名 -->
             <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
                 <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
                     data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/882033bd48c99ea745036697beefb6bb.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
                 <view>高峰预警</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/90d32d4b4be584bbdb23b43c20da188c.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
                 <view>实时路况</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/340f637b40d21fdafa42b67463ef371a.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
                 <view>行李寄存</view>
                 </view>
                 <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
                     data-path="/pages/pbService/bike/index?type=1">
-                    <image src="https://static.ticket.sz-trip.com/uploads/20241012/5d794820cbb29acea5c78e0a46df29ee.png" mode="widthFix"></image>
+                    <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
                     <view>找厕所</view>
                 </view>
             </view>
         </view>
+
+        <!-- 十全十美 -->
         <view class="sale-road-boxes">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" />
         </view>
-
-        <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
         <view class="six-box-new" wx:if="{{!isTest}}">
-            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
             </image>
         </view>
+
+        <!-- 长三角文旅平台 -->
         <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" />
         </view>
-        
         <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
             <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{item.icon}}" mode="widthFix"></image>
+            <image src="{{imageSourceList.CSJWLPT[index]}}" mode="widthFix"></image>
             <view>{{item.name}}</view>
             </view>
         </view>
+
+        <!-- 热门推荐 -->
         <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode="" />
         </view>
         <view class="hot-list" wx:if="{{isTest==false}}">
             <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index adcd838..e2d5f3f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -3,8 +3,8 @@
 page {
   /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20241012/abae687010ec0955b70872edd660002a.jpg');
+  
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
   background-repeat: repeat-y;
   background-size: 100% 100%;
 }
@@ -45,8 +45,8 @@ page {
   /* color: #666; */
   /* height: 70.67rpx; */
   height: 64rpx;
-  background: rgba(255,255,255,0.7);
-  border-radius: 32rpx;
+  /* background: rgba(255,255,255,0.7); */
+  border-radius: 0rpx;
   /* color: #72674E; */
   color: #333333;
   /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
@@ -54,11 +54,15 @@ page {
   display: flex;
   align-items: center;
   font-size: 25rpx;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png");
+  background-size: 100% 100%;
+  padding: 2rpx 5rpx;
+  box-sizing: border-box;
 }
 .search-box .iconfont {
   font-size: 30rpx;
   margin-left: 20rpx;
-  margin-right: 10rpx;
+  margin-right: 20rpx;
   /* color: #72674E; */
 }
 .top-box .weather-num,.top-box .weather {
@@ -90,7 +94,6 @@ page {
   flex-wrap: wrap;
   margin-top: -50rpx;
   padding-top: 84rpx;
-  background: #FFF1C2;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -105,7 +108,7 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 113rpx;
+  width: 86rpx;
   display: block;
   margin: 0 auto;
   margin-bottom: 10rpx;
@@ -119,7 +122,6 @@ page {
   margin-top: 40rpx;
   position: relative;
   align-items: flex-end;
-  margin-bottom: 28rpx;
 }
 .sale-box {
   flex-shrink: 0;
@@ -325,11 +327,10 @@ page {
 .title-more {
   font-size: 27rpx;
   font-weight: 500;
-  color: #F65D1F;
+  color: #29305A;
   z-index: 9;
   width: 173rpx;
-  height: 40rpx;
-  background: rgba(255,255,255,0.5);
+  height: 80rpx;
   border-radius: 20rpx;
   text-align: center;
   display: flex;
@@ -341,7 +342,6 @@ page {
 }
 .slide-out-box {
   margin-top: 20rpx;
-  background: #FFF1C2;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
   margin-bottom: 40rpx;
@@ -544,41 +544,30 @@ page {
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #F6591D;
-  border-radius: 35rpx;
+  border: 1px solid #5184B0;
   font-size: 27rpx;
   font-family: PingFang SC;
-  font-weight: bold;
-  color: #F6591D;
+  font-weight: 500;
+  color: #5184B0;
 }
 .scroll-line {
-  /* height: 6rpx;
-  border-radius: 3rpx;
-  background: #ccc;
-  overflow: hidden;
-  margin: 30rpx auto; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
+
   width: 73rpx !important;
   height: 7rpx;
   /* background: #DDCEAC; */
-  background: #fff;
+  background: #97D0EC;
   border-radius: 3rpx;
   margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  /* width: 300rpx;
-  height: 6rpx;
-  border-radius: 3rpx;
-  background: #0B898E; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
   height: 7rpx;
-  background: #F65D1F;
+  background: #5184B0;
   border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 37.33rpx;
-  background: #F65D1F;
+  background: #5184B0;
   height: 7rpx;
   border-radius: 3rpx;
 }
@@ -686,16 +675,15 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
-  background: #FFF1C2;
   justify-content: space-around;
   height: 187rpx;
   border-radius: 27rpx;
   align-items: center;
 }
 .other-plats image {
-  width: 80rpx;
+  width: 106rpx;
   display: block;
-  height: 80rpx;
+  height: 106rpx;
   margin-bottom: 15rpx;
 }
 .other-plat {
@@ -845,6 +833,9 @@ page {
   margin-left: -50rpx;
   z-index: 9;
   flex-wrap: nowrap;
+
+  position: relative;
+  left: -150rpx;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
@@ -852,12 +843,11 @@ page {
   height: 43rpx;
   padding: 0 7rpx;
   line-height: 43rpx;
-  background: #FFF1C2;
   border-radius: 13rpx;
   font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #ED1C19;
+  color: #FF6A57;
   text-align: center;
 }
 .time-box text {
@@ -911,17 +901,19 @@ page {
   box-sizing: border-box;
   display: flex;
   justify-content: space-between; 
-  background: #FFF1C2;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
   flex: 1;
   margin-left: 15rpx;
-  height: 320rpx;
+  height: 322rpx;
   width: 100%;
-  border-radius: 20rpx;
+  border-radius: 1rpx;
   overflow: hidden;
   position: relative;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
+  background-size: 100% 100%;
+  padding: 3rpx;
 }
 .xpth-banner-swiper{
     height: 100%;
@@ -954,19 +946,13 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item {
-  /* width: 413rpx;
-  height: 160rpx; */
-  /* background: #FFFFFF; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
-  background-size: 100% 100%; */
   border-radius: 20rpx;
   height: 153rpx;
-  background: #FFFFFF;
   display: flex;
   margin-bottom: 13rpx;
-  /* margin-bottom: 10rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
-  /* padding: 5rpx; */
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png");
+  background-size: 100% 100%;
+  padding: 1rpx;
 }
 .xpth-item:last-child {
   margin-bottom: 0;
@@ -1045,7 +1031,7 @@ page {
 /* 元旦修改新增样式 */
 .new-pic {
   width: 160rpx !important;
-  height: 213rpx !important;
+  height: 220rpx !important;
   margin-bottom: 26.67rpx;
 }
 
@@ -1061,8 +1047,8 @@ page {
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 70rpx !important;
-  height: 70rpx !important;
+  width: 93rpx !important;
+  height: 93rpx !important;
 }
 
 .six-box-new {
@@ -1173,8 +1159,8 @@ page {
 .jqssd {
   /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
   background-size: 100% 100%; */
-  width: 365.33rpx;
-  height: 166rpx;
+  width: 344.33rpx;
+  height: 160rpx;
   flex-shrink: 0;
 }
 .jqssd image, .sslk image{
@@ -1184,10 +1170,9 @@ page {
 .sslk {
   /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
   background-size: 100% 100%; */
-  width: 365.33rpx;
-  height: 166rpx;
+  width: 344rpx;
+  height: 160rpx;
   flex-shrink: 0;
-  margin-left: -20rpx;
 }
 
 .xsth-left{
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 4b41d22..23d01e0 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -40,7 +40,11 @@ Page({
     time: "",
     showDate:false,
     showPrice:0,
-    showDate2:false
+    showDate2:false,
+
+    skuDoms: [], // sku 节点Dom
+    activeIndex: 0, // sku 侧边栏
+    scrollHeight: 0,
   },
 
   /**
@@ -839,6 +843,117 @@ Page({
 
   },
 
+  changeMenu: function (e) {
+        let index = e.currentTarget.dataset.index,
+            that = this;
+
+        if (Array.isArray(this.data.skuDoms) && this.data.skuDoms.length>0) {
+            console.log('进入暂存数据')
+            try {
+                let res = this.data.skuDoms
+                let target0 = res[0][0]
+                let targetDom = res[0][index]
+                let scrollTop = that.data.scrollHeight
+                console.log(targetDom)
+               
+                if (target0&&targetDom) {
+                    scrollTop = targetDom.top - target0.top  // title高度87
+                }
+                console.log(scrollTop)
+                that.setData({
+                    activeIndex: index,
+                    scrollHeight: scrollTop,
+                })
+            } catch(e) {
+                console.log(e)
+            }
+        } else {
+            const query = wx.createSelectorQuery(); //创建节点查询器
+            query.selectAll(".scroll-item-top").boundingClientRect() //选择toViewid获取位置信息
+            query.exec(function (res) {
+                try {
+                    let target0 = res[0][0]
+                    let targetDom = res[0][index]
+                    let scrollTop = that.data.scrollHeight
+                    console.log(targetDom)
+                
+                    if (target0&&targetDom) {
+                        scrollTop = targetDom.top - target0.top  // title高度87
+                    }
+                    console.log(scrollTop)
+                    that.setData({
+                        activeIndex: index,
+                        scrollHeight: scrollTop,
+                        skuDoms: res,
+                    })
+                } catch(e) {
+                    console.log(e)
+                }
+            })
+        }
+  },
+
+  skuScroll: function (e) {
+      let that = this
+      let domSctollTop = e.detail.scrollTop
+      if (Array.isArray(this.data.skuDoms) && this.data.skuDoms.length>0) {
+        console.log('进入暂存数据')
+        try {
+            let res = this.data.skuDoms
+            let target0 = res[0][0]
+            let topHeightArr = []
+
+            res[0].forEach(v=>{
+                topHeightArr.push(v.top - target0.top)
+            })
+
+            // 找到第一个大于domSctollTop的下标再-1  如果返回-1 就是最后一个
+            // 预留50px
+            let findIndex = topHeightArr.findIndex(v=>v-50>=domSctollTop)
+            if (findIndex<0) {
+                findIndex = topHeightArr.length-1
+            } else if(findIndex>=1) {
+                findIndex--
+            }
+
+            console.log(topHeightArr,domSctollTop,findIndex)
+            that.setData({
+                activeIndex: findIndex,
+                skuDoms: res,
+            })
+        } catch(e) {
+            console.log(e)
+        }
+    } else {
+        const query = wx.createSelectorQuery(); //创建节点查询器
+            query.selectAll(".scroll-item-top").boundingClientRect() //选择toViewid获取位置信息
+            query.exec(function (res) {
+                try {
+                    let target0 = res[0][0]
+                    let topHeightArr = []
+                    res[0].forEach(v=>{
+                        topHeightArr.push(v.top - target0.top)
+                    })
+                    // 找到第一个大于domSctollTop的下标再-1  如果返回-1 就是最后一个
+                    // 预留50px
+                    let findIndex = topHeightArr.findIndex(v=>v-50>=domSctollTop)
+                    if (findIndex<0) {
+                        findIndex = topHeightArr.length-1
+                    } else if(findIndex>=1) {
+                        findIndex--
+                    }
+
+                    that.setData({
+                        activeIndex: findIndex,
+                    })
+                } catch(e) {
+                    console.log(e)
+                }
+            })
+    }
+  },
+
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 02470b1..2c2022f 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -26,33 +26,51 @@
   </view>
   <view class="status-text{{info.garden_flag==0?' disable':''}}" wx:if="{{info.garden_flag_text && info.garden_flag!=1}}">{{info.garden_flag_text}}</view>
 </view>
-<view class="box" wx:if="{{info}}" wx:for="{{info.product}}">
-  <view class="allowance-box" wx:if="{{info.allowance}}" bindtap="changeAllowance">
-    补贴价
-    <view class="com-price two">￥{{ info.allowance.mini_price / 100 }}起</view>
-    <view class="yellow">单品最高补贴{{ info.allowance.max_price / 100 }}元</view>
-  </view>
-  <view class="box-top">
-    <text>{{item.title}}</text>
-  </view>
-  <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI">
-    <view class="skutitle">{{sku.sku_name}}</view>
-    <view class="product-box">
-      <view class="product-left textOver">
-        <view class="product-tags">
-          <view class="product-tag textOver" wx:for="{{sku.display_tags}}">{{item}}</view>
+
+
+<view class="sku-type-container" wx:if="{{info}}">
+    <view class="left-type-container">
+        <view class="sku-type {{activeIndex==index?'active':''}}" wx:for="{{info.product}}" 
+            data-index="{{index}}" bindtap="changeMenu">
+            {{item.title}}
         </view>
-        <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
-      </view>
-      <view class="product-right">
-        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>
-        <!-- showOrder    selectDate  -->
-        <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
-          data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
-          class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">预订</view>
-      </view>
     </view>
-  </view>
+
+    <scroll-view class="right-container" scroll-y="{{true}}" scroll-top="{{scrollHeight}}" enhanced="{{true}}" binddragend="skuScroll">
+        <view class="box" wx:if="{{info}}" wx:for="{{info.product}}">
+            <view class="allowance-box" wx:if="{{info.allowance}}" bindtap="changeAllowance">
+                补贴价
+                <view class="com-price two">￥{{ info.allowance.mini_price / 100 }}起</view>
+                <view class="yellow">单品最高补贴{{ info.allowance.max_price / 100 }}元</view>
+            </view>
+            <view id="{{'scrollItem'+index}}" class="box-top  scroll-item-top">
+                <text>{{item.title}}</text>
+            </view>
+
+            <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI">
+                <view class="skutitle">{{sku.sku_name}}</view>
+                <view class="product-box">
+                <view class="product-left textOver">
+                    <view class="product-tags">
+                    <view class="product-tag textOver" wx:for="{{sku.display_tags}}">{{item}}</view>
+                    </view>
+                    <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
+                </view>
+                <view class="product-right">
+                    <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>
+                    <!-- showOrder    selectDate  -->
+                    <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
+                    data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
+                    class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">预订</view>
+                </view>
+                </view>
+            </view>
+        </view>
+    
+    </scroll-view>
+</view>
+
+
   <view class="fixed-bottom">
     <navigator url="/pages/user/service/index" catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
       <view class="iconfont icon-kefu"></view>
@@ -160,9 +178,11 @@
     <view>这里空空如也，快去向大家提问吧!</view>
     <view class="empty-btn">去提问</view>
   </view> -->
-</view>
-<view class="box" wx:if="{{isTest==false}}">
-  <view class="box-top">
+
+
+
+<view class="box box-gb-20241216" wx:if="{{isTest==false}}">
+  <view class="box-top" style="border-bottom:1px solid #D9D9D9;">
     <text class="iconfont icon-tiwen1"></text><text>问大家</text>
   </view>
   <view class="empty-box" wx:if="{{!ask || ask.length==0}}">
@@ -191,7 +211,7 @@
       查看全部问答<text class="iconfont icon-you"></text></navigator>
   </view>
 </view>
-<view class="box">
+<view class="box box-gb-20241216">
   <view class="box-top">
     <text class="iconfont icon-tiwen"></text><text>游客点评</text><text class="score" wx:if="{{info && commentTotal>0}}">{{info.rate}}分</text>
      <navigator url="/pages/list/comments/index?sceneid={{id}}"  style="display: inline;">  <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong; font-weight: bold;color: #000;">></text></text>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 742b30c..44d3b80 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -1,6 +1,6 @@
 /* pages/info/sceneProductInfo/index.wxss */
 page {
-  background: #f2f2f2;
+  background: #f8f8f8;
 }
 
 .swiper {
@@ -920,4 +920,41 @@ page {
   position: absolute;
   top: 30rpx;
   right: 30rpx;
+}
+
+
+.sku-type-container{
+    display: flex;
+    margin-top: 20rpx;
+}
+.left-type-container{
+    width: 147rpx;
+    flex-shrink: 0;
+    background: #F8F8F8;
+    display: flex;
+    flex-direction: column;
+}
+.left-type-container .sku-type{
+    padding: 38rpx 12rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #000000;
+}
+.left-type-container .sku-type.active{
+    background: #FFFFFF;
+    font-weight: bold;
+    color: #0B898E;
+}
+.sku-type-container .right-container{
+    background: #FFFFFF;
+    flex: 1;
+    width: 1rpx;
+    max-height: 1100rpx;
+    padding-bottom: 20rpx;
+}
+
+.box-gb-20241216{
+    background: #FFF;
+    margin: 20rpx 0;
+    padding:0 20rpx;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index b5b645b..184d71d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,8 +8,8 @@
       "list": [
         {
           "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FpetYou2024%253FcnylCode%253D123456=",
+          "pathName": "subPackages/index/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index fb73f07..b82fe47 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -5,6 +5,7 @@ import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 import https from "../../utils/https.js"
+
 Page({
 	data: {
 		banner: [],
@@ -18,7 +19,7 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: [ "changshu", "taicang", "kunshan", "wujiang", "gongyeyuanqu", "zhangjiagang", "wuzhong", "xiangcheng", "gusu", "gaoxin"],
+		
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -33,7 +34,8 @@ Page({
 		prizeInfo: null,
 		otherPlat: null,
 		activeBannerIndex: 0,
-		smBannerIndex: 0,
+        smBannerIndex: 0,
+        XPathBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -47,24 +49,27 @@ Page({
 		showTime: false,
 		xpth: {}, // 元旦新增 新品特惠和sqjNew
 		djs: null, // 元旦新增 新品特惠倒计时
-		djsTime: null,
+        djsTime: null,
+        area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
 		sqjNew: [
-      'https://static.ticket.sz-trip.com/uploads/20240617/3acf736c1dc9c7af08d3363833669896.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20240617/4f33191399b2ec1b6b8af77a9d976389.png',// 太仓
-			'https://static.ticket.sz-trip.com/uploads/20240617/7c62e1438242fc6db47f96cff8a43e9b.png',// 昆山
-			'https://static.ticket.sz-trip.com/uploads/20240617/4ac7bd7e59edef07d5079bb802dae99b.png',// 吴江
-			'https://static.ticket.sz-trip.com/uploads/20240617/fc20f4d0582ac8611dc9ce7a933deda3.png',// 工业园区
-			'https://static.ticket.sz-trip.com/uploads/20240617/09325c6e6d94e1b23c1019f95ec05f3f.png',// 张家港
-			'https://static.ticket.sz-trip.com/uploads/20240617/56ccaab57aaf050bb6feccc3a70983bb.png',// 吴中
-			'https://static.ticket.sz-trip.com/uploads/20240617/fbb3b7bdaa0cafed88015aa3f8d3da96.png',// 相城
-			'https://static.ticket.sz-trip.com/uploads/20240617/d83cb13156ad76bb8051dbc2b60126af.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20240617/b28afa0861eb54f5f3d483a7c08fdbda.png',// 高新区
+            'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
+			'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓
+            'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山
+            'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江
+            'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区
+            'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港
+            'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中
+            'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城
+            'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
+			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
 		],
 		viewHeight: "0px",
 		isMuted: true,
 		videoPlay: false,
 	},
 	onLoad: function(options) {
+        wx.getLocation({type: 'gcj02'})
+           
 		console.log('options',options)
 		// 相城小程序跳转获取用户信息
 		if(options && options.szxcCode) {
@@ -171,8 +176,9 @@ Page({
 		this.setData({
 			month: (this.data.months[today.getMonth()]).toUpperCase(),
 			date: today.getDate()
-		})
-		this.getVideoPrize()
+        })
+        // 调用接口如果token过期会导致一进入就要登陆
+		// this.getVideoPrize()
 		this.getXpthList()
 	},
 	getHeight() {
@@ -189,8 +195,10 @@ Page({
 		// 元旦新增 新品特惠
 		commonApi._post("product/get_product_indulgence", {
 			tag_id: 275,
-			typeId: 3,
+            typeId: 3,
+            type: 1, // 返回数组
 		}).then(res => {
+            // res.data.adv = [res.data.adv]
 			this.setData({
 				xpth: res.data,
 				djsTime: res.data.time
@@ -241,7 +249,12 @@ Page({
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
-	},
+    },
+    changeXPathBannerIndex: function(e) {
+		this.setData({
+			XPathBannerIndex: e.detail.current
+		})
+    },
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -549,7 +562,8 @@ Page({
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
 		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
+        app.globalData.weburl = url;
+        console.log(url)
 		wx.navigateTo({
 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
 		})
@@ -812,7 +826,7 @@ Page({
 	// 获取短视频大赛是否中奖 中奖详情
 	getVideoPrize() {
 		let user_id = wx.getStorageSync('jstrip_userid');
-		if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
 		commonApi.user_post('actonline/video_act/getRaffle', {
 			act_id: 5
 		}).then(res => {
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index c6b19ef..8305409 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -26,14 +26,14 @@
     </view>
     <view style="position:relative;z-index: 1;">
     <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="*this">
+        <block wx:for="{{banner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
             <image src="{{item.head_img}}" mode="scaleToFill"></image>
         </swiper-item>
         </block>
     </swiper>
     <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
     </view>
     </view>
 
@@ -46,484 +46,428 @@
     </block>
     </swiper> -->
     <view class="top-icons" wx:if="{{!isTest}}">
-    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">活动日历</view>
-    </view>
-    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">场馆预约</view>
-    </view>
-    <!-- 非遗跳专题 -->
-    <!-- <view bindtap="goFeiyi" data-event="legacy" data-title="非遗专卖"
-        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item"> -->
-    <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-        <view class="top-icon-text">非遗专卖</view>
-    </view>
-    <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-        data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-        <view class="top-icon-text">非遗专卖</view>
-    </view> -->
-    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">剧场演出</view>
-    </view>
-    <!-- 2024年7月新版文创特产 -->
-    <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-        <view class="top-icon-text">文创特产</view>
-    </view>
-    <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-        data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-        <view class="top-icon-text">文创特产</view>
-    </view> -->
-    <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/e11e0cb3033b786fc61ee17f8bfbfbfb.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">景点门票</view>
-    </view>
-    <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/26d38d0b8b6014915b5b013e8672ae82.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">酒店住宿</view>
-    </view>
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">夜游苏州</view>
-    </view>
-    <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/d63fd9f74bc5f3016800f0572fdbeed9.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">一日游</view>
-    </view>
-    <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3537918b5a5b26319c22747e80200ef7.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">研学游</view>
-    </view>
-    </view>
-    <view class="content">
-    <view class="sale-road-boxes" wx:if="{{false}}">
-        <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-        <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-        <view class="sale-product">
-            <view class="sale-product-bg"></view>
-            <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
-            </image>
-            <view class="sale-info">
-            <view class="sale-product-title textOver2">
-                <view>限时特惠</view>
-                <view>新品推荐</view>
-            </view>
-            <view class="sale-price" style="#F44747" wx:if="{{saleProduct}}">
-                ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-            </view>
+        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/48059df0ab43af6fd86a7a2f8ca2fa47.png" mode="widthFix"></image>
+            <view class="top-icon-text">活动日历</view>
+        </view>
+        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/95098baee61e82506860793945970c04.png" mode="widthFix"></image>
+            <view class="top-icon-text">场馆预约</view>
+        </view>
+        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/af56b9461fc129eeb2076cddc7575b4e.png" mode="widthFix"></image>
+            <view class="top-icon-text">非遗专卖</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
+            data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
+            <view class="top-icon-text">非遗专卖</view>
+        </view> -->
+        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/486a7a434f036ffa4e4f3dacec8eedfc.png" mode="widthFix"></image>
+            <view class="top-icon-text">剧场演出</view>
+        </view>
+        <!-- 2024年7月新版文创特产 -->
+        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/193c7646a95fb88ff1bc2d73bda03e70.png" mode="widthFix"></image>
+            <view class="top-icon-text">文创特产</view>
+        </view>
+        <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
+            data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
+            <view class="top-icon-text">文创特产</view>
+        </view> -->
+        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/bde4344ae2bfe55ff8cd91704904a07b.png" mode="widthFix"></image>
+            <view class="top-icon-text">景点门票</view>
         </view>
+        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/05c99091489d8eba395075471c5abfd3.png" mode="widthFix"></image>
+            <view class="top-icon-text">酒店住宿</view>
         </view>
-        <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-        <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-        <view class="sale-product">
-            <view class="sale-product-bg road-product-bg"></view>
-            <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-            <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
-            </image>
-            <view class="sale-info">
-            <view class="sale-product-title textOver2">
-                <view>四季苏州</view>
-                <view>最是江南</view>
-            </view>
-            <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-                ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
-            </view>
+        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/32e3894971c3f57f2e86f46c885f4d64.png" mode="widthFix"></image>
+            <view class="top-icon-text">夜游苏州</view>
         </view>
+        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/56333c7e1867719fdfbbdd1acd8b8af1.png" mode="widthFix"></image>
+            <view class="top-icon-text">一日游</view>
         </view>
-    </view>
-    <!-- 五一修改 一张banner不滚动 -->
-    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-    </view>
-    <view class="small-swiper-box" wx:else>
-        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-        <block wx:for="{{xiaobanner}}" wx:key="*this">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <!-- 原 圆角77rpx，现改为13rpx -->
-            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-            </swiper-item>
-        </block>
-        </swiper>
-        <view class="dot-list com-flex sm-dot-list">
-        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20241011/23c1af842453eb981adbc315b2012ff9.png" mode="widthFix"></image>
+            <view class="top-icon-text">研学游</view>
         </view>
     </view>
-    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-    <view style="display: flex;">
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-        <image src="{{indexSeason.ai}}" mode=""/>
-        </view>
-        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-        <image src="{{indexSeason.avoid}}" mode=""/>
-        </view>
-    </view>
-    <!-- 元旦修改  限时特惠--新版-->
-    <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-        <!-- 上方标题部分 -->
-        <view class="xsth-title">
-        <view class="xsth-left" style="display: flex;">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
-        </view>
-        <view class="time-box" style="z-index: 9;">
-            倒计时
-            <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-            <text>:</text>
-            <view class="xsth-time">{{djs.m}}</view>
-            <text>:</text>
-            <view class="xsth-time">{{djs.s}}</view>
-        </view>
-        <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-        <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-            更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-        </view> -->
-        </view>
-        <!-- 商品部分 -->
-        <view class="xpth-product">
-        <!-- 左边的2个产品 -->
-        <view class="xpth-left">
-            <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-            <image src="{{item.headimg}}" mode="" />
-            <view class="xpth-item-content">
-                <view class="xpth-item-title textOver2">{{item.title}}</view>
-                <!-- <view class="xpth-tag">唇齿留香</view> -->
-                <view class="xpth-item-bottom">
-                <view class="xpth-item-price">{{item.price/100}}</view>
-                <!-- <view class="xpth-item-buy">立即抢购</view> -->
+    <view class="content">
+        <view class="sale-road-boxes" wx:if="{{false}}">
+            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+            <view class="sale-product">
+                <view class="sale-product-bg"></view>
+                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
+                </image>
+                <view class="sale-info">
+                <view class="sale-product-title textOver2">
+                    <view>限时特惠</view>
+                    <view>新品推荐</view>
+                </view>
+                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
+                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
                 </view>
             </view>
             </view>
-        </view>
-        <!-- 右边的banner -->
-        <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" />
-        </view>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-    </view>
-    <!-- 五一修改 .slide-out-box 增加背景色-->
-    <view class="slide-out-box">
-        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-            <view class="text">数字非遗</view>
-            </view>
-            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-            <view class="text">数字博物馆</view>
-            </view>
-            <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/df0683bb40ec2615a932ef2379779374.png" mode="widthFix"></image>
-            <view class="text">数字名人馆</view>
+            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
+            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+            <view class="sale-product">
+                <view class="sale-product-bg road-product-bg"></view>
+                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
+                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
+                </image>
+                <view class="sale-info">
+                <view class="sale-product-title textOver2">
+                    <view>四季苏州</view>
+                    <view>最是江南</view>
+                </view>
+                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+                </view>
             </view>
-            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-            <view>云上观展</view>
             </view>
-            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-            <view class="text">云上文博会</view>
+        </view>
+        <!-- ai避高峰 -->
+        <view style="display: flex;margin-top: 30rpx;">
+            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
+            <image src="{{indexSeason.ai}}" mode=""/>
             </view>
-            <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/e5b8c83dd99e18b9af6b15aede1c458b.png" mode="widthFix"></image>
-            <view class="text">精彩回顾</view>
+            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+            <image src="{{indexSeason.avoid}}" mode=""/>
             </view>
-            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-            <view class="text">文化场馆查询</view>
+        </view>
+
+        <!-- 小banner 五一修改 一张banner不滚动 -->
+        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+        </view>
+        <view class="small-swiper-box" wx:else>
+            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+            <block wx:for="{{xiaobanner}}" wx:key="index">
+                <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <!-- 原 圆角77rpx，现改为13rpx -->
+                <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                </swiper-item>
+            </block>
+            </swiper>
+            <view class="dot-list com-flex sm-dot-list">
+            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+            </view>
+        </view>
+    
+        <!-- 限时特惠--新版-->
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+            <!-- 上方标题部分 -->
+            <view class="xsth-title">
+            <view class="xsth-left" style="display: flex;">
+                <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+            </view>
+            <view class="time-box" style="z-index: 9;flex-shrink: 0;">
+                倒计时
+                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+                <text>:</text>
+                <view class="xsth-time">{{djs.m}}</view>
+                <text>:</text>
+                <view class="xsth-time">{{djs.s}}</view>
+            </view>
+            <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
+            <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
+                更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
+            </view> -->
             </view>
-            <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b2f56e57caa058ef0293a682bc620c5.png" mode="widthFix"></image>
-            <view class="text">苏影通</view>
+            <!-- 商品部分 -->
+            <view class="xpth-product">
+            <!-- 左边的2个产品 -->
+            <view class="xpth-left">
+                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                <image src="{{item.headimg}}" mode="" />
+                <view class="xpth-item-content">
+                    <view class="xpth-item-title textOver2">{{item.title}}</view>
+                    <!-- <view class="xpth-tag">唇齿留香</view> -->
+                    <view class="xpth-item-bottom">
+                    <view class="xpth-item-price">{{item.price/100}}</view>
+                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                    </view>
+                </view>
+                </view>
             </view>
-            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
+            <!-- 右边的banner -->
+            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
+                <block wx:for="{{xpth.adv}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <view class="xpth-banner-dot-list">
+                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                </view>
             </view>
-            <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/1a5fc26d419e589c5649273f8105b723.png" mode="widthFix"></image>
-            <view class="text">e读书</view>
+            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
             </view>
+        </view>
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+        </view>
 
-            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-            <view class="text">数字公共文化</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-            <view class="text">文旅单位</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view> -->
-            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-            <view class="text">云游苏州</view>
+        <!-- 数字文旅-->
+        <view class="slide-out-box">
+            <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+            <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+            <view class="pbservice" style="margin-bottom:30rpx">
+                <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/3f386ea45281d642a2692c9e65a2037c.png" mode="widthFix"></image>
+                <view class="text">数字非遗</view>
+                </view>
+                <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/d1e0df4aa32de12451228e776a75a882.png" mode="widthFix"></image>
+                <view class="text">数字博物馆</view>
+                </view>
+                <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/c3c31a60c94d1fe1292dbe2ffc253519.png" mode="widthFix"></image>
+                <view class="text">数字名人馆</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/cc82f9b107f600b444bc4e43f0d06d68.png" mode="widthFix"></image>
+                <view>云上观展</view>
+                </view>
+                <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/ba90dbaaf1b833411e517991d0784292.png" mode="widthFix"></image>
+                <view class="text">云上文博会</view>
+                </view>
+                <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/b0b3cc6f2ed3ed0fafe9e9f9b9ed3f88.png" mode="widthFix"></image>
+                <view class="text">精彩回顾</view>
+                </view>
+                <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/8de0e891c1e8fec7439619d1d6e63db4.png" mode="widthFix"></image>
+                <view class="text">文化场馆查询</view>
+                </view>
+                <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/ced5cb9b113d5c37cabf199e2a348b46.png" mode="widthFix"></image>
+                <view class="text">苏影通</view>
+                </view>
+                <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/579dd26c8549e7c77cc0edd72bb7d9b9.png" mode="widthFix"></image>
+                <view class="text">书仓</view>
+                </view>
+                <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/8dcf8ddf93d276d5009617f77ff26df4.png" mode="widthFix"></image>
+                <view class="text">e读书</view>
+                </view>
+
+                <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/640e0ea31fa881e694b93591d4d84b49.png" mode="widthFix"></image>
+                <view class="text">数字公共文化</view>
+                </view>
+                <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+                data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+                <view class="text">文旅单位</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+                <view class="text">书仓</view>
+                </view> -->
+                <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/4fc0b988d1d5ced741b585c22ae875f2.png" mode="widthFix"></image>
+                <view class="text">云游苏州</view>
+                </view>
+                <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241015/267db6cc986b61bb3777b70f67cafb47.png" mode="widthFix"></image>
+                <view class="text">美图鉴赏</view>
+                </view>
+                <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+                data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+                <view>文物查询</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+                data-path="/pages/pbService/museum/index" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+                <view>博物馆查询</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+                <view>云上文博会</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+                <view class="text">投资导引图</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-title="数字文物"
+                data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+                <view>数字文物</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+                <view>团体预约</view>
+                </view> -->
+                <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+                data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+                <view>廉洁地图</view>
+                </view> -->
+                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+                class="pbservice-item">
+                <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+                <view>文化配送</view>
+                </view> -->
             </view>
-            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-            <view class="text">美图鉴赏</view>
+            </scroll-view>
+            <view class="scroll-line">
+            <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+            <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+            <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
+            <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
             </view>
-            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-            <view>文物查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-            data-path="/pages/pbService/museum/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-            <view>博物馆查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-            <view>云上文博会</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-            <view class="text">投资导引图</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="数字文物"
-            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-            <view>数字文物</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-            <view>团体预约</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-            <view>廉洁地图</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-            <view>文化配送</view>
-            </view> -->
-        </view>
-        </scroll-view>
-        <view class="scroll-line">
-        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
         </view>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
-    </view>
-    <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-        <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-        <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
-        <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/disz.png" mode="aspectFill"></image> -->
-        <!-- <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-        data-path="/pages/list/{{isTest?'road':'food'}}/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/jxms.png" mode="aspectFill"></image> -->
-        <!-- <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yydl.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/yjgl.png" mode="aspectFill"></image> -->
-        <!-- 元旦修改 下面4个为原始的， 上面的是新改的 新改的class为 new-pic -->
-        <!-- <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-        data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
-        <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-        data-path="/pages/list/{{isTest?'road':'food'}}/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
-        <image bindtap="audioGuide" data-event="voice_click"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
-        </image>
-        <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-        src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image> -->
-        <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-        mode="aspectFill"></image> -->
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0;">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
-        <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-        <view>
-            查看全部
-        </view>
-        <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20240617/ae3b9e3833861d242489c844e0abe99e.png" mode="" />
-        <!-- <text class="iconfont icon-you"></text>  -->
-        </navigator>
-        <!-- <image class="rmtj-right" style="z-index: 2;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ggfw-right.png" mode=""/> -->
-    </view>
-    <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
-        <!-- 元旦修改 ggfw为新增类名 -->
-        <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-            data-url="data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-            <view>景区舒适度</view>
-        </view> -->
-        <!-- 元旦修改 ggfw为新增类名 -->
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5bc25bb21009b5f652b07d7c5d44b247.png" mode="widthFix"></image>
-            <view>安全服务</view>
-        </view> -->
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
-            <view>电子社保卡</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
-            <view>景区舒适度</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image> -->
-            <!-- 元旦修改 -->
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
-            <view>行李寄存</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-            <!-- <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image> -->
-            <!-- 元旦修改 -->
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
-            <view>实时路况</view>
-        </view>
-        <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
-            data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
-            <view>找厕所</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
-            data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
-            <view>停车场</view>
-        </view> -->
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-            <view>12348</view>
-        </view> -->
+
+        <!-- 旅游助手 -->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
+        </view>
+        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
+            </image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
         </view>
-    </view>
-    <view class="sale-road-boxes">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
-    </view>
-    <!-- <view class="six-box">
-        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪"
-        data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{10}}"
-        src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
-        </image>
-    </view> -->
-    <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
-    <view class="six-box-new" wx:if="{{!isTest}}">
-        <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
-        </image>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
-    </view>
-    <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-        <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="this">
-        <image src="{{item.icon}}" mode="widthFix"></image>
-        <view>{{item.name}}</view>
+
+        <!-- 公共服务 -->
+        <view class="sale-road-boxes" style="margin-top:0;">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                <view style="height: 40rpx;line-height: 40rpx;">查看全部</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241012/a3eea8df9bb8347f550d5828bddfc215.png" mode="" />
+            </navigator>
+            
         </view>
-    </view>
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
-    </view>
-    <view class="hot-list" wx:if="{{isTest==false}}">
-        <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
-        <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-            <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-            <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-            <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-            <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-            <view class="today-date">{{date}} {{month}}</view>
-            <view class="today-hot-box">
-                <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="this">
-                {{item.ext.display_tags[0]}}</view>
-                <view class="today-hot-title">{{item.title}}</view>
-            </view>
-            </view>
-            <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-            <view style="position:relative">
-                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-            </view>
-            <view class="hot-info">
-                <view class="hot-title">{{item.title}}</view>
-                <view class="tags textOver" style="margin-bottom:0">
-                <view class="icon-box">
-                    <text class="iconfont icon-xin"></text>
-                    <text>{{item.ext.like_number}}</text>
+        <view style="overflow-x:auto;background: #FFF1C2;border-radius: 20rpx;height: 199.33rpx;">
+            <!-- 元旦修改 ggfw为新增类名 -->
+            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/882033bd48c99ea745036697beefb6bb.png" mode="widthFix"></image>
+                <view>高峰预警</view>
                 </view>
-                <view class="icon-box">
-                    <text class="iconfont icon-eye"></text>
-                    <text>{{item.ext.view_number}}</text>
+                <view bindtap="gotoUrl" data-event="xlqc"
+                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/90d32d4b4be584bbdb23b43c20da188c.png" mode="widthFix"></image>
+                <view>实时路况</view>
                 </view>
+                <view bindtap="gotoUrl" data-event="xlqc"
+                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20241012/340f637b40d21fdafa42b67463ef371a.png" mode="widthFix"></image>
+                <view>行李寄存</view>
+                </view>
+                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+                    data-path="/pages/pbService/bike/index?type=1">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20241012/5d794820cbb29acea5c78e0a46df29ee.png" mode="widthFix"></image>
+                    <view>找厕所</view>
                 </view>
             </view>
-            </view>
-            <view wx:else class="hot-item">
-            <view style="position:relative">
-                <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                <!-- <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' && item.ext.price}}" class="hot-price">
-                <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+        </view>
+        <view class="sale-road-boxes">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
+        </view>
+
+        <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
+        <view class="six-box-new" wx:if="{{!isTest}}">
+            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+            </image>
+        </view>
+        <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
+        </view>
+        
+        <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
+            <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+            <image src="{{item.icon}}" mode="widthFix"></image>
+            <view>{{item.name}}</view>
+            </view>
+        </view>
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
+            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
+        </view>
+        <view class="hot-list" wx:if="{{isTest==false}}">
+            <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
+            <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+                <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
+                <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+                <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
+                <view class="today-date">{{date}} {{month}}</view>
+                <view class="today-hot-box">
+                    <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
+                    {{item.ext.display_tags[0]}}</view>
+                    <view class="today-hot-title">{{item.title}}</view>
+                </view>
+                </view>
+                <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+                <view style="position:relative">
+                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                    <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+                </view>
+                <view class="hot-info">
+                    <view class="hot-title">{{item.title}}</view>
+                    <view class="tags textOver" style="margin-bottom:0">
+                    <view class="icon-box">
+                        <text class="iconfont icon-xin"></text>
+                        <text>{{item.ext.like_number}}</text>
+                    </view>
+                    <view class="icon-box">
+                        <text class="iconfont icon-eye"></text>
+                        <text>{{item.ext.view_number}}</text>
+                    </view>
+                    </view>
+                </view>
+                </view>
+                <view wx:else class="hot-item">
+                <view style="position:relative">
+                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                    <!-- <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' && item.ext.price}}" class="hot-price">
+                    <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                    </view>
+                </view>
                 </view>
             </view>
             </view>
         </view>
-        </view>
-    </view>
-    <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-    <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+        <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+        <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
     </view>
+
     <view class="mask prizeMask" wx:if="{{videoPrize}}">
     <view class="mask-bg"></view>
     <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
@@ -578,7 +522,7 @@
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
     <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-        <block wx:for="{{alertSwipeList}}" wx:key="*this">
+        <block wx:for="{{alertSwipeList}}" wx:key="index">
         <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
             <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
         </swiper-item>
@@ -653,7 +597,7 @@
     </view>
   
    
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item" wx:if="{{false}}">
         <!-- 夏季修改 -->
         <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
         <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 34cd243..adcd838 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -4,9 +4,9 @@ page {
   /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
   /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
-  background: #9DDCF5 url('https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png');
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20241012/abae687010ec0955b70872edd660002a.jpg');
   background-repeat: repeat-y;
-  background-size: contain;
+  background-size: 100% 100%;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -78,10 +78,8 @@ page {
   margin-right: 30rpx;
 }
 .top-icons {
-  /* background: #FFFFFF; */
-  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
-  width: 710rpx;
+  width: 697rpx;
   margin: 0 auto;
   position: relative;
   z-index: 0;
@@ -90,11 +88,9 @@ page {
   padding-bottom: 29.33rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  /* background: #FFFED6; */
   margin-top: -50rpx;
   padding-top: 84rpx;
-  background: url('https://static.ticket.sz-trip.com/uploads/20240606/80bc185bf83b276b114415d670eaa57f.png');
-  background-size: 100% 100%;
+  background: #FFF1C2;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -211,7 +207,7 @@ page {
   border-radius: 20rpx;
   /* border-radius: 77rpx; */
   overflow: hidden;
-  margin-bottom: 33rpx;
+  margin-top: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -327,15 +323,13 @@ page {
   flex-wrap: wrap;
 }
 .title-more {
-  font-size: 24rpx;
-  /* color: #0B898E; */
-  /* 元旦修改 */
-  color: #54504D;
+  font-size: 27rpx;
+  font-weight: 500;
+  color: #F65D1F;
   z-index: 9;
   width: 173rpx;
   height: 40rpx;
-  /* line-height: 40rpx; */
-  background: rgba(255, 255, 255, 0.5);
+  background: rgba(255,255,255,0.5);
   border-radius: 20rpx;
   text-align: center;
   display: flex;
@@ -347,13 +341,10 @@ page {
 }
 .slide-out-box {
   margin-top: 20rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
+  background: #FFF1C2;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
   margin-bottom: 40rpx;
-  background: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
-  background-size: 100% 100%;
 }
 .pbservice {
   /* width: calc(175rpx * 6); */
@@ -373,9 +364,7 @@ page {
   /* width: 175rpx; */
   text-align: center;
   font-size: 25rpx;
-  /* color: #333; */
-  /* 春节调整颜色改版 */
-  color: #54504D;
+  color: #111111;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -551,21 +540,16 @@ page {
 }
 .more-btn-text {
   text-align: center;
-  /* color: #0b898e;
-  font-size: 27rpx;
-  width: 200rpx;
-  line-height: 65rpx;
-  border: 1px solid #0b898e;
-  border-radius: 33rpx; */
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #111;
+  border: 1px solid #F6591D;
   border-radius: 35rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
-  font-weight: 500;
+  font-weight: bold;
+  color: #F6591D;
 }
 .scroll-line {
   /* height: 6rpx;
@@ -588,13 +572,13 @@ page {
   background: #0B898E; */
   /* 元旦修改 以上为注释部分 下面为新内容*/
   height: 7rpx;
-  background: #56A5EA;
+  background: #F65D1F;
   border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 37.33rpx;
-  background: #56A5EA;
+  background: #F65D1F;
   height: 7rpx;
   border-radius: 3rpx;
 }
@@ -702,14 +686,11 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
-  background: #FFFED6;
+  background: #FFF1C2;
   justify-content: space-around;
   height: 187rpx;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
-  background: url('https://static.ticket.sz-trip.com/uploads/20240606/e1c3f60baf65787d593c6a7c79f881c7.png');
-  background-size: 100% 100%;
 }
 .other-plats image {
   width: 80rpx;
@@ -719,7 +700,7 @@ page {
 }
 .other-plat {
   /* 春节新增样式 */
-  color: #54504D;
+  color: #111111;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -853,7 +834,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .time-box {
-  font-size: 25rpx;
+  font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
   /* color: #54504D; */
@@ -867,15 +848,16 @@ page {
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  width: 43rpx;
+  /* width: 43rpx; */
   height: 43rpx;
+  padding: 0 7rpx;
   line-height: 43rpx;
-  background: #FFEF47;
+  background: #FFF1C2;
   border-radius: 13rpx;
-  font-size: 25rpx;
+  font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #000;
+  color: #ED1C19;
   text-align: center;
 }
 .time-box text {
@@ -922,46 +904,53 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-product {
-  /* position: absolute; */
   width: 700rpx;
   height: 373rpx;
-  /* background: #FFFED6; */
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx;
+  padding: 25rpx 13rpx;
   box-sizing: border-box;
-  /* left: 0;
-  bottom: 15.33rpx;
-  /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20240606/88feacc675386ac7c8144633ccbd6f76.png');
-  background-size: 100% 100%;
+  background: #FFF1C2;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
-  /* width: 270rpx; */
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
-  /* background-size: 100% 100%; */
-  border-radius: 20rpx;
   flex: 1;
   margin-left: 15rpx;
-  /* padding: 4rpx;
-  background: #72674e;
-  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  height: 319rpx;
+  height: 320rpx;
+  width: 100%;
+  border-radius: 20rpx;
+  overflow: hidden;
+  position: relative;
+}
+.xpth-banner-swiper{
+    height: 100%;
 }
 .xpth-banner image {
-  /* width: 270rpx; */
   flex: 1;
-  height: 319rpx;
+  height: 100%;
+  width: 100%;
   border-radius: 20rpx;
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  /* border-radius: 20rpx; */
+}
+.xpth-banner-dot-list{
+    position: absolute;
+    right: 0;
+    bottom: 10rpx;
+    padding: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+.xpth-banner-dot-list .xpth-dot{
+    width: 9rpx;
+    height: 9rpx;
+    background: #FFFFFF;
+    border-radius: 50%;
+    opacity: 0.6;
+    margin: 0 4rpx;
+}
+.xpth-banner-dot-list .xpth-dot.active{
+    opacity: 1;
 }
 /* 元旦修改新增样式 */
 .xpth-item {
@@ -1030,15 +1019,15 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-price {
-  font-size: 32rpx;
+  font-size: 31rpx;
   font-family: PingFang SC;
-  font-weight: 500;
-  color: #D62828;
+  font-weight: bold;
+  color: #ED1C19;
 }
 /* 元旦修改新增样式 */
 .xpth-item-price::before {
   content: "￥";
-  font-size: 20rpx;
+  font-size: 23rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-item-buy {
@@ -1055,14 +1044,18 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 158.67rpx !important;
-  height: 218.67rpx !important;
+  width: 160rpx !important;
+  height: 213rpx !important;
   margin-bottom: 26.67rpx;
 }
 
 .ggfw-list {
   justify-content: space-around !important;
 }
+.ggfw-list .pbservice-item{
+    margin-right: 0;
+    color: #111111;
+}
 .ggfw {
   width: auto;
 }
@@ -1096,7 +1089,7 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #54504D;
+  color: #111111;
 }
 
 .rmtj-right {
@@ -1196,3 +1189,12 @@ page {
   flex-shrink: 0;
   margin-left: -20rpx;
 }
+
+.xsth-left{
+    /* flex: 1;
+    width: 1rpx; */
+}
+.xsth-left>image{
+    max-width: 100%;
+    overflow: hidden;
+}
\ No newline at end of file
diff --git a/utils/https.js b/utils/https.js
index 58ee3a1..50f43f4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From a77be1abbe4804911e9e13f9a456d8c4ccab9761 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 26 Dec 2024 09:14:42 +0800
Subject: [PATCH 236/471] 1

---
 pages/index/index.wxss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index e2d5f3f..b543000 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -908,7 +908,7 @@ page {
   margin-left: 15rpx;
   height: 322rpx;
   width: 100%;
-  border-radius: 1rpx;
+  border-radius: 0rpx;
   overflow: hidden;
   position: relative;
   background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
@@ -917,6 +917,8 @@ page {
 }
 .xpth-banner-swiper{
     height: 100%;
+    border-radius: 20rpx;
+    overflow: hidden;
 }
 .xpth-banner image {
   flex: 1;

From 9b6d4fa90d7121ee5a588bf50cec62f7214b846b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 27 Dec 2024 09:32:20 +0800
Subject: [PATCH 237/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 | 2 +-
 pages/index/index.js                   | 4 ++--
 pages/info/sceneProductInfo/index.js   | 2 ++
 pages/info/sceneProductInfo/index.wxml | 6 ++++--
 pages/info/sceneProductInfo/index.wxss | 1 -
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 2d8e4ba..215d2b7 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.isTest149? true : false;
+      data.isTest = data.isTest150? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 78aeb41..49f6d81 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -339,9 +339,9 @@ Page({
 			isTest: app.globalData.configJson.isTest,
             otherPlat: app.globalData.configJson.otherPlats,
             // 正式数据
-            // indexSeason: app.globalData.configJson.indexSeason,
+            indexSeason: app.globalData.configJson.indexSeason,
             // 开发数据
-            indexSeason: imageSource.testImgs.indexSeason
+            // indexSeason: imageSource.testImgs.indexSeason
 		})
         this.getFourProduct()
         console.log(this.data)
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 23d01e0..d7103c2 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -121,6 +121,7 @@ Page({
           res.data.product.map(product => {
             product.sku.map(sku => {
               sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+              sku.display_tags_str = sku.display_tags.join(' | ')
             })
           })
           this.setData({
@@ -157,6 +158,7 @@ Page({
       res.data.product.map(product => {
         product.sku.map(sku => {
           sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+          sku.display_tags_str = sku.display_tags.join(' | ')
         })
       })
       this.setData({
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 2c2022f..1d0768a 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -37,7 +37,7 @@
     </view>
 
     <scroll-view class="right-container" scroll-y="{{true}}" scroll-top="{{scrollHeight}}" enhanced="{{true}}" binddragend="skuScroll">
-        <view class="box" wx:if="{{info}}" wx:for="{{info.product}}">
+        <view class="box" style="margin: 0;padding: 20rpx;" wx:if="{{info}}" wx:for="{{info.product}}">
             <view class="allowance-box" wx:if="{{info.allowance}}" bindtap="changeAllowance">
                 补贴价
                 <view class="com-price two">￥{{ info.allowance.mini_price / 100 }}起</view>
@@ -52,7 +52,9 @@
                 <view class="product-box">
                 <view class="product-left textOver">
                     <view class="product-tags">
-                    <view class="product-tag textOver" wx:for="{{sku.display_tags}}">{{item}}</view>
+                    <!-- <view class="product-tag textOver" wx:for="{{sku.display_tags}}">{{item}}</view> -->
+                    <view class="product-tag textOver" >{{sku.display_tags_str}}</view>
+
                     </view>
                     <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
                 </view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 44d3b80..9db679b 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -950,7 +950,6 @@ page {
     flex: 1;
     width: 1rpx;
     max-height: 1100rpx;
-    padding-bottom: 20rpx;
 }
 
 .box-gb-20241216{

From 6748aa40752ebb6c3e813f8813ae6c6182c780b5 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 27 Dec 2024 14:26:51 +0800
Subject: [PATCH 238/471] =?UTF-8?q?=E5=B7=A5=E8=A1=8C=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index bc26f71..9aa3928 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -181,16 +181,19 @@ Page({
     }
     commonApi.user_post("order/pay",{
       order_id:this.data.id,
-      pay_method:"WEIXIN",
+    //   pay_method:"WEIXIN",
+    // 2024-12-20 换为工行聚合支付
+      pay_method: "ICBC_WECHAT",
       pay_platform:"MINI",
-      app_name:"WxXcxConfig"
+    //   app_name:"WxXcxConfig"
     }).then(res=>{
       res.data = JSON.parse(res.data)
+      console.log(res.data)
       wx.requestPayment({
-        nonceStr: res.data.nonceStr,
+        nonceStr: res.data.nonceStr || res.data.noncestr,
         package: res.data.package,
-        paySign: res.data.paySign,
-        timeStamp:""+res.data.timeStamp,
+        paySign: res.data.paySign || res.data.sign,
+        timeStamp:""+(res.data.timeStamp || res.data.timestamp),
         signType:res.data.signType,
         success:function(res){
           wx.showToast({

From 0107b6cff6a1ff473ec311d8eb926fa76a65fb3c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 30 Dec 2024 09:47:20 +0800
Subject: [PATCH 239/471] =?UTF-8?q?=E5=AF=92=E5=B1=B1=E5=AF=BA=E5=90=AC?=
 =?UTF-8?q?=E9=92=9F=E5=A3=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/orderAdv/orderAdv.js   | 42 ++++++--------------------
 pages/info/sceneProductInfo/index.wxml |  6 ++--
 3 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/app.js b/app.js
index 215d2b7..2d8e4ba 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.isTest150? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/orderAdv/orderAdv.js b/pages/component/orderAdv/orderAdv.js
index 89c9b32..0dbfd09 100644
--- a/pages/component/orderAdv/orderAdv.js
+++ b/pages/component/orderAdv/orderAdv.js
@@ -75,39 +75,15 @@ Component({
     			}
     			break;
     		case 3:
-    			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-    				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-    				// 外部h5
-    				app.globalData.weburl = item.tdata.url;
-    				wx.navigateTo({
-    					url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
-    						.url)
-    				})
-    			} else {
-    				let page = item.tdata.url.split("/");
-    				page = page[page.length - 1].split("?")
-    				let url = this.data.urltopage[page[0]];
-    				if (url && url.indexOf('map') != -1) {
-    					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-    							'cinema', 'academes'
-    						],
-    						type = page[1] ? page[1].split("=") : [];
-    					wx.reLaunch({
-    						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
-    							null)
-    					})
-    				} else if (url) {
-    					wx.navigateTo({
-    						url: url,
-    					})
-    				} else {
-    					app.globalData.weburl = item.tdata.url;
-    					wx.navigateTo({
-    						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
-    							.tdata.url)
-    					})
-    				}
-    			}
+                // 外部h5
+                console.log(item)
+    			app.globalData.weburl = item.tdata.url;
+                wx.navigateTo({
+                    url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+                        .url)
+                })
+                
+
     			break;
     		case 4:
     			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 1d0768a..fc15461 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -83,8 +83,8 @@
       <view>收藏</view>
     </view>
     <view style="flex:1"></view>
-    <view class="btns">
-      <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line'}}">加入购物车</view>
+    <view class="btns" wx:if="{{info.id!=914626}}">
+      <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line' }}">加入购物车</view>
       <!-- <view class="btn {{info.product[0].type=='line' ? 'btn-r':''}}" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view> -->
       <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
     </view>
@@ -158,7 +158,7 @@
         </view>
       </view>
       <view class="sku-names">
-        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}} {{item.stock==0&&item.is_third_stock!=1?' disable':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
+        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}} {{(item.stock==0&&item.is_third_stock!=1)||item.is_salee==1?' disable':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
       </view>
       <view class="number-box">
         <text>数量</text>

From 0072e272ee82e59ed1c7b58536359a4713047608 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 30 Dec 2024 17:14:26 +0800
Subject: [PATCH 240/471] =?UTF-8?q?=E6=98=86=E5=B1=B1=E8=81=94=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/web/index.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 6d8fc89..65a3bb0 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -55,7 +55,25 @@ Page({
                 webUrl:weburl
             })
         })
-    } else {
+    }
+    // 遇见昆山
+    else if (lowerUrl.indexOf('couponAndKs') && webParam.ksCode) {
+        commonApi._get("uservice/user/loginByCnyl", {
+            cnylCode: webParam.cnylCode
+        }).then(res => {
+            if(res.data && res.data.id && res.data.token) {
+                wx.setStorageSync("jstrip_userid", res.data.id)
+                wx.setStorageSync("jstrip_token", res.data.token)
+                wx.setStorageSync("jstrip_userInfo", res.data)
+                weburl += '&token='+res.data.token
+            }
+        }).finally(()=>{
+            this.setData({
+                webUrl:weburl
+            })
+        })
+    }
+     else {
         this.setData({
             webUrl:weburl
         })

From 53b5ad04bd4f103047d69cb8435bfdce5b6bc262 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 30 Dec 2024 17:16:18 +0800
Subject: [PATCH 241/471] =?UTF-8?q?=E6=98=86=E5=B1=B1=E8=81=94=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/web/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 65a3bb0..caacdc0 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -58,7 +58,7 @@ Page({
     }
     // 遇见昆山
     else if (lowerUrl.indexOf('couponAndKs') && webParam.ksCode) {
-        commonApi._get("uservice/user/loginByCnyl", {
+        commonApi._get("uservice/user/loginByKsCode", {
             cnylCode: webParam.cnylCode
         }).then(res => {
             if(res.data && res.data.id && res.data.token) {

From e6e1728632ad84df7ec8bd5ec02eda863918fe63 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 30 Dec 2024 17:17:28 +0800
Subject: [PATCH 242/471] =?UTF-8?q?=E6=96=B0=E8=83=BD=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.wxml | 10 ++++++++--
 pages/order/pay/index.wxss | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 80c6d17..fef6fdf 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -17,7 +17,10 @@
   </view>
   <view class="pay-method" wx:if="{{payList.length>0 && SUBWALLET}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
     <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
-    <view class="method-name">数字人民币</view>
+    <view class="method-name" style="position: relative;">
+        <text>数字人民币</text>
+        <text class="carPayTip">新能源车补专用支付通道</text>
+    </view>
     <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
@@ -35,7 +38,10 @@
   </view>
   <view class="pay-method" wx:if="{{payList.length>0}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
     <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
-    <view class="method-name">数字人民币</view>
+    <view class="method-name" style="position: relative;">
+        <text>数字人民币</text>
+        <text class="carPayTip">新能源车补专用支付通道</text>
+    </view>
     <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index 3a1fe89..8957da5 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -82,4 +82,15 @@ page {
   padding:50rpx 0;
   color: #000;
   font-size: 36rpx;
+}
+.carPayTip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #D62828;
+    line-height: 55rpx;
+    position: absolute;
+    height: 22rpx;
+    bottom: -20rpx;
+    left: 0;
 }
\ No newline at end of file

From 7a8dfde7ae33b89865441d829b3c35fa4373c42f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 31 Dec 2024 11:09:01 +0800
Subject: [PATCH 243/471] =?UTF-8?q?=E6=96=B0=E8=83=BD=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js     | 21 +++++++++++++++++++--
 pages/order/pay/index.wxml   | 15 ++++++---------
 pages/order/pay/index.wxss   |  2 +-
 pages/pbService/web/index.js |  6 +++---
 project.private.config.json  |  4 ++--
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 9aa3928..714eefa 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -20,7 +20,9 @@ Page({
     wxPay:false,
     isBook:false,
     ids:[], // 多产品id
-    status:false
+    status:false,
+    // 是否新能源汽车专题产品
+    carCouponTip: 0,
   },
 
   /**
@@ -77,13 +79,28 @@ Page({
    */
   onShow: function () {
     commonApi.user_post("subwallet.ermb/wallet",{}).then(res=>{
+        // 给建设银行子钱包做标识
+        let resData = res.data || []
+        let JHWallet = resData.find(v=>v.bank_name.indexOf('建设')>=0)
+        if (JHWallet) {
+            JHWallet.isJSYH = 1
+        }
+
       this.setData({
-        payList:res.data
+        payList:resData
       })
     })
     commonApi.user_post("order/query",{
       order_id:this.data.id
     }).then(res=>{
+      //判断是否存在新能源汽车专题产品
+      let carCouponTip = (res.data.order_product_list || []).some(v=>(v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391))
+
+      this.setData({
+        carCouponTip:carCouponTip,
+      })
+
+      
 	  // 书券产品
 	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929){
 		  this.setData({
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index fef6fdf..6b16192 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -17,10 +17,7 @@
   </view>
   <view class="pay-method" wx:if="{{payList.length>0 && SUBWALLET}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
     <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
-    <view class="method-name" style="position: relative;">
-        <text>数字人民币</text>
-        <text class="carPayTip">新能源车补专用支付通道</text>
-    </view>
+    <view class="method-name">数字人民币</view>
     <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
@@ -38,10 +35,7 @@
   </view>
   <view class="pay-method" wx:if="{{payList.length>0}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
     <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
-    <view class="method-name" style="position: relative;">
-        <text>数字人民币</text>
-        <text class="carPayTip">新能源车补专用支付通道</text>
-    </view>
+    <view class="method-name">数字人民币</view>
     <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
@@ -61,7 +55,10 @@
     <view style="margin:0 30rpx" class="pay-method" wx:for="{{payList}}" bindtap="changeNumIndex" data-index="{{index}}">
       <image src="{{item.bank_logo}}" mode="aspectFill"></image>
       <!-- <view class="iconfont icon-weixin1"></view> -->
-      <view class="method-name">{{item.bank_name}}</view>
+      <view class="method-name" style="position:relative">
+        <text>{{item.bank_name}}</text>
+        <text class="carPayTip" wx:if="{{item.isJSYH&&carCouponTip}}">新能源车补专用支付通道</text>
+      </view>
       <view class="iconfont {{numIndex==index?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
     </view>
     <view class="btn" bindtap="walletPay" style="margin:25rpx">立即付款</view>
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index 8957da5..3d94b16 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -91,6 +91,6 @@ page {
     line-height: 55rpx;
     position: absolute;
     height: 22rpx;
-    bottom: -20rpx;
+    bottom: -12rpx;
     left: 0;
 }
\ No newline at end of file
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index caacdc0..a1d52ab 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -20,7 +20,7 @@ Page({
   onLoad: function (options) {
     let weburl = decodeURIComponent(options.weburl)
     // weburl = 'https://test.m.cloud.sz-trip.com/petYou2024?cnylCode=oK7OHccT'
-    console.log(weburl)
+    console.log('weburl',weburl)
     // 获取路径参数
     let webParam = {}
     try {
@@ -58,8 +58,8 @@ Page({
     }
     // 遇见昆山
     else if (lowerUrl.indexOf('couponAndKs') && webParam.ksCode) {
-        commonApi._get("uservice/user/loginByKsCode", {
-            cnylCode: webParam.cnylCode
+        commonApi._get("uservice/user/loginBykunshan", {
+            code: webParam.ksCode
         }).then(res => {
             if(res.data && res.data.id && res.data.token) {
                 wx.setStorageSync("jstrip_userid", res.data.id)
diff --git a/project.private.config.json b/project.private.config.json
index 184d71d..e44e007 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,8 +8,8 @@
       "list": [
         {
           "name": "pages/pbService/web/index",
-          "pathName": "subPackages/index/index",
-          "query": "",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2FcouponAndKs%3FksCode%3D7975f8d216d7f5b2b588863f86d5739f",
           "launchMode": "default",
           "scene": null
         },

From 3b1ab0582f3a9331532685977d30c8e98fcb4c96 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 3 Jan 2025 13:31:01 +0800
Subject: [PATCH 244/471] =?UTF-8?q?=E6=96=B0=E8=83=BD=E6=BA=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=962.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/index/index.wxml       |  7 ++++-
 pages/order/pay/index.js     | 50 +++++++++++++++++++++++++++++++-----
 pages/order/pay/index.wxml   | 25 ++++++++++++++++++
 pages/order/pay/index.wxss   |  2 --
 pages/pbService/web/index.js |  2 +-
 project.private.config.json  |  2 +-
 7 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index 2d8e4ba..215d2b7 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.isTest149? true : false;
+      data.isTest = data.isTest150? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 91cdd96..cc29437 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -65,7 +65,12 @@
             <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <!-- <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
+            <view class="top-icon-text">酒店住宿</view>
+        </view> -->
+        <!-- 临时跳转专题页 -->
+        <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
         </view>
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 714eefa..87135fa 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -23,6 +23,8 @@ Page({
     status:false,
     // 是否新能源汽车专题产品
     carCouponTip: 0,
+    showTipMask:false,
+    showTipMaskSecond: 3,
   },
 
   /**
@@ -32,6 +34,7 @@ Page({
     this.setData({
       id:options.id
     })
+    this.initTipMask()
   },
   daojishi:function(time){
     let now = new Date().getTime();
@@ -93,12 +96,7 @@ Page({
     commonApi.user_post("order/query",{
       order_id:this.data.id
     }).then(res=>{
-      //判断是否存在新能源汽车专题产品
-      let carCouponTip = (res.data.order_product_list || []).some(v=>(v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391))
-
-      this.setData({
-        carCouponTip:carCouponTip,
-      })
+      
 
       
 	  // 书券产品
@@ -129,7 +127,16 @@ Page({
           info:res.data,
         })
       }
-     
+      //判断是否存在新能源汽车专题产品
+      let carCouponTip = (res.data.order_product_list || []).some(v=>(v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391))
+      res.data.order_product_list.forEach(v=>{
+        v.needTip = (v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391)
+      })
+
+      this.setData({
+        carCouponTip:carCouponTip,
+        info: res.data
+      })
       
       console.log(this.data.ERMB);
 
@@ -268,6 +275,35 @@ Page({
     })
   },
 
+  // 临时支付弹窗
+  initTipMask () {
+    if (new Date().getTime()>=new Date('2025-02-01 00:00:00')) {
+        return
+    }
+
+      this.setData({
+        showTipMask:true,
+        showTipMaskSecond: 3,
+      })
+      let second = this.data.showTipMaskSecond
+      let timer = setInterval(()=>{
+            if(second<0) {
+                clearInterval(timer)
+            }
+            second--
+            this.setData({showTipMaskSecond: second})
+      },1000)
+    
+  },
+  closeTipMask () {
+    if (this.data.showTipMaskSecond<=0) {
+
+    this.setData({
+        showTipMask:false,
+      })
+    }
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 6b16192..1dd7ea4 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -63,4 +63,29 @@
     </view>
     <view class="btn" bindtap="walletPay" style="margin:25rpx">立即付款</view>
   </view>
+</view>
+
+
+<view class="mask" wx:if="{{showTipMask&&carCouponTip}}">
+  <view class="mask-bg"></view>
+  <view class="mask-content" style="text-align:center;width:90%;border-radius:10rpx">
+    <view class="num-pay-top">
+      <view style="margin-bottom:40rpx;font-size: 36rpx;font-weight: bold;">重要提示</view>
+      <view style="font-size: 28rpx;font-weight: normal;text-align: left;padding:0 40rpx 20rpx 40rpx;">您购买的以下产品一经下单，不退不改</view>
+
+      <view  style="max-height: 500rpx;overflow-y: auto;color: #666;">
+        <view wx:for="{{info.order_product_list}}">
+        <view style="text-align: left;padding: 0 40rpx 20rpx;" wx:if="{{item.needTip}}">
+            <view>{{item.sku_name}}</view>
+            <view>可用时间：{{item.sku_model.expired_range_start}}至{{item.sku_model.expired_range_end}}</view>
+        </view>
+        </view>
+      </view>
+    </view>
+    <view style="padding:20rpx 0 60rpx;">
+        <view class="btn" style="margin:0 100rpx" bindtap="closeTipMask">确认{{showTipMaskSecond<=0?'':'（'+showTipMaskSecond+'s）'}}</view>
+
+    </view>
+      
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index 3d94b16..a1a4206 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -78,10 +78,8 @@ page {
 }
 .num-pay-top {
   text-align: center;
-  font-weight: bold;
   padding:50rpx 0;
   color: #000;
-  font-size: 36rpx;
 }
 .carPayTip{
     font-family: PingFang SC;
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index a1d52ab..05c1156 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -19,7 +19,7 @@ Page({
    */
   onLoad: function (options) {
     let weburl = decodeURIComponent(options.weburl)
-    // weburl = 'https://test.m.cloud.sz-trip.com/petYou2024?cnylCode=oK7OHccT'
+    // weburl = 'https://test.m.cloud.sz-trip.com/petYou2024'
     console.log('weburl',weburl)
     // 获取路径参数
     let webParam = {}
diff --git a/project.private.config.json b/project.private.config.json
index e44e007..025c1bb 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -9,7 +9,7 @@
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
-          "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2FcouponAndKs%3FksCode%3D7975f8d216d7f5b2b588863f86d5739f",
+          "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2FcouponAndKs%3FksCode%3D3995803e3e3ef3154554f14c2fc8511b",
           "launchMode": "default",
           "scene": null
         },

From 7a83bc55aca3d8b6d846062f2bfe51b19e42347c Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 6 Jan 2025 13:26:45 +0800
Subject: [PATCH 245/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AB=98=E5=BE=B7=E5=87=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     |  2 +-
 pages/pbService/index.js   | 10 ++++++++++
 pages/pbService/index.wxml |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 215d2b7..aa16719 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.isTest150? true : false;
+      data.isTest = data.isTest151? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/pbService/index.js b/pages/pbService/index.js
index 74d2f9b..8dc1505 100644
--- a/pages/pbService/index.js
+++ b/pages/pbService/index.js
@@ -64,6 +64,16 @@ Page({
     //   page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
     // })
   },
+  gaode: function (e) {
+    if (!this.data.jsj) return;
+    if (e.currentTarget.dataset.event) {
+      util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+    }
+    wx.navigateToMiniProgram({
+      appId: 'wxbc0cf9b963bd3550',
+      page: "onlineCar/online_index/page/Home/Home?gd_from=taizhouwenlv"
+    })
+  },
   gotoUrl: function (e) {
     if (e.currentTarget.dataset.event) {
       util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index c21a591..33d3ba0 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -95,6 +95,10 @@
       <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
       <view>实时路况</view>
     </view>
+	<view class="pb-item" data-event="gaode_click" data-title="高德出行" bindtap="gaode">
+	  <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png" mode="widthFix"></image>
+	  <view>高德出行</view>
+	</view>
   </view>
 </view>
 <!-- <view class="pb-box">

From 17cc91b8792de301c75de65201b680d6d2e41a45 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 6 Jan 2025 16:17:38 +0800
Subject: [PATCH 246/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js               |  7 ++++-
 pages/index/index.wxml             |  6 ++---
 pages/order/pay/index.wxml         |  2 +-
 pages/user/service/index.wxss      |  4 ++-
 pages/user/service/info/index.js   | 41 ++++++++++++++++++++----------
 pages/user/service/info/index.wxml | 15 +++++++++++
 pages/user/service/info/index.wxss |  6 +++++
 project.private.config.json        | 21 ++++++++++-----
 8 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 49f6d81..e473655 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -10,6 +10,7 @@ import https from "../../utils/https.js"
 
 Page({
 	data: {
+        bannerInterver: 1000*60,
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -73,6 +74,8 @@ Page({
         imageSourceList:imageSource,
 	},
 	onLoad: function(options) {
+        console.log('onload')
+
         wx.getLocation({type: 'gcj02'})
            
 		console.log('options',options)
@@ -247,7 +250,8 @@ Page({
 	},
 	changeBannerIndex: function(e) {
 		this.setData({
-			activeBannerIndex: e.detail.current
+            activeBannerIndex: e.detail.current,
+            bannerInterver: 5000
 		})
 	},
 	changeSmBannerIndex: function(e) {
@@ -983,6 +987,7 @@ Page({
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
+
 		if (app.globalData.loadIndexSeason) {
 			this.getIndexSeason()
 		} else {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index cc29437..1142f10 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -26,7 +26,7 @@
     </navigator>
     </view>
     <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
         <block wx:for="{{banner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
             <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -160,7 +160,7 @@
             <view class="xsth-left" style="display: flex;">
                 <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
             </view>
-            <view class="time-box" style="z-index: 9;flex-shrink: 0;">
+            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
                 倒计时
                 <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
                 <text>:</text>
@@ -504,7 +504,7 @@
 <view wx:else>
     <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
     <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
         <block wx:for="{{banner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
             <image src="{{item.head_img}}" mode="scaleToFill"></image>
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 1dd7ea4..70d9ad4 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -77,7 +77,7 @@
         <view wx:for="{{info.order_product_list}}">
         <view style="text-align: left;padding: 0 40rpx 20rpx;" wx:if="{{item.needTip}}">
             <view>{{item.sku_name}}</view>
-            <view>可用时间：{{item.sku_model.expired_range_start}}至{{item.sku_model.expired_range_end}}</view>
+            <view wx:if="{{item.sku_model.expired_range_start&&item.sku_model.expired_range_end}}">可用时间：{{item.sku_model.expired_range_start}}至{{item.sku_model.expired_range_end}}</view>
         </view>
         </view>
       </view>
diff --git a/pages/user/service/index.wxss b/pages/user/service/index.wxss
index 795f383..d2e177f 100644
--- a/pages/user/service/index.wxss
+++ b/pages/user/service/index.wxss
@@ -99,7 +99,9 @@
 }
 .more-btn {
   text-align: center;
-  width: 300rpx;
+  min-width: 300rpx;
+  width: fit-content;
+  padding: 0 40rpx;
   line-height: 60rpx;
   background: rgba(11, 137, 142, 0);
   border: 1rpx solid #D8D8D8;
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index aa5bb40..41a4182 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -9,7 +9,10 @@ Page({
    */
   data: {
     info:null,
-    linkData:[]
+    linkData:[],
+
+    phoneList: ["0512-66555111","17625172834","18114363097","13245079618"],
+    showPhoneMask: false
   },
 
   /**
@@ -91,20 +94,32 @@ Page({
         id: this.data.info.id
       }
     },1)
-    wx.showModal({
-      title: '提示',
-      content: '呼叫人工客服\n0512-66555111',
-      confirmColor:"#0B898E",
-      success (res) {
-        if (res.confirm) {
-          wx.makePhoneCall({
-            phoneNumber: '0512-66555111',
-          })
-        } else if (res.cancel) {
-        }
-      }
+    // wx.showModal({
+    //   title: '提示',
+    //   content: '呼叫人工客服\n0512-66555111',
+    //   confirmColor:"#0B898E",
+    //   success (res) {
+    //     if (res.confirm) {
+    //       wx.makePhoneCall({
+    //         phoneNumber: '0512-66555111',
+    //       })
+    //     } else if (res.cancel) {
+    //     }
+    //   }
+    // })
+    this.setData({showPhoneMask: true})
+  },
+
+  callPhone (e) {
+    let item = e.currentTarget.dataset.item;
+    wx.makePhoneCall({
+        phoneNumber: item,
     })
   },
+  closePhoneMask () {
+    this.setData({showPhoneMask: false})
+  },
+
   zan:function(){
     let info = this.data.info;
     commonApi.user_post("ics/useful",{
diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml
index 73623a1..4de9a47 100644
--- a/pages/user/service/info/index.wxml
+++ b/pages/user/service/info/index.wxml
@@ -18,4 +18,19 @@
     <view class="iconfont icon-you"></view>
   </navigator>
   <navigator url="list/index?typeid={{typeId}}" class="more-btn" bindtap="showService">没找到想要的答案？一键呼唤<text>人工客服</text></navigator>
+</view>
+
+
+<view class="mask" wx:if="{{showPhoneMask}}">
+  <view class="mask-bg" bindtap="closePhoneMask"></view>
+  <view class="mask-content" style="text-align:center;width:70%;border-radius:10rpx">
+    <view class="num-pay-top" style="font-weight: bold;padding: 30rpx 60rpx;font-size: 30rpx;">
+      <view style="padding-bottom: 20rpx;">热线电话</view>
+      <view style="padding-bottom:20rpx;border-bottom: 2rpx solid #ccc;">点击号码拨打</view>
+
+      <view >
+        <view class="phone-item" wx:for="{{phoneList}}" bindtap="callPhone" data-item="{{item}}">{{item}}</view>
+      </view>
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/user/service/info/index.wxss b/pages/user/service/info/index.wxss
index 8b5e6ef..3a27766 100644
--- a/pages/user/service/info/index.wxss
+++ b/pages/user/service/info/index.wxss
@@ -64,4 +64,10 @@ page {
 }
 .icon-zan.zhuan {
   transform: rotate(180deg);
+}
+.phone-item{
+    height: 100rpx;
+    line-height: 100rpx;
+    color: #409EFF;
+    border-bottom: 2rpx solid #ccc;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 025c1bb..ad31315 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "首页",
+          "pathName": "subPackages/indexGQ/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/user/order/showOrderInfo/index",
+          "pathName": "pages/user/order/showOrderInfo/index",
+          "query": "id=46022501041743498343",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
@@ -41,13 +55,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "首页",
-          "pathName": "pages/list/six/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "景点购物车5447",
           "pathName": "pages/info/sceneProductInfoNew/index",

From fc7678d8bc7013a5f4ab5339971bf4cb6b9a0069 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 7 Jan 2025 10:08:16 +0800
Subject: [PATCH 247/471] =?UTF-8?q?=E5=BE=AE=E6=97=85=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A4=B4=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         | 2 +-
 pages/list/minitrip/index.wxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index aa16719..f95be04 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.isTest151? true : false;
+      data.isTest = data.isTest152? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/minitrip/index.wxml b/pages/list/minitrip/index.wxml
index 107360f..2c2b375 100644
--- a/pages/list/minitrip/index.wxml
+++ b/pages/list/minitrip/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/list/road/index.wxml-->
 <search bind:onload="search"></search>
-<image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/minitrip.png" mode="widthFix"></image>
+<image class="topimg" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/carPurchase/topImg.jpg" mode="widthFix"></image>
 <view class="top-box">
   <!-- <picker mode="selector" value="{{type}}" range="{{types}}" range-key="type_name" bindchange="changeType">
     <view class="picker">

From cc98a366feb844d3562dfd1f88169dd88abe5b63 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 7 Jan 2025 11:31:37 +0800
Subject: [PATCH 248/471] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E5=87=BA=E8=A1=8C?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AE=9E=E6=97=B6=E6=89=93=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/pbService/index.wxml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index f95be04..69972e7 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.isTest152? true : false;
+      data.isTest = data.isTest153? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 33d3ba0..19f9215 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -95,9 +95,9 @@
       <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
       <view>实时路况</view>
     </view>
-	<view class="pb-item" data-event="gaode_click" data-title="高德出行" bindtap="gaode">
+	<view class="pb-item" data-event="gaode_click" data-title="实时打车" bindtap="gaode">
 	  <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png" mode="widthFix"></image>
-	  <view>高德出行</view>
+	  <view>实时打车</view>
 	</view>
   </view>
 </view>

From d3497241d8e728016e320a63b75854d2edd54f6e Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 11 Jan 2025 10:34:55 +0800
Subject: [PATCH 249/471] =?UTF-8?q?=E5=9C=BA=E9=A6=86=E9=97=A8=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/museumOrderInfo/index.wxml |  7 +++++-
 pages/user/order/museumOrderInfo/index.wxss | 28 ++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index bf8eaf7..562f1a7 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -6,8 +6,13 @@
 <view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
-  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
+  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}" style="position: relative;">
     <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
+      <view class="text-shadow-state">
+        {{item.stateText}}
+      </view>
+    </view>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
diff --git a/pages/user/order/museumOrderInfo/index.wxss b/pages/user/order/museumOrderInfo/index.wxss
index e4d8a32..f1178f1 100644
--- a/pages/user/order/museumOrderInfo/index.wxss
+++ b/pages/user/order/museumOrderInfo/index.wxss
@@ -289,4 +289,30 @@ page {
   background-size: 100% 100%;
   display: flex;
   align-items: center;
-}
\ No newline at end of file
+}
+
+.text-shadow {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    text-align: center;
+    background: rgba(0, 0, 0, .3);
+    width: 300rpx;
+    height: 300rpx;
+    /*border-radius: .3rem;*/
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+  }
+  .text-shadow-state {
+    width: 200rpx;
+    height: 200rpx;
+    line-height: 200rpx;
+    background: #FFFFFF;
+    border-radius: 50%;
+    color: #0B898E;
+  }
\ No newline at end of file

From bb4a2ed86f1176c4145645e8aefc335b051566e5 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 14 Jan 2025 14:20:04 +0800
Subject: [PATCH 250/471] =?UTF-8?q?=E8=8A=B1=E5=8D=89=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   | 2 +-
 pages/order/pay/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 69972e7..3429dbc 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.isTest153? true : false;
+      data.isTest = data.isTest155? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 87135fa..0b75b66 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -100,7 +100,7 @@ Page({
 
       
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929){
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166){
 		  this.setData({
         isBook:true,
         payIndex:1

From 00757b8db6ad42d937d227cd7c19cc7fddca74c0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 15 Jan 2025 10:09:48 +0800
Subject: [PATCH 251/471] =?UTF-8?q?=E8=A1=8C=E6=9D=8E=E7=9B=B4=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/index.js   | 8 ++++++++
 pages/pbService/index.wxml | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/pages/pbService/index.js b/pages/pbService/index.js
index 8dc1505..6da1e5b 100644
--- a/pages/pbService/index.js
+++ b/pages/pbService/index.js
@@ -74,6 +74,14 @@ Page({
       page: "onlineCar/online_index/page/Home/Home?gd_from=taizhouwenlv"
     })
   },
+  xlzs: function (e) {
+
+    wx.navigateToMiniProgram({
+      appId: 'wx757dd1ee184e75e9',
+      page: "pages/tabBar/index/index"
+    })
+  },
+
   gotoUrl: function (e) {
     if (e.currentTarget.dataset.event) {
       util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 19f9215..b8d74ef 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -14,6 +14,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>高峰预警</view>
     </view>
+    <view class="pb-item"  data-title="行李直送" bindtap="xlzs">
+	  <image src="https://static.ticket.sz-trip.com/uploads/20250115/1628737d70e74613fc12e9fdbd8c192f.png" mode="widthFix"></image>
+	  <view>行李直送</view>
+	</view>
     <view class="pb-item" bindtap="gotoUrl" data-event="xlqc" 
     data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
       <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>

From 279d0fec61825e9ab7585654fdd69f9caa726117 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 15 Jan 2025 10:19:16 +0800
Subject: [PATCH 252/471] =?UTF-8?q?=E8=A1=8C=E6=9D=8E=E7=9B=B4=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 2 +-
 pages/index/index.js   | 7 +++++++
 pages/index/index.wxml | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 3429dbc..170af3f 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.isTest155? true : false;
+      data.isTest = data.isTest? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index e473655..f0ffd00 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -264,6 +264,13 @@ Page({
 			XPathBannerIndex: e.detail.current
 		})
     },
+    xlzs: function (e) {
+
+        wx.navigateToMiniProgram({
+          appId: 'wx757dd1ee184e75e9',
+          page: "pages/tabBar/index/index"
+        })
+      },
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1142f10..ca9bc60 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -313,6 +313,10 @@
                 <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
                 <view>实时路况</view>
                 </view>
+                <view bindtap="xlzs"  class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20250115/18e8e2274a8191d0be0b8c63884ebe04.png" mode="widthFix"></image>
+                <view>行李直送</view>
+                </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
                 <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>

From f545755e678b8ccb8c08acee3753261a6a7022ef Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 15 Jan 2025 19:44:05 +0800
Subject: [PATCH 253/471] =?UTF-8?q?=E6=B3=A8=E9=94=80=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/index/index.wxml       | 11 +--------
 pages/user/logout/index.js   | 44 ++++++++++++++++++++++++------------
 pages/user/logout/index.wxml |  9 ++++++++
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/app.js b/app.js
index 170af3f..3429dbc 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.isTest? true : false;
+      data.isTest = data.isTest155? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ca9bc60..b405320 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -568,16 +568,7 @@
         <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
         </view>
     </view>
-    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-    <view style="display: flex;">
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-        <image src="{{indexSeason.ai}}" mode=""/>
-        </view>
-        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-        <image src="{{indexSeason.avoid}}" mode=""/>
-        </view>
-    </view>
+
 
     <view class="sale-road-boxes" style="margin-top:0">
         <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
diff --git a/pages/user/logout/index.js b/pages/user/logout/index.js
index f2145fe..7b275a2 100644
--- a/pages/user/logout/index.js
+++ b/pages/user/logout/index.js
@@ -12,10 +12,10 @@ Page({
   },
 
   gotoLogoutNotice(){
-    app.globalData.weburl = "https://m.cloud.sz-trip.com/LogoutNoticeApp"
     wx.navigateTo({
-      url: '/pages/pbService/web/index'
+        url: "/pages/pbService/web/index?weburl="+encodeURIComponent('https://m.cloud.sz-trip.com/LogoutNotice'),
     })
+    
   },
 
   changeCheck() {
@@ -35,21 +35,35 @@ Page({
       })
       return;
     }
-    common.user_post('uservice/user/user_logout', { protocol: that.data.protocol ? 1 : 0 }).then(res => {
-      if (res) {
-        wx.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        if (res.code === 1) {
-          setTimeout(() => {
-            wx.switchTab({
-              url: '/pages/user/user',
-            })
-          }, 400)
+
+    wx.showModal({
+        title: '提示',
+        content: '是否确认注销账号？',
+        success (res) {
+            if (res.confirm) {
+                common.user_post('uservice/user/user_logout', { protocol: that.data.protocol ? 1 : 0 }).then(res => {
+                    if (res) {
+                      wx.showToast({
+                        title: res.msg,
+                        icon: 'none'
+                      })
+                      if (res.code === 1) {
+                        setTimeout(() => {
+                          wx.switchTab({
+                            url: '/pages/user/user',
+                          })
+                        }, 400)
+                      }
+                    }
+                  })
+                
+            }
+            
         }
-      }
     })
+
+    
+
   },
 
   /**
diff --git a/pages/user/logout/index.wxml b/pages/user/logout/index.wxml
index 2b66239..e4858b3 100644
--- a/pages/user/logout/index.wxml
+++ b/pages/user/logout/index.wxml
@@ -9,6 +9,15 @@
   <view class="content">
     <view>2.账号无未完成订单</view>
     <view>账号无未核销、未支付、待退款等状态的订单。</view>
+  </view>
+  <view class="content">
+    <view>3.上述账号留存的信息、权益将被清空且无法找回</view>
+    <view>· 银行卡的快捷支付(含卡通)服务</view>
+    <view>· 使用各产品/服务时留存的其他信息</view>
+    <view>· 身份信息，如个人资料、实名认证信息等账号资产及权益，如各产品/服务的会员及权益、优惠券等</view>
+    <view>· 业务订单及交易记录，请确保所有交易已完结且无纠纷账号注销后的因历史交易可能产生的资金退回等权益视作自动放弃</view>
+    
+
   </view>
   <view class="notice-msg">
     <checkbox-group bindchange="changeCheck">

From 99ffc4009c7e273a4c9724e2dbf415291af66bf7 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 16 Jan 2025 11:43:55 +0800
Subject: [PATCH 254/471] =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/https.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/https.js b/utils/https.js
index 50f43f4..d661db6 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -317,12 +317,18 @@ const set_logininfo = r => {
     }
   }
 }
+
+let canToLogin = true
 const checkLogin = () => {
   // 判断是否已经授权过
   let page = getCurrentPages();
-  if (page[page.length - 1].route != 'pages/login/index') {
+  if (page[page.length - 1].route != 'pages/login/index' && canToLogin) {
+      canToLogin = false
     wx.navigateTo({
       url: '/pages/login/index',
+      complete: function () {
+        canToLogin = true
+      }
     })
   }
   return;

From 2278ab7c276ddcacb4dd7136e1f0130c3fce427b Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 17 Jan 2025 13:15:47 +0800
Subject: [PATCH 255/471] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/user/service/info/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 3429dbc..8aa3646 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.isTest155? true : false;
+      data.isTest = data.isTest156? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index 41a4182..72734fa 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -11,7 +11,7 @@ Page({
     info:null,
     linkData:[],
 
-    phoneList: ["0512-66555111","17625172834","18114363097","13245079618"],
+    phoneList: ["0512-66555111"],
     showPhoneMask: false
   },
 

From cb0787007a409c252f1eb2091574265c5a43c576 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 17 Jan 2025 13:28:48 +0800
Subject: [PATCH 256/471] =?UTF-8?q?=E9=85=92=E5=BA=97=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 2 +-
 pages/index/index.wxml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 8aa3646..170af3f 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.isTest156? true : false;
+      data.isTest = data.isTest? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b405320..3445f12 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -65,15 +65,15 @@
             <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
-        </view> -->
+        </view>
         <!-- 临时跳转专题页 -->
-        <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
+        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
-        </view>
+        </view> -->
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
             <view class="top-icon-text">夜游苏州</view>

From 984cc711f60e6692ece629b6fe586fbc045c2c6b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 18 Jan 2025 10:46:03 +0800
Subject: [PATCH 257/471] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E9=85=92=E5=BA=97?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         |   2 +-
 pages/order/pay/index.js       |  25 +++-
 pages/order/pay/index.wxml     |  25 ++++
 project.private.config.json    |  15 ++-
 subPackages/index/imgSource.js | 113 +++++++++++++++++
 subPackages/index/index.js     |  31 ++++-
 subPackages/index/index.wxml   | 226 ++++++++++++---------------------
 subPackages/index/index.wxss   |  97 ++++++--------
 subPackages/indexGQ/index.js   |   8 +-
 subPackages/indexGQ/index.wxml |  18 +--
 subPackages/indexGQ/index.wxss |  33 +++--
 11 files changed, 355 insertions(+), 238 deletions(-)
 create mode 100644 subPackages/index/imgSource.js

diff --git a/app.js b/app.js
index 170af3f..8aa3646 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.isTest? true : false;
+      data.isTest = data.isTest156? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 0b75b66..757300b 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -25,6 +25,8 @@ Page({
     carCouponTip: 0,
     showTipMask:false,
     showTipMaskSecond: 3,
+
+    MTTip: 0,
   },
 
   /**
@@ -34,7 +36,7 @@ Page({
     this.setData({
       id:options.id
     })
-    this.initTipMask()
+    
   },
   daojishi:function(time){
     let now = new Date().getTime();
@@ -129,19 +131,32 @@ Page({
       }
       //判断是否存在新能源汽车专题产品
       let carCouponTip = (res.data.order_product_list || []).some(v=>(v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391))
-      res.data.order_product_list.forEach(v=>{
-        v.needTip = (v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391)
-      })
+      if (carCouponTip) {
+        res.data.order_product_list.forEach(v=>{
+            v.needTip = (v.tag_ids||[]).includes(390) || (v.tag_ids||[]).includes(391)
+        })
+      }
+
+      // 判断是否存在美团酒店
+      let MTTip = (res.data.order_product_list || []).some(v=>(v.hotel_type=='mt'))
+      if (MTTip) {
+        res.data.order_product_list.forEach(v=>{
+            v.needTip = v.hotel_type=='mt'
+        })
+        }
+
 
       this.setData({
         carCouponTip:carCouponTip,
-        info: res.data
+        info: res.data,
+        MTTip: MTTip,
       })
       
       console.log(this.data.ERMB);
 
     })
     this.checkPay();
+    this.initTipMask()
    
   },
   checkPay:function(){
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 70d9ad4..c67f2a2 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -87,5 +87,30 @@
 
     </view>
       
+  </view>
+</view>
+
+
+<view class="mask" wx:if="{{showTipMask&&MTTip}}">
+  <view class="mask-bg"></view>
+  <view class="mask-content" style="text-align:center;width:90%;border-radius:10rpx">
+    <view class="num-pay-top">
+      <view style="margin-bottom:40rpx;font-size: 36rpx;font-weight: bold;">重要提示</view>
+      <view style="font-size: 28rpx;font-weight: normal;text-align: left;padding:0 40rpx 20rpx 40rpx;">您预订的以下酒店，下单15分钟后不退不改</view>
+
+      <view  style="max-height: 500rpx;overflow-y: auto;color: #666;">
+        <view wx:for="{{info.order_product_list}}">
+        <view style="text-align: left;padding: 0 40rpx 20rpx;" wx:if="{{item.needTip}}">
+            <view>{{item.sku_name}}</view>
+            <view wx:if="{{item.sku_model.expired_range_start&&item.sku_model.expired_range_end}}">可用时间：{{item.sku_model.expired_range_start}}至{{item.sku_model.expired_range_end}}</view>
+        </view>
+        </view>
+      </view>
+    </view>
+    <view style="padding:20rpx 0 60rpx;">
+        <view class="btn" style="margin:0 100rpx" bindtap="closeTipMask">确认{{showTipMaskSecond<=0?'':'（'+showTipMaskSecond+'s）'}}</view>
+
+    </view>
+      
   </view>
 </view>
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index ad31315..d302a3d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,16 +7,23 @@
     "miniprogram": {
       "list": [
         {
-          "name": "首页",
+          "name": "subPackages/indexGQ/index",
           "pathName": "subPackages/indexGQ/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/user/order/showOrderInfo/index",
-          "pathName": "pages/user/order/showOrderInfo/index",
-          "query": "id=46022501041743498343",
+          "name": "subPackages/index/index",
+          "pathName": "subPackages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "首页",
+          "pathName": "subPackages/indexGQ/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
diff --git a/subPackages/index/imgSource.js b/subPackages/index/imgSource.js
new file mode 100644
index 0000000..588f666
--- /dev/null
+++ b/subPackages/index/imgSource.js
@@ -0,0 +1,113 @@
+const imageSource = {
+    // 活动日历、场馆预约等
+    mainFunImgs: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
+    ],
+    // 数字文旅
+    SZWL: [
+        // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
+        // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
+        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
+
+    ],
+    // 旅游助手
+    LVZS: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
+    ],
+    // 公共服务
+    GGFW: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
+    ],
+    
+    // 十全十美
+    SQSM: [
+        // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
+
+    ],
+
+    // 长三角文旅平台
+    CSJWLPT: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
+    ],
+
+    // 导航标题侧边图片
+    CBTP: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
+        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+    ],
+
+    // 其他后台配置的图片，开发时使用
+    testImgs: {
+        indexSeason : {
+             // 头图
+             topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
+            // ai伴你游
+            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
+            // ai避高峰
+            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
+            // 新品特惠
+            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            // 文旅鉴赏
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            // 出行助手
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            // 公共服务
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            // 十全十美
+            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            // 长三角文旅平台
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            // 热门推荐
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            
+        }
+    },
+}
+
+
+module.exports = imageSource
\ No newline at end of file
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index b82fe47..f0ffd00 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -1,6 +1,8 @@
 //index.js
 //获取应用实例
 let app = getApp()
+import imageSource from "./imgSource"
+
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
@@ -8,6 +10,7 @@ import https from "../../utils/https.js"
 
 Page({
 	data: {
+        bannerInterver: 1000*60,
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -65,9 +68,14 @@ Page({
 		],
 		viewHeight: "0px",
 		isMuted: true,
-		videoPlay: false,
+        videoPlay: false,
+
+        // 页面图片
+        imageSourceList:imageSource,
 	},
 	onLoad: function(options) {
+        console.log('onload')
+
         wx.getLocation({type: 'gcj02'})
            
 		console.log('options',options)
@@ -242,7 +250,8 @@ Page({
 	},
 	changeBannerIndex: function(e) {
 		this.setData({
-			activeBannerIndex: e.detail.current
+            activeBannerIndex: e.detail.current,
+            bannerInterver: 5000
 		})
 	},
 	changeSmBannerIndex: function(e) {
@@ -255,6 +264,13 @@ Page({
 			XPathBannerIndex: e.detail.current
 		})
     },
+    xlzs: function (e) {
+
+        wx.navigateToMiniProgram({
+          appId: 'wx757dd1ee184e75e9',
+          page: "pages/tabBar/index/index"
+        })
+      },
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -332,10 +348,14 @@ Page({
 		this.setData({
 			indexHot: app.globalData.configJson.indexHot,
 			isTest: app.globalData.configJson.isTest,
-			otherPlat: app.globalData.configJson.otherPlats,
-			indexSeason: app.globalData.configJson.indexSeason
+            otherPlat: app.globalData.configJson.otherPlats,
+            // 正式数据
+            indexSeason: app.globalData.configJson.indexSeason,
+            // 开发数据
+            // indexSeason: imageSource.testImgs.indexSeason
 		})
-		this.getFourProduct()
+        this.getFourProduct()
+        console.log(this.data)
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
@@ -974,6 +994,7 @@ Page({
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
+
 		if (app.globalData.loadIndexSeason) {
 			this.getIndexSeason()
 		} else {
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 8305409..3445f12 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -20,12 +20,13 @@
     </view>
     <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
     <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <view class="iconfont icon-sousuo"></view>
-        <view class="textOver">搜索想要的旅游产品或服务</view>
+        <!-- <view class="iconfont icon-sousuo"></view> -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20241225/59b88ab6ae2800ebe02f8c25eaf29636.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+        <view class="textOver" style="color:rgba(41, 48, 90, 0.5);">搜索想要的旅游产品或服务</view>
     </navigator>
     </view>
     <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
         <block wx:for="{{banner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
             <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -37,64 +38,52 @@
     </view>
     </view>
 
-    <!-- <swiper class="swiper" indicator-dots="{{true}}"
-    autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
-    <block wx:for="{{banner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick2" data-item="{{item}}">
-        <image src="{{item.img}}" mode="aspectFill"></image>
-        </swiper-item>
-    </block>
-    </swiper> -->
+ 
     <view class="top-icons" wx:if="{{!isTest}}">
         <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/48059df0ab43af6fd86a7a2f8ca2fa47.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
             <view class="top-icon-text">活动日历</view>
         </view>
         <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/95098baee61e82506860793945970c04.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
             <view class="top-icon-text">场馆预约</view>
         </view>
         <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/af56b9461fc129eeb2076cddc7575b4e.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
             <view class="top-icon-text">非遗专卖</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖"
-            data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/64bc601cd248586984c6ba7f7abf12cd.png" mode="widthFix"></image>
-            <view class="top-icon-text">非遗专卖</view>
-        </view> -->
+
         <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/486a7a434f036ffa4e4f3dacec8eedfc.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
             <view class="top-icon-text">剧场演出</view>
         </view>
-        <!-- 2024年7月新版文创特产 -->
         <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/193c7646a95fb88ff1bc2d73bda03e70.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
             <view class="top-icon-text">文创特产</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="specialty" data-title="文创特产"
-            data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/bafa90e369f339347170f9c55a245d78.png" mode="widthFix"></image>
-            <view class="top-icon-text">文创特产</view>
-        </view> -->
         <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/bde4344ae2bfe55ff8cd91704904a07b.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
         <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/05c99091489d8eba395075471c5abfd3.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
         </view>
+        <!-- 临时跳转专题页 -->
+        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
+            <view class="top-icon-text">酒店住宿</view>
+        </view> -->
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/32e3894971c3f57f2e86f46c885f4d64.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
             <view class="top-icon-text">夜游苏州</view>
         </view>
         <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/56333c7e1867719fdfbbdd1acd8b8af1.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
             <view class="top-icon-text">一日游</view>
         </view>
         <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20241011/23c1af842453eb981adbc315b2012ff9.png" mode="widthFix"></image>
+            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
             <view class="top-icon-text">研学游</view>
         </view>
     </view>
@@ -136,7 +125,7 @@
             </view>
         </view>
         <!-- ai避高峰 -->
-        <view style="display: flex;margin-top: 30rpx;">
+        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
             <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
             <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
             <image src="{{indexSeason.ai}}" mode=""/>
@@ -169,9 +158,9 @@
             <!-- 上方标题部分 -->
             <view class="xsth-title">
             <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
+                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
             </view>
-            <view class="time-box" style="z-index: 9;flex-shrink: 0;">
+            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
                 倒计时
                 <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
                 <text>:</text>
@@ -179,10 +168,7 @@
                 <text>:</text>
                 <view class="xsth-time">{{djs.s}}</view>
             </view>
-            <!-- <image class="rmtj-right" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-right.png" mode=""/> -->
-            <!-- <view class="xsth-more" bindtap="goBanner" data-url="{{xpth.adv.tdata}}">
-                更多<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/yuandan2024/rightIcon.png" mode="heightFix"/>
-            </view> -->
+
             </view>
             <!-- 商品部分 -->
             <view class="xpth-product">
@@ -216,120 +202,69 @@
             <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
             </view>
         </view>
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-        </view>
+
 
         <!-- 数字文旅-->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode="" />
+        </view>
         <view class="slide-out-box">
             <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
             <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
             <view class="pbservice" style="margin-bottom:30rpx">
                 <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/3f386ea45281d642a2692c9e65a2037c.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[0]}}" mode="widthFix"></image>
                 <view class="text">数字非遗</view>
                 </view>
                 <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/d1e0df4aa32de12451228e776a75a882.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[1]}}" mode="widthFix"></image>
                 <view class="text">数字博物馆</view>
                 </view>
                 <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/c3c31a60c94d1fe1292dbe2ffc253519.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[2]}}" mode="widthFix"></image>
                 <view class="text">数字名人馆</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/cc82f9b107f600b444bc4e43f0d06d68.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[3]}}" mode="widthFix"></image>
                 <view>云上观展</view>
                 </view>
                 <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/ba90dbaaf1b833411e517991d0784292.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[4]}}" mode="widthFix"></image>
                 <view class="text">云上文博会</view>
                 </view>
                 <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/b0b3cc6f2ed3ed0fafe9e9f9b9ed3f88.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[5]}}" mode="widthFix"></image>
                 <view class="text">精彩回顾</view>
                 </view>
                 <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/8de0e891c1e8fec7439619d1d6e63db4.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[6]}}" mode="widthFix"></image>
                 <view class="text">文化场馆查询</view>
                 </view>
                 <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/ced5cb9b113d5c37cabf199e2a348b46.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[7]}}" mode="widthFix"></image>
                 <view class="text">苏影通</view>
                 </view>
                 <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/579dd26c8549e7c77cc0edd72bb7d9b9.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[8]}}" mode="widthFix"></image>
                 <view class="text">书仓</view>
                 </view>
                 <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/8dcf8ddf93d276d5009617f77ff26df4.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[9]}}" mode="widthFix"></image>
                 <view class="text">e读书</view>
                 </view>
-
                 <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/640e0ea31fa881e694b93591d4d84b49.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[10]}}" mode="widthFix"></image>
                 <view class="text">数字公共文化</view>
                 </view>
-                <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-                data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-                <view class="text">文旅单位</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-                <view class="text">书仓</view>
-                </view> -->
                 <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/4fc0b988d1d5ced741b585c22ae875f2.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[11]}}" mode="widthFix"></image>
                 <view class="text">云游苏州</view>
                 </view>
                 <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241015/267db6cc986b61bb3777b70f67cafb47.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.SZWL[12]}}" mode="widthFix"></image>
                 <view class="text">美图鉴赏</view>
                 </view>
-                <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-                data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-                <view>文物查询</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-                data-path="/pages/pbService/museum/index" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-                <view>博物馆查询</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-                <view>云上文博会</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-                <view class="text">投资导引图</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-title="数字文物"
-                data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-                <view>数字文物</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-                <view>团体预约</view>
-                </view> -->
-                <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-                data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-                <view>廉洁地图</view>
-                </view> -->
-                <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-                class="pbservice-item">
-                <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-                <view>文化配送</view>
-                </view> -->
             </view>
             </scroll-view>
             <view class="scroll-line">
@@ -342,75 +277,85 @@
 
         <!-- 旅游助手 -->
         <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/7f1962fbfe1c56155ace577eeb8e6580.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" />
         </view>
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" src="https://static.ticket.sz-trip.com/uploads/20240428/c40ddcb3ed2c971eec02187374540d06.png" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" src="https://static.ticket.sz-trip.com/uploads/20240428/866baa2713b1819cb861aec9fd34970d.png" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7e1fc96543b093aa6871172770d0db6b.png" mode="aspectFill">
-            </image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" src="https://static.ticket.sz-trip.com/uploads/20240428/3c21e5876209c1bad4bbfcc688779c08.png" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
+            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
+            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
+            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
         </view>
 
         <!-- 公共服务 -->
         <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
             <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">查看全部</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241012/a3eea8df9bb8347f550d5828bddfc215.png" mode="" />
+                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
             </navigator>
             
         </view>
-        <view style="overflow-x:auto;background: #FFF1C2;border-radius: 20rpx;height: 199.33rpx;">
+        <view style="overflow-x:auto">
             <!-- 元旦修改 ggfw为新增类名 -->
             <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
                 <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
                     data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/882033bd48c99ea745036697beefb6bb.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
                 <view>高峰预警</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/90d32d4b4be584bbdb23b43c20da188c.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
                 <view>实时路况</view>
                 </view>
+                <view bindtap="xlzs"  class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20250115/18e8e2274a8191d0be0b8c63884ebe04.png" mode="widthFix"></image>
+                <view>行李直送</view>
+                </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20241012/340f637b40d21fdafa42b67463ef371a.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
                 <view>行李寄存</view>
                 </view>
                 <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
                     data-path="/pages/pbService/bike/index?type=1">
-                    <image src="https://static.ticket.sz-trip.com/uploads/20241012/5d794820cbb29acea5c78e0a46df29ee.png" mode="widthFix"></image>
+                    <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
                     <view>找厕所</view>
                 </view>
             </view>
         </view>
+
+        <!-- 十全十美 -->
         <view class="sale-road-boxes">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.sqj}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" />
         </view>
-
-        <!-- 元旦修改 十全街新 以上注释部分为之前的版本-->
         <view class="six-box-new" wx:if="{{!isTest}}">
-            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{sqjNew}}" src="{{sqjNew[index]}}" mode="widthFix" wx:key="index">
+            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
             </image>
         </view>
+
+        <!-- 长三角文旅平台 -->
         <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/f6648d96e0f6d99cc8d82633b5ad1536.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" />
         </view>
-        
         <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
             <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{item.icon}}" mode="widthFix"></image>
+            <image src="{{imageSourceList.CSJWLPT[index]}}" mode="widthFix"></image>
             <view>{{item.name}}</view>
             </view>
         </view>
+
+        <!-- 热门推荐 -->
         <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:86rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240428/31601dded0df580774b24b064bbb6580.png" mode="" />
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode="" />
         </view>
         <view class="hot-list" wx:if="{{isTest==false}}">
             <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
@@ -563,7 +508,7 @@
 <view wx:else>
     <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
     <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
         <block wx:for="{{banner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
             <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -623,16 +568,7 @@
         <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
         </view>
     </view>
-    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-    <view style="display: flex;">
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-        <image src="{{indexSeason.ai}}" mode=""/>
-        </view>
-        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-        <image src="{{indexSeason.avoid}}" mode=""/>
-        </view>
-    </view>
+
 
     <view class="sale-road-boxes" style="margin-top:0">
         <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index adcd838..b543000 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -3,8 +3,8 @@
 page {
   /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/f92942021f97786a25c1cd51de779c7c.png"); */
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20241012/abae687010ec0955b70872edd660002a.jpg');
+  
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
   background-repeat: repeat-y;
   background-size: 100% 100%;
 }
@@ -45,8 +45,8 @@ page {
   /* color: #666; */
   /* height: 70.67rpx; */
   height: 64rpx;
-  background: rgba(255,255,255,0.7);
-  border-radius: 32rpx;
+  /* background: rgba(255,255,255,0.7); */
+  border-radius: 0rpx;
   /* color: #72674E; */
   color: #333333;
   /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
@@ -54,11 +54,15 @@ page {
   display: flex;
   align-items: center;
   font-size: 25rpx;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png");
+  background-size: 100% 100%;
+  padding: 2rpx 5rpx;
+  box-sizing: border-box;
 }
 .search-box .iconfont {
   font-size: 30rpx;
   margin-left: 20rpx;
-  margin-right: 10rpx;
+  margin-right: 20rpx;
   /* color: #72674E; */
 }
 .top-box .weather-num,.top-box .weather {
@@ -90,7 +94,6 @@ page {
   flex-wrap: wrap;
   margin-top: -50rpx;
   padding-top: 84rpx;
-  background: #FFF1C2;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -105,7 +108,7 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 113rpx;
+  width: 86rpx;
   display: block;
   margin: 0 auto;
   margin-bottom: 10rpx;
@@ -119,7 +122,6 @@ page {
   margin-top: 40rpx;
   position: relative;
   align-items: flex-end;
-  margin-bottom: 28rpx;
 }
 .sale-box {
   flex-shrink: 0;
@@ -325,11 +327,10 @@ page {
 .title-more {
   font-size: 27rpx;
   font-weight: 500;
-  color: #F65D1F;
+  color: #29305A;
   z-index: 9;
   width: 173rpx;
-  height: 40rpx;
-  background: rgba(255,255,255,0.5);
+  height: 80rpx;
   border-radius: 20rpx;
   text-align: center;
   display: flex;
@@ -341,7 +342,6 @@ page {
 }
 .slide-out-box {
   margin-top: 20rpx;
-  background: #FFF1C2;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
   margin-bottom: 40rpx;
@@ -544,41 +544,30 @@ page {
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #F6591D;
-  border-radius: 35rpx;
+  border: 1px solid #5184B0;
   font-size: 27rpx;
   font-family: PingFang SC;
-  font-weight: bold;
-  color: #F6591D;
+  font-weight: 500;
+  color: #5184B0;
 }
 .scroll-line {
-  /* height: 6rpx;
-  border-radius: 3rpx;
-  background: #ccc;
-  overflow: hidden;
-  margin: 30rpx auto; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
+
   width: 73rpx !important;
   height: 7rpx;
   /* background: #DDCEAC; */
-  background: #fff;
+  background: #97D0EC;
   border-radius: 3rpx;
   margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  /* width: 300rpx;
-  height: 6rpx;
-  border-radius: 3rpx;
-  background: #0B898E; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
   height: 7rpx;
-  background: #F65D1F;
+  background: #5184B0;
   border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
   margin-left: 37.33rpx;
-  background: #F65D1F;
+  background: #5184B0;
   height: 7rpx;
   border-radius: 3rpx;
 }
@@ -686,16 +675,15 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
-  background: #FFF1C2;
   justify-content: space-around;
   height: 187rpx;
   border-radius: 27rpx;
   align-items: center;
 }
 .other-plats image {
-  width: 80rpx;
+  width: 106rpx;
   display: block;
-  height: 80rpx;
+  height: 106rpx;
   margin-bottom: 15rpx;
 }
 .other-plat {
@@ -845,6 +833,9 @@ page {
   margin-left: -50rpx;
   z-index: 9;
   flex-wrap: nowrap;
+
+  position: relative;
+  left: -150rpx;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
@@ -852,12 +843,11 @@ page {
   height: 43rpx;
   padding: 0 7rpx;
   line-height: 43rpx;
-  background: #FFF1C2;
   border-radius: 13rpx;
   font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #ED1C19;
+  color: #FF6A57;
   text-align: center;
 }
 .time-box text {
@@ -911,20 +901,24 @@ page {
   box-sizing: border-box;
   display: flex;
   justify-content: space-between; 
-  background: #FFF1C2;
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
   flex: 1;
   margin-left: 15rpx;
-  height: 320rpx;
+  height: 322rpx;
   width: 100%;
-  border-radius: 20rpx;
+  border-radius: 0rpx;
   overflow: hidden;
   position: relative;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
+  background-size: 100% 100%;
+  padding: 3rpx;
 }
 .xpth-banner-swiper{
     height: 100%;
+    border-radius: 20rpx;
+    overflow: hidden;
 }
 .xpth-banner image {
   flex: 1;
@@ -954,19 +948,13 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item {
-  /* width: 413rpx;
-  height: 160rpx; */
-  /* background: #FFFFFF; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
-  background-size: 100% 100%; */
   border-radius: 20rpx;
   height: 153rpx;
-  background: #FFFFFF;
   display: flex;
   margin-bottom: 13rpx;
-  /* margin-bottom: 10rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
-  /* padding: 5rpx; */
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png");
+  background-size: 100% 100%;
+  padding: 1rpx;
 }
 .xpth-item:last-child {
   margin-bottom: 0;
@@ -1045,7 +1033,7 @@ page {
 /* 元旦修改新增样式 */
 .new-pic {
   width: 160rpx !important;
-  height: 213rpx !important;
+  height: 220rpx !important;
   margin-bottom: 26.67rpx;
 }
 
@@ -1061,8 +1049,8 @@ page {
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 70rpx !important;
-  height: 70rpx !important;
+  width: 93rpx !important;
+  height: 93rpx !important;
 }
 
 .six-box-new {
@@ -1173,8 +1161,8 @@ page {
 .jqssd {
   /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
   background-size: 100% 100%; */
-  width: 365.33rpx;
-  height: 166rpx;
+  width: 344.33rpx;
+  height: 160rpx;
   flex-shrink: 0;
 }
 .jqssd image, .sslk image{
@@ -1184,10 +1172,9 @@ page {
 .sslk {
   /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
   background-size: 100% 100%; */
-  width: 365.33rpx;
-  height: 166rpx;
+  width: 344rpx;
+  height: 160rpx;
   flex-shrink: 0;
-  margin-left: -20rpx;
 }
 
 .xsth-left{
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
index 8c339b2..446bbf6 100644
--- a/subPackages/indexGQ/index.js
+++ b/subPackages/indexGQ/index.js
@@ -97,7 +97,7 @@ Page({
     yszIndex:0,
     bdList:[
         {
-            bg: 'linear-gradient(172deg, #FFF3E5, #FFD9AD);',
+            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点
             url:'',
             path:'/pages/list/scene/index',
@@ -105,7 +105,7 @@ Page({
             
         },
         {
-            bg: 'linear-gradient(172deg, #E7F1FF, #ADD1FF);',
+            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品
             path:'/pages/list/night/index',
             url:'',
@@ -113,7 +113,7 @@ Page({
             
         },
         {
-            bg: 'linear-gradient(172deg, #F0EBFF, #E3D9FF);',
+            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
             url:'',
             path:'/pages/list/theatre/index',
@@ -121,7 +121,7 @@ Page({
             
         },
         {
-            bg: 'linear-gradient(172deg, #FFEDF0, #FFC9D2);',
+            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
             icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
             path:'/subPackages/techanNew/index',
             url:'',
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index ed9f76b..66fa1ca 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -82,10 +82,10 @@
   <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20250117/a480fadd053c80bc2efb3239fd956ceb.png" mode=""/>
       <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+       src="https://static.ticket.sz-trip.com/uploads/20250117/57373a69fac19bc39cb91d44c233257d.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
@@ -154,7 +154,7 @@
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+    <image class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250117/e0d0cf611cfa9f63259de578a6065b50.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
@@ -166,23 +166,23 @@
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
          class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/857299fcd14ee5c7a1621598e0e05bae.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/9a1611d20a32fc4b18438dabffaaacf9.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
         
         <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
             data-path="/pages/pbService/bike/index?type=1">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240925/38ee5d21e1eb4ef2379c3d81edfb3799.png" mode="widthFix"></image>
+            <image src="https://static.ticket.sz-trip.com/uploads/20250117/1565d2b5a46180d53b5b3c225ce91068.png" mode="widthFix"></image>
             <view>找厕所</view>
         </view>
 
@@ -214,7 +214,7 @@
     </view>
   </view>
   <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/fc8d43d1ca820912aae4b2bede13235c.png" mode=""/>
+  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20250117/c91744bedb5bf427faf21b2802f7194b.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
index d9479c5..f2d50d9 100644
--- a/subPackages/indexGQ/index.wxss
+++ b/subPackages/indexGQ/index.wxss
@@ -1163,7 +1163,7 @@ page {
 .right-more {
   width: 120rpx;
   height: 47rpx;
-  background-color: rgba(255,255,255,.3);
+  background: rgba(255,250,245,0.3);
   border-radius: 23rpx;
   font-weight: 500;
   font-size: 27rpx;
@@ -1186,17 +1186,19 @@ page {
   background: rgba(255,250,245,0.3);
   border-radius: 13rpx;
   /* border: 1px solid #FFFFFF; */
+  min-width: 133rpx;
 
   font-size: 32rpx;
   color: #FFFFFF;
   text-align: center;
   line-height: 53rpx;
   margin-right: 14rpx;
+  box-sizing: border-box;
 }
 .hdrlNavActive {
-  background: linear-gradient(180deg, #FFFAF5, #FFE3C2);
+  background: linear-gradient(180deg, #FFECD9, #FFBD7A);
   font-size: 32rpx;
-  color: #FF4848;
+  color: #E6201C;
   border: none;
 }
 .hdrlItem {
@@ -1204,7 +1206,7 @@ page {
   padding: 26.67rpx 22rpx 26.67rpx 20rpx;
   /* width: 593.33rpx; */
   display: flex;
-  background: url("https://static.ticket.sz-trip.com/uploads/20240923/d4c9e6e558796b0ff89726d0857a5d03.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20250117/8d7f5ce0ecafbc2f836342e4226ec364.png");
   background-size: 100% 100%;
 }
 .hdrlItem-img {
@@ -1236,7 +1238,7 @@ page {
 }
 
 .main-box {
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/98ca9dfa8253e50d624ce64d24295570.png");
   background-size: 100% 100%;
   padding: 27.67rpx 20.67rpx 40rpx 20rpx;
   margin: 0 8rpx;
@@ -1270,12 +1272,14 @@ page {
 }
 .ysz-box {
     margin: 0 8rpx 15.33rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20240923/0220a6adf111a97a9b12746438e87967.png");
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/8efd4c072b3c95fe7c31d1e7b79759d3.png");
     /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
     background-size: 100% 100%;
     width: 733.33rpx;
     height: 320rpx;
     padding-top: 33.33rpx;
+    position: relative;
+    z-index: 5;
 }
 .ysz-more {
     width: 267rpx;
@@ -1287,7 +1291,7 @@ page {
     line-height: 53rpx;
     font-weight: 500;
     font-size: 25rpx;
-    color: #320000;
+    color: #FF4D48;
 }
 .ysz-box2 {
   /* padding: 20rpx 35rpx; */
@@ -1333,7 +1337,7 @@ page {
   border-radius: 23rpx;
   font-weight: 500;
   font-size: 27rpx;
-  color: #320000;
+  color: #F34017;
   z-index: 9;
   text-align: center;
   line-height: 47rpx;
@@ -1475,11 +1479,20 @@ page {
     color: #FFFFFF;
 }
 .nowDate .num{
-    background: #FFEBD5;
+    background: #FFD0A5;
     color: #111111;
 
     font-family: PingFang SC;
-    /* font-weight: bold; */
+    font-weight: bold;
     font-size: 29rpx;
     color: #111111;
+}
+
+.ysz-right-img{
+    width: 200.8rpx;
+    height: 207.33rpx;
+    position: absolute;
+    right: -26rpx;
+    top: 0;
+    z-index:3;
 }
\ No newline at end of file

From bd6bdc98e4e82aa850c88221f58765549295f188 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 20 Jan 2025 15:00:41 +0800
Subject: [PATCH 258/471] =?UTF-8?q?=E6=98=A5=E5=AD=A3=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         |    2 +-
 app.json                       |   16 +-
 images/aindex.png              |  Bin 0 -> 4169 bytes
 images/aindex_seld.png         |  Bin 0 -> 5008 bytes
 images/amap.png                |  Bin 0 -> 5939 bytes
 images/amap_seld.png           |  Bin 0 -> 7571 bytes
 images/auser.png               |  Bin 0 -> 4396 bytes
 images/auser_seld.png          |  Bin 0 -> 5503 bytes
 pages/index/index.js           |  887 ++++++++++++++++-----------
 pages/index/index.wxml         | 1022 ++++++++++++--------------------
 pages/index/index.wxss         |  629 +++++++++++++++-----
 pages/order/pay/index.js       |    2 +-
 subPackages/indexGQ/index.js   |   15 +-
 subPackages/indexGQ/index.wxml |   10 +-
 subPackages/indexGQ/index.wxss |   14 +-
 15 files changed, 1431 insertions(+), 1166 deletions(-)
 create mode 100644 images/aindex.png
 create mode 100644 images/aindex_seld.png
 create mode 100644 images/amap.png
 create mode 100644 images/amap_seld.png
 create mode 100644 images/auser.png
 create mode 100644 images/auser_seld.png

diff --git a/app.js b/app.js
index 8aa3646..170af3f 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.isTest156? true : false;
+      data.isTest = data.isTest? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 9b8bc0d..44e570e 100644
--- a/app.json
+++ b/app.json
@@ -230,27 +230,27 @@
   "style": "v2",
   "sitemapLocation": "sitemap.json",
   "tabBar": {
-    "color": "#97D0EC",
-    "selectedColor": "#5184B0",
+    "color": "#999999",
+    "selectedColor": "#FF4848",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
-        "iconPath": "/images/home.png",
-        "selectedIconPath": "/images/index_seld_2.png",
+        "iconPath": "/images/aindex.png",
+        "selectedIconPath": "/images/aindex_seld.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
-        "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/map_seld_2.png",
+        "iconPath": "/images/amap.png",
+        "selectedIconPath": "/images/amap_seld.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
-        "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/user_seld_2.png",
+        "iconPath": "/images/auser.png",
+        "selectedIconPath": "/images/auser_seld.png",
         "text": "我的"
       }
     ]
diff --git a/images/aindex.png b/images/aindex.png
new file mode 100644
index 0000000000000000000000000000000000000000..456edd2b0072c2de8b08ac572193a603d2871999
GIT binary patch
literal 4169
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
TMfRBO00000NkvXXu0mjfTi6uK

literal 0
HcmV?d00001

diff --git a/images/aindex_seld.png b/images/aindex_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e422ec27ecec4c4ff106004849d6e407cf7f51f
GIT binary patch
literal 5008
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
aPV>L(k$~}CZ{_;{0000<MNUMnLSTaN#Kai@

literal 0
HcmV?d00001

diff --git a/images/amap.png b/images/amap.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cb3a16181e927d3d25e1d5f26f133d44c611891
GIT binary patch
literal 5939
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
V`{F6RXGj15002ovPDHLkV1k0aYu5k(

literal 0
HcmV?d00001

diff --git a/images/amap_seld.png b/images/amap_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4af3f5a74a1633829299f46c26029daa1500e59
GIT binary patch
literal 7571
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

literal 0
HcmV?d00001

diff --git a/images/auser.png b/images/auser.png
new file mode 100644
index 0000000000000000000000000000000000000000..f26c0412fc7b6b52e5caca2d68f78390201063d1
GIT binary patch
literal 4396
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

literal 0
HcmV?d00001

diff --git a/images/auser_seld.png b/images/auser_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cd9a438b62a0c37042868788e9f98dba7a614b8
GIT binary patch
literal 5503
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
Bq%{Bl

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index f0ffd00..e420bb4 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,16 +1,11 @@
 //index.js
 //获取应用实例
 let app = getApp()
-import imageSource from "./imgSource"
-
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
-import https from "../../utils/https.js"
-
 Page({
 	data: {
-        bannerInterver: 1000*60,
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -22,7 +17,9 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -37,8 +34,7 @@ Page({
 		prizeInfo: null,
 		otherPlat: null,
 		activeBannerIndex: 0,
-        smBannerIndex: 0,
-        XPathBannerIndex: 0,
+		smBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -52,43 +48,98 @@ Page({
 		showTime: false,
 		xpth: {}, // 元旦新增 新品特惠和sqjNew
 		djs: null, // 元旦新增 新品特惠倒计时
-        djsTime: null,
-        area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+		djsTime: null,
 		sqjNew: [
-            'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓
-            'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山
-            'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江
-            'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区
-            'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港
-            'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中
-            'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城
-            'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
 		],
 		viewHeight: "0px",
 		isMuted: true,
-        videoPlay: false,
-
-        // 页面图片
-        imageSourceList:imageSource,
+    videoPlay: false,
+    hdrlNavList:[
+      {
+        type:null,
+        title:'全部'
+      },
+      {
+        type:'scene',
+        title:'景区活动'
+      },
+      {
+        type:'show',
+        title:'演出'
+      },
+      {
+        type:'exhibition',
+        title:'展览'
+      },
+      {
+        type:'movie',
+        title:'电影'
+      },
+      {
+        type:'other',
+        title:'其他'
+      }
+    ], //活动日历板块导航分类
+    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+    today:null,
+    hdrlList:[],
+    yszNav:['公共服务','旅游助手'],
+    yszIndex:0,
+    bdList:[
+        {
+            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/4b46ddaa6f9b66fd33c85b4cd34aa2e3.png', //游 景点
+            url:'',
+            path:'/pages/list/scene/index',
+            list: [],
+            
+        },
+        {
+            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/218d224b27b6363e11a5e2ec25990ff2.png', //非玩不可 景点产品
+            path:'/pages/list/night/index',
+            url:'',
+            list: [],
+            
+        },
+        {
+            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/b53c5039299b3152f72eae11a88b7eae.png', //非看不可
+            url:'',
+            path:'/pages/list/theatre/index',
+            list: [],
+            
+        },
+        {
+            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/307d96f6b88be850eb5cd67ef7942f32.png', //非买不可
+            path:'/subPackages/techanNew/index',
+            url:'',
+            list: [],
+            
+        },
+      
+      
+    ],
+    list1:[], //游-景点
+    list2:[], //非晚-夜游
+    list3:[], //非看-剧场演出
+    list4:[], //非买-文创
+    
+    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
+    
 	},
 	onLoad: function(options) {
-        console.log('onload')
-
-        wx.getLocation({type: 'gcj02'})
-           
-		console.log('options',options)
-		// 相城小程序跳转获取用户信息
-		if(options && options.szxcCode) {
-			commonApi._post("uservice/user/loginByXC", {
-				code: options.szxcCode
-			}).then(res => {
-				if(res.data && res.data.id && res.data.token) {
-				  https.set_logininfo(res);
-				}
-			})
-		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -100,9 +151,11 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
+					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -145,7 +198,21 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-		}
+    }
+    // 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+    let d = new Date();
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
+    this.setData({
+      today: d.getFullYear() + "-" + month + "-" + day
+    })
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -156,10 +223,12 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			},
 			fail: (err) => {
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			}
 		})
 		this.setData({
@@ -178,99 +247,258 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-		this.getWeather()
-		// 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
+    this.getWeather()
+  },
+  gobdDetail(e) {
+    let item = e.currentTarget.dataset.item
+    // wx.navigateTo({
+    //   url: url
+    // })
+    util.gotoDetail(item)
+  },
+  getList() {
+    let bdList = this.data.bdList
+    // 游--景点
+    commonApi._post("scene/get_scene_by_tag",{
+      tag_id:"4",
+      limit:6,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      offset:0,
+      sort:"weight",
+      title:'',
+      area_id:''
+    }).then(res=>{
+      console.log('景点', res)
+      res.data.list.map(item => {
+        if (item.distance || item.distance == 0) {
+          if (item.distance >= 1000) {
+            item.distance = (item.distance / 1000).toFixed(2) + 'km';
+          } else {
+            item.distance = (item.distance).toFixed(2) + 'm';
+          }
+        }
+      })
+      bdList[0].list = res.data.list
+      this.setData({
+        list1:res.data.list,
+        bdList: bdList
+      })
+    })
+    // 非买不可--文创
+    commonApi._post('product/get_product_by_tag',{
+        product_model: 'post',
+      offset: 0,
+      limit: 6,
+    }).then(res=>{
+        bdList[3].list = res.data.list
+      this.setData({
+        list4:res.data.list,
+        bdList: bdList
+      })
+    })
+    // 非游不可--线路一日游
+    commonApi._post('product/get_product_by_tag',{
+    //   type_id: 23,
+      tag_id: "10,11,12",
+      offset: 0,
+      limit: 6,
+      sort: 'weight'
+    }).then(res=>{
+        bdList[1].list = res.data.list
+      this.setData({
+        list2:res.data.list,
+        bdList: bdList
+      })
+    })
+    // 非看不可--剧场演出
+    commonApi._post("product/get_product_by_tag",{
+      tag_id:"6",
+      offset:0,
+      limit:6,
+      sort:'',
+      order:'',
+      lat:this.data.lat,
+      lon:this.data.lon,
+      title:''
+    }).then(res=>{
+        bdList[2].list = res.data.list
+      this.setData({
+        list3:res.data.list,
+        bdList: bdList
+      })
+    })
+  },
+  goDetail(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+    if (type == 'movie') {
+      wx.navigateTo({
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/info/activityInfo/index?id=' + item.id,
+      })
+    }
+  },
+  // 分类为电影时调这个接口
+  getMovieList() {
+    let service = "Cinema/getHotMovieList";
+		let data = {
+			page: 1,
+			pageSize: 5
+    };
+    commonApi._post(service, data).then(res => {
+      console.log(res.data);
+			this.setData({
+				hdrlList: res.data
+			})
+    })
+    console.log(this.data.hdrlList);
+  },
+  // 推荐榜单更多跳转
+  moreBtn(e) {
+    let item = e.currentTarget.dataset.item
+    if (item.path!='') {
+      wx.navigateTo({
+        url: item.path,
+      })
+    } else {
+      // if (e.currentTarget.dataset.event) {
+      //   this.pagePoint({
+      //     event: e.currentTarget.dataset.event
+      //   }, 1)
+      // }
+      let url = item.url;
+      app.globalData.weburl = url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+      })
+    }
+  },
+  // 活动日历下的列表
+  getHdrlList() {
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: 1,
+      date: this.data.today,
+      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+      keywords: '',
+      area_key: '',
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 5
+    }).then(res => {
+        res.data.rows.forEach(v=>{
+            if (!v.post_url) {
+                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+            }
         })
-        // 调用接口如果token过期会导致一进入就要登陆
-		// this.getVideoPrize()
-		this.getXpthList()
-	},
+      this.setData({
+        hdrlList:res.data.rows
+      })
+    })
+  },
+  // 切换活动日历分类
+  changeHdrlNav(e) {
+    console.log(e.currentTarget.dataset);
+    this.setData({
+      hdrlList:[],
+      hdrlNavIndex:e.currentTarget.dataset.index,
+    })
+    if (this.data.hdrlNavIndex == 4) {
+      this.getMovieList()
+    } else {
+      this.getHdrlList() //切换分类重新获取活动日历列表
+    }
+  },
+  // 游苏州下的公共服务和旅游助手切换
+  changeType(e) {
+    this.setData({
+      yszIndex:e.currentTarget.dataset.index,
+    })
+  },
+  xlzs: function (e) {
+
+    wx.navigateToMiniProgram({
+      appId: 'wx757dd1ee184e75e9',
+      page: "pages/tabBar/index/index"
+    })
+  },
+  // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
+				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
+				console.log(that.data.viewHeight)
 			}
 		})
 	},
-	getXpthList: function() {
-		// 元旦新增 新品特惠
-		commonApi._post("product/get_product_indulgence", {
-			tag_id: 275,
-            typeId: 3,
-            type: 1, // 返回数组
-		}).then(res => {
-            // res.data.adv = [res.data.adv]
-			this.setData({
-				xpth: res.data,
-				djsTime: res.data.time
-			})
-			let time = setInterval(() => {
-				this.setData({
-					djsTime: this.data.djsTime - 1
-				})
-				this.formatDate(this.data.djsTime)
-			}, 1000)
-			if (this.data.djsTime == 0) {
-				clearInterval(time)
-			}
-		})
-	},
+	// getXpthList: function() {
+	// 	// 元旦新增 新品特惠
+	// 	commonApi._post("product/get_product_indulgence", {
+	// 		tag_id: 275,
+	// 		typeId: 3,
+	// 	}).then(res => {
+	// 		console.log('data', res.data);
+	// 		this.setData({
+	// 			xpth: res.data,
+	// 			djsTime: res.data.time
+	// 		})
+	// 		let time = setInterval(() => {
+	// 			this.setData({
+	// 				djsTime: this.data.djsTime - 1
+	// 			})
+	// 			this.formatDate(this.data.djsTime)
+	// 		}, 1000)
+	// 		if (this.data.djsTime == 0) {
+	// 			clearInterval(time)
+	// 		}
+	// 	})
+	// },
 	// 元旦新品特惠 倒计时 
-	formatDate: function(oTime) {
-		let h = parseInt(oTime / 3600)
-		let m = parseInt((oTime % 3600) / 60)
-		let s = parseInt(oTime % 60)
-		h = h < 10 ? "0" + h : h;
-		m = m < 10 ? "0" + m : m;
-		s = s < 10 ? "0" + s : s;
-		this.setData({
-			djs: {
-				h: h,
-				m: m,
-				s: s
-			}
-		})
-		return
-	},
-	goFeiyi: function() {
-		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-		wx.navigateTo({
-			url: "/pages/pbService/web/index"
-		})
-	},
-	onTabItemTap: function(e) {
-		console.log(e, 99999999)
-	},
+	// formatDate: function(oTime) {
+	// 	let h = parseInt(oTime / 3600)
+	// 	let m = parseInt((oTime % 3600) / 60)
+	// 	let s = parseInt(oTime % 60)
+	// 	h = h < 10 ? "0" + h : h;
+	// 	m = m < 10 ? "0" + m : m;
+	// 	s = s < 10 ? "0" + s : s;
+	// 	this.setData({
+	// 		djs: {
+	// 			h: h,
+	// 			m: m,
+	// 			s: s
+	// 		}
+	// 	})
+	// 	return
+	// },
+  // 非遗跳转
+  // goFeiyi: function() {
+	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+	// 	wx.navigateTo({
+	// 		url: "/pages/pbService/web/index"
+	// 	})
+	// },
+	// onTabItemTap: function(e) {
+	// 	console.log(e, 99999999)
+  // },
+  // 大轮播的监听方法
 	changeBannerIndex: function(e) {
 		this.setData({
-            activeBannerIndex: e.detail.current,
-            bannerInterver: 5000
+			activeBannerIndex: e.detail.current
 		})
-	},
+  },
+  // 小轮播监听方法
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
-    },
-    changeXPathBannerIndex: function(e) {
-		this.setData({
-			XPathBannerIndex: e.detail.current
-		})
-    },
-    xlzs: function (e) {
-
-        wx.navigateToMiniProgram({
-          appId: 'wx757dd1ee184e75e9',
-          page: "pages/tabBar/index/index"
-        })
-      },
+	},
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -348,14 +576,10 @@ Page({
 		this.setData({
 			indexHot: app.globalData.configJson.indexHot,
 			isTest: app.globalData.configJson.isTest,
-            otherPlat: app.globalData.configJson.otherPlats,
-            // 正式数据
-            indexSeason: app.globalData.configJson.indexSeason,
-            // 开发数据
-            // indexSeason: imageSource.testImgs.indexSeason
+			otherPlat: app.globalData.configJson.otherPlats,
+			indexSeason: app.globalData.configJson.indexSeason
 		})
-        this.getFourProduct()
-        console.log(this.data)
+		this.getFourProduct()
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
@@ -401,6 +625,7 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -498,6 +723,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
+    console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -523,19 +749,13 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-		// 	wx.navigateToMiniProgram({
-		// 		appId: 'wxdd39069b9a91dbfe',
-		// 		path: 'pages/index/index'
-		// 	})
-		// 	return;
-		} else if (e.currentTarget.dataset.title == 'e读书') {
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
 			wx.navigateToMiniProgram({
-				appId: 'wx26e6f4c0baba005b',
+				appId: 'wxdd39069b9a91dbfe',
 				path: 'pages/index/index'
 			})
 			return;
-		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
@@ -581,14 +801,15 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
-        app.globalData.weburl = url;
-        console.log(url)
+		app.globalData.weburl = url;
 		wx.navigateTo({
 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
 		})
 	},
 	gotoUrl: function(e) {
+		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -600,8 +821,8 @@ Page({
 			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
-	},
-	// 实时路况跳转外链
+    },
+    	// 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -641,6 +862,7 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -662,33 +884,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	getList: function() {
-		if (!this.data.listMore) return;
-		commonApi._post("search/recommend", {
-			offset: this.data.list.length,
-			limit: 16
-		}).then(res => {
-			res.data.map(item => {
-				if (item.ext.display_tags) {
-					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-				} else {
-					item.ext.display_tags = []
-				}
-			})
-			if (res.data.length < 15) {
-				this.setData({
-					listMore: false
-				})
-			}
-			this.setData({
-				list: this.data.list.concat(res.data)
-			})
-		})
-	},
+	// getList: function() {
+	// 	if (!this.data.listMore) return;
+	// 	commonApi._post("search/recommend", {
+	// 		offset: this.data.list.length,
+	// 		limit: 16
+	// 	}).then(res => {
+	// 		res.data.map(item => {
+	// 			if (item.ext.display_tags) {
+	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+	// 			} else {
+	// 				item.ext.display_tags = []
+	// 			}
+	// 		})
+	// 		if (res.data.length < 15) {
+	// 			this.setData({
+	// 				listMore: false
+	// 			})
+	// 		}
+	// 		this.setData({
+	// 			list: this.data.list.concat(res.data)
+	// 		})
+	// 	})
+	// },
 	onReachBottom: function() {
-		if (this.data.list.length < 30) {
-			this.getList()
-		}
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+		// }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -739,6 +961,7 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
+					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -747,6 +970,7 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
+					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -763,6 +987,7 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -805,6 +1030,7 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -812,189 +1038,190 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	bannerClick2: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.action == 'href') {
-			if (item.href.indexOf(",") != -1) {
-				let info = item.href.split(",");
-				wx.navigateToMiniProgram({
-					appId: info[0],
-					path: info[1]
-				})
-			} else if (item.href.indexOf('map/index') != -1) {
-				wx.reLaunch({
-					url: item.href
-				})
-			} else {
-				wx.navigateTo({
-					url: item.href,
-				})
-			}
-		} else if (item.action == "web") {
-			app.globalData.weburl = item.href;
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-			})
-		}
-	},
+	// bannerClick2: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.action == 'href') {
+	// 		if (item.href.indexOf(",") != -1) {
+	// 			let info = item.href.split(",");
+	// 			wx.navigateToMiniProgram({
+	// 				appId: info[0],
+	// 				path: info[1]
+	// 			})
+	// 		} else if (item.href.indexOf('map/index') != -1) {
+	// 			wx.reLaunch({
+	// 				url: item.href
+	// 			})
+	// 		} else {
+	// 			wx.navigateTo({
+	// 				url: item.href,
+	// 			})
+	// 		}
+	// 	} else if (item.action == "web") {
+	// 		app.globalData.weburl = item.href;
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+	// 		})
+	// 	}
+	// },
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// 获取短视频大赛是否中奖 中奖详情
-	getVideoPrize() {
-		let user_id = wx.getStorageSync('jstrip_userid');
-        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-		commonApi.user_post('actonline/video_act/getRaffle', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				videoPrize: res.data
-			})
-		})
-	},
-	noMoreTip() {
-		wx.setStorageSync('indexPriceNoTip', true)
-		this.closePrice()
-	},
-	closePrice() {
-		this.setData({
-			videoPrize: false,
-			prizeInfo: null
-		})
-	},
+	// // 获取短视频大赛是否中奖 中奖详情
+	// getVideoPrize() {
+	// 	let user_id = wx.getStorageSync('jstrip_userid');
+	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+	// 	commonApi.user_post('actonline/video_act/getRaffle', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			videoPrize: res.data
+	// 		})
+	// 	})
+	// },
+	// noMoreTip() {
+	// 	wx.setStorageSync('indexPriceNoTip', true)
+	// 	this.closePrice()
+	// },
+	// closePrice() {
+	// 	this.setData({
+	// 		videoPrize: false,
+	// 		prizeInfo: null
+	// 	})
+	// },
 	// 抽奖
-	choosePrize() {
-		commonApi.user_post('actonline/video_act/luckyDraw', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				prizeInfo: res.data
-			})
-			if (res.data.type != 'none') {
-				// 抽奖成功的话 弹框
-				wx.showModal({
-					title: "提示",
-					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-					showCancel: false
-				})
-			}
-		})
-	},
-	bannerJumpNew(item) {
-		let that = this
-		item = item.currentTarget.dataset.item
-		if (item.tdata == '') return
-		that.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index"
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index"
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return
-	},
+	// choosePrize() {
+	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			prizeInfo: res.data
+	// 		})
+	// 		if (res.data.type != 'none') {
+	// 			// 抽奖成功的话 弹框
+	// 			wx.showModal({
+	// 				title: "提示",
+	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+	// 				showCancel: false
+	// 			})
+	// 		}
+	// 	})
+	// },
+	// bannerJumpNew(item) {
+	// 	let that = this
+	// 	item = item.currentTarget.dataset.item
+	// 	if (item.tdata == '') return
+	// 	that.pagePoint({
+	// 		event: "banner_click",
+	// 		type: 'banner'
+	// 	}, 1)
+	// 	switch (item.jump_type) {
+	// 		case 0:
+	// 			break;
+	// 		case 1:
+	// 			util.gotoDetail(item.product_model)
+	// 			break;
+	// 		case 2:
+	// 			if (item.front_model && item.front_model.mini) {
+	// 				wx.navigateTo({
+	// 					url: "/" + item.front_model.mini
+	// 				})
+	// 			}
+	// 			break;
+	// 		case 3:
+	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+	// 				// 外部h5
+	// 				console.log(item.tdata)
+	// 				app.globalData.weburl = item.tdata.url;
+	// 				wx.navigateTo({
+	// 					url: "/pages/pbService/web/index"
+	// 				})
+	// 			} else {
+	// 				let page = item.tdata.url.split("/");
+	// 				page = page[page.length - 1].split("?")
+	// 				console.log(page[0])
+	// 				let url = this.data.urltopage[page[0]];
+	// 				if (url && url.indexOf('map') != -1) {
+	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+	// 							'cinema', 'academes'
+	// 						],
+	// 						type = page[1] ? page[1].split("=") : [];
+	// 					wx.reLaunch({
+	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+	// 					})
+	// 				} else if (url) {
+	// 					wx.navigateTo({
+	// 						url: url,
+	// 					})
+	// 				} else {
+	// 					app.globalData.weburl = item.tdata.url;
+	// 					wx.navigateTo({
+	// 						url: "/pages/pbService/web/index"
+	// 					})
+	// 				}
+	// 			}
+	// 			break;
+	// 		case 4:
+	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+	// 				// 如果是苏心游的小程序 直接把authCode带过去
+	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+	// 					let weburl = item.tdata.page
+	// 					if (weburl.indexOf('?') != -1) {
+	// 						weburl += '&authCode=' + res.data;
+	// 					} else {
+	// 						weburl += '?authCode=' + res.data
+	// 					}
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: weburl
+	// 					})
+	// 				}).catch(err => {
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: item.tdata.page
+	// 					})
+	// 				})
+	// 			} else {
+	// 				wx.navigateToMiniProgram({
+	// 					appId: item.tdata.appid,
+	// 					path: item.tdata.page
+	// 				})
+	// 			}
+	// 			break;
+	// 		default:
+	// 			break;
+	// 	}
+	// 	return
+	// },
 	onReady: function() {
 
 
 	},
-	gotoOther: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.type == 'h5') {
-			app.globalData.weburl = item.url
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-			})
-		} else if (item.type == 'mini') {
-			wx.navigateToMiniProgram({
-				appId: item.appid,
-				path: item.path
-			})
-		} else if (item.type == 'page') {
-			wx.navigateTo({
-				url: item.page,
-			})
-		}
-	},
+	// gotoOther: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.type == 'h5') {
+	// 		app.globalData.weburl = item.url
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+	// 		})
+	// 	} else if (item.type == 'mini') {
+	// 		wx.navigateToMiniProgram({
+	// 			appId: item.appid,
+	// 			path: item.path
+	// 		})
+	// 	} else if (item.type == 'page') {
+	// 		wx.navigateTo({
+	// 			url: item.page,
+	// 		})
+	// 	}
+	// },
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
-
 		if (app.globalData.loadIndexSeason) {
 			this.getIndexSeason()
 		} else {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3445f12..fc06ec0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,691 +1,403 @@
-<!--index.wxml-->
+<!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
-<!-- <view class="old-btn">关怀模式</view> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<view wx:if="{{!isTest}}">
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-    <view class="weather-num">{{weather.max_temp}}°</view>
-    <view class="weather">{{weather.weather}}</view>
-    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-        mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/newYear2025/topBg.png" mode="widthFix"></image>
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <view class="weather-num">{{weather.max_temp}}°</view>
+  <view class="weather">{{weather.weather}}</view>
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
+    mode="aspectFill"></image>
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20250120/213c1a6ae49848fa54047d6f9059fec2.png" mode="aspectFill"></image>
+</view>
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+    <view class="iconfont icon-sousuo"></view>
+    <view class="textOver">搜索想要的旅游产品或服务</view>
+  </navigator>
+</view>
+<view style="position:relative;z-index: 1;" >
+  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+    <block wx:for="{{banner}}" wx:key="index">
+      <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="com-flex dot-list">
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+  </view>
+</view>
+<view class="content" wx:if="{{!isTest}}">
+  <!-- 活动日历 -->
+  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:86rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20240925/9d10d5ff4a5314573328dd6cdab67b82.png"></image>
+    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+    <view class="nowDate"> 
+        <view class="num">{{nowDate[0]}}</view>
+        <view>月</view>
+        <view class="num">{{nowDate[1]}}</view>
+        <view>日</view>
+    </view>
+  </view>
+  <view class="hdrlNavList">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+      {{item.title}}
+    </view>
+  </view>
+  <view wx:if="{{hdrlNavIndex!=4}}">
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
+        <view style="background: #fff;display: flex;border-radius: 13rpx;">
+          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
+          <view class="hdrlItem-content">
+            <view class="hdrlItem-title textOver3">{{item.name}}</view>
+            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view wx:else>
+    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
+        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
+          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
+          
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
+            <view>{{item.title}}</view>
+            <view style="display: flex;justify-content: flex-end;">
+              <view class="buyMovie">去购票 ></view>
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
-    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <!-- <view class="iconfont icon-sousuo"></view> -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20241225/59b88ab6ae2800ebe02f8c25eaf29636.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-        <view class="textOver" style="color:rgba(41, 48, 90, 0.5);">搜索想要的旅游产品或服务</view>
-    </navigator>
+  </view>
+  <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" wx:if="{{!isTest}}">
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20250117/a480fadd053c80bc2efb3239fd956ceb.png" mode=""/>
+      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20250117/57373a69fac19bc39cb91d44c233257d.png" mode=""/>
     </view>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="index">
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
+          </view>
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
+            <view class="text">一卡游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <view class="text">非遗专卖</view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
-        </block>
+      </block>
     </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
     </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
     </view>
-
- 
-    <view class="top-icons" wx:if="{{!isTest}}">
-        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
-            <view class="top-icon-text">活动日历</view>
-        </view>
-        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
-            <view class="top-icon-text">场馆预约</view>
-        </view>
-        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
-            <view class="top-icon-text">非遗专卖</view>
-        </view>
-
-        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
-            <view class="top-icon-text">剧场演出</view>
-        </view>
-        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
-            <view class="top-icon-text">文创特产</view>
-        </view>
-        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
-            <view class="top-icon-text">景点门票</view>
-        </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view>
-        <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
+    <image class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250117/e0d0cf611cfa9f63259de578a6065b50.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
+        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
         </view> -->
-        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
-            <view class="top-icon-text">夜游苏州</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
-            <view class="top-icon-text">一日游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
-            <view class="top-icon-text">研学游</view>
-        </view>
-    </view>
-    <view class="content">
-        <view class="sale-road-boxes" wx:if="{{false}}">
-            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-            <view class="sale-product">
-                <view class="sale-product-bg"></view>
-                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>限时特惠</view>
-                    <view>新品推荐</view>
-                </view>
-                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
-                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-                </view>
-            </view>
-            </view>
-            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-            <view class="sale-product">
-                <view class="sale-product-bg road-product-bg"></view>
-                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>四季苏州</view>
-                    <view>最是江南</view>
-                </view>
-                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
-                </view>
-            </view>
-            </view>
-        </view>
-        <!-- ai避高峰 -->
-        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
-            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-            <image src="{{indexSeason.ai}}" mode=""/>
-            </view>
-            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-            <image src="{{indexSeason.avoid}}" mode=""/>
-            </view>
-        </view>
-
-        <!-- 小banner 五一修改 一张banner不滚动 -->
-        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-        </view>
-        <view class="small-swiper-box" wx:else>
-            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-            <block wx:for="{{xiaobanner}}" wx:key="index">
-                <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <!-- 原 圆角77rpx，现改为13rpx -->
-                <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-                </swiper-item>
-            </block>
-            </swiper>
-            <view class="dot-list com-flex sm-dot-list">
-            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-            </view>
-        </view>
-    
-        <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-            <!-- 上方标题部分 -->
-            <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
-                倒计时
-                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.m}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.s}}</view>
-            </view>
-
-            </view>
-            <!-- 商品部分 -->
-            <view class="xpth-product">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left">
-                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                <image src="{{item.headimg}}" mode="" />
-                <view class="xpth-item-content">
-                    <view class="xpth-item-title textOver2">{{item.title}}</view>
-                    <!-- <view class="xpth-tag">唇齿留香</view> -->
-                    <view class="xpth-item-bottom">
-                    <view class="xpth-item-price">{{item.price/100}}</view>
-                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
-                    </view>
-                </view>
-                </view>
-            </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
-                <block wx:for="{{xpth.adv}}" wx:key="index">
-                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
-                    </swiper-item>
-                </block>
-                </swiper>
-                <view class="xpth-banner-dot-list">
-                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
-                </view>
-            </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
-            </view>
-        </view>
-
-
-        <!-- 数字文旅-->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode="" />
-        </view>
-        <view class="slide-out-box">
-            <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-            <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-            <view class="pbservice" style="margin-bottom:30rpx">
-                <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[0]}}" mode="widthFix"></image>
-                <view class="text">数字非遗</view>
-                </view>
-                <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[1]}}" mode="widthFix"></image>
-                <view class="text">数字博物馆</view>
-                </view>
-                <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[2]}}" mode="widthFix"></image>
-                <view class="text">数字名人馆</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[3]}}" mode="widthFix"></image>
-                <view>云上观展</view>
-                </view>
-                <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[4]}}" mode="widthFix"></image>
-                <view class="text">云上文博会</view>
-                </view>
-                <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[5]}}" mode="widthFix"></image>
-                <view class="text">精彩回顾</view>
-                </view>
-                <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[6]}}" mode="widthFix"></image>
-                <view class="text">文化场馆查询</view>
-                </view>
-                <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[7]}}" mode="widthFix"></image>
-                <view class="text">苏影通</view>
-                </view>
-                <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[8]}}" mode="widthFix"></image>
-                <view class="text">书仓</view>
-                </view>
-                <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[9]}}" mode="widthFix"></image>
-                <view class="text">e读书</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[10]}}" mode="widthFix"></image>
-                <view class="text">数字公共文化</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[11]}}" mode="widthFix"></image>
-                <view class="text">云游苏州</view>
-                </view>
-                <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[12]}}" mode="widthFix"></image>
-                <view class="text">美图鉴赏</view>
-                </view>
-            </view>
-            </scroll-view>
-            <view class="scroll-line">
-            <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-            <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-            <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
-            <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-            </view>
-        </view>
-
-        <!-- 旅游助手 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" />
-        </view>
-        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
-            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
-            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
-            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
-        </view>
-
-        <!-- 公共服务 -->
-        <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
-            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
-            </navigator>
-            
-        </view>
-        <view style="overflow-x:auto">
-            <!-- 元旦修改 ggfw为新增类名 -->
-            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
-                <view>高峰预警</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
-                <view>实时路况</view>
-                </view>
-                <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20250115/18e8e2274a8191d0be0b8c63884ebe04.png" mode="widthFix"></image>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/857299fcd14ee5c7a1621598e0e05bae.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/9a1611d20a32fc4b18438dabffaaacf9.png" mode="widthFix"></image>
+          <view>实时路况</view>
+        </view>
+        <view bindtap="xlzs"  class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20250120/cdd4faf804f1cd494b6a7cccdc7f7f23.png" mode="widthFix"></image>
                 <view>行李直送</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
-                <view>行李寄存</view>
-                </view>
-                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-                    data-path="/pages/pbService/bike/index?type=1">
-                    <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
-                    <view>找厕所</view>
-                </view>
-            </view>
-        </view>
-
-        <!-- 十全十美 -->
-        <view class="sale-road-boxes">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" />
         </view>
-        <view class="six-box-new" wx:if="{{!isTest}}">
-            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
-            </image>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
+          <view>行李寄存</view>
         </view>
-
-        <!-- 长三角文旅平台 -->
-        <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" />
-        </view>
-        <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-            <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{imageSourceList.CSJWLPT[index]}}" mode="widthFix"></image>
-            <view>{{item.name}}</view>
-            </view>
+        
+        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+            data-path="/pages/pbService/bike/index?type=1">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250117/1565d2b5a46180d53b5b3c225ce91068.png" mode="widthFix"></image>
+            <view>找厕所</view>
         </view>
 
-        <!-- 热门推荐 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode="" />
-        </view>
-        <view class="hot-list" wx:if="{{isTest==false}}">
-            <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
-            <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-                <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-                <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-                <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-                <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-                <view class="today-date">{{date}} {{month}}</view>
-                <view class="today-hot-box">
-                    <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
-                    {{item.ext.display_tags[0]}}</view>
-                    <view class="today-hot-title">{{item.title}}</view>
-                </view>
-                </view>
-                <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-                <view style="position:relative">
-                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                    <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-                </view>
-                <view class="hot-info">
-                    <view class="hot-title">{{item.title}}</view>
-                    <view class="tags textOver" style="margin-bottom:0">
-                    <view class="icon-box">
-                        <text class="iconfont icon-xin"></text>
-                        <text>{{item.ext.like_number}}</text>
-                    </view>
-                    <view class="icon-box">
-                        <text class="iconfont icon-eye"></text>
-                        <text>{{item.ext.view_number}}</text>
-                    </view>
-                    </view>
-                </view>
-                </view>
-                <view wx:else class="hot-item">
-                <view style="position:relative">
-                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                    <!-- <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' && item.ext.price}}" class="hot-price">
-                    <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
-                    </view>
-                </view>
-                </view>
-            </view>
-            </view>
-        </view>
-        <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-        <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
-    </view>
-
-    <view class="mask prizeMask" wx:if="{{videoPrize}}">
-    <view class="mask-bg"></view>
-    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-        <!-- 中奖的卡券 -->
-        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
         </view> -->
-        </view>
-        <!-- 中奖的产品 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 未中奖 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <view bindtap="closePrice">我知道了</view>
-        </view>
-        </view>
-        <!-- 未抽奖状态 -->
-        <view style="position:relative" wx:else>
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-        </view>
-        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
     </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          data-path="/pages/list/{{isTest?'road':'food'}}/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
     </view>
-    <!-- 广告弹窗 -->
-    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
-    <view class="alertavd" wx:if="{{showAdv}}">
-    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-        <block wx:for="{{alertSwipeList}}" wx:key="index">
-        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
-            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+  </view>
+  <!-- 推荐榜单 -->
+  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20250117/c91744bedb5bf427faf21b2802f7194b.png" mode=""/>
+  <!-- 4个产品榜单 -->
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
+  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
+    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <view class="bd-top">
+      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" data-item="{{bdItem}}">更多 ></view>
     </view>
-    <!-- 广告弹窗结束 -->
-    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
-    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    <view style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
+        wx:key="id" data-item="{{item}}">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
 
-    <!-- 视频 -->
-    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
+  </view>
+ </view>
 
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-    </view>
-    </view>
-    <!-- <view class="topBox">
-        <view class="Qtop" :style="{height:height}">
-        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
-        </view>
-        <view class="jumpBox">
-        <view class="time">{{time}}s</view>
-        <view bind:tap="gotoIndex">跳过</view>
-        </view>
-    </view> -->
 </view>
 
-<view wx:else>
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="*this">
+<view class="content" wx:else>
+    <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" >
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image  data-title="景区舒适度"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
+      <image  class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
+    </view>
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          
+          
+        </view>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
-        </block>
+      </block>
     </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-    </view>
-    </view>
-    <view class="top-icons">
-    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">活动日历</view>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
     </view>
-    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">场馆预约</view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
     </view>
-
-  
-    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">剧场演出</view>
-    </view>
-  
-   
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item" wx:if="{{false}}">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">夜游苏州</view>
-    </view>
-    </view>
-    <view class="content">
- 
-    <!-- 五一修改 一张banner不滚动 -->
-    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-    </view>
-    <view class="small-swiper-box" wx:else>
-        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-        <block wx:for="{{xiaobanner}}" wx:key="*this">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <!-- 原 圆角77rpx，现改为13rpx -->
-            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-            </swiper-item>
-        </block>
-        </swiper>
-        <view class="dot-list com-flex sm-dot-list">
-        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
         </view>
-    </view>
 
-
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view> -->
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
     </view>
-    <!-- 五一修改 .slide-out-box 增加背景色-->
-    <view class="slide-out-box">
-        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-            <view class="text">数字非遗</view>
-            </view>
-            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-            <view class="text">数字博物馆</view>
-            </view>
-            
-            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-            <view>云上观展</view>
-            </view>
-            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-            <view class="text">云上文博会</view>
-            </view>
-            
-            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-            <view class="text">文化场馆查询</view>
-            </view>
-            
-            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view>
-            
-
-            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-            <view class="text">数字公共文化</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-            <view class="text">文旅单位</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view> -->
-            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-            <view class="text">云游苏州</view>
-            </view>
-            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-            <view class="text">美图鉴赏</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-            <view>文物查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-            data-path="/pages/pbService/museum/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-            <view>博物馆查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-            <view>云上文博会</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-            <view class="text">投资导引图</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="数字文物"
-            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-            <view>数字文物</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-            <view>团体预约</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-            <view>廉洁地图</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-            <view>文化配送</view>
-            </view> -->
-        </view>
-        </scroll-view>
-        <view class="scroll-line">
-        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-        </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" >
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
     </view>
+  </view>
+</view>
 
 
-
-
-
-
-  
+<!-- 开屏页 -->
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
-</view>
\ No newline at end of file
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
+</view>
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index b543000..abaade5 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,12 +1,12 @@
-/**index.wxss**/
+/* pages/indexs/index.wxss */
 /* 元旦修改 */
 page {
-  /* background: #9DDCF5; */
+  height: fit-content;
   padding-bottom: 36.67rpx;
-  
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
-  background-repeat: repeat-y;
-  background-size: 100% 100%;
+  background: url("https://static.ticket.sz-trip.com/uploads/20250120/b42c1ac742bee3ddff35151ecd860f81.jpg");
+  background-size: 100% auto;
+  /* background-repeat: round; */
+  background-repeat: no-repeat;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -39,31 +39,19 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
-  /* height: 64rpx; */
-  /* background: rgba(255, 255, 255, 0.6); */
-  /* border-radius: 32rpx; */
-  /* color: #666; */
-  /* height: 70.67rpx; */
   height: 64rpx;
-  /* background: rgba(255,255,255,0.7); */
-  border-radius: 0rpx;
-  /* color: #72674E; */
-  color: #333333;
-  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
-  background-size: 100% 100%; */
+  background: rgba(255,255,255,0.7);
+  border-radius: 32rpx;
+  color: #000;
   display: flex;
   align-items: center;
   font-size: 25rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png");
-  background-size: 100% 100%;
-  padding: 2rpx 5rpx;
-  box-sizing: border-box;
 }
 .search-box .iconfont {
   font-size: 30rpx;
   margin-left: 20rpx;
-  margin-right: 20rpx;
-  /* color: #72674E; */
+  margin-right: 10rpx;
+  color: #000;
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -74,14 +62,18 @@ page {
   font-size: 29rpx;
   margin-bottom: 10rpx;
   margin-left: 4rpx;
+  color: white;
 }
 .top-box .weather {
   font-size: 19rpx;
   margin-top: 20rpx;
   margin-left: -4rpx;
   margin-right: 30rpx;
+  color: white;
 }
 .top-icons {
+  /* background: #FFFFFF; */
+  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
   width: 697rpx;
   margin: 0 auto;
@@ -89,11 +81,12 @@ page {
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 29.33rpx;
+  padding-bottom: 7rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  margin-top: -50rpx;
-  padding-top: 84rpx;
+  background: #FFFED6;
+  margin-top: -20rpx;
+  padding-top: 54rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -108,13 +101,14 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 86rpx;
+  width: 113rpx;
   display: block;
   margin: 0 auto;
   margin-bottom: 10rpx;
 }
 .content {
-  margin: 0 25rpx;
+  /* margin: 0 25rpx; */
+  margin-top: 20.67rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -122,6 +116,7 @@ page {
   margin-top: 40rpx;
   position: relative;
   align-items: flex-end;
+  margin-bottom: 28rpx;
 }
 .sale-box {
   flex-shrink: 0;
@@ -203,13 +198,11 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 50rpx 0;
-  width: 100%;
+  margin: 24rpx 26.67rpx 26.67rpx;
+  /* width: 100%; */
   height: 154rpx;
   border-radius: 20rpx;
-  /* border-radius: 77rpx; */
   overflow: hidden;
-  margin-top: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -317,54 +310,56 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  width: 100%;
+  /* width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap;
+  flex-wrap: wrap; */
+    display: flex;
+    justify-content: space-between;
+    margin: 0 28rpx;
 }
 .title-more {
-  font-size: 27rpx;
-  font-weight: 500;
-  color: #29305A;
+  font-size: 24rpx;
+  /* color: #0B898E; */
+  /* 元旦修改 */
+  color: #54504D;
   z-index: 9;
   width: 173rpx;
-  height: 80rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  background: rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
   text-align: center;
-  display: flex;
-  align-items: center;
-  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  margin-top: 20rpx;
+  /* margin-top: 20rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  margin-bottom: 40rpx;
+  /* margin-bottom: 40rpx; */
 }
 .pbservice {
-  /* width: calc(175rpx * 6); */
-  /* 元旦修改 */
-  width: calc(190rpx * 7);
+  width: calc(160rpx * 8);
   display: flex;
-  margin-top: 30rpx;
-  flex-wrap: wrap;
-  /* margin-bottom: 60rpx; */
-  /* 元旦修改 注释margin-bottom */
+  margin-top: 5rpx;
+  /* flex-wrap: wrap; */
+  flex-wrap: nowrap;
+  /* padding-left: 12rpx; */
+  /* overflow-x: scroll; */
 }
 .pbservice-item {
-  /* 元旦修改 截止到注释的width*/
-  width: 120rpx;
-  margin-bottom: 33.33rpx;
-  margin-right: 62.33rpx;
-  /* width: 175rpx; */
+  width: 106rpx;
+  margin-bottom: 25rpx;
+  margin-right: 32.33rpx;
   text-align: center;
-  font-size: 25rpx;
-  color: #111111;
+  font-size: 27rpx;
+  color: #000;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -379,7 +374,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 106rpx;
+  width: 80rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -540,36 +535,47 @@ page {
 }
 .more-btn-text {
   text-align: center;
+  /* color: #0b898e;
+  font-size: 27rpx;
+  width: 200rpx;
+  line-height: 65rpx;
+  border: 1px solid #0b898e;
+  border-radius: 33rpx; */
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #5184B0;
+  border: 1px solid #111;
+  border-radius: 35rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #5184B0;
 }
 .scroll-line {
-
-  width: 73rpx !important;
-  height: 7rpx;
-  /* background: #DDCEAC; */
-  background: #97D0EC;
+  /* height: 6rpx;
   border-radius: 3rpx;
-  margin: 33.33rpx auto;
+  background: #ccc;
+  overflow: hidden;
+  margin: 30rpx auto; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  width: 48rpx !important;
+  height: 8rpx;
+  /* background: #DDCEAC; */
+  background: #fff;
+  border-radius: 4rpx;
+  margin: 15rpx auto 10rpx;
 }
 .scroll-line-bg {
-  height: 7rpx;
-  background: #5184B0;
-  border-radius: 3rpx;
+  height: 8rpx;
+  background: #FF4848;
+  border-radius: 4rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 37.33rpx;
-  background: #5184B0;
-  height: 7rpx;
-  border-radius: 3rpx;
+  margin-left: 24rpx;
+  background: #FF4848;
+  height: 8rpx;
+  border-radius: 4rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -675,20 +681,22 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
+  background: #FFFED6;
   justify-content: space-around;
   height: 187rpx;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
 }
 .other-plats image {
-  width: 106rpx;
+  width: 80rpx;
   display: block;
-  height: 106rpx;
+  height: 80rpx;
   margin-bottom: 15rpx;
 }
 .other-plat {
   /* 春节新增样式 */
-  color: #111111;
+  color: #54504D;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -822,7 +830,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .time-box {
-  font-size: 27rpx;
+  font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
   /* color: #54504D; */
@@ -833,22 +841,26 @@ page {
   margin-left: -50rpx;
   z-index: 9;
   flex-wrap: nowrap;
-
-  position: relative;
-  left: -150rpx;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  /* width: 43rpx; */
+  /* margin: 0 5rpx; */
+  /* width: 50rpx; */
+  /* height: 33rpx; */
+  width: 43rpx;
   height: 43rpx;
-  padding: 0 7rpx;
   line-height: 43rpx;
+  background: #4AB648;
+  /* background: #F9F1DB; */
+  /* border-radius: 5rpx; */
   border-radius: 13rpx;
-  font-size: 27rpx;
+  font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #FF6A57;
+  /* color: #D62828; */
+  color: white;
   text-align: center;
+  /* line-height: 33rpx; */
 }
 .time-box text {
   width: 18rpx;
@@ -894,67 +906,60 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-product {
-  width: 700rpx;
+  /* position: absolute; */
+  width: 697rpx;
   height: 373rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx 13rpx;
+  padding: 25rpx 15rpx;
   box-sizing: border-box;
+  /* left: 0;
+  bottom: 15.33rpx;
+  /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
+  /* width: 270rpx; */
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
+  /* background-size: 100% 100%; */
+  border-radius: 20rpx;
   flex: 1;
   margin-left: 15rpx;
-  height: 322rpx;
-  width: 100%;
-  border-radius: 0rpx;
-  overflow: hidden;
-  position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
-  background-size: 100% 100%;
-  padding: 3rpx;
-}
-.xpth-banner-swiper{
-    height: 100%;
-    border-radius: 20rpx;
-    overflow: hidden;
+  /* padding: 4rpx;
+  background: #72674e;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  height: 319rpx;
 }
 .xpth-banner image {
+  /* width: 270rpx; */
   flex: 1;
-  height: 100%;
-  width: 100%;
+  height: 319rpx;
   border-radius: 20rpx;
-}
-.xpth-banner-dot-list{
-    position: absolute;
-    right: 0;
-    bottom: 10rpx;
-    padding: 10rpx;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-.xpth-banner-dot-list .xpth-dot{
-    width: 9rpx;
-    height: 9rpx;
-    background: #FFFFFF;
-    border-radius: 50%;
-    opacity: 0.6;
-    margin: 0 4rpx;
-}
-.xpth-banner-dot-list .xpth-dot.active{
-    opacity: 1;
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  /* border-radius: 20rpx; */
 }
 /* 元旦修改新增样式 */
 .xpth-item {
+  /* width: 413rpx;
+  height: 160rpx; */
+  /* background: #FFFFFF; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%; */
   border-radius: 20rpx;
   height: 153rpx;
+  background: #FFFFFF;
   display: flex;
   margin-bottom: 13rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png");
-  background-size: 100% 100%;
-  padding: 1rpx;
+  /* margin-bottom: 10rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
+  /* padding: 5rpx; */
 }
 .xpth-item:last-child {
   margin-bottom: 0;
@@ -984,7 +989,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 210rpx;
+  width: 230rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
@@ -1007,15 +1012,15 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-price {
-  font-size: 31rpx;
+  font-size: 32rpx;
   font-family: PingFang SC;
-  font-weight: bold;
-  color: #ED1C19;
+  font-weight: 500;
+  color: #D62828;
 }
 /* 元旦修改新增样式 */
 .xpth-item-price::before {
   content: "￥";
-  font-size: 23rpx;
+  font-size: 20rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-item-buy {
@@ -1033,24 +1038,22 @@ page {
 /* 元旦修改新增样式 */
 .new-pic {
   width: 160rpx !important;
-  height: 220rpx !important;
-  margin-bottom: 26.67rpx;
+  height: 255rpx !important;
+  /* margin-bottom: 26.67rpx; */
 }
 
-.ggfw-list {
-  justify-content: space-around !important;
-}
-.ggfw-list .pbservice-item{
-    margin-right: 0;
-    color: #111111;
+.ggfw-list{
+    display: flex;
+    justify-content: space-around;
 }
 .ggfw {
   width: auto;
+  margin:0;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 93rpx !important;
-  height: 93rpx !important;
+  width: 113.33rpx !important;
+  height: 113.33rpx !important;
 }
 
 .six-box-new {
@@ -1077,7 +1080,7 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #111111;
+  color: #54504D;
 }
 
 .rmtj-right {
@@ -1158,30 +1161,340 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-.jqssd {
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
-  background-size: 100% 100%; */
-  width: 344.33rpx;
-  height: 160rpx;
+
+.right-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,208,165,0.4);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 47rpx;
+}
+
+.hdrlNavList {
+  display: flex;
+  margin: 28rpx 26.67rpx 10rpx;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+}
+.hdrlNav {
   flex-shrink: 0;
+  /* width: 160rpx; */
+  padding: 0 20rpx;
+  height: 53rpx;
+  background: rgba(255,208,165,0.4);
+  border-radius: 13rpx;
+  /* border: 1px solid #FFFFFF; */
+  min-width: 133rpx;
+
+  font-size: 32rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 53rpx;
+  margin-right: 14rpx;
+  box-sizing: border-box;
 }
-.jqssd image, .sslk image{
-  width: 100%;
-  height: 100%;
+.hdrlNavActive {
+  background: linear-gradient(180deg, #FFECD9, #FFBD7A);
+  font-size: 32rpx;
+  color: #E6201C;
+  border: none;
+}
+.hdrlItem {
+  flex-shrink: 0;
+  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
+  /* width: 593.33rpx; */
+  display: flex;
+  background: url("https://static.ticket.sz-trip.com/uploads/20250117/8d7f5ce0ecafbc2f836342e4226ec364.png");
+  background-size: 100% 100%;
+}
+.hdrlItem-img {
+  width: 240rpx;
+  height: 213rpx;
+  background: #8C8C8C;
+  border-radius: 13rpx;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+  overflow: hidden;
+}
+.hdrlItem-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 213rpx;
+}
+.hdrlItem-title {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 15.33rpx;
+}
+.hdrlItem-date {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #000000;
+  margin-bottom: 19.33rpx;
+}
+
+.main-box {
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/98ca9dfa8253e50d624ce64d24295570.png");
+  background-size: 100% 100%;
+  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
+  margin: 0 8rpx;
+}
+.main-box-top {
+  display: flex;
+  margin-bottom: 5.33rpx;
+}
+.gfyj,.sslk {
+  width: 369.33rpx;
+  height: 146rpx;
+  flex-shrink: 0;
 }
 .sslk {
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
-  background-size: 100% 100%; */
-  width: 344rpx;
-  height: 160rpx;
+  margin-left: -48rpx;
+}
+
+.movieItem {
+  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+  flex-shrink: 0;
+  height: 206.67rpx;
+}
+.movieItem-img {
+  width: 213rpx;
+  height: 213rpx;
+  border-radius: 18rpx;
+  margin-right: 18rpx;
   flex-shrink: 0;
 }
+.ysz-box {
+    margin: 0 8rpx 15.33rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/8efd4c072b3c95fe7c31d1e7b79759d3.png");
+    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
+    background-size: 100% 100%;
+    width: 733.33rpx;
+    height: 320rpx;
+    padding-top: 33.33rpx;
+    position: relative;
+    z-index: 1;
+}
+.ysz-more {
+    width: 267rpx;
+    height: 53rpx;
+    background: #FFFFFF;
+    border-radius: 27rpx;
+    margin: 38rpx auto 0;
+    text-align: center;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 25rpx;
+    color: #FF4D48;
+}
+.ysz-box2 {
+  /* padding: 20rpx 35rpx; */
+  padding-top: 23.33rpx;
+}
+.tjbd-title {
+  width: 286.67rpx;
+  height: 80rpx;
+}
+
+.bd-box {
+  position: relative;
+  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
+  margin-left: 26.67rpx;
+  width: 582rpx;
+  /* height: 1133rpx; */
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  border-radius: 20rpx 80rpx 20rpx 20rpx;
+}
+.bd-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+  position: relative;
+}
+.zz {
+    width: 236.67rpx;
+    height: 206.67rpx;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 2;
+}
+.bd-type {
+  width: 125.33rpx;
+  height: 38.67rpx;
+}
+.bd-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #F34017;
+  z-index: 9;
+  text-align: center;
+  line-height: 47rpx;
+}
+.bd-index {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #000000;
+}
+.bd-item {
+  margin-left: 45.33rpx;
+  width: 453rpx;
+  height: 147rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  display: flex;
+}
+.bd-item-img {
+    width: 147rpx;
+    height: 147rpx;
+    background: #D9D9D9;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.bd-item-content {
+    padding: 14rpx 29.33rpx 13.33rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.bd-item-title {
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+}
+.bd-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    width: 260rpx;
+}
+.bd-price {
+    font-size: 29.33rpx;
+    color: #F93434;
+    font-weight: bold;
+}
+.bd-price:after {
+  content:'起';
+  color: #999999;
+  font-size: 23rpx;
+  font-weight: 700;
+}
+.bd-price::before {
+  content:'￥';
+  font-size: 23rpx;
+}
+.bd-distance {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #999999;
+}
 
-.xsth-left{
-    /* flex: 1;
-    width: 1rpx; */
+.buyMovie {
+    width: 160rpx;
+    height: 56rpx;
+    background: #FF4848;
+    color: #fff;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 56rpx;
+}
+
+.bg1 {
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+}
+.bg2 {
+  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
 }
-.xsth-left>image{
-    max-width: 100%;
-    overflow: hidden;
+.bg3 {
+  background: linear-gradient(180deg, #E0F7DC, #A0F292);
+}
+.bg4 {
+  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
+}
+
+.hdrlNavList::-webkit-scrollbar{
+  display:none;
+}
+.hdrlList::-webkit-scrollbar{
+  display:none;
+}
+.bottom-box::-webkit-scrollbar{
+  display:none;
+}
+.slide-box::-webkit-scrollbar{
+  display:none;
+}
+.pbservice::-webkit-scrollbar{
+  display:none;
+}
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}
+.public-box {
+  width: 593.33rpx;
+  height: 266.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.one::-webkit-scrollbar{
+  display:none;
+}
+
+
+.date-container{
+    position: relative;
+}
+.nowDate{
+    display: flex;
+    position: absolute;
+    left: 228.77rpx;
+    bottom: 7.33rpx;
+}
+
+.nowDate>view{
+
+    width: 44rpx;
+    height: 44rpx;
+    border-radius: 7rpx;
+    text-align: center;
+    line-height: 44rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 29rpx;
+    color: #FFFFFF;
+}
+.nowDate .num{
+    background: #FFD0A5;
+    color: #111111;
+
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 29rpx;
+    color: #111111;
+}
+
+.ysz-right-img{
+    width: 200.8rpx;
+    height: 207.33rpx;
+    position: absolute;
+    right: -26rpx;
+    top: 0;
+    z-index:1;
 }
\ No newline at end of file
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 757300b..cf67b05 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -102,7 +102,7 @@ Page({
 
       
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166){
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166 || res.data.order_product_list[0].product_id == 437248){
 		  this.setData({
         isBook:true,
         payIndex:1
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
index 446bbf6..e420bb4 100644
--- a/subPackages/indexGQ/index.js
+++ b/subPackages/indexGQ/index.js
@@ -98,7 +98,7 @@ Page({
     bdList:[
         {
             bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/15ee44a960511cdcf276b5d8df472626.png', //游 景点
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/4b46ddaa6f9b66fd33c85b4cd34aa2e3.png', //游 景点
             url:'',
             path:'/pages/list/scene/index',
             list: [],
@@ -106,7 +106,7 @@ Page({
         },
         {
             bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/cd652f4bcfcef7f55863bf8587609ca4.png', //非玩不可 景点产品
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/218d224b27b6363e11a5e2ec25990ff2.png', //非玩不可 景点产品
             path:'/pages/list/night/index',
             url:'',
             list: [],
@@ -114,7 +114,7 @@ Page({
         },
         {
             bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/a0b95152b87215dccbb2e5dfa1bfd145.png', //非看不可
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/b53c5039299b3152f72eae11a88b7eae.png', //非看不可
             url:'',
             path:'/pages/list/theatre/index',
             list: [],
@@ -122,7 +122,7 @@ Page({
         },
         {
             bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20240923/799befa78b1d474bfb26004cc2ef817d.png', //非买不可
+            icon:'https://static.ticket.sz-trip.com/uploads/20250120/307d96f6b88be850eb5cd67ef7942f32.png', //非买不可
             path:'/subPackages/techanNew/index',
             url:'',
             list: [],
@@ -418,6 +418,13 @@ Page({
       yszIndex:e.currentTarget.dataset.index,
     })
   },
+  xlzs: function (e) {
+
+    wx.navigateToMiniProgram({
+      appId: 'wx757dd1ee184e75e9',
+      page: "pages/tabBar/index/index"
+    })
+  },
   // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index 66fa1ca..fc06ec0 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -1,16 +1,16 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20240923/d62c7214a790c9746c9dd9f8821775f7.gif" mode="widthFix"></image>
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/newYear2025/topBg.png" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
   <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
     mode="aspectFill"></image>
   <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+    src="https://static.ticket.sz-trip.com/uploads/20250120/213c1a6ae49848fa54047d6f9059fec2.png" mode="aspectFill"></image>
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
@@ -174,6 +174,10 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20250117/9a1611d20a32fc4b18438dabffaaacf9.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
+        <view bindtap="xlzs"  class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20250120/cdd4faf804f1cd494b6a7cccdc7f7f23.png" mode="widthFix"></image>
+                <view>行李直送</view>
+        </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
index f2d50d9..abaade5 100644
--- a/subPackages/indexGQ/index.wxss
+++ b/subPackages/indexGQ/index.wxss
@@ -3,8 +3,8 @@
 page {
   height: fit-content;
   padding-bottom: 36.67rpx;
-  background: url("https://static.ticket.sz-trip.com/uploads/20240923/69d4d68f5207c84146739951d07dbda4.jpg");
-  background-size: 100% 300%;
+  background: url("https://static.ticket.sz-trip.com/uploads/20250120/b42c1ac742bee3ddff35151ecd860f81.jpg");
+  background-size: 100% auto;
   /* background-repeat: round; */
   background-repeat: no-repeat;
 }
@@ -62,12 +62,14 @@ page {
   font-size: 29rpx;
   margin-bottom: 10rpx;
   margin-left: 4rpx;
+  color: white;
 }
 .top-box .weather {
   font-size: 19rpx;
   margin-top: 20rpx;
   margin-left: -4rpx;
   margin-right: 30rpx;
+  color: white;
 }
 .top-icons {
   /* background: #FFFFFF; */
@@ -1163,7 +1165,7 @@ page {
 .right-more {
   width: 120rpx;
   height: 47rpx;
-  background: rgba(255,250,245,0.3);
+  background: rgba(255,208,165,0.4);
   border-radius: 23rpx;
   font-weight: 500;
   font-size: 27rpx;
@@ -1183,7 +1185,7 @@ page {
   /* width: 160rpx; */
   padding: 0 20rpx;
   height: 53rpx;
-  background: rgba(255,250,245,0.3);
+  background: rgba(255,208,165,0.4);
   border-radius: 13rpx;
   /* border: 1px solid #FFFFFF; */
   min-width: 133rpx;
@@ -1279,7 +1281,7 @@ page {
     height: 320rpx;
     padding-top: 33.33rpx;
     position: relative;
-    z-index: 5;
+    z-index: 1;
 }
 .ysz-more {
     width: 267rpx;
@@ -1494,5 +1496,5 @@ page {
     position: absolute;
     right: -26rpx;
     top: 0;
-    z-index:3;
+    z-index:1;
 }
\ No newline at end of file

From 0b2ec0cbe9d024a53e8f7a5bb42f9c58b6d45b92 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 21 Jan 2025 13:50:13 +0800
Subject: [PATCH 259/471] =?UTF-8?q?=E6=98=A5=E5=AD=A3=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                    | 2 +-
 pages/index/index.wxml                    | 9 ++-------
 pages/index/index.wxss                    | 2 +-
 pages/list/movieticket/list/info/index.js | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 170af3f..8aa3646 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.isTest? true : false;
+      data.isTest = data.isTest156? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index fc06ec0..bf41bb6 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/newYear2025/topBg.png" mode="widthFix"></image>
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20250121/540fa46b838ea3166cd8701bd611ca9d.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
@@ -255,12 +255,7 @@
     <!-- 高峰预警、实时路况及几个板块 -->
   <view class="main-box" >
     <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image  data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
-      <image  class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
-    </view>
+
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index abaade5..01d1d77 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1311,7 +1311,7 @@ page {
   width: 582rpx;
   /* height: 1133rpx; */
   background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  /* box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(224,61,60,0.26); */
   border-radius: 20rpx 80rpx 20rpx 20rpx;
 }
 .bd-top {
diff --git a/pages/list/movieticket/list/info/index.js b/pages/list/movieticket/list/info/index.js
index 9c359bd..57841c9 100644
--- a/pages/list/movieticket/list/info/index.js
+++ b/pages/list/movieticket/list/info/index.js
@@ -27,7 +27,7 @@ Page({
       show_id:options.id
     }).then(res=>{
       let showFlag = new Date(res.data.open_time.replace(/-/g,'/')).getTime()<=new Date().getTime();
-      res.data.listimg = res.data.listimg.split(",") || []
+      res.data.listimg = res.data.listimg?res.data.listimg.split(",") || [] :[]
       this.setData({
         info:res.data,
         showFlag:showFlag

From 87d436f41abb693fa0be00493d7566db66d0048c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 23 Jan 2025 11:00:25 +0800
Subject: [PATCH 260/471] =?UTF-8?q?=E9=82=AE=E5=AF=84=E7=AE=97=E8=BF=90?=
 =?UTF-8?q?=E8=B4=B9=E8=AF=B7=E6=B1=82=E6=9C=80=E5=A4=A7=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  2 +-
 pages/index/index.wxml           | 13 ++++++++++++-
 pages/order/orderList/index.js   | 12 +++++++++---
 pages/order/pay/index.wxml       |  3 ++-
 pages/order/postOrder/index.wxml |  2 +-
 pages/order/scene/index.js       |  4 ++++
 pages/order/scene/index.wxml     |  2 +-
 7 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index 8aa3646..170af3f 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.isTest156? true : false;
+      data.isTest = data.isTest? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index bf41bb6..e67ee4f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -19,7 +19,7 @@
   </navigator>
 </view>
 <view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -107,6 +107,11 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
+          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
+        </view>
+
           <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
             <view class="text">一日游</view>
@@ -124,6 +129,12 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
+
+          <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <view class="text">研学游</view>
+        </view>
+
         </view>
       </scroll-view>
       <view class="scroll-line">
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 27c84fd..5ffd963 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -25,7 +25,7 @@ Page({
   linkmanList:[],
   finalPrice: 0,
 
-  showCoupon: false,
+  showCoupon: true,
   },
 
   /**
@@ -38,16 +38,22 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       flag:options.flag,
-      showCoupon: (app.globalData.list || []).length<=0,
+    //   showCoupon: (app.globalData.list || []).length<=0,
       // linkmanList: app.globalData.linkmanList
     })
     console.log('-------------',this.data.ticketList);
     // debugger
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
+        try {
+            item.postFee = parseFloat(item.postFee)
+        } catch(e){
+            item.postFee = 0
+        }
+
       if (!app.globalData.kjId && !this.data.gp_id) {
         price = price + item.sku.price * item.productNum;
-        postFee +=item.postFee
+        postFee += item.postFee
       }
       else if (this.data.gp_id) {
         price = price + item.sku.event_price * item.productNum;
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index c67f2a2..93508e9 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -82,8 +82,9 @@
         </view>
       </view>
     </view>
-    <view style="padding:20rpx 0 60rpx;">
+    <view style="padding:20rpx 0 30rpx;">
         <view class="btn" style="margin:0 100rpx" bindtap="closeTipMask">确认{{showTipMaskSecond<=0?'':'（'+showTipMaskSecond+'s）'}}</view>
+        <view style="padding:30rpx 60rpx 0rpx;color: #d62828;font-size: 22rpx;font-weight: bold;">数币红包可使用1000元旅游红包，1000元购物红包无法在本平台使用</view>
 
     </view>
       
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index fd18ba0..0dedbe3 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -34,7 +34,7 @@
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view>
   <view class="all-money-box" wx:if="{{from=='cart'}}">
-    小计：<text class="unit">￥</text><text class="s-price">{{item.sku.price * item.productNum /100}}</text>
+    小计：<text class="unit">￥</text><text class="s-price">{{(item.sku.price * item.productNum + item.postFee || 0) /100}}</text>
   </view>
   <!-- 补贴 -->
   <view class="box-title allowance" wx:if="{{allowance_price}}">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 9577afb..56e5a75 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -310,6 +310,10 @@ Page({
     this.totalPrice(this.data.singlePrice)
   },
   totalPrice(price) {
+    this.setData({
+        singlePrice:price
+    })
+
     let allPrice
     if (this.data.coupon) {
       if (this.data.coupon.activity.discount_type == 'pricebreak') {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 8fa77b0..0a896a9 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -34,7 +34,7 @@
   </view>
   <view class="box">
     <view class="box-title">
-      <view style="flex:1">{{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}</view>
+      <view class="textOver2" style="flex:1">{{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}</view>
       <!-- <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view> -->
       <!-- <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view> -->
       <view class="s-price">

From f350237e15f72635b244202eb352a21109ebc7bc Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 23 Jan 2025 20:25:16 +0800
Subject: [PATCH 261/471] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=99=AF?=
 =?UTF-8?q?=E5=8C=BA=E5=88=97=E8=A1=A8=E6=8F=90=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                    |  2 +-
 pages/index/index.js      |  2 +-
 pages/index/index.wxml    | 24 +++---------------------
 pages/list/scene/index.js | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app.js b/app.js
index 170af3f..8aa3646 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.isTest? true : false;
+      data.isTest = data.isTest156? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index e420bb4..7827e1e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -313,7 +313,7 @@ Page({
     })
     // 非看不可--剧场演出
     commonApi._post("product/get_product_by_tag",{
-      tag_id:"6",
+      tag_id:"477",
       offset:0,
       limit:6,
       sort:'',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e67ee4f..44f63a1 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -270,33 +270,15 @@
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+        <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          
-          
+
         </view>
       </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
-      </view>
+      
     </view>
   </view>
   <!-- 小轮播 -->
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 5c66ea3..4cd5eb3 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -119,10 +119,25 @@ Page({
           item.distance = item.distance + "m"
         }
       })
+
+
+        // isTest时只展示拙政园
+        if (app.globalData.configJson.isTest) {
+            let sceneIds = [5442,5492,5465,5257,5447]
+            let ZZY = res.data.list.filter(x=>sceneIds.includes(x.id))
+            this.setData({
+                list: ZZY
+            })
+            return
+        }
+
       this.setData({
         list:list.concat(res.data.list),
         total:res.data.count
       })
+
+      
+
       console.log(res)
     })
   },

From aecb82478cd1fa4768fd345f0655dccb11311458 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 24 Jan 2025 11:05:13 +0800
Subject: [PATCH 262/471] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/user/service/info/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 8aa3646..e8b8d6a 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.isTest156? true : false;
+      data.isTest = data.isTest157? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index 72734fa..6469d88 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -11,7 +11,7 @@ Page({
     info:null,
     linkData:[],
 
-    phoneList: ["0512-66555111"],
+    phoneList: ["0512-66555111","15051405673"],
     showPhoneMask: false
   },
 

From 149344ecd82a6c9a4f7d6749975461f5b3145b11 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 25 Jan 2025 16:25:36 +0800
Subject: [PATCH 263/471] =?UTF-8?q?=E9=85=92=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/order/hotel/index.js   | 14 +++++++++++---
 pages/order/hotel/index.wxml |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index e8b8d6a..170af3f 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.isTest157? true : false;
+      data.isTest = data.isTest? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/hotel/index.js b/pages/order/hotel/index.js
index 0ca49c7..131c265 100644
--- a/pages/order/hotel/index.js
+++ b/pages/order/hotel/index.js
@@ -29,7 +29,8 @@ Page({
       showMask:false,
       editId:null,
       linkmanList:[],
-      prizeId:null
+      prizeId:null,
+      showCoupon: false
     },
   
     /**
@@ -39,7 +40,7 @@ Page({
       this.setData({
         prizeId:wx.getStorageSync('prizeId')
       })
-      this.couponCom = this.selectAllComponents("#coupon")[0];
+      
       let CtripHotelCart = app.globalData.product;
       // 获取默认联系人
       userApi.user_post("user/getDefaultContact",{
@@ -73,8 +74,15 @@ Page({
         CtripHotelCart.price_sum = price_sum;
         this.setData({
           priceInfo:res.data,
-          CtripHotelCart:CtripHotelCart
+          CtripHotelCart:CtripHotelCart,
+          showCoupon: true
         })
+        this.couponCom = this.selectAllComponents("#coupon")[0];
+        // if (this.couponCom) {
+        //     this.couponCom.getMaxCoupon()
+        // }
+
+
       })
     },
     inputTel:function(e){
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index 3619f74..94eea6a 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -69,7 +69,7 @@
   </view>
 </view>
 <!-- 2023/9/14隐藏酒店下单页优惠券入口 -->
-<!-- <coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon> -->
+<coupon id="coupon" wx:if="{{showCoupon}}" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon>
 <!-- 支付按钮 -->
 <view style="height:{{100 }}rpx"></view>
 <view class="fixed-bottom">

From fc1086d9f4f47f3fee1f3bf85e2d0a31c6b37733 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 25 Jan 2025 21:04:32 +0800
Subject: [PATCH 264/471] =?UTF-8?q?=E6=98=86=E5=B1=B1=E5=9B=9E=E4=BC=A0?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                               |  2 +-
 pages/info/postProductInfo/index.js  | 12 ++++++++++--
 pages/info/roadInfo/index.js         | 12 +++++++++---
 pages/info/sceneProductInfo/index.js |  7 +++++++
 pages/info/showInfo/index.js         |  9 ++++++---
 pages/order/WineSceneOrder/index.js  |  4 ++++
 pages/order/postOrder/index.js       |  6 ++++++
 pages/order/road/index.js            |  8 ++++++--
 pages/order/roadOrder/index.js       |  4 ++++
 pages/order/scene/index.js           |  4 ++++
 pages/order/show/index.js            |  4 +++-
 pages/order/showOrderNew/index.js    |  4 ++++
 project.private.config.json          |  7 +++++++
 13 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/app.js b/app.js
index 170af3f..e8b8d6a 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.isTest? true : false;
+      data.isTest = data.isTest157? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 22e9eb8..5c2ee7f 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -35,13 +35,16 @@ Page({
         iShop: false,
         supplierId: null,
         showQrCode: false,
-        wxqrcode: null
+        wxqrcode: null,
+
+        ZTPoint:''
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        console.log(options)
         //删除临时存储的联系人
         wx.removeStorageSync('linkMan')
         let rect = wx.getMenuButtonBoundingClientRect(),
@@ -58,6 +61,11 @@ Page({
                 cartTop: res.top
             })
         }).exec()
+        if (options.ZTPoint) {
+            this.setData({
+                ZTPoint: options.ZTPoint
+            })
+        }
 
         if (options.retailId) {
             this.setData({
@@ -349,7 +357,7 @@ Page({
                     app.globalData.couponInfo = null;
                     // 购买
                     let product = [{
-                        product: this.data.info,
+                        product: {...this.data.info,ZTPoint:this.data.ZTPoint},
                         sku: this.data.info.sku[this.data.skuIndex],
                         productNum: this.data.producNum
                     }];
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 18ed345..bda6477 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -22,7 +22,8 @@ Page({
         shareImg: null,
         showShareFlag: false,
         showQrCode: false,
-        wxqrcode: null
+        wxqrcode: null,
+        ZTPoint:''
     },
 
     /**
@@ -40,6 +41,8 @@ Page({
                 retailId: options.retailId
             })
         }
+        if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
+
         let api = commonApi._post;
         if (wx.getStorageSync("jstrip_token")) {
             api = commonApi.user_post;
@@ -169,7 +172,8 @@ Page({
             } else {
                 app.globalData.couponInfo = null;
                 app.globalData.product = {
-                    product: this.data.info
+                    product: {...this.data.info,ZTPoint:this.data.ZTPoint},
+
                 }
                 app.globalData.retailId = this.data.retailId;
                 util.pagePoint({
@@ -182,7 +186,9 @@ Page({
                 wx.setStorageSync('login_from', 'product_order_login')
                 wx.setStorageSync('order_from', 'product_order_submit')
                 wx.navigateTo({
-                    url: '/pages/order/road/index?id=' + this.data.info.id + (this.data.retailSkuId ? ('&skuid=' + this.data.retailSkuId) : '')
+                    url: '/pages/order/road/index?id=' + this.data.info.id 
+                    + (this.data.retailSkuId ? ('&skuid=' + this.data.retailSkuId) : '')
+                    +'&ZTPoint='+this.data.ZTPoint,
                 })
             }
         })
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index d7103c2..67be917 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -45,6 +45,8 @@ Page({
     skuDoms: [], // sku 节点Dom
     activeIndex: 0, // sku 侧边栏
     scrollHeight: 0,
+    ZTPoint:'',
+    
   },
 
   /**
@@ -61,6 +63,8 @@ Page({
         retailId: options.retailId
       })
     }
+    if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
+
     this.setData({
       id: options.id
     })
@@ -393,6 +397,9 @@ Page({
           // product.productNum = this.data.productNum
           app.globalData.product.date = this.data.date
           app.globalData.product.time = this.data.time
+          app.globalData.product.product.ZTPoint = this.data.ZTPoint
+
+
           // app.globalData.product = {
           //   ...sku,
           //   ...product
diff --git a/pages/info/showInfo/index.js b/pages/info/showInfo/index.js
index baf18b8..7444ad9 100644
--- a/pages/info/showInfo/index.js
+++ b/pages/info/showInfo/index.js
@@ -40,7 +40,9 @@ Page({
         showDetail: false,
         lat:120,
         lng:31,
-        distance: 0
+        distance: 0,
+        ZTPoint:''
+
     },
 
     /**
@@ -69,6 +71,7 @@ Page({
                 retailId: options.retailId
             })
         }
+        if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
         commonApi._post("product/get_product_detail", {
             id: options.id
         }).then(res => {
@@ -304,7 +307,7 @@ Page({
         // app.globalData.retailId = this.data.retailId;
 
         wx.navigateTo({
-            url: '/pages/order/show/index?id='+this.data.id,
+            url: '/pages/order/show/index?id='+this.data.id+'&ZTPoint='+this.data.ZTPoint,
         })
     },
     order: function () {
@@ -322,7 +325,7 @@ Page({
                     app.globalData.couponInfo = null;
                     // 购买
                     let product = [{
-                        product: this.data.info,
+                        product: {...this.data.info,ZTPoint:this.data.ZTPoint},
                         sku: this.data.info.sku[this.data.skuIndex],
                         productNum: this.data.producNum
                     }];
diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js
index 94defbc..c1c4722 100644
--- a/pages/order/WineSceneOrder/index.js
+++ b/pages/order/WineSceneOrder/index.js
@@ -80,6 +80,7 @@ Page({
     this.showAllPrice()
 
     console.log(this.data);
+    console.log(this.data.product.product.ZTPoint)
     this.getNewCoupon()
     this.couponCom = this.selectAllComponents("#coupon")[0];
 
@@ -293,6 +294,9 @@ Page({
     if (this.data.prizeId) {
       data.lottery_id = this.data.prizeId
     }
+    if (this.data.product.product.ZTPoint) {
+        data.partner_code = this.data.product.product.ZTPoint
+    }
     let service = 'order/create', postData = {
       data: JSON.stringify(data)
     }
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 1668344..06b2343 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -54,6 +54,7 @@ Page({
       showPrice: app.globalData.kjId ? 0 : price,
       sku_id: sku_id.join(",")
     })
+    console.log(this.data.product)
     if (!this.data.kjId && !this.data.gp_id) {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
@@ -179,6 +180,11 @@ Page({
     if (app.globalData.category_id) {
       data.category_id = app.globalData.category_id;
     }
+
+    let ZTPointProduct = this.data.product.find(v=>v.product&&v.product.ZTPoint)
+    if (ZTPointProduct) {
+        data.partner_code = ZTPointProduct.product.ZTPoint
+    }
 	console.log(app.globalData.list)
 	if(!app.globalData.list || app.globalData.list.length == 0){
 		commonApi.user_post("order/create", {
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 1446a15..96de141 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -19,7 +19,9 @@ Page({
     nums:[],
     price:0,
     infoFlag:false,
-    productInfo:null
+    productInfo:null,
+    ZTPoint:''
+
   },
 
   /**
@@ -30,6 +32,8 @@ Page({
     this.setData({
       id:options.id
     })
+    if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
+
     // 获取产品下的规格
     commonApi._post("product/get_product_detail",{
       id:this.data.id
@@ -223,7 +227,7 @@ Page({
       return;
     };
     app.globalData.product = {
-      product:this.data.productInfo,
+      product:{...this.data.productInfo,ZTPoint:this.data.ZTPoint},
       sku:sku,
       selectDate:selectDate,
       price:this.data.price
diff --git a/pages/order/roadOrder/index.js b/pages/order/roadOrder/index.js
index 1c222ff..0090e4a 100644
--- a/pages/order/roadOrder/index.js
+++ b/pages/order/roadOrder/index.js
@@ -51,6 +51,7 @@ Page({
       price:product.price,
       sku_ids:sku_ids.join(",")
     })
+    console.log(this.data)
     // 获取默认联系人
     this.getLinkmanList()
   },
@@ -263,6 +264,9 @@ Page({
     if(app.globalData.category_id){
       data.category_id = app.globalData.category_id;
     }
+    if (this.data.product.ZTPoint) {
+        data.partner_code = this.data.product.ZTPoint
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 56e5a75..1bdae09 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -477,9 +477,13 @@ Page({
     if (this.data.prizeId) {
       data.lottery_id = this.data.prizeId
     }
+    if (this.data.product.product.ZTPoint) {
+        data.partner_code = this.data.product.product.ZTPoint
+    }
     let service = 'order/create', postData = {
       data: JSON.stringify(data)
     }
+    
     if (app.globalData.product.isGroup == 1) {
       service = "team_order/appoint"
       postData.member_num = this.data.productNum
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index 51c71e2..82f43d7 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -31,6 +31,7 @@ Page({
 
     // 日历
     showMoreDateFlag: false,
+    ZTPoint:''
   },
 
   /**
@@ -42,6 +43,7 @@ Page({
         this.setData({
             productId: id
         })
+        if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
         // let product = app.globalData.product
         // console.log(product)
         // this.setData({
@@ -266,7 +268,7 @@ Page({
                 // app.globalData.retailId = this.data.retailId;
                 
                 app.globalData.product = {
-                    product: {...product, price: skuSelect.price},
+                    product: {...product, price: skuSelect.price,ZTPoint:this.data.ZTPoint},
                     sku: sku
                 }
                 
diff --git a/pages/order/showOrderNew/index.js b/pages/order/showOrderNew/index.js
index 393e269..2c2467d 100644
--- a/pages/order/showOrderNew/index.js
+++ b/pages/order/showOrderNew/index.js
@@ -52,6 +52,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+      console.log(app.globalData.product)
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -443,6 +444,9 @@ Page({
     if (this.data.prizeId) {
       data.lottery_id = this.data.prizeId
     }
+    if (this.data.product.product.ZTPoint) {
+        data.partner_code = this.data.product.product.ZTPoint
+    }
     console.log(data)
     let service = 'order/create', postData = {
       data: JSON.stringify(data)
diff --git a/project.private.config.json b/project.private.config.json
index d302a3d..6f2c82b 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=437254&ZTPoint=yjksSpecial",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/indexGQ/index",
           "pathName": "subPackages/indexGQ/index",

From 71b6106bbb97d571cb09c99b10436b63a2bdadda Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sun, 26 Jan 2025 22:19:01 +0800
Subject: [PATCH 265/471] 11

---
 pages/index/index.js   |  2 ++
 pages/index/index.wxml | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 7827e1e..2684e23 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -290,6 +290,8 @@ Page({
         product_model: 'post',
       offset: 0,
       limit: 6,
+      sort:'sales_number',
+      order:'desc',
     }).then(res=>{
         bdList[3].list = res.data.list
       this.setData({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 44f63a1..fc14305 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -189,11 +189,17 @@
                 <image src="https://static.ticket.sz-trip.com/uploads/20250120/cdd4faf804f1cd494b6a7cccdc7f7f23.png" mode="widthFix"></image>
                 <view>行李直送</view>
         </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
+
+        <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
+      <image src="https://static.ticket.sz-trip.com/uploads/20250126/083b1053137c4e0350eb92b8144f018c.png" mode="widthFix"></image>
+      <view>停车场</view>
+    </view>
+
+        <!-- <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
           <view>行李寄存</view>
-        </view>
+        </view> -->
         
         <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
             data-path="/pages/pbService/bike/index?type=1">

From 6789c4052f4dcb4809fb1836e17afa336fc73d7c Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 31 Jan 2025 13:59:01 +0800
Subject: [PATCH 266/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E4=BB=8E=E7=AC=AC=E4=BA=94=E4=B8=AA=E5=BC=80=E5=A7=8B=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 2 +-
 pages/index/index.js   | 2 +-
 pages/index/index.wxml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index e8b8d6a..1115291 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.isTest157? true : false;
+      data.isTest = data.isTest158? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 2684e23..d5cf101 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -33,7 +33,7 @@ Page({
 		videoPrize: false,
 		prizeInfo: null,
 		otherPlat: null,
-		activeBannerIndex: 0,
+		activeBannerIndex: 5,
 		smBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index fc14305..7161c71 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -19,7 +19,7 @@
   </navigator>
 </view>
 <view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>

From ca5bec2793cbb93e8b89a24872678b1eebdbf775 Mon Sep 17 00:00:00 2001
From: 18761167687 <1132620739@qq.com>
Date: Fri, 31 Jan 2025 15:48:27 +0800
Subject: [PATCH 267/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=92=E5=BA=97?=
 =?UTF-8?q?=E4=BD=8F=E5=AE=BF=E4=B8=B4=E6=97=B6=E8=B7=B3=E8=BD=AC=E6=96=B0?=
 =?UTF-8?q?=E8=83=BD=E6=BA=90=E4=B8=93=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7161c71..8338f1a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -107,7 +107,12 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
-          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
+          <!-- <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
+        </view> -->
+        <!-- 临时跳转专题页 -->
+        <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase"  class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
             <view class="text">酒店住宿</view>
         </view>

From e439d1bd7a7858b67fa6cfe905a0e6d93f6ace81 Mon Sep 17 00:00:00 2001
From: 18761167687 <1132620739@qq.com>
Date: Sat, 1 Feb 2025 11:03:03 +0800
Subject: [PATCH 268/471] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/index/index.wxml           | 8 ++++----
 pages/user/service/info/index.js | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 1115291..6c32407 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.isTest158? true : false;
+      data.isTest = data.isTest159? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8338f1a..573ed0b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -107,15 +107,15 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
-          <!-- <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
+          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
             <view class="text">酒店住宿</view>
-        </view> -->
+        </view>
         <!-- 临时跳转专题页 -->
-        <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase"  class="pbservice-item">
+        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase"  class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
             <view class="text">酒店住宿</view>
-        </view>
+        </view> -->
 
           <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index 6469d88..cb5ab57 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -11,7 +11,7 @@ Page({
     info:null,
     linkData:[],
 
-    phoneList: ["0512-66555111","15051405673"],
+    phoneList: ["0512-66555111","18915532527"],
     showPhoneMask: false
   },
 

From e1b024395d4dfa1eaadb2f3b497e6725d20b7baf Mon Sep 17 00:00:00 2001
From: 18761167687 <1132620739@qq.com>
Date: Sat, 1 Feb 2025 18:03:13 +0800
Subject: [PATCH 269/471] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             | 2 +-
 pages/user/service/list/index.js   | 6 ++++++
 pages/user/service/list/index.wxml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 6c32407..d4352f8 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.isTest159? true : false;
+      data.isTest = data.isTest160? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js
index 51b8f3d..b9eedb9 100644
--- a/pages/user/service/list/index.js
+++ b/pages/user/service/list/index.js
@@ -113,6 +113,12 @@ Page({
       phoneNumber: '0512-66555111',
     })
   },
+  phoneCall2:function(){
+    console.log(1111);
+    wx.makePhoneCall({
+      phoneNumber: '18915532527',
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml
index 43455a0..1081b19 100644
--- a/pages/user/service/list/index.wxml
+++ b/pages/user/service/list/index.wxml
@@ -24,7 +24,7 @@
       <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
  <view>客服服务时间:9:00-12:00,</view>
  <view>13:00-18:00</view>
-如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view></view></view>
+如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view><view class="green" bindtap="phoneCall2"> 18915532527 </view></view></view>
       <view class="modal-footer">
         <view
           class="btn-confirms two"

From c1ab375dc3d88b7a75e9011e4e5a98f992bf47fb Mon Sep 17 00:00:00 2001
From: 18761167687 <1132620739@qq.com>
Date: Sat, 1 Feb 2025 20:19:22 +0800
Subject: [PATCH 270/471] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml            | 2 +-
 pages/index/index.wxss            | 3 +++
 pages/list/activitynew/index.wxml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 573ed0b..1551e47 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -43,7 +43,7 @@
     </view>
   </view>
   <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
       {{item.title}}
     </view>
   </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 01d1d77..11f779a 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1497,4 +1497,7 @@ page {
     right: -26rpx;
     top: 0;
     z-index:1;
+}
+.hidden{
+  display: none;
 }
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index e30e9de..440df97 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -24,7 +24,7 @@
     <view class="{{type==3?'types-item-active':'types-item'}}" bindtap="changeType" data-type="3">景区活动</view>
     <view class="{{type==1?'types-item-active':'types-item'}}" bindtap="changeType" data-type="1">演出</view>
     <view class="{{type==2?'types-item-active':'types-item'}}" bindtap="changeType" data-type="2">展览</view>
-    <view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4">电影</view>
+    <view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4" style="display: none;">电影</view>
     <view class="{{type==7?'types-item-active':'types-item'}}" bindtap="changeType" data-type="7">文化惠民</view>
     <view class="{{type==6?'types-item-active':'types-item'}}" bindtap="changeType" data-type="6">其他</view>
   </view>

From 692b21cd396acabed1cae888f84610c44d8436f3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 6 Feb 2025 15:30:06 +0800
Subject: [PATCH 271/471] =?UTF-8?q?=E6=96=87=E5=88=9B=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=9F=E9=A1=B5=E9=9D=A2=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=81=9C=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         | 2 +-
 subPackages/techanNew/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index d4352f8..d7376c3 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.isTest160? true : false;
+      data.isTest = data.isTest161? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index 88546b1..ee85e0f 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -730,7 +730,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.onReload()
+    // this.onReload()
     // this.setData({
     //   seachFlag:false
     //   // list:[],

From f184a20e3f8c786c56070e8269a969eb189f9949 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 8 Feb 2025 21:47:00 +0800
Subject: [PATCH 272/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 app.json                                   |  3 +-
 pages/component/newCalendar/index.js       |  7 +-
 pages/map/index.js                         | 10 ++-
 pages/map/index.wxml                       |  2 +-
 subPackages/transferPage/transferPage.js   | 84 ++++++++++++++++++++++
 subPackages/transferPage/transferPage.json |  3 +
 subPackages/transferPage/transferPage.wxml |  0
 subPackages/transferPage/transferPage.wxss |  1 +
 9 files changed, 105 insertions(+), 7 deletions(-)
 create mode 100644 subPackages/transferPage/transferPage.js
 create mode 100644 subPackages/transferPage/transferPage.json
 create mode 100644 subPackages/transferPage/transferPage.wxml
 create mode 100644 subPackages/transferPage/transferPage.wxss

diff --git a/app.js b/app.js
index d7376c3..edf5273 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.isTest161? true : false;
+      data.isTest = data.isTest163? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 44e570e..0bbbcb6 100644
--- a/app.json
+++ b/app.json
@@ -200,7 +200,8 @@
         "feiyiNew/index",
         "postSearch/index",
         "gwcOrder/index",
-        "indexGQ/index"
+        "indexGQ/index",
+        "transferPage/transferPage"
       ]
     }
   ],
diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js
index 5bc7fe1..85d72d9 100644
--- a/pages/component/newCalendar/index.js
+++ b/pages/component/newCalendar/index.js
@@ -56,7 +56,8 @@ Component({
 
          /** 视图收起/展开 */
     toggleMode() {
-      if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2025)) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2023))) {
+        const { year, month} = this.data
+      if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year+1))) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year-1)))) {
         return
       }
       this.setData({
@@ -64,7 +65,7 @@ Component({
       })
       const activeDateStr = this.data.activeDateStr 
       const arr = activeDateStr.split("/")
-      const { year, month} = this.data
+     
       if(  this.data.currentViewType === "month" ) {
           this.getLastMonthDays(year, month)
           this.getNowMonthDays(year, month)
@@ -219,7 +220,7 @@ Component({
               nowDay
             } = this.data
             let type = e.currentTarget.dataset.type //类型
-            if ((type == 'next' && this.data.weekDay[0].year === 2025) || (type == 'prev' && this.data.weekDay[0].year === 2023)) {
+            if ((type == 'next' && this.data.weekDay[0].year === (year+1)) || (type == 'prev' && this.data.weekDay[0].year === (year-1))) {
                 return
             }  
             // if (type == 'next' && this.data.weekDay[0].year === 2025) {
diff --git a/pages/map/index.js b/pages/map/index.js
index bfa0fe6..31627d0 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -31,7 +31,9 @@ Page({
     timeList:{},
     showMore:'close',
     scrollLeft: 0,
-    levelList:[]
+    levelList:[],
+
+    selectHeight: 90,
   },
   listenScroll(e) {
     this.setData({
@@ -43,6 +45,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
     if(options.type){
       this.setData({
         type:options.type
@@ -80,6 +83,11 @@ Page({
         levelList:res.data
       })
     })
+
+    // 设置筛选框top
+    let systemInfo = wx.getWindowInfo(),rect = wx.getMenuButtonBoundingClientRect();
+    let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+    this.setData({selectHeight:height+systemInfo.statusBarHeight})
   },
   changeClose() {
     this.setData({
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 58ef64d..9935dac 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -7,7 +7,7 @@
 </map>
 <view style="height:{{topHeight}}px"></view>
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">
-  <view class="picker">
+  <view class="picker" style="top:{{selectHeight}}px">
     <view class="areatext">{{areas[areaIndex].area_title}}</view>
     <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
   </view>
diff --git a/subPackages/transferPage/transferPage.js b/subPackages/transferPage/transferPage.js
new file mode 100644
index 0000000..e1322c0
--- /dev/null
+++ b/subPackages/transferPage/transferPage.js
@@ -0,0 +1,84 @@
+// subPackages/transferPage/transferPage.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    if (options.action = 'otherMiniProgram') {
+        this.goOtherMiniProgrogram(options)
+    } else {
+        wx.navigateBack()
+
+    }
+  },
+
+  goOtherMiniProgrogram (data) {
+    wx.navigateToMiniProgram({
+        // appId: 'wx114d514f39cb1fed',
+        // path: "pages/entry/index",
+        appId: data.appId,
+        path: data.path,
+        shortLink: data.shortLink,
+        complete: () =>{
+            wx.navigateBack()
+        }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/transferPage/transferPage.json b/subPackages/transferPage/transferPage.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/subPackages/transferPage/transferPage.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subPackages/transferPage/transferPage.wxml b/subPackages/transferPage/transferPage.wxml
new file mode 100644
index 0000000..e69de29
diff --git a/subPackages/transferPage/transferPage.wxss b/subPackages/transferPage/transferPage.wxss
new file mode 100644
index 0000000..3487a40
--- /dev/null
+++ b/subPackages/transferPage/transferPage.wxss
@@ -0,0 +1 @@
+/* subPackages/transferPage/transferPage.wxss */
\ No newline at end of file

From d909b863c25a61ac949b3ffea27c5cd80bc173ec Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 10 Feb 2025 09:28:58 +0800
Subject: [PATCH 273/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=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/component/newCalendar/index.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index edf5273..419407e 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.isTest163? true : false;
+      data.isTest = data.isTest164? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js
index 85d72d9..0e5322e 100644
--- a/pages/component/newCalendar/index.js
+++ b/pages/component/newCalendar/index.js
@@ -57,7 +57,8 @@ Component({
          /** 视图收起/展开 */
     toggleMode() {
         const { year, month} = this.data
-      if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year+1))) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year-1)))) {
+        let nowYear = parseInt(new Date().getFullYear())
+      if ((this.data.currentViewType === 'week' && year != nowYear)) {
         return
       }
       this.setData({
@@ -189,6 +190,7 @@ Component({
         },
         /** 切换月份 */
         changeMonthFun(e){
+            let nowYear = parseInt(new Date().getFullYear())
           if (this.data.currentViewType === "month") {
             let {
               year,
@@ -203,7 +205,7 @@ Component({
                 year = (parseInt(month) + 1) > 12 ? year + 1 : year
                 month = (parseInt(month) + 1) > 12 ? 1 : parseInt(month) + 1
             }
-            if (year != this.data.year) {
+            if (year != nowYear) {
               return
             }
             this.setData({
@@ -220,7 +222,7 @@ Component({
               nowDay
             } = this.data
             let type = e.currentTarget.dataset.type //类型
-            if ((type == 'next' && this.data.weekDay[0].year === (year+1)) || (type == 'prev' && this.data.weekDay[0].year === (year-1))) {
+            if ((type == 'next' && this.data.weekDay[6].year === (nowYear+1)) || (type == 'prev' && this.data.weekDay[0].year === (nowYear-1))) {
                 return
             }  
             // if (type == 'next' && this.data.weekDay[0].year === 2025) {

From b74ce363c7d882aac335da92e363a1889228b492 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 10 Feb 2025 16:37:37 +0800
Subject: [PATCH 274/471] =?UTF-8?q?=E4=B8=AD=E8=BD=AC=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/transferPage/transferPage.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/subPackages/transferPage/transferPage.js b/subPackages/transferPage/transferPage.js
index e1322c0..5a5ee19 100644
--- a/subPackages/transferPage/transferPage.js
+++ b/subPackages/transferPage/transferPage.js
@@ -5,13 +5,16 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    back: false
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    this.setData({
+        back: false
+    })
     if (options.action = 'otherMiniProgram') {
         this.goOtherMiniProgrogram(options)
     } else {
@@ -27,7 +30,12 @@ Page({
         appId: data.appId,
         path: data.path,
         shortLink: data.shortLink,
-        complete: () =>{
+        success: () =>{
+            this.setData({
+                back: true
+            })
+        },
+        fail: ()=>{
             wx.navigateBack()
         }
     })
@@ -44,7 +52,15 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    if (this.data.back) {
+        wx.showModal({
+          title: '即将返回君到苏州小程序',
+          showCancel: false,
+          complete: (res) => {
+            wx.navigateBack()
+          }
+        })
+    }
   },
 
   /**
@@ -58,7 +74,6 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload() {
-
   },
 
   /**

From b7d5d1cb90f8a263a4bc8c8def2c1cda00ffbff6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 11 Feb 2025 17:54:40 +0800
Subject: [PATCH 275/471] 1

---
 app.js                                      |   2 +-
 app.json                                    |   5 +-
 pages/order/pay/index.js                    |  59 +++++
 pages/order/pay/index.wxml                  |  47 ++++
 pages/order/pay/index.wxss                  | 100 +++++++-
 pages/user/profile/index.wxml               |   5 +
 project.private.config.json                 |   2 +-
 subPackages/password/overview/overview.js   |  81 +++++++
 subPackages/password/overview/overview.json |   5 +
 subPackages/password/overview/overview.wxml |  19 ++
 subPackages/password/overview/overview.wxss |  29 +++
 subPackages/password/setting/setting.js     | 238 ++++++++++++++++++++
 subPackages/password/setting/setting.json   |   5 +
 subPackages/password/setting/setting.wxml   |  50 ++++
 subPackages/password/setting/setting.wxss   |  91 ++++++++
 15 files changed, 734 insertions(+), 4 deletions(-)
 create mode 100644 subPackages/password/overview/overview.js
 create mode 100644 subPackages/password/overview/overview.json
 create mode 100644 subPackages/password/overview/overview.wxml
 create mode 100644 subPackages/password/overview/overview.wxss
 create mode 100644 subPackages/password/setting/setting.js
 create mode 100644 subPackages/password/setting/setting.json
 create mode 100644 subPackages/password/setting/setting.wxml
 create mode 100644 subPackages/password/setting/setting.wxss

diff --git a/app.js b/app.js
index 419407e..edf5273 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.isTest164? true : false;
+      data.isTest = data.isTest163? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 0bbbcb6..f70c7e1 100644
--- a/app.json
+++ b/app.json
@@ -188,6 +188,7 @@
     "pages/order/showOrderNew/index",
     "pages/user/order/showOrderInfo/index",
     "pages/user/suggest/suggest"
+    
   ],
   "subpackages": [
     {
@@ -201,7 +202,9 @@
         "postSearch/index",
         "gwcOrder/index",
         "indexGQ/index",
-        "transferPage/transferPage"
+        "transferPage/transferPage",
+        "password/overview/overview",
+        "password/setting/setting"
       ]
     }
   ],
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index cf67b05..1208742 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -27,6 +27,23 @@ Page({
     showTipMaskSecond: 3,
 
     MTTip: 0,
+
+    SBMask: true, // 数币支付密码弹窗
+    isFoucs: true,
+    vcode: '',
+    haveSBPassword: false,
+    inputData: {
+        phone: '',
+        code: '',
+        password: '',
+        confirmPassword: '',
+    },
+    canSubmit: false,
+    code:"",
+    buttonText:"获取验证码",
+    sendFlag:true,
+    regToken:null,
+    codeId:null,
   },
 
   /**
@@ -319,6 +336,48 @@ Page({
     }
   },
 
+  // 数币密码确认
+  hideSBMask(){
+    this.setData({SBMask:false})
+  },
+  passwordChange: function (e) {
+    let val =  e.detail.value
+    this.setData({
+        vcode: val
+    })
+    if (val.length==6) {
+        // 验证密码
+        
+    }
+  },
+  handleFoucs() {
+    this.setData({
+      isFoucs: true
+    })
+  },
+  inputChange:function(e){
+    let inputData = this.data.inputData
+    let keyname =e.currentTarget.dataset.keyname;
+    inputData[keyname] = e.detail.value
+    this.setData({
+      inputData: inputData
+    })
+
+    let canSubmit = false
+    if (inputData.phone && inputData.code && inputData.password && inputData.confirmPassword) {
+        canSubmit = true
+    }
+    this.setData({canSubmit: canSubmit})
+},
+  // 获取验证码
+  getCode:function(){
+    
+  },
+  // 绑定
+  submit:function(){
+
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 93508e9..137872d 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -113,5 +113,52 @@
 
     </view>
       
+  </view>
+</view>
+
+
+<view class="mask" style="align-items:flex-end" wx:if="{{SBMask}}">
+  <view class="mask-bg" bindtap="hideSBMask"></view>
+  <view class="mask-content" style="text-align:center;width:100%;border-radius:0;min-height: 448rpx;padding: 46rpx 26rpx;">
+    <view class="password-title">
+      <view>{{haveSBPassword?'输入':'设置'}}支付密码</view>
+      <view class="iconfont icon-close" style="position: absolute;right: 0;top: 4rpx;" bindtap="hideSBMask"></view>
+    </view>
+
+    <view wx:if="{{haveSBPassword}}">
+        <view class="passward-box-container">
+            <input type="number" password="true" class="show-code" wx:for="{{6}}" disabled 
+            wx:key="index" value="{{vcode[index]}}" catch:tap="handleFoucs"/>
+        </view>
+        <input type="number" password="true" maxlength="6" focus="{{isFoucs}}" bindinput="passwordChange"  class="passward-box" />
+        <view class="resetPassword">
+            <navigator url="/subPackages/password/setting/setting?type=reset">忘记密码</navigator>
+        </view>
+    </view>
+
+    <view wx:else>
+        <view class="bind-box">
+            <view class="bind-item" >
+            <view class="bind-item-left">手机号</view>
+            <input type="number" bindinput="inputChange" data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
+            </view>
+            <view class="bind-item" >
+            <view class="bind-item-left">验证码</view>
+            <input type="number" bindinput="inputChange" data-keyname="code" class="weui-input" placeholder="请输入验证码" />
+            <button class="vaild-number" type="primary" size="mini" bindtap="getCode">{{buttonText}}</button>
+            </view>
+
+            <view class="bind-item" >
+                <view class="bind-item-left">设置支付密码</view>
+                <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="password" class="weui-input" placeholder="请设置您的支付密码" />
+            </view>
+            <view class="bind-item">
+            <view class="bind-item-left">再次填写密码</view>
+            <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="confirmPassword"  class="weui-input" placeholder="再次填写您的支付密码" />
+            </view>
+        </view>
+        <view class="btn {{canSubmit?'':'disabled'}}" bindtap="submit">确 定</view>
+    </view>
+    
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index a1a4206..eb667c1 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -91,4 +91,102 @@ page {
     height: 22rpx;
     bottom: -12rpx;
     left: 0;
-}
\ No newline at end of file
+}
+
+.password-title{
+    text-align: center;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #000000;
+    position: relative;
+}
+
+.passward-box-container{
+    width: 697rpx;
+    height: 93rpx;
+    margin: 68rpx auto 0;
+    position: relative;
+    border-radius: 7rpx;
+    border: 1px solid #999999;
+    display: flex;
+    box-sizing: border-box;
+    padding: 16rpx 0;
+}
+.show-code{
+    flex: 1;
+    height: 100%;
+    border-right: 1px solid #999999;
+    text-align: center;
+    font-size: 20rpx;
+}
+.show-code:last-of-type {
+    border: none;
+}
+.passward-box{
+    width: 0;
+    height: 0;
+    border: none;
+    opacity: 0;
+    color: rgba(0,0,0,0);
+}
+.resetPassword{
+    width: 106rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #0C898F;
+    margin: 0 0 0 auto;
+}
+
+
+  .bind-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 120rpx;
+    line-height: 120rpx;
+    font-size: 28rpx;
+    border-bottom: 1rpx solid #EEE;
+    text-align: left;
+  }
+  .bind-item .weui-input {
+    flex: 1;
+  }
+  .bind-item-left {
+    width: 249rpx;
+    
+  }
+  .bind-item image {
+    width: 200rpx;
+    height: 60rpx;
+  }
+  .btn {
+    margin:0rpx auto;
+    margin-top: 74rpx;
+    width: 697rpx;
+    height: 73rpx;
+    background: #D62829;
+    border-radius: 37rpx;
+    line-height: 73rpx;
+    font-weight: bold;
+    font-size: 35rpx;
+    color: #FFFFFF;
+    text-align: center;
+  }
+  .btn.disabled{
+    background: #CCCCCC;
+  }
+
+    .vaild-number{
+        width: 197rpx !important;
+        height: 53rpx !important;
+        font-size: 27rpx !important;
+        color: #0C898F !important;
+        background: none !important;
+        line-height: 53rpx !important;
+        padding: 0 !important;
+        text-align: center;
+        border: 1px solid #0C898F;
+        border-radius: 27rpx;
+        font-weight: 500 !important;
+    }
\ No newline at end of file
diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml
index 033373a..3af30d5 100644
--- a/pages/user/profile/index.wxml
+++ b/pages/user/profile/index.wxml
@@ -48,6 +48,11 @@
   </view>
   <view class="iconfont icon-you"></view>
 </view>
+<navigator url="/subPackages/password/overview/overview" class="profile-item">
+  <text>支付密码</text>
+  <view class="info"></view>
+  <view class="iconfont icon-you"></view>
+</navigator>
 <navigator url="../logout/index" class="profile-item">
   <text>注销账号</text>
   <view class="info">注销后账号无法恢复，请谨慎操作</view>
diff --git a/project.private.config.json b/project.private.config.json
index 6f2c82b..5001ef7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -112,5 +112,5 @@
   },
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "libVersion": "2.30.0"
+  "libVersion": "development"
 }
\ No newline at end of file
diff --git a/subPackages/password/overview/overview.js b/subPackages/password/overview/overview.js
new file mode 100644
index 0000000..af40f95
--- /dev/null
+++ b/subPackages/password/overview/overview.js
@@ -0,0 +1,81 @@
+// pages/user/profile/index.js
+let app = getApp();
+import util from "../../../utils/util"
+import WeCropper from '../../../we-cropper/we-cropper.min.js';
+import userApi from "../../../utils/https/user"
+let device = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
+const width = device.windowWidth // 示例为一个与屏幕等宽的正方形裁剪框
+let menuHeight = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+let height = device.windowHeight - menuHeight;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+    info:null,
+   
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    
+  },
+
+  goSetting (e) {
+      let type = e.currentTarget.dataset.type;
+      wx.navigateTo({
+        url: '/subPackages/password/setting/setting?type='+type,
+      })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    // userApi.user_post("user/getMyInfo",{}).then(res=>{
+    //   this.setData({
+    //     info:res.data,
+    //   })
+    // })
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/password/overview/overview.json b/subPackages/password/overview/overview.json
new file mode 100644
index 0000000..edc5913
--- /dev/null
+++ b/subPackages/password/overview/overview.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+      "title":"/pages/component/TitleHeader"
+    }
+  }
\ No newline at end of file
diff --git a/subPackages/password/overview/overview.wxml b/subPackages/password/overview/overview.wxml
new file mode 100644
index 0000000..3e924cb
--- /dev/null
+++ b/subPackages/password/overview/overview.wxml
@@ -0,0 +1,19 @@
+<!--pages/user/profile/index.wxml-->
+
+<title title="支付密码"></title>
+
+<view bindtap="goSetting" data-type="add" class="profile-item" >
+  <text>设置支付密码</text>
+  <view class="info" wx:if="{{info&&info.password}}">已设置</view>
+  <view class="iconfont icon-you"></view>
+</view>
+<view bindtap="goSetting" data-type="edit" class="profile-item" >
+  <text>修改密码</text>
+  <view class="info"></view>
+  <view class="iconfont icon-you"></view>
+</view>
+<view bindtap="goSetting" data-type="reset" class="profile-item">
+  <text>忘记密码</text>
+  <view class="info"></view>
+  <view class="iconfont icon-you"></view>
+</view>
diff --git a/subPackages/password/overview/overview.wxss b/subPackages/password/overview/overview.wxss
new file mode 100644
index 0000000..99f6698
--- /dev/null
+++ b/subPackages/password/overview/overview.wxss
@@ -0,0 +1,29 @@
+/* pages/user/profile/index.wxss */
+.profile-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 30rpx;
+    color: #333;
+    height: 118rpx;
+    margin: 0 30rpx;
+    border-bottom: 1rpx solid #D8D8D8;
+  }
+  .profile-item text {
+    font-weight: 500;
+    flex-shrink: 0;
+  }
+  .profile-item .info {
+    flex: 1;
+    text-align: right;
+  }
+  .profile-item .iconfont {
+    flex-shrink: 0;
+  }
+  .profile-item .info image {
+    display: inline-block;
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+  }
+  
\ No newline at end of file
diff --git a/subPackages/password/setting/setting.js b/subPackages/password/setting/setting.js
new file mode 100644
index 0000000..4371f6b
--- /dev/null
+++ b/subPackages/password/setting/setting.js
@@ -0,0 +1,238 @@
+
+import util from "../../../utils/util.js"
+import user from "../../../utils/https/user.js"
+import https from "../../../utils/https.js"
+var app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+      type:'add',
+      title: '',
+      
+      editConfrim: false,
+      vcode: '',//验证码内容
+      isFoucs: true,
+
+      inputData: {
+        phone: '',
+        code: '',
+        password: '',
+        confirmPassword: '',
+      },
+      canSubmit: false,
+
+    code:"",
+    buttonText:"获取验证码",
+    sendFlag:true,
+    regToken:null,
+    codeId:null,
+
+
+    isApproval: false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+        type: options.type||'add',
+        title: options.type=='reset'?'忘记密码':options.type=='edit'?'修改密码':'设置支付密码',
+        editConfrim: options.type == 'edit'?true:false
+    })
+  },
+
+  // 编辑输入原密码
+  passwordChange: function (e) {
+    let val =  e.detail.value
+    this.setData({
+        vcode: val
+    })
+    if (val.length==6) {
+        // 验证密码
+        this.setData({editConfrim: false})
+    }
+  },
+  handleFoucs() {
+    this.setData({
+      isFoucs: true
+    })
+  },
+
+  // 输入框
+  inputChange:function(e){
+      let inputData = this.data.inputData
+      let keyname =e.currentTarget.dataset.keyname;
+      inputData[keyname] = e.detail.value
+      this.setData({
+        inputData: inputData
+      })
+
+      let canSubmit = false
+      if (this.data.type == 'edit' && inputData.password && inputData.confirmPassword) {
+          canSubmit = true
+      }
+      if (this.data.type != 'edit' && inputData.phone && inputData.code && inputData.password && inputData.confirmPassword) {
+          canSubmit = true
+      }
+      this.setData({canSubmit: canSubmit})
+
+  },
+
+  // 获取验证码
+  getCode:function(){
+    // 如果已经在发送则不能继续发送验证码
+    if (!this.data.sendFlag){
+      return false;
+    }
+    if(!this.data.inputData.phone){
+      wx.showToast({
+        title: '请输入手机号',
+        icon:"none"
+      })
+      return false;
+    }
+    if(!util.isTel(this.data.inputData.phone)){
+      wx.showToast({
+        title: '请输入正确的手机号码',
+        icon: "none"
+      })
+      return false;
+    }
+
+     // 获取验证码则需要改变按钮的文字
+     this.setData({
+      buttonText:"发送中...",
+      sendFlag:false
+    })
+    let service = "user/getMobileCodeForChange",data={
+      mobile:this.data.inputData.phone,
+    },api = user.user_post;
+    if(this.data.regToken){
+      service="user/getMobileCodeForBind";
+      data.openid = this.data.regToken
+      api = user._post
+    }
+    api(service, data).then(res=>{
+      console.log('sendmsg',res)
+      if(res.code==1){
+        // 发送成功 即接口调用成功
+        this.setData({
+          buttonText: "发送成功",
+          sendFlag: false,
+          codeId: res.data.id
+        })
+        // 获取成功之后需要马上改变成倒计时
+        let time = 59;
+        var timer = setInterval(() => {
+          // 倒计时结束需要重置可发送验证码状态和按钮文字
+          if (time < 0) {
+            // 清除定时器
+            clearInterval(timer)
+            this.setData({
+              buttonText: "重新发送",
+              sendFlag: true
+            })
+            return false;
+          }
+          this.setData({
+            buttonText: time + "秒后重新发送"
+          })
+          time--;
+        }, 1000)
+      }
+      else {
+        this.setData({
+          buttonText: "重新发送",
+          sendFlag: true
+        })
+      }
+      
+    })
+    
+  },
+  // 绑定
+  submit:function(){
+    if(!this.data.inputData.code){
+      wx.showToast({
+        title: '请输入验证码',
+        icon: "none"
+      })
+      return false;
+    }
+
+    let service = "user/changeMobile"
+    let data={smsCode:this.data.inputData.code,mobile:this.data.inputData.phone,smsCodeId:this.data.codeId}
+    let api = user.user_post;
+    if(this.data.regToken){
+      service = "user/wxBindPhoneAndLogin"
+      data.openid = this.data.regToken
+      data.fromSource = "WECHATXCX"
+      if(app.globalData.category_id){
+        data.category_id = app.globalData.category_id;
+      }
+      api = user._post
+    }
+    api(service,data).then(res=>{
+      if(res.code==1){
+        
+        setTimeout(()=>{
+          wx.navigateBack({
+            delta:1
+          })
+        },500)
+        // if(this.data.regToken){
+        //   https.set_logininfo(res);
+        // }
+ 
+      }
+    })
+  },
+
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+   
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/password/setting/setting.json b/subPackages/password/setting/setting.json
new file mode 100644
index 0000000..b4c6fd2
--- /dev/null
+++ b/subPackages/password/setting/setting.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+      "title-header": "/pages/component/TitleHeader"
+    }
+  }
\ No newline at end of file
diff --git a/subPackages/password/setting/setting.wxml b/subPackages/password/setting/setting.wxml
new file mode 100644
index 0000000..c7cca14
--- /dev/null
+++ b/subPackages/password/setting/setting.wxml
@@ -0,0 +1,50 @@
+<!--pages/user/bindtel/index.wxml-->
+<view>
+  <title-header title="{{title}}"></title-header>
+
+  <view wx:if="{{editConfrim}}">
+    <view class="edit-tip">输入支付密码</view>
+    <view class="passward-box-container">
+        <input type="number" password="true" class="show-code" wx:for="{{6}}" disabled 
+        wx:key="index" value="{{vcode[index]}}" catch:tap="handleFoucs"/>
+    </view>
+
+    <input type="number" password="true" maxlength="6" focus="{{isFoucs}}" bindinput="passwordChange"  class="passward-box" />
+
+  </view>
+
+  <view wx:else>
+    <view class="bind-box">
+        <view class="bind-item" wx:if="{{type!='edit'}}">
+        <view class="bind-item-left">手机号</view>
+        <input type="number" bindinput="inputChange" data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
+        </view>
+        <view class="bind-item" wx:if="{{type!='edit'}}">
+        <view class="bind-item-left">验证码</view>
+        <input type="number" bindinput="inputChange" data-keyname="code" class="weui-input" placeholder="请输入验证码" />
+        <button class="vaild-number" type="primary" size="mini" bindtap="getCode">{{buttonText}}</button>
+        </view>
+
+        <view class="bind-item" wx:if="{{type=='reset'}}">
+            <view class="bind-item-left">修改支付密码</view>
+            <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="password" class="weui-input" placeholder="请设置新的支付密码" />
+        </view>
+        <view class="bind-item" wx:if="{{type=='add'}}">
+            <view class="bind-item-left">设置支付密码</view>
+            <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="password" class="weui-input" placeholder="请设置您的支付密码" />
+        </view>
+        <view class="bind-item" wx:if="{{type=='edit'}}">
+            <view class="bind-item-left">输入新密码</view>
+            <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="password" class="weui-input" placeholder="请设置新的支付密码" />
+        </view>
+
+        <view class="bind-item">
+        <view class="bind-item-left">再次填写密码</view>
+        <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="confirmPassword"  class="weui-input" placeholder="再次填写您的支付密码" />
+        </view>
+    </view>
+    <view class="btn {{canSubmit?'':'disabled'}}" bindtap="submit">确 定</view>
+  </view>
+ 
+
+</view>
\ No newline at end of file
diff --git a/subPackages/password/setting/setting.wxss b/subPackages/password/setting/setting.wxss
new file mode 100644
index 0000000..0d011b6
--- /dev/null
+++ b/subPackages/password/setting/setting.wxss
@@ -0,0 +1,91 @@
+/* pages/user/bindtel/index.wxss */
+.bind-box {
+    background: white;
+  }
+  .bind-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 0 20rpx;
+    height: 120rpx;
+    line-height: 120rpx;
+    font-size: 28rpx;
+    border-bottom: 1rpx solid #EEE;
+  }
+  .bind-item .weui-input {
+    flex: 1;
+  }
+  .bind-item-left {
+    width: 249rpx;
+  }
+  .bind-item image {
+    width: 200rpx;
+    height: 60rpx;
+  }
+  .btn {
+    margin:0rpx auto;
+    margin-top: 74rpx;
+    width: 697rpx;
+    height: 73rpx;
+    background: #D62829;
+    border-radius: 37rpx;
+    line-height: 73rpx;
+    font-weight: bold;
+    font-size: 35rpx;
+    color: #FFFFFF;
+    text-align: center;
+  }
+  .btn.disabled{
+    background: #CCCCCC;
+  }
+
+    .vaild-number{
+        width: 197rpx !important;
+        height: 53rpx !important;
+        font-size: 27rpx !important;
+        color: #0C898F !important;
+        background: none !important;
+        line-height: 53rpx !important;
+        padding: 0 !important;
+        text-align: center;
+        border: 1px solid #0C898F;
+        border-radius: 27rpx;
+        font-weight: 500 !important;
+    }
+
+    .edit-tip{
+        padding: 66rpx 0;
+        text-align: center;
+        font-weight: bold;
+        font-size: 31rpx;
+        color: #000000;
+    }
+    .passward-box-container{
+        width: 697rpx;
+        height: 93rpx;
+        margin: 0 auto;
+        position: relative;
+        border-radius: 7rpx;
+        border: 1px solid #999999;
+        display: flex;
+        box-sizing: border-box;
+        padding: 16rpx 0;
+
+    }
+    .show-code{
+        flex: 1;
+        height: 100%;
+        border-right: 1px solid #999999;
+        text-align: center;
+        font-size: 20rpx;
+    }
+    .show-code:last-of-type {
+        border: none;
+    }
+    .passward-box{
+        width: 0;
+        height: 0;
+        border: none;
+        opacity: 0;
+        color: rgba(0,0,0,0);
+    }
\ No newline at end of file

From 2d0508e1c220936d8ed8c1faef97db09d28e0abc Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 13 Feb 2025 11:55:03 +0800
Subject: [PATCH 276/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram_npm/chinese-workday/index.js    |   4 +-
 miniprogram_npm/crypto-js/index.js          | 144 +++++++++---------
 miniprogram_npm/crypto-js/index.js.map      |   2 +-
 miniprogram_npm/dayjs/index.js              |   4 +-
 pages/order/pay/index.js                    | 154 +++++++++++++++++++-
 pages/order/pay/index.wxml                  |  13 +-
 pages/order/pay/index.wxss                  |   5 +-
 subPackages/password/overview/overview.js   |  30 ++--
 subPackages/password/overview/overview.wxml |   4 +-
 subPackages/password/setting/setting.js     | 140 +++++++++++-------
 subPackages/password/setting/setting.wxml   |   4 +-
 subPackages/password/setting/setting.wxss   |   2 +-
 utils/jsencrypt.min.js                      |   2 +
 utils/passwordEncode.js                     |  21 +++
 14 files changed, 367 insertions(+), 162 deletions(-)
 create mode 100644 utils/jsencrypt.min.js
 create mode 100644 utils/passwordEncode.js

diff --git a/miniprogram_npm/chinese-workday/index.js b/miniprogram_npm/chinese-workday/index.js
index e7632a3..8e75567 100644
--- a/miniprogram_npm/chinese-workday/index.js
+++ b/miniprogram_npm/chinese-workday/index.js
@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1734585676993, function(require, module, exports) {
+__DEFINE__(1739326742649, function(require, module, exports) {
 // from
 // - 2018 https://www.gov.cn/zhengce/content/2017-11/30/content_5243579.htm
 // - 2019 https://www.gov.cn/zhengce/content/2018-12/06/content_5346276.htm
@@ -320,7 +320,7 @@ function formatDate(day) {
 }
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1734585676993);
+return __REQUIRE__(1739326742649);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/crypto-js/index.js b/miniprogram_npm/crypto-js/index.js
index cfc53de..4d77465 100644
--- a/miniprogram_npm/crypto-js/index.js
+++ b/miniprogram_npm/crypto-js/index.js
@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1734585676994, function(require, module, exports) {
+__DEFINE__(1739326742650, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -23,8 +23,8 @@ __DEFINE__(1734585676994, function(require, module, exports) {
 	return CryptoJS;
 
 }));
-}, function(modId) {var map = {"./core":1734585676995,"./x64-core":1734585676996,"./lib-typedarrays":1734585676997,"./enc-utf16":1734585676998,"./enc-base64":1734585676999,"./enc-base64url":1734585677000,"./md5":1734585677001,"./sha1":1734585677002,"./sha256":1734585677003,"./sha224":1734585677004,"./sha512":1734585677005,"./sha384":1734585677006,"./sha3":1734585677007,"./ripemd160":1734585677008,"./hmac":1734585677009,"./pbkdf2":1734585677010,"./evpkdf":1734585677011,"./cipher-core":1734585677012,"./mode-cfb":1734585677013,"./mode-ctr":1734585677014,"./mode-ctr-gladman":1734585677015,"./mode-ofb":1734585677016,"./mode-ecb":1734585677017,"./pad-ansix923":1734585677018,"./pad-iso10126":1734585677019,"./pad-iso97971":1734585677020,"./pad-zeropadding":1734585677021,"./pad-nopadding":1734585677022,"./format-hex":1734585677023,"./aes":1734585677024,"./tripledes":1734585677025,"./rc4":1734585677026,"./rabbit":1734585677027,"./rabbit-legacy":1734585677028,"./blowfish":1734585677029}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585676995, function(require, module, exports) {
+}, function(modId) {var map = {"./core":1739326742651,"./x64-core":1739326742652,"./lib-typedarrays":1739326742653,"./enc-utf16":1739326742654,"./enc-base64":1739326742655,"./enc-base64url":1739326742656,"./md5":1739326742657,"./sha1":1739326742658,"./sha256":1739326742659,"./sha224":1739326742660,"./sha512":1739326742661,"./sha384":1739326742662,"./sha3":1739326742663,"./ripemd160":1739326742664,"./hmac":1739326742665,"./pbkdf2":1739326742666,"./evpkdf":1739326742667,"./cipher-core":1739326742668,"./mode-cfb":1739326742669,"./mode-ctr":1739326742670,"./mode-ctr-gladman":1739326742671,"./mode-ofb":1739326742672,"./mode-ecb":1739326742673,"./pad-ansix923":1739326742674,"./pad-iso10126":1739326742675,"./pad-iso97971":1739326742676,"./pad-zeropadding":1739326742677,"./pad-nopadding":1739326742678,"./format-hex":1739326742679,"./aes":1739326742680,"./tripledes":1739326742681,"./rc4":1739326742682,"./rabbit":1739326742683,"./rabbit-legacy":1739326742684,"./blowfish":1739326742685}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742651, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -833,7 +833,7 @@ __DEFINE__(1734585676995, function(require, module, exports) {
 
 }));
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585676996, function(require, module, exports) {
+__DEFINE__(1739326742652, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1138,8 +1138,8 @@ __DEFINE__(1734585676996, function(require, module, exports) {
 	return CryptoJS;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585676997, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742653, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1216,8 +1216,8 @@ __DEFINE__(1734585676997, function(require, module, exports) {
 	return CryptoJS.lib.WordArray;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585676998, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742654, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1367,8 +1367,8 @@ __DEFINE__(1734585676998, function(require, module, exports) {
 	return CryptoJS.enc.Utf16;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585676999, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742655, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1505,8 +1505,8 @@ __DEFINE__(1734585676999, function(require, module, exports) {
 	return CryptoJS.enc.Base64;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677000, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742656, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1655,8 +1655,8 @@ __DEFINE__(1734585677000, function(require, module, exports) {
 	return CryptoJS.enc.Base64url;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677001, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742657, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1925,8 +1925,8 @@ __DEFINE__(1734585677001, function(require, module, exports) {
 	return CryptoJS.MD5;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677002, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742658, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2077,8 +2077,8 @@ __DEFINE__(1734585677002, function(require, module, exports) {
 	return CryptoJS.SHA1;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677003, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742659, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2278,8 +2278,8 @@ __DEFINE__(1734585677003, function(require, module, exports) {
 	return CryptoJS.SHA256;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677004, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742660, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2360,8 +2360,8 @@ __DEFINE__(1734585677004, function(require, module, exports) {
 	return CryptoJS.SHA224;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./sha256":1734585677003}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677005, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./sha256":1739326742659}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742661, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2688,8 +2688,8 @@ __DEFINE__(1734585677005, function(require, module, exports) {
 	return CryptoJS.SHA512;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./x64-core":1734585676996}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677006, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./x64-core":1739326742652}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742662, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2773,8 +2773,8 @@ __DEFINE__(1734585677006, function(require, module, exports) {
 	return CryptoJS.SHA384;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./x64-core":1734585676996,"./sha512":1734585677005}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677007, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./x64-core":1739326742652,"./sha512":1739326742661}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742663, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3101,8 +3101,8 @@ __DEFINE__(1734585677007, function(require, module, exports) {
 	return CryptoJS.SHA3;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./x64-core":1734585676996}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677008, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./x64-core":1739326742652}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742664, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3370,8 +3370,8 @@ __DEFINE__(1734585677008, function(require, module, exports) {
 	return CryptoJS.RIPEMD160;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677009, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742665, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3515,8 +3515,8 @@ __DEFINE__(1734585677009, function(require, module, exports) {
 
 
 }));
-}, function(modId) { var map = {"./core":1734585676995}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677010, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742666, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3662,8 +3662,8 @@ __DEFINE__(1734585677010, function(require, module, exports) {
 	return CryptoJS.PBKDF2;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./sha256":1734585677003,"./hmac":1734585677009}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677011, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./sha256":1739326742659,"./hmac":1739326742665}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742667, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3798,8 +3798,8 @@ __DEFINE__(1734585677011, function(require, module, exports) {
 	return CryptoJS.EvpKDF;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./sha1":1734585677002,"./hmac":1734585677009}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677012, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./sha1":1739326742658,"./hmac":1739326742665}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742668, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4695,8 +4695,8 @@ __DEFINE__(1734585677012, function(require, module, exports) {
 
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./evpkdf":1734585677011}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677013, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./evpkdf":1739326742667}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742669, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4777,8 +4777,8 @@ __DEFINE__(1734585677013, function(require, module, exports) {
 	return CryptoJS.mode.CFB;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677014, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742670, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4837,8 +4837,8 @@ __DEFINE__(1734585677014, function(require, module, exports) {
 	return CryptoJS.mode.CTR;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677015, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742671, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4955,8 +4955,8 @@ __DEFINE__(1734585677015, function(require, module, exports) {
 	return CryptoJS.mode.CTRGladman;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677016, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742672, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5011,8 +5011,8 @@ __DEFINE__(1734585677016, function(require, module, exports) {
 	return CryptoJS.mode.OFB;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677017, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742673, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5053,8 +5053,8 @@ __DEFINE__(1734585677017, function(require, module, exports) {
 	return CryptoJS.mode.ECB;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677018, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742674, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5104,8 +5104,8 @@ __DEFINE__(1734585677018, function(require, module, exports) {
 	return CryptoJS.pad.Ansix923;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677019, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742675, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5150,8 +5150,8 @@ __DEFINE__(1734585677019, function(require, module, exports) {
 	return CryptoJS.pad.Iso10126;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677020, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742676, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5192,8 +5192,8 @@ __DEFINE__(1734585677020, function(require, module, exports) {
 	return CryptoJS.pad.Iso97971;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677021, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742677, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5241,8 +5241,8 @@ __DEFINE__(1734585677021, function(require, module, exports) {
 	return CryptoJS.pad.ZeroPadding;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677022, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742678, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5273,8 +5273,8 @@ __DEFINE__(1734585677022, function(require, module, exports) {
 	return CryptoJS.pad.NoPadding;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677023, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742679, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5341,8 +5341,8 @@ __DEFINE__(1734585677023, function(require, module, exports) {
 	return CryptoJS.format.Hex;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677024, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742680, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5577,8 +5577,8 @@ __DEFINE__(1734585677024, function(require, module, exports) {
 	return CryptoJS.AES;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677025, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./enc-base64":1739326742655,"./md5":1739326742657,"./evpkdf":1739326742667,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742681, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6358,8 +6358,8 @@ __DEFINE__(1734585677025, function(require, module, exports) {
 	return CryptoJS.TripleDES;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677026, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./enc-base64":1739326742655,"./md5":1739326742657,"./evpkdf":1739326742667,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742682, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6499,8 +6499,8 @@ __DEFINE__(1734585677026, function(require, module, exports) {
 	return CryptoJS.RC4;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677027, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./enc-base64":1739326742655,"./md5":1739326742657,"./evpkdf":1739326742667,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742683, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6693,8 +6693,8 @@ __DEFINE__(1734585677027, function(require, module, exports) {
 	return CryptoJS.Rabbit;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677028, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./enc-base64":1739326742655,"./md5":1739326742657,"./evpkdf":1739326742667,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742684, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6885,8 +6885,8 @@ __DEFINE__(1734585677028, function(require, module, exports) {
 	return CryptoJS.RabbitLegacy;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1734585677029, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1739326742651,"./enc-base64":1739326742655,"./md5":1739326742657,"./evpkdf":1739326742667,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1739326742685, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -7358,8 +7358,8 @@ __DEFINE__(1734585677029, function(require, module, exports) {
 	return CryptoJS.Blowfish;
 
 }));
-}, function(modId) { var map = {"./core":1734585676995,"./enc-base64":1734585676999,"./md5":1734585677001,"./evpkdf":1734585677011,"./cipher-core":1734585677012}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1734585676994);
+}, function(modId) { var map = {"./core":1739326742651,"./enc-base64":1739326742655,"./md5":1739326742657,"./evpkdf":1739326742667,"./cipher-core":1739326742668}; return __REQUIRE__(map[modId], modId); })
+return __REQUIRE__(1739326742650);
 })()
 //miniprogram-npm-outsideDeps=["crypto"]
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/miniprogram_npm/crypto-js/index.js.map b/miniprogram_npm/crypto-js/index.js.map
index c54bf84..1a16ff5 100644
--- a/miniprogram_npm/crypto-js/index.js.map
+++ b/miniprogram_npm/crypto-js/index.js.map
@@ -1 +1 @@
-{"version":3,"sources":["index.js","core.js","x64-core.js","lib-typedarrays.js","enc-utf16.js","enc-base64.js","enc-base64url.js","md5.js","sha1.js","sha256.js","sha224.js","sha512.js","sha384.js","sha3.js","ripemd160.js","hmac.js","pbkdf2.js","evpkdf.js","cipher-core.js","mode-cfb.js","mode-ctr.js","mode-ctr-gladman.js","mode-ofb.js","mode-ecb.js","pad-ansix923.js","pad-iso10126.js","pad-iso97971.js","pad-zeropadding.js","pad-nopadding.js","format-hex.js","aes.js","tripledes.js","rc4.js","rabbit.js","rabbit-legacy.js","blowfish.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;ACFA,ADGA;ACFA,ADGA;ACFA,ADGA;ACFA,ADGA,AENA;ADIA,ADGA,AENA;ADIA,ADGA,AENA;ADIA,ADGA,AGTA,ADGA;ADIA,ADGA,AGTA,ADGA;ADIA,ADGA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ACHA,AENA,ACHA,AENA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ACHA,AENA,AGTA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AGTA,AGTA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ApB4DA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":[";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"), require(\"./lib-typedarrays\"), require(\"./enc-utf16\"), require(\"./enc-base64\"), require(\"./enc-base64url\"), require(\"./md5\"), require(\"./sha1\"), require(\"./sha256\"), require(\"./sha224\"), require(\"./sha512\"), require(\"./sha384\"), require(\"./sha3\"), require(\"./ripemd160\"), require(\"./hmac\"), require(\"./pbkdf2\"), require(\"./evpkdf\"), require(\"./cipher-core\"), require(\"./mode-cfb\"), require(\"./mode-ctr\"), require(\"./mode-ctr-gladman\"), require(\"./mode-ofb\"), require(\"./mode-ecb\"), require(\"./pad-ansix923\"), require(\"./pad-iso10126\"), require(\"./pad-iso97971\"), require(\"./pad-zeropadding\"), require(\"./pad-nopadding\"), require(\"./format-hex\"), require(\"./aes\"), require(\"./tripledes\"), require(\"./rc4\"), require(\"./rabbit\"), require(\"./rabbit-legacy\"), require(\"./blowfish\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\", \"./lib-typedarrays\", \"./enc-utf16\", \"./enc-base64\", \"./enc-base64url\", \"./md5\", \"./sha1\", \"./sha256\", \"./sha224\", \"./sha512\", \"./sha384\", \"./sha3\", \"./ripemd160\", \"./hmac\", \"./pbkdf2\", \"./evpkdf\", \"./cipher-core\", \"./mode-cfb\", \"./mode-ctr\", \"./mode-ctr-gladman\", \"./mode-ofb\", \"./mode-ecb\", \"./pad-ansix923\", \"./pad-iso10126\", \"./pad-iso97971\", \"./pad-zeropadding\", \"./pad-nopadding\", \"./format-hex\", \"./aes\", \"./tripledes\", \"./rc4\", \"./rabbit\", \"./rabbit-legacy\", \"./blowfish\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\troot.CryptoJS = factory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\treturn CryptoJS;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory();\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\troot.CryptoJS = factory();\n\t}\n}(this, function () {\n\n\t/*globals window, global, require*/\n\n\t/**\n\t * CryptoJS core components.\n\t */\n\tvar CryptoJS = CryptoJS || (function (Math, undefined) {\n\n\t    var crypto;\n\n\t    // Native crypto from window (Browser)\n\t    if (typeof window !== 'undefined' && window.crypto) {\n\t        crypto = window.crypto;\n\t    }\n\n\t    // Native crypto in web worker (Browser)\n\t    if (typeof self !== 'undefined' && self.crypto) {\n\t        crypto = self.crypto;\n\t    }\n\n\t    // Native crypto from worker\n\t    if (typeof globalThis !== 'undefined' && globalThis.crypto) {\n\t        crypto = globalThis.crypto;\n\t    }\n\n\t    // Native (experimental IE 11) crypto from window (Browser)\n\t    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {\n\t        crypto = window.msCrypto;\n\t    }\n\n\t    // Native crypto from global (NodeJS)\n\t    if (!crypto && typeof global !== 'undefined' && global.crypto) {\n\t        crypto = global.crypto;\n\t    }\n\n\t    // Native crypto import via require (NodeJS)\n\t    if (!crypto && typeof require === 'function') {\n\t        try {\n\t            crypto = require('crypto');\n\t        } catch (err) {}\n\t    }\n\n\t    /*\n\t     * Cryptographically secure pseudorandom number generator\n\t     *\n\t     * As Math.random() is cryptographically not safe to use\n\t     */\n\t    var cryptoSecureRandomInt = function () {\n\t        if (crypto) {\n\t            // Use getRandomValues method (Browser)\n\t            if (typeof crypto.getRandomValues === 'function') {\n\t                try {\n\t                    return crypto.getRandomValues(new Uint32Array(1))[0];\n\t                } catch (err) {}\n\t            }\n\n\t            // Use randomBytes method (NodeJS)\n\t            if (typeof crypto.randomBytes === 'function') {\n\t                try {\n\t                    return crypto.randomBytes(4).readInt32LE();\n\t                } catch (err) {}\n\t            }\n\t        }\n\n\t        throw new Error('Native crypto module could not be used to get secure random number.');\n\t    };\n\n\t    /*\n\t     * Local polyfill of Object.create\n\n\t     */\n\t    var create = Object.create || (function () {\n\t        function F() {}\n\n\t        return function (obj) {\n\t            var subtype;\n\n\t            F.prototype = obj;\n\n\t            subtype = new F();\n\n\t            F.prototype = null;\n\n\t            return subtype;\n\t        };\n\t    }());\n\n\t    /**\n\t     * CryptoJS namespace.\n\t     */\n\t    var C = {};\n\n\t    /**\n\t     * Library namespace.\n\t     */\n\t    var C_lib = C.lib = {};\n\n\t    /**\n\t     * Base object for prototypal inheritance.\n\t     */\n\t    var Base = C_lib.Base = (function () {\n\n\n\t        return {\n\t            /**\n\t             * Creates a new object that inherits from this object.\n\t             *\n\t             * @param {Object} overrides Properties to copy into the new object.\n\t             *\n\t             * @return {Object} The new object.\n\t             *\n\t             * @static\n\t             *\n\t             * @example\n\t             *\n\t             *     var MyType = CryptoJS.lib.Base.extend({\n\t             *         field: 'value',\n\t             *\n\t             *         method: function () {\n\t             *         }\n\t             *     });\n\t             */\n\t            extend: function (overrides) {\n\t                // Spawn\n\t                var subtype = create(this);\n\n\t                // Augment\n\t                if (overrides) {\n\t                    subtype.mixIn(overrides);\n\t                }\n\n\t                // Create default initializer\n\t                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {\n\t                    subtype.init = function () {\n\t                        subtype.$super.init.apply(this, arguments);\n\t                    };\n\t                }\n\n\t                // Initializer's prototype is the subtype object\n\t                subtype.init.prototype = subtype;\n\n\t                // Reference supertype\n\t                subtype.$super = this;\n\n\t                return subtype;\n\t            },\n\n\t            /**\n\t             * Extends this object and runs the init method.\n\t             * Arguments to create() will be passed to init().\n\t             *\n\t             * @return {Object} The new object.\n\t             *\n\t             * @static\n\t             *\n\t             * @example\n\t             *\n\t             *     var instance = MyType.create();\n\t             */\n\t            create: function () {\n\t                var instance = this.extend();\n\t                instance.init.apply(instance, arguments);\n\n\t                return instance;\n\t            },\n\n\t            /**\n\t             * Initializes a newly created object.\n\t             * Override this method to add some logic when your objects are created.\n\t             *\n\t             * @example\n\t             *\n\t             *     var MyType = CryptoJS.lib.Base.extend({\n\t             *         init: function () {\n\t             *             // ...\n\t             *         }\n\t             *     });\n\t             */\n\t            init: function () {\n\t            },\n\n\t            /**\n\t             * Copies properties into this object.\n\t             *\n\t             * @param {Object} properties The properties to mix in.\n\t             *\n\t             * @example\n\t             *\n\t             *     MyType.mixIn({\n\t             *         field: 'value'\n\t             *     });\n\t             */\n\t            mixIn: function (properties) {\n\t                for (var propertyName in properties) {\n\t                    if (properties.hasOwnProperty(propertyName)) {\n\t                        this[propertyName] = properties[propertyName];\n\t                    }\n\t                }\n\n\t                // IE won't copy toString using the loop above\n\t                if (properties.hasOwnProperty('toString')) {\n\t                    this.toString = properties.toString;\n\t                }\n\t            },\n\n\t            /**\n\t             * Creates a copy of this object.\n\t             *\n\t             * @return {Object} The clone.\n\t             *\n\t             * @example\n\t             *\n\t             *     var clone = instance.clone();\n\t             */\n\t            clone: function () {\n\t                return this.init.prototype.extend(this);\n\t            }\n\t        };\n\t    }());\n\n\t    /**\n\t     * An array of 32-bit words.\n\t     *\n\t     * @property {Array} words The array of 32-bit words.\n\t     * @property {number} sigBytes The number of significant bytes in this word array.\n\t     */\n\t    var WordArray = C_lib.WordArray = Base.extend({\n\t        /**\n\t         * Initializes a newly created word array.\n\t         *\n\t         * @param {Array} words (Optional) An array of 32-bit words.\n\t         * @param {number} sigBytes (Optional) The number of significant bytes in the words.\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.lib.WordArray.create();\n\t         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);\n\t         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);\n\t         */\n\t        init: function (words, sigBytes) {\n\t            words = this.words = words || [];\n\n\t            if (sigBytes != undefined) {\n\t                this.sigBytes = sigBytes;\n\t            } else {\n\t                this.sigBytes = words.length * 4;\n\t            }\n\t        },\n\n\t        /**\n\t         * Converts this word array to a string.\n\t         *\n\t         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex\n\t         *\n\t         * @return {string} The stringified word array.\n\t         *\n\t         * @example\n\t         *\n\t         *     var string = wordArray + '';\n\t         *     var string = wordArray.toString();\n\t         *     var string = wordArray.toString(CryptoJS.enc.Utf8);\n\t         */\n\t        toString: function (encoder) {\n\t            return (encoder || Hex).stringify(this);\n\t        },\n\n\t        /**\n\t         * Concatenates a word array to this word array.\n\t         *\n\t         * @param {WordArray} wordArray The word array to append.\n\t         *\n\t         * @return {WordArray} This word array.\n\t         *\n\t         * @example\n\t         *\n\t         *     wordArray1.concat(wordArray2);\n\t         */\n\t        concat: function (wordArray) {\n\t            // Shortcuts\n\t            var thisWords = this.words;\n\t            var thatWords = wordArray.words;\n\t            var thisSigBytes = this.sigBytes;\n\t            var thatSigBytes = wordArray.sigBytes;\n\n\t            // Clamp excess bits\n\t            this.clamp();\n\n\t            // Concat\n\t            if (thisSigBytes % 4) {\n\t                // Copy one byte at a time\n\t                for (var i = 0; i < thatSigBytes; i++) {\n\t                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\n\t                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);\n\t                }\n\t            } else {\n\t                // Copy one word at a time\n\t                for (var j = 0; j < thatSigBytes; j += 4) {\n\t                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];\n\t                }\n\t            }\n\t            this.sigBytes += thatSigBytes;\n\n\t            // Chainable\n\t            return this;\n\t        },\n\n\t        /**\n\t         * Removes insignificant bits.\n\t         *\n\t         * @example\n\t         *\n\t         *     wordArray.clamp();\n\t         */\n\t        clamp: function () {\n\t            // Shortcuts\n\t            var words = this.words;\n\t            var sigBytes = this.sigBytes;\n\n\t            // Clamp\n\t            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);\n\t            words.length = Math.ceil(sigBytes / 4);\n\t        },\n\n\t        /**\n\t         * Creates a copy of this word array.\n\t         *\n\t         * @return {WordArray} The clone.\n\t         *\n\t         * @example\n\t         *\n\t         *     var clone = wordArray.clone();\n\t         */\n\t        clone: function () {\n\t            var clone = Base.clone.call(this);\n\t            clone.words = this.words.slice(0);\n\n\t            return clone;\n\t        },\n\n\t        /**\n\t         * Creates a word array filled with random bytes.\n\t         *\n\t         * @param {number} nBytes The number of random bytes to generate.\n\t         *\n\t         * @return {WordArray} The random word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.lib.WordArray.random(16);\n\t         */\n\t        random: function (nBytes) {\n\t            var words = [];\n\n\t            for (var i = 0; i < nBytes; i += 4) {\n\t                words.push(cryptoSecureRandomInt());\n\t            }\n\n\t            return new WordArray.init(words, nBytes);\n\t        }\n\t    });\n\n\t    /**\n\t     * Encoder namespace.\n\t     */\n\t    var C_enc = C.enc = {};\n\n\t    /**\n\t     * Hex encoding strategy.\n\t     */\n\t    var Hex = C_enc.Hex = {\n\t        /**\n\t         * Converts a word array to a hex string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The hex string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var hexChars = [];\n\t            for (var i = 0; i < sigBytes; i++) {\n\t                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\n\t                hexChars.push((bite >>> 4).toString(16));\n\t                hexChars.push((bite & 0x0f).toString(16));\n\t            }\n\n\t            return hexChars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a hex string to a word array.\n\t         *\n\t         * @param {string} hexStr The hex string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);\n\t         */\n\t        parse: function (hexStr) {\n\t            // Shortcut\n\t            var hexStrLength = hexStr.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < hexStrLength; i += 2) {\n\t                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);\n\t            }\n\n\t            return new WordArray.init(words, hexStrLength / 2);\n\t        }\n\t    };\n\n\t    /**\n\t     * Latin1 encoding strategy.\n\t     */\n\t    var Latin1 = C_enc.Latin1 = {\n\t        /**\n\t         * Converts a word array to a Latin1 string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The Latin1 string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var latin1Chars = [];\n\t            for (var i = 0; i < sigBytes; i++) {\n\t                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\n\t                latin1Chars.push(String.fromCharCode(bite));\n\t            }\n\n\t            return latin1Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a Latin1 string to a word array.\n\t         *\n\t         * @param {string} latin1Str The Latin1 string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);\n\t         */\n\t        parse: function (latin1Str) {\n\t            // Shortcut\n\t            var latin1StrLength = latin1Str.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < latin1StrLength; i++) {\n\t                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);\n\t            }\n\n\t            return new WordArray.init(words, latin1StrLength);\n\t        }\n\t    };\n\n\t    /**\n\t     * UTF-8 encoding strategy.\n\t     */\n\t    var Utf8 = C_enc.Utf8 = {\n\t        /**\n\t         * Converts a word array to a UTF-8 string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The UTF-8 string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            try {\n\t                return decodeURIComponent(escape(Latin1.stringify(wordArray)));\n\t            } catch (e) {\n\t                throw new Error('Malformed UTF-8 data');\n\t            }\n\t        },\n\n\t        /**\n\t         * Converts a UTF-8 string to a word array.\n\t         *\n\t         * @param {string} utf8Str The UTF-8 string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);\n\t         */\n\t        parse: function (utf8Str) {\n\t            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));\n\t        }\n\t    };\n\n\t    /**\n\t     * Abstract buffered block algorithm template.\n\t     *\n\t     * The property blockSize must be implemented in a concrete subtype.\n\t     *\n\t     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0\n\t     */\n\t    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({\n\t        /**\n\t         * Resets this block algorithm's data buffer to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     bufferedBlockAlgorithm.reset();\n\t         */\n\t        reset: function () {\n\t            // Initial values\n\t            this._data = new WordArray.init();\n\t            this._nDataBytes = 0;\n\t        },\n\n\t        /**\n\t         * Adds new data to this block algorithm's buffer.\n\t         *\n\t         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.\n\t         *\n\t         * @example\n\t         *\n\t         *     bufferedBlockAlgorithm._append('data');\n\t         *     bufferedBlockAlgorithm._append(wordArray);\n\t         */\n\t        _append: function (data) {\n\t            // Convert string to WordArray, else assume WordArray already\n\t            if (typeof data == 'string') {\n\t                data = Utf8.parse(data);\n\t            }\n\n\t            // Append\n\t            this._data.concat(data);\n\t            this._nDataBytes += data.sigBytes;\n\t        },\n\n\t        /**\n\t         * Processes available data blocks.\n\t         *\n\t         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.\n\t         *\n\t         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.\n\t         *\n\t         * @return {WordArray} The processed data.\n\t         *\n\t         * @example\n\t         *\n\t         *     var processedData = bufferedBlockAlgorithm._process();\n\t         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');\n\t         */\n\t        _process: function (doFlush) {\n\t            var processedWords;\n\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\t            var dataSigBytes = data.sigBytes;\n\t            var blockSize = this.blockSize;\n\t            var blockSizeBytes = blockSize * 4;\n\n\t            // Count blocks ready\n\t            var nBlocksReady = dataSigBytes / blockSizeBytes;\n\t            if (doFlush) {\n\t                // Round up to include partial blocks\n\t                nBlocksReady = Math.ceil(nBlocksReady);\n\t            } else {\n\t                // Round down to include only full blocks,\n\t                // less the number of blocks that must remain in the buffer\n\t                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);\n\t            }\n\n\t            // Count words ready\n\t            var nWordsReady = nBlocksReady * blockSize;\n\n\t            // Count bytes ready\n\t            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);\n\n\t            // Process blocks\n\t            if (nWordsReady) {\n\t                for (var offset = 0; offset < nWordsReady; offset += blockSize) {\n\t                    // Perform concrete-algorithm logic\n\t                    this._doProcessBlock(dataWords, offset);\n\t                }\n\n\t                // Remove processed words\n\t                processedWords = dataWords.splice(0, nWordsReady);\n\t                data.sigBytes -= nBytesReady;\n\t            }\n\n\t            // Return processed words\n\t            return new WordArray.init(processedWords, nBytesReady);\n\t        },\n\n\t        /**\n\t         * Creates a copy of this object.\n\t         *\n\t         * @return {Object} The clone.\n\t         *\n\t         * @example\n\t         *\n\t         *     var clone = bufferedBlockAlgorithm.clone();\n\t         */\n\t        clone: function () {\n\t            var clone = Base.clone.call(this);\n\t            clone._data = this._data.clone();\n\n\t            return clone;\n\t        },\n\n\t        _minBufferSize: 0\n\t    });\n\n\t    /**\n\t     * Abstract hasher template.\n\t     *\n\t     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)\n\t     */\n\t    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({\n\t        /**\n\t         * Configuration options.\n\t         */\n\t        cfg: Base.extend(),\n\n\t        /**\n\t         * Initializes a newly created hasher.\n\t         *\n\t         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hasher = CryptoJS.algo.SHA256.create();\n\t         */\n\t        init: function (cfg) {\n\t            // Apply config defaults\n\t            this.cfg = this.cfg.extend(cfg);\n\n\t            // Set initial values\n\t            this.reset();\n\t        },\n\n\t        /**\n\t         * Resets this hasher to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     hasher.reset();\n\t         */\n\t        reset: function () {\n\t            // Reset data buffer\n\t            BufferedBlockAlgorithm.reset.call(this);\n\n\t            // Perform concrete-hasher logic\n\t            this._doReset();\n\t        },\n\n\t        /**\n\t         * Updates this hasher with a message.\n\t         *\n\t         * @param {WordArray|string} messageUpdate The message to append.\n\t         *\n\t         * @return {Hasher} This hasher.\n\t         *\n\t         * @example\n\t         *\n\t         *     hasher.update('message');\n\t         *     hasher.update(wordArray);\n\t         */\n\t        update: function (messageUpdate) {\n\t            // Append\n\t            this._append(messageUpdate);\n\n\t            // Update the hash\n\t            this._process();\n\n\t            // Chainable\n\t            return this;\n\t        },\n\n\t        /**\n\t         * Finalizes the hash computation.\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\n\t         *\n\t         * @param {WordArray|string} messageUpdate (Optional) A final message update.\n\t         *\n\t         * @return {WordArray} The hash.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hash = hasher.finalize();\n\t         *     var hash = hasher.finalize('message');\n\t         *     var hash = hasher.finalize(wordArray);\n\t         */\n\t        finalize: function (messageUpdate) {\n\t            // Final message update\n\t            if (messageUpdate) {\n\t                this._append(messageUpdate);\n\t            }\n\n\t            // Perform concrete-hasher logic\n\t            var hash = this._doFinalize();\n\n\t            return hash;\n\t        },\n\n\t        blockSize: 512/32,\n\n\t        /**\n\t         * Creates a shortcut function to a hasher's object interface.\n\t         *\n\t         * @param {Hasher} hasher The hasher to create a helper for.\n\t         *\n\t         * @return {Function} The shortcut function.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);\n\t         */\n\t        _createHelper: function (hasher) {\n\t            return function (message, cfg) {\n\t                return new hasher.init(cfg).finalize(message);\n\t            };\n\t        },\n\n\t        /**\n\t         * Creates a shortcut function to the HMAC's object interface.\n\t         *\n\t         * @param {Hasher} hasher The hasher to use in this HMAC helper.\n\t         *\n\t         * @return {Function} The shortcut function.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);\n\t         */\n\t        _createHmacHelper: function (hasher) {\n\t            return function (message, key) {\n\t                return new C_algo.HMAC.init(hasher, key).finalize(message);\n\t            };\n\t        }\n\t    });\n\n\t    /**\n\t     * Algorithm namespace.\n\t     */\n\t    var C_algo = C.algo = {};\n\n\t    return C;\n\t}(Math));\n\n\n\treturn CryptoJS;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (undefined) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var X32WordArray = C_lib.WordArray;\n\n\t    /**\n\t     * x64 namespace.\n\t     */\n\t    var C_x64 = C.x64 = {};\n\n\t    /**\n\t     * A 64-bit word.\n\t     */\n\t    var X64Word = C_x64.Word = Base.extend({\n\t        /**\n\t         * Initializes a newly created 64-bit word.\n\t         *\n\t         * @param {number} high The high 32 bits.\n\t         * @param {number} low The low 32 bits.\n\t         *\n\t         * @example\n\t         *\n\t         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);\n\t         */\n\t        init: function (high, low) {\n\t            this.high = high;\n\t            this.low = low;\n\t        }\n\n\t        /**\n\t         * Bitwise NOTs this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after negating.\n\t         *\n\t         * @example\n\t         *\n\t         *     var negated = x64Word.not();\n\t         */\n\t        // not: function () {\n\t            // var high = ~this.high;\n\t            // var low = ~this.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Bitwise ANDs this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to AND with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after ANDing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var anded = x64Word.and(anotherX64Word);\n\t         */\n\t        // and: function (word) {\n\t            // var high = this.high & word.high;\n\t            // var low = this.low & word.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Bitwise ORs this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to OR with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after ORing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var ored = x64Word.or(anotherX64Word);\n\t         */\n\t        // or: function (word) {\n\t            // var high = this.high | word.high;\n\t            // var low = this.low | word.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Bitwise XORs this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to XOR with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after XORing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var xored = x64Word.xor(anotherX64Word);\n\t         */\n\t        // xor: function (word) {\n\t            // var high = this.high ^ word.high;\n\t            // var low = this.low ^ word.low;\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Shifts this word n bits to the left.\n\t         *\n\t         * @param {number} n The number of bits to shift.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after shifting.\n\t         *\n\t         * @example\n\t         *\n\t         *     var shifted = x64Word.shiftL(25);\n\t         */\n\t        // shiftL: function (n) {\n\t            // if (n < 32) {\n\t                // var high = (this.high << n) | (this.low >>> (32 - n));\n\t                // var low = this.low << n;\n\t            // } else {\n\t                // var high = this.low << (n - 32);\n\t                // var low = 0;\n\t            // }\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Shifts this word n bits to the right.\n\t         *\n\t         * @param {number} n The number of bits to shift.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after shifting.\n\t         *\n\t         * @example\n\t         *\n\t         *     var shifted = x64Word.shiftR(7);\n\t         */\n\t        // shiftR: function (n) {\n\t            // if (n < 32) {\n\t                // var low = (this.low >>> n) | (this.high << (32 - n));\n\t                // var high = this.high >>> n;\n\t            // } else {\n\t                // var low = this.high >>> (n - 32);\n\t                // var high = 0;\n\t            // }\n\n\t            // return X64Word.create(high, low);\n\t        // },\n\n\t        /**\n\t         * Rotates this word n bits to the left.\n\t         *\n\t         * @param {number} n The number of bits to rotate.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after rotating.\n\t         *\n\t         * @example\n\t         *\n\t         *     var rotated = x64Word.rotL(25);\n\t         */\n\t        // rotL: function (n) {\n\t            // return this.shiftL(n).or(this.shiftR(64 - n));\n\t        // },\n\n\t        /**\n\t         * Rotates this word n bits to the right.\n\t         *\n\t         * @param {number} n The number of bits to rotate.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after rotating.\n\t         *\n\t         * @example\n\t         *\n\t         *     var rotated = x64Word.rotR(7);\n\t         */\n\t        // rotR: function (n) {\n\t            // return this.shiftR(n).or(this.shiftL(64 - n));\n\t        // },\n\n\t        /**\n\t         * Adds this word with the passed word.\n\t         *\n\t         * @param {X64Word} word The x64-Word to add with this word.\n\t         *\n\t         * @return {X64Word} A new x64-Word object after adding.\n\t         *\n\t         * @example\n\t         *\n\t         *     var added = x64Word.add(anotherX64Word);\n\t         */\n\t        // add: function (word) {\n\t            // var low = (this.low + word.low) | 0;\n\t            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;\n\t            // var high = (this.high + word.high + carry) | 0;\n\n\t            // return X64Word.create(high, low);\n\t        // }\n\t    });\n\n\t    /**\n\t     * An array of 64-bit words.\n\t     *\n\t     * @property {Array} words The array of CryptoJS.x64.Word objects.\n\t     * @property {number} sigBytes The number of significant bytes in this word array.\n\t     */\n\t    var X64WordArray = C_x64.WordArray = Base.extend({\n\t        /**\n\t         * Initializes a newly created word array.\n\t         *\n\t         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.\n\t         * @param {number} sigBytes (Optional) The number of significant bytes in the words.\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.x64.WordArray.create();\n\t         *\n\t         *     var wordArray = CryptoJS.x64.WordArray.create([\n\t         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),\n\t         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)\n\t         *     ]);\n\t         *\n\t         *     var wordArray = CryptoJS.x64.WordArray.create([\n\t         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),\n\t         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)\n\t         *     ], 10);\n\t         */\n\t        init: function (words, sigBytes) {\n\t            words = this.words = words || [];\n\n\t            if (sigBytes != undefined) {\n\t                this.sigBytes = sigBytes;\n\t            } else {\n\t                this.sigBytes = words.length * 8;\n\t            }\n\t        },\n\n\t        /**\n\t         * Converts this 64-bit word array to a 32-bit word array.\n\t         *\n\t         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.\n\t         *\n\t         * @example\n\t         *\n\t         *     var x32WordArray = x64WordArray.toX32();\n\t         */\n\t        toX32: function () {\n\t            // Shortcuts\n\t            var x64Words = this.words;\n\t            var x64WordsLength = x64Words.length;\n\n\t            // Convert\n\t            var x32Words = [];\n\t            for (var i = 0; i < x64WordsLength; i++) {\n\t                var x64Word = x64Words[i];\n\t                x32Words.push(x64Word.high);\n\t                x32Words.push(x64Word.low);\n\t            }\n\n\t            return X32WordArray.create(x32Words, this.sigBytes);\n\t        },\n\n\t        /**\n\t         * Creates a copy of this word array.\n\t         *\n\t         * @return {X64WordArray} The clone.\n\t         *\n\t         * @example\n\t         *\n\t         *     var clone = x64WordArray.clone();\n\t         */\n\t        clone: function () {\n\t            var clone = Base.clone.call(this);\n\n\t            // Clone \"words\" array\n\t            var words = clone.words = this.words.slice(0);\n\n\t            // Clone each X64Word object\n\t            var wordsLength = words.length;\n\t            for (var i = 0; i < wordsLength; i++) {\n\t                words[i] = words[i].clone();\n\t            }\n\n\t            return clone;\n\t        }\n\t    });\n\t}());\n\n\n\treturn CryptoJS;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Check if typed arrays are supported\n\t    if (typeof ArrayBuffer != 'function') {\n\t        return;\n\t    }\n\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\n\t    // Reference original init\n\t    var superInit = WordArray.init;\n\n\t    // Augment WordArray.init to handle typed arrays\n\t    var subInit = WordArray.init = function (typedArray) {\n\t        // Convert buffers to uint8\n\t        if (typedArray instanceof ArrayBuffer) {\n\t            typedArray = new Uint8Array(typedArray);\n\t        }\n\n\t        // Convert other array views to uint8\n\t        if (\n\t            typedArray instanceof Int8Array ||\n\t            (typeof Uint8ClampedArray !== \"undefined\" && typedArray instanceof Uint8ClampedArray) ||\n\t            typedArray instanceof Int16Array ||\n\t            typedArray instanceof Uint16Array ||\n\t            typedArray instanceof Int32Array ||\n\t            typedArray instanceof Uint32Array ||\n\t            typedArray instanceof Float32Array ||\n\t            typedArray instanceof Float64Array\n\t        ) {\n\t            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);\n\t        }\n\n\t        // Handle Uint8Array\n\t        if (typedArray instanceof Uint8Array) {\n\t            // Shortcut\n\t            var typedArrayByteLength = typedArray.byteLength;\n\n\t            // Extract bytes\n\t            var words = [];\n\t            for (var i = 0; i < typedArrayByteLength; i++) {\n\t                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);\n\t            }\n\n\t            // Initialize this word array\n\t            superInit.call(this, words, typedArrayByteLength);\n\t        } else {\n\t            // Else call normal init\n\t            superInit.apply(this, arguments);\n\t        }\n\t    };\n\n\t    subInit.prototype = WordArray;\n\t}());\n\n\n\treturn CryptoJS.lib.WordArray;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_enc = C.enc;\n\n\t    /**\n\t     * UTF-16 BE encoding strategy.\n\t     */\n\t    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {\n\t        /**\n\t         * Converts a word array to a UTF-16 BE string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The UTF-16 BE string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var utf16Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 2) {\n\t                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;\n\t                utf16Chars.push(String.fromCharCode(codePoint));\n\t            }\n\n\t            return utf16Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a UTF-16 BE string to a word array.\n\t         *\n\t         * @param {string} utf16Str The UTF-16 BE string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);\n\t         */\n\t        parse: function (utf16Str) {\n\t            // Shortcut\n\t            var utf16StrLength = utf16Str.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < utf16StrLength; i++) {\n\t                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);\n\t            }\n\n\t            return WordArray.create(words, utf16StrLength * 2);\n\t        }\n\t    };\n\n\t    /**\n\t     * UTF-16 LE encoding strategy.\n\t     */\n\t    C_enc.Utf16LE = {\n\t        /**\n\t         * Converts a word array to a UTF-16 LE string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The UTF-16 LE string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\n\t            // Convert\n\t            var utf16Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 2) {\n\t                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);\n\t                utf16Chars.push(String.fromCharCode(codePoint));\n\t            }\n\n\t            return utf16Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a UTF-16 LE string to a word array.\n\t         *\n\t         * @param {string} utf16Str The UTF-16 LE string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);\n\t         */\n\t        parse: function (utf16Str) {\n\t            // Shortcut\n\t            var utf16StrLength = utf16Str.length;\n\n\t            // Convert\n\t            var words = [];\n\t            for (var i = 0; i < utf16StrLength; i++) {\n\t                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));\n\t            }\n\n\t            return WordArray.create(words, utf16StrLength * 2);\n\t        }\n\t    };\n\n\t    function swapEndian(word) {\n\t        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);\n\t    }\n\t}());\n\n\n\treturn CryptoJS.enc.Utf16;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_enc = C.enc;\n\n\t    /**\n\t     * Base64 encoding strategy.\n\t     */\n\t    var Base64 = C_enc.Base64 = {\n\t        /**\n\t         * Converts a word array to a Base64 string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @return {string} The Base64 string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray) {\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\t            var map = this._map;\n\n\t            // Clamp excess bits\n\t            wordArray.clamp();\n\n\t            // Convert\n\t            var base64Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 3) {\n\t                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;\n\t                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;\n\t                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;\n\n\t                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;\n\n\t                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {\n\t                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));\n\t                }\n\t            }\n\n\t            // Add padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                while (base64Chars.length % 4) {\n\t                    base64Chars.push(paddingChar);\n\t                }\n\t            }\n\n\t            return base64Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a Base64 string to a word array.\n\t         *\n\t         * @param {string} base64Str The Base64 string.\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);\n\t         */\n\t        parse: function (base64Str) {\n\t            // Shortcuts\n\t            var base64StrLength = base64Str.length;\n\t            var map = this._map;\n\t            var reverseMap = this._reverseMap;\n\n\t            if (!reverseMap) {\n\t                    reverseMap = this._reverseMap = [];\n\t                    for (var j = 0; j < map.length; j++) {\n\t                        reverseMap[map.charCodeAt(j)] = j;\n\t                    }\n\t            }\n\n\t            // Ignore padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                var paddingIndex = base64Str.indexOf(paddingChar);\n\t                if (paddingIndex !== -1) {\n\t                    base64StrLength = paddingIndex;\n\t                }\n\t            }\n\n\t            // Convert\n\t            return parseLoop(base64Str, base64StrLength, reverseMap);\n\n\t        },\n\n\t        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='\n\t    };\n\n\t    function parseLoop(base64Str, base64StrLength, reverseMap) {\n\t      var words = [];\n\t      var nBytes = 0;\n\t      for (var i = 0; i < base64StrLength; i++) {\n\t          if (i % 4) {\n\t              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);\n\t              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);\n\t              var bitsCombined = bits1 | bits2;\n\t              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);\n\t              nBytes++;\n\t          }\n\t      }\n\t      return WordArray.create(words, nBytes);\n\t    }\n\t}());\n\n\n\treturn CryptoJS.enc.Base64;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_enc = C.enc;\n\n\t    /**\n\t     * Base64url encoding strategy.\n\t     */\n\t    var Base64url = C_enc.Base64url = {\n\t        /**\n\t         * Converts a word array to a Base64url string.\n\t         *\n\t         * @param {WordArray} wordArray The word array.\n\t         *\n\t         * @param {boolean} urlSafe Whether to use url safe\n\t         *\n\t         * @return {string} The Base64url string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);\n\t         */\n\t        stringify: function (wordArray, urlSafe) {\n\t            if (urlSafe === undefined) {\n\t                urlSafe = true\n\t            }\n\t            // Shortcuts\n\t            var words = wordArray.words;\n\t            var sigBytes = wordArray.sigBytes;\n\t            var map = urlSafe ? this._safe_map : this._map;\n\n\t            // Clamp excess bits\n\t            wordArray.clamp();\n\n\t            // Convert\n\t            var base64Chars = [];\n\t            for (var i = 0; i < sigBytes; i += 3) {\n\t                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;\n\t                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;\n\t                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;\n\n\t                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;\n\n\t                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {\n\t                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));\n\t                }\n\t            }\n\n\t            // Add padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                while (base64Chars.length % 4) {\n\t                    base64Chars.push(paddingChar);\n\t                }\n\t            }\n\n\t            return base64Chars.join('');\n\t        },\n\n\t        /**\n\t         * Converts a Base64url string to a word array.\n\t         *\n\t         * @param {string} base64Str The Base64url string.\n\t         *\n\t         * @param {boolean} urlSafe Whether to use url safe\n\t         *\n\t         * @return {WordArray} The word array.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);\n\t         */\n\t        parse: function (base64Str, urlSafe) {\n\t            if (urlSafe === undefined) {\n\t                urlSafe = true\n\t            }\n\n\t            // Shortcuts\n\t            var base64StrLength = base64Str.length;\n\t            var map = urlSafe ? this._safe_map : this._map;\n\t            var reverseMap = this._reverseMap;\n\n\t            if (!reverseMap) {\n\t                reverseMap = this._reverseMap = [];\n\t                for (var j = 0; j < map.length; j++) {\n\t                    reverseMap[map.charCodeAt(j)] = j;\n\t                }\n\t            }\n\n\t            // Ignore padding\n\t            var paddingChar = map.charAt(64);\n\t            if (paddingChar) {\n\t                var paddingIndex = base64Str.indexOf(paddingChar);\n\t                if (paddingIndex !== -1) {\n\t                    base64StrLength = paddingIndex;\n\t                }\n\t            }\n\n\t            // Convert\n\t            return parseLoop(base64Str, base64StrLength, reverseMap);\n\n\t        },\n\n\t        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',\n\t        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',\n\t    };\n\n\t    function parseLoop(base64Str, base64StrLength, reverseMap) {\n\t        var words = [];\n\t        var nBytes = 0;\n\t        for (var i = 0; i < base64StrLength; i++) {\n\t            if (i % 4) {\n\t                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);\n\t                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);\n\t                var bitsCombined = bits1 | bits2;\n\t                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);\n\t                nBytes++;\n\t            }\n\t        }\n\t        return WordArray.create(words, nBytes);\n\t    }\n\t}());\n\n\n\treturn CryptoJS.enc.Base64url;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Constants table\n\t    var T = [];\n\n\t    // Compute constants\n\t    (function () {\n\t        for (var i = 0; i < 64; i++) {\n\t            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;\n\t        }\n\t    }());\n\n\t    /**\n\t     * MD5 hash algorithm.\n\t     */\n\t    var MD5 = C_algo.MD5 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init([\n\t                0x67452301, 0xefcdab89,\n\t                0x98badcfe, 0x10325476\n\t            ]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Swap endian\n\t            for (var i = 0; i < 16; i++) {\n\t                // Shortcuts\n\t                var offset_i = offset + i;\n\t                var M_offset_i = M[offset_i];\n\n\t                M[offset_i] = (\n\t                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |\n\t                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)\n\t                );\n\t            }\n\n\t            // Shortcuts\n\t            var H = this._hash.words;\n\n\t            var M_offset_0  = M[offset + 0];\n\t            var M_offset_1  = M[offset + 1];\n\t            var M_offset_2  = M[offset + 2];\n\t            var M_offset_3  = M[offset + 3];\n\t            var M_offset_4  = M[offset + 4];\n\t            var M_offset_5  = M[offset + 5];\n\t            var M_offset_6  = M[offset + 6];\n\t            var M_offset_7  = M[offset + 7];\n\t            var M_offset_8  = M[offset + 8];\n\t            var M_offset_9  = M[offset + 9];\n\t            var M_offset_10 = M[offset + 10];\n\t            var M_offset_11 = M[offset + 11];\n\t            var M_offset_12 = M[offset + 12];\n\t            var M_offset_13 = M[offset + 13];\n\t            var M_offset_14 = M[offset + 14];\n\t            var M_offset_15 = M[offset + 15];\n\n\t            // Working variables\n\t            var a = H[0];\n\t            var b = H[1];\n\t            var c = H[2];\n\t            var d = H[3];\n\n\t            // Computation\n\t            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);\n\t            d = FF(d, a, b, c, M_offset_1,  12, T[1]);\n\t            c = FF(c, d, a, b, M_offset_2,  17, T[2]);\n\t            b = FF(b, c, d, a, M_offset_3,  22, T[3]);\n\t            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);\n\t            d = FF(d, a, b, c, M_offset_5,  12, T[5]);\n\t            c = FF(c, d, a, b, M_offset_6,  17, T[6]);\n\t            b = FF(b, c, d, a, M_offset_7,  22, T[7]);\n\t            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);\n\t            d = FF(d, a, b, c, M_offset_9,  12, T[9]);\n\t            c = FF(c, d, a, b, M_offset_10, 17, T[10]);\n\t            b = FF(b, c, d, a, M_offset_11, 22, T[11]);\n\t            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);\n\t            d = FF(d, a, b, c, M_offset_13, 12, T[13]);\n\t            c = FF(c, d, a, b, M_offset_14, 17, T[14]);\n\t            b = FF(b, c, d, a, M_offset_15, 22, T[15]);\n\n\t            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);\n\t            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);\n\t            c = GG(c, d, a, b, M_offset_11, 14, T[18]);\n\t            b = GG(b, c, d, a, M_offset_0,  20, T[19]);\n\t            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);\n\t            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);\n\t            c = GG(c, d, a, b, M_offset_15, 14, T[22]);\n\t            b = GG(b, c, d, a, M_offset_4,  20, T[23]);\n\t            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);\n\t            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);\n\t            c = GG(c, d, a, b, M_offset_3,  14, T[26]);\n\t            b = GG(b, c, d, a, M_offset_8,  20, T[27]);\n\t            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);\n\t            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);\n\t            c = GG(c, d, a, b, M_offset_7,  14, T[30]);\n\t            b = GG(b, c, d, a, M_offset_12, 20, T[31]);\n\n\t            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);\n\t            d = HH(d, a, b, c, M_offset_8,  11, T[33]);\n\t            c = HH(c, d, a, b, M_offset_11, 16, T[34]);\n\t            b = HH(b, c, d, a, M_offset_14, 23, T[35]);\n\t            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);\n\t            d = HH(d, a, b, c, M_offset_4,  11, T[37]);\n\t            c = HH(c, d, a, b, M_offset_7,  16, T[38]);\n\t            b = HH(b, c, d, a, M_offset_10, 23, T[39]);\n\t            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);\n\t            d = HH(d, a, b, c, M_offset_0,  11, T[41]);\n\t            c = HH(c, d, a, b, M_offset_3,  16, T[42]);\n\t            b = HH(b, c, d, a, M_offset_6,  23, T[43]);\n\t            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);\n\t            d = HH(d, a, b, c, M_offset_12, 11, T[45]);\n\t            c = HH(c, d, a, b, M_offset_15, 16, T[46]);\n\t            b = HH(b, c, d, a, M_offset_2,  23, T[47]);\n\n\t            a = II(a, b, c, d, M_offset_0,  6,  T[48]);\n\t            d = II(d, a, b, c, M_offset_7,  10, T[49]);\n\t            c = II(c, d, a, b, M_offset_14, 15, T[50]);\n\t            b = II(b, c, d, a, M_offset_5,  21, T[51]);\n\t            a = II(a, b, c, d, M_offset_12, 6,  T[52]);\n\t            d = II(d, a, b, c, M_offset_3,  10, T[53]);\n\t            c = II(c, d, a, b, M_offset_10, 15, T[54]);\n\t            b = II(b, c, d, a, M_offset_1,  21, T[55]);\n\t            a = II(a, b, c, d, M_offset_8,  6,  T[56]);\n\t            d = II(d, a, b, c, M_offset_15, 10, T[57]);\n\t            c = II(c, d, a, b, M_offset_6,  15, T[58]);\n\t            b = II(b, c, d, a, M_offset_13, 21, T[59]);\n\t            a = II(a, b, c, d, M_offset_4,  6,  T[60]);\n\t            d = II(d, a, b, c, M_offset_11, 10, T[61]);\n\t            c = II(c, d, a, b, M_offset_2,  15, T[62]);\n\t            b = II(b, c, d, a, M_offset_9,  21, T[63]);\n\n\t            // Intermediate hash value\n\t            H[0] = (H[0] + a) | 0;\n\t            H[1] = (H[1] + b) | 0;\n\t            H[2] = (H[2] + c) | 0;\n\t            H[3] = (H[3] + d) | 0;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\n\t            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);\n\t            var nBitsTotalL = nBitsTotal;\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (\n\t                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |\n\t                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)\n\t            );\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (\n\t                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |\n\t                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)\n\t            );\n\n\t            data.sigBytes = (dataWords.length + 1) * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Shortcuts\n\t            var hash = this._hash;\n\t            var H = hash.words;\n\n\t            // Swap endian\n\t            for (var i = 0; i < 4; i++) {\n\t                // Shortcut\n\t                var H_i = H[i];\n\n\t                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |\n\t                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);\n\t            }\n\n\t            // Return final computed hash\n\t            return hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    function FF(a, b, c, d, x, s, t) {\n\t        var n = a + ((b & c) | (~b & d)) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    function GG(a, b, c, d, x, s, t) {\n\t        var n = a + ((b & d) | (c & ~d)) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    function HH(a, b, c, d, x, s, t) {\n\t        var n = a + (b ^ c ^ d) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    function II(a, b, c, d, x, s, t) {\n\t        var n = a + (c ^ (b | ~d)) + x + t;\n\t        return ((n << s) | (n >>> (32 - s))) + b;\n\t    }\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.MD5('message');\n\t     *     var hash = CryptoJS.MD5(wordArray);\n\t     */\n\t    C.MD5 = Hasher._createHelper(MD5);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacMD5(message, key);\n\t     */\n\t    C.HmacMD5 = Hasher._createHmacHelper(MD5);\n\t}(Math));\n\n\n\treturn CryptoJS.MD5;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Reusable object\n\t    var W = [];\n\n\t    /**\n\t     * SHA-1 hash algorithm.\n\t     */\n\t    var SHA1 = C_algo.SHA1 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init([\n\t                0x67452301, 0xefcdab89,\n\t                0x98badcfe, 0x10325476,\n\t                0xc3d2e1f0\n\t            ]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var H = this._hash.words;\n\n\t            // Working variables\n\t            var a = H[0];\n\t            var b = H[1];\n\t            var c = H[2];\n\t            var d = H[3];\n\t            var e = H[4];\n\n\t            // Computation\n\t            for (var i = 0; i < 80; i++) {\n\t                if (i < 16) {\n\t                    W[i] = M[offset + i] | 0;\n\t                } else {\n\t                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];\n\t                    W[i] = (n << 1) | (n >>> 31);\n\t                }\n\n\t                var t = ((a << 5) | (a >>> 27)) + e + W[i];\n\t                if (i < 20) {\n\t                    t += ((b & c) | (~b & d)) + 0x5a827999;\n\t                } else if (i < 40) {\n\t                    t += (b ^ c ^ d) + 0x6ed9eba1;\n\t                } else if (i < 60) {\n\t                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;\n\t                } else /* if (i < 80) */ {\n\t                    t += (b ^ c ^ d) - 0x359d3e2a;\n\t                }\n\n\t                e = d;\n\t                d = c;\n\t                c = (b << 30) | (b >>> 2);\n\t                b = a;\n\t                a = t;\n\t            }\n\n\t            // Intermediate hash value\n\t            H[0] = (H[0] + a) | 0;\n\t            H[1] = (H[1] + b) | 0;\n\t            H[2] = (H[2] + c) | 0;\n\t            H[3] = (H[3] + d) | 0;\n\t            H[4] = (H[4] + e) | 0;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Return final computed hash\n\t            return this._hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA1('message');\n\t     *     var hash = CryptoJS.SHA1(wordArray);\n\t     */\n\t    C.SHA1 = Hasher._createHelper(SHA1);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA1(message, key);\n\t     */\n\t    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);\n\t}());\n\n\n\treturn CryptoJS.SHA1;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Initialization and round constants tables\n\t    var H = [];\n\t    var K = [];\n\n\t    // Compute constants\n\t    (function () {\n\t        function isPrime(n) {\n\t            var sqrtN = Math.sqrt(n);\n\t            for (var factor = 2; factor <= sqrtN; factor++) {\n\t                if (!(n % factor)) {\n\t                    return false;\n\t                }\n\t            }\n\n\t            return true;\n\t        }\n\n\t        function getFractionalBits(n) {\n\t            return ((n - (n | 0)) * 0x100000000) | 0;\n\t        }\n\n\t        var n = 2;\n\t        var nPrime = 0;\n\t        while (nPrime < 64) {\n\t            if (isPrime(n)) {\n\t                if (nPrime < 8) {\n\t                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));\n\t                }\n\t                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));\n\n\t                nPrime++;\n\t            }\n\n\t            n++;\n\t        }\n\t    }());\n\n\t    // Reusable object\n\t    var W = [];\n\n\t    /**\n\t     * SHA-256 hash algorithm.\n\t     */\n\t    var SHA256 = C_algo.SHA256 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init(H.slice(0));\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var H = this._hash.words;\n\n\t            // Working variables\n\t            var a = H[0];\n\t            var b = H[1];\n\t            var c = H[2];\n\t            var d = H[3];\n\t            var e = H[4];\n\t            var f = H[5];\n\t            var g = H[6];\n\t            var h = H[7];\n\n\t            // Computation\n\t            for (var i = 0; i < 64; i++) {\n\t                if (i < 16) {\n\t                    W[i] = M[offset + i] | 0;\n\t                } else {\n\t                    var gamma0x = W[i - 15];\n\t                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^\n\t                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^\n\t                                   (gamma0x >>> 3);\n\n\t                    var gamma1x = W[i - 2];\n\t                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^\n\t                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^\n\t                                   (gamma1x >>> 10);\n\n\t                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];\n\t                }\n\n\t                var ch  = (e & f) ^ (~e & g);\n\t                var maj = (a & b) ^ (a & c) ^ (b & c);\n\n\t                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));\n\t                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));\n\n\t                var t1 = h + sigma1 + ch + K[i] + W[i];\n\t                var t2 = sigma0 + maj;\n\n\t                h = g;\n\t                g = f;\n\t                f = e;\n\t                e = (d + t1) | 0;\n\t                d = c;\n\t                c = b;\n\t                b = a;\n\t                a = (t1 + t2) | 0;\n\t            }\n\n\t            // Intermediate hash value\n\t            H[0] = (H[0] + a) | 0;\n\t            H[1] = (H[1] + b) | 0;\n\t            H[2] = (H[2] + c) | 0;\n\t            H[3] = (H[3] + d) | 0;\n\t            H[4] = (H[4] + e) | 0;\n\t            H[5] = (H[5] + f) | 0;\n\t            H[6] = (H[6] + g) | 0;\n\t            H[7] = (H[7] + h) | 0;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Return final computed hash\n\t            return this._hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA256('message');\n\t     *     var hash = CryptoJS.SHA256(wordArray);\n\t     */\n\t    C.SHA256 = Hasher._createHelper(SHA256);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA256(message, key);\n\t     */\n\t    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);\n\t}(Math));\n\n\n\treturn CryptoJS.SHA256;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha256\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./sha256\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_algo = C.algo;\n\t    var SHA256 = C_algo.SHA256;\n\n\t    /**\n\t     * SHA-224 hash algorithm.\n\t     */\n\t    var SHA224 = C_algo.SHA224 = SHA256.extend({\n\t        _doReset: function () {\n\t            this._hash = new WordArray.init([\n\t                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,\n\t                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4\n\t            ]);\n\t        },\n\n\t        _doFinalize: function () {\n\t            var hash = SHA256._doFinalize.call(this);\n\n\t            hash.sigBytes -= 4;\n\n\t            return hash;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA224('message');\n\t     *     var hash = CryptoJS.SHA224(wordArray);\n\t     */\n\t    C.SHA224 = SHA256._createHelper(SHA224);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA224(message, key);\n\t     */\n\t    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);\n\t}());\n\n\n\treturn CryptoJS.SHA224;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_x64 = C.x64;\n\t    var X64Word = C_x64.Word;\n\t    var X64WordArray = C_x64.WordArray;\n\t    var C_algo = C.algo;\n\n\t    function X64Word_create() {\n\t        return X64Word.create.apply(X64Word, arguments);\n\t    }\n\n\t    // Constants\n\t    var K = [\n\t        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),\n\t        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),\n\t        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),\n\t        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),\n\t        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),\n\t        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),\n\t        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),\n\t        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),\n\t        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),\n\t        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),\n\t        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),\n\t        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),\n\t        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),\n\t        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),\n\t        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),\n\t        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),\n\t        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),\n\t        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),\n\t        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),\n\t        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),\n\t        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),\n\t        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),\n\t        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),\n\t        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),\n\t        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),\n\t        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),\n\t        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),\n\t        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),\n\t        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),\n\t        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),\n\t        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),\n\t        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),\n\t        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),\n\t        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),\n\t        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),\n\t        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),\n\t        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),\n\t        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),\n\t        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),\n\t        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)\n\t    ];\n\n\t    // Reusable objects\n\t    var W = [];\n\t    (function () {\n\t        for (var i = 0; i < 80; i++) {\n\t            W[i] = X64Word_create();\n\t        }\n\t    }());\n\n\t    /**\n\t     * SHA-512 hash algorithm.\n\t     */\n\t    var SHA512 = C_algo.SHA512 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash = new X64WordArray.init([\n\t                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),\n\t                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),\n\t                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),\n\t                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)\n\t            ]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcuts\n\t            var H = this._hash.words;\n\n\t            var H0 = H[0];\n\t            var H1 = H[1];\n\t            var H2 = H[2];\n\t            var H3 = H[3];\n\t            var H4 = H[4];\n\t            var H5 = H[5];\n\t            var H6 = H[6];\n\t            var H7 = H[7];\n\n\t            var H0h = H0.high;\n\t            var H0l = H0.low;\n\t            var H1h = H1.high;\n\t            var H1l = H1.low;\n\t            var H2h = H2.high;\n\t            var H2l = H2.low;\n\t            var H3h = H3.high;\n\t            var H3l = H3.low;\n\t            var H4h = H4.high;\n\t            var H4l = H4.low;\n\t            var H5h = H5.high;\n\t            var H5l = H5.low;\n\t            var H6h = H6.high;\n\t            var H6l = H6.low;\n\t            var H7h = H7.high;\n\t            var H7l = H7.low;\n\n\t            // Working variables\n\t            var ah = H0h;\n\t            var al = H0l;\n\t            var bh = H1h;\n\t            var bl = H1l;\n\t            var ch = H2h;\n\t            var cl = H2l;\n\t            var dh = H3h;\n\t            var dl = H3l;\n\t            var eh = H4h;\n\t            var el = H4l;\n\t            var fh = H5h;\n\t            var fl = H5l;\n\t            var gh = H6h;\n\t            var gl = H6l;\n\t            var hh = H7h;\n\t            var hl = H7l;\n\n\t            // Rounds\n\t            for (var i = 0; i < 80; i++) {\n\t                var Wil;\n\t                var Wih;\n\n\t                // Shortcut\n\t                var Wi = W[i];\n\n\t                // Extend message\n\t                if (i < 16) {\n\t                    Wih = Wi.high = M[offset + i * 2]     | 0;\n\t                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;\n\t                } else {\n\t                    // Gamma0\n\t                    var gamma0x  = W[i - 15];\n\t                    var gamma0xh = gamma0x.high;\n\t                    var gamma0xl = gamma0x.low;\n\t                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);\n\t                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));\n\n\t                    // Gamma1\n\t                    var gamma1x  = W[i - 2];\n\t                    var gamma1xh = gamma1x.high;\n\t                    var gamma1xl = gamma1x.low;\n\t                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);\n\t                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));\n\n\t                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]\n\t                    var Wi7  = W[i - 7];\n\t                    var Wi7h = Wi7.high;\n\t                    var Wi7l = Wi7.low;\n\n\t                    var Wi16  = W[i - 16];\n\t                    var Wi16h = Wi16.high;\n\t                    var Wi16l = Wi16.low;\n\n\t                    Wil = gamma0l + Wi7l;\n\t                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);\n\t                    Wil = Wil + gamma1l;\n\t                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);\n\t                    Wil = Wil + Wi16l;\n\t                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);\n\n\t                    Wi.high = Wih;\n\t                    Wi.low  = Wil;\n\t                }\n\n\t                var chh  = (eh & fh) ^ (~eh & gh);\n\t                var chl  = (el & fl) ^ (~el & gl);\n\t                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);\n\t                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);\n\n\t                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));\n\t                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));\n\t                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));\n\t                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));\n\n\t                // t1 = h + sigma1 + ch + K[i] + W[i]\n\t                var Ki  = K[i];\n\t                var Kih = Ki.high;\n\t                var Kil = Ki.low;\n\n\t                var t1l = hl + sigma1l;\n\t                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);\n\t                var t1l = t1l + chl;\n\t                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);\n\t                var t1l = t1l + Kil;\n\t                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);\n\t                var t1l = t1l + Wil;\n\t                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);\n\n\t                // t2 = sigma0 + maj\n\t                var t2l = sigma0l + majl;\n\t                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);\n\n\t                // Update working variables\n\t                hh = gh;\n\t                hl = gl;\n\t                gh = fh;\n\t                gl = fl;\n\t                fh = eh;\n\t                fl = el;\n\t                el = (dl + t1l) | 0;\n\t                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;\n\t                dh = ch;\n\t                dl = cl;\n\t                ch = bh;\n\t                cl = bl;\n\t                bh = ah;\n\t                bl = al;\n\t                al = (t1l + t2l) | 0;\n\t                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;\n\t            }\n\n\t            // Intermediate hash value\n\t            H0l = H0.low  = (H0l + al);\n\t            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));\n\t            H1l = H1.low  = (H1l + bl);\n\t            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));\n\t            H2l = H2.low  = (H2l + cl);\n\t            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));\n\t            H3l = H3.low  = (H3l + dl);\n\t            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));\n\t            H4l = H4.low  = (H4l + el);\n\t            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));\n\t            H5l = H5.low  = (H5l + fl);\n\t            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));\n\t            H6l = H6.low  = (H6l + gl);\n\t            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));\n\t            H7l = H7.low  = (H7l + hl);\n\t            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);\n\t            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Convert hash to 32-bit word array before returning\n\t            var hash = this._hash.toX32();\n\n\t            // Return final computed hash\n\t            return hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        },\n\n\t        blockSize: 1024/32\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA512('message');\n\t     *     var hash = CryptoJS.SHA512(wordArray);\n\t     */\n\t    C.SHA512 = Hasher._createHelper(SHA512);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA512(message, key);\n\t     */\n\t    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);\n\t}());\n\n\n\treturn CryptoJS.SHA512;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"), require(\"./sha512\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\", \"./sha512\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_x64 = C.x64;\n\t    var X64Word = C_x64.Word;\n\t    var X64WordArray = C_x64.WordArray;\n\t    var C_algo = C.algo;\n\t    var SHA512 = C_algo.SHA512;\n\n\t    /**\n\t     * SHA-384 hash algorithm.\n\t     */\n\t    var SHA384 = C_algo.SHA384 = SHA512.extend({\n\t        _doReset: function () {\n\t            this._hash = new X64WordArray.init([\n\t                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),\n\t                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),\n\t                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),\n\t                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)\n\t            ]);\n\t        },\n\n\t        _doFinalize: function () {\n\t            var hash = SHA512._doFinalize.call(this);\n\n\t            hash.sigBytes -= 16;\n\n\t            return hash;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA384('message');\n\t     *     var hash = CryptoJS.SHA384(wordArray);\n\t     */\n\t    C.SHA384 = SHA512._createHelper(SHA384);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA384(message, key);\n\t     */\n\t    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);\n\t}());\n\n\n\treturn CryptoJS.SHA384;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./x64-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_x64 = C.x64;\n\t    var X64Word = C_x64.Word;\n\t    var C_algo = C.algo;\n\n\t    // Constants tables\n\t    var RHO_OFFSETS = [];\n\t    var PI_INDEXES  = [];\n\t    var ROUND_CONSTANTS = [];\n\n\t    // Compute Constants\n\t    (function () {\n\t        // Compute rho offset constants\n\t        var x = 1, y = 0;\n\t        for (var t = 0; t < 24; t++) {\n\t            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;\n\n\t            var newX = y % 5;\n\t            var newY = (2 * x + 3 * y) % 5;\n\t            x = newX;\n\t            y = newY;\n\t        }\n\n\t        // Compute pi index constants\n\t        for (var x = 0; x < 5; x++) {\n\t            for (var y = 0; y < 5; y++) {\n\t                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;\n\t            }\n\t        }\n\n\t        // Compute round constants\n\t        var LFSR = 0x01;\n\t        for (var i = 0; i < 24; i++) {\n\t            var roundConstantMsw = 0;\n\t            var roundConstantLsw = 0;\n\n\t            for (var j = 0; j < 7; j++) {\n\t                if (LFSR & 0x01) {\n\t                    var bitPosition = (1 << j) - 1;\n\t                    if (bitPosition < 32) {\n\t                        roundConstantLsw ^= 1 << bitPosition;\n\t                    } else /* if (bitPosition >= 32) */ {\n\t                        roundConstantMsw ^= 1 << (bitPosition - 32);\n\t                    }\n\t                }\n\n\t                // Compute next LFSR\n\t                if (LFSR & 0x80) {\n\t                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1\n\t                    LFSR = (LFSR << 1) ^ 0x71;\n\t                } else {\n\t                    LFSR <<= 1;\n\t                }\n\t            }\n\n\t            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);\n\t        }\n\t    }());\n\n\t    // Reusable objects for temporary values\n\t    var T = [];\n\t    (function () {\n\t        for (var i = 0; i < 25; i++) {\n\t            T[i] = X64Word.create();\n\t        }\n\t    }());\n\n\t    /**\n\t     * SHA-3 hash algorithm.\n\t     */\n\t    var SHA3 = C_algo.SHA3 = Hasher.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} outputLength\n\t         *   The desired number of bits in the output hash.\n\t         *   Only values permitted are: 224, 256, 384, 512.\n\t         *   Default: 512\n\t         */\n\t        cfg: Hasher.cfg.extend({\n\t            outputLength: 512\n\t        }),\n\n\t        _doReset: function () {\n\t            var state = this._state = []\n\t            for (var i = 0; i < 25; i++) {\n\t                state[i] = new X64Word.init();\n\t            }\n\n\t            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcuts\n\t            var state = this._state;\n\t            var nBlockSizeLanes = this.blockSize / 2;\n\n\t            // Absorb\n\t            for (var i = 0; i < nBlockSizeLanes; i++) {\n\t                // Shortcuts\n\t                var M2i  = M[offset + 2 * i];\n\t                var M2i1 = M[offset + 2 * i + 1];\n\n\t                // Swap endian\n\t                M2i = (\n\t                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |\n\t                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)\n\t                );\n\t                M2i1 = (\n\t                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |\n\t                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)\n\t                );\n\n\t                // Absorb message into state\n\t                var lane = state[i];\n\t                lane.high ^= M2i1;\n\t                lane.low  ^= M2i;\n\t            }\n\n\t            // Rounds\n\t            for (var round = 0; round < 24; round++) {\n\t                // Theta\n\t                for (var x = 0; x < 5; x++) {\n\t                    // Mix column lanes\n\t                    var tMsw = 0, tLsw = 0;\n\t                    for (var y = 0; y < 5; y++) {\n\t                        var lane = state[x + 5 * y];\n\t                        tMsw ^= lane.high;\n\t                        tLsw ^= lane.low;\n\t                    }\n\n\t                    // Temporary values\n\t                    var Tx = T[x];\n\t                    Tx.high = tMsw;\n\t                    Tx.low  = tLsw;\n\t                }\n\t                for (var x = 0; x < 5; x++) {\n\t                    // Shortcuts\n\t                    var Tx4 = T[(x + 4) % 5];\n\t                    var Tx1 = T[(x + 1) % 5];\n\t                    var Tx1Msw = Tx1.high;\n\t                    var Tx1Lsw = Tx1.low;\n\n\t                    // Mix surrounding columns\n\t                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));\n\t                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));\n\t                    for (var y = 0; y < 5; y++) {\n\t                        var lane = state[x + 5 * y];\n\t                        lane.high ^= tMsw;\n\t                        lane.low  ^= tLsw;\n\t                    }\n\t                }\n\n\t                // Rho Pi\n\t                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {\n\t                    var tMsw;\n\t                    var tLsw;\n\n\t                    // Shortcuts\n\t                    var lane = state[laneIndex];\n\t                    var laneMsw = lane.high;\n\t                    var laneLsw = lane.low;\n\t                    var rhoOffset = RHO_OFFSETS[laneIndex];\n\n\t                    // Rotate lanes\n\t                    if (rhoOffset < 32) {\n\t                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));\n\t                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));\n\t                    } else /* if (rhoOffset >= 32) */ {\n\t                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));\n\t                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));\n\t                    }\n\n\t                    // Transpose lanes\n\t                    var TPiLane = T[PI_INDEXES[laneIndex]];\n\t                    TPiLane.high = tMsw;\n\t                    TPiLane.low  = tLsw;\n\t                }\n\n\t                // Rho pi at x = y = 0\n\t                var T0 = T[0];\n\t                var state0 = state[0];\n\t                T0.high = state0.high;\n\t                T0.low  = state0.low;\n\n\t                // Chi\n\t                for (var x = 0; x < 5; x++) {\n\t                    for (var y = 0; y < 5; y++) {\n\t                        // Shortcuts\n\t                        var laneIndex = x + 5 * y;\n\t                        var lane = state[laneIndex];\n\t                        var TLane = T[laneIndex];\n\t                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];\n\t                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];\n\n\t                        // Mix rows\n\t                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);\n\t                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);\n\t                    }\n\t                }\n\n\t                // Iota\n\t                var lane = state[0];\n\t                var roundConstant = ROUND_CONSTANTS[round];\n\t                lane.high ^= roundConstant.high;\n\t                lane.low  ^= roundConstant.low;\n\t            }\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\t            var blockSizeBits = this.blockSize * 32;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);\n\t            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;\n\t            data.sigBytes = dataWords.length * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Shortcuts\n\t            var state = this._state;\n\t            var outputLengthBytes = this.cfg.outputLength / 8;\n\t            var outputLengthLanes = outputLengthBytes / 8;\n\n\t            // Squeeze\n\t            var hashWords = [];\n\t            for (var i = 0; i < outputLengthLanes; i++) {\n\t                // Shortcuts\n\t                var lane = state[i];\n\t                var laneMsw = lane.high;\n\t                var laneLsw = lane.low;\n\n\t                // Swap endian\n\t                laneMsw = (\n\t                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |\n\t                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)\n\t                );\n\t                laneLsw = (\n\t                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |\n\t                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)\n\t                );\n\n\t                // Squeeze state to retrieve hash\n\t                hashWords.push(laneLsw);\n\t                hashWords.push(laneMsw);\n\t            }\n\n\t            // Return final computed hash\n\t            return new WordArray.init(hashWords, outputLengthBytes);\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\n\t            var state = clone._state = this._state.slice(0);\n\t            for (var i = 0; i < 25; i++) {\n\t                state[i] = state[i].clone();\n\t            }\n\n\t            return clone;\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.SHA3('message');\n\t     *     var hash = CryptoJS.SHA3(wordArray);\n\t     */\n\t    C.SHA3 = Hasher._createHelper(SHA3);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacSHA3(message, key);\n\t     */\n\t    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);\n\t}(Math));\n\n\n\treturn CryptoJS.SHA3;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/** @preserve\n\t(c) 2012 by Cédric Mesnil. All rights reserved.\n\n\tRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n\t    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\t    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n\tTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\t*/\n\n\t(function (Math) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var Hasher = C_lib.Hasher;\n\t    var C_algo = C.algo;\n\n\t    // Constants table\n\t    var _zl = WordArray.create([\n\t        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,\n\t        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,\n\t        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,\n\t        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,\n\t        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);\n\t    var _zr = WordArray.create([\n\t        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,\n\t        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,\n\t        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,\n\t        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,\n\t        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);\n\t    var _sl = WordArray.create([\n\t         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,\n\t        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,\n\t        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,\n\t          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,\n\t        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);\n\t    var _sr = WordArray.create([\n\t        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,\n\t        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,\n\t        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,\n\t        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,\n\t        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);\n\n\t    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);\n\t    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);\n\n\t    /**\n\t     * RIPEMD160 hash algorithm.\n\t     */\n\t    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({\n\t        _doReset: function () {\n\t            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\n\t            // Swap endian\n\t            for (var i = 0; i < 16; i++) {\n\t                // Shortcuts\n\t                var offset_i = offset + i;\n\t                var M_offset_i = M[offset_i];\n\n\t                // Swap\n\t                M[offset_i] = (\n\t                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |\n\t                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)\n\t                );\n\t            }\n\t            // Shortcut\n\t            var H  = this._hash.words;\n\t            var hl = _hl.words;\n\t            var hr = _hr.words;\n\t            var zl = _zl.words;\n\t            var zr = _zr.words;\n\t            var sl = _sl.words;\n\t            var sr = _sr.words;\n\n\t            // Working variables\n\t            var al, bl, cl, dl, el;\n\t            var ar, br, cr, dr, er;\n\n\t            ar = al = H[0];\n\t            br = bl = H[1];\n\t            cr = cl = H[2];\n\t            dr = dl = H[3];\n\t            er = el = H[4];\n\t            // Computation\n\t            var t;\n\t            for (var i = 0; i < 80; i += 1) {\n\t                t = (al +  M[offset+zl[i]])|0;\n\t                if (i<16){\n\t\t            t +=  f1(bl,cl,dl) + hl[0];\n\t                } else if (i<32) {\n\t\t            t +=  f2(bl,cl,dl) + hl[1];\n\t                } else if (i<48) {\n\t\t            t +=  f3(bl,cl,dl) + hl[2];\n\t                } else if (i<64) {\n\t\t            t +=  f4(bl,cl,dl) + hl[3];\n\t                } else {// if (i<80) {\n\t\t            t +=  f5(bl,cl,dl) + hl[4];\n\t                }\n\t                t = t|0;\n\t                t =  rotl(t,sl[i]);\n\t                t = (t+el)|0;\n\t                al = el;\n\t                el = dl;\n\t                dl = rotl(cl, 10);\n\t                cl = bl;\n\t                bl = t;\n\n\t                t = (ar + M[offset+zr[i]])|0;\n\t                if (i<16){\n\t\t            t +=  f5(br,cr,dr) + hr[0];\n\t                } else if (i<32) {\n\t\t            t +=  f4(br,cr,dr) + hr[1];\n\t                } else if (i<48) {\n\t\t            t +=  f3(br,cr,dr) + hr[2];\n\t                } else if (i<64) {\n\t\t            t +=  f2(br,cr,dr) + hr[3];\n\t                } else {// if (i<80) {\n\t\t            t +=  f1(br,cr,dr) + hr[4];\n\t                }\n\t                t = t|0;\n\t                t =  rotl(t,sr[i]) ;\n\t                t = (t+er)|0;\n\t                ar = er;\n\t                er = dr;\n\t                dr = rotl(cr, 10);\n\t                cr = br;\n\t                br = t;\n\t            }\n\t            // Intermediate hash value\n\t            t    = (H[1] + cl + dr)|0;\n\t            H[1] = (H[2] + dl + er)|0;\n\t            H[2] = (H[3] + el + ar)|0;\n\t            H[3] = (H[4] + al + br)|0;\n\t            H[4] = (H[0] + bl + cr)|0;\n\t            H[0] =  t;\n\t        },\n\n\t        _doFinalize: function () {\n\t            // Shortcuts\n\t            var data = this._data;\n\t            var dataWords = data.words;\n\n\t            var nBitsTotal = this._nDataBytes * 8;\n\t            var nBitsLeft = data.sigBytes * 8;\n\n\t            // Add padding\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (\n\t                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |\n\t                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)\n\t            );\n\t            data.sigBytes = (dataWords.length + 1) * 4;\n\n\t            // Hash final blocks\n\t            this._process();\n\n\t            // Shortcuts\n\t            var hash = this._hash;\n\t            var H = hash.words;\n\n\t            // Swap endian\n\t            for (var i = 0; i < 5; i++) {\n\t                // Shortcut\n\t                var H_i = H[i];\n\n\t                // Swap\n\t                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |\n\t                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);\n\t            }\n\n\t            // Return final computed hash\n\t            return hash;\n\t        },\n\n\t        clone: function () {\n\t            var clone = Hasher.clone.call(this);\n\t            clone._hash = this._hash.clone();\n\n\t            return clone;\n\t        }\n\t    });\n\n\n\t    function f1(x, y, z) {\n\t        return ((x) ^ (y) ^ (z));\n\n\t    }\n\n\t    function f2(x, y, z) {\n\t        return (((x)&(y)) | ((~x)&(z)));\n\t    }\n\n\t    function f3(x, y, z) {\n\t        return (((x) | (~(y))) ^ (z));\n\t    }\n\n\t    function f4(x, y, z) {\n\t        return (((x) & (z)) | ((y)&(~(z))));\n\t    }\n\n\t    function f5(x, y, z) {\n\t        return ((x) ^ ((y) |(~(z))));\n\n\t    }\n\n\t    function rotl(x,n) {\n\t        return (x<<n) | (x>>>(32-n));\n\t    }\n\n\n\t    /**\n\t     * Shortcut function to the hasher's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     *\n\t     * @return {WordArray} The hash.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hash = CryptoJS.RIPEMD160('message');\n\t     *     var hash = CryptoJS.RIPEMD160(wordArray);\n\t     */\n\t    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);\n\n\t    /**\n\t     * Shortcut function to the HMAC's object interface.\n\t     *\n\t     * @param {WordArray|string} message The message to hash.\n\t     * @param {WordArray|string} key The secret key.\n\t     *\n\t     * @return {WordArray} The HMAC.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);\n\t     */\n\t    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);\n\t}(Math));\n\n\n\treturn CryptoJS.RIPEMD160;\n\n}));",";(function (root, factory) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var C_enc = C.enc;\n\t    var Utf8 = C_enc.Utf8;\n\t    var C_algo = C.algo;\n\n\t    /**\n\t     * HMAC algorithm.\n\t     */\n\t    var HMAC = C_algo.HMAC = Base.extend({\n\t        /**\n\t         * Initializes a newly created HMAC.\n\t         *\n\t         * @param {Hasher} hasher The hash algorithm to use.\n\t         * @param {WordArray|string} key The secret key.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);\n\t         */\n\t        init: function (hasher, key) {\n\t            // Init hasher\n\t            hasher = this._hasher = new hasher.init();\n\n\t            // Convert string to WordArray, else assume WordArray already\n\t            if (typeof key == 'string') {\n\t                key = Utf8.parse(key);\n\t            }\n\n\t            // Shortcuts\n\t            var hasherBlockSize = hasher.blockSize;\n\t            var hasherBlockSizeBytes = hasherBlockSize * 4;\n\n\t            // Allow arbitrary length keys\n\t            if (key.sigBytes > hasherBlockSizeBytes) {\n\t                key = hasher.finalize(key);\n\t            }\n\n\t            // Clamp excess bits\n\t            key.clamp();\n\n\t            // Clone key for inner and outer pads\n\t            var oKey = this._oKey = key.clone();\n\t            var iKey = this._iKey = key.clone();\n\n\t            // Shortcuts\n\t            var oKeyWords = oKey.words;\n\t            var iKeyWords = iKey.words;\n\n\t            // XOR keys with pad constants\n\t            for (var i = 0; i < hasherBlockSize; i++) {\n\t                oKeyWords[i] ^= 0x5c5c5c5c;\n\t                iKeyWords[i] ^= 0x36363636;\n\t            }\n\t            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;\n\n\t            // Set initial values\n\t            this.reset();\n\t        },\n\n\t        /**\n\t         * Resets this HMAC to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     hmacHasher.reset();\n\t         */\n\t        reset: function () {\n\t            // Shortcut\n\t            var hasher = this._hasher;\n\n\t            // Reset\n\t            hasher.reset();\n\t            hasher.update(this._iKey);\n\t        },\n\n\t        /**\n\t         * Updates this HMAC with a message.\n\t         *\n\t         * @param {WordArray|string} messageUpdate The message to append.\n\t         *\n\t         * @return {HMAC} This HMAC instance.\n\t         *\n\t         * @example\n\t         *\n\t         *     hmacHasher.update('message');\n\t         *     hmacHasher.update(wordArray);\n\t         */\n\t        update: function (messageUpdate) {\n\t            this._hasher.update(messageUpdate);\n\n\t            // Chainable\n\t            return this;\n\t        },\n\n\t        /**\n\t         * Finalizes the HMAC computation.\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\n\t         *\n\t         * @param {WordArray|string} messageUpdate (Optional) A final message update.\n\t         *\n\t         * @return {WordArray} The HMAC.\n\t         *\n\t         * @example\n\t         *\n\t         *     var hmac = hmacHasher.finalize();\n\t         *     var hmac = hmacHasher.finalize('message');\n\t         *     var hmac = hmacHasher.finalize(wordArray);\n\t         */\n\t        finalize: function (messageUpdate) {\n\t            // Shortcut\n\t            var hasher = this._hasher;\n\n\t            // Compute HMAC\n\t            var innerHash = hasher.finalize(messageUpdate);\n\t            hasher.reset();\n\t            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));\n\n\t            return hmac;\n\t        }\n\t    });\n\t}());\n\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha256\"), require(\"./hmac\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./sha256\", \"./hmac\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_algo = C.algo;\n\t    var SHA256 = C_algo.SHA256;\n\t    var HMAC = C_algo.HMAC;\n\n\t    /**\n\t     * Password-Based Key Derivation Function 2 algorithm.\n\t     */\n\t    var PBKDF2 = C_algo.PBKDF2 = Base.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)\n\t         * @property {Hasher} hasher The hasher to use. Default: SHA256\n\t         * @property {number} iterations The number of iterations to perform. Default: 250000\n\t         */\n\t        cfg: Base.extend({\n\t            keySize: 128/32,\n\t            hasher: SHA256,\n\t            iterations: 250000\n\t        }),\n\n\t        /**\n\t         * Initializes a newly created key derivation function.\n\t         *\n\t         * @param {Object} cfg (Optional) The configuration options to use for the derivation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create();\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });\n\t         */\n\t        init: function (cfg) {\n\t            this.cfg = this.cfg.extend(cfg);\n\t        },\n\n\t        /**\n\t         * Computes the Password-Based Key Derivation Function 2.\n\t         *\n\t         * @param {WordArray|string} password The password.\n\t         * @param {WordArray|string} salt A salt.\n\t         *\n\t         * @return {WordArray} The derived key.\n\t         *\n\t         * @example\n\t         *\n\t         *     var key = kdf.compute(password, salt);\n\t         */\n\t        compute: function (password, salt) {\n\t            // Shortcut\n\t            var cfg = this.cfg;\n\n\t            // Init HMAC\n\t            var hmac = HMAC.create(cfg.hasher, password);\n\n\t            // Initial values\n\t            var derivedKey = WordArray.create();\n\t            var blockIndex = WordArray.create([0x00000001]);\n\n\t            // Shortcuts\n\t            var derivedKeyWords = derivedKey.words;\n\t            var blockIndexWords = blockIndex.words;\n\t            var keySize = cfg.keySize;\n\t            var iterations = cfg.iterations;\n\n\t            // Generate key\n\t            while (derivedKeyWords.length < keySize) {\n\t                var block = hmac.update(salt).finalize(blockIndex);\n\t                hmac.reset();\n\n\t                // Shortcuts\n\t                var blockWords = block.words;\n\t                var blockWordsLength = blockWords.length;\n\n\t                // Iterations\n\t                var intermediate = block;\n\t                for (var i = 1; i < iterations; i++) {\n\t                    intermediate = hmac.finalize(intermediate);\n\t                    hmac.reset();\n\n\t                    // Shortcut\n\t                    var intermediateWords = intermediate.words;\n\n\t                    // XOR intermediate with block\n\t                    for (var j = 0; j < blockWordsLength; j++) {\n\t                        blockWords[j] ^= intermediateWords[j];\n\t                    }\n\t                }\n\n\t                derivedKey.concat(block);\n\t                blockIndexWords[0]++;\n\t            }\n\t            derivedKey.sigBytes = keySize * 4;\n\n\t            return derivedKey;\n\t        }\n\t    });\n\n\t    /**\n\t     * Computes the Password-Based Key Derivation Function 2.\n\t     *\n\t     * @param {WordArray|string} password The password.\n\t     * @param {WordArray|string} salt A salt.\n\t     * @param {Object} cfg (Optional) The configuration options to use for this computation.\n\t     *\n\t     * @return {WordArray} The derived key.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var key = CryptoJS.PBKDF2(password, salt);\n\t     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });\n\t     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });\n\t     */\n\t    C.PBKDF2 = function (password, salt, cfg) {\n\t        return PBKDF2.create(cfg).compute(password, salt);\n\t    };\n\t}());\n\n\n\treturn CryptoJS.PBKDF2;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha1\"), require(\"./hmac\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./sha1\", \"./hmac\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var WordArray = C_lib.WordArray;\n\t    var C_algo = C.algo;\n\t    var MD5 = C_algo.MD5;\n\n\t    /**\n\t     * This key derivation function is meant to conform with EVP_BytesToKey.\n\t     * www.openssl.org/docs/crypto/EVP_BytesToKey.html\n\t     */\n\t    var EvpKDF = C_algo.EvpKDF = Base.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)\n\t         * @property {Hasher} hasher The hash algorithm to use. Default: MD5\n\t         * @property {number} iterations The number of iterations to perform. Default: 1\n\t         */\n\t        cfg: Base.extend({\n\t            keySize: 128/32,\n\t            hasher: MD5,\n\t            iterations: 1\n\t        }),\n\n\t        /**\n\t         * Initializes a newly created key derivation function.\n\t         *\n\t         * @param {Object} cfg (Optional) The configuration options to use for the derivation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create();\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });\n\t         */\n\t        init: function (cfg) {\n\t            this.cfg = this.cfg.extend(cfg);\n\t        },\n\n\t        /**\n\t         * Derives a key from a password.\n\t         *\n\t         * @param {WordArray|string} password The password.\n\t         * @param {WordArray|string} salt A salt.\n\t         *\n\t         * @return {WordArray} The derived key.\n\t         *\n\t         * @example\n\t         *\n\t         *     var key = kdf.compute(password, salt);\n\t         */\n\t        compute: function (password, salt) {\n\t            var block;\n\n\t            // Shortcut\n\t            var cfg = this.cfg;\n\n\t            // Init hasher\n\t            var hasher = cfg.hasher.create();\n\n\t            // Initial values\n\t            var derivedKey = WordArray.create();\n\n\t            // Shortcuts\n\t            var derivedKeyWords = derivedKey.words;\n\t            var keySize = cfg.keySize;\n\t            var iterations = cfg.iterations;\n\n\t            // Generate key\n\t            while (derivedKeyWords.length < keySize) {\n\t                if (block) {\n\t                    hasher.update(block);\n\t                }\n\t                block = hasher.update(password).finalize(salt);\n\t                hasher.reset();\n\n\t                // Iterations\n\t                for (var i = 1; i < iterations; i++) {\n\t                    block = hasher.finalize(block);\n\t                    hasher.reset();\n\t                }\n\n\t                derivedKey.concat(block);\n\t            }\n\t            derivedKey.sigBytes = keySize * 4;\n\n\t            return derivedKey;\n\t        }\n\t    });\n\n\t    /**\n\t     * Derives a key from a password.\n\t     *\n\t     * @param {WordArray|string} password The password.\n\t     * @param {WordArray|string} salt A salt.\n\t     * @param {Object} cfg (Optional) The configuration options to use for this computation.\n\t     *\n\t     * @return {WordArray} The derived key.\n\t     *\n\t     * @static\n\t     *\n\t     * @example\n\t     *\n\t     *     var key = CryptoJS.EvpKDF(password, salt);\n\t     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });\n\t     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });\n\t     */\n\t    C.EvpKDF = function (password, salt, cfg) {\n\t        return EvpKDF.create(cfg).compute(password, salt);\n\t    };\n\t}());\n\n\n\treturn CryptoJS.EvpKDF;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./evpkdf\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./evpkdf\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Cipher core components.\n\t */\n\tCryptoJS.lib.Cipher || (function (undefined) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var Base = C_lib.Base;\n\t    var WordArray = C_lib.WordArray;\n\t    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;\n\t    var C_enc = C.enc;\n\t    var Utf8 = C_enc.Utf8;\n\t    var Base64 = C_enc.Base64;\n\t    var C_algo = C.algo;\n\t    var EvpKDF = C_algo.EvpKDF;\n\n\t    /**\n\t     * Abstract base cipher template.\n\t     *\n\t     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)\n\t     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)\n\t     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.\n\t     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.\n\t     */\n\t    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {WordArray} iv The IV to use for this operation.\n\t         */\n\t        cfg: Base.extend(),\n\n\t        /**\n\t         * Creates this cipher in encryption mode.\n\t         *\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {Cipher} A cipher instance.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });\n\t         */\n\t        createEncryptor: function (key, cfg) {\n\t            return this.create(this._ENC_XFORM_MODE, key, cfg);\n\t        },\n\n\t        /**\n\t         * Creates this cipher in decryption mode.\n\t         *\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {Cipher} A cipher instance.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });\n\t         */\n\t        createDecryptor: function (key, cfg) {\n\t            return this.create(this._DEC_XFORM_MODE, key, cfg);\n\t        },\n\n\t        /**\n\t         * Initializes a newly created cipher.\n\t         *\n\t         * @param {number} xformMode Either the encryption or decryption transormation mode constant.\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });\n\t         */\n\t        init: function (xformMode, key, cfg) {\n\t            // Apply config defaults\n\t            this.cfg = this.cfg.extend(cfg);\n\n\t            // Store transform mode and key\n\t            this._xformMode = xformMode;\n\t            this._key = key;\n\n\t            // Set initial values\n\t            this.reset();\n\t        },\n\n\t        /**\n\t         * Resets this cipher to its initial state.\n\t         *\n\t         * @example\n\t         *\n\t         *     cipher.reset();\n\t         */\n\t        reset: function () {\n\t            // Reset data buffer\n\t            BufferedBlockAlgorithm.reset.call(this);\n\n\t            // Perform concrete-cipher logic\n\t            this._doReset();\n\t        },\n\n\t        /**\n\t         * Adds data to be encrypted or decrypted.\n\t         *\n\t         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.\n\t         *\n\t         * @return {WordArray} The data after processing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var encrypted = cipher.process('data');\n\t         *     var encrypted = cipher.process(wordArray);\n\t         */\n\t        process: function (dataUpdate) {\n\t            // Append\n\t            this._append(dataUpdate);\n\n\t            // Process available blocks\n\t            return this._process();\n\t        },\n\n\t        /**\n\t         * Finalizes the encryption or decryption process.\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\n\t         *\n\t         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.\n\t         *\n\t         * @return {WordArray} The data after final processing.\n\t         *\n\t         * @example\n\t         *\n\t         *     var encrypted = cipher.finalize();\n\t         *     var encrypted = cipher.finalize('data');\n\t         *     var encrypted = cipher.finalize(wordArray);\n\t         */\n\t        finalize: function (dataUpdate) {\n\t            // Final data update\n\t            if (dataUpdate) {\n\t                this._append(dataUpdate);\n\t            }\n\n\t            // Perform concrete-cipher logic\n\t            var finalProcessedData = this._doFinalize();\n\n\t            return finalProcessedData;\n\t        },\n\n\t        keySize: 128/32,\n\n\t        ivSize: 128/32,\n\n\t        _ENC_XFORM_MODE: 1,\n\n\t        _DEC_XFORM_MODE: 2,\n\n\t        /**\n\t         * Creates shortcut functions to a cipher's object interface.\n\t         *\n\t         * @param {Cipher} cipher The cipher to create a helper for.\n\t         *\n\t         * @return {Object} An object with encrypt and decrypt shortcut functions.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);\n\t         */\n\t        _createHelper: (function () {\n\t            function selectCipherStrategy(key) {\n\t                if (typeof key == 'string') {\n\t                    return PasswordBasedCipher;\n\t                } else {\n\t                    return SerializableCipher;\n\t                }\n\t            }\n\n\t            return function (cipher) {\n\t                return {\n\t                    encrypt: function (message, key, cfg) {\n\t                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);\n\t                    },\n\n\t                    decrypt: function (ciphertext, key, cfg) {\n\t                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);\n\t                    }\n\t                };\n\t            };\n\t        }())\n\t    });\n\n\t    /**\n\t     * Abstract base stream cipher template.\n\t     *\n\t     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)\n\t     */\n\t    var StreamCipher = C_lib.StreamCipher = Cipher.extend({\n\t        _doFinalize: function () {\n\t            // Process partial blocks\n\t            var finalProcessedBlocks = this._process(!!'flush');\n\n\t            return finalProcessedBlocks;\n\t        },\n\n\t        blockSize: 1\n\t    });\n\n\t    /**\n\t     * Mode namespace.\n\t     */\n\t    var C_mode = C.mode = {};\n\n\t    /**\n\t     * Abstract base block cipher mode template.\n\t     */\n\t    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({\n\t        /**\n\t         * Creates this mode for encryption.\n\t         *\n\t         * @param {Cipher} cipher A block cipher instance.\n\t         * @param {Array} iv The IV words.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);\n\t         */\n\t        createEncryptor: function (cipher, iv) {\n\t            return this.Encryptor.create(cipher, iv);\n\t        },\n\n\t        /**\n\t         * Creates this mode for decryption.\n\t         *\n\t         * @param {Cipher} cipher A block cipher instance.\n\t         * @param {Array} iv The IV words.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);\n\t         */\n\t        createDecryptor: function (cipher, iv) {\n\t            return this.Decryptor.create(cipher, iv);\n\t        },\n\n\t        /**\n\t         * Initializes a newly created mode.\n\t         *\n\t         * @param {Cipher} cipher A block cipher instance.\n\t         * @param {Array} iv The IV words.\n\t         *\n\t         * @example\n\t         *\n\t         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);\n\t         */\n\t        init: function (cipher, iv) {\n\t            this._cipher = cipher;\n\t            this._iv = iv;\n\t        }\n\t    });\n\n\t    /**\n\t     * Cipher Block Chaining mode.\n\t     */\n\t    var CBC = C_mode.CBC = (function () {\n\t        /**\n\t         * Abstract base CBC mode.\n\t         */\n\t        var CBC = BlockCipherMode.extend();\n\n\t        /**\n\t         * CBC encryptor.\n\t         */\n\t        CBC.Encryptor = CBC.extend({\n\t            /**\n\t             * Processes the data block at offset.\n\t             *\n\t             * @param {Array} words The data words to operate on.\n\t             * @param {number} offset The offset where the block starts.\n\t             *\n\t             * @example\n\t             *\n\t             *     mode.processBlock(data.words, offset);\n\t             */\n\t            processBlock: function (words, offset) {\n\t                // Shortcuts\n\t                var cipher = this._cipher;\n\t                var blockSize = cipher.blockSize;\n\n\t                // XOR and encrypt\n\t                xorBlock.call(this, words, offset, blockSize);\n\t                cipher.encryptBlock(words, offset);\n\n\t                // Remember this block to use with next block\n\t                this._prevBlock = words.slice(offset, offset + blockSize);\n\t            }\n\t        });\n\n\t        /**\n\t         * CBC decryptor.\n\t         */\n\t        CBC.Decryptor = CBC.extend({\n\t            /**\n\t             * Processes the data block at offset.\n\t             *\n\t             * @param {Array} words The data words to operate on.\n\t             * @param {number} offset The offset where the block starts.\n\t             *\n\t             * @example\n\t             *\n\t             *     mode.processBlock(data.words, offset);\n\t             */\n\t            processBlock: function (words, offset) {\n\t                // Shortcuts\n\t                var cipher = this._cipher;\n\t                var blockSize = cipher.blockSize;\n\n\t                // Remember this block to use with next block\n\t                var thisBlock = words.slice(offset, offset + blockSize);\n\n\t                // Decrypt and XOR\n\t                cipher.decryptBlock(words, offset);\n\t                xorBlock.call(this, words, offset, blockSize);\n\n\t                // This block becomes the previous block\n\t                this._prevBlock = thisBlock;\n\t            }\n\t        });\n\n\t        function xorBlock(words, offset, blockSize) {\n\t            var block;\n\n\t            // Shortcut\n\t            var iv = this._iv;\n\n\t            // Choose mixing block\n\t            if (iv) {\n\t                block = iv;\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            } else {\n\t                block = this._prevBlock;\n\t            }\n\n\t            // XOR blocks\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= block[i];\n\t            }\n\t        }\n\n\t        return CBC;\n\t    }());\n\n\t    /**\n\t     * Padding namespace.\n\t     */\n\t    var C_pad = C.pad = {};\n\n\t    /**\n\t     * PKCS #5/7 padding strategy.\n\t     */\n\t    var Pkcs7 = C_pad.Pkcs7 = {\n\t        /**\n\t         * Pads data using the algorithm defined in PKCS #5/7.\n\t         *\n\t         * @param {WordArray} data The data to pad.\n\t         * @param {number} blockSize The multiple that the data should be padded to.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);\n\t         */\n\t        pad: function (data, blockSize) {\n\t            // Shortcut\n\t            var blockSizeBytes = blockSize * 4;\n\n\t            // Count padding bytes\n\t            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;\n\n\t            // Create padding word\n\t            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;\n\n\t            // Create padding\n\t            var paddingWords = [];\n\t            for (var i = 0; i < nPaddingBytes; i += 4) {\n\t                paddingWords.push(paddingWord);\n\t            }\n\t            var padding = WordArray.create(paddingWords, nPaddingBytes);\n\n\t            // Add padding\n\t            data.concat(padding);\n\t        },\n\n\t        /**\n\t         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.\n\t         *\n\t         * @param {WordArray} data The data to unpad.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     CryptoJS.pad.Pkcs7.unpad(wordArray);\n\t         */\n\t        unpad: function (data) {\n\t            // Get number of padding bytes from last byte\n\t            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\n\n\t            // Remove padding\n\t            data.sigBytes -= nPaddingBytes;\n\t        }\n\t    };\n\n\t    /**\n\t     * Abstract base block cipher template.\n\t     *\n\t     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)\n\t     */\n\t    var BlockCipher = C_lib.BlockCipher = Cipher.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {Mode} mode The block mode to use. Default: CBC\n\t         * @property {Padding} padding The padding strategy to use. Default: Pkcs7\n\t         */\n\t        cfg: Cipher.cfg.extend({\n\t            mode: CBC,\n\t            padding: Pkcs7\n\t        }),\n\n\t        reset: function () {\n\t            var modeCreator;\n\n\t            // Reset cipher\n\t            Cipher.reset.call(this);\n\n\t            // Shortcuts\n\t            var cfg = this.cfg;\n\t            var iv = cfg.iv;\n\t            var mode = cfg.mode;\n\n\t            // Reset block mode\n\t            if (this._xformMode == this._ENC_XFORM_MODE) {\n\t                modeCreator = mode.createEncryptor;\n\t            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {\n\t                modeCreator = mode.createDecryptor;\n\t                // Keep at least one block in the buffer for unpadding\n\t                this._minBufferSize = 1;\n\t            }\n\n\t            if (this._mode && this._mode.__creator == modeCreator) {\n\t                this._mode.init(this, iv && iv.words);\n\t            } else {\n\t                this._mode = modeCreator.call(mode, this, iv && iv.words);\n\t                this._mode.__creator = modeCreator;\n\t            }\n\t        },\n\n\t        _doProcessBlock: function (words, offset) {\n\t            this._mode.processBlock(words, offset);\n\t        },\n\n\t        _doFinalize: function () {\n\t            var finalProcessedBlocks;\n\n\t            // Shortcut\n\t            var padding = this.cfg.padding;\n\n\t            // Finalize\n\t            if (this._xformMode == this._ENC_XFORM_MODE) {\n\t                // Pad data\n\t                padding.pad(this._data, this.blockSize);\n\n\t                // Process final blocks\n\t                finalProcessedBlocks = this._process(!!'flush');\n\t            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {\n\t                // Process final blocks\n\t                finalProcessedBlocks = this._process(!!'flush');\n\n\t                // Unpad data\n\t                padding.unpad(finalProcessedBlocks);\n\t            }\n\n\t            return finalProcessedBlocks;\n\t        },\n\n\t        blockSize: 128/32\n\t    });\n\n\t    /**\n\t     * A collection of cipher parameters.\n\t     *\n\t     * @property {WordArray} ciphertext The raw ciphertext.\n\t     * @property {WordArray} key The key to this ciphertext.\n\t     * @property {WordArray} iv The IV used in the ciphering operation.\n\t     * @property {WordArray} salt The salt used with a key derivation function.\n\t     * @property {Cipher} algorithm The cipher algorithm.\n\t     * @property {Mode} mode The block mode used in the ciphering operation.\n\t     * @property {Padding} padding The padding scheme used in the ciphering operation.\n\t     * @property {number} blockSize The block size of the cipher.\n\t     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.\n\t     */\n\t    var CipherParams = C_lib.CipherParams = Base.extend({\n\t        /**\n\t         * Initializes a newly created cipher params object.\n\t         *\n\t         * @param {Object} cipherParams An object with any of the possible cipher parameters.\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipherParams = CryptoJS.lib.CipherParams.create({\n\t         *         ciphertext: ciphertextWordArray,\n\t         *         key: keyWordArray,\n\t         *         iv: ivWordArray,\n\t         *         salt: saltWordArray,\n\t         *         algorithm: CryptoJS.algo.AES,\n\t         *         mode: CryptoJS.mode.CBC,\n\t         *         padding: CryptoJS.pad.PKCS7,\n\t         *         blockSize: 4,\n\t         *         formatter: CryptoJS.format.OpenSSL\n\t         *     });\n\t         */\n\t        init: function (cipherParams) {\n\t            this.mixIn(cipherParams);\n\t        },\n\n\t        /**\n\t         * Converts this cipher params object to a string.\n\t         *\n\t         * @param {Format} formatter (Optional) The formatting strategy to use.\n\t         *\n\t         * @return {string} The stringified cipher params.\n\t         *\n\t         * @throws Error If neither the formatter nor the default formatter is set.\n\t         *\n\t         * @example\n\t         *\n\t         *     var string = cipherParams + '';\n\t         *     var string = cipherParams.toString();\n\t         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);\n\t         */\n\t        toString: function (formatter) {\n\t            return (formatter || this.formatter).stringify(this);\n\t        }\n\t    });\n\n\t    /**\n\t     * Format namespace.\n\t     */\n\t    var C_format = C.format = {};\n\n\t    /**\n\t     * OpenSSL formatting strategy.\n\t     */\n\t    var OpenSSLFormatter = C_format.OpenSSL = {\n\t        /**\n\t         * Converts a cipher params object to an OpenSSL-compatible string.\n\t         *\n\t         * @param {CipherParams} cipherParams The cipher params object.\n\t         *\n\t         * @return {string} The OpenSSL-compatible string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);\n\t         */\n\t        stringify: function (cipherParams) {\n\t            var wordArray;\n\n\t            // Shortcuts\n\t            var ciphertext = cipherParams.ciphertext;\n\t            var salt = cipherParams.salt;\n\n\t            // Format\n\t            if (salt) {\n\t                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);\n\t            } else {\n\t                wordArray = ciphertext;\n\t            }\n\n\t            return wordArray.toString(Base64);\n\t        },\n\n\t        /**\n\t         * Converts an OpenSSL-compatible string to a cipher params object.\n\t         *\n\t         * @param {string} openSSLStr The OpenSSL-compatible string.\n\t         *\n\t         * @return {CipherParams} The cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);\n\t         */\n\t        parse: function (openSSLStr) {\n\t            var salt;\n\n\t            // Parse base64\n\t            var ciphertext = Base64.parse(openSSLStr);\n\n\t            // Shortcut\n\t            var ciphertextWords = ciphertext.words;\n\n\t            // Test for salt\n\t            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {\n\t                // Extract salt\n\t                salt = WordArray.create(ciphertextWords.slice(2, 4));\n\n\t                // Remove salt from ciphertext\n\t                ciphertextWords.splice(0, 4);\n\t                ciphertext.sigBytes -= 16;\n\t            }\n\n\t            return CipherParams.create({ ciphertext: ciphertext, salt: salt });\n\t        }\n\t    };\n\n\t    /**\n\t     * A cipher wrapper that returns ciphertext as a serializable cipher params object.\n\t     */\n\t    var SerializableCipher = C_lib.SerializableCipher = Base.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL\n\t         */\n\t        cfg: Base.extend({\n\t            format: OpenSSLFormatter\n\t        }),\n\n\t        /**\n\t         * Encrypts a message.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {WordArray|string} message The message to encrypt.\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {CipherParams} A cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });\n\t         */\n\t        encrypt: function (cipher, message, key, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Encrypt\n\t            var encryptor = cipher.createEncryptor(key, cfg);\n\t            var ciphertext = encryptor.finalize(message);\n\n\t            // Shortcut\n\t            var cipherCfg = encryptor.cfg;\n\n\t            // Create and return serializable cipher params\n\t            return CipherParams.create({\n\t                ciphertext: ciphertext,\n\t                key: key,\n\t                iv: cipherCfg.iv,\n\t                algorithm: cipher,\n\t                mode: cipherCfg.mode,\n\t                padding: cipherCfg.padding,\n\t                blockSize: cipher.blockSize,\n\t                formatter: cfg.format\n\t            });\n\t        },\n\n\t        /**\n\t         * Decrypts serialized ciphertext.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.\n\t         * @param {WordArray} key The key.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {WordArray} The plaintext.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });\n\t         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });\n\t         */\n\t        decrypt: function (cipher, ciphertext, key, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Convert string to CipherParams\n\t            ciphertext = this._parse(ciphertext, cfg.format);\n\n\t            // Decrypt\n\t            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);\n\n\t            return plaintext;\n\t        },\n\n\t        /**\n\t         * Converts serialized ciphertext to CipherParams,\n\t         * else assumed CipherParams already and returns ciphertext unchanged.\n\t         *\n\t         * @param {CipherParams|string} ciphertext The ciphertext.\n\t         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.\n\t         *\n\t         * @return {CipherParams} The unserialized ciphertext.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);\n\t         */\n\t        _parse: function (ciphertext, format) {\n\t            if (typeof ciphertext == 'string') {\n\t                return format.parse(ciphertext, this);\n\t            } else {\n\t                return ciphertext;\n\t            }\n\t        }\n\t    });\n\n\t    /**\n\t     * Key derivation function namespace.\n\t     */\n\t    var C_kdf = C.kdf = {};\n\n\t    /**\n\t     * OpenSSL key derivation function.\n\t     */\n\t    var OpenSSLKdf = C_kdf.OpenSSL = {\n\t        /**\n\t         * Derives a key and IV from a password.\n\t         *\n\t         * @param {string} password The password to derive from.\n\t         * @param {number} keySize The size in words of the key to generate.\n\t         * @param {number} ivSize The size in words of the IV to generate.\n\t         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.\n\t         *\n\t         * @return {CipherParams} A cipher params object with the key, IV, and salt.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);\n\t         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');\n\t         */\n\t        execute: function (password, keySize, ivSize, salt, hasher) {\n\t            // Generate random salt\n\t            if (!salt) {\n\t                salt = WordArray.random(64/8);\n\t            }\n\n\t            // Derive key and IV\n\t            if (!hasher) {\n\t                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);\n\t            } else {\n\t                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);\n\t            }\n\n\n\t            // Separate key and IV\n\t            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);\n\t            key.sigBytes = keySize * 4;\n\n\t            // Return params\n\t            return CipherParams.create({ key: key, iv: iv, salt: salt });\n\t        }\n\t    };\n\n\t    /**\n\t     * A serializable cipher wrapper that derives the key from a password,\n\t     * and returns ciphertext as a serializable cipher params object.\n\t     */\n\t    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL\n\t         */\n\t        cfg: SerializableCipher.cfg.extend({\n\t            kdf: OpenSSLKdf\n\t        }),\n\n\t        /**\n\t         * Encrypts a message using a password.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {WordArray|string} message The message to encrypt.\n\t         * @param {string} password The password.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {CipherParams} A cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');\n\t         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });\n\t         */\n\t        encrypt: function (cipher, message, password, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Derive key and other params\n\t            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);\n\n\t            // Add IV to config\n\t            cfg.iv = derivedParams.iv;\n\n\t            // Encrypt\n\t            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);\n\n\t            // Mix in derived params\n\t            ciphertext.mixIn(derivedParams);\n\n\t            return ciphertext;\n\t        },\n\n\t        /**\n\t         * Decrypts serialized ciphertext using a password.\n\t         *\n\t         * @param {Cipher} cipher The cipher algorithm to use.\n\t         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.\n\t         * @param {string} password The password.\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\n\t         *\n\t         * @return {WordArray} The plaintext.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });\n\t         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });\n\t         */\n\t        decrypt: function (cipher, ciphertext, password, cfg) {\n\t            // Apply config defaults\n\t            cfg = this.cfg.extend(cfg);\n\n\t            // Convert string to CipherParams\n\t            ciphertext = this._parse(ciphertext, cfg.format);\n\n\t            // Derive key and other params\n\t            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);\n\n\t            // Add IV to config\n\t            cfg.iv = derivedParams.iv;\n\n\t            // Decrypt\n\t            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);\n\n\t            return plaintext;\n\t        }\n\t    });\n\t}());\n\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Cipher Feedback block mode.\n\t */\n\tCryptoJS.mode.CFB = (function () {\n\t    var CFB = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    CFB.Encryptor = CFB.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher;\n\t            var blockSize = cipher.blockSize;\n\n\t            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);\n\n\t            // Remember this block to use with next block\n\t            this._prevBlock = words.slice(offset, offset + blockSize);\n\t        }\n\t    });\n\n\t    CFB.Decryptor = CFB.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher;\n\t            var blockSize = cipher.blockSize;\n\n\t            // Remember this block to use with next block\n\t            var thisBlock = words.slice(offset, offset + blockSize);\n\n\t            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);\n\n\t            // This block becomes the previous block\n\t            this._prevBlock = thisBlock;\n\t        }\n\t    });\n\n\t    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {\n\t        var keystream;\n\n\t        // Shortcut\n\t        var iv = this._iv;\n\n\t        // Generate keystream\n\t        if (iv) {\n\t            keystream = iv.slice(0);\n\n\t            // Remove IV for subsequent blocks\n\t            this._iv = undefined;\n\t        } else {\n\t            keystream = this._prevBlock;\n\t        }\n\t        cipher.encryptBlock(keystream, 0);\n\n\t        // Encrypt\n\t        for (var i = 0; i < blockSize; i++) {\n\t            words[offset + i] ^= keystream[i];\n\t        }\n\t    }\n\n\t    return CFB;\n\t}());\n\n\n\treturn CryptoJS.mode.CFB;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Counter block mode.\n\t */\n\tCryptoJS.mode.CTR = (function () {\n\t    var CTR = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    var Encryptor = CTR.Encryptor = CTR.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher\n\t            var blockSize = cipher.blockSize;\n\t            var iv = this._iv;\n\t            var counter = this._counter;\n\n\t            // Generate keystream\n\t            if (iv) {\n\t                counter = this._counter = iv.slice(0);\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            }\n\t            var keystream = counter.slice(0);\n\t            cipher.encryptBlock(keystream, 0);\n\n\t            // Increment counter\n\t            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0\n\n\t            // Encrypt\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= keystream[i];\n\t            }\n\t        }\n\t    });\n\n\t    CTR.Decryptor = Encryptor;\n\n\t    return CTR;\n\t}());\n\n\n\treturn CryptoJS.mode.CTR;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/** @preserve\n\t * Counter block mode compatible with  Dr Brian Gladman fileenc.c\n\t * derived from CryptoJS.mode.CTR\n\t * Jan Hruby jhruby.web@gmail.com\n\t */\n\tCryptoJS.mode.CTRGladman = (function () {\n\t    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();\n\n\t\tfunction incWord(word)\n\t\t{\n\t\t\tif (((word >> 24) & 0xff) === 0xff) { //overflow\n\t\t\tvar b1 = (word >> 16)&0xff;\n\t\t\tvar b2 = (word >> 8)&0xff;\n\t\t\tvar b3 = word & 0xff;\n\n\t\t\tif (b1 === 0xff) // overflow b1\n\t\t\t{\n\t\t\tb1 = 0;\n\t\t\tif (b2 === 0xff)\n\t\t\t{\n\t\t\t\tb2 = 0;\n\t\t\t\tif (b3 === 0xff)\n\t\t\t\t{\n\t\t\t\t\tb3 = 0;\n\t\t\t\t}\n\t\t\t\telse\n\t\t\t\t{\n\t\t\t\t\t++b3;\n\t\t\t\t}\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t\t++b2;\n\t\t\t}\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t++b1;\n\t\t\t}\n\n\t\t\tword = 0;\n\t\t\tword += (b1 << 16);\n\t\t\tword += (b2 << 8);\n\t\t\tword += b3;\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\tword += (0x01 << 24);\n\t\t\t}\n\t\t\treturn word;\n\t\t}\n\n\t\tfunction incCounter(counter)\n\t\t{\n\t\t\tif ((counter[0] = incWord(counter[0])) === 0)\n\t\t\t{\n\t\t\t\t// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8\n\t\t\t\tcounter[1] = incWord(counter[1]);\n\t\t\t}\n\t\t\treturn counter;\n\t\t}\n\n\t    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher\n\t            var blockSize = cipher.blockSize;\n\t            var iv = this._iv;\n\t            var counter = this._counter;\n\n\t            // Generate keystream\n\t            if (iv) {\n\t                counter = this._counter = iv.slice(0);\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            }\n\n\t\t\t\tincCounter(counter);\n\n\t\t\t\tvar keystream = counter.slice(0);\n\t            cipher.encryptBlock(keystream, 0);\n\n\t            // Encrypt\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= keystream[i];\n\t            }\n\t        }\n\t    });\n\n\t    CTRGladman.Decryptor = Encryptor;\n\n\t    return CTRGladman;\n\t}());\n\n\n\n\n\treturn CryptoJS.mode.CTRGladman;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Output Feedback block mode.\n\t */\n\tCryptoJS.mode.OFB = (function () {\n\t    var OFB = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    var Encryptor = OFB.Encryptor = OFB.extend({\n\t        processBlock: function (words, offset) {\n\t            // Shortcuts\n\t            var cipher = this._cipher\n\t            var blockSize = cipher.blockSize;\n\t            var iv = this._iv;\n\t            var keystream = this._keystream;\n\n\t            // Generate keystream\n\t            if (iv) {\n\t                keystream = this._keystream = iv.slice(0);\n\n\t                // Remove IV for subsequent blocks\n\t                this._iv = undefined;\n\t            }\n\t            cipher.encryptBlock(keystream, 0);\n\n\t            // Encrypt\n\t            for (var i = 0; i < blockSize; i++) {\n\t                words[offset + i] ^= keystream[i];\n\t            }\n\t        }\n\t    });\n\n\t    OFB.Decryptor = Encryptor;\n\n\t    return OFB;\n\t}());\n\n\n\treturn CryptoJS.mode.OFB;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Electronic Codebook block mode.\n\t */\n\tCryptoJS.mode.ECB = (function () {\n\t    var ECB = CryptoJS.lib.BlockCipherMode.extend();\n\n\t    ECB.Encryptor = ECB.extend({\n\t        processBlock: function (words, offset) {\n\t            this._cipher.encryptBlock(words, offset);\n\t        }\n\t    });\n\n\t    ECB.Decryptor = ECB.extend({\n\t        processBlock: function (words, offset) {\n\t            this._cipher.decryptBlock(words, offset);\n\t        }\n\t    });\n\n\t    return ECB;\n\t}());\n\n\n\treturn CryptoJS.mode.ECB;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * ANSI X.923 padding strategy.\n\t */\n\tCryptoJS.pad.AnsiX923 = {\n\t    pad: function (data, blockSize) {\n\t        // Shortcuts\n\t        var dataSigBytes = data.sigBytes;\n\t        var blockSizeBytes = blockSize * 4;\n\n\t        // Count padding bytes\n\t        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;\n\n\t        // Compute last byte position\n\t        var lastBytePos = dataSigBytes + nPaddingBytes - 1;\n\n\t        // Pad\n\t        data.clamp();\n\t        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);\n\t        data.sigBytes += nPaddingBytes;\n\t    },\n\n\t    unpad: function (data) {\n\t        // Get number of padding bytes from last byte\n\t        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\n\n\t        // Remove padding\n\t        data.sigBytes -= nPaddingBytes;\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.Ansix923;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * ISO 10126 padding strategy.\n\t */\n\tCryptoJS.pad.Iso10126 = {\n\t    pad: function (data, blockSize) {\n\t        // Shortcut\n\t        var blockSizeBytes = blockSize * 4;\n\n\t        // Count padding bytes\n\t        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;\n\n\t        // Pad\n\t        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).\n\t             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));\n\t    },\n\n\t    unpad: function (data) {\n\t        // Get number of padding bytes from last byte\n\t        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\n\n\t        // Remove padding\n\t        data.sigBytes -= nPaddingBytes;\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.Iso10126;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * ISO/IEC 9797-1 Padding Method 2.\n\t */\n\tCryptoJS.pad.Iso97971 = {\n\t    pad: function (data, blockSize) {\n\t        // Add 0x80 byte\n\t        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));\n\n\t        // Zero pad the rest\n\t        CryptoJS.pad.ZeroPadding.pad(data, blockSize);\n\t    },\n\n\t    unpad: function (data) {\n\t        // Remove zero padding\n\t        CryptoJS.pad.ZeroPadding.unpad(data);\n\n\t        // Remove one more byte -- the 0x80 byte\n\t        data.sigBytes--;\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.Iso97971;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * Zero padding strategy.\n\t */\n\tCryptoJS.pad.ZeroPadding = {\n\t    pad: function (data, blockSize) {\n\t        // Shortcut\n\t        var blockSizeBytes = blockSize * 4;\n\n\t        // Pad\n\t        data.clamp();\n\t        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);\n\t    },\n\n\t    unpad: function (data) {\n\t        // Shortcut\n\t        var dataWords = data.words;\n\n\t        // Unpad\n\t        var i = data.sigBytes - 1;\n\t        for (var i = data.sigBytes - 1; i >= 0; i--) {\n\t            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {\n\t                data.sigBytes = i + 1;\n\t                break;\n\t            }\n\t        }\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.ZeroPadding;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t/**\n\t * A noop padding strategy.\n\t */\n\tCryptoJS.pad.NoPadding = {\n\t    pad: function () {\n\t    },\n\n\t    unpad: function () {\n\t    }\n\t};\n\n\n\treturn CryptoJS.pad.NoPadding;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function (undefined) {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var CipherParams = C_lib.CipherParams;\n\t    var C_enc = C.enc;\n\t    var Hex = C_enc.Hex;\n\t    var C_format = C.format;\n\n\t    var HexFormatter = C_format.Hex = {\n\t        /**\n\t         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.\n\t         *\n\t         * @param {CipherParams} cipherParams The cipher params object.\n\t         *\n\t         * @return {string} The hexadecimally encoded string.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);\n\t         */\n\t        stringify: function (cipherParams) {\n\t            return cipherParams.ciphertext.toString(Hex);\n\t        },\n\n\t        /**\n\t         * Converts a hexadecimally encoded ciphertext string to a cipher params object.\n\t         *\n\t         * @param {string} input The hexadecimally encoded string.\n\t         *\n\t         * @return {CipherParams} The cipher params object.\n\t         *\n\t         * @static\n\t         *\n\t         * @example\n\t         *\n\t         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);\n\t         */\n\t        parse: function (input) {\n\t            var ciphertext = Hex.parse(input);\n\t            return CipherParams.create({ ciphertext: ciphertext });\n\t        }\n\t    };\n\t}());\n\n\n\treturn CryptoJS.format.Hex;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var BlockCipher = C_lib.BlockCipher;\n\t    var C_algo = C.algo;\n\n\t    // Lookup tables\n\t    var SBOX = [];\n\t    var INV_SBOX = [];\n\t    var SUB_MIX_0 = [];\n\t    var SUB_MIX_1 = [];\n\t    var SUB_MIX_2 = [];\n\t    var SUB_MIX_3 = [];\n\t    var INV_SUB_MIX_0 = [];\n\t    var INV_SUB_MIX_1 = [];\n\t    var INV_SUB_MIX_2 = [];\n\t    var INV_SUB_MIX_3 = [];\n\n\t    // Compute lookup tables\n\t    (function () {\n\t        // Compute double table\n\t        var d = [];\n\t        for (var i = 0; i < 256; i++) {\n\t            if (i < 128) {\n\t                d[i] = i << 1;\n\t            } else {\n\t                d[i] = (i << 1) ^ 0x11b;\n\t            }\n\t        }\n\n\t        // Walk GF(2^8)\n\t        var x = 0;\n\t        var xi = 0;\n\t        for (var i = 0; i < 256; i++) {\n\t            // Compute sbox\n\t            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);\n\t            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;\n\t            SBOX[x] = sx;\n\t            INV_SBOX[sx] = x;\n\n\t            // Compute multiplication\n\t            var x2 = d[x];\n\t            var x4 = d[x2];\n\t            var x8 = d[x4];\n\n\t            // Compute sub bytes, mix columns tables\n\t            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);\n\t            SUB_MIX_0[x] = (t << 24) | (t >>> 8);\n\t            SUB_MIX_1[x] = (t << 16) | (t >>> 16);\n\t            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);\n\t            SUB_MIX_3[x] = t;\n\n\t            // Compute inv sub bytes, inv mix columns tables\n\t            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);\n\t            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);\n\t            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);\n\t            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);\n\t            INV_SUB_MIX_3[sx] = t;\n\n\t            // Compute next counter\n\t            if (!x) {\n\t                x = xi = 1;\n\t            } else {\n\t                x = x2 ^ d[d[d[x8 ^ x2]]];\n\t                xi ^= d[d[xi]];\n\t            }\n\t        }\n\t    }());\n\n\t    // Precomputed Rcon lookup\n\t    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];\n\n\t    /**\n\t     * AES block cipher algorithm.\n\t     */\n\t    var AES = C_algo.AES = BlockCipher.extend({\n\t        _doReset: function () {\n\t            var t;\n\n\t            // Skip reset of nRounds has been set before and key did not change\n\t            if (this._nRounds && this._keyPriorReset === this._key) {\n\t                return;\n\t            }\n\n\t            // Shortcuts\n\t            var key = this._keyPriorReset = this._key;\n\t            var keyWords = key.words;\n\t            var keySize = key.sigBytes / 4;\n\n\t            // Compute number of rounds\n\t            var nRounds = this._nRounds = keySize + 6;\n\n\t            // Compute number of key schedule rows\n\t            var ksRows = (nRounds + 1) * 4;\n\n\t            // Compute key schedule\n\t            var keySchedule = this._keySchedule = [];\n\t            for (var ksRow = 0; ksRow < ksRows; ksRow++) {\n\t                if (ksRow < keySize) {\n\t                    keySchedule[ksRow] = keyWords[ksRow];\n\t                } else {\n\t                    t = keySchedule[ksRow - 1];\n\n\t                    if (!(ksRow % keySize)) {\n\t                        // Rot word\n\t                        t = (t << 8) | (t >>> 24);\n\n\t                        // Sub word\n\t                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];\n\n\t                        // Mix Rcon\n\t                        t ^= RCON[(ksRow / keySize) | 0] << 24;\n\t                    } else if (keySize > 6 && ksRow % keySize == 4) {\n\t                        // Sub word\n\t                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];\n\t                    }\n\n\t                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;\n\t                }\n\t            }\n\n\t            // Compute inv key schedule\n\t            var invKeySchedule = this._invKeySchedule = [];\n\t            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {\n\t                var ksRow = ksRows - invKsRow;\n\n\t                if (invKsRow % 4) {\n\t                    var t = keySchedule[ksRow];\n\t                } else {\n\t                    var t = keySchedule[ksRow - 4];\n\t                }\n\n\t                if (invKsRow < 4 || ksRow <= 4) {\n\t                    invKeySchedule[invKsRow] = t;\n\t                } else {\n\t                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^\n\t                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];\n\t                }\n\t            }\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            // Swap 2nd and 4th rows\n\t            var t = M[offset + 1];\n\t            M[offset + 1] = M[offset + 3];\n\t            M[offset + 3] = t;\n\n\t            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);\n\n\t            // Inv swap 2nd and 4th rows\n\t            var t = M[offset + 1];\n\t            M[offset + 1] = M[offset + 3];\n\t            M[offset + 3] = t;\n\t        },\n\n\t        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {\n\t            // Shortcut\n\t            var nRounds = this._nRounds;\n\n\t            // Get input, add round key\n\t            var s0 = M[offset]     ^ keySchedule[0];\n\t            var s1 = M[offset + 1] ^ keySchedule[1];\n\t            var s2 = M[offset + 2] ^ keySchedule[2];\n\t            var s3 = M[offset + 3] ^ keySchedule[3];\n\n\t            // Key schedule row counter\n\t            var ksRow = 4;\n\n\t            // Rounds\n\t            for (var round = 1; round < nRounds; round++) {\n\t                // Shift rows, sub bytes, mix columns, add round key\n\t                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];\n\t                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];\n\t                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];\n\t                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];\n\n\t                // Update state\n\t                s0 = t0;\n\t                s1 = t1;\n\t                s2 = t2;\n\t                s3 = t3;\n\t            }\n\n\t            // Shift rows, sub bytes, add round key\n\t            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];\n\t            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];\n\t            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];\n\t            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];\n\n\t            // Set output\n\t            M[offset]     = t0;\n\t            M[offset + 1] = t1;\n\t            M[offset + 2] = t2;\n\t            M[offset + 3] = t3;\n\t        },\n\n\t        keySize: 256/32\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.AES = BlockCipher._createHelper(AES);\n\t}());\n\n\n\treturn CryptoJS.AES;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var WordArray = C_lib.WordArray;\n\t    var BlockCipher = C_lib.BlockCipher;\n\t    var C_algo = C.algo;\n\n\t    // Permuted Choice 1 constants\n\t    var PC1 = [\n\t        57, 49, 41, 33, 25, 17, 9,  1,\n\t        58, 50, 42, 34, 26, 18, 10, 2,\n\t        59, 51, 43, 35, 27, 19, 11, 3,\n\t        60, 52, 44, 36, 63, 55, 47, 39,\n\t        31, 23, 15, 7,  62, 54, 46, 38,\n\t        30, 22, 14, 6,  61, 53, 45, 37,\n\t        29, 21, 13, 5,  28, 20, 12, 4\n\t    ];\n\n\t    // Permuted Choice 2 constants\n\t    var PC2 = [\n\t        14, 17, 11, 24, 1,  5,\n\t        3,  28, 15, 6,  21, 10,\n\t        23, 19, 12, 4,  26, 8,\n\t        16, 7,  27, 20, 13, 2,\n\t        41, 52, 31, 37, 47, 55,\n\t        30, 40, 51, 45, 33, 48,\n\t        44, 49, 39, 56, 34, 53,\n\t        46, 42, 50, 36, 29, 32\n\t    ];\n\n\t    // Cumulative bit shift constants\n\t    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];\n\n\t    // SBOXes and round permutation constants\n\t    var SBOX_P = [\n\t        {\n\t            0x0: 0x808200,\n\t            0x10000000: 0x8000,\n\t            0x20000000: 0x808002,\n\t            0x30000000: 0x2,\n\t            0x40000000: 0x200,\n\t            0x50000000: 0x808202,\n\t            0x60000000: 0x800202,\n\t            0x70000000: 0x800000,\n\t            0x80000000: 0x202,\n\t            0x90000000: 0x800200,\n\t            0xa0000000: 0x8200,\n\t            0xb0000000: 0x808000,\n\t            0xc0000000: 0x8002,\n\t            0xd0000000: 0x800002,\n\t            0xe0000000: 0x0,\n\t            0xf0000000: 0x8202,\n\t            0x8000000: 0x0,\n\t            0x18000000: 0x808202,\n\t            0x28000000: 0x8202,\n\t            0x38000000: 0x8000,\n\t            0x48000000: 0x808200,\n\t            0x58000000: 0x200,\n\t            0x68000000: 0x808002,\n\t            0x78000000: 0x2,\n\t            0x88000000: 0x800200,\n\t            0x98000000: 0x8200,\n\t            0xa8000000: 0x808000,\n\t            0xb8000000: 0x800202,\n\t            0xc8000000: 0x800002,\n\t            0xd8000000: 0x8002,\n\t            0xe8000000: 0x202,\n\t            0xf8000000: 0x800000,\n\t            0x1: 0x8000,\n\t            0x10000001: 0x2,\n\t            0x20000001: 0x808200,\n\t            0x30000001: 0x800000,\n\t            0x40000001: 0x808002,\n\t            0x50000001: 0x8200,\n\t            0x60000001: 0x200,\n\t            0x70000001: 0x800202,\n\t            0x80000001: 0x808202,\n\t            0x90000001: 0x808000,\n\t            0xa0000001: 0x800002,\n\t            0xb0000001: 0x8202,\n\t            0xc0000001: 0x202,\n\t            0xd0000001: 0x800200,\n\t            0xe0000001: 0x8002,\n\t            0xf0000001: 0x0,\n\t            0x8000001: 0x808202,\n\t            0x18000001: 0x808000,\n\t            0x28000001: 0x800000,\n\t            0x38000001: 0x200,\n\t            0x48000001: 0x8000,\n\t            0x58000001: 0x800002,\n\t            0x68000001: 0x2,\n\t            0x78000001: 0x8202,\n\t            0x88000001: 0x8002,\n\t            0x98000001: 0x800202,\n\t            0xa8000001: 0x202,\n\t            0xb8000001: 0x808200,\n\t            0xc8000001: 0x800200,\n\t            0xd8000001: 0x0,\n\t            0xe8000001: 0x8200,\n\t            0xf8000001: 0x808002\n\t        },\n\t        {\n\t            0x0: 0x40084010,\n\t            0x1000000: 0x4000,\n\t            0x2000000: 0x80000,\n\t            0x3000000: 0x40080010,\n\t            0x4000000: 0x40000010,\n\t            0x5000000: 0x40084000,\n\t            0x6000000: 0x40004000,\n\t            0x7000000: 0x10,\n\t            0x8000000: 0x84000,\n\t            0x9000000: 0x40004010,\n\t            0xa000000: 0x40000000,\n\t            0xb000000: 0x84010,\n\t            0xc000000: 0x80010,\n\t            0xd000000: 0x0,\n\t            0xe000000: 0x4010,\n\t            0xf000000: 0x40080000,\n\t            0x800000: 0x40004000,\n\t            0x1800000: 0x84010,\n\t            0x2800000: 0x10,\n\t            0x3800000: 0x40004010,\n\t            0x4800000: 0x40084010,\n\t            0x5800000: 0x40000000,\n\t            0x6800000: 0x80000,\n\t            0x7800000: 0x40080010,\n\t            0x8800000: 0x80010,\n\t            0x9800000: 0x0,\n\t            0xa800000: 0x4000,\n\t            0xb800000: 0x40080000,\n\t            0xc800000: 0x40000010,\n\t            0xd800000: 0x84000,\n\t            0xe800000: 0x40084000,\n\t            0xf800000: 0x4010,\n\t            0x10000000: 0x0,\n\t            0x11000000: 0x40080010,\n\t            0x12000000: 0x40004010,\n\t            0x13000000: 0x40084000,\n\t            0x14000000: 0x40080000,\n\t            0x15000000: 0x10,\n\t            0x16000000: 0x84010,\n\t            0x17000000: 0x4000,\n\t            0x18000000: 0x4010,\n\t            0x19000000: 0x80000,\n\t            0x1a000000: 0x80010,\n\t            0x1b000000: 0x40000010,\n\t            0x1c000000: 0x84000,\n\t            0x1d000000: 0x40004000,\n\t            0x1e000000: 0x40000000,\n\t            0x1f000000: 0x40084010,\n\t            0x10800000: 0x84010,\n\t            0x11800000: 0x80000,\n\t            0x12800000: 0x40080000,\n\t            0x13800000: 0x4000,\n\t            0x14800000: 0x40004000,\n\t            0x15800000: 0x40084010,\n\t            0x16800000: 0x10,\n\t            0x17800000: 0x40000000,\n\t            0x18800000: 0x40084000,\n\t            0x19800000: 0x40000010,\n\t            0x1a800000: 0x40004010,\n\t            0x1b800000: 0x80010,\n\t            0x1c800000: 0x0,\n\t            0x1d800000: 0x4010,\n\t            0x1e800000: 0x40080010,\n\t            0x1f800000: 0x84000\n\t        },\n\t        {\n\t            0x0: 0x104,\n\t            0x100000: 0x0,\n\t            0x200000: 0x4000100,\n\t            0x300000: 0x10104,\n\t            0x400000: 0x10004,\n\t            0x500000: 0x4000004,\n\t            0x600000: 0x4010104,\n\t            0x700000: 0x4010000,\n\t            0x800000: 0x4000000,\n\t            0x900000: 0x4010100,\n\t            0xa00000: 0x10100,\n\t            0xb00000: 0x4010004,\n\t            0xc00000: 0x4000104,\n\t            0xd00000: 0x10000,\n\t            0xe00000: 0x4,\n\t            0xf00000: 0x100,\n\t            0x80000: 0x4010100,\n\t            0x180000: 0x4010004,\n\t            0x280000: 0x0,\n\t            0x380000: 0x4000100,\n\t            0x480000: 0x4000004,\n\t            0x580000: 0x10000,\n\t            0x680000: 0x10004,\n\t            0x780000: 0x104,\n\t            0x880000: 0x4,\n\t            0x980000: 0x100,\n\t            0xa80000: 0x4010000,\n\t            0xb80000: 0x10104,\n\t            0xc80000: 0x10100,\n\t            0xd80000: 0x4000104,\n\t            0xe80000: 0x4010104,\n\t            0xf80000: 0x4000000,\n\t            0x1000000: 0x4010100,\n\t            0x1100000: 0x10004,\n\t            0x1200000: 0x10000,\n\t            0x1300000: 0x4000100,\n\t            0x1400000: 0x100,\n\t            0x1500000: 0x4010104,\n\t            0x1600000: 0x4000004,\n\t            0x1700000: 0x0,\n\t            0x1800000: 0x4000104,\n\t            0x1900000: 0x4000000,\n\t            0x1a00000: 0x4,\n\t            0x1b00000: 0x10100,\n\t            0x1c00000: 0x4010000,\n\t            0x1d00000: 0x104,\n\t            0x1e00000: 0x10104,\n\t            0x1f00000: 0x4010004,\n\t            0x1080000: 0x4000000,\n\t            0x1180000: 0x104,\n\t            0x1280000: 0x4010100,\n\t            0x1380000: 0x0,\n\t            0x1480000: 0x10004,\n\t            0x1580000: 0x4000100,\n\t            0x1680000: 0x100,\n\t            0x1780000: 0x4010004,\n\t            0x1880000: 0x10000,\n\t            0x1980000: 0x4010104,\n\t            0x1a80000: 0x10104,\n\t            0x1b80000: 0x4000004,\n\t            0x1c80000: 0x4000104,\n\t            0x1d80000: 0x4010000,\n\t            0x1e80000: 0x4,\n\t            0x1f80000: 0x10100\n\t        },\n\t        {\n\t            0x0: 0x80401000,\n\t            0x10000: 0x80001040,\n\t            0x20000: 0x401040,\n\t            0x30000: 0x80400000,\n\t            0x40000: 0x0,\n\t            0x50000: 0x401000,\n\t            0x60000: 0x80000040,\n\t            0x70000: 0x400040,\n\t            0x80000: 0x80000000,\n\t            0x90000: 0x400000,\n\t            0xa0000: 0x40,\n\t            0xb0000: 0x80001000,\n\t            0xc0000: 0x80400040,\n\t            0xd0000: 0x1040,\n\t            0xe0000: 0x1000,\n\t            0xf0000: 0x80401040,\n\t            0x8000: 0x80001040,\n\t            0x18000: 0x40,\n\t            0x28000: 0x80400040,\n\t            0x38000: 0x80001000,\n\t            0x48000: 0x401000,\n\t            0x58000: 0x80401040,\n\t            0x68000: 0x0,\n\t            0x78000: 0x80400000,\n\t            0x88000: 0x1000,\n\t            0x98000: 0x80401000,\n\t            0xa8000: 0x400000,\n\t            0xb8000: 0x1040,\n\t            0xc8000: 0x80000000,\n\t            0xd8000: 0x400040,\n\t            0xe8000: 0x401040,\n\t            0xf8000: 0x80000040,\n\t            0x100000: 0x400040,\n\t            0x110000: 0x401000,\n\t            0x120000: 0x80000040,\n\t            0x130000: 0x0,\n\t            0x140000: 0x1040,\n\t            0x150000: 0x80400040,\n\t            0x160000: 0x80401000,\n\t            0x170000: 0x80001040,\n\t            0x180000: 0x80401040,\n\t            0x190000: 0x80000000,\n\t            0x1a0000: 0x80400000,\n\t            0x1b0000: 0x401040,\n\t            0x1c0000: 0x80001000,\n\t            0x1d0000: 0x400000,\n\t            0x1e0000: 0x40,\n\t            0x1f0000: 0x1000,\n\t            0x108000: 0x80400000,\n\t            0x118000: 0x80401040,\n\t            0x128000: 0x0,\n\t            0x138000: 0x401000,\n\t            0x148000: 0x400040,\n\t            0x158000: 0x80000000,\n\t            0x168000: 0x80001040,\n\t            0x178000: 0x40,\n\t            0x188000: 0x80000040,\n\t            0x198000: 0x1000,\n\t            0x1a8000: 0x80001000,\n\t            0x1b8000: 0x80400040,\n\t            0x1c8000: 0x1040,\n\t            0x1d8000: 0x80401000,\n\t            0x1e8000: 0x400000,\n\t            0x1f8000: 0x401040\n\t        },\n\t        {\n\t            0x0: 0x80,\n\t            0x1000: 0x1040000,\n\t            0x2000: 0x40000,\n\t            0x3000: 0x20000000,\n\t            0x4000: 0x20040080,\n\t            0x5000: 0x1000080,\n\t            0x6000: 0x21000080,\n\t            0x7000: 0x40080,\n\t            0x8000: 0x1000000,\n\t            0x9000: 0x20040000,\n\t            0xa000: 0x20000080,\n\t            0xb000: 0x21040080,\n\t            0xc000: 0x21040000,\n\t            0xd000: 0x0,\n\t            0xe000: 0x1040080,\n\t            0xf000: 0x21000000,\n\t            0x800: 0x1040080,\n\t            0x1800: 0x21000080,\n\t            0x2800: 0x80,\n\t            0x3800: 0x1040000,\n\t            0x4800: 0x40000,\n\t            0x5800: 0x20040080,\n\t            0x6800: 0x21040000,\n\t            0x7800: 0x20000000,\n\t            0x8800: 0x20040000,\n\t            0x9800: 0x0,\n\t            0xa800: 0x21040080,\n\t            0xb800: 0x1000080,\n\t            0xc800: 0x20000080,\n\t            0xd800: 0x21000000,\n\t            0xe800: 0x1000000,\n\t            0xf800: 0x40080,\n\t            0x10000: 0x40000,\n\t            0x11000: 0x80,\n\t            0x12000: 0x20000000,\n\t            0x13000: 0x21000080,\n\t            0x14000: 0x1000080,\n\t            0x15000: 0x21040000,\n\t            0x16000: 0x20040080,\n\t            0x17000: 0x1000000,\n\t            0x18000: 0x21040080,\n\t            0x19000: 0x21000000,\n\t            0x1a000: 0x1040000,\n\t            0x1b000: 0x20040000,\n\t            0x1c000: 0x40080,\n\t            0x1d000: 0x20000080,\n\t            0x1e000: 0x0,\n\t            0x1f000: 0x1040080,\n\t            0x10800: 0x21000080,\n\t            0x11800: 0x1000000,\n\t            0x12800: 0x1040000,\n\t            0x13800: 0x20040080,\n\t            0x14800: 0x20000000,\n\t            0x15800: 0x1040080,\n\t            0x16800: 0x80,\n\t            0x17800: 0x21040000,\n\t            0x18800: 0x40080,\n\t            0x19800: 0x21040080,\n\t            0x1a800: 0x0,\n\t            0x1b800: 0x21000000,\n\t            0x1c800: 0x1000080,\n\t            0x1d800: 0x40000,\n\t            0x1e800: 0x20040000,\n\t            0x1f800: 0x20000080\n\t        },\n\t        {\n\t            0x0: 0x10000008,\n\t            0x100: 0x2000,\n\t            0x200: 0x10200000,\n\t            0x300: 0x10202008,\n\t            0x400: 0x10002000,\n\t            0x500: 0x200000,\n\t            0x600: 0x200008,\n\t            0x700: 0x10000000,\n\t            0x800: 0x0,\n\t            0x900: 0x10002008,\n\t            0xa00: 0x202000,\n\t            0xb00: 0x8,\n\t            0xc00: 0x10200008,\n\t            0xd00: 0x202008,\n\t            0xe00: 0x2008,\n\t            0xf00: 0x10202000,\n\t            0x80: 0x10200000,\n\t            0x180: 0x10202008,\n\t            0x280: 0x8,\n\t            0x380: 0x200000,\n\t            0x480: 0x202008,\n\t            0x580: 0x10000008,\n\t            0x680: 0x10002000,\n\t            0x780: 0x2008,\n\t            0x880: 0x200008,\n\t            0x980: 0x2000,\n\t            0xa80: 0x10002008,\n\t            0xb80: 0x10200008,\n\t            0xc80: 0x0,\n\t            0xd80: 0x10202000,\n\t            0xe80: 0x202000,\n\t            0xf80: 0x10000000,\n\t            0x1000: 0x10002000,\n\t            0x1100: 0x10200008,\n\t            0x1200: 0x10202008,\n\t            0x1300: 0x2008,\n\t            0x1400: 0x200000,\n\t            0x1500: 0x10000000,\n\t            0x1600: 0x10000008,\n\t            0x1700: 0x202000,\n\t            0x1800: 0x202008,\n\t            0x1900: 0x0,\n\t            0x1a00: 0x8,\n\t            0x1b00: 0x10200000,\n\t            0x1c00: 0x2000,\n\t            0x1d00: 0x10002008,\n\t            0x1e00: 0x10202000,\n\t            0x1f00: 0x200008,\n\t            0x1080: 0x8,\n\t            0x1180: 0x202000,\n\t            0x1280: 0x200000,\n\t            0x1380: 0x10000008,\n\t            0x1480: 0x10002000,\n\t            0x1580: 0x2008,\n\t            0x1680: 0x10202008,\n\t            0x1780: 0x10200000,\n\t            0x1880: 0x10202000,\n\t            0x1980: 0x10200008,\n\t            0x1a80: 0x2000,\n\t            0x1b80: 0x202008,\n\t            0x1c80: 0x200008,\n\t            0x1d80: 0x0,\n\t            0x1e80: 0x10000000,\n\t            0x1f80: 0x10002008\n\t        },\n\t        {\n\t            0x0: 0x100000,\n\t            0x10: 0x2000401,\n\t            0x20: 0x400,\n\t            0x30: 0x100401,\n\t            0x40: 0x2100401,\n\t            0x50: 0x0,\n\t            0x60: 0x1,\n\t            0x70: 0x2100001,\n\t            0x80: 0x2000400,\n\t            0x90: 0x100001,\n\t            0xa0: 0x2000001,\n\t            0xb0: 0x2100400,\n\t            0xc0: 0x2100000,\n\t            0xd0: 0x401,\n\t            0xe0: 0x100400,\n\t            0xf0: 0x2000000,\n\t            0x8: 0x2100001,\n\t            0x18: 0x0,\n\t            0x28: 0x2000401,\n\t            0x38: 0x2100400,\n\t            0x48: 0x100000,\n\t            0x58: 0x2000001,\n\t            0x68: 0x2000000,\n\t            0x78: 0x401,\n\t            0x88: 0x100401,\n\t            0x98: 0x2000400,\n\t            0xa8: 0x2100000,\n\t            0xb8: 0x100001,\n\t            0xc8: 0x400,\n\t            0xd8: 0x2100401,\n\t            0xe8: 0x1,\n\t            0xf8: 0x100400,\n\t            0x100: 0x2000000,\n\t            0x110: 0x100000,\n\t            0x120: 0x2000401,\n\t            0x130: 0x2100001,\n\t            0x140: 0x100001,\n\t            0x150: 0x2000400,\n\t            0x160: 0x2100400,\n\t            0x170: 0x100401,\n\t            0x180: 0x401,\n\t            0x190: 0x2100401,\n\t            0x1a0: 0x100400,\n\t            0x1b0: 0x1,\n\t            0x1c0: 0x0,\n\t            0x1d0: 0x2100000,\n\t            0x1e0: 0x2000001,\n\t            0x1f0: 0x400,\n\t            0x108: 0x100400,\n\t            0x118: 0x2000401,\n\t            0x128: 0x2100001,\n\t            0x138: 0x1,\n\t            0x148: 0x2000000,\n\t            0x158: 0x100000,\n\t            0x168: 0x401,\n\t            0x178: 0x2100400,\n\t            0x188: 0x2000001,\n\t            0x198: 0x2100000,\n\t            0x1a8: 0x0,\n\t            0x1b8: 0x2100401,\n\t            0x1c8: 0x100401,\n\t            0x1d8: 0x400,\n\t            0x1e8: 0x2000400,\n\t            0x1f8: 0x100001\n\t        },\n\t        {\n\t            0x0: 0x8000820,\n\t            0x1: 0x20000,\n\t            0x2: 0x8000000,\n\t            0x3: 0x20,\n\t            0x4: 0x20020,\n\t            0x5: 0x8020820,\n\t            0x6: 0x8020800,\n\t            0x7: 0x800,\n\t            0x8: 0x8020000,\n\t            0x9: 0x8000800,\n\t            0xa: 0x20800,\n\t            0xb: 0x8020020,\n\t            0xc: 0x820,\n\t            0xd: 0x0,\n\t            0xe: 0x8000020,\n\t            0xf: 0x20820,\n\t            0x80000000: 0x800,\n\t            0x80000001: 0x8020820,\n\t            0x80000002: 0x8000820,\n\t            0x80000003: 0x8000000,\n\t            0x80000004: 0x8020000,\n\t            0x80000005: 0x20800,\n\t            0x80000006: 0x20820,\n\t            0x80000007: 0x20,\n\t            0x80000008: 0x8000020,\n\t            0x80000009: 0x820,\n\t            0x8000000a: 0x20020,\n\t            0x8000000b: 0x8020800,\n\t            0x8000000c: 0x0,\n\t            0x8000000d: 0x8020020,\n\t            0x8000000e: 0x8000800,\n\t            0x8000000f: 0x20000,\n\t            0x10: 0x20820,\n\t            0x11: 0x8020800,\n\t            0x12: 0x20,\n\t            0x13: 0x800,\n\t            0x14: 0x8000800,\n\t            0x15: 0x8000020,\n\t            0x16: 0x8020020,\n\t            0x17: 0x20000,\n\t            0x18: 0x0,\n\t            0x19: 0x20020,\n\t            0x1a: 0x8020000,\n\t            0x1b: 0x8000820,\n\t            0x1c: 0x8020820,\n\t            0x1d: 0x20800,\n\t            0x1e: 0x820,\n\t            0x1f: 0x8000000,\n\t            0x80000010: 0x20000,\n\t            0x80000011: 0x800,\n\t            0x80000012: 0x8020020,\n\t            0x80000013: 0x20820,\n\t            0x80000014: 0x20,\n\t            0x80000015: 0x8020000,\n\t            0x80000016: 0x8000000,\n\t            0x80000017: 0x8000820,\n\t            0x80000018: 0x8020820,\n\t            0x80000019: 0x8000020,\n\t            0x8000001a: 0x8000800,\n\t            0x8000001b: 0x0,\n\t            0x8000001c: 0x20800,\n\t            0x8000001d: 0x820,\n\t            0x8000001e: 0x20020,\n\t            0x8000001f: 0x8020800\n\t        }\n\t    ];\n\n\t    // Masks that select the SBOX input\n\t    var SBOX_MASK = [\n\t        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,\n\t        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f\n\t    ];\n\n\t    /**\n\t     * DES block cipher algorithm.\n\t     */\n\t    var DES = C_algo.DES = BlockCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var key = this._key;\n\t            var keyWords = key.words;\n\n\t            // Select 56 bits according to PC1\n\t            var keyBits = [];\n\t            for (var i = 0; i < 56; i++) {\n\t                var keyBitPos = PC1[i] - 1;\n\t                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;\n\t            }\n\n\t            // Assemble 16 subkeys\n\t            var subKeys = this._subKeys = [];\n\t            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {\n\t                // Create subkey\n\t                var subKey = subKeys[nSubKey] = [];\n\n\t                // Shortcut\n\t                var bitShift = BIT_SHIFTS[nSubKey];\n\n\t                // Select 48 bits according to PC2\n\t                for (var i = 0; i < 24; i++) {\n\t                    // Select from the left 28 key bits\n\t                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);\n\n\t                    // Select from the right 28 key bits\n\t                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);\n\t                }\n\n\t                // Since each subkey is applied to an expanded 32-bit input,\n\t                // the subkey can be broken into 8 values scaled to 32-bits,\n\t                // which allows the key to be used without expansion\n\t                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);\n\t                for (var i = 1; i < 7; i++) {\n\t                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);\n\t                }\n\t                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);\n\t            }\n\n\t            // Compute inverse subkeys\n\t            var invSubKeys = this._invSubKeys = [];\n\t            for (var i = 0; i < 16; i++) {\n\t                invSubKeys[i] = subKeys[15 - i];\n\t            }\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            this._doCryptBlock(M, offset, this._subKeys);\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            this._doCryptBlock(M, offset, this._invSubKeys);\n\t        },\n\n\t        _doCryptBlock: function (M, offset, subKeys) {\n\t            // Get input\n\t            this._lBlock = M[offset];\n\t            this._rBlock = M[offset + 1];\n\n\t            // Initial permutation\n\t            exchangeLR.call(this, 4,  0x0f0f0f0f);\n\t            exchangeLR.call(this, 16, 0x0000ffff);\n\t            exchangeRL.call(this, 2,  0x33333333);\n\t            exchangeRL.call(this, 8,  0x00ff00ff);\n\t            exchangeLR.call(this, 1,  0x55555555);\n\n\t            // Rounds\n\t            for (var round = 0; round < 16; round++) {\n\t                // Shortcuts\n\t                var subKey = subKeys[round];\n\t                var lBlock = this._lBlock;\n\t                var rBlock = this._rBlock;\n\n\t                // Feistel function\n\t                var f = 0;\n\t                for (var i = 0; i < 8; i++) {\n\t                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];\n\t                }\n\t                this._lBlock = rBlock;\n\t                this._rBlock = lBlock ^ f;\n\t            }\n\n\t            // Undo swap from last round\n\t            var t = this._lBlock;\n\t            this._lBlock = this._rBlock;\n\t            this._rBlock = t;\n\n\t            // Final permutation\n\t            exchangeLR.call(this, 1,  0x55555555);\n\t            exchangeRL.call(this, 8,  0x00ff00ff);\n\t            exchangeRL.call(this, 2,  0x33333333);\n\t            exchangeLR.call(this, 16, 0x0000ffff);\n\t            exchangeLR.call(this, 4,  0x0f0f0f0f);\n\n\t            // Set output\n\t            M[offset] = this._lBlock;\n\t            M[offset + 1] = this._rBlock;\n\t        },\n\n\t        keySize: 64/32,\n\n\t        ivSize: 64/32,\n\n\t        blockSize: 64/32\n\t    });\n\n\t    // Swap bits across the left and right words\n\t    function exchangeLR(offset, mask) {\n\t        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;\n\t        this._rBlock ^= t;\n\t        this._lBlock ^= t << offset;\n\t    }\n\n\t    function exchangeRL(offset, mask) {\n\t        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;\n\t        this._lBlock ^= t;\n\t        this._rBlock ^= t << offset;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.DES = BlockCipher._createHelper(DES);\n\n\t    /**\n\t     * Triple-DES block cipher algorithm.\n\t     */\n\t    var TripleDES = C_algo.TripleDES = BlockCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var key = this._key;\n\t            var keyWords = key.words;\n\t            // Make sure the key length is valid (64, 128 or >= 192 bit)\n\t            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {\n\t                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');\n\t            }\n\n\t            // Extend the key according to the keying options defined in 3DES standard\n\t            var key1 = keyWords.slice(0, 2);\n\t            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);\n\t            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);\n\n\t            // Create DES instances\n\t            this._des1 = DES.createEncryptor(WordArray.create(key1));\n\t            this._des2 = DES.createEncryptor(WordArray.create(key2));\n\t            this._des3 = DES.createEncryptor(WordArray.create(key3));\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            this._des1.encryptBlock(M, offset);\n\t            this._des2.decryptBlock(M, offset);\n\t            this._des3.encryptBlock(M, offset);\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            this._des3.decryptBlock(M, offset);\n\t            this._des2.encryptBlock(M, offset);\n\t            this._des1.decryptBlock(M, offset);\n\t        },\n\n\t        keySize: 192/32,\n\n\t        ivSize: 64/32,\n\n\t        blockSize: 64/32\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.TripleDES = BlockCipher._createHelper(TripleDES);\n\t}());\n\n\n\treturn CryptoJS.TripleDES;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var StreamCipher = C_lib.StreamCipher;\n\t    var C_algo = C.algo;\n\n\t    /**\n\t     * RC4 stream cipher algorithm.\n\t     */\n\t    var RC4 = C_algo.RC4 = StreamCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var key = this._key;\n\t            var keyWords = key.words;\n\t            var keySigBytes = key.sigBytes;\n\n\t            // Init sbox\n\t            var S = this._S = [];\n\t            for (var i = 0; i < 256; i++) {\n\t                S[i] = i;\n\t            }\n\n\t            // Key setup\n\t            for (var i = 0, j = 0; i < 256; i++) {\n\t                var keyByteIndex = i % keySigBytes;\n\t                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;\n\n\t                j = (j + S[i] + keyByte) % 256;\n\n\t                // Swap\n\t                var t = S[i];\n\t                S[i] = S[j];\n\t                S[j] = t;\n\t            }\n\n\t            // Counters\n\t            this._i = this._j = 0;\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            M[offset] ^= generateKeystreamWord.call(this);\n\t        },\n\n\t        keySize: 256/32,\n\n\t        ivSize: 0\n\t    });\n\n\t    function generateKeystreamWord() {\n\t        // Shortcuts\n\t        var S = this._S;\n\t        var i = this._i;\n\t        var j = this._j;\n\n\t        // Generate keystream word\n\t        var keystreamWord = 0;\n\t        for (var n = 0; n < 4; n++) {\n\t            i = (i + 1) % 256;\n\t            j = (j + S[i]) % 256;\n\n\t            // Swap\n\t            var t = S[i];\n\t            S[i] = S[j];\n\t            S[j] = t;\n\n\t            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);\n\t        }\n\n\t        // Update counters\n\t        this._i = i;\n\t        this._j = j;\n\n\t        return keystreamWord;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.RC4 = StreamCipher._createHelper(RC4);\n\n\t    /**\n\t     * Modified RC4 stream cipher algorithm.\n\t     */\n\t    var RC4Drop = C_algo.RC4Drop = RC4.extend({\n\t        /**\n\t         * Configuration options.\n\t         *\n\t         * @property {number} drop The number of keystream words to drop. Default 192\n\t         */\n\t        cfg: RC4.cfg.extend({\n\t            drop: 192\n\t        }),\n\n\t        _doReset: function () {\n\t            RC4._doReset.call(this);\n\n\t            // Drop\n\t            for (var i = this.cfg.drop; i > 0; i--) {\n\t                generateKeystreamWord.call(this);\n\t            }\n\t        }\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.RC4Drop = StreamCipher._createHelper(RC4Drop);\n\t}());\n\n\n\treturn CryptoJS.RC4;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var StreamCipher = C_lib.StreamCipher;\n\t    var C_algo = C.algo;\n\n\t    // Reusable objects\n\t    var S  = [];\n\t    var C_ = [];\n\t    var G  = [];\n\n\t    /**\n\t     * Rabbit stream cipher algorithm\n\t     */\n\t    var Rabbit = C_algo.Rabbit = StreamCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var K = this._key.words;\n\t            var iv = this.cfg.iv;\n\n\t            // Swap endian\n\t            for (var i = 0; i < 4; i++) {\n\t                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |\n\t                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);\n\t            }\n\n\t            // Generate initial state values\n\t            var X = this._X = [\n\t                K[0], (K[3] << 16) | (K[2] >>> 16),\n\t                K[1], (K[0] << 16) | (K[3] >>> 16),\n\t                K[2], (K[1] << 16) | (K[0] >>> 16),\n\t                K[3], (K[2] << 16) | (K[1] >>> 16)\n\t            ];\n\n\t            // Generate initial counter values\n\t            var C = this._C = [\n\t                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),\n\t                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),\n\t                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),\n\t                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)\n\t            ];\n\n\t            // Carry bit\n\t            this._b = 0;\n\n\t            // Iterate the system four times\n\t            for (var i = 0; i < 4; i++) {\n\t                nextState.call(this);\n\t            }\n\n\t            // Modify the counters\n\t            for (var i = 0; i < 8; i++) {\n\t                C[i] ^= X[(i + 4) & 7];\n\t            }\n\n\t            // IV setup\n\t            if (iv) {\n\t                // Shortcuts\n\t                var IV = iv.words;\n\t                var IV_0 = IV[0];\n\t                var IV_1 = IV[1];\n\n\t                // Generate four subvectors\n\t                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);\n\t                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);\n\t                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);\n\t                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);\n\n\t                // Modify counter values\n\t                C[0] ^= i0;\n\t                C[1] ^= i1;\n\t                C[2] ^= i2;\n\t                C[3] ^= i3;\n\t                C[4] ^= i0;\n\t                C[5] ^= i1;\n\t                C[6] ^= i2;\n\t                C[7] ^= i3;\n\n\t                // Iterate the system four times\n\t                for (var i = 0; i < 4; i++) {\n\t                    nextState.call(this);\n\t                }\n\t            }\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var X = this._X;\n\n\t            // Iterate the system\n\t            nextState.call(this);\n\n\t            // Generate four keystream words\n\t            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);\n\t            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);\n\t            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);\n\t            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);\n\n\t            for (var i = 0; i < 4; i++) {\n\t                // Swap endian\n\t                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |\n\t                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);\n\n\t                // Encrypt\n\t                M[offset + i] ^= S[i];\n\t            }\n\t        },\n\n\t        blockSize: 128/32,\n\n\t        ivSize: 64/32\n\t    });\n\n\t    function nextState() {\n\t        // Shortcuts\n\t        var X = this._X;\n\t        var C = this._C;\n\n\t        // Save old counter values\n\t        for (var i = 0; i < 8; i++) {\n\t            C_[i] = C[i];\n\t        }\n\n\t        // Calculate new counter values\n\t        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;\n\t        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;\n\t        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;\n\t        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;\n\t        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;\n\t        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;\n\t        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;\n\t        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;\n\t        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;\n\n\t        // Calculate the g-values\n\t        for (var i = 0; i < 8; i++) {\n\t            var gx = X[i] + C[i];\n\n\t            // Construct high and low argument for squaring\n\t            var ga = gx & 0xffff;\n\t            var gb = gx >>> 16;\n\n\t            // Calculate high and low result of squaring\n\t            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;\n\t            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);\n\n\t            // High XOR low\n\t            G[i] = gh ^ gl;\n\t        }\n\n\t        // Calculate new state values\n\t        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;\n\t        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;\n\t        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;\n\t        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;\n\t        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;\n\t        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;\n\t        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;\n\t        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.Rabbit = StreamCipher._createHelper(Rabbit);\n\t}());\n\n\n\treturn CryptoJS.Rabbit;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var StreamCipher = C_lib.StreamCipher;\n\t    var C_algo = C.algo;\n\n\t    // Reusable objects\n\t    var S  = [];\n\t    var C_ = [];\n\t    var G  = [];\n\n\t    /**\n\t     * Rabbit stream cipher algorithm.\n\t     *\n\t     * This is a legacy version that neglected to convert the key to little-endian.\n\t     * This error doesn't affect the cipher's security,\n\t     * but it does affect its compatibility with other implementations.\n\t     */\n\t    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({\n\t        _doReset: function () {\n\t            // Shortcuts\n\t            var K = this._key.words;\n\t            var iv = this.cfg.iv;\n\n\t            // Generate initial state values\n\t            var X = this._X = [\n\t                K[0], (K[3] << 16) | (K[2] >>> 16),\n\t                K[1], (K[0] << 16) | (K[3] >>> 16),\n\t                K[2], (K[1] << 16) | (K[0] >>> 16),\n\t                K[3], (K[2] << 16) | (K[1] >>> 16)\n\t            ];\n\n\t            // Generate initial counter values\n\t            var C = this._C = [\n\t                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),\n\t                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),\n\t                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),\n\t                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)\n\t            ];\n\n\t            // Carry bit\n\t            this._b = 0;\n\n\t            // Iterate the system four times\n\t            for (var i = 0; i < 4; i++) {\n\t                nextState.call(this);\n\t            }\n\n\t            // Modify the counters\n\t            for (var i = 0; i < 8; i++) {\n\t                C[i] ^= X[(i + 4) & 7];\n\t            }\n\n\t            // IV setup\n\t            if (iv) {\n\t                // Shortcuts\n\t                var IV = iv.words;\n\t                var IV_0 = IV[0];\n\t                var IV_1 = IV[1];\n\n\t                // Generate four subvectors\n\t                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);\n\t                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);\n\t                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);\n\t                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);\n\n\t                // Modify counter values\n\t                C[0] ^= i0;\n\t                C[1] ^= i1;\n\t                C[2] ^= i2;\n\t                C[3] ^= i3;\n\t                C[4] ^= i0;\n\t                C[5] ^= i1;\n\t                C[6] ^= i2;\n\t                C[7] ^= i3;\n\n\t                // Iterate the system four times\n\t                for (var i = 0; i < 4; i++) {\n\t                    nextState.call(this);\n\t                }\n\t            }\n\t        },\n\n\t        _doProcessBlock: function (M, offset) {\n\t            // Shortcut\n\t            var X = this._X;\n\n\t            // Iterate the system\n\t            nextState.call(this);\n\n\t            // Generate four keystream words\n\t            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);\n\t            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);\n\t            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);\n\t            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);\n\n\t            for (var i = 0; i < 4; i++) {\n\t                // Swap endian\n\t                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |\n\t                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);\n\n\t                // Encrypt\n\t                M[offset + i] ^= S[i];\n\t            }\n\t        },\n\n\t        blockSize: 128/32,\n\n\t        ivSize: 64/32\n\t    });\n\n\t    function nextState() {\n\t        // Shortcuts\n\t        var X = this._X;\n\t        var C = this._C;\n\n\t        // Save old counter values\n\t        for (var i = 0; i < 8; i++) {\n\t            C_[i] = C[i];\n\t        }\n\n\t        // Calculate new counter values\n\t        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;\n\t        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;\n\t        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;\n\t        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;\n\t        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;\n\t        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;\n\t        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;\n\t        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;\n\t        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;\n\n\t        // Calculate the g-values\n\t        for (var i = 0; i < 8; i++) {\n\t            var gx = X[i] + C[i];\n\n\t            // Construct high and low argument for squaring\n\t            var ga = gx & 0xffff;\n\t            var gb = gx >>> 16;\n\n\t            // Calculate high and low result of squaring\n\t            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;\n\t            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);\n\n\t            // High XOR low\n\t            G[i] = gh ^ gl;\n\t        }\n\n\t        // Calculate new state values\n\t        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;\n\t        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;\n\t        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;\n\t        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;\n\t        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;\n\t        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;\n\t        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;\n\t        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;\n\t    }\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);\n\t}());\n\n\n\treturn CryptoJS.RabbitLegacy;\n\n}));",";(function (root, factory, undef) {\n\tif (typeof exports === \"object\") {\n\t\t// CommonJS\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\n\t}\n\telse if (typeof define === \"function\" && define.amd) {\n\t\t// AMD\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\n\t}\n\telse {\n\t\t// Global (browser)\n\t\tfactory(root.CryptoJS);\n\t}\n}(this, function (CryptoJS) {\n\n\t(function () {\n\t    // Shortcuts\n\t    var C = CryptoJS;\n\t    var C_lib = C.lib;\n\t    var BlockCipher = C_lib.BlockCipher;\n\t    var C_algo = C.algo;\n\n\t    const N = 16;\n\n\t    //Origin pbox and sbox, derived from PI\n\t    const ORIG_P = [\n\t        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,\n\t        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,\n\t        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,\n\t        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,\n\t        0x9216D5D9, 0x8979FB1B\n\t    ];\n\n\t    const ORIG_S = [\n\t        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,\n\t            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,\n\t            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,\n\t            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,\n\t            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,\n\t            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,\n\t            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,\n\t            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,\n\t            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,\n\t            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,\n\t            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,\n\t            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,\n\t            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,\n\t            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,\n\t            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,\n\t            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,\n\t            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,\n\t            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,\n\t            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,\n\t            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,\n\t            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,\n\t            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,\n\t            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,\n\t            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,\n\t            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,\n\t            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,\n\t            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,\n\t            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,\n\t            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,\n\t            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,\n\t            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,\n\t            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,\n\t            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,\n\t            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,\n\t            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,\n\t            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,\n\t            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,\n\t            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,\n\t            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,\n\t            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,\n\t            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,\n\t            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,\n\t            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,\n\t            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,\n\t            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,\n\t            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,\n\t            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,\n\t            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,\n\t            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,\n\t            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,\n\t            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,\n\t            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,\n\t            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,\n\t            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,\n\t            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,\n\t            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,\n\t            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,\n\t            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,\n\t            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,\n\t            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,\n\t            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,\n\t            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,\n\t            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,\n\t            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],\n\t        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,\n\t            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,\n\t            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,\n\t            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,\n\t            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,\n\t            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,\n\t            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,\n\t            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,\n\t            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,\n\t            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,\n\t            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,\n\t            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,\n\t            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,\n\t            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,\n\t            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,\n\t            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,\n\t            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,\n\t            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,\n\t            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,\n\t            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,\n\t            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,\n\t            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,\n\t            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,\n\t            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,\n\t            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,\n\t            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,\n\t            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,\n\t            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,\n\t            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,\n\t            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,\n\t            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,\n\t            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,\n\t            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,\n\t            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,\n\t            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,\n\t            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,\n\t            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,\n\t            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,\n\t            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,\n\t            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,\n\t            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,\n\t            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,\n\t            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,\n\t            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,\n\t            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,\n\t            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,\n\t            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,\n\t            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,\n\t            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,\n\t            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,\n\t            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,\n\t            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,\n\t            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,\n\t            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,\n\t            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,\n\t            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,\n\t            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,\n\t            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,\n\t            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,\n\t            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,\n\t            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,\n\t            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,\n\t            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,\n\t            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],\n\t        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,\n\t            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,\n\t            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,\n\t            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,\n\t            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,\n\t            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,\n\t            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,\n\t            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,\n\t            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,\n\t            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,\n\t            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,\n\t            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,\n\t            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,\n\t            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,\n\t            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,\n\t            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,\n\t            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,\n\t            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,\n\t            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,\n\t            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,\n\t            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,\n\t            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,\n\t            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,\n\t            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,\n\t            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,\n\t            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,\n\t            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,\n\t            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,\n\t            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,\n\t            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,\n\t            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,\n\t            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,\n\t            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,\n\t            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,\n\t            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,\n\t            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,\n\t            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,\n\t            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,\n\t            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,\n\t            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,\n\t            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,\n\t            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,\n\t            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,\n\t            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,\n\t            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,\n\t            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,\n\t            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,\n\t            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,\n\t            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,\n\t            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,\n\t            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,\n\t            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,\n\t            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,\n\t            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,\n\t            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,\n\t            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,\n\t            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,\n\t            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,\n\t            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,\n\t            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,\n\t            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,\n\t            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,\n\t            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,\n\t            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],\n\t        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,\n\t            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,\n\t            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,\n\t            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,\n\t            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,\n\t            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,\n\t            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,\n\t            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,\n\t            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,\n\t            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,\n\t            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,\n\t            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,\n\t            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,\n\t            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,\n\t            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,\n\t            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,\n\t            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,\n\t            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,\n\t            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,\n\t            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,\n\t            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,\n\t            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,\n\t            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,\n\t            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,\n\t            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,\n\t            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,\n\t            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,\n\t            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,\n\t            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,\n\t            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,\n\t            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,\n\t            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,\n\t            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,\n\t            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,\n\t            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,\n\t            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,\n\t            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,\n\t            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,\n\t            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,\n\t            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,\n\t            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,\n\t            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,\n\t            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,\n\t            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,\n\t            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,\n\t            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,\n\t            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,\n\t            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,\n\t            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,\n\t            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,\n\t            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,\n\t            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,\n\t            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,\n\t            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,\n\t            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,\n\t            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,\n\t            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,\n\t            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,\n\t            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,\n\t            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,\n\t            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,\n\t            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,\n\t            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,\n\t            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]\n\t    ];\n\n\t    var BLOWFISH_CTX = {\n\t        pbox: [],\n\t        sbox: []\n\t    }\n\n\t    function F(ctx, x){\n\t        let a = (x >> 24) & 0xFF;\n\t        let b = (x >> 16) & 0xFF;\n\t        let c = (x >> 8) & 0xFF;\n\t        let d = x & 0xFF;\n\n\t        let y = ctx.sbox[0][a] + ctx.sbox[1][b];\n\t        y = y ^ ctx.sbox[2][c];\n\t        y = y + ctx.sbox[3][d];\n\n\t        return y;\n\t    }\n\n\t    function BlowFish_Encrypt(ctx, left, right){\n\t        let Xl = left;\n\t        let Xr = right;\n\t        let temp;\n\n\t        for(let i = 0; i < N; ++i){\n\t            Xl = Xl ^ ctx.pbox[i];\n\t            Xr = F(ctx, Xl) ^ Xr;\n\n\t            temp = Xl;\n\t            Xl = Xr;\n\t            Xr = temp;\n\t        }\n\n\t        temp = Xl;\n\t        Xl = Xr;\n\t        Xr = temp;\n\n\t        Xr = Xr ^ ctx.pbox[N];\n\t        Xl = Xl ^ ctx.pbox[N + 1];\n\n\t        return {left: Xl, right: Xr};\n\t    }\n\n\t    function BlowFish_Decrypt(ctx, left, right){\n\t        let Xl = left;\n\t        let Xr = right;\n\t        let temp;\n\n\t        for(let i = N + 1; i > 1; --i){\n\t            Xl = Xl ^ ctx.pbox[i];\n\t            Xr = F(ctx, Xl) ^ Xr;\n\n\t            temp = Xl;\n\t            Xl = Xr;\n\t            Xr = temp;\n\t        }\n\n\t        temp = Xl;\n\t        Xl = Xr;\n\t        Xr = temp;\n\n\t        Xr = Xr ^ ctx.pbox[1];\n\t        Xl = Xl ^ ctx.pbox[0];\n\n\t        return {left: Xl, right: Xr};\n\t    }\n\n\t    /**\n\t     * Initialization ctx's pbox and sbox.\n\t     *\n\t     * @param {Object} ctx The object has pbox and sbox.\n\t     * @param {Array} key An array of 32-bit words.\n\t     * @param {int} keysize The length of the key.\n\t     *\n\t     * @example\n\t     *\n\t     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);\n\t     */\n\t    function BlowFishInit(ctx, key, keysize)\n\t    {\n\t        for(let Row = 0; Row < 4; Row++)\n\t        {\n\t            ctx.sbox[Row] = [];\n\t            for(let Col = 0; Col < 256; Col++)\n\t            {\n\t                ctx.sbox[Row][Col] = ORIG_S[Row][Col];\n\t            }\n\t        }\n\n\t        let keyIndex = 0;\n\t        for(let index = 0; index < N + 2; index++)\n\t        {\n\t            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];\n\t            keyIndex++;\n\t            if(keyIndex >= keysize)\n\t            {\n\t                keyIndex = 0;\n\t            }\n\t        }\n\n\t        let Data1 = 0;\n\t        let Data2 = 0;\n\t        let res = 0;\n\t        for(let i = 0; i < N + 2; i += 2)\n\t        {\n\t            res = BlowFish_Encrypt(ctx, Data1, Data2);\n\t            Data1 = res.left;\n\t            Data2 = res.right;\n\t            ctx.pbox[i] = Data1;\n\t            ctx.pbox[i + 1] = Data2;\n\t        }\n\n\t        for(let i = 0; i < 4; i++)\n\t        {\n\t            for(let j = 0; j < 256; j += 2)\n\t            {\n\t                res = BlowFish_Encrypt(ctx, Data1, Data2);\n\t                Data1 = res.left;\n\t                Data2 = res.right;\n\t                ctx.sbox[i][j] = Data1;\n\t                ctx.sbox[i][j + 1] = Data2;\n\t            }\n\t        }\n\n\t        return true;\n\t    }\n\n\t    /**\n\t     * Blowfish block cipher algorithm.\n\t     */\n\t    var Blowfish = C_algo.Blowfish = BlockCipher.extend({\n\t        _doReset: function () {\n\t            // Skip reset of nRounds has been set before and key did not change\n\t            if (this._keyPriorReset === this._key) {\n\t                return;\n\t            }\n\n\t            // Shortcuts\n\t            var key = this._keyPriorReset = this._key;\n\t            var keyWords = key.words;\n\t            var keySize = key.sigBytes / 4;\n\n\t            //Initialization pbox and sbox\n\t            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);\n\t        },\n\n\t        encryptBlock: function (M, offset) {\n\t            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);\n\t            M[offset] = res.left;\n\t            M[offset + 1] = res.right;\n\t        },\n\n\t        decryptBlock: function (M, offset) {\n\t            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);\n\t            M[offset] = res.left;\n\t            M[offset + 1] = res.right;\n\t        },\n\n\t        blockSize: 64/32,\n\n\t        keySize: 128/32,\n\n\t        ivSize: 64/32\n\t    });\n\n\t    /**\n\t     * Shortcut functions to the cipher's object interface.\n\t     *\n\t     * @example\n\t     *\n\t     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);\n\t     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);\n\t     */\n\t    C.Blowfish = BlockCipher._createHelper(Blowfish);\n\t}());\n\n\n\treturn CryptoJS.Blowfish;\n\n}));"]}
\ No newline at end of file
+{"version":3,"sources":["index.js","core.js","x64-core.js","lib-typedarrays.js","enc-utf16.js","enc-base64.js","enc-base64url.js","md5.js","sha1.js","sha256.js","sha224.js","sha512.js","sha384.js","sha3.js","ripemd160.js","hmac.js","pbkdf2.js","evpkdf.js","cipher-core.js","mode-cfb.js","mode-ctr.js","mode-ctr-gladman.js","mode-ofb.js","mode-ecb.js","pad-ansix923.js","pad-iso10126.js","pad-iso97971.js","pad-zeropadding.js","pad-nopadding.js","format-hex.js","aes.js","tripledes.js","rc4.js","rabbit.js","rabbit-legacy.js","blowfish.js"],"names":[],"mappings":";;;;;;;AAAA;AACA;AACA;ACFA,ADGA;ACFA,ADGA;ACFA,ADGA;ACFA,ADGA,AENA;ADIA,ADGA,AENA;ADIA,ADGA,AENA;ADIA,ADGA,AGTA,ADGA;ADIA,ADGA,AGTA,ADGA;ADIA,ADGA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AGTA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ADGA,AJYA,AGTA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,ADGA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ALeA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ANkBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,ACHA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,APqBA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AENA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AGTA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,ACHA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,ADGA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AOrBA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AWjCA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;ADIA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AS3BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AHSA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,ACHA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AJYA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AENA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,ANkBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ARwBA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,AT2BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AV8BA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,ACHA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,AZoCA,AIZA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AFMA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;AgB/CA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AT2BA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AFMA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AgBhDA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AiBnDA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AZoCA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AGTA,ADGA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,AENA,ADGA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,AENA,ADGA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ADGA,AENA,AENA,ACHA,ACHA,ACHA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ACHA,AENA,ACHA,AENA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,ADGA,ADGA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ACHA,AENA,AGTA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AGTA,AGTA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,AMlBA,AXiCA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,AYpCA,AENA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AIZA,ACHA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AYpCA,Ad0CA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AFMA,AavCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AKfA,AWjCA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ANkBA,ACHA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,Ac1CA,ALeA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AgBhDA,AFMA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,Ac1CA,ARwBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,AS3BA,AkBtDA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ALeA,AIZA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,ADGA,AlBsDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AMlBA,A2BjFA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ADGA,AnByDA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AiCnGA,ApB4DA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AavCA,ADGA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA,A7BuFA;A4BnFA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;ADIA,AKfA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AFMA,AoB5DA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,AYpCA,AkBtDA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AIXA,AjBmDA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AjBmDA,A8B1FA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA,AavCA;AbwCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":[";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"), require(\"./lib-typedarrays\"), require(\"./enc-utf16\"), require(\"./enc-base64\"), require(\"./enc-base64url\"), require(\"./md5\"), require(\"./sha1\"), require(\"./sha256\"), require(\"./sha224\"), require(\"./sha512\"), require(\"./sha384\"), require(\"./sha3\"), require(\"./ripemd160\"), require(\"./hmac\"), require(\"./pbkdf2\"), require(\"./evpkdf\"), require(\"./cipher-core\"), require(\"./mode-cfb\"), require(\"./mode-ctr\"), require(\"./mode-ctr-gladman\"), require(\"./mode-ofb\"), require(\"./mode-ecb\"), require(\"./pad-ansix923\"), require(\"./pad-iso10126\"), require(\"./pad-iso97971\"), require(\"./pad-zeropadding\"), require(\"./pad-nopadding\"), require(\"./format-hex\"), require(\"./aes\"), require(\"./tripledes\"), require(\"./rc4\"), require(\"./rabbit\"), require(\"./rabbit-legacy\"), require(\"./blowfish\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./x64-core\", \"./lib-typedarrays\", \"./enc-utf16\", \"./enc-base64\", \"./enc-base64url\", \"./md5\", \"./sha1\", \"./sha256\", \"./sha224\", \"./sha512\", \"./sha384\", \"./sha3\", \"./ripemd160\", \"./hmac\", \"./pbkdf2\", \"./evpkdf\", \"./cipher-core\", \"./mode-cfb\", \"./mode-ctr\", \"./mode-ctr-gladman\", \"./mode-ofb\", \"./mode-ecb\", \"./pad-ansix923\", \"./pad-iso10126\", \"./pad-iso97971\", \"./pad-zeropadding\", \"./pad-nopadding\", \"./format-hex\", \"./aes\", \"./tripledes\", \"./rc4\", \"./rabbit\", \"./rabbit-legacy\", \"./blowfish\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\troot.CryptoJS = factory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\treturn CryptoJS;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory();\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\troot.CryptoJS = factory();\r\n\t}\r\n}(this, function () {\r\n\r\n\t/*globals window, global, require*/\r\n\r\n\t/**\r\n\t * CryptoJS core components.\r\n\t */\r\n\tvar CryptoJS = CryptoJS || (function (Math, undefined) {\r\n\r\n\t    var crypto;\r\n\r\n\t    // Native crypto from window (Browser)\r\n\t    if (typeof window !== 'undefined' && window.crypto) {\r\n\t        crypto = window.crypto;\r\n\t    }\r\n\r\n\t    // Native crypto in web worker (Browser)\r\n\t    if (typeof self !== 'undefined' && self.crypto) {\r\n\t        crypto = self.crypto;\r\n\t    }\r\n\r\n\t    // Native crypto from worker\r\n\t    if (typeof globalThis !== 'undefined' && globalThis.crypto) {\r\n\t        crypto = globalThis.crypto;\r\n\t    }\r\n\r\n\t    // Native (experimental IE 11) crypto from window (Browser)\r\n\t    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {\r\n\t        crypto = window.msCrypto;\r\n\t    }\r\n\r\n\t    // Native crypto from global (NodeJS)\r\n\t    if (!crypto && typeof global !== 'undefined' && global.crypto) {\r\n\t        crypto = global.crypto;\r\n\t    }\r\n\r\n\t    // Native crypto import via require (NodeJS)\r\n\t    if (!crypto && typeof require === 'function') {\r\n\t        try {\r\n\t            crypto = require('crypto');\r\n\t        } catch (err) {}\r\n\t    }\r\n\r\n\t    /*\r\n\t     * Cryptographically secure pseudorandom number generator\r\n\t     *\r\n\t     * As Math.random() is cryptographically not safe to use\r\n\t     */\r\n\t    var cryptoSecureRandomInt = function () {\r\n\t        if (crypto) {\r\n\t            // Use getRandomValues method (Browser)\r\n\t            if (typeof crypto.getRandomValues === 'function') {\r\n\t                try {\r\n\t                    return crypto.getRandomValues(new Uint32Array(1))[0];\r\n\t                } catch (err) {}\r\n\t            }\r\n\r\n\t            // Use randomBytes method (NodeJS)\r\n\t            if (typeof crypto.randomBytes === 'function') {\r\n\t                try {\r\n\t                    return crypto.randomBytes(4).readInt32LE();\r\n\t                } catch (err) {}\r\n\t            }\r\n\t        }\r\n\r\n\t        throw new Error('Native crypto module could not be used to get secure random number.');\r\n\t    };\r\n\r\n\t    /*\r\n\t     * Local polyfill of Object.create\r\n\r\n\t     */\r\n\t    var create = Object.create || (function () {\r\n\t        function F() {}\r\n\r\n\t        return function (obj) {\r\n\t            var subtype;\r\n\r\n\t            F.prototype = obj;\r\n\r\n\t            subtype = new F();\r\n\r\n\t            F.prototype = null;\r\n\r\n\t            return subtype;\r\n\t        };\r\n\t    }());\r\n\r\n\t    /**\r\n\t     * CryptoJS namespace.\r\n\t     */\r\n\t    var C = {};\r\n\r\n\t    /**\r\n\t     * Library namespace.\r\n\t     */\r\n\t    var C_lib = C.lib = {};\r\n\r\n\t    /**\r\n\t     * Base object for prototypal inheritance.\r\n\t     */\r\n\t    var Base = C_lib.Base = (function () {\r\n\r\n\r\n\t        return {\r\n\t            /**\r\n\t             * Creates a new object that inherits from this object.\r\n\t             *\r\n\t             * @param {Object} overrides Properties to copy into the new object.\r\n\t             *\r\n\t             * @return {Object} The new object.\r\n\t             *\r\n\t             * @static\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     var MyType = CryptoJS.lib.Base.extend({\r\n\t             *         field: 'value',\r\n\t             *\r\n\t             *         method: function () {\r\n\t             *         }\r\n\t             *     });\r\n\t             */\r\n\t            extend: function (overrides) {\r\n\t                // Spawn\r\n\t                var subtype = create(this);\r\n\r\n\t                // Augment\r\n\t                if (overrides) {\r\n\t                    subtype.mixIn(overrides);\r\n\t                }\r\n\r\n\t                // Create default initializer\r\n\t                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {\r\n\t                    subtype.init = function () {\r\n\t                        subtype.$super.init.apply(this, arguments);\r\n\t                    };\r\n\t                }\r\n\r\n\t                // Initializer's prototype is the subtype object\r\n\t                subtype.init.prototype = subtype;\r\n\r\n\t                // Reference supertype\r\n\t                subtype.$super = this;\r\n\r\n\t                return subtype;\r\n\t            },\r\n\r\n\t            /**\r\n\t             * Extends this object and runs the init method.\r\n\t             * Arguments to create() will be passed to init().\r\n\t             *\r\n\t             * @return {Object} The new object.\r\n\t             *\r\n\t             * @static\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     var instance = MyType.create();\r\n\t             */\r\n\t            create: function () {\r\n\t                var instance = this.extend();\r\n\t                instance.init.apply(instance, arguments);\r\n\r\n\t                return instance;\r\n\t            },\r\n\r\n\t            /**\r\n\t             * Initializes a newly created object.\r\n\t             * Override this method to add some logic when your objects are created.\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     var MyType = CryptoJS.lib.Base.extend({\r\n\t             *         init: function () {\r\n\t             *             // ...\r\n\t             *         }\r\n\t             *     });\r\n\t             */\r\n\t            init: function () {\r\n\t            },\r\n\r\n\t            /**\r\n\t             * Copies properties into this object.\r\n\t             *\r\n\t             * @param {Object} properties The properties to mix in.\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     MyType.mixIn({\r\n\t             *         field: 'value'\r\n\t             *     });\r\n\t             */\r\n\t            mixIn: function (properties) {\r\n\t                for (var propertyName in properties) {\r\n\t                    if (properties.hasOwnProperty(propertyName)) {\r\n\t                        this[propertyName] = properties[propertyName];\r\n\t                    }\r\n\t                }\r\n\r\n\t                // IE won't copy toString using the loop above\r\n\t                if (properties.hasOwnProperty('toString')) {\r\n\t                    this.toString = properties.toString;\r\n\t                }\r\n\t            },\r\n\r\n\t            /**\r\n\t             * Creates a copy of this object.\r\n\t             *\r\n\t             * @return {Object} The clone.\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     var clone = instance.clone();\r\n\t             */\r\n\t            clone: function () {\r\n\t                return this.init.prototype.extend(this);\r\n\t            }\r\n\t        };\r\n\t    }());\r\n\r\n\t    /**\r\n\t     * An array of 32-bit words.\r\n\t     *\r\n\t     * @property {Array} words The array of 32-bit words.\r\n\t     * @property {number} sigBytes The number of significant bytes in this word array.\r\n\t     */\r\n\t    var WordArray = C_lib.WordArray = Base.extend({\r\n\t        /**\r\n\t         * Initializes a newly created word array.\r\n\t         *\r\n\t         * @param {Array} words (Optional) An array of 32-bit words.\r\n\t         * @param {number} sigBytes (Optional) The number of significant bytes in the words.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.lib.WordArray.create();\r\n\t         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);\r\n\t         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);\r\n\t         */\r\n\t        init: function (words, sigBytes) {\r\n\t            words = this.words = words || [];\r\n\r\n\t            if (sigBytes != undefined) {\r\n\t                this.sigBytes = sigBytes;\r\n\t            } else {\r\n\t                this.sigBytes = words.length * 4;\r\n\t            }\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts this word array to a string.\r\n\t         *\r\n\t         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex\r\n\t         *\r\n\t         * @return {string} The stringified word array.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var string = wordArray + '';\r\n\t         *     var string = wordArray.toString();\r\n\t         *     var string = wordArray.toString(CryptoJS.enc.Utf8);\r\n\t         */\r\n\t        toString: function (encoder) {\r\n\t            return (encoder || Hex).stringify(this);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Concatenates a word array to this word array.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array to append.\r\n\t         *\r\n\t         * @return {WordArray} This word array.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     wordArray1.concat(wordArray2);\r\n\t         */\r\n\t        concat: function (wordArray) {\r\n\t            // Shortcuts\r\n\t            var thisWords = this.words;\r\n\t            var thatWords = wordArray.words;\r\n\t            var thisSigBytes = this.sigBytes;\r\n\t            var thatSigBytes = wordArray.sigBytes;\r\n\r\n\t            // Clamp excess bits\r\n\t            this.clamp();\r\n\r\n\t            // Concat\r\n\t            if (thisSigBytes % 4) {\r\n\t                // Copy one byte at a time\r\n\t                for (var i = 0; i < thatSigBytes; i++) {\r\n\t                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\r\n\t                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);\r\n\t                }\r\n\t            } else {\r\n\t                // Copy one word at a time\r\n\t                for (var j = 0; j < thatSigBytes; j += 4) {\r\n\t                    thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];\r\n\t                }\r\n\t            }\r\n\t            this.sigBytes += thatSigBytes;\r\n\r\n\t            // Chainable\r\n\t            return this;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Removes insignificant bits.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     wordArray.clamp();\r\n\t         */\r\n\t        clamp: function () {\r\n\t            // Shortcuts\r\n\t            var words = this.words;\r\n\t            var sigBytes = this.sigBytes;\r\n\r\n\t            // Clamp\r\n\t            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);\r\n\t            words.length = Math.ceil(sigBytes / 4);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates a copy of this word array.\r\n\t         *\r\n\t         * @return {WordArray} The clone.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var clone = wordArray.clone();\r\n\t         */\r\n\t        clone: function () {\r\n\t            var clone = Base.clone.call(this);\r\n\t            clone.words = this.words.slice(0);\r\n\r\n\t            return clone;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates a word array filled with random bytes.\r\n\t         *\r\n\t         * @param {number} nBytes The number of random bytes to generate.\r\n\t         *\r\n\t         * @return {WordArray} The random word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.lib.WordArray.random(16);\r\n\t         */\r\n\t        random: function (nBytes) {\r\n\t            var words = [];\r\n\r\n\t            for (var i = 0; i < nBytes; i += 4) {\r\n\t                words.push(cryptoSecureRandomInt());\r\n\t            }\r\n\r\n\t            return new WordArray.init(words, nBytes);\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Encoder namespace.\r\n\t     */\r\n\t    var C_enc = C.enc = {};\r\n\r\n\t    /**\r\n\t     * Hex encoding strategy.\r\n\t     */\r\n\t    var Hex = C_enc.Hex = {\r\n\t        /**\r\n\t         * Converts a word array to a hex string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @return {string} The hex string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray) {\r\n\t            // Shortcuts\r\n\t            var words = wordArray.words;\r\n\t            var sigBytes = wordArray.sigBytes;\r\n\r\n\t            // Convert\r\n\t            var hexChars = [];\r\n\t            for (var i = 0; i < sigBytes; i++) {\r\n\t                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\r\n\t                hexChars.push((bite >>> 4).toString(16));\r\n\t                hexChars.push((bite & 0x0f).toString(16));\r\n\t            }\r\n\r\n\t            return hexChars.join('');\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a hex string to a word array.\r\n\t         *\r\n\t         * @param {string} hexStr The hex string.\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);\r\n\t         */\r\n\t        parse: function (hexStr) {\r\n\t            // Shortcut\r\n\t            var hexStrLength = hexStr.length;\r\n\r\n\t            // Convert\r\n\t            var words = [];\r\n\t            for (var i = 0; i < hexStrLength; i += 2) {\r\n\t                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);\r\n\t            }\r\n\r\n\t            return new WordArray.init(words, hexStrLength / 2);\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * Latin1 encoding strategy.\r\n\t     */\r\n\t    var Latin1 = C_enc.Latin1 = {\r\n\t        /**\r\n\t         * Converts a word array to a Latin1 string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @return {string} The Latin1 string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray) {\r\n\t            // Shortcuts\r\n\t            var words = wordArray.words;\r\n\t            var sigBytes = wordArray.sigBytes;\r\n\r\n\t            // Convert\r\n\t            var latin1Chars = [];\r\n\t            for (var i = 0; i < sigBytes; i++) {\r\n\t                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;\r\n\t                latin1Chars.push(String.fromCharCode(bite));\r\n\t            }\r\n\r\n\t            return latin1Chars.join('');\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a Latin1 string to a word array.\r\n\t         *\r\n\t         * @param {string} latin1Str The Latin1 string.\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);\r\n\t         */\r\n\t        parse: function (latin1Str) {\r\n\t            // Shortcut\r\n\t            var latin1StrLength = latin1Str.length;\r\n\r\n\t            // Convert\r\n\t            var words = [];\r\n\t            for (var i = 0; i < latin1StrLength; i++) {\r\n\t                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);\r\n\t            }\r\n\r\n\t            return new WordArray.init(words, latin1StrLength);\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * UTF-8 encoding strategy.\r\n\t     */\r\n\t    var Utf8 = C_enc.Utf8 = {\r\n\t        /**\r\n\t         * Converts a word array to a UTF-8 string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @return {string} The UTF-8 string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray) {\r\n\t            try {\r\n\t                return decodeURIComponent(escape(Latin1.stringify(wordArray)));\r\n\t            } catch (e) {\r\n\t                throw new Error('Malformed UTF-8 data');\r\n\t            }\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a UTF-8 string to a word array.\r\n\t         *\r\n\t         * @param {string} utf8Str The UTF-8 string.\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);\r\n\t         */\r\n\t        parse: function (utf8Str) {\r\n\t            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * Abstract buffered block algorithm template.\r\n\t     *\r\n\t     * The property blockSize must be implemented in a concrete subtype.\r\n\t     *\r\n\t     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0\r\n\t     */\r\n\t    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({\r\n\t        /**\r\n\t         * Resets this block algorithm's data buffer to its initial state.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     bufferedBlockAlgorithm.reset();\r\n\t         */\r\n\t        reset: function () {\r\n\t            // Initial values\r\n\t            this._data = new WordArray.init();\r\n\t            this._nDataBytes = 0;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Adds new data to this block algorithm's buffer.\r\n\t         *\r\n\t         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     bufferedBlockAlgorithm._append('data');\r\n\t         *     bufferedBlockAlgorithm._append(wordArray);\r\n\t         */\r\n\t        _append: function (data) {\r\n\t            // Convert string to WordArray, else assume WordArray already\r\n\t            if (typeof data == 'string') {\r\n\t                data = Utf8.parse(data);\r\n\t            }\r\n\r\n\t            // Append\r\n\t            this._data.concat(data);\r\n\t            this._nDataBytes += data.sigBytes;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Processes available data blocks.\r\n\t         *\r\n\t         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.\r\n\t         *\r\n\t         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.\r\n\t         *\r\n\t         * @return {WordArray} The processed data.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var processedData = bufferedBlockAlgorithm._process();\r\n\t         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');\r\n\t         */\r\n\t        _process: function (doFlush) {\r\n\t            var processedWords;\r\n\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\t            var dataSigBytes = data.sigBytes;\r\n\t            var blockSize = this.blockSize;\r\n\t            var blockSizeBytes = blockSize * 4;\r\n\r\n\t            // Count blocks ready\r\n\t            var nBlocksReady = dataSigBytes / blockSizeBytes;\r\n\t            if (doFlush) {\r\n\t                // Round up to include partial blocks\r\n\t                nBlocksReady = Math.ceil(nBlocksReady);\r\n\t            } else {\r\n\t                // Round down to include only full blocks,\r\n\t                // less the number of blocks that must remain in the buffer\r\n\t                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);\r\n\t            }\r\n\r\n\t            // Count words ready\r\n\t            var nWordsReady = nBlocksReady * blockSize;\r\n\r\n\t            // Count bytes ready\r\n\t            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);\r\n\r\n\t            // Process blocks\r\n\t            if (nWordsReady) {\r\n\t                for (var offset = 0; offset < nWordsReady; offset += blockSize) {\r\n\t                    // Perform concrete-algorithm logic\r\n\t                    this._doProcessBlock(dataWords, offset);\r\n\t                }\r\n\r\n\t                // Remove processed words\r\n\t                processedWords = dataWords.splice(0, nWordsReady);\r\n\t                data.sigBytes -= nBytesReady;\r\n\t            }\r\n\r\n\t            // Return processed words\r\n\t            return new WordArray.init(processedWords, nBytesReady);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates a copy of this object.\r\n\t         *\r\n\t         * @return {Object} The clone.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var clone = bufferedBlockAlgorithm.clone();\r\n\t         */\r\n\t        clone: function () {\r\n\t            var clone = Base.clone.call(this);\r\n\t            clone._data = this._data.clone();\r\n\r\n\t            return clone;\r\n\t        },\r\n\r\n\t        _minBufferSize: 0\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Abstract hasher template.\r\n\t     *\r\n\t     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)\r\n\t     */\r\n\t    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         */\r\n\t        cfg: Base.extend(),\r\n\r\n\t        /**\r\n\t         * Initializes a newly created hasher.\r\n\t         *\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var hasher = CryptoJS.algo.SHA256.create();\r\n\t         */\r\n\t        init: function (cfg) {\r\n\t            // Apply config defaults\r\n\t            this.cfg = this.cfg.extend(cfg);\r\n\r\n\t            // Set initial values\r\n\t            this.reset();\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Resets this hasher to its initial state.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     hasher.reset();\r\n\t         */\r\n\t        reset: function () {\r\n\t            // Reset data buffer\r\n\t            BufferedBlockAlgorithm.reset.call(this);\r\n\r\n\t            // Perform concrete-hasher logic\r\n\t            this._doReset();\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Updates this hasher with a message.\r\n\t         *\r\n\t         * @param {WordArray|string} messageUpdate The message to append.\r\n\t         *\r\n\t         * @return {Hasher} This hasher.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     hasher.update('message');\r\n\t         *     hasher.update(wordArray);\r\n\t         */\r\n\t        update: function (messageUpdate) {\r\n\t            // Append\r\n\t            this._append(messageUpdate);\r\n\r\n\t            // Update the hash\r\n\t            this._process();\r\n\r\n\t            // Chainable\r\n\t            return this;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Finalizes the hash computation.\r\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\r\n\t         *\r\n\t         * @param {WordArray|string} messageUpdate (Optional) A final message update.\r\n\t         *\r\n\t         * @return {WordArray} The hash.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var hash = hasher.finalize();\r\n\t         *     var hash = hasher.finalize('message');\r\n\t         *     var hash = hasher.finalize(wordArray);\r\n\t         */\r\n\t        finalize: function (messageUpdate) {\r\n\t            // Final message update\r\n\t            if (messageUpdate) {\r\n\t                this._append(messageUpdate);\r\n\t            }\r\n\r\n\t            // Perform concrete-hasher logic\r\n\t            var hash = this._doFinalize();\r\n\r\n\t            return hash;\r\n\t        },\r\n\r\n\t        blockSize: 512/32,\r\n\r\n\t        /**\r\n\t         * Creates a shortcut function to a hasher's object interface.\r\n\t         *\r\n\t         * @param {Hasher} hasher The hasher to create a helper for.\r\n\t         *\r\n\t         * @return {Function} The shortcut function.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);\r\n\t         */\r\n\t        _createHelper: function (hasher) {\r\n\t            return function (message, cfg) {\r\n\t                return new hasher.init(cfg).finalize(message);\r\n\t            };\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates a shortcut function to the HMAC's object interface.\r\n\t         *\r\n\t         * @param {Hasher} hasher The hasher to use in this HMAC helper.\r\n\t         *\r\n\t         * @return {Function} The shortcut function.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);\r\n\t         */\r\n\t        _createHmacHelper: function (hasher) {\r\n\t            return function (message, key) {\r\n\t                return new C_algo.HMAC.init(hasher, key).finalize(message);\r\n\t            };\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Algorithm namespace.\r\n\t     */\r\n\t    var C_algo = C.algo = {};\r\n\r\n\t    return C;\r\n\t}(Math));\r\n\r\n\r\n\treturn CryptoJS;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function (undefined) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var Base = C_lib.Base;\r\n\t    var X32WordArray = C_lib.WordArray;\r\n\r\n\t    /**\r\n\t     * x64 namespace.\r\n\t     */\r\n\t    var C_x64 = C.x64 = {};\r\n\r\n\t    /**\r\n\t     * A 64-bit word.\r\n\t     */\r\n\t    var X64Word = C_x64.Word = Base.extend({\r\n\t        /**\r\n\t         * Initializes a newly created 64-bit word.\r\n\t         *\r\n\t         * @param {number} high The high 32 bits.\r\n\t         * @param {number} low The low 32 bits.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);\r\n\t         */\r\n\t        init: function (high, low) {\r\n\t            this.high = high;\r\n\t            this.low = low;\r\n\t        }\r\n\r\n\t        /**\r\n\t         * Bitwise NOTs this word.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after negating.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var negated = x64Word.not();\r\n\t         */\r\n\t        // not: function () {\r\n\t            // var high = ~this.high;\r\n\t            // var low = ~this.low;\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Bitwise ANDs this word with the passed word.\r\n\t         *\r\n\t         * @param {X64Word} word The x64-Word to AND with this word.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after ANDing.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var anded = x64Word.and(anotherX64Word);\r\n\t         */\r\n\t        // and: function (word) {\r\n\t            // var high = this.high & word.high;\r\n\t            // var low = this.low & word.low;\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Bitwise ORs this word with the passed word.\r\n\t         *\r\n\t         * @param {X64Word} word The x64-Word to OR with this word.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after ORing.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var ored = x64Word.or(anotherX64Word);\r\n\t         */\r\n\t        // or: function (word) {\r\n\t            // var high = this.high | word.high;\r\n\t            // var low = this.low | word.low;\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Bitwise XORs this word with the passed word.\r\n\t         *\r\n\t         * @param {X64Word} word The x64-Word to XOR with this word.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after XORing.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var xored = x64Word.xor(anotherX64Word);\r\n\t         */\r\n\t        // xor: function (word) {\r\n\t            // var high = this.high ^ word.high;\r\n\t            // var low = this.low ^ word.low;\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Shifts this word n bits to the left.\r\n\t         *\r\n\t         * @param {number} n The number of bits to shift.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after shifting.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var shifted = x64Word.shiftL(25);\r\n\t         */\r\n\t        // shiftL: function (n) {\r\n\t            // if (n < 32) {\r\n\t                // var high = (this.high << n) | (this.low >>> (32 - n));\r\n\t                // var low = this.low << n;\r\n\t            // } else {\r\n\t                // var high = this.low << (n - 32);\r\n\t                // var low = 0;\r\n\t            // }\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Shifts this word n bits to the right.\r\n\t         *\r\n\t         * @param {number} n The number of bits to shift.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after shifting.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var shifted = x64Word.shiftR(7);\r\n\t         */\r\n\t        // shiftR: function (n) {\r\n\t            // if (n < 32) {\r\n\t                // var low = (this.low >>> n) | (this.high << (32 - n));\r\n\t                // var high = this.high >>> n;\r\n\t            // } else {\r\n\t                // var low = this.high >>> (n - 32);\r\n\t                // var high = 0;\r\n\t            // }\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Rotates this word n bits to the left.\r\n\t         *\r\n\t         * @param {number} n The number of bits to rotate.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after rotating.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var rotated = x64Word.rotL(25);\r\n\t         */\r\n\t        // rotL: function (n) {\r\n\t            // return this.shiftL(n).or(this.shiftR(64 - n));\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Rotates this word n bits to the right.\r\n\t         *\r\n\t         * @param {number} n The number of bits to rotate.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after rotating.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var rotated = x64Word.rotR(7);\r\n\t         */\r\n\t        // rotR: function (n) {\r\n\t            // return this.shiftR(n).or(this.shiftL(64 - n));\r\n\t        // },\r\n\r\n\t        /**\r\n\t         * Adds this word with the passed word.\r\n\t         *\r\n\t         * @param {X64Word} word The x64-Word to add with this word.\r\n\t         *\r\n\t         * @return {X64Word} A new x64-Word object after adding.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var added = x64Word.add(anotherX64Word);\r\n\t         */\r\n\t        // add: function (word) {\r\n\t            // var low = (this.low + word.low) | 0;\r\n\t            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;\r\n\t            // var high = (this.high + word.high + carry) | 0;\r\n\r\n\t            // return X64Word.create(high, low);\r\n\t        // }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * An array of 64-bit words.\r\n\t     *\r\n\t     * @property {Array} words The array of CryptoJS.x64.Word objects.\r\n\t     * @property {number} sigBytes The number of significant bytes in this word array.\r\n\t     */\r\n\t    var X64WordArray = C_x64.WordArray = Base.extend({\r\n\t        /**\r\n\t         * Initializes a newly created word array.\r\n\t         *\r\n\t         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.\r\n\t         * @param {number} sigBytes (Optional) The number of significant bytes in the words.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.x64.WordArray.create();\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.x64.WordArray.create([\r\n\t         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),\r\n\t         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)\r\n\t         *     ]);\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.x64.WordArray.create([\r\n\t         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),\r\n\t         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)\r\n\t         *     ], 10);\r\n\t         */\r\n\t        init: function (words, sigBytes) {\r\n\t            words = this.words = words || [];\r\n\r\n\t            if (sigBytes != undefined) {\r\n\t                this.sigBytes = sigBytes;\r\n\t            } else {\r\n\t                this.sigBytes = words.length * 8;\r\n\t            }\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts this 64-bit word array to a 32-bit word array.\r\n\t         *\r\n\t         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var x32WordArray = x64WordArray.toX32();\r\n\t         */\r\n\t        toX32: function () {\r\n\t            // Shortcuts\r\n\t            var x64Words = this.words;\r\n\t            var x64WordsLength = x64Words.length;\r\n\r\n\t            // Convert\r\n\t            var x32Words = [];\r\n\t            for (var i = 0; i < x64WordsLength; i++) {\r\n\t                var x64Word = x64Words[i];\r\n\t                x32Words.push(x64Word.high);\r\n\t                x32Words.push(x64Word.low);\r\n\t            }\r\n\r\n\t            return X32WordArray.create(x32Words, this.sigBytes);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates a copy of this word array.\r\n\t         *\r\n\t         * @return {X64WordArray} The clone.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var clone = x64WordArray.clone();\r\n\t         */\r\n\t        clone: function () {\r\n\t            var clone = Base.clone.call(this);\r\n\r\n\t            // Clone \"words\" array\r\n\t            var words = clone.words = this.words.slice(0);\r\n\r\n\t            // Clone each X64Word object\r\n\t            var wordsLength = words.length;\r\n\t            for (var i = 0; i < wordsLength; i++) {\r\n\t                words[i] = words[i].clone();\r\n\t            }\r\n\r\n\t            return clone;\r\n\t        }\r\n\t    });\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Check if typed arrays are supported\r\n\t    if (typeof ArrayBuffer != 'function') {\r\n\t        return;\r\n\t    }\r\n\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\r\n\t    // Reference original init\r\n\t    var superInit = WordArray.init;\r\n\r\n\t    // Augment WordArray.init to handle typed arrays\r\n\t    var subInit = WordArray.init = function (typedArray) {\r\n\t        // Convert buffers to uint8\r\n\t        if (typedArray instanceof ArrayBuffer) {\r\n\t            typedArray = new Uint8Array(typedArray);\r\n\t        }\r\n\r\n\t        // Convert other array views to uint8\r\n\t        if (\r\n\t            typedArray instanceof Int8Array ||\r\n\t            (typeof Uint8ClampedArray !== \"undefined\" && typedArray instanceof Uint8ClampedArray) ||\r\n\t            typedArray instanceof Int16Array ||\r\n\t            typedArray instanceof Uint16Array ||\r\n\t            typedArray instanceof Int32Array ||\r\n\t            typedArray instanceof Uint32Array ||\r\n\t            typedArray instanceof Float32Array ||\r\n\t            typedArray instanceof Float64Array\r\n\t        ) {\r\n\t            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);\r\n\t        }\r\n\r\n\t        // Handle Uint8Array\r\n\t        if (typedArray instanceof Uint8Array) {\r\n\t            // Shortcut\r\n\t            var typedArrayByteLength = typedArray.byteLength;\r\n\r\n\t            // Extract bytes\r\n\t            var words = [];\r\n\t            for (var i = 0; i < typedArrayByteLength; i++) {\r\n\t                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);\r\n\t            }\r\n\r\n\t            // Initialize this word array\r\n\t            superInit.call(this, words, typedArrayByteLength);\r\n\t        } else {\r\n\t            // Else call normal init\r\n\t            superInit.apply(this, arguments);\r\n\t        }\r\n\t    };\r\n\r\n\t    subInit.prototype = WordArray;\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.lib.WordArray;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var C_enc = C.enc;\r\n\r\n\t    /**\r\n\t     * UTF-16 BE encoding strategy.\r\n\t     */\r\n\t    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {\r\n\t        /**\r\n\t         * Converts a word array to a UTF-16 BE string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @return {string} The UTF-16 BE string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray) {\r\n\t            // Shortcuts\r\n\t            var words = wordArray.words;\r\n\t            var sigBytes = wordArray.sigBytes;\r\n\r\n\t            // Convert\r\n\t            var utf16Chars = [];\r\n\t            for (var i = 0; i < sigBytes; i += 2) {\r\n\t                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;\r\n\t                utf16Chars.push(String.fromCharCode(codePoint));\r\n\t            }\r\n\r\n\t            return utf16Chars.join('');\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a UTF-16 BE string to a word array.\r\n\t         *\r\n\t         * @param {string} utf16Str The UTF-16 BE string.\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);\r\n\t         */\r\n\t        parse: function (utf16Str) {\r\n\t            // Shortcut\r\n\t            var utf16StrLength = utf16Str.length;\r\n\r\n\t            // Convert\r\n\t            var words = [];\r\n\t            for (var i = 0; i < utf16StrLength; i++) {\r\n\t                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);\r\n\t            }\r\n\r\n\t            return WordArray.create(words, utf16StrLength * 2);\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * UTF-16 LE encoding strategy.\r\n\t     */\r\n\t    C_enc.Utf16LE = {\r\n\t        /**\r\n\t         * Converts a word array to a UTF-16 LE string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @return {string} The UTF-16 LE string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray) {\r\n\t            // Shortcuts\r\n\t            var words = wordArray.words;\r\n\t            var sigBytes = wordArray.sigBytes;\r\n\r\n\t            // Convert\r\n\t            var utf16Chars = [];\r\n\t            for (var i = 0; i < sigBytes; i += 2) {\r\n\t                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);\r\n\t                utf16Chars.push(String.fromCharCode(codePoint));\r\n\t            }\r\n\r\n\t            return utf16Chars.join('');\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a UTF-16 LE string to a word array.\r\n\t         *\r\n\t         * @param {string} utf16Str The UTF-16 LE string.\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);\r\n\t         */\r\n\t        parse: function (utf16Str) {\r\n\t            // Shortcut\r\n\t            var utf16StrLength = utf16Str.length;\r\n\r\n\t            // Convert\r\n\t            var words = [];\r\n\t            for (var i = 0; i < utf16StrLength; i++) {\r\n\t                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));\r\n\t            }\r\n\r\n\t            return WordArray.create(words, utf16StrLength * 2);\r\n\t        }\r\n\t    };\r\n\r\n\t    function swapEndian(word) {\r\n\t        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);\r\n\t    }\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.enc.Utf16;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var C_enc = C.enc;\r\n\r\n\t    /**\r\n\t     * Base64 encoding strategy.\r\n\t     */\r\n\t    var Base64 = C_enc.Base64 = {\r\n\t        /**\r\n\t         * Converts a word array to a Base64 string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @return {string} The Base64 string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray) {\r\n\t            // Shortcuts\r\n\t            var words = wordArray.words;\r\n\t            var sigBytes = wordArray.sigBytes;\r\n\t            var map = this._map;\r\n\r\n\t            // Clamp excess bits\r\n\t            wordArray.clamp();\r\n\r\n\t            // Convert\r\n\t            var base64Chars = [];\r\n\t            for (var i = 0; i < sigBytes; i += 3) {\r\n\t                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;\r\n\t                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;\r\n\t                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;\r\n\r\n\t                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;\r\n\r\n\t                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {\r\n\t                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));\r\n\t                }\r\n\t            }\r\n\r\n\t            // Add padding\r\n\t            var paddingChar = map.charAt(64);\r\n\t            if (paddingChar) {\r\n\t                while (base64Chars.length % 4) {\r\n\t                    base64Chars.push(paddingChar);\r\n\t                }\r\n\t            }\r\n\r\n\t            return base64Chars.join('');\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a Base64 string to a word array.\r\n\t         *\r\n\t         * @param {string} base64Str The Base64 string.\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);\r\n\t         */\r\n\t        parse: function (base64Str) {\r\n\t            // Shortcuts\r\n\t            var base64StrLength = base64Str.length;\r\n\t            var map = this._map;\r\n\t            var reverseMap = this._reverseMap;\r\n\r\n\t            if (!reverseMap) {\r\n\t                    reverseMap = this._reverseMap = [];\r\n\t                    for (var j = 0; j < map.length; j++) {\r\n\t                        reverseMap[map.charCodeAt(j)] = j;\r\n\t                    }\r\n\t            }\r\n\r\n\t            // Ignore padding\r\n\t            var paddingChar = map.charAt(64);\r\n\t            if (paddingChar) {\r\n\t                var paddingIndex = base64Str.indexOf(paddingChar);\r\n\t                if (paddingIndex !== -1) {\r\n\t                    base64StrLength = paddingIndex;\r\n\t                }\r\n\t            }\r\n\r\n\t            // Convert\r\n\t            return parseLoop(base64Str, base64StrLength, reverseMap);\r\n\r\n\t        },\r\n\r\n\t        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='\r\n\t    };\r\n\r\n\t    function parseLoop(base64Str, base64StrLength, reverseMap) {\r\n\t      var words = [];\r\n\t      var nBytes = 0;\r\n\t      for (var i = 0; i < base64StrLength; i++) {\r\n\t          if (i % 4) {\r\n\t              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);\r\n\t              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);\r\n\t              var bitsCombined = bits1 | bits2;\r\n\t              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);\r\n\t              nBytes++;\r\n\t          }\r\n\t      }\r\n\t      return WordArray.create(words, nBytes);\r\n\t    }\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.enc.Base64;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var C_enc = C.enc;\r\n\r\n\t    /**\r\n\t     * Base64url encoding strategy.\r\n\t     */\r\n\t    var Base64url = C_enc.Base64url = {\r\n\t        /**\r\n\t         * Converts a word array to a Base64url string.\r\n\t         *\r\n\t         * @param {WordArray} wordArray The word array.\r\n\t         *\r\n\t         * @param {boolean} urlSafe Whether to use url safe\r\n\t         *\r\n\t         * @return {string} The Base64url string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);\r\n\t         */\r\n\t        stringify: function (wordArray, urlSafe) {\r\n\t            if (urlSafe === undefined) {\r\n\t                urlSafe = true\r\n\t            }\r\n\t            // Shortcuts\r\n\t            var words = wordArray.words;\r\n\t            var sigBytes = wordArray.sigBytes;\r\n\t            var map = urlSafe ? this._safe_map : this._map;\r\n\r\n\t            // Clamp excess bits\r\n\t            wordArray.clamp();\r\n\r\n\t            // Convert\r\n\t            var base64Chars = [];\r\n\t            for (var i = 0; i < sigBytes; i += 3) {\r\n\t                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;\r\n\t                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;\r\n\t                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;\r\n\r\n\t                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;\r\n\r\n\t                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {\r\n\t                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));\r\n\t                }\r\n\t            }\r\n\r\n\t            // Add padding\r\n\t            var paddingChar = map.charAt(64);\r\n\t            if (paddingChar) {\r\n\t                while (base64Chars.length % 4) {\r\n\t                    base64Chars.push(paddingChar);\r\n\t                }\r\n\t            }\r\n\r\n\t            return base64Chars.join('');\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a Base64url string to a word array.\r\n\t         *\r\n\t         * @param {string} base64Str The Base64url string.\r\n\t         *\r\n\t         * @param {boolean} urlSafe Whether to use url safe\r\n\t         *\r\n\t         * @return {WordArray} The word array.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);\r\n\t         */\r\n\t        parse: function (base64Str, urlSafe) {\r\n\t            if (urlSafe === undefined) {\r\n\t                urlSafe = true\r\n\t            }\r\n\r\n\t            // Shortcuts\r\n\t            var base64StrLength = base64Str.length;\r\n\t            var map = urlSafe ? this._safe_map : this._map;\r\n\t            var reverseMap = this._reverseMap;\r\n\r\n\t            if (!reverseMap) {\r\n\t                reverseMap = this._reverseMap = [];\r\n\t                for (var j = 0; j < map.length; j++) {\r\n\t                    reverseMap[map.charCodeAt(j)] = j;\r\n\t                }\r\n\t            }\r\n\r\n\t            // Ignore padding\r\n\t            var paddingChar = map.charAt(64);\r\n\t            if (paddingChar) {\r\n\t                var paddingIndex = base64Str.indexOf(paddingChar);\r\n\t                if (paddingIndex !== -1) {\r\n\t                    base64StrLength = paddingIndex;\r\n\t                }\r\n\t            }\r\n\r\n\t            // Convert\r\n\t            return parseLoop(base64Str, base64StrLength, reverseMap);\r\n\r\n\t        },\r\n\r\n\t        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',\r\n\t        _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',\r\n\t    };\r\n\r\n\t    function parseLoop(base64Str, base64StrLength, reverseMap) {\r\n\t        var words = [];\r\n\t        var nBytes = 0;\r\n\t        for (var i = 0; i < base64StrLength; i++) {\r\n\t            if (i % 4) {\r\n\t                var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);\r\n\t                var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);\r\n\t                var bitsCombined = bits1 | bits2;\r\n\t                words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);\r\n\t                nBytes++;\r\n\t            }\r\n\t        }\r\n\t        return WordArray.create(words, nBytes);\r\n\t    }\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.enc.Base64url;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function (Math) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var Hasher = C_lib.Hasher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Constants table\r\n\t    var T = [];\r\n\r\n\t    // Compute constants\r\n\t    (function () {\r\n\t        for (var i = 0; i < 64; i++) {\r\n\t            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;\r\n\t        }\r\n\t    }());\r\n\r\n\t    /**\r\n\t     * MD5 hash algorithm.\r\n\t     */\r\n\t    var MD5 = C_algo.MD5 = Hasher.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash = new WordArray.init([\r\n\t                0x67452301, 0xefcdab89,\r\n\t                0x98badcfe, 0x10325476\r\n\t            ]);\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Swap endian\r\n\t            for (var i = 0; i < 16; i++) {\r\n\t                // Shortcuts\r\n\t                var offset_i = offset + i;\r\n\t                var M_offset_i = M[offset_i];\r\n\r\n\t                M[offset_i] = (\r\n\t                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |\r\n\t                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)\r\n\t                );\r\n\t            }\r\n\r\n\t            // Shortcuts\r\n\t            var H = this._hash.words;\r\n\r\n\t            var M_offset_0  = M[offset + 0];\r\n\t            var M_offset_1  = M[offset + 1];\r\n\t            var M_offset_2  = M[offset + 2];\r\n\t            var M_offset_3  = M[offset + 3];\r\n\t            var M_offset_4  = M[offset + 4];\r\n\t            var M_offset_5  = M[offset + 5];\r\n\t            var M_offset_6  = M[offset + 6];\r\n\t            var M_offset_7  = M[offset + 7];\r\n\t            var M_offset_8  = M[offset + 8];\r\n\t            var M_offset_9  = M[offset + 9];\r\n\t            var M_offset_10 = M[offset + 10];\r\n\t            var M_offset_11 = M[offset + 11];\r\n\t            var M_offset_12 = M[offset + 12];\r\n\t            var M_offset_13 = M[offset + 13];\r\n\t            var M_offset_14 = M[offset + 14];\r\n\t            var M_offset_15 = M[offset + 15];\r\n\r\n\t            // Working variables\r\n\t            var a = H[0];\r\n\t            var b = H[1];\r\n\t            var c = H[2];\r\n\t            var d = H[3];\r\n\r\n\t            // Computation\r\n\t            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);\r\n\t            d = FF(d, a, b, c, M_offset_1,  12, T[1]);\r\n\t            c = FF(c, d, a, b, M_offset_2,  17, T[2]);\r\n\t            b = FF(b, c, d, a, M_offset_3,  22, T[3]);\r\n\t            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);\r\n\t            d = FF(d, a, b, c, M_offset_5,  12, T[5]);\r\n\t            c = FF(c, d, a, b, M_offset_6,  17, T[6]);\r\n\t            b = FF(b, c, d, a, M_offset_7,  22, T[7]);\r\n\t            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);\r\n\t            d = FF(d, a, b, c, M_offset_9,  12, T[9]);\r\n\t            c = FF(c, d, a, b, M_offset_10, 17, T[10]);\r\n\t            b = FF(b, c, d, a, M_offset_11, 22, T[11]);\r\n\t            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);\r\n\t            d = FF(d, a, b, c, M_offset_13, 12, T[13]);\r\n\t            c = FF(c, d, a, b, M_offset_14, 17, T[14]);\r\n\t            b = FF(b, c, d, a, M_offset_15, 22, T[15]);\r\n\r\n\t            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);\r\n\t            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);\r\n\t            c = GG(c, d, a, b, M_offset_11, 14, T[18]);\r\n\t            b = GG(b, c, d, a, M_offset_0,  20, T[19]);\r\n\t            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);\r\n\t            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);\r\n\t            c = GG(c, d, a, b, M_offset_15, 14, T[22]);\r\n\t            b = GG(b, c, d, a, M_offset_4,  20, T[23]);\r\n\t            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);\r\n\t            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);\r\n\t            c = GG(c, d, a, b, M_offset_3,  14, T[26]);\r\n\t            b = GG(b, c, d, a, M_offset_8,  20, T[27]);\r\n\t            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);\r\n\t            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);\r\n\t            c = GG(c, d, a, b, M_offset_7,  14, T[30]);\r\n\t            b = GG(b, c, d, a, M_offset_12, 20, T[31]);\r\n\r\n\t            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);\r\n\t            d = HH(d, a, b, c, M_offset_8,  11, T[33]);\r\n\t            c = HH(c, d, a, b, M_offset_11, 16, T[34]);\r\n\t            b = HH(b, c, d, a, M_offset_14, 23, T[35]);\r\n\t            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);\r\n\t            d = HH(d, a, b, c, M_offset_4,  11, T[37]);\r\n\t            c = HH(c, d, a, b, M_offset_7,  16, T[38]);\r\n\t            b = HH(b, c, d, a, M_offset_10, 23, T[39]);\r\n\t            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);\r\n\t            d = HH(d, a, b, c, M_offset_0,  11, T[41]);\r\n\t            c = HH(c, d, a, b, M_offset_3,  16, T[42]);\r\n\t            b = HH(b, c, d, a, M_offset_6,  23, T[43]);\r\n\t            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);\r\n\t            d = HH(d, a, b, c, M_offset_12, 11, T[45]);\r\n\t            c = HH(c, d, a, b, M_offset_15, 16, T[46]);\r\n\t            b = HH(b, c, d, a, M_offset_2,  23, T[47]);\r\n\r\n\t            a = II(a, b, c, d, M_offset_0,  6,  T[48]);\r\n\t            d = II(d, a, b, c, M_offset_7,  10, T[49]);\r\n\t            c = II(c, d, a, b, M_offset_14, 15, T[50]);\r\n\t            b = II(b, c, d, a, M_offset_5,  21, T[51]);\r\n\t            a = II(a, b, c, d, M_offset_12, 6,  T[52]);\r\n\t            d = II(d, a, b, c, M_offset_3,  10, T[53]);\r\n\t            c = II(c, d, a, b, M_offset_10, 15, T[54]);\r\n\t            b = II(b, c, d, a, M_offset_1,  21, T[55]);\r\n\t            a = II(a, b, c, d, M_offset_8,  6,  T[56]);\r\n\t            d = II(d, a, b, c, M_offset_15, 10, T[57]);\r\n\t            c = II(c, d, a, b, M_offset_6,  15, T[58]);\r\n\t            b = II(b, c, d, a, M_offset_13, 21, T[59]);\r\n\t            a = II(a, b, c, d, M_offset_4,  6,  T[60]);\r\n\t            d = II(d, a, b, c, M_offset_11, 10, T[61]);\r\n\t            c = II(c, d, a, b, M_offset_2,  15, T[62]);\r\n\t            b = II(b, c, d, a, M_offset_9,  21, T[63]);\r\n\r\n\t            // Intermediate hash value\r\n\t            H[0] = (H[0] + a) | 0;\r\n\t            H[1] = (H[1] + b) | 0;\r\n\t            H[2] = (H[2] + c) | 0;\r\n\t            H[3] = (H[3] + d) | 0;\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\r\n\t            var nBitsTotal = this._nDataBytes * 8;\r\n\t            var nBitsLeft = data.sigBytes * 8;\r\n\r\n\t            // Add padding\r\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\r\n\r\n\t            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);\r\n\t            var nBitsTotalL = nBitsTotal;\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (\r\n\t                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |\r\n\t                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)\r\n\t            );\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (\r\n\t                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |\r\n\t                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)\r\n\t            );\r\n\r\n\t            data.sigBytes = (dataWords.length + 1) * 4;\r\n\r\n\t            // Hash final blocks\r\n\t            this._process();\r\n\r\n\t            // Shortcuts\r\n\t            var hash = this._hash;\r\n\t            var H = hash.words;\r\n\r\n\t            // Swap endian\r\n\t            for (var i = 0; i < 4; i++) {\r\n\t                // Shortcut\r\n\t                var H_i = H[i];\r\n\r\n\t                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |\r\n\t                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);\r\n\t            }\r\n\r\n\t            // Return final computed hash\r\n\t            return hash;\r\n\t        },\r\n\r\n\t        clone: function () {\r\n\t            var clone = Hasher.clone.call(this);\r\n\t            clone._hash = this._hash.clone();\r\n\r\n\t            return clone;\r\n\t        }\r\n\t    });\r\n\r\n\t    function FF(a, b, c, d, x, s, t) {\r\n\t        var n = a + ((b & c) | (~b & d)) + x + t;\r\n\t        return ((n << s) | (n >>> (32 - s))) + b;\r\n\t    }\r\n\r\n\t    function GG(a, b, c, d, x, s, t) {\r\n\t        var n = a + ((b & d) | (c & ~d)) + x + t;\r\n\t        return ((n << s) | (n >>> (32 - s))) + b;\r\n\t    }\r\n\r\n\t    function HH(a, b, c, d, x, s, t) {\r\n\t        var n = a + (b ^ c ^ d) + x + t;\r\n\t        return ((n << s) | (n >>> (32 - s))) + b;\r\n\t    }\r\n\r\n\t    function II(a, b, c, d, x, s, t) {\r\n\t        var n = a + (c ^ (b | ~d)) + x + t;\r\n\t        return ((n << s) | (n >>> (32 - s))) + b;\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.MD5('message');\r\n\t     *     var hash = CryptoJS.MD5(wordArray);\r\n\t     */\r\n\t    C.MD5 = Hasher._createHelper(MD5);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacMD5(message, key);\r\n\t     */\r\n\t    C.HmacMD5 = Hasher._createHmacHelper(MD5);\r\n\t}(Math));\r\n\r\n\r\n\treturn CryptoJS.MD5;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var Hasher = C_lib.Hasher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Reusable object\r\n\t    var W = [];\r\n\r\n\t    /**\r\n\t     * SHA-1 hash algorithm.\r\n\t     */\r\n\t    var SHA1 = C_algo.SHA1 = Hasher.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash = new WordArray.init([\r\n\t                0x67452301, 0xefcdab89,\r\n\t                0x98badcfe, 0x10325476,\r\n\t                0xc3d2e1f0\r\n\t            ]);\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Shortcut\r\n\t            var H = this._hash.words;\r\n\r\n\t            // Working variables\r\n\t            var a = H[0];\r\n\t            var b = H[1];\r\n\t            var c = H[2];\r\n\t            var d = H[3];\r\n\t            var e = H[4];\r\n\r\n\t            // Computation\r\n\t            for (var i = 0; i < 80; i++) {\r\n\t                if (i < 16) {\r\n\t                    W[i] = M[offset + i] | 0;\r\n\t                } else {\r\n\t                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];\r\n\t                    W[i] = (n << 1) | (n >>> 31);\r\n\t                }\r\n\r\n\t                var t = ((a << 5) | (a >>> 27)) + e + W[i];\r\n\t                if (i < 20) {\r\n\t                    t += ((b & c) | (~b & d)) + 0x5a827999;\r\n\t                } else if (i < 40) {\r\n\t                    t += (b ^ c ^ d) + 0x6ed9eba1;\r\n\t                } else if (i < 60) {\r\n\t                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;\r\n\t                } else /* if (i < 80) */ {\r\n\t                    t += (b ^ c ^ d) - 0x359d3e2a;\r\n\t                }\r\n\r\n\t                e = d;\r\n\t                d = c;\r\n\t                c = (b << 30) | (b >>> 2);\r\n\t                b = a;\r\n\t                a = t;\r\n\t            }\r\n\r\n\t            // Intermediate hash value\r\n\t            H[0] = (H[0] + a) | 0;\r\n\t            H[1] = (H[1] + b) | 0;\r\n\t            H[2] = (H[2] + c) | 0;\r\n\t            H[3] = (H[3] + d) | 0;\r\n\t            H[4] = (H[4] + e) | 0;\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\r\n\t            var nBitsTotal = this._nDataBytes * 8;\r\n\t            var nBitsLeft = data.sigBytes * 8;\r\n\r\n\t            // Add padding\r\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;\r\n\t            data.sigBytes = dataWords.length * 4;\r\n\r\n\t            // Hash final blocks\r\n\t            this._process();\r\n\r\n\t            // Return final computed hash\r\n\t            return this._hash;\r\n\t        },\r\n\r\n\t        clone: function () {\r\n\t            var clone = Hasher.clone.call(this);\r\n\t            clone._hash = this._hash.clone();\r\n\r\n\t            return clone;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.SHA1('message');\r\n\t     *     var hash = CryptoJS.SHA1(wordArray);\r\n\t     */\r\n\t    C.SHA1 = Hasher._createHelper(SHA1);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacSHA1(message, key);\r\n\t     */\r\n\t    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.SHA1;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function (Math) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var Hasher = C_lib.Hasher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Initialization and round constants tables\r\n\t    var H = [];\r\n\t    var K = [];\r\n\r\n\t    // Compute constants\r\n\t    (function () {\r\n\t        function isPrime(n) {\r\n\t            var sqrtN = Math.sqrt(n);\r\n\t            for (var factor = 2; factor <= sqrtN; factor++) {\r\n\t                if (!(n % factor)) {\r\n\t                    return false;\r\n\t                }\r\n\t            }\r\n\r\n\t            return true;\r\n\t        }\r\n\r\n\t        function getFractionalBits(n) {\r\n\t            return ((n - (n | 0)) * 0x100000000) | 0;\r\n\t        }\r\n\r\n\t        var n = 2;\r\n\t        var nPrime = 0;\r\n\t        while (nPrime < 64) {\r\n\t            if (isPrime(n)) {\r\n\t                if (nPrime < 8) {\r\n\t                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));\r\n\t                }\r\n\t                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));\r\n\r\n\t                nPrime++;\r\n\t            }\r\n\r\n\t            n++;\r\n\t        }\r\n\t    }());\r\n\r\n\t    // Reusable object\r\n\t    var W = [];\r\n\r\n\t    /**\r\n\t     * SHA-256 hash algorithm.\r\n\t     */\r\n\t    var SHA256 = C_algo.SHA256 = Hasher.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash = new WordArray.init(H.slice(0));\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Shortcut\r\n\t            var H = this._hash.words;\r\n\r\n\t            // Working variables\r\n\t            var a = H[0];\r\n\t            var b = H[1];\r\n\t            var c = H[2];\r\n\t            var d = H[3];\r\n\t            var e = H[4];\r\n\t            var f = H[5];\r\n\t            var g = H[6];\r\n\t            var h = H[7];\r\n\r\n\t            // Computation\r\n\t            for (var i = 0; i < 64; i++) {\r\n\t                if (i < 16) {\r\n\t                    W[i] = M[offset + i] | 0;\r\n\t                } else {\r\n\t                    var gamma0x = W[i - 15];\r\n\t                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^\r\n\t                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^\r\n\t                                   (gamma0x >>> 3);\r\n\r\n\t                    var gamma1x = W[i - 2];\r\n\t                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^\r\n\t                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^\r\n\t                                   (gamma1x >>> 10);\r\n\r\n\t                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];\r\n\t                }\r\n\r\n\t                var ch  = (e & f) ^ (~e & g);\r\n\t                var maj = (a & b) ^ (a & c) ^ (b & c);\r\n\r\n\t                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));\r\n\t                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));\r\n\r\n\t                var t1 = h + sigma1 + ch + K[i] + W[i];\r\n\t                var t2 = sigma0 + maj;\r\n\r\n\t                h = g;\r\n\t                g = f;\r\n\t                f = e;\r\n\t                e = (d + t1) | 0;\r\n\t                d = c;\r\n\t                c = b;\r\n\t                b = a;\r\n\t                a = (t1 + t2) | 0;\r\n\t            }\r\n\r\n\t            // Intermediate hash value\r\n\t            H[0] = (H[0] + a) | 0;\r\n\t            H[1] = (H[1] + b) | 0;\r\n\t            H[2] = (H[2] + c) | 0;\r\n\t            H[3] = (H[3] + d) | 0;\r\n\t            H[4] = (H[4] + e) | 0;\r\n\t            H[5] = (H[5] + f) | 0;\r\n\t            H[6] = (H[6] + g) | 0;\r\n\t            H[7] = (H[7] + h) | 0;\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\r\n\t            var nBitsTotal = this._nDataBytes * 8;\r\n\t            var nBitsLeft = data.sigBytes * 8;\r\n\r\n\t            // Add padding\r\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;\r\n\t            data.sigBytes = dataWords.length * 4;\r\n\r\n\t            // Hash final blocks\r\n\t            this._process();\r\n\r\n\t            // Return final computed hash\r\n\t            return this._hash;\r\n\t        },\r\n\r\n\t        clone: function () {\r\n\t            var clone = Hasher.clone.call(this);\r\n\t            clone._hash = this._hash.clone();\r\n\r\n\t            return clone;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.SHA256('message');\r\n\t     *     var hash = CryptoJS.SHA256(wordArray);\r\n\t     */\r\n\t    C.SHA256 = Hasher._createHelper(SHA256);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacSHA256(message, key);\r\n\t     */\r\n\t    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);\r\n\t}(Math));\r\n\r\n\r\n\treturn CryptoJS.SHA256;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha256\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./sha256\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var C_algo = C.algo;\r\n\t    var SHA256 = C_algo.SHA256;\r\n\r\n\t    /**\r\n\t     * SHA-224 hash algorithm.\r\n\t     */\r\n\t    var SHA224 = C_algo.SHA224 = SHA256.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash = new WordArray.init([\r\n\t                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,\r\n\t                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4\r\n\t            ]);\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            var hash = SHA256._doFinalize.call(this);\r\n\r\n\t            hash.sigBytes -= 4;\r\n\r\n\t            return hash;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.SHA224('message');\r\n\t     *     var hash = CryptoJS.SHA224(wordArray);\r\n\t     */\r\n\t    C.SHA224 = SHA256._createHelper(SHA224);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacSHA224(message, key);\r\n\t     */\r\n\t    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.SHA224;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./x64-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var Hasher = C_lib.Hasher;\r\n\t    var C_x64 = C.x64;\r\n\t    var X64Word = C_x64.Word;\r\n\t    var X64WordArray = C_x64.WordArray;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    function X64Word_create() {\r\n\t        return X64Word.create.apply(X64Word, arguments);\r\n\t    }\r\n\r\n\t    // Constants\r\n\t    var K = [\r\n\t        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),\r\n\t        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),\r\n\t        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),\r\n\t        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),\r\n\t        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),\r\n\t        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),\r\n\t        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),\r\n\t        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),\r\n\t        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),\r\n\t        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),\r\n\t        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),\r\n\t        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),\r\n\t        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),\r\n\t        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),\r\n\t        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),\r\n\t        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),\r\n\t        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),\r\n\t        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),\r\n\t        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),\r\n\t        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),\r\n\t        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),\r\n\t        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),\r\n\t        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),\r\n\t        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),\r\n\t        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),\r\n\t        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),\r\n\t        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),\r\n\t        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),\r\n\t        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),\r\n\t        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),\r\n\t        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),\r\n\t        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),\r\n\t        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),\r\n\t        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),\r\n\t        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),\r\n\t        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),\r\n\t        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),\r\n\t        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),\r\n\t        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),\r\n\t        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)\r\n\t    ];\r\n\r\n\t    // Reusable objects\r\n\t    var W = [];\r\n\t    (function () {\r\n\t        for (var i = 0; i < 80; i++) {\r\n\t            W[i] = X64Word_create();\r\n\t        }\r\n\t    }());\r\n\r\n\t    /**\r\n\t     * SHA-512 hash algorithm.\r\n\t     */\r\n\t    var SHA512 = C_algo.SHA512 = Hasher.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash = new X64WordArray.init([\r\n\t                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),\r\n\t                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),\r\n\t                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),\r\n\t                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)\r\n\t            ]);\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Shortcuts\r\n\t            var H = this._hash.words;\r\n\r\n\t            var H0 = H[0];\r\n\t            var H1 = H[1];\r\n\t            var H2 = H[2];\r\n\t            var H3 = H[3];\r\n\t            var H4 = H[4];\r\n\t            var H5 = H[5];\r\n\t            var H6 = H[6];\r\n\t            var H7 = H[7];\r\n\r\n\t            var H0h = H0.high;\r\n\t            var H0l = H0.low;\r\n\t            var H1h = H1.high;\r\n\t            var H1l = H1.low;\r\n\t            var H2h = H2.high;\r\n\t            var H2l = H2.low;\r\n\t            var H3h = H3.high;\r\n\t            var H3l = H3.low;\r\n\t            var H4h = H4.high;\r\n\t            var H4l = H4.low;\r\n\t            var H5h = H5.high;\r\n\t            var H5l = H5.low;\r\n\t            var H6h = H6.high;\r\n\t            var H6l = H6.low;\r\n\t            var H7h = H7.high;\r\n\t            var H7l = H7.low;\r\n\r\n\t            // Working variables\r\n\t            var ah = H0h;\r\n\t            var al = H0l;\r\n\t            var bh = H1h;\r\n\t            var bl = H1l;\r\n\t            var ch = H2h;\r\n\t            var cl = H2l;\r\n\t            var dh = H3h;\r\n\t            var dl = H3l;\r\n\t            var eh = H4h;\r\n\t            var el = H4l;\r\n\t            var fh = H5h;\r\n\t            var fl = H5l;\r\n\t            var gh = H6h;\r\n\t            var gl = H6l;\r\n\t            var hh = H7h;\r\n\t            var hl = H7l;\r\n\r\n\t            // Rounds\r\n\t            for (var i = 0; i < 80; i++) {\r\n\t                var Wil;\r\n\t                var Wih;\r\n\r\n\t                // Shortcut\r\n\t                var Wi = W[i];\r\n\r\n\t                // Extend message\r\n\t                if (i < 16) {\r\n\t                    Wih = Wi.high = M[offset + i * 2]     | 0;\r\n\t                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;\r\n\t                } else {\r\n\t                    // Gamma0\r\n\t                    var gamma0x  = W[i - 15];\r\n\t                    var gamma0xh = gamma0x.high;\r\n\t                    var gamma0xl = gamma0x.low;\r\n\t                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);\r\n\t                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));\r\n\r\n\t                    // Gamma1\r\n\t                    var gamma1x  = W[i - 2];\r\n\t                    var gamma1xh = gamma1x.high;\r\n\t                    var gamma1xl = gamma1x.low;\r\n\t                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);\r\n\t                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));\r\n\r\n\t                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]\r\n\t                    var Wi7  = W[i - 7];\r\n\t                    var Wi7h = Wi7.high;\r\n\t                    var Wi7l = Wi7.low;\r\n\r\n\t                    var Wi16  = W[i - 16];\r\n\t                    var Wi16h = Wi16.high;\r\n\t                    var Wi16l = Wi16.low;\r\n\r\n\t                    Wil = gamma0l + Wi7l;\r\n\t                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);\r\n\t                    Wil = Wil + gamma1l;\r\n\t                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);\r\n\t                    Wil = Wil + Wi16l;\r\n\t                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);\r\n\r\n\t                    Wi.high = Wih;\r\n\t                    Wi.low  = Wil;\r\n\t                }\r\n\r\n\t                var chh  = (eh & fh) ^ (~eh & gh);\r\n\t                var chl  = (el & fl) ^ (~el & gl);\r\n\t                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);\r\n\t                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);\r\n\r\n\t                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));\r\n\t                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));\r\n\t                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));\r\n\t                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));\r\n\r\n\t                // t1 = h + sigma1 + ch + K[i] + W[i]\r\n\t                var Ki  = K[i];\r\n\t                var Kih = Ki.high;\r\n\t                var Kil = Ki.low;\r\n\r\n\t                var t1l = hl + sigma1l;\r\n\t                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);\r\n\t                var t1l = t1l + chl;\r\n\t                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);\r\n\t                var t1l = t1l + Kil;\r\n\t                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);\r\n\t                var t1l = t1l + Wil;\r\n\t                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);\r\n\r\n\t                // t2 = sigma0 + maj\r\n\t                var t2l = sigma0l + majl;\r\n\t                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);\r\n\r\n\t                // Update working variables\r\n\t                hh = gh;\r\n\t                hl = gl;\r\n\t                gh = fh;\r\n\t                gl = fl;\r\n\t                fh = eh;\r\n\t                fl = el;\r\n\t                el = (dl + t1l) | 0;\r\n\t                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;\r\n\t                dh = ch;\r\n\t                dl = cl;\r\n\t                ch = bh;\r\n\t                cl = bl;\r\n\t                bh = ah;\r\n\t                bl = al;\r\n\t                al = (t1l + t2l) | 0;\r\n\t                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;\r\n\t            }\r\n\r\n\t            // Intermediate hash value\r\n\t            H0l = H0.low  = (H0l + al);\r\n\t            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));\r\n\t            H1l = H1.low  = (H1l + bl);\r\n\t            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));\r\n\t            H2l = H2.low  = (H2l + cl);\r\n\t            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));\r\n\t            H3l = H3.low  = (H3l + dl);\r\n\t            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));\r\n\t            H4l = H4.low  = (H4l + el);\r\n\t            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));\r\n\t            H5l = H5.low  = (H5l + fl);\r\n\t            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));\r\n\t            H6l = H6.low  = (H6l + gl);\r\n\t            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));\r\n\t            H7l = H7.low  = (H7l + hl);\r\n\t            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\r\n\t            var nBitsTotal = this._nDataBytes * 8;\r\n\t            var nBitsLeft = data.sigBytes * 8;\r\n\r\n\t            // Add padding\r\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\r\n\t            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);\r\n\t            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;\r\n\t            data.sigBytes = dataWords.length * 4;\r\n\r\n\t            // Hash final blocks\r\n\t            this._process();\r\n\r\n\t            // Convert hash to 32-bit word array before returning\r\n\t            var hash = this._hash.toX32();\r\n\r\n\t            // Return final computed hash\r\n\t            return hash;\r\n\t        },\r\n\r\n\t        clone: function () {\r\n\t            var clone = Hasher.clone.call(this);\r\n\t            clone._hash = this._hash.clone();\r\n\r\n\t            return clone;\r\n\t        },\r\n\r\n\t        blockSize: 1024/32\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.SHA512('message');\r\n\t     *     var hash = CryptoJS.SHA512(wordArray);\r\n\t     */\r\n\t    C.SHA512 = Hasher._createHelper(SHA512);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacSHA512(message, key);\r\n\t     */\r\n\t    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.SHA512;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"), require(\"./sha512\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./x64-core\", \"./sha512\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_x64 = C.x64;\r\n\t    var X64Word = C_x64.Word;\r\n\t    var X64WordArray = C_x64.WordArray;\r\n\t    var C_algo = C.algo;\r\n\t    var SHA512 = C_algo.SHA512;\r\n\r\n\t    /**\r\n\t     * SHA-384 hash algorithm.\r\n\t     */\r\n\t    var SHA384 = C_algo.SHA384 = SHA512.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash = new X64WordArray.init([\r\n\t                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),\r\n\t                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),\r\n\t                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),\r\n\t                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)\r\n\t            ]);\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            var hash = SHA512._doFinalize.call(this);\r\n\r\n\t            hash.sigBytes -= 16;\r\n\r\n\t            return hash;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.SHA384('message');\r\n\t     *     var hash = CryptoJS.SHA384(wordArray);\r\n\t     */\r\n\t    C.SHA384 = SHA512._createHelper(SHA384);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacSHA384(message, key);\r\n\t     */\r\n\t    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.SHA384;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./x64-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./x64-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function (Math) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var Hasher = C_lib.Hasher;\r\n\t    var C_x64 = C.x64;\r\n\t    var X64Word = C_x64.Word;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Constants tables\r\n\t    var RHO_OFFSETS = [];\r\n\t    var PI_INDEXES  = [];\r\n\t    var ROUND_CONSTANTS = [];\r\n\r\n\t    // Compute Constants\r\n\t    (function () {\r\n\t        // Compute rho offset constants\r\n\t        var x = 1, y = 0;\r\n\t        for (var t = 0; t < 24; t++) {\r\n\t            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;\r\n\r\n\t            var newX = y % 5;\r\n\t            var newY = (2 * x + 3 * y) % 5;\r\n\t            x = newX;\r\n\t            y = newY;\r\n\t        }\r\n\r\n\t        // Compute pi index constants\r\n\t        for (var x = 0; x < 5; x++) {\r\n\t            for (var y = 0; y < 5; y++) {\r\n\t                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;\r\n\t            }\r\n\t        }\r\n\r\n\t        // Compute round constants\r\n\t        var LFSR = 0x01;\r\n\t        for (var i = 0; i < 24; i++) {\r\n\t            var roundConstantMsw = 0;\r\n\t            var roundConstantLsw = 0;\r\n\r\n\t            for (var j = 0; j < 7; j++) {\r\n\t                if (LFSR & 0x01) {\r\n\t                    var bitPosition = (1 << j) - 1;\r\n\t                    if (bitPosition < 32) {\r\n\t                        roundConstantLsw ^= 1 << bitPosition;\r\n\t                    } else /* if (bitPosition >= 32) */ {\r\n\t                        roundConstantMsw ^= 1 << (bitPosition - 32);\r\n\t                    }\r\n\t                }\r\n\r\n\t                // Compute next LFSR\r\n\t                if (LFSR & 0x80) {\r\n\t                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1\r\n\t                    LFSR = (LFSR << 1) ^ 0x71;\r\n\t                } else {\r\n\t                    LFSR <<= 1;\r\n\t                }\r\n\t            }\r\n\r\n\t            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);\r\n\t        }\r\n\t    }());\r\n\r\n\t    // Reusable objects for temporary values\r\n\t    var T = [];\r\n\t    (function () {\r\n\t        for (var i = 0; i < 25; i++) {\r\n\t            T[i] = X64Word.create();\r\n\t        }\r\n\t    }());\r\n\r\n\t    /**\r\n\t     * SHA-3 hash algorithm.\r\n\t     */\r\n\t    var SHA3 = C_algo.SHA3 = Hasher.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {number} outputLength\r\n\t         *   The desired number of bits in the output hash.\r\n\t         *   Only values permitted are: 224, 256, 384, 512.\r\n\t         *   Default: 512\r\n\t         */\r\n\t        cfg: Hasher.cfg.extend({\r\n\t            outputLength: 512\r\n\t        }),\r\n\r\n\t        _doReset: function () {\r\n\t            var state = this._state = []\r\n\t            for (var i = 0; i < 25; i++) {\r\n\t                state[i] = new X64Word.init();\r\n\t            }\r\n\r\n\t            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Shortcuts\r\n\t            var state = this._state;\r\n\t            var nBlockSizeLanes = this.blockSize / 2;\r\n\r\n\t            // Absorb\r\n\t            for (var i = 0; i < nBlockSizeLanes; i++) {\r\n\t                // Shortcuts\r\n\t                var M2i  = M[offset + 2 * i];\r\n\t                var M2i1 = M[offset + 2 * i + 1];\r\n\r\n\t                // Swap endian\r\n\t                M2i = (\r\n\t                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |\r\n\t                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)\r\n\t                );\r\n\t                M2i1 = (\r\n\t                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |\r\n\t                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)\r\n\t                );\r\n\r\n\t                // Absorb message into state\r\n\t                var lane = state[i];\r\n\t                lane.high ^= M2i1;\r\n\t                lane.low  ^= M2i;\r\n\t            }\r\n\r\n\t            // Rounds\r\n\t            for (var round = 0; round < 24; round++) {\r\n\t                // Theta\r\n\t                for (var x = 0; x < 5; x++) {\r\n\t                    // Mix column lanes\r\n\t                    var tMsw = 0, tLsw = 0;\r\n\t                    for (var y = 0; y < 5; y++) {\r\n\t                        var lane = state[x + 5 * y];\r\n\t                        tMsw ^= lane.high;\r\n\t                        tLsw ^= lane.low;\r\n\t                    }\r\n\r\n\t                    // Temporary values\r\n\t                    var Tx = T[x];\r\n\t                    Tx.high = tMsw;\r\n\t                    Tx.low  = tLsw;\r\n\t                }\r\n\t                for (var x = 0; x < 5; x++) {\r\n\t                    // Shortcuts\r\n\t                    var Tx4 = T[(x + 4) % 5];\r\n\t                    var Tx1 = T[(x + 1) % 5];\r\n\t                    var Tx1Msw = Tx1.high;\r\n\t                    var Tx1Lsw = Tx1.low;\r\n\r\n\t                    // Mix surrounding columns\r\n\t                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));\r\n\t                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));\r\n\t                    for (var y = 0; y < 5; y++) {\r\n\t                        var lane = state[x + 5 * y];\r\n\t                        lane.high ^= tMsw;\r\n\t                        lane.low  ^= tLsw;\r\n\t                    }\r\n\t                }\r\n\r\n\t                // Rho Pi\r\n\t                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {\r\n\t                    var tMsw;\r\n\t                    var tLsw;\r\n\r\n\t                    // Shortcuts\r\n\t                    var lane = state[laneIndex];\r\n\t                    var laneMsw = lane.high;\r\n\t                    var laneLsw = lane.low;\r\n\t                    var rhoOffset = RHO_OFFSETS[laneIndex];\r\n\r\n\t                    // Rotate lanes\r\n\t                    if (rhoOffset < 32) {\r\n\t                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));\r\n\t                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));\r\n\t                    } else /* if (rhoOffset >= 32) */ {\r\n\t                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));\r\n\t                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));\r\n\t                    }\r\n\r\n\t                    // Transpose lanes\r\n\t                    var TPiLane = T[PI_INDEXES[laneIndex]];\r\n\t                    TPiLane.high = tMsw;\r\n\t                    TPiLane.low  = tLsw;\r\n\t                }\r\n\r\n\t                // Rho pi at x = y = 0\r\n\t                var T0 = T[0];\r\n\t                var state0 = state[0];\r\n\t                T0.high = state0.high;\r\n\t                T0.low  = state0.low;\r\n\r\n\t                // Chi\r\n\t                for (var x = 0; x < 5; x++) {\r\n\t                    for (var y = 0; y < 5; y++) {\r\n\t                        // Shortcuts\r\n\t                        var laneIndex = x + 5 * y;\r\n\t                        var lane = state[laneIndex];\r\n\t                        var TLane = T[laneIndex];\r\n\t                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];\r\n\t                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];\r\n\r\n\t                        // Mix rows\r\n\t                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);\r\n\t                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);\r\n\t                    }\r\n\t                }\r\n\r\n\t                // Iota\r\n\t                var lane = state[0];\r\n\t                var roundConstant = ROUND_CONSTANTS[round];\r\n\t                lane.high ^= roundConstant.high;\r\n\t                lane.low  ^= roundConstant.low;\r\n\t            }\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\t            var nBitsTotal = this._nDataBytes * 8;\r\n\t            var nBitsLeft = data.sigBytes * 8;\r\n\t            var blockSizeBits = this.blockSize * 32;\r\n\r\n\t            // Add padding\r\n\t            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);\r\n\t            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;\r\n\t            data.sigBytes = dataWords.length * 4;\r\n\r\n\t            // Hash final blocks\r\n\t            this._process();\r\n\r\n\t            // Shortcuts\r\n\t            var state = this._state;\r\n\t            var outputLengthBytes = this.cfg.outputLength / 8;\r\n\t            var outputLengthLanes = outputLengthBytes / 8;\r\n\r\n\t            // Squeeze\r\n\t            var hashWords = [];\r\n\t            for (var i = 0; i < outputLengthLanes; i++) {\r\n\t                // Shortcuts\r\n\t                var lane = state[i];\r\n\t                var laneMsw = lane.high;\r\n\t                var laneLsw = lane.low;\r\n\r\n\t                // Swap endian\r\n\t                laneMsw = (\r\n\t                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |\r\n\t                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)\r\n\t                );\r\n\t                laneLsw = (\r\n\t                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |\r\n\t                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)\r\n\t                );\r\n\r\n\t                // Squeeze state to retrieve hash\r\n\t                hashWords.push(laneLsw);\r\n\t                hashWords.push(laneMsw);\r\n\t            }\r\n\r\n\t            // Return final computed hash\r\n\t            return new WordArray.init(hashWords, outputLengthBytes);\r\n\t        },\r\n\r\n\t        clone: function () {\r\n\t            var clone = Hasher.clone.call(this);\r\n\r\n\t            var state = clone._state = this._state.slice(0);\r\n\t            for (var i = 0; i < 25; i++) {\r\n\t                state[i] = state[i].clone();\r\n\t            }\r\n\r\n\t            return clone;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.SHA3('message');\r\n\t     *     var hash = CryptoJS.SHA3(wordArray);\r\n\t     */\r\n\t    C.SHA3 = Hasher._createHelper(SHA3);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacSHA3(message, key);\r\n\t     */\r\n\t    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);\r\n\t}(Math));\r\n\r\n\r\n\treturn CryptoJS.SHA3;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/** @preserve\r\n\t(c) 2012 by Cédric Mesnil. All rights reserved.\r\n\r\n\tRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\r\n\r\n\t    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\r\n\t    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\r\n\r\n\tTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r\n\t*/\r\n\r\n\t(function (Math) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var Hasher = C_lib.Hasher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Constants table\r\n\t    var _zl = WordArray.create([\r\n\t        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,\r\n\t        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,\r\n\t        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,\r\n\t        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,\r\n\t        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);\r\n\t    var _zr = WordArray.create([\r\n\t        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,\r\n\t        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,\r\n\t        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,\r\n\t        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,\r\n\t        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);\r\n\t    var _sl = WordArray.create([\r\n\t         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,\r\n\t        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,\r\n\t        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,\r\n\t          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,\r\n\t        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);\r\n\t    var _sr = WordArray.create([\r\n\t        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,\r\n\t        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,\r\n\t        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,\r\n\t        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,\r\n\t        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);\r\n\r\n\t    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);\r\n\t    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);\r\n\r\n\t    /**\r\n\t     * RIPEMD160 hash algorithm.\r\n\t     */\r\n\t    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({\r\n\t        _doReset: function () {\r\n\t            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\r\n\t            // Swap endian\r\n\t            for (var i = 0; i < 16; i++) {\r\n\t                // Shortcuts\r\n\t                var offset_i = offset + i;\r\n\t                var M_offset_i = M[offset_i];\r\n\r\n\t                // Swap\r\n\t                M[offset_i] = (\r\n\t                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |\r\n\t                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)\r\n\t                );\r\n\t            }\r\n\t            // Shortcut\r\n\t            var H  = this._hash.words;\r\n\t            var hl = _hl.words;\r\n\t            var hr = _hr.words;\r\n\t            var zl = _zl.words;\r\n\t            var zr = _zr.words;\r\n\t            var sl = _sl.words;\r\n\t            var sr = _sr.words;\r\n\r\n\t            // Working variables\r\n\t            var al, bl, cl, dl, el;\r\n\t            var ar, br, cr, dr, er;\r\n\r\n\t            ar = al = H[0];\r\n\t            br = bl = H[1];\r\n\t            cr = cl = H[2];\r\n\t            dr = dl = H[3];\r\n\t            er = el = H[4];\r\n\t            // Computation\r\n\t            var t;\r\n\t            for (var i = 0; i < 80; i += 1) {\r\n\t                t = (al +  M[offset+zl[i]])|0;\r\n\t                if (i<16){\r\n\t\t            t +=  f1(bl,cl,dl) + hl[0];\r\n\t                } else if (i<32) {\r\n\t\t            t +=  f2(bl,cl,dl) + hl[1];\r\n\t                } else if (i<48) {\r\n\t\t            t +=  f3(bl,cl,dl) + hl[2];\r\n\t                } else if (i<64) {\r\n\t\t            t +=  f4(bl,cl,dl) + hl[3];\r\n\t                } else {// if (i<80) {\r\n\t\t            t +=  f5(bl,cl,dl) + hl[4];\r\n\t                }\r\n\t                t = t|0;\r\n\t                t =  rotl(t,sl[i]);\r\n\t                t = (t+el)|0;\r\n\t                al = el;\r\n\t                el = dl;\r\n\t                dl = rotl(cl, 10);\r\n\t                cl = bl;\r\n\t                bl = t;\r\n\r\n\t                t = (ar + M[offset+zr[i]])|0;\r\n\t                if (i<16){\r\n\t\t            t +=  f5(br,cr,dr) + hr[0];\r\n\t                } else if (i<32) {\r\n\t\t            t +=  f4(br,cr,dr) + hr[1];\r\n\t                } else if (i<48) {\r\n\t\t            t +=  f3(br,cr,dr) + hr[2];\r\n\t                } else if (i<64) {\r\n\t\t            t +=  f2(br,cr,dr) + hr[3];\r\n\t                } else {// if (i<80) {\r\n\t\t            t +=  f1(br,cr,dr) + hr[4];\r\n\t                }\r\n\t                t = t|0;\r\n\t                t =  rotl(t,sr[i]) ;\r\n\t                t = (t+er)|0;\r\n\t                ar = er;\r\n\t                er = dr;\r\n\t                dr = rotl(cr, 10);\r\n\t                cr = br;\r\n\t                br = t;\r\n\t            }\r\n\t            // Intermediate hash value\r\n\t            t    = (H[1] + cl + dr)|0;\r\n\t            H[1] = (H[2] + dl + er)|0;\r\n\t            H[2] = (H[3] + el + ar)|0;\r\n\t            H[3] = (H[4] + al + br)|0;\r\n\t            H[4] = (H[0] + bl + cr)|0;\r\n\t            H[0] =  t;\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            // Shortcuts\r\n\t            var data = this._data;\r\n\t            var dataWords = data.words;\r\n\r\n\t            var nBitsTotal = this._nDataBytes * 8;\r\n\t            var nBitsLeft = data.sigBytes * 8;\r\n\r\n\t            // Add padding\r\n\t            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);\r\n\t            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (\r\n\t                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |\r\n\t                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)\r\n\t            );\r\n\t            data.sigBytes = (dataWords.length + 1) * 4;\r\n\r\n\t            // Hash final blocks\r\n\t            this._process();\r\n\r\n\t            // Shortcuts\r\n\t            var hash = this._hash;\r\n\t            var H = hash.words;\r\n\r\n\t            // Swap endian\r\n\t            for (var i = 0; i < 5; i++) {\r\n\t                // Shortcut\r\n\t                var H_i = H[i];\r\n\r\n\t                // Swap\r\n\t                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |\r\n\t                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);\r\n\t            }\r\n\r\n\t            // Return final computed hash\r\n\t            return hash;\r\n\t        },\r\n\r\n\t        clone: function () {\r\n\t            var clone = Hasher.clone.call(this);\r\n\t            clone._hash = this._hash.clone();\r\n\r\n\t            return clone;\r\n\t        }\r\n\t    });\r\n\r\n\r\n\t    function f1(x, y, z) {\r\n\t        return ((x) ^ (y) ^ (z));\r\n\r\n\t    }\r\n\r\n\t    function f2(x, y, z) {\r\n\t        return (((x)&(y)) | ((~x)&(z)));\r\n\t    }\r\n\r\n\t    function f3(x, y, z) {\r\n\t        return (((x) | (~(y))) ^ (z));\r\n\t    }\r\n\r\n\t    function f4(x, y, z) {\r\n\t        return (((x) & (z)) | ((y)&(~(z))));\r\n\t    }\r\n\r\n\t    function f5(x, y, z) {\r\n\t        return ((x) ^ ((y) |(~(z))));\r\n\r\n\t    }\r\n\r\n\t    function rotl(x,n) {\r\n\t        return (x<<n) | (x>>>(32-n));\r\n\t    }\r\n\r\n\r\n\t    /**\r\n\t     * Shortcut function to the hasher's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     *\r\n\t     * @return {WordArray} The hash.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hash = CryptoJS.RIPEMD160('message');\r\n\t     *     var hash = CryptoJS.RIPEMD160(wordArray);\r\n\t     */\r\n\t    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);\r\n\r\n\t    /**\r\n\t     * Shortcut function to the HMAC's object interface.\r\n\t     *\r\n\t     * @param {WordArray|string} message The message to hash.\r\n\t     * @param {WordArray|string} key The secret key.\r\n\t     *\r\n\t     * @return {WordArray} The HMAC.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);\r\n\t     */\r\n\t    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);\r\n\t}(Math));\r\n\r\n\r\n\treturn CryptoJS.RIPEMD160;\r\n\r\n}));",";(function (root, factory) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var Base = C_lib.Base;\r\n\t    var C_enc = C.enc;\r\n\t    var Utf8 = C_enc.Utf8;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    /**\r\n\t     * HMAC algorithm.\r\n\t     */\r\n\t    var HMAC = C_algo.HMAC = Base.extend({\r\n\t        /**\r\n\t         * Initializes a newly created HMAC.\r\n\t         *\r\n\t         * @param {Hasher} hasher The hash algorithm to use.\r\n\t         * @param {WordArray|string} key The secret key.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);\r\n\t         */\r\n\t        init: function (hasher, key) {\r\n\t            // Init hasher\r\n\t            hasher = this._hasher = new hasher.init();\r\n\r\n\t            // Convert string to WordArray, else assume WordArray already\r\n\t            if (typeof key == 'string') {\r\n\t                key = Utf8.parse(key);\r\n\t            }\r\n\r\n\t            // Shortcuts\r\n\t            var hasherBlockSize = hasher.blockSize;\r\n\t            var hasherBlockSizeBytes = hasherBlockSize * 4;\r\n\r\n\t            // Allow arbitrary length keys\r\n\t            if (key.sigBytes > hasherBlockSizeBytes) {\r\n\t                key = hasher.finalize(key);\r\n\t            }\r\n\r\n\t            // Clamp excess bits\r\n\t            key.clamp();\r\n\r\n\t            // Clone key for inner and outer pads\r\n\t            var oKey = this._oKey = key.clone();\r\n\t            var iKey = this._iKey = key.clone();\r\n\r\n\t            // Shortcuts\r\n\t            var oKeyWords = oKey.words;\r\n\t            var iKeyWords = iKey.words;\r\n\r\n\t            // XOR keys with pad constants\r\n\t            for (var i = 0; i < hasherBlockSize; i++) {\r\n\t                oKeyWords[i] ^= 0x5c5c5c5c;\r\n\t                iKeyWords[i] ^= 0x36363636;\r\n\t            }\r\n\t            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;\r\n\r\n\t            // Set initial values\r\n\t            this.reset();\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Resets this HMAC to its initial state.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     hmacHasher.reset();\r\n\t         */\r\n\t        reset: function () {\r\n\t            // Shortcut\r\n\t            var hasher = this._hasher;\r\n\r\n\t            // Reset\r\n\t            hasher.reset();\r\n\t            hasher.update(this._iKey);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Updates this HMAC with a message.\r\n\t         *\r\n\t         * @param {WordArray|string} messageUpdate The message to append.\r\n\t         *\r\n\t         * @return {HMAC} This HMAC instance.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     hmacHasher.update('message');\r\n\t         *     hmacHasher.update(wordArray);\r\n\t         */\r\n\t        update: function (messageUpdate) {\r\n\t            this._hasher.update(messageUpdate);\r\n\r\n\t            // Chainable\r\n\t            return this;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Finalizes the HMAC computation.\r\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\r\n\t         *\r\n\t         * @param {WordArray|string} messageUpdate (Optional) A final message update.\r\n\t         *\r\n\t         * @return {WordArray} The HMAC.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var hmac = hmacHasher.finalize();\r\n\t         *     var hmac = hmacHasher.finalize('message');\r\n\t         *     var hmac = hmacHasher.finalize(wordArray);\r\n\t         */\r\n\t        finalize: function (messageUpdate) {\r\n\t            // Shortcut\r\n\t            var hasher = this._hasher;\r\n\r\n\t            // Compute HMAC\r\n\t            var innerHash = hasher.finalize(messageUpdate);\r\n\t            hasher.reset();\r\n\t            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));\r\n\r\n\t            return hmac;\r\n\t        }\r\n\t    });\r\n\t}());\r\n\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha256\"), require(\"./hmac\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./sha256\", \"./hmac\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var Base = C_lib.Base;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var C_algo = C.algo;\r\n\t    var SHA256 = C_algo.SHA256;\r\n\t    var HMAC = C_algo.HMAC;\r\n\r\n\t    /**\r\n\t     * Password-Based Key Derivation Function 2 algorithm.\r\n\t     */\r\n\t    var PBKDF2 = C_algo.PBKDF2 = Base.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)\r\n\t         * @property {Hasher} hasher The hasher to use. Default: SHA256\r\n\t         * @property {number} iterations The number of iterations to perform. Default: 250000\r\n\t         */\r\n\t        cfg: Base.extend({\r\n\t            keySize: 128/32,\r\n\t            hasher: SHA256,\r\n\t            iterations: 250000\r\n\t        }),\r\n\r\n\t        /**\r\n\t         * Initializes a newly created key derivation function.\r\n\t         *\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for the derivation.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create();\r\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });\r\n\t         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });\r\n\t         */\r\n\t        init: function (cfg) {\r\n\t            this.cfg = this.cfg.extend(cfg);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Computes the Password-Based Key Derivation Function 2.\r\n\t         *\r\n\t         * @param {WordArray|string} password The password.\r\n\t         * @param {WordArray|string} salt A salt.\r\n\t         *\r\n\t         * @return {WordArray} The derived key.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var key = kdf.compute(password, salt);\r\n\t         */\r\n\t        compute: function (password, salt) {\r\n\t            // Shortcut\r\n\t            var cfg = this.cfg;\r\n\r\n\t            // Init HMAC\r\n\t            var hmac = HMAC.create(cfg.hasher, password);\r\n\r\n\t            // Initial values\r\n\t            var derivedKey = WordArray.create();\r\n\t            var blockIndex = WordArray.create([0x00000001]);\r\n\r\n\t            // Shortcuts\r\n\t            var derivedKeyWords = derivedKey.words;\r\n\t            var blockIndexWords = blockIndex.words;\r\n\t            var keySize = cfg.keySize;\r\n\t            var iterations = cfg.iterations;\r\n\r\n\t            // Generate key\r\n\t            while (derivedKeyWords.length < keySize) {\r\n\t                var block = hmac.update(salt).finalize(blockIndex);\r\n\t                hmac.reset();\r\n\r\n\t                // Shortcuts\r\n\t                var blockWords = block.words;\r\n\t                var blockWordsLength = blockWords.length;\r\n\r\n\t                // Iterations\r\n\t                var intermediate = block;\r\n\t                for (var i = 1; i < iterations; i++) {\r\n\t                    intermediate = hmac.finalize(intermediate);\r\n\t                    hmac.reset();\r\n\r\n\t                    // Shortcut\r\n\t                    var intermediateWords = intermediate.words;\r\n\r\n\t                    // XOR intermediate with block\r\n\t                    for (var j = 0; j < blockWordsLength; j++) {\r\n\t                        blockWords[j] ^= intermediateWords[j];\r\n\t                    }\r\n\t                }\r\n\r\n\t                derivedKey.concat(block);\r\n\t                blockIndexWords[0]++;\r\n\t            }\r\n\t            derivedKey.sigBytes = keySize * 4;\r\n\r\n\t            return derivedKey;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Computes the Password-Based Key Derivation Function 2.\r\n\t     *\r\n\t     * @param {WordArray|string} password The password.\r\n\t     * @param {WordArray|string} salt A salt.\r\n\t     * @param {Object} cfg (Optional) The configuration options to use for this computation.\r\n\t     *\r\n\t     * @return {WordArray} The derived key.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var key = CryptoJS.PBKDF2(password, salt);\r\n\t     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });\r\n\t     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });\r\n\t     */\r\n\t    C.PBKDF2 = function (password, salt, cfg) {\r\n\t        return PBKDF2.create(cfg).compute(password, salt);\r\n\t    };\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.PBKDF2;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./sha1\"), require(\"./hmac\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./sha1\", \"./hmac\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var Base = C_lib.Base;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var C_algo = C.algo;\r\n\t    var MD5 = C_algo.MD5;\r\n\r\n\t    /**\r\n\t     * This key derivation function is meant to conform with EVP_BytesToKey.\r\n\t     * www.openssl.org/docs/crypto/EVP_BytesToKey.html\r\n\t     */\r\n\t    var EvpKDF = C_algo.EvpKDF = Base.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)\r\n\t         * @property {Hasher} hasher The hash algorithm to use. Default: MD5\r\n\t         * @property {number} iterations The number of iterations to perform. Default: 1\r\n\t         */\r\n\t        cfg: Base.extend({\r\n\t            keySize: 128/32,\r\n\t            hasher: MD5,\r\n\t            iterations: 1\r\n\t        }),\r\n\r\n\t        /**\r\n\t         * Initializes a newly created key derivation function.\r\n\t         *\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for the derivation.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create();\r\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });\r\n\t         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });\r\n\t         */\r\n\t        init: function (cfg) {\r\n\t            this.cfg = this.cfg.extend(cfg);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Derives a key from a password.\r\n\t         *\r\n\t         * @param {WordArray|string} password The password.\r\n\t         * @param {WordArray|string} salt A salt.\r\n\t         *\r\n\t         * @return {WordArray} The derived key.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var key = kdf.compute(password, salt);\r\n\t         */\r\n\t        compute: function (password, salt) {\r\n\t            var block;\r\n\r\n\t            // Shortcut\r\n\t            var cfg = this.cfg;\r\n\r\n\t            // Init hasher\r\n\t            var hasher = cfg.hasher.create();\r\n\r\n\t            // Initial values\r\n\t            var derivedKey = WordArray.create();\r\n\r\n\t            // Shortcuts\r\n\t            var derivedKeyWords = derivedKey.words;\r\n\t            var keySize = cfg.keySize;\r\n\t            var iterations = cfg.iterations;\r\n\r\n\t            // Generate key\r\n\t            while (derivedKeyWords.length < keySize) {\r\n\t                if (block) {\r\n\t                    hasher.update(block);\r\n\t                }\r\n\t                block = hasher.update(password).finalize(salt);\r\n\t                hasher.reset();\r\n\r\n\t                // Iterations\r\n\t                for (var i = 1; i < iterations; i++) {\r\n\t                    block = hasher.finalize(block);\r\n\t                    hasher.reset();\r\n\t                }\r\n\r\n\t                derivedKey.concat(block);\r\n\t            }\r\n\t            derivedKey.sigBytes = keySize * 4;\r\n\r\n\t            return derivedKey;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Derives a key from a password.\r\n\t     *\r\n\t     * @param {WordArray|string} password The password.\r\n\t     * @param {WordArray|string} salt A salt.\r\n\t     * @param {Object} cfg (Optional) The configuration options to use for this computation.\r\n\t     *\r\n\t     * @return {WordArray} The derived key.\r\n\t     *\r\n\t     * @static\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var key = CryptoJS.EvpKDF(password, salt);\r\n\t     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });\r\n\t     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });\r\n\t     */\r\n\t    C.EvpKDF = function (password, salt, cfg) {\r\n\t        return EvpKDF.create(cfg).compute(password, salt);\r\n\t    };\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.EvpKDF;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./evpkdf\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./evpkdf\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * Cipher core components.\r\n\t */\r\n\tCryptoJS.lib.Cipher || (function (undefined) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var Base = C_lib.Base;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;\r\n\t    var C_enc = C.enc;\r\n\t    var Utf8 = C_enc.Utf8;\r\n\t    var Base64 = C_enc.Base64;\r\n\t    var C_algo = C.algo;\r\n\t    var EvpKDF = C_algo.EvpKDF;\r\n\r\n\t    /**\r\n\t     * Abstract base cipher template.\r\n\t     *\r\n\t     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)\r\n\t     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)\r\n\t     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.\r\n\t     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.\r\n\t     */\r\n\t    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {WordArray} iv The IV to use for this operation.\r\n\t         */\r\n\t        cfg: Base.extend(),\r\n\r\n\t        /**\r\n\t         * Creates this cipher in encryption mode.\r\n\t         *\r\n\t         * @param {WordArray} key The key.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @return {Cipher} A cipher instance.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });\r\n\t         */\r\n\t        createEncryptor: function (key, cfg) {\r\n\t            return this.create(this._ENC_XFORM_MODE, key, cfg);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates this cipher in decryption mode.\r\n\t         *\r\n\t         * @param {WordArray} key The key.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @return {Cipher} A cipher instance.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });\r\n\t         */\r\n\t        createDecryptor: function (key, cfg) {\r\n\t            return this.create(this._DEC_XFORM_MODE, key, cfg);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Initializes a newly created cipher.\r\n\t         *\r\n\t         * @param {number} xformMode Either the encryption or decryption transormation mode constant.\r\n\t         * @param {WordArray} key The key.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });\r\n\t         */\r\n\t        init: function (xformMode, key, cfg) {\r\n\t            // Apply config defaults\r\n\t            this.cfg = this.cfg.extend(cfg);\r\n\r\n\t            // Store transform mode and key\r\n\t            this._xformMode = xformMode;\r\n\t            this._key = key;\r\n\r\n\t            // Set initial values\r\n\t            this.reset();\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Resets this cipher to its initial state.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     cipher.reset();\r\n\t         */\r\n\t        reset: function () {\r\n\t            // Reset data buffer\r\n\t            BufferedBlockAlgorithm.reset.call(this);\r\n\r\n\t            // Perform concrete-cipher logic\r\n\t            this._doReset();\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Adds data to be encrypted or decrypted.\r\n\t         *\r\n\t         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.\r\n\t         *\r\n\t         * @return {WordArray} The data after processing.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var encrypted = cipher.process('data');\r\n\t         *     var encrypted = cipher.process(wordArray);\r\n\t         */\r\n\t        process: function (dataUpdate) {\r\n\t            // Append\r\n\t            this._append(dataUpdate);\r\n\r\n\t            // Process available blocks\r\n\t            return this._process();\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Finalizes the encryption or decryption process.\r\n\t         * Note that the finalize operation is effectively a destructive, read-once operation.\r\n\t         *\r\n\t         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.\r\n\t         *\r\n\t         * @return {WordArray} The data after final processing.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var encrypted = cipher.finalize();\r\n\t         *     var encrypted = cipher.finalize('data');\r\n\t         *     var encrypted = cipher.finalize(wordArray);\r\n\t         */\r\n\t        finalize: function (dataUpdate) {\r\n\t            // Final data update\r\n\t            if (dataUpdate) {\r\n\t                this._append(dataUpdate);\r\n\t            }\r\n\r\n\t            // Perform concrete-cipher logic\r\n\t            var finalProcessedData = this._doFinalize();\r\n\r\n\t            return finalProcessedData;\r\n\t        },\r\n\r\n\t        keySize: 128/32,\r\n\r\n\t        ivSize: 128/32,\r\n\r\n\t        _ENC_XFORM_MODE: 1,\r\n\r\n\t        _DEC_XFORM_MODE: 2,\r\n\r\n\t        /**\r\n\t         * Creates shortcut functions to a cipher's object interface.\r\n\t         *\r\n\t         * @param {Cipher} cipher The cipher to create a helper for.\r\n\t         *\r\n\t         * @return {Object} An object with encrypt and decrypt shortcut functions.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);\r\n\t         */\r\n\t        _createHelper: (function () {\r\n\t            function selectCipherStrategy(key) {\r\n\t                if (typeof key == 'string') {\r\n\t                    return PasswordBasedCipher;\r\n\t                } else {\r\n\t                    return SerializableCipher;\r\n\t                }\r\n\t            }\r\n\r\n\t            return function (cipher) {\r\n\t                return {\r\n\t                    encrypt: function (message, key, cfg) {\r\n\t                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);\r\n\t                    },\r\n\r\n\t                    decrypt: function (ciphertext, key, cfg) {\r\n\t                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);\r\n\t                    }\r\n\t                };\r\n\t            };\r\n\t        }())\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Abstract base stream cipher template.\r\n\t     *\r\n\t     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)\r\n\t     */\r\n\t    var StreamCipher = C_lib.StreamCipher = Cipher.extend({\r\n\t        _doFinalize: function () {\r\n\t            // Process partial blocks\r\n\t            var finalProcessedBlocks = this._process(!!'flush');\r\n\r\n\t            return finalProcessedBlocks;\r\n\t        },\r\n\r\n\t        blockSize: 1\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Mode namespace.\r\n\t     */\r\n\t    var C_mode = C.mode = {};\r\n\r\n\t    /**\r\n\t     * Abstract base block cipher mode template.\r\n\t     */\r\n\t    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({\r\n\t        /**\r\n\t         * Creates this mode for encryption.\r\n\t         *\r\n\t         * @param {Cipher} cipher A block cipher instance.\r\n\t         * @param {Array} iv The IV words.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);\r\n\t         */\r\n\t        createEncryptor: function (cipher, iv) {\r\n\t            return this.Encryptor.create(cipher, iv);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Creates this mode for decryption.\r\n\t         *\r\n\t         * @param {Cipher} cipher A block cipher instance.\r\n\t         * @param {Array} iv The IV words.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);\r\n\t         */\r\n\t        createDecryptor: function (cipher, iv) {\r\n\t            return this.Decryptor.create(cipher, iv);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Initializes a newly created mode.\r\n\t         *\r\n\t         * @param {Cipher} cipher A block cipher instance.\r\n\t         * @param {Array} iv The IV words.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);\r\n\t         */\r\n\t        init: function (cipher, iv) {\r\n\t            this._cipher = cipher;\r\n\t            this._iv = iv;\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Cipher Block Chaining mode.\r\n\t     */\r\n\t    var CBC = C_mode.CBC = (function () {\r\n\t        /**\r\n\t         * Abstract base CBC mode.\r\n\t         */\r\n\t        var CBC = BlockCipherMode.extend();\r\n\r\n\t        /**\r\n\t         * CBC encryptor.\r\n\t         */\r\n\t        CBC.Encryptor = CBC.extend({\r\n\t            /**\r\n\t             * Processes the data block at offset.\r\n\t             *\r\n\t             * @param {Array} words The data words to operate on.\r\n\t             * @param {number} offset The offset where the block starts.\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     mode.processBlock(data.words, offset);\r\n\t             */\r\n\t            processBlock: function (words, offset) {\r\n\t                // Shortcuts\r\n\t                var cipher = this._cipher;\r\n\t                var blockSize = cipher.blockSize;\r\n\r\n\t                // XOR and encrypt\r\n\t                xorBlock.call(this, words, offset, blockSize);\r\n\t                cipher.encryptBlock(words, offset);\r\n\r\n\t                // Remember this block to use with next block\r\n\t                this._prevBlock = words.slice(offset, offset + blockSize);\r\n\t            }\r\n\t        });\r\n\r\n\t        /**\r\n\t         * CBC decryptor.\r\n\t         */\r\n\t        CBC.Decryptor = CBC.extend({\r\n\t            /**\r\n\t             * Processes the data block at offset.\r\n\t             *\r\n\t             * @param {Array} words The data words to operate on.\r\n\t             * @param {number} offset The offset where the block starts.\r\n\t             *\r\n\t             * @example\r\n\t             *\r\n\t             *     mode.processBlock(data.words, offset);\r\n\t             */\r\n\t            processBlock: function (words, offset) {\r\n\t                // Shortcuts\r\n\t                var cipher = this._cipher;\r\n\t                var blockSize = cipher.blockSize;\r\n\r\n\t                // Remember this block to use with next block\r\n\t                var thisBlock = words.slice(offset, offset + blockSize);\r\n\r\n\t                // Decrypt and XOR\r\n\t                cipher.decryptBlock(words, offset);\r\n\t                xorBlock.call(this, words, offset, blockSize);\r\n\r\n\t                // This block becomes the previous block\r\n\t                this._prevBlock = thisBlock;\r\n\t            }\r\n\t        });\r\n\r\n\t        function xorBlock(words, offset, blockSize) {\r\n\t            var block;\r\n\r\n\t            // Shortcut\r\n\t            var iv = this._iv;\r\n\r\n\t            // Choose mixing block\r\n\t            if (iv) {\r\n\t                block = iv;\r\n\r\n\t                // Remove IV for subsequent blocks\r\n\t                this._iv = undefined;\r\n\t            } else {\r\n\t                block = this._prevBlock;\r\n\t            }\r\n\r\n\t            // XOR blocks\r\n\t            for (var i = 0; i < blockSize; i++) {\r\n\t                words[offset + i] ^= block[i];\r\n\t            }\r\n\t        }\r\n\r\n\t        return CBC;\r\n\t    }());\r\n\r\n\t    /**\r\n\t     * Padding namespace.\r\n\t     */\r\n\t    var C_pad = C.pad = {};\r\n\r\n\t    /**\r\n\t     * PKCS #5/7 padding strategy.\r\n\t     */\r\n\t    var Pkcs7 = C_pad.Pkcs7 = {\r\n\t        /**\r\n\t         * Pads data using the algorithm defined in PKCS #5/7.\r\n\t         *\r\n\t         * @param {WordArray} data The data to pad.\r\n\t         * @param {number} blockSize The multiple that the data should be padded to.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);\r\n\t         */\r\n\t        pad: function (data, blockSize) {\r\n\t            // Shortcut\r\n\t            var blockSizeBytes = blockSize * 4;\r\n\r\n\t            // Count padding bytes\r\n\t            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;\r\n\r\n\t            // Create padding word\r\n\t            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;\r\n\r\n\t            // Create padding\r\n\t            var paddingWords = [];\r\n\t            for (var i = 0; i < nPaddingBytes; i += 4) {\r\n\t                paddingWords.push(paddingWord);\r\n\t            }\r\n\t            var padding = WordArray.create(paddingWords, nPaddingBytes);\r\n\r\n\t            // Add padding\r\n\t            data.concat(padding);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.\r\n\t         *\r\n\t         * @param {WordArray} data The data to unpad.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     CryptoJS.pad.Pkcs7.unpad(wordArray);\r\n\t         */\r\n\t        unpad: function (data) {\r\n\t            // Get number of padding bytes from last byte\r\n\t            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\r\n\r\n\t            // Remove padding\r\n\t            data.sigBytes -= nPaddingBytes;\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * Abstract base block cipher template.\r\n\t     *\r\n\t     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)\r\n\t     */\r\n\t    var BlockCipher = C_lib.BlockCipher = Cipher.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {Mode} mode The block mode to use. Default: CBC\r\n\t         * @property {Padding} padding The padding strategy to use. Default: Pkcs7\r\n\t         */\r\n\t        cfg: Cipher.cfg.extend({\r\n\t            mode: CBC,\r\n\t            padding: Pkcs7\r\n\t        }),\r\n\r\n\t        reset: function () {\r\n\t            var modeCreator;\r\n\r\n\t            // Reset cipher\r\n\t            Cipher.reset.call(this);\r\n\r\n\t            // Shortcuts\r\n\t            var cfg = this.cfg;\r\n\t            var iv = cfg.iv;\r\n\t            var mode = cfg.mode;\r\n\r\n\t            // Reset block mode\r\n\t            if (this._xformMode == this._ENC_XFORM_MODE) {\r\n\t                modeCreator = mode.createEncryptor;\r\n\t            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {\r\n\t                modeCreator = mode.createDecryptor;\r\n\t                // Keep at least one block in the buffer for unpadding\r\n\t                this._minBufferSize = 1;\r\n\t            }\r\n\r\n\t            if (this._mode && this._mode.__creator == modeCreator) {\r\n\t                this._mode.init(this, iv && iv.words);\r\n\t            } else {\r\n\t                this._mode = modeCreator.call(mode, this, iv && iv.words);\r\n\t                this._mode.__creator = modeCreator;\r\n\t            }\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (words, offset) {\r\n\t            this._mode.processBlock(words, offset);\r\n\t        },\r\n\r\n\t        _doFinalize: function () {\r\n\t            var finalProcessedBlocks;\r\n\r\n\t            // Shortcut\r\n\t            var padding = this.cfg.padding;\r\n\r\n\t            // Finalize\r\n\t            if (this._xformMode == this._ENC_XFORM_MODE) {\r\n\t                // Pad data\r\n\t                padding.pad(this._data, this.blockSize);\r\n\r\n\t                // Process final blocks\r\n\t                finalProcessedBlocks = this._process(!!'flush');\r\n\t            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {\r\n\t                // Process final blocks\r\n\t                finalProcessedBlocks = this._process(!!'flush');\r\n\r\n\t                // Unpad data\r\n\t                padding.unpad(finalProcessedBlocks);\r\n\t            }\r\n\r\n\t            return finalProcessedBlocks;\r\n\t        },\r\n\r\n\t        blockSize: 128/32\r\n\t    });\r\n\r\n\t    /**\r\n\t     * A collection of cipher parameters.\r\n\t     *\r\n\t     * @property {WordArray} ciphertext The raw ciphertext.\r\n\t     * @property {WordArray} key The key to this ciphertext.\r\n\t     * @property {WordArray} iv The IV used in the ciphering operation.\r\n\t     * @property {WordArray} salt The salt used with a key derivation function.\r\n\t     * @property {Cipher} algorithm The cipher algorithm.\r\n\t     * @property {Mode} mode The block mode used in the ciphering operation.\r\n\t     * @property {Padding} padding The padding scheme used in the ciphering operation.\r\n\t     * @property {number} blockSize The block size of the cipher.\r\n\t     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.\r\n\t     */\r\n\t    var CipherParams = C_lib.CipherParams = Base.extend({\r\n\t        /**\r\n\t         * Initializes a newly created cipher params object.\r\n\t         *\r\n\t         * @param {Object} cipherParams An object with any of the possible cipher parameters.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var cipherParams = CryptoJS.lib.CipherParams.create({\r\n\t         *         ciphertext: ciphertextWordArray,\r\n\t         *         key: keyWordArray,\r\n\t         *         iv: ivWordArray,\r\n\t         *         salt: saltWordArray,\r\n\t         *         algorithm: CryptoJS.algo.AES,\r\n\t         *         mode: CryptoJS.mode.CBC,\r\n\t         *         padding: CryptoJS.pad.PKCS7,\r\n\t         *         blockSize: 4,\r\n\t         *         formatter: CryptoJS.format.OpenSSL\r\n\t         *     });\r\n\t         */\r\n\t        init: function (cipherParams) {\r\n\t            this.mixIn(cipherParams);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts this cipher params object to a string.\r\n\t         *\r\n\t         * @param {Format} formatter (Optional) The formatting strategy to use.\r\n\t         *\r\n\t         * @return {string} The stringified cipher params.\r\n\t         *\r\n\t         * @throws Error If neither the formatter nor the default formatter is set.\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var string = cipherParams + '';\r\n\t         *     var string = cipherParams.toString();\r\n\t         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);\r\n\t         */\r\n\t        toString: function (formatter) {\r\n\t            return (formatter || this.formatter).stringify(this);\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Format namespace.\r\n\t     */\r\n\t    var C_format = C.format = {};\r\n\r\n\t    /**\r\n\t     * OpenSSL formatting strategy.\r\n\t     */\r\n\t    var OpenSSLFormatter = C_format.OpenSSL = {\r\n\t        /**\r\n\t         * Converts a cipher params object to an OpenSSL-compatible string.\r\n\t         *\r\n\t         * @param {CipherParams} cipherParams The cipher params object.\r\n\t         *\r\n\t         * @return {string} The OpenSSL-compatible string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);\r\n\t         */\r\n\t        stringify: function (cipherParams) {\r\n\t            var wordArray;\r\n\r\n\t            // Shortcuts\r\n\t            var ciphertext = cipherParams.ciphertext;\r\n\t            var salt = cipherParams.salt;\r\n\r\n\t            // Format\r\n\t            if (salt) {\r\n\t                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);\r\n\t            } else {\r\n\t                wordArray = ciphertext;\r\n\t            }\r\n\r\n\t            return wordArray.toString(Base64);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts an OpenSSL-compatible string to a cipher params object.\r\n\t         *\r\n\t         * @param {string} openSSLStr The OpenSSL-compatible string.\r\n\t         *\r\n\t         * @return {CipherParams} The cipher params object.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);\r\n\t         */\r\n\t        parse: function (openSSLStr) {\r\n\t            var salt;\r\n\r\n\t            // Parse base64\r\n\t            var ciphertext = Base64.parse(openSSLStr);\r\n\r\n\t            // Shortcut\r\n\t            var ciphertextWords = ciphertext.words;\r\n\r\n\t            // Test for salt\r\n\t            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {\r\n\t                // Extract salt\r\n\t                salt = WordArray.create(ciphertextWords.slice(2, 4));\r\n\r\n\t                // Remove salt from ciphertext\r\n\t                ciphertextWords.splice(0, 4);\r\n\t                ciphertext.sigBytes -= 16;\r\n\t            }\r\n\r\n\t            return CipherParams.create({ ciphertext: ciphertext, salt: salt });\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * A cipher wrapper that returns ciphertext as a serializable cipher params object.\r\n\t     */\r\n\t    var SerializableCipher = C_lib.SerializableCipher = Base.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL\r\n\t         */\r\n\t        cfg: Base.extend({\r\n\t            format: OpenSSLFormatter\r\n\t        }),\r\n\r\n\t        /**\r\n\t         * Encrypts a message.\r\n\t         *\r\n\t         * @param {Cipher} cipher The cipher algorithm to use.\r\n\t         * @param {WordArray|string} message The message to encrypt.\r\n\t         * @param {WordArray} key The key.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @return {CipherParams} A cipher params object.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);\r\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });\r\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });\r\n\t         */\r\n\t        encrypt: function (cipher, message, key, cfg) {\r\n\t            // Apply config defaults\r\n\t            cfg = this.cfg.extend(cfg);\r\n\r\n\t            // Encrypt\r\n\t            var encryptor = cipher.createEncryptor(key, cfg);\r\n\t            var ciphertext = encryptor.finalize(message);\r\n\r\n\t            // Shortcut\r\n\t            var cipherCfg = encryptor.cfg;\r\n\r\n\t            // Create and return serializable cipher params\r\n\t            return CipherParams.create({\r\n\t                ciphertext: ciphertext,\r\n\t                key: key,\r\n\t                iv: cipherCfg.iv,\r\n\t                algorithm: cipher,\r\n\t                mode: cipherCfg.mode,\r\n\t                padding: cipherCfg.padding,\r\n\t                blockSize: cipher.blockSize,\r\n\t                formatter: cfg.format\r\n\t            });\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Decrypts serialized ciphertext.\r\n\t         *\r\n\t         * @param {Cipher} cipher The cipher algorithm to use.\r\n\t         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.\r\n\t         * @param {WordArray} key The key.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @return {WordArray} The plaintext.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });\r\n\t         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });\r\n\t         */\r\n\t        decrypt: function (cipher, ciphertext, key, cfg) {\r\n\t            // Apply config defaults\r\n\t            cfg = this.cfg.extend(cfg);\r\n\r\n\t            // Convert string to CipherParams\r\n\t            ciphertext = this._parse(ciphertext, cfg.format);\r\n\r\n\t            // Decrypt\r\n\t            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);\r\n\r\n\t            return plaintext;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts serialized ciphertext to CipherParams,\r\n\t         * else assumed CipherParams already and returns ciphertext unchanged.\r\n\t         *\r\n\t         * @param {CipherParams|string} ciphertext The ciphertext.\r\n\t         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.\r\n\t         *\r\n\t         * @return {CipherParams} The unserialized ciphertext.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);\r\n\t         */\r\n\t        _parse: function (ciphertext, format) {\r\n\t            if (typeof ciphertext == 'string') {\r\n\t                return format.parse(ciphertext, this);\r\n\t            } else {\r\n\t                return ciphertext;\r\n\t            }\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Key derivation function namespace.\r\n\t     */\r\n\t    var C_kdf = C.kdf = {};\r\n\r\n\t    /**\r\n\t     * OpenSSL key derivation function.\r\n\t     */\r\n\t    var OpenSSLKdf = C_kdf.OpenSSL = {\r\n\t        /**\r\n\t         * Derives a key and IV from a password.\r\n\t         *\r\n\t         * @param {string} password The password to derive from.\r\n\t         * @param {number} keySize The size in words of the key to generate.\r\n\t         * @param {number} ivSize The size in words of the IV to generate.\r\n\t         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.\r\n\t         *\r\n\t         * @return {CipherParams} A cipher params object with the key, IV, and salt.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);\r\n\t         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');\r\n\t         */\r\n\t        execute: function (password, keySize, ivSize, salt, hasher) {\r\n\t            // Generate random salt\r\n\t            if (!salt) {\r\n\t                salt = WordArray.random(64/8);\r\n\t            }\r\n\r\n\t            // Derive key and IV\r\n\t            if (!hasher) {\r\n\t                var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);\r\n\t            } else {\r\n\t                var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);\r\n\t            }\r\n\r\n\r\n\t            // Separate key and IV\r\n\t            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);\r\n\t            key.sigBytes = keySize * 4;\r\n\r\n\t            // Return params\r\n\t            return CipherParams.create({ key: key, iv: iv, salt: salt });\r\n\t        }\r\n\t    };\r\n\r\n\t    /**\r\n\t     * A serializable cipher wrapper that derives the key from a password,\r\n\t     * and returns ciphertext as a serializable cipher params object.\r\n\t     */\r\n\t    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL\r\n\t         */\r\n\t        cfg: SerializableCipher.cfg.extend({\r\n\t            kdf: OpenSSLKdf\r\n\t        }),\r\n\r\n\t        /**\r\n\t         * Encrypts a message using a password.\r\n\t         *\r\n\t         * @param {Cipher} cipher The cipher algorithm to use.\r\n\t         * @param {WordArray|string} message The message to encrypt.\r\n\t         * @param {string} password The password.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @return {CipherParams} A cipher params object.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');\r\n\t         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });\r\n\t         */\r\n\t        encrypt: function (cipher, message, password, cfg) {\r\n\t            // Apply config defaults\r\n\t            cfg = this.cfg.extend(cfg);\r\n\r\n\t            // Derive key and other params\r\n\t            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, cfg.salt, cfg.hasher);\r\n\r\n\t            // Add IV to config\r\n\t            cfg.iv = derivedParams.iv;\r\n\r\n\t            // Encrypt\r\n\t            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);\r\n\r\n\t            // Mix in derived params\r\n\t            ciphertext.mixIn(derivedParams);\r\n\r\n\t            return ciphertext;\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Decrypts serialized ciphertext using a password.\r\n\t         *\r\n\t         * @param {Cipher} cipher The cipher algorithm to use.\r\n\t         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.\r\n\t         * @param {string} password The password.\r\n\t         * @param {Object} cfg (Optional) The configuration options to use for this operation.\r\n\t         *\r\n\t         * @return {WordArray} The plaintext.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });\r\n\t         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });\r\n\t         */\r\n\t        decrypt: function (cipher, ciphertext, password, cfg) {\r\n\t            // Apply config defaults\r\n\t            cfg = this.cfg.extend(cfg);\r\n\r\n\t            // Convert string to CipherParams\r\n\t            ciphertext = this._parse(ciphertext, cfg.format);\r\n\r\n\t            // Derive key and other params\r\n\t            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt, cfg.hasher);\r\n\r\n\t            // Add IV to config\r\n\t            cfg.iv = derivedParams.iv;\r\n\r\n\t            // Decrypt\r\n\t            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);\r\n\r\n\t            return plaintext;\r\n\t        }\r\n\t    });\r\n\t}());\r\n\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * Cipher Feedback block mode.\r\n\t */\r\n\tCryptoJS.mode.CFB = (function () {\r\n\t    var CFB = CryptoJS.lib.BlockCipherMode.extend();\r\n\r\n\t    CFB.Encryptor = CFB.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            // Shortcuts\r\n\t            var cipher = this._cipher;\r\n\t            var blockSize = cipher.blockSize;\r\n\r\n\t            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);\r\n\r\n\t            // Remember this block to use with next block\r\n\t            this._prevBlock = words.slice(offset, offset + blockSize);\r\n\t        }\r\n\t    });\r\n\r\n\t    CFB.Decryptor = CFB.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            // Shortcuts\r\n\t            var cipher = this._cipher;\r\n\t            var blockSize = cipher.blockSize;\r\n\r\n\t            // Remember this block to use with next block\r\n\t            var thisBlock = words.slice(offset, offset + blockSize);\r\n\r\n\t            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);\r\n\r\n\t            // This block becomes the previous block\r\n\t            this._prevBlock = thisBlock;\r\n\t        }\r\n\t    });\r\n\r\n\t    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {\r\n\t        var keystream;\r\n\r\n\t        // Shortcut\r\n\t        var iv = this._iv;\r\n\r\n\t        // Generate keystream\r\n\t        if (iv) {\r\n\t            keystream = iv.slice(0);\r\n\r\n\t            // Remove IV for subsequent blocks\r\n\t            this._iv = undefined;\r\n\t        } else {\r\n\t            keystream = this._prevBlock;\r\n\t        }\r\n\t        cipher.encryptBlock(keystream, 0);\r\n\r\n\t        // Encrypt\r\n\t        for (var i = 0; i < blockSize; i++) {\r\n\t            words[offset + i] ^= keystream[i];\r\n\t        }\r\n\t    }\r\n\r\n\t    return CFB;\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.mode.CFB;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * Counter block mode.\r\n\t */\r\n\tCryptoJS.mode.CTR = (function () {\r\n\t    var CTR = CryptoJS.lib.BlockCipherMode.extend();\r\n\r\n\t    var Encryptor = CTR.Encryptor = CTR.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            // Shortcuts\r\n\t            var cipher = this._cipher\r\n\t            var blockSize = cipher.blockSize;\r\n\t            var iv = this._iv;\r\n\t            var counter = this._counter;\r\n\r\n\t            // Generate keystream\r\n\t            if (iv) {\r\n\t                counter = this._counter = iv.slice(0);\r\n\r\n\t                // Remove IV for subsequent blocks\r\n\t                this._iv = undefined;\r\n\t            }\r\n\t            var keystream = counter.slice(0);\r\n\t            cipher.encryptBlock(keystream, 0);\r\n\r\n\t            // Increment counter\r\n\t            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0\r\n\r\n\t            // Encrypt\r\n\t            for (var i = 0; i < blockSize; i++) {\r\n\t                words[offset + i] ^= keystream[i];\r\n\t            }\r\n\t        }\r\n\t    });\r\n\r\n\t    CTR.Decryptor = Encryptor;\r\n\r\n\t    return CTR;\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.mode.CTR;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/** @preserve\r\n\t * Counter block mode compatible with  Dr Brian Gladman fileenc.c\r\n\t * derived from CryptoJS.mode.CTR\r\n\t * Jan Hruby jhruby.web@gmail.com\r\n\t */\r\n\tCryptoJS.mode.CTRGladman = (function () {\r\n\t    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();\r\n\r\n\t\tfunction incWord(word)\r\n\t\t{\r\n\t\t\tif (((word >> 24) & 0xff) === 0xff) { //overflow\r\n\t\t\tvar b1 = (word >> 16)&0xff;\r\n\t\t\tvar b2 = (word >> 8)&0xff;\r\n\t\t\tvar b3 = word & 0xff;\r\n\r\n\t\t\tif (b1 === 0xff) // overflow b1\r\n\t\t\t{\r\n\t\t\tb1 = 0;\r\n\t\t\tif (b2 === 0xff)\r\n\t\t\t{\r\n\t\t\t\tb2 = 0;\r\n\t\t\t\tif (b3 === 0xff)\r\n\t\t\t\t{\r\n\t\t\t\t\tb3 = 0;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\t++b3;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\telse\r\n\t\t\t{\r\n\t\t\t\t++b2;\r\n\t\t\t}\r\n\t\t\t}\r\n\t\t\telse\r\n\t\t\t{\r\n\t\t\t++b1;\r\n\t\t\t}\r\n\r\n\t\t\tword = 0;\r\n\t\t\tword += (b1 << 16);\r\n\t\t\tword += (b2 << 8);\r\n\t\t\tword += b3;\r\n\t\t\t}\r\n\t\t\telse\r\n\t\t\t{\r\n\t\t\tword += (0x01 << 24);\r\n\t\t\t}\r\n\t\t\treturn word;\r\n\t\t}\r\n\r\n\t\tfunction incCounter(counter)\r\n\t\t{\r\n\t\t\tif ((counter[0] = incWord(counter[0])) === 0)\r\n\t\t\t{\r\n\t\t\t\t// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8\r\n\t\t\t\tcounter[1] = incWord(counter[1]);\r\n\t\t\t}\r\n\t\t\treturn counter;\r\n\t\t}\r\n\r\n\t    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            // Shortcuts\r\n\t            var cipher = this._cipher\r\n\t            var blockSize = cipher.blockSize;\r\n\t            var iv = this._iv;\r\n\t            var counter = this._counter;\r\n\r\n\t            // Generate keystream\r\n\t            if (iv) {\r\n\t                counter = this._counter = iv.slice(0);\r\n\r\n\t                // Remove IV for subsequent blocks\r\n\t                this._iv = undefined;\r\n\t            }\r\n\r\n\t\t\t\tincCounter(counter);\r\n\r\n\t\t\t\tvar keystream = counter.slice(0);\r\n\t            cipher.encryptBlock(keystream, 0);\r\n\r\n\t            // Encrypt\r\n\t            for (var i = 0; i < blockSize; i++) {\r\n\t                words[offset + i] ^= keystream[i];\r\n\t            }\r\n\t        }\r\n\t    });\r\n\r\n\t    CTRGladman.Decryptor = Encryptor;\r\n\r\n\t    return CTRGladman;\r\n\t}());\r\n\r\n\r\n\r\n\r\n\treturn CryptoJS.mode.CTRGladman;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * Output Feedback block mode.\r\n\t */\r\n\tCryptoJS.mode.OFB = (function () {\r\n\t    var OFB = CryptoJS.lib.BlockCipherMode.extend();\r\n\r\n\t    var Encryptor = OFB.Encryptor = OFB.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            // Shortcuts\r\n\t            var cipher = this._cipher\r\n\t            var blockSize = cipher.blockSize;\r\n\t            var iv = this._iv;\r\n\t            var keystream = this._keystream;\r\n\r\n\t            // Generate keystream\r\n\t            if (iv) {\r\n\t                keystream = this._keystream = iv.slice(0);\r\n\r\n\t                // Remove IV for subsequent blocks\r\n\t                this._iv = undefined;\r\n\t            }\r\n\t            cipher.encryptBlock(keystream, 0);\r\n\r\n\t            // Encrypt\r\n\t            for (var i = 0; i < blockSize; i++) {\r\n\t                words[offset + i] ^= keystream[i];\r\n\t            }\r\n\t        }\r\n\t    });\r\n\r\n\t    OFB.Decryptor = Encryptor;\r\n\r\n\t    return OFB;\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.mode.OFB;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * Electronic Codebook block mode.\r\n\t */\r\n\tCryptoJS.mode.ECB = (function () {\r\n\t    var ECB = CryptoJS.lib.BlockCipherMode.extend();\r\n\r\n\t    ECB.Encryptor = ECB.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            this._cipher.encryptBlock(words, offset);\r\n\t        }\r\n\t    });\r\n\r\n\t    ECB.Decryptor = ECB.extend({\r\n\t        processBlock: function (words, offset) {\r\n\t            this._cipher.decryptBlock(words, offset);\r\n\t        }\r\n\t    });\r\n\r\n\t    return ECB;\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.mode.ECB;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * ANSI X.923 padding strategy.\r\n\t */\r\n\tCryptoJS.pad.AnsiX923 = {\r\n\t    pad: function (data, blockSize) {\r\n\t        // Shortcuts\r\n\t        var dataSigBytes = data.sigBytes;\r\n\t        var blockSizeBytes = blockSize * 4;\r\n\r\n\t        // Count padding bytes\r\n\t        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;\r\n\r\n\t        // Compute last byte position\r\n\t        var lastBytePos = dataSigBytes + nPaddingBytes - 1;\r\n\r\n\t        // Pad\r\n\t        data.clamp();\r\n\t        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);\r\n\t        data.sigBytes += nPaddingBytes;\r\n\t    },\r\n\r\n\t    unpad: function (data) {\r\n\t        // Get number of padding bytes from last byte\r\n\t        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\r\n\r\n\t        // Remove padding\r\n\t        data.sigBytes -= nPaddingBytes;\r\n\t    }\r\n\t};\r\n\r\n\r\n\treturn CryptoJS.pad.Ansix923;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * ISO 10126 padding strategy.\r\n\t */\r\n\tCryptoJS.pad.Iso10126 = {\r\n\t    pad: function (data, blockSize) {\r\n\t        // Shortcut\r\n\t        var blockSizeBytes = blockSize * 4;\r\n\r\n\t        // Count padding bytes\r\n\t        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;\r\n\r\n\t        // Pad\r\n\t        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).\r\n\t             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));\r\n\t    },\r\n\r\n\t    unpad: function (data) {\r\n\t        // Get number of padding bytes from last byte\r\n\t        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;\r\n\r\n\t        // Remove padding\r\n\t        data.sigBytes -= nPaddingBytes;\r\n\t    }\r\n\t};\r\n\r\n\r\n\treturn CryptoJS.pad.Iso10126;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * ISO/IEC 9797-1 Padding Method 2.\r\n\t */\r\n\tCryptoJS.pad.Iso97971 = {\r\n\t    pad: function (data, blockSize) {\r\n\t        // Add 0x80 byte\r\n\t        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));\r\n\r\n\t        // Zero pad the rest\r\n\t        CryptoJS.pad.ZeroPadding.pad(data, blockSize);\r\n\t    },\r\n\r\n\t    unpad: function (data) {\r\n\t        // Remove zero padding\r\n\t        CryptoJS.pad.ZeroPadding.unpad(data);\r\n\r\n\t        // Remove one more byte -- the 0x80 byte\r\n\t        data.sigBytes--;\r\n\t    }\r\n\t};\r\n\r\n\r\n\treturn CryptoJS.pad.Iso97971;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * Zero padding strategy.\r\n\t */\r\n\tCryptoJS.pad.ZeroPadding = {\r\n\t    pad: function (data, blockSize) {\r\n\t        // Shortcut\r\n\t        var blockSizeBytes = blockSize * 4;\r\n\r\n\t        // Pad\r\n\t        data.clamp();\r\n\t        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);\r\n\t    },\r\n\r\n\t    unpad: function (data) {\r\n\t        // Shortcut\r\n\t        var dataWords = data.words;\r\n\r\n\t        // Unpad\r\n\t        var i = data.sigBytes - 1;\r\n\t        for (var i = data.sigBytes - 1; i >= 0; i--) {\r\n\t            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {\r\n\t                data.sigBytes = i + 1;\r\n\t                break;\r\n\t            }\r\n\t        }\r\n\t    }\r\n\t};\r\n\r\n\r\n\treturn CryptoJS.pad.ZeroPadding;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t/**\r\n\t * A noop padding strategy.\r\n\t */\r\n\tCryptoJS.pad.NoPadding = {\r\n\t    pad: function () {\r\n\t    },\r\n\r\n\t    unpad: function () {\r\n\t    }\r\n\t};\r\n\r\n\r\n\treturn CryptoJS.pad.NoPadding;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function (undefined) {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var CipherParams = C_lib.CipherParams;\r\n\t    var C_enc = C.enc;\r\n\t    var Hex = C_enc.Hex;\r\n\t    var C_format = C.format;\r\n\r\n\t    var HexFormatter = C_format.Hex = {\r\n\t        /**\r\n\t         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.\r\n\t         *\r\n\t         * @param {CipherParams} cipherParams The cipher params object.\r\n\t         *\r\n\t         * @return {string} The hexadecimally encoded string.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);\r\n\t         */\r\n\t        stringify: function (cipherParams) {\r\n\t            return cipherParams.ciphertext.toString(Hex);\r\n\t        },\r\n\r\n\t        /**\r\n\t         * Converts a hexadecimally encoded ciphertext string to a cipher params object.\r\n\t         *\r\n\t         * @param {string} input The hexadecimally encoded string.\r\n\t         *\r\n\t         * @return {CipherParams} The cipher params object.\r\n\t         *\r\n\t         * @static\r\n\t         *\r\n\t         * @example\r\n\t         *\r\n\t         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);\r\n\t         */\r\n\t        parse: function (input) {\r\n\t            var ciphertext = Hex.parse(input);\r\n\t            return CipherParams.create({ ciphertext: ciphertext });\r\n\t        }\r\n\t    };\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.format.Hex;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var BlockCipher = C_lib.BlockCipher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Lookup tables\r\n\t    var SBOX = [];\r\n\t    var INV_SBOX = [];\r\n\t    var SUB_MIX_0 = [];\r\n\t    var SUB_MIX_1 = [];\r\n\t    var SUB_MIX_2 = [];\r\n\t    var SUB_MIX_3 = [];\r\n\t    var INV_SUB_MIX_0 = [];\r\n\t    var INV_SUB_MIX_1 = [];\r\n\t    var INV_SUB_MIX_2 = [];\r\n\t    var INV_SUB_MIX_3 = [];\r\n\r\n\t    // Compute lookup tables\r\n\t    (function () {\r\n\t        // Compute double table\r\n\t        var d = [];\r\n\t        for (var i = 0; i < 256; i++) {\r\n\t            if (i < 128) {\r\n\t                d[i] = i << 1;\r\n\t            } else {\r\n\t                d[i] = (i << 1) ^ 0x11b;\r\n\t            }\r\n\t        }\r\n\r\n\t        // Walk GF(2^8)\r\n\t        var x = 0;\r\n\t        var xi = 0;\r\n\t        for (var i = 0; i < 256; i++) {\r\n\t            // Compute sbox\r\n\t            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);\r\n\t            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;\r\n\t            SBOX[x] = sx;\r\n\t            INV_SBOX[sx] = x;\r\n\r\n\t            // Compute multiplication\r\n\t            var x2 = d[x];\r\n\t            var x4 = d[x2];\r\n\t            var x8 = d[x4];\r\n\r\n\t            // Compute sub bytes, mix columns tables\r\n\t            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);\r\n\t            SUB_MIX_0[x] = (t << 24) | (t >>> 8);\r\n\t            SUB_MIX_1[x] = (t << 16) | (t >>> 16);\r\n\t            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);\r\n\t            SUB_MIX_3[x] = t;\r\n\r\n\t            // Compute inv sub bytes, inv mix columns tables\r\n\t            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);\r\n\t            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);\r\n\t            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);\r\n\t            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);\r\n\t            INV_SUB_MIX_3[sx] = t;\r\n\r\n\t            // Compute next counter\r\n\t            if (!x) {\r\n\t                x = xi = 1;\r\n\t            } else {\r\n\t                x = x2 ^ d[d[d[x8 ^ x2]]];\r\n\t                xi ^= d[d[xi]];\r\n\t            }\r\n\t        }\r\n\t    }());\r\n\r\n\t    // Precomputed Rcon lookup\r\n\t    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];\r\n\r\n\t    /**\r\n\t     * AES block cipher algorithm.\r\n\t     */\r\n\t    var AES = C_algo.AES = BlockCipher.extend({\r\n\t        _doReset: function () {\r\n\t            var t;\r\n\r\n\t            // Skip reset of nRounds has been set before and key did not change\r\n\t            if (this._nRounds && this._keyPriorReset === this._key) {\r\n\t                return;\r\n\t            }\r\n\r\n\t            // Shortcuts\r\n\t            var key = this._keyPriorReset = this._key;\r\n\t            var keyWords = key.words;\r\n\t            var keySize = key.sigBytes / 4;\r\n\r\n\t            // Compute number of rounds\r\n\t            var nRounds = this._nRounds = keySize + 6;\r\n\r\n\t            // Compute number of key schedule rows\r\n\t            var ksRows = (nRounds + 1) * 4;\r\n\r\n\t            // Compute key schedule\r\n\t            var keySchedule = this._keySchedule = [];\r\n\t            for (var ksRow = 0; ksRow < ksRows; ksRow++) {\r\n\t                if (ksRow < keySize) {\r\n\t                    keySchedule[ksRow] = keyWords[ksRow];\r\n\t                } else {\r\n\t                    t = keySchedule[ksRow - 1];\r\n\r\n\t                    if (!(ksRow % keySize)) {\r\n\t                        // Rot word\r\n\t                        t = (t << 8) | (t >>> 24);\r\n\r\n\t                        // Sub word\r\n\t                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];\r\n\r\n\t                        // Mix Rcon\r\n\t                        t ^= RCON[(ksRow / keySize) | 0] << 24;\r\n\t                    } else if (keySize > 6 && ksRow % keySize == 4) {\r\n\t                        // Sub word\r\n\t                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];\r\n\t                    }\r\n\r\n\t                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;\r\n\t                }\r\n\t            }\r\n\r\n\t            // Compute inv key schedule\r\n\t            var invKeySchedule = this._invKeySchedule = [];\r\n\t            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {\r\n\t                var ksRow = ksRows - invKsRow;\r\n\r\n\t                if (invKsRow % 4) {\r\n\t                    var t = keySchedule[ksRow];\r\n\t                } else {\r\n\t                    var t = keySchedule[ksRow - 4];\r\n\t                }\r\n\r\n\t                if (invKsRow < 4 || ksRow <= 4) {\r\n\t                    invKeySchedule[invKsRow] = t;\r\n\t                } else {\r\n\t                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^\r\n\t                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];\r\n\t                }\r\n\t            }\r\n\t        },\r\n\r\n\t        encryptBlock: function (M, offset) {\r\n\t            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);\r\n\t        },\r\n\r\n\t        decryptBlock: function (M, offset) {\r\n\t            // Swap 2nd and 4th rows\r\n\t            var t = M[offset + 1];\r\n\t            M[offset + 1] = M[offset + 3];\r\n\t            M[offset + 3] = t;\r\n\r\n\t            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);\r\n\r\n\t            // Inv swap 2nd and 4th rows\r\n\t            var t = M[offset + 1];\r\n\t            M[offset + 1] = M[offset + 3];\r\n\t            M[offset + 3] = t;\r\n\t        },\r\n\r\n\t        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {\r\n\t            // Shortcut\r\n\t            var nRounds = this._nRounds;\r\n\r\n\t            // Get input, add round key\r\n\t            var s0 = M[offset]     ^ keySchedule[0];\r\n\t            var s1 = M[offset + 1] ^ keySchedule[1];\r\n\t            var s2 = M[offset + 2] ^ keySchedule[2];\r\n\t            var s3 = M[offset + 3] ^ keySchedule[3];\r\n\r\n\t            // Key schedule row counter\r\n\t            var ksRow = 4;\r\n\r\n\t            // Rounds\r\n\t            for (var round = 1; round < nRounds; round++) {\r\n\t                // Shift rows, sub bytes, mix columns, add round key\r\n\t                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];\r\n\t                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];\r\n\t                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];\r\n\t                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];\r\n\r\n\t                // Update state\r\n\t                s0 = t0;\r\n\t                s1 = t1;\r\n\t                s2 = t2;\r\n\t                s3 = t3;\r\n\t            }\r\n\r\n\t            // Shift rows, sub bytes, add round key\r\n\t            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];\r\n\t            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];\r\n\t            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];\r\n\t            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];\r\n\r\n\t            // Set output\r\n\t            M[offset]     = t0;\r\n\t            M[offset + 1] = t1;\r\n\t            M[offset + 2] = t2;\r\n\t            M[offset + 3] = t3;\r\n\t        },\r\n\r\n\t        keySize: 256/32\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.AES = BlockCipher._createHelper(AES);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.AES;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var WordArray = C_lib.WordArray;\r\n\t    var BlockCipher = C_lib.BlockCipher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Permuted Choice 1 constants\r\n\t    var PC1 = [\r\n\t        57, 49, 41, 33, 25, 17, 9,  1,\r\n\t        58, 50, 42, 34, 26, 18, 10, 2,\r\n\t        59, 51, 43, 35, 27, 19, 11, 3,\r\n\t        60, 52, 44, 36, 63, 55, 47, 39,\r\n\t        31, 23, 15, 7,  62, 54, 46, 38,\r\n\t        30, 22, 14, 6,  61, 53, 45, 37,\r\n\t        29, 21, 13, 5,  28, 20, 12, 4\r\n\t    ];\r\n\r\n\t    // Permuted Choice 2 constants\r\n\t    var PC2 = [\r\n\t        14, 17, 11, 24, 1,  5,\r\n\t        3,  28, 15, 6,  21, 10,\r\n\t        23, 19, 12, 4,  26, 8,\r\n\t        16, 7,  27, 20, 13, 2,\r\n\t        41, 52, 31, 37, 47, 55,\r\n\t        30, 40, 51, 45, 33, 48,\r\n\t        44, 49, 39, 56, 34, 53,\r\n\t        46, 42, 50, 36, 29, 32\r\n\t    ];\r\n\r\n\t    // Cumulative bit shift constants\r\n\t    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];\r\n\r\n\t    // SBOXes and round permutation constants\r\n\t    var SBOX_P = [\r\n\t        {\r\n\t            0x0: 0x808200,\r\n\t            0x10000000: 0x8000,\r\n\t            0x20000000: 0x808002,\r\n\t            0x30000000: 0x2,\r\n\t            0x40000000: 0x200,\r\n\t            0x50000000: 0x808202,\r\n\t            0x60000000: 0x800202,\r\n\t            0x70000000: 0x800000,\r\n\t            0x80000000: 0x202,\r\n\t            0x90000000: 0x800200,\r\n\t            0xa0000000: 0x8200,\r\n\t            0xb0000000: 0x808000,\r\n\t            0xc0000000: 0x8002,\r\n\t            0xd0000000: 0x800002,\r\n\t            0xe0000000: 0x0,\r\n\t            0xf0000000: 0x8202,\r\n\t            0x8000000: 0x0,\r\n\t            0x18000000: 0x808202,\r\n\t            0x28000000: 0x8202,\r\n\t            0x38000000: 0x8000,\r\n\t            0x48000000: 0x808200,\r\n\t            0x58000000: 0x200,\r\n\t            0x68000000: 0x808002,\r\n\t            0x78000000: 0x2,\r\n\t            0x88000000: 0x800200,\r\n\t            0x98000000: 0x8200,\r\n\t            0xa8000000: 0x808000,\r\n\t            0xb8000000: 0x800202,\r\n\t            0xc8000000: 0x800002,\r\n\t            0xd8000000: 0x8002,\r\n\t            0xe8000000: 0x202,\r\n\t            0xf8000000: 0x800000,\r\n\t            0x1: 0x8000,\r\n\t            0x10000001: 0x2,\r\n\t            0x20000001: 0x808200,\r\n\t            0x30000001: 0x800000,\r\n\t            0x40000001: 0x808002,\r\n\t            0x50000001: 0x8200,\r\n\t            0x60000001: 0x200,\r\n\t            0x70000001: 0x800202,\r\n\t            0x80000001: 0x808202,\r\n\t            0x90000001: 0x808000,\r\n\t            0xa0000001: 0x800002,\r\n\t            0xb0000001: 0x8202,\r\n\t            0xc0000001: 0x202,\r\n\t            0xd0000001: 0x800200,\r\n\t            0xe0000001: 0x8002,\r\n\t            0xf0000001: 0x0,\r\n\t            0x8000001: 0x808202,\r\n\t            0x18000001: 0x808000,\r\n\t            0x28000001: 0x800000,\r\n\t            0x38000001: 0x200,\r\n\t            0x48000001: 0x8000,\r\n\t            0x58000001: 0x800002,\r\n\t            0x68000001: 0x2,\r\n\t            0x78000001: 0x8202,\r\n\t            0x88000001: 0x8002,\r\n\t            0x98000001: 0x800202,\r\n\t            0xa8000001: 0x202,\r\n\t            0xb8000001: 0x808200,\r\n\t            0xc8000001: 0x800200,\r\n\t            0xd8000001: 0x0,\r\n\t            0xe8000001: 0x8200,\r\n\t            0xf8000001: 0x808002\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x40084010,\r\n\t            0x1000000: 0x4000,\r\n\t            0x2000000: 0x80000,\r\n\t            0x3000000: 0x40080010,\r\n\t            0x4000000: 0x40000010,\r\n\t            0x5000000: 0x40084000,\r\n\t            0x6000000: 0x40004000,\r\n\t            0x7000000: 0x10,\r\n\t            0x8000000: 0x84000,\r\n\t            0x9000000: 0x40004010,\r\n\t            0xa000000: 0x40000000,\r\n\t            0xb000000: 0x84010,\r\n\t            0xc000000: 0x80010,\r\n\t            0xd000000: 0x0,\r\n\t            0xe000000: 0x4010,\r\n\t            0xf000000: 0x40080000,\r\n\t            0x800000: 0x40004000,\r\n\t            0x1800000: 0x84010,\r\n\t            0x2800000: 0x10,\r\n\t            0x3800000: 0x40004010,\r\n\t            0x4800000: 0x40084010,\r\n\t            0x5800000: 0x40000000,\r\n\t            0x6800000: 0x80000,\r\n\t            0x7800000: 0x40080010,\r\n\t            0x8800000: 0x80010,\r\n\t            0x9800000: 0x0,\r\n\t            0xa800000: 0x4000,\r\n\t            0xb800000: 0x40080000,\r\n\t            0xc800000: 0x40000010,\r\n\t            0xd800000: 0x84000,\r\n\t            0xe800000: 0x40084000,\r\n\t            0xf800000: 0x4010,\r\n\t            0x10000000: 0x0,\r\n\t            0x11000000: 0x40080010,\r\n\t            0x12000000: 0x40004010,\r\n\t            0x13000000: 0x40084000,\r\n\t            0x14000000: 0x40080000,\r\n\t            0x15000000: 0x10,\r\n\t            0x16000000: 0x84010,\r\n\t            0x17000000: 0x4000,\r\n\t            0x18000000: 0x4010,\r\n\t            0x19000000: 0x80000,\r\n\t            0x1a000000: 0x80010,\r\n\t            0x1b000000: 0x40000010,\r\n\t            0x1c000000: 0x84000,\r\n\t            0x1d000000: 0x40004000,\r\n\t            0x1e000000: 0x40000000,\r\n\t            0x1f000000: 0x40084010,\r\n\t            0x10800000: 0x84010,\r\n\t            0x11800000: 0x80000,\r\n\t            0x12800000: 0x40080000,\r\n\t            0x13800000: 0x4000,\r\n\t            0x14800000: 0x40004000,\r\n\t            0x15800000: 0x40084010,\r\n\t            0x16800000: 0x10,\r\n\t            0x17800000: 0x40000000,\r\n\t            0x18800000: 0x40084000,\r\n\t            0x19800000: 0x40000010,\r\n\t            0x1a800000: 0x40004010,\r\n\t            0x1b800000: 0x80010,\r\n\t            0x1c800000: 0x0,\r\n\t            0x1d800000: 0x4010,\r\n\t            0x1e800000: 0x40080010,\r\n\t            0x1f800000: 0x84000\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x104,\r\n\t            0x100000: 0x0,\r\n\t            0x200000: 0x4000100,\r\n\t            0x300000: 0x10104,\r\n\t            0x400000: 0x10004,\r\n\t            0x500000: 0x4000004,\r\n\t            0x600000: 0x4010104,\r\n\t            0x700000: 0x4010000,\r\n\t            0x800000: 0x4000000,\r\n\t            0x900000: 0x4010100,\r\n\t            0xa00000: 0x10100,\r\n\t            0xb00000: 0x4010004,\r\n\t            0xc00000: 0x4000104,\r\n\t            0xd00000: 0x10000,\r\n\t            0xe00000: 0x4,\r\n\t            0xf00000: 0x100,\r\n\t            0x80000: 0x4010100,\r\n\t            0x180000: 0x4010004,\r\n\t            0x280000: 0x0,\r\n\t            0x380000: 0x4000100,\r\n\t            0x480000: 0x4000004,\r\n\t            0x580000: 0x10000,\r\n\t            0x680000: 0x10004,\r\n\t            0x780000: 0x104,\r\n\t            0x880000: 0x4,\r\n\t            0x980000: 0x100,\r\n\t            0xa80000: 0x4010000,\r\n\t            0xb80000: 0x10104,\r\n\t            0xc80000: 0x10100,\r\n\t            0xd80000: 0x4000104,\r\n\t            0xe80000: 0x4010104,\r\n\t            0xf80000: 0x4000000,\r\n\t            0x1000000: 0x4010100,\r\n\t            0x1100000: 0x10004,\r\n\t            0x1200000: 0x10000,\r\n\t            0x1300000: 0x4000100,\r\n\t            0x1400000: 0x100,\r\n\t            0x1500000: 0x4010104,\r\n\t            0x1600000: 0x4000004,\r\n\t            0x1700000: 0x0,\r\n\t            0x1800000: 0x4000104,\r\n\t            0x1900000: 0x4000000,\r\n\t            0x1a00000: 0x4,\r\n\t            0x1b00000: 0x10100,\r\n\t            0x1c00000: 0x4010000,\r\n\t            0x1d00000: 0x104,\r\n\t            0x1e00000: 0x10104,\r\n\t            0x1f00000: 0x4010004,\r\n\t            0x1080000: 0x4000000,\r\n\t            0x1180000: 0x104,\r\n\t            0x1280000: 0x4010100,\r\n\t            0x1380000: 0x0,\r\n\t            0x1480000: 0x10004,\r\n\t            0x1580000: 0x4000100,\r\n\t            0x1680000: 0x100,\r\n\t            0x1780000: 0x4010004,\r\n\t            0x1880000: 0x10000,\r\n\t            0x1980000: 0x4010104,\r\n\t            0x1a80000: 0x10104,\r\n\t            0x1b80000: 0x4000004,\r\n\t            0x1c80000: 0x4000104,\r\n\t            0x1d80000: 0x4010000,\r\n\t            0x1e80000: 0x4,\r\n\t            0x1f80000: 0x10100\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x80401000,\r\n\t            0x10000: 0x80001040,\r\n\t            0x20000: 0x401040,\r\n\t            0x30000: 0x80400000,\r\n\t            0x40000: 0x0,\r\n\t            0x50000: 0x401000,\r\n\t            0x60000: 0x80000040,\r\n\t            0x70000: 0x400040,\r\n\t            0x80000: 0x80000000,\r\n\t            0x90000: 0x400000,\r\n\t            0xa0000: 0x40,\r\n\t            0xb0000: 0x80001000,\r\n\t            0xc0000: 0x80400040,\r\n\t            0xd0000: 0x1040,\r\n\t            0xe0000: 0x1000,\r\n\t            0xf0000: 0x80401040,\r\n\t            0x8000: 0x80001040,\r\n\t            0x18000: 0x40,\r\n\t            0x28000: 0x80400040,\r\n\t            0x38000: 0x80001000,\r\n\t            0x48000: 0x401000,\r\n\t            0x58000: 0x80401040,\r\n\t            0x68000: 0x0,\r\n\t            0x78000: 0x80400000,\r\n\t            0x88000: 0x1000,\r\n\t            0x98000: 0x80401000,\r\n\t            0xa8000: 0x400000,\r\n\t            0xb8000: 0x1040,\r\n\t            0xc8000: 0x80000000,\r\n\t            0xd8000: 0x400040,\r\n\t            0xe8000: 0x401040,\r\n\t            0xf8000: 0x80000040,\r\n\t            0x100000: 0x400040,\r\n\t            0x110000: 0x401000,\r\n\t            0x120000: 0x80000040,\r\n\t            0x130000: 0x0,\r\n\t            0x140000: 0x1040,\r\n\t            0x150000: 0x80400040,\r\n\t            0x160000: 0x80401000,\r\n\t            0x170000: 0x80001040,\r\n\t            0x180000: 0x80401040,\r\n\t            0x190000: 0x80000000,\r\n\t            0x1a0000: 0x80400000,\r\n\t            0x1b0000: 0x401040,\r\n\t            0x1c0000: 0x80001000,\r\n\t            0x1d0000: 0x400000,\r\n\t            0x1e0000: 0x40,\r\n\t            0x1f0000: 0x1000,\r\n\t            0x108000: 0x80400000,\r\n\t            0x118000: 0x80401040,\r\n\t            0x128000: 0x0,\r\n\t            0x138000: 0x401000,\r\n\t            0x148000: 0x400040,\r\n\t            0x158000: 0x80000000,\r\n\t            0x168000: 0x80001040,\r\n\t            0x178000: 0x40,\r\n\t            0x188000: 0x80000040,\r\n\t            0x198000: 0x1000,\r\n\t            0x1a8000: 0x80001000,\r\n\t            0x1b8000: 0x80400040,\r\n\t            0x1c8000: 0x1040,\r\n\t            0x1d8000: 0x80401000,\r\n\t            0x1e8000: 0x400000,\r\n\t            0x1f8000: 0x401040\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x80,\r\n\t            0x1000: 0x1040000,\r\n\t            0x2000: 0x40000,\r\n\t            0x3000: 0x20000000,\r\n\t            0x4000: 0x20040080,\r\n\t            0x5000: 0x1000080,\r\n\t            0x6000: 0x21000080,\r\n\t            0x7000: 0x40080,\r\n\t            0x8000: 0x1000000,\r\n\t            0x9000: 0x20040000,\r\n\t            0xa000: 0x20000080,\r\n\t            0xb000: 0x21040080,\r\n\t            0xc000: 0x21040000,\r\n\t            0xd000: 0x0,\r\n\t            0xe000: 0x1040080,\r\n\t            0xf000: 0x21000000,\r\n\t            0x800: 0x1040080,\r\n\t            0x1800: 0x21000080,\r\n\t            0x2800: 0x80,\r\n\t            0x3800: 0x1040000,\r\n\t            0x4800: 0x40000,\r\n\t            0x5800: 0x20040080,\r\n\t            0x6800: 0x21040000,\r\n\t            0x7800: 0x20000000,\r\n\t            0x8800: 0x20040000,\r\n\t            0x9800: 0x0,\r\n\t            0xa800: 0x21040080,\r\n\t            0xb800: 0x1000080,\r\n\t            0xc800: 0x20000080,\r\n\t            0xd800: 0x21000000,\r\n\t            0xe800: 0x1000000,\r\n\t            0xf800: 0x40080,\r\n\t            0x10000: 0x40000,\r\n\t            0x11000: 0x80,\r\n\t            0x12000: 0x20000000,\r\n\t            0x13000: 0x21000080,\r\n\t            0x14000: 0x1000080,\r\n\t            0x15000: 0x21040000,\r\n\t            0x16000: 0x20040080,\r\n\t            0x17000: 0x1000000,\r\n\t            0x18000: 0x21040080,\r\n\t            0x19000: 0x21000000,\r\n\t            0x1a000: 0x1040000,\r\n\t            0x1b000: 0x20040000,\r\n\t            0x1c000: 0x40080,\r\n\t            0x1d000: 0x20000080,\r\n\t            0x1e000: 0x0,\r\n\t            0x1f000: 0x1040080,\r\n\t            0x10800: 0x21000080,\r\n\t            0x11800: 0x1000000,\r\n\t            0x12800: 0x1040000,\r\n\t            0x13800: 0x20040080,\r\n\t            0x14800: 0x20000000,\r\n\t            0x15800: 0x1040080,\r\n\t            0x16800: 0x80,\r\n\t            0x17800: 0x21040000,\r\n\t            0x18800: 0x40080,\r\n\t            0x19800: 0x21040080,\r\n\t            0x1a800: 0x0,\r\n\t            0x1b800: 0x21000000,\r\n\t            0x1c800: 0x1000080,\r\n\t            0x1d800: 0x40000,\r\n\t            0x1e800: 0x20040000,\r\n\t            0x1f800: 0x20000080\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x10000008,\r\n\t            0x100: 0x2000,\r\n\t            0x200: 0x10200000,\r\n\t            0x300: 0x10202008,\r\n\t            0x400: 0x10002000,\r\n\t            0x500: 0x200000,\r\n\t            0x600: 0x200008,\r\n\t            0x700: 0x10000000,\r\n\t            0x800: 0x0,\r\n\t            0x900: 0x10002008,\r\n\t            0xa00: 0x202000,\r\n\t            0xb00: 0x8,\r\n\t            0xc00: 0x10200008,\r\n\t            0xd00: 0x202008,\r\n\t            0xe00: 0x2008,\r\n\t            0xf00: 0x10202000,\r\n\t            0x80: 0x10200000,\r\n\t            0x180: 0x10202008,\r\n\t            0x280: 0x8,\r\n\t            0x380: 0x200000,\r\n\t            0x480: 0x202008,\r\n\t            0x580: 0x10000008,\r\n\t            0x680: 0x10002000,\r\n\t            0x780: 0x2008,\r\n\t            0x880: 0x200008,\r\n\t            0x980: 0x2000,\r\n\t            0xa80: 0x10002008,\r\n\t            0xb80: 0x10200008,\r\n\t            0xc80: 0x0,\r\n\t            0xd80: 0x10202000,\r\n\t            0xe80: 0x202000,\r\n\t            0xf80: 0x10000000,\r\n\t            0x1000: 0x10002000,\r\n\t            0x1100: 0x10200008,\r\n\t            0x1200: 0x10202008,\r\n\t            0x1300: 0x2008,\r\n\t            0x1400: 0x200000,\r\n\t            0x1500: 0x10000000,\r\n\t            0x1600: 0x10000008,\r\n\t            0x1700: 0x202000,\r\n\t            0x1800: 0x202008,\r\n\t            0x1900: 0x0,\r\n\t            0x1a00: 0x8,\r\n\t            0x1b00: 0x10200000,\r\n\t            0x1c00: 0x2000,\r\n\t            0x1d00: 0x10002008,\r\n\t            0x1e00: 0x10202000,\r\n\t            0x1f00: 0x200008,\r\n\t            0x1080: 0x8,\r\n\t            0x1180: 0x202000,\r\n\t            0x1280: 0x200000,\r\n\t            0x1380: 0x10000008,\r\n\t            0x1480: 0x10002000,\r\n\t            0x1580: 0x2008,\r\n\t            0x1680: 0x10202008,\r\n\t            0x1780: 0x10200000,\r\n\t            0x1880: 0x10202000,\r\n\t            0x1980: 0x10200008,\r\n\t            0x1a80: 0x2000,\r\n\t            0x1b80: 0x202008,\r\n\t            0x1c80: 0x200008,\r\n\t            0x1d80: 0x0,\r\n\t            0x1e80: 0x10000000,\r\n\t            0x1f80: 0x10002008\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x100000,\r\n\t            0x10: 0x2000401,\r\n\t            0x20: 0x400,\r\n\t            0x30: 0x100401,\r\n\t            0x40: 0x2100401,\r\n\t            0x50: 0x0,\r\n\t            0x60: 0x1,\r\n\t            0x70: 0x2100001,\r\n\t            0x80: 0x2000400,\r\n\t            0x90: 0x100001,\r\n\t            0xa0: 0x2000001,\r\n\t            0xb0: 0x2100400,\r\n\t            0xc0: 0x2100000,\r\n\t            0xd0: 0x401,\r\n\t            0xe0: 0x100400,\r\n\t            0xf0: 0x2000000,\r\n\t            0x8: 0x2100001,\r\n\t            0x18: 0x0,\r\n\t            0x28: 0x2000401,\r\n\t            0x38: 0x2100400,\r\n\t            0x48: 0x100000,\r\n\t            0x58: 0x2000001,\r\n\t            0x68: 0x2000000,\r\n\t            0x78: 0x401,\r\n\t            0x88: 0x100401,\r\n\t            0x98: 0x2000400,\r\n\t            0xa8: 0x2100000,\r\n\t            0xb8: 0x100001,\r\n\t            0xc8: 0x400,\r\n\t            0xd8: 0x2100401,\r\n\t            0xe8: 0x1,\r\n\t            0xf8: 0x100400,\r\n\t            0x100: 0x2000000,\r\n\t            0x110: 0x100000,\r\n\t            0x120: 0x2000401,\r\n\t            0x130: 0x2100001,\r\n\t            0x140: 0x100001,\r\n\t            0x150: 0x2000400,\r\n\t            0x160: 0x2100400,\r\n\t            0x170: 0x100401,\r\n\t            0x180: 0x401,\r\n\t            0x190: 0x2100401,\r\n\t            0x1a0: 0x100400,\r\n\t            0x1b0: 0x1,\r\n\t            0x1c0: 0x0,\r\n\t            0x1d0: 0x2100000,\r\n\t            0x1e0: 0x2000001,\r\n\t            0x1f0: 0x400,\r\n\t            0x108: 0x100400,\r\n\t            0x118: 0x2000401,\r\n\t            0x128: 0x2100001,\r\n\t            0x138: 0x1,\r\n\t            0x148: 0x2000000,\r\n\t            0x158: 0x100000,\r\n\t            0x168: 0x401,\r\n\t            0x178: 0x2100400,\r\n\t            0x188: 0x2000001,\r\n\t            0x198: 0x2100000,\r\n\t            0x1a8: 0x0,\r\n\t            0x1b8: 0x2100401,\r\n\t            0x1c8: 0x100401,\r\n\t            0x1d8: 0x400,\r\n\t            0x1e8: 0x2000400,\r\n\t            0x1f8: 0x100001\r\n\t        },\r\n\t        {\r\n\t            0x0: 0x8000820,\r\n\t            0x1: 0x20000,\r\n\t            0x2: 0x8000000,\r\n\t            0x3: 0x20,\r\n\t            0x4: 0x20020,\r\n\t            0x5: 0x8020820,\r\n\t            0x6: 0x8020800,\r\n\t            0x7: 0x800,\r\n\t            0x8: 0x8020000,\r\n\t            0x9: 0x8000800,\r\n\t            0xa: 0x20800,\r\n\t            0xb: 0x8020020,\r\n\t            0xc: 0x820,\r\n\t            0xd: 0x0,\r\n\t            0xe: 0x8000020,\r\n\t            0xf: 0x20820,\r\n\t            0x80000000: 0x800,\r\n\t            0x80000001: 0x8020820,\r\n\t            0x80000002: 0x8000820,\r\n\t            0x80000003: 0x8000000,\r\n\t            0x80000004: 0x8020000,\r\n\t            0x80000005: 0x20800,\r\n\t            0x80000006: 0x20820,\r\n\t            0x80000007: 0x20,\r\n\t            0x80000008: 0x8000020,\r\n\t            0x80000009: 0x820,\r\n\t            0x8000000a: 0x20020,\r\n\t            0x8000000b: 0x8020800,\r\n\t            0x8000000c: 0x0,\r\n\t            0x8000000d: 0x8020020,\r\n\t            0x8000000e: 0x8000800,\r\n\t            0x8000000f: 0x20000,\r\n\t            0x10: 0x20820,\r\n\t            0x11: 0x8020800,\r\n\t            0x12: 0x20,\r\n\t            0x13: 0x800,\r\n\t            0x14: 0x8000800,\r\n\t            0x15: 0x8000020,\r\n\t            0x16: 0x8020020,\r\n\t            0x17: 0x20000,\r\n\t            0x18: 0x0,\r\n\t            0x19: 0x20020,\r\n\t            0x1a: 0x8020000,\r\n\t            0x1b: 0x8000820,\r\n\t            0x1c: 0x8020820,\r\n\t            0x1d: 0x20800,\r\n\t            0x1e: 0x820,\r\n\t            0x1f: 0x8000000,\r\n\t            0x80000010: 0x20000,\r\n\t            0x80000011: 0x800,\r\n\t            0x80000012: 0x8020020,\r\n\t            0x80000013: 0x20820,\r\n\t            0x80000014: 0x20,\r\n\t            0x80000015: 0x8020000,\r\n\t            0x80000016: 0x8000000,\r\n\t            0x80000017: 0x8000820,\r\n\t            0x80000018: 0x8020820,\r\n\t            0x80000019: 0x8000020,\r\n\t            0x8000001a: 0x8000800,\r\n\t            0x8000001b: 0x0,\r\n\t            0x8000001c: 0x20800,\r\n\t            0x8000001d: 0x820,\r\n\t            0x8000001e: 0x20020,\r\n\t            0x8000001f: 0x8020800\r\n\t        }\r\n\t    ];\r\n\r\n\t    // Masks that select the SBOX input\r\n\t    var SBOX_MASK = [\r\n\t        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,\r\n\t        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f\r\n\t    ];\r\n\r\n\t    /**\r\n\t     * DES block cipher algorithm.\r\n\t     */\r\n\t    var DES = C_algo.DES = BlockCipher.extend({\r\n\t        _doReset: function () {\r\n\t            // Shortcuts\r\n\t            var key = this._key;\r\n\t            var keyWords = key.words;\r\n\r\n\t            // Select 56 bits according to PC1\r\n\t            var keyBits = [];\r\n\t            for (var i = 0; i < 56; i++) {\r\n\t                var keyBitPos = PC1[i] - 1;\r\n\t                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;\r\n\t            }\r\n\r\n\t            // Assemble 16 subkeys\r\n\t            var subKeys = this._subKeys = [];\r\n\t            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {\r\n\t                // Create subkey\r\n\t                var subKey = subKeys[nSubKey] = [];\r\n\r\n\t                // Shortcut\r\n\t                var bitShift = BIT_SHIFTS[nSubKey];\r\n\r\n\t                // Select 48 bits according to PC2\r\n\t                for (var i = 0; i < 24; i++) {\r\n\t                    // Select from the left 28 key bits\r\n\t                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);\r\n\r\n\t                    // Select from the right 28 key bits\r\n\t                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);\r\n\t                }\r\n\r\n\t                // Since each subkey is applied to an expanded 32-bit input,\r\n\t                // the subkey can be broken into 8 values scaled to 32-bits,\r\n\t                // which allows the key to be used without expansion\r\n\t                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);\r\n\t                for (var i = 1; i < 7; i++) {\r\n\t                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);\r\n\t                }\r\n\t                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);\r\n\t            }\r\n\r\n\t            // Compute inverse subkeys\r\n\t            var invSubKeys = this._invSubKeys = [];\r\n\t            for (var i = 0; i < 16; i++) {\r\n\t                invSubKeys[i] = subKeys[15 - i];\r\n\t            }\r\n\t        },\r\n\r\n\t        encryptBlock: function (M, offset) {\r\n\t            this._doCryptBlock(M, offset, this._subKeys);\r\n\t        },\r\n\r\n\t        decryptBlock: function (M, offset) {\r\n\t            this._doCryptBlock(M, offset, this._invSubKeys);\r\n\t        },\r\n\r\n\t        _doCryptBlock: function (M, offset, subKeys) {\r\n\t            // Get input\r\n\t            this._lBlock = M[offset];\r\n\t            this._rBlock = M[offset + 1];\r\n\r\n\t            // Initial permutation\r\n\t            exchangeLR.call(this, 4,  0x0f0f0f0f);\r\n\t            exchangeLR.call(this, 16, 0x0000ffff);\r\n\t            exchangeRL.call(this, 2,  0x33333333);\r\n\t            exchangeRL.call(this, 8,  0x00ff00ff);\r\n\t            exchangeLR.call(this, 1,  0x55555555);\r\n\r\n\t            // Rounds\r\n\t            for (var round = 0; round < 16; round++) {\r\n\t                // Shortcuts\r\n\t                var subKey = subKeys[round];\r\n\t                var lBlock = this._lBlock;\r\n\t                var rBlock = this._rBlock;\r\n\r\n\t                // Feistel function\r\n\t                var f = 0;\r\n\t                for (var i = 0; i < 8; i++) {\r\n\t                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];\r\n\t                }\r\n\t                this._lBlock = rBlock;\r\n\t                this._rBlock = lBlock ^ f;\r\n\t            }\r\n\r\n\t            // Undo swap from last round\r\n\t            var t = this._lBlock;\r\n\t            this._lBlock = this._rBlock;\r\n\t            this._rBlock = t;\r\n\r\n\t            // Final permutation\r\n\t            exchangeLR.call(this, 1,  0x55555555);\r\n\t            exchangeRL.call(this, 8,  0x00ff00ff);\r\n\t            exchangeRL.call(this, 2,  0x33333333);\r\n\t            exchangeLR.call(this, 16, 0x0000ffff);\r\n\t            exchangeLR.call(this, 4,  0x0f0f0f0f);\r\n\r\n\t            // Set output\r\n\t            M[offset] = this._lBlock;\r\n\t            M[offset + 1] = this._rBlock;\r\n\t        },\r\n\r\n\t        keySize: 64/32,\r\n\r\n\t        ivSize: 64/32,\r\n\r\n\t        blockSize: 64/32\r\n\t    });\r\n\r\n\t    // Swap bits across the left and right words\r\n\t    function exchangeLR(offset, mask) {\r\n\t        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;\r\n\t        this._rBlock ^= t;\r\n\t        this._lBlock ^= t << offset;\r\n\t    }\r\n\r\n\t    function exchangeRL(offset, mask) {\r\n\t        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;\r\n\t        this._lBlock ^= t;\r\n\t        this._rBlock ^= t << offset;\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.DES = BlockCipher._createHelper(DES);\r\n\r\n\t    /**\r\n\t     * Triple-DES block cipher algorithm.\r\n\t     */\r\n\t    var TripleDES = C_algo.TripleDES = BlockCipher.extend({\r\n\t        _doReset: function () {\r\n\t            // Shortcuts\r\n\t            var key = this._key;\r\n\t            var keyWords = key.words;\r\n\t            // Make sure the key length is valid (64, 128 or >= 192 bit)\r\n\t            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {\r\n\t                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');\r\n\t            }\r\n\r\n\t            // Extend the key according to the keying options defined in 3DES standard\r\n\t            var key1 = keyWords.slice(0, 2);\r\n\t            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);\r\n\t            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);\r\n\r\n\t            // Create DES instances\r\n\t            this._des1 = DES.createEncryptor(WordArray.create(key1));\r\n\t            this._des2 = DES.createEncryptor(WordArray.create(key2));\r\n\t            this._des3 = DES.createEncryptor(WordArray.create(key3));\r\n\t        },\r\n\r\n\t        encryptBlock: function (M, offset) {\r\n\t            this._des1.encryptBlock(M, offset);\r\n\t            this._des2.decryptBlock(M, offset);\r\n\t            this._des3.encryptBlock(M, offset);\r\n\t        },\r\n\r\n\t        decryptBlock: function (M, offset) {\r\n\t            this._des3.decryptBlock(M, offset);\r\n\t            this._des2.encryptBlock(M, offset);\r\n\t            this._des1.decryptBlock(M, offset);\r\n\t        },\r\n\r\n\t        keySize: 192/32,\r\n\r\n\t        ivSize: 64/32,\r\n\r\n\t        blockSize: 64/32\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.TripleDES = BlockCipher._createHelper(TripleDES);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.TripleDES;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var StreamCipher = C_lib.StreamCipher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    /**\r\n\t     * RC4 stream cipher algorithm.\r\n\t     */\r\n\t    var RC4 = C_algo.RC4 = StreamCipher.extend({\r\n\t        _doReset: function () {\r\n\t            // Shortcuts\r\n\t            var key = this._key;\r\n\t            var keyWords = key.words;\r\n\t            var keySigBytes = key.sigBytes;\r\n\r\n\t            // Init sbox\r\n\t            var S = this._S = [];\r\n\t            for (var i = 0; i < 256; i++) {\r\n\t                S[i] = i;\r\n\t            }\r\n\r\n\t            // Key setup\r\n\t            for (var i = 0, j = 0; i < 256; i++) {\r\n\t                var keyByteIndex = i % keySigBytes;\r\n\t                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;\r\n\r\n\t                j = (j + S[i] + keyByte) % 256;\r\n\r\n\t                // Swap\r\n\t                var t = S[i];\r\n\t                S[i] = S[j];\r\n\t                S[j] = t;\r\n\t            }\r\n\r\n\t            // Counters\r\n\t            this._i = this._j = 0;\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            M[offset] ^= generateKeystreamWord.call(this);\r\n\t        },\r\n\r\n\t        keySize: 256/32,\r\n\r\n\t        ivSize: 0\r\n\t    });\r\n\r\n\t    function generateKeystreamWord() {\r\n\t        // Shortcuts\r\n\t        var S = this._S;\r\n\t        var i = this._i;\r\n\t        var j = this._j;\r\n\r\n\t        // Generate keystream word\r\n\t        var keystreamWord = 0;\r\n\t        for (var n = 0; n < 4; n++) {\r\n\t            i = (i + 1) % 256;\r\n\t            j = (j + S[i]) % 256;\r\n\r\n\t            // Swap\r\n\t            var t = S[i];\r\n\t            S[i] = S[j];\r\n\t            S[j] = t;\r\n\r\n\t            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);\r\n\t        }\r\n\r\n\t        // Update counters\r\n\t        this._i = i;\r\n\t        this._j = j;\r\n\r\n\t        return keystreamWord;\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.RC4 = StreamCipher._createHelper(RC4);\r\n\r\n\t    /**\r\n\t     * Modified RC4 stream cipher algorithm.\r\n\t     */\r\n\t    var RC4Drop = C_algo.RC4Drop = RC4.extend({\r\n\t        /**\r\n\t         * Configuration options.\r\n\t         *\r\n\t         * @property {number} drop The number of keystream words to drop. Default 192\r\n\t         */\r\n\t        cfg: RC4.cfg.extend({\r\n\t            drop: 192\r\n\t        }),\r\n\r\n\t        _doReset: function () {\r\n\t            RC4._doReset.call(this);\r\n\r\n\t            // Drop\r\n\t            for (var i = this.cfg.drop; i > 0; i--) {\r\n\t                generateKeystreamWord.call(this);\r\n\t            }\r\n\t        }\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.RC4Drop = StreamCipher._createHelper(RC4Drop);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.RC4;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var StreamCipher = C_lib.StreamCipher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Reusable objects\r\n\t    var S  = [];\r\n\t    var C_ = [];\r\n\t    var G  = [];\r\n\r\n\t    /**\r\n\t     * Rabbit stream cipher algorithm\r\n\t     */\r\n\t    var Rabbit = C_algo.Rabbit = StreamCipher.extend({\r\n\t        _doReset: function () {\r\n\t            // Shortcuts\r\n\t            var K = this._key.words;\r\n\t            var iv = this.cfg.iv;\r\n\r\n\t            // Swap endian\r\n\t            for (var i = 0; i < 4; i++) {\r\n\t                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |\r\n\t                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);\r\n\t            }\r\n\r\n\t            // Generate initial state values\r\n\t            var X = this._X = [\r\n\t                K[0], (K[3] << 16) | (K[2] >>> 16),\r\n\t                K[1], (K[0] << 16) | (K[3] >>> 16),\r\n\t                K[2], (K[1] << 16) | (K[0] >>> 16),\r\n\t                K[3], (K[2] << 16) | (K[1] >>> 16)\r\n\t            ];\r\n\r\n\t            // Generate initial counter values\r\n\t            var C = this._C = [\r\n\t                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),\r\n\t                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),\r\n\t                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),\r\n\t                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)\r\n\t            ];\r\n\r\n\t            // Carry bit\r\n\t            this._b = 0;\r\n\r\n\t            // Iterate the system four times\r\n\t            for (var i = 0; i < 4; i++) {\r\n\t                nextState.call(this);\r\n\t            }\r\n\r\n\t            // Modify the counters\r\n\t            for (var i = 0; i < 8; i++) {\r\n\t                C[i] ^= X[(i + 4) & 7];\r\n\t            }\r\n\r\n\t            // IV setup\r\n\t            if (iv) {\r\n\t                // Shortcuts\r\n\t                var IV = iv.words;\r\n\t                var IV_0 = IV[0];\r\n\t                var IV_1 = IV[1];\r\n\r\n\t                // Generate four subvectors\r\n\t                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);\r\n\t                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);\r\n\t                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);\r\n\t                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);\r\n\r\n\t                // Modify counter values\r\n\t                C[0] ^= i0;\r\n\t                C[1] ^= i1;\r\n\t                C[2] ^= i2;\r\n\t                C[3] ^= i3;\r\n\t                C[4] ^= i0;\r\n\t                C[5] ^= i1;\r\n\t                C[6] ^= i2;\r\n\t                C[7] ^= i3;\r\n\r\n\t                // Iterate the system four times\r\n\t                for (var i = 0; i < 4; i++) {\r\n\t                    nextState.call(this);\r\n\t                }\r\n\t            }\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Shortcut\r\n\t            var X = this._X;\r\n\r\n\t            // Iterate the system\r\n\t            nextState.call(this);\r\n\r\n\t            // Generate four keystream words\r\n\t            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);\r\n\t            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);\r\n\t            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);\r\n\t            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);\r\n\r\n\t            for (var i = 0; i < 4; i++) {\r\n\t                // Swap endian\r\n\t                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |\r\n\t                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);\r\n\r\n\t                // Encrypt\r\n\t                M[offset + i] ^= S[i];\r\n\t            }\r\n\t        },\r\n\r\n\t        blockSize: 128/32,\r\n\r\n\t        ivSize: 64/32\r\n\t    });\r\n\r\n\t    function nextState() {\r\n\t        // Shortcuts\r\n\t        var X = this._X;\r\n\t        var C = this._C;\r\n\r\n\t        // Save old counter values\r\n\t        for (var i = 0; i < 8; i++) {\r\n\t            C_[i] = C[i];\r\n\t        }\r\n\r\n\t        // Calculate new counter values\r\n\t        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;\r\n\t        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;\r\n\t        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;\r\n\r\n\t        // Calculate the g-values\r\n\t        for (var i = 0; i < 8; i++) {\r\n\t            var gx = X[i] + C[i];\r\n\r\n\t            // Construct high and low argument for squaring\r\n\t            var ga = gx & 0xffff;\r\n\t            var gb = gx >>> 16;\r\n\r\n\t            // Calculate high and low result of squaring\r\n\t            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;\r\n\t            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);\r\n\r\n\t            // High XOR low\r\n\t            G[i] = gh ^ gl;\r\n\t        }\r\n\r\n\t        // Calculate new state values\r\n\t        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;\r\n\t        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;\r\n\t        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;\r\n\t        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;\r\n\t        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;\r\n\t        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;\r\n\t        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;\r\n\t        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.Rabbit = StreamCipher._createHelper(Rabbit);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.Rabbit;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var StreamCipher = C_lib.StreamCipher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    // Reusable objects\r\n\t    var S  = [];\r\n\t    var C_ = [];\r\n\t    var G  = [];\r\n\r\n\t    /**\r\n\t     * Rabbit stream cipher algorithm.\r\n\t     *\r\n\t     * This is a legacy version that neglected to convert the key to little-endian.\r\n\t     * This error doesn't affect the cipher's security,\r\n\t     * but it does affect its compatibility with other implementations.\r\n\t     */\r\n\t    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({\r\n\t        _doReset: function () {\r\n\t            // Shortcuts\r\n\t            var K = this._key.words;\r\n\t            var iv = this.cfg.iv;\r\n\r\n\t            // Generate initial state values\r\n\t            var X = this._X = [\r\n\t                K[0], (K[3] << 16) | (K[2] >>> 16),\r\n\t                K[1], (K[0] << 16) | (K[3] >>> 16),\r\n\t                K[2], (K[1] << 16) | (K[0] >>> 16),\r\n\t                K[3], (K[2] << 16) | (K[1] >>> 16)\r\n\t            ];\r\n\r\n\t            // Generate initial counter values\r\n\t            var C = this._C = [\r\n\t                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),\r\n\t                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),\r\n\t                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),\r\n\t                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)\r\n\t            ];\r\n\r\n\t            // Carry bit\r\n\t            this._b = 0;\r\n\r\n\t            // Iterate the system four times\r\n\t            for (var i = 0; i < 4; i++) {\r\n\t                nextState.call(this);\r\n\t            }\r\n\r\n\t            // Modify the counters\r\n\t            for (var i = 0; i < 8; i++) {\r\n\t                C[i] ^= X[(i + 4) & 7];\r\n\t            }\r\n\r\n\t            // IV setup\r\n\t            if (iv) {\r\n\t                // Shortcuts\r\n\t                var IV = iv.words;\r\n\t                var IV_0 = IV[0];\r\n\t                var IV_1 = IV[1];\r\n\r\n\t                // Generate four subvectors\r\n\t                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);\r\n\t                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);\r\n\t                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);\r\n\t                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);\r\n\r\n\t                // Modify counter values\r\n\t                C[0] ^= i0;\r\n\t                C[1] ^= i1;\r\n\t                C[2] ^= i2;\r\n\t                C[3] ^= i3;\r\n\t                C[4] ^= i0;\r\n\t                C[5] ^= i1;\r\n\t                C[6] ^= i2;\r\n\t                C[7] ^= i3;\r\n\r\n\t                // Iterate the system four times\r\n\t                for (var i = 0; i < 4; i++) {\r\n\t                    nextState.call(this);\r\n\t                }\r\n\t            }\r\n\t        },\r\n\r\n\t        _doProcessBlock: function (M, offset) {\r\n\t            // Shortcut\r\n\t            var X = this._X;\r\n\r\n\t            // Iterate the system\r\n\t            nextState.call(this);\r\n\r\n\t            // Generate four keystream words\r\n\t            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);\r\n\t            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);\r\n\t            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);\r\n\t            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);\r\n\r\n\t            for (var i = 0; i < 4; i++) {\r\n\t                // Swap endian\r\n\t                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |\r\n\t                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);\r\n\r\n\t                // Encrypt\r\n\t                M[offset + i] ^= S[i];\r\n\t            }\r\n\t        },\r\n\r\n\t        blockSize: 128/32,\r\n\r\n\t        ivSize: 64/32\r\n\t    });\r\n\r\n\t    function nextState() {\r\n\t        // Shortcuts\r\n\t        var X = this._X;\r\n\t        var C = this._C;\r\n\r\n\t        // Save old counter values\r\n\t        for (var i = 0; i < 8; i++) {\r\n\t            C_[i] = C[i];\r\n\t        }\r\n\r\n\t        // Calculate new counter values\r\n\t        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;\r\n\t        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;\r\n\t        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;\r\n\t        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;\r\n\r\n\t        // Calculate the g-values\r\n\t        for (var i = 0; i < 8; i++) {\r\n\t            var gx = X[i] + C[i];\r\n\r\n\t            // Construct high and low argument for squaring\r\n\t            var ga = gx & 0xffff;\r\n\t            var gb = gx >>> 16;\r\n\r\n\t            // Calculate high and low result of squaring\r\n\t            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;\r\n\t            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);\r\n\r\n\t            // High XOR low\r\n\t            G[i] = gh ^ gl;\r\n\t        }\r\n\r\n\t        // Calculate new state values\r\n\t        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;\r\n\t        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;\r\n\t        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;\r\n\t        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;\r\n\t        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;\r\n\t        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;\r\n\t        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;\r\n\t        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.RabbitLegacy;\r\n\r\n}));",";(function (root, factory, undef) {\r\n\tif (typeof exports === \"object\") {\r\n\t\t// CommonJS\r\n\t\tmodule.exports = exports = factory(require(\"./core\"), require(\"./enc-base64\"), require(\"./md5\"), require(\"./evpkdf\"), require(\"./cipher-core\"));\r\n\t}\r\n\telse if (typeof define === \"function\" && define.amd) {\r\n\t\t// AMD\r\n\t\tdefine([\"./core\", \"./enc-base64\", \"./md5\", \"./evpkdf\", \"./cipher-core\"], factory);\r\n\t}\r\n\telse {\r\n\t\t// Global (browser)\r\n\t\tfactory(root.CryptoJS);\r\n\t}\r\n}(this, function (CryptoJS) {\r\n\r\n\t(function () {\r\n\t    // Shortcuts\r\n\t    var C = CryptoJS;\r\n\t    var C_lib = C.lib;\r\n\t    var BlockCipher = C_lib.BlockCipher;\r\n\t    var C_algo = C.algo;\r\n\r\n\t    const N = 16;\r\n\r\n\t    //Origin pbox and sbox, derived from PI\r\n\t    const ORIG_P = [\r\n\t        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,\r\n\t        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,\r\n\t        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,\r\n\t        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,\r\n\t        0x9216D5D9, 0x8979FB1B\r\n\t    ];\r\n\r\n\t    const ORIG_S = [\r\n\t        [   0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,\r\n\t            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,\r\n\t            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,\r\n\t            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,\r\n\t            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,\r\n\t            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,\r\n\t            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,\r\n\t            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,\r\n\t            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,\r\n\t            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,\r\n\t            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,\r\n\t            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,\r\n\t            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,\r\n\t            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,\r\n\t            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,\r\n\t            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,\r\n\t            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,\r\n\t            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,\r\n\t            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,\r\n\t            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,\r\n\t            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,\r\n\t            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,\r\n\t            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,\r\n\t            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,\r\n\t            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,\r\n\t            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,\r\n\t            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,\r\n\t            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,\r\n\t            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,\r\n\t            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,\r\n\t            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,\r\n\t            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,\r\n\t            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,\r\n\t            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,\r\n\t            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,\r\n\t            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,\r\n\t            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,\r\n\t            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,\r\n\t            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,\r\n\t            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,\r\n\t            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,\r\n\t            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,\r\n\t            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,\r\n\t            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,\r\n\t            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,\r\n\t            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,\r\n\t            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,\r\n\t            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,\r\n\t            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,\r\n\t            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,\r\n\t            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,\r\n\t            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,\r\n\t            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,\r\n\t            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,\r\n\t            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,\r\n\t            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,\r\n\t            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,\r\n\t            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,\r\n\t            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,\r\n\t            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,\r\n\t            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,\r\n\t            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,\r\n\t            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,\r\n\t            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A   ],\r\n\t        [   0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,\r\n\t            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,\r\n\t            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,\r\n\t            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,\r\n\t            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,\r\n\t            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,\r\n\t            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,\r\n\t            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,\r\n\t            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,\r\n\t            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,\r\n\t            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,\r\n\t            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,\r\n\t            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,\r\n\t            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,\r\n\t            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,\r\n\t            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,\r\n\t            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,\r\n\t            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,\r\n\t            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,\r\n\t            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,\r\n\t            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,\r\n\t            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,\r\n\t            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,\r\n\t            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,\r\n\t            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,\r\n\t            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,\r\n\t            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,\r\n\t            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,\r\n\t            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,\r\n\t            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,\r\n\t            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,\r\n\t            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,\r\n\t            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,\r\n\t            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,\r\n\t            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,\r\n\t            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,\r\n\t            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,\r\n\t            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,\r\n\t            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,\r\n\t            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,\r\n\t            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,\r\n\t            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,\r\n\t            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,\r\n\t            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,\r\n\t            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,\r\n\t            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,\r\n\t            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,\r\n\t            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,\r\n\t            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,\r\n\t            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,\r\n\t            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,\r\n\t            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,\r\n\t            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,\r\n\t            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,\r\n\t            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,\r\n\t            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,\r\n\t            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,\r\n\t            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,\r\n\t            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,\r\n\t            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,\r\n\t            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,\r\n\t            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,\r\n\t            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,\r\n\t            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7   ],\r\n\t        [   0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,\r\n\t            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,\r\n\t            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,\r\n\t            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,\r\n\t            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,\r\n\t            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,\r\n\t            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,\r\n\t            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,\r\n\t            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,\r\n\t            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,\r\n\t            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,\r\n\t            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,\r\n\t            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,\r\n\t            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,\r\n\t            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,\r\n\t            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,\r\n\t            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,\r\n\t            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,\r\n\t            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,\r\n\t            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,\r\n\t            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,\r\n\t            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,\r\n\t            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,\r\n\t            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,\r\n\t            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,\r\n\t            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,\r\n\t            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,\r\n\t            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,\r\n\t            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,\r\n\t            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,\r\n\t            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,\r\n\t            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,\r\n\t            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,\r\n\t            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,\r\n\t            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,\r\n\t            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,\r\n\t            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,\r\n\t            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,\r\n\t            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,\r\n\t            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,\r\n\t            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,\r\n\t            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,\r\n\t            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,\r\n\t            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,\r\n\t            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,\r\n\t            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,\r\n\t            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,\r\n\t            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,\r\n\t            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,\r\n\t            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,\r\n\t            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,\r\n\t            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,\r\n\t            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,\r\n\t            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,\r\n\t            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,\r\n\t            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,\r\n\t            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,\r\n\t            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,\r\n\t            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,\r\n\t            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,\r\n\t            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,\r\n\t            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,\r\n\t            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,\r\n\t            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0  ],\r\n\t        [   0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,\r\n\t            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,\r\n\t            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,\r\n\t            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,\r\n\t            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,\r\n\t            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,\r\n\t            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,\r\n\t            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,\r\n\t            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,\r\n\t            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,\r\n\t            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,\r\n\t            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,\r\n\t            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,\r\n\t            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,\r\n\t            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,\r\n\t            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,\r\n\t            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,\r\n\t            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,\r\n\t            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,\r\n\t            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,\r\n\t            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,\r\n\t            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,\r\n\t            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,\r\n\t            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,\r\n\t            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,\r\n\t            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,\r\n\t            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,\r\n\t            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,\r\n\t            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,\r\n\t            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,\r\n\t            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,\r\n\t            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,\r\n\t            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,\r\n\t            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,\r\n\t            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,\r\n\t            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,\r\n\t            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,\r\n\t            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,\r\n\t            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,\r\n\t            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,\r\n\t            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,\r\n\t            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,\r\n\t            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,\r\n\t            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,\r\n\t            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,\r\n\t            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,\r\n\t            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,\r\n\t            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,\r\n\t            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,\r\n\t            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,\r\n\t            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,\r\n\t            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,\r\n\t            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,\r\n\t            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,\r\n\t            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,\r\n\t            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,\r\n\t            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,\r\n\t            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,\r\n\t            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,\r\n\t            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,\r\n\t            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,\r\n\t            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,\r\n\t            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,\r\n\t            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6  ]\r\n\t    ];\r\n\r\n\t    var BLOWFISH_CTX = {\r\n\t        pbox: [],\r\n\t        sbox: []\r\n\t    }\r\n\r\n\t    function F(ctx, x){\r\n\t        let a = (x >> 24) & 0xFF;\r\n\t        let b = (x >> 16) & 0xFF;\r\n\t        let c = (x >> 8) & 0xFF;\r\n\t        let d = x & 0xFF;\r\n\r\n\t        let y = ctx.sbox[0][a] + ctx.sbox[1][b];\r\n\t        y = y ^ ctx.sbox[2][c];\r\n\t        y = y + ctx.sbox[3][d];\r\n\r\n\t        return y;\r\n\t    }\r\n\r\n\t    function BlowFish_Encrypt(ctx, left, right){\r\n\t        let Xl = left;\r\n\t        let Xr = right;\r\n\t        let temp;\r\n\r\n\t        for(let i = 0; i < N; ++i){\r\n\t            Xl = Xl ^ ctx.pbox[i];\r\n\t            Xr = F(ctx, Xl) ^ Xr;\r\n\r\n\t            temp = Xl;\r\n\t            Xl = Xr;\r\n\t            Xr = temp;\r\n\t        }\r\n\r\n\t        temp = Xl;\r\n\t        Xl = Xr;\r\n\t        Xr = temp;\r\n\r\n\t        Xr = Xr ^ ctx.pbox[N];\r\n\t        Xl = Xl ^ ctx.pbox[N + 1];\r\n\r\n\t        return {left: Xl, right: Xr};\r\n\t    }\r\n\r\n\t    function BlowFish_Decrypt(ctx, left, right){\r\n\t        let Xl = left;\r\n\t        let Xr = right;\r\n\t        let temp;\r\n\r\n\t        for(let i = N + 1; i > 1; --i){\r\n\t            Xl = Xl ^ ctx.pbox[i];\r\n\t            Xr = F(ctx, Xl) ^ Xr;\r\n\r\n\t            temp = Xl;\r\n\t            Xl = Xr;\r\n\t            Xr = temp;\r\n\t        }\r\n\r\n\t        temp = Xl;\r\n\t        Xl = Xr;\r\n\t        Xr = temp;\r\n\r\n\t        Xr = Xr ^ ctx.pbox[1];\r\n\t        Xl = Xl ^ ctx.pbox[0];\r\n\r\n\t        return {left: Xl, right: Xr};\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Initialization ctx's pbox and sbox.\r\n\t     *\r\n\t     * @param {Object} ctx The object has pbox and sbox.\r\n\t     * @param {Array} key An array of 32-bit words.\r\n\t     * @param {int} keysize The length of the key.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     BlowFishInit(BLOWFISH_CTX, key, 128/32);\r\n\t     */\r\n\t    function BlowFishInit(ctx, key, keysize)\r\n\t    {\r\n\t        for(let Row = 0; Row < 4; Row++)\r\n\t        {\r\n\t            ctx.sbox[Row] = [];\r\n\t            for(let Col = 0; Col < 256; Col++)\r\n\t            {\r\n\t                ctx.sbox[Row][Col] = ORIG_S[Row][Col];\r\n\t            }\r\n\t        }\r\n\r\n\t        let keyIndex = 0;\r\n\t        for(let index = 0; index < N + 2; index++)\r\n\t        {\r\n\t            ctx.pbox[index] = ORIG_P[index] ^ key[keyIndex];\r\n\t            keyIndex++;\r\n\t            if(keyIndex >= keysize)\r\n\t            {\r\n\t                keyIndex = 0;\r\n\t            }\r\n\t        }\r\n\r\n\t        let Data1 = 0;\r\n\t        let Data2 = 0;\r\n\t        let res = 0;\r\n\t        for(let i = 0; i < N + 2; i += 2)\r\n\t        {\r\n\t            res = BlowFish_Encrypt(ctx, Data1, Data2);\r\n\t            Data1 = res.left;\r\n\t            Data2 = res.right;\r\n\t            ctx.pbox[i] = Data1;\r\n\t            ctx.pbox[i + 1] = Data2;\r\n\t        }\r\n\r\n\t        for(let i = 0; i < 4; i++)\r\n\t        {\r\n\t            for(let j = 0; j < 256; j += 2)\r\n\t            {\r\n\t                res = BlowFish_Encrypt(ctx, Data1, Data2);\r\n\t                Data1 = res.left;\r\n\t                Data2 = res.right;\r\n\t                ctx.sbox[i][j] = Data1;\r\n\t                ctx.sbox[i][j + 1] = Data2;\r\n\t            }\r\n\t        }\r\n\r\n\t        return true;\r\n\t    }\r\n\r\n\t    /**\r\n\t     * Blowfish block cipher algorithm.\r\n\t     */\r\n\t    var Blowfish = C_algo.Blowfish = BlockCipher.extend({\r\n\t        _doReset: function () {\r\n\t            // Skip reset of nRounds has been set before and key did not change\r\n\t            if (this._keyPriorReset === this._key) {\r\n\t                return;\r\n\t            }\r\n\r\n\t            // Shortcuts\r\n\t            var key = this._keyPriorReset = this._key;\r\n\t            var keyWords = key.words;\r\n\t            var keySize = key.sigBytes / 4;\r\n\r\n\t            //Initialization pbox and sbox\r\n\t            BlowFishInit(BLOWFISH_CTX, keyWords, keySize);\r\n\t        },\r\n\r\n\t        encryptBlock: function (M, offset) {\r\n\t            var res = BlowFish_Encrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);\r\n\t            M[offset] = res.left;\r\n\t            M[offset + 1] = res.right;\r\n\t        },\r\n\r\n\t        decryptBlock: function (M, offset) {\r\n\t            var res = BlowFish_Decrypt(BLOWFISH_CTX, M[offset], M[offset + 1]);\r\n\t            M[offset] = res.left;\r\n\t            M[offset + 1] = res.right;\r\n\t        },\r\n\r\n\t        blockSize: 64/32,\r\n\r\n\t        keySize: 128/32,\r\n\r\n\t        ivSize: 64/32\r\n\t    });\r\n\r\n\t    /**\r\n\t     * Shortcut functions to the cipher's object interface.\r\n\t     *\r\n\t     * @example\r\n\t     *\r\n\t     *     var ciphertext = CryptoJS.Blowfish.encrypt(message, key, cfg);\r\n\t     *     var plaintext  = CryptoJS.Blowfish.decrypt(ciphertext, key, cfg);\r\n\t     */\r\n\t    C.Blowfish = BlockCipher._createHelper(Blowfish);\r\n\t}());\r\n\r\n\r\n\treturn CryptoJS.Blowfish;\r\n\r\n}));"]}
\ No newline at end of file
diff --git a/miniprogram_npm/dayjs/index.js b/miniprogram_npm/dayjs/index.js
index d7f36a7..eca51af 100644
--- a/miniprogram_npm/dayjs/index.js
+++ b/miniprogram_npm/dayjs/index.js
@@ -4,10 +4,10 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1734585677030, function(require, module, exports) {
+__DEFINE__(1739326742686, function(require, module, exports) {
 !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1734585677030);
+return __REQUIRE__(1739326742686);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 1208742..954b961 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -1,6 +1,7 @@
 // pages/order/pay/index.js
 import commonApi from "../../../utils/https/common"
 import util from "../../../utils/util"
+import pwEncode from "../../../utils/passwordEncode"
 let timer;
 Page({
 
@@ -28,10 +29,10 @@ Page({
 
     MTTip: 0,
 
-    SBMask: true, // 数币支付密码弹窗
+    SBMask: false, // 数币支付密码弹窗
     isFoucs: true,
     vcode: '',
-    haveSBPassword: false,
+    haveSBPassword: false, // 是否设置密码
     inputData: {
         phone: '',
         code: '',
@@ -270,14 +271,16 @@ Page({
     })
   },
   // 电子钱包支付
-  walletPay:function(){
+  walletPay:function(password){
     let item = this.data.payList[this.data.numIndex];
     commonApi.user_post("order/pay",{
       order_id:this.data.id,
       pay_method:"SUBWALLET",
       pay_platform:"MINI",
       app_name:"WxXcxConfig",
-      ins_no:item.ins_no
+      ins_no:item.ins_no,
+      password: password,
+      type: 1,
     }).then(res=>{
       let data = res.data?JSON.parse(res.data):{};
       if(data && data.RESULT && data.RESULT=='Y'){
@@ -337,8 +340,34 @@ Page({
   },
 
   // 数币密码确认
+  showPassword () {
+      // 请求是否设置密码
+      commonApi.user_post("pay_password/checkUsedPassword",{}).then(res=>{
+          // 设置过密码
+        if (res.data) {
+            this.setData({
+                SBMask: true,
+                haveSBPassword: true,
+                vcode: '',
+                isFoucs: true
+            })
+        } else {
+            let userinfo = wx.getStorageSync('jstrip_userInfo')
+            let inputData =  {phone: '',code: '',password: '',confirmPassword: ''}
+            if (userinfo && userinfo.mobile) {
+                inputData.phone = userinfo.mobile
+            }
+            this.setData({
+                SBMask: true,
+                inputData: inputData,
+            })
+        }
+      })
+  },
   hideSBMask(){
-    this.setData({SBMask:false})
+    this.setData({
+        SBMask:false,
+    })
   },
   passwordChange: function (e) {
     let val =  e.detail.value
@@ -346,8 +375,23 @@ Page({
         vcode: val
     })
     if (val.length==6) {
+        let password = pwEncode.handleEncrypt(val)
         // 验证密码
-        
+        commonApi.user_post("pay_password/verifyPassword",{password:password})
+        .then(res=>{
+            // 密码校验成功
+            if (res.code == 1) {
+                this.setData({
+                    vcode: '',
+                    SBMask: false,
+                })
+                this.walletPay(password)
+            } else {
+                this.setData({
+                    vcode: '',
+                })
+            }
+        })
     }
   },
   handleFoucs() {
@@ -371,11 +415,107 @@ Page({
 },
   // 获取验证码
   getCode:function(){
-    
+      // 如果已经在发送则不能继续发送验证码
+      if (!this.data.sendFlag){
+        return false;
+      }
+      if(!this.data.inputData.phone){
+        wx.showToast({
+          title: '请输入手机号',
+          icon:"none"
+        })
+        return false;
+      }
+      if(!util.isTel(this.data.inputData.phone)){
+        wx.showToast({
+          title: '请输入正确的手机号码',
+          icon: "none"
+        })
+        return false;
+      }
+  
+       // 获取验证码则需要改变按钮的文字
+       this.setData({
+        buttonText:"发送中...",
+        sendFlag:false
+      })
+  
+      commonApi.user_post("uservice/user/getMobileCodeForResetPayPass",{mobile:this.data.inputData.phone}).then(res=>{
+          if(res.code==1){
+              // 发送成功 即接口调用成功
+              this.setData({
+                buttonText: "发送成功",
+                sendFlag: false,
+                codeId: res.data.smsCodeId
+              })
+              // 获取成功之后需要马上改变成倒计时
+              let time = 59;
+              var timer = setInterval(() => {
+                // 倒计时结束需要重置可发送验证码状态和按钮文字
+                if (time < 0) {
+                  // 清除定时器
+                  clearInterval(timer)
+                  this.setData({
+                    buttonText: "重新发送",
+                    sendFlag: true
+                  })
+                  return false;
+                }
+                this.setData({
+                  buttonText: time + "秒后重新发送"
+                })
+                time--;
+              }, 1000)
+            }
+            else {
+              this.setData({
+                buttonText: "重新发送",
+                sendFlag: true
+              })
+            }
+      }).catch(e=>{
+          this.setData({
+              buttonText: "重新发送",
+              sendFlag: true
+          })
+      })
   },
   // 绑定
   submit:function(){
+    if (!this.data.canSubmit) {
+        return
+    }
+    if(!this.data.inputData.code){
+      wx.showToast({
+        title: '请输入验证码',
+        icon: "none"
+      })
+      return false;
+    }
 
+    let data={
+        code:this.data.inputData.code,
+        mobile:this.data.inputData.phone,
+        smsCodeId:this.data.codeId,
+        password: pwEncode.handleEncrypt(this.data.inputData.password),
+        confirm_password:pwEncode.handleEncrypt(this.data.inputData.confirmPassword)
+    }
+
+    let service = "pay_password/set"
+    commonApi.user_post(service,data).then(res=>{
+      if(res.code==1){
+          wx.showToast({
+            title: '密码设置成功',
+            icon: 'none'
+          })
+          this.setData({
+            haveSBPassword: true,
+            isFoucs: true,
+            vcode: '',
+          })
+       
+      }
+    })
   },
 
   /**
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 137872d..e78639a 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -61,7 +61,9 @@
       </view>
       <view class="iconfont {{numIndex==index?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
     </view>
-    <view class="btn" bindtap="walletPay" style="margin:25rpx">立即付款</view>
+    <!-- <view class="btn" bindtap="walletPay" style="margin:25rpx">立即付款</view> -->
+    <view class="btn" bindtap="showPassword" style="margin:25rpx">立即付款</view>
+
   </view>
 </view>
 
@@ -118,8 +120,8 @@
 
 
 <view class="mask" style="align-items:flex-end" wx:if="{{SBMask}}">
-  <view class="mask-bg" bindtap="hideSBMask"></view>
-  <view class="mask-content" style="text-align:center;width:100%;border-radius:0;min-height: 448rpx;padding: 46rpx 26rpx;">
+  <view class="mask-bg"></view>
+  <view class="mask-content" style="text-align:center;width:100%;border-radius:0;min-height: 500rpx;padding: 46rpx 26rpx;">
     <view class="password-title">
       <view>{{haveSBPassword?'输入':'设置'}}支付密码</view>
       <view class="iconfont icon-close" style="position: absolute;right: 0;top: 4rpx;" bindtap="hideSBMask"></view>
@@ -130,7 +132,8 @@
             <input type="number" password="true" class="show-code" wx:for="{{6}}" disabled 
             wx:key="index" value="{{vcode[index]}}" catch:tap="handleFoucs"/>
         </view>
-        <input type="number" password="true" maxlength="6" focus="{{isFoucs}}" bindinput="passwordChange"  class="passward-box" />
+        <input type="number" value="{{vcode}}" password="true" maxlength="6" focus="{{isFoucs}}" 
+        bindinput="passwordChange"  class="passward-box" />
         <view class="resetPassword">
             <navigator url="/subPackages/password/setting/setting?type=reset">忘记密码</navigator>
         </view>
@@ -140,7 +143,7 @@
         <view class="bind-box">
             <view class="bind-item" >
             <view class="bind-item-left">手机号</view>
-            <input type="number" bindinput="inputChange" data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
+            <input type="number" bindinput="inputChange" value="{{inputData.phone}}"  data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
             </view>
             <view class="bind-item" >
             <view class="bind-item-left">验证码</view>
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index eb667c1..d4206b5 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -130,12 +130,13 @@ page {
     color: rgba(0,0,0,0);
 }
 .resetPassword{
-    width: 106rpx;
+    width: 160rpx;
     font-family: PingFang SC;
     font-weight: 500;
     font-size: 27rpx;
     color: #0C898F;
     margin: 0 0 0 auto;
+    text-align: right;
 }
 
 
@@ -178,7 +179,7 @@ page {
   }
 
     .vaild-number{
-        width: 197rpx !important;
+        width: 207rpx !important;
         height: 53rpx !important;
         font-size: 27rpx !important;
         color: #0C898F !important;
diff --git a/subPackages/password/overview/overview.js b/subPackages/password/overview/overview.js
index af40f95..c98e147 100644
--- a/subPackages/password/overview/overview.js
+++ b/subPackages/password/overview/overview.js
@@ -1,12 +1,8 @@
 // pages/user/profile/index.js
 let app = getApp();
 import util from "../../../utils/util"
-import WeCropper from '../../../we-cropper/we-cropper.min.js';
-import userApi from "../../../utils/https/user"
-let device = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect(); // 获取设备信息
-const width = device.windowWidth // 示例为一个与屏幕等宽的正方形裁剪框
-let menuHeight = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
-let height = device.windowHeight - menuHeight;
+import commonApi from "../../../utils/https/common"
+
 Page({
 
   /**
@@ -14,7 +10,7 @@ Page({
    */
   data: {
   
-    info:null,
+    havePassword:false,
    
   },
 
@@ -27,6 +23,16 @@ Page({
 
   goSetting (e) {
       let type = e.currentTarget.dataset.type;
+      if (type == 'add' && this.data.havePassword) {
+        return
+      }
+      if (type !='add' && !this.data.havePassword){
+          wx.showToast({
+            title: '请先设置密码',
+            icon: "none",
+          })
+          return
+      }
       wx.navigateTo({
         url: '/subPackages/password/setting/setting?type='+type,
       })
@@ -44,11 +50,11 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    // userApi.user_post("user/getMyInfo",{}).then(res=>{
-    //   this.setData({
-    //     info:res.data,
-    //   })
-    // })
+    commonApi.user_post("pay_password/checkUsedPassword",{}).then(res=>{
+      this.setData({
+        havePassword:res.data,
+      })
+    })
   },
 
   /**
diff --git a/subPackages/password/overview/overview.wxml b/subPackages/password/overview/overview.wxml
index 3e924cb..d8026cb 100644
--- a/subPackages/password/overview/overview.wxml
+++ b/subPackages/password/overview/overview.wxml
@@ -4,8 +4,8 @@
 
 <view bindtap="goSetting" data-type="add" class="profile-item" >
   <text>设置支付密码</text>
-  <view class="info" wx:if="{{info&&info.password}}">已设置</view>
-  <view class="iconfont icon-you"></view>
+  <view class="info" wx:if="{{havePassword}}">已设置</view>
+  <view class="iconfont icon-you" wx:else></view>
 </view>
 <view bindtap="goSetting" data-type="edit" class="profile-item" >
   <text>修改密码</text>
diff --git a/subPackages/password/setting/setting.js b/subPackages/password/setting/setting.js
index 4371f6b..bb6eef5 100644
--- a/subPackages/password/setting/setting.js
+++ b/subPackages/password/setting/setting.js
@@ -1,7 +1,8 @@
 
 import util from "../../../utils/util.js"
-import user from "../../../utils/https/user.js"
-import https from "../../../utils/https.js"
+import commonApi from "../../../utils/https/common"
+import pwEncode from "../../../utils/passwordEncode"
+
 var app = getApp();
 Page({
 
@@ -43,23 +44,48 @@ Page({
         title: options.type=='reset'?'忘记密码':options.type=='edit'?'修改密码':'设置支付密码',
         editConfrim: options.type == 'edit'?true:false
     })
+
+    let userinfo = wx.getStorageSync('jstrip_userInfo')
+    if (userinfo && userinfo.mobile) {
+        this.data.inputData.phone = userinfo.mobile
+        this.setData({
+            inputData: this.data.inputData
+        })
+    }
   },
 
-  // 编辑输入原密码
+  // 编辑时输入原密码
   passwordChange: function (e) {
+      let _this = this
     let val =  e.detail.value
+    console.log("passwordChange")
     this.setData({
         vcode: val
     })
     if (val.length==6) {
         // 验证密码
-        this.setData({editConfrim: false})
+        let password = pwEncode.handleEncrypt(val)
+        // 验证密码
+        commonApi.user_post("pay_password/verifyPassword",{password:password})
+        .then(res=>{
+            // 密码校验成功
+            if (res.code == 1) {
+                _this.setData({editConfrim: false})
+            } else {
+                _this.setData({
+                    vcode: '',
+                    isFoucs: true
+                })
+            }
+        })
+        // this.setData({editConfrim: false})
     }
   },
   handleFoucs() {
     this.setData({
       isFoucs: true
     })
+    console.log("focus")
   },
 
   // 输入框
@@ -108,55 +134,55 @@ Page({
       buttonText:"发送中...",
       sendFlag:false
     })
-    let service = "user/getMobileCodeForChange",data={
-      mobile:this.data.inputData.phone,
-    },api = user.user_post;
-    if(this.data.regToken){
-      service="user/getMobileCodeForBind";
-      data.openid = this.data.regToken
-      api = user._post
-    }
-    api(service, data).then(res=>{
-      console.log('sendmsg',res)
-      if(res.code==1){
-        // 发送成功 即接口调用成功
-        this.setData({
-          buttonText: "发送成功",
-          sendFlag: false,
-          codeId: res.data.id
-        })
-        // 获取成功之后需要马上改变成倒计时
-        let time = 59;
-        var timer = setInterval(() => {
-          // 倒计时结束需要重置可发送验证码状态和按钮文字
-          if (time < 0) {
-            // 清除定时器
-            clearInterval(timer)
+
+    commonApi.user_post("uservice/user/getMobileCodeForResetPayPass",{mobile:this.data.inputData.phone}).then(res=>{
+        if(res.code==1){
+            // 发送成功 即接口调用成功
+            this.setData({
+              buttonText: "发送成功",
+              sendFlag: false,
+              codeId: res.data.smsCodeId
+            })
+            // 获取成功之后需要马上改变成倒计时
+            let time = 59;
+            var timer = setInterval(() => {
+              // 倒计时结束需要重置可发送验证码状态和按钮文字
+              if (time < 0) {
+                // 清除定时器
+                clearInterval(timer)
+                this.setData({
+                  buttonText: "重新发送",
+                  sendFlag: true
+                })
+                return false;
+              }
+              this.setData({
+                buttonText: time + "秒后重新发送"
+              })
+              time--;
+            }, 1000)
+          }
+          else {
             this.setData({
               buttonText: "重新发送",
               sendFlag: true
             })
-            return false;
           }
-          this.setData({
-            buttonText: time + "秒后重新发送"
-          })
-          time--;
-        }, 1000)
-      }
-      else {
+    }).catch(e=>{
         this.setData({
-          buttonText: "重新发送",
-          sendFlag: true
+            buttonText: "重新发送",
+            sendFlag: true
         })
-      }
-      
     })
     
   },
   // 绑定
   submit:function(){
-    if(!this.data.inputData.code){
+    if (!this.data.canSubmit) {
+        return
+    }
+
+    if(this.data.type!='edit'&&!this.data.inputData.code){
       wx.showToast({
         title: '请输入验证码',
         icon: "none"
@@ -164,21 +190,27 @@ Page({
       return false;
     }
 
-    let service = "user/changeMobile"
-    let data={smsCode:this.data.inputData.code,mobile:this.data.inputData.phone,smsCodeId:this.data.codeId}
-    let api = user.user_post;
-    if(this.data.regToken){
-      service = "user/wxBindPhoneAndLogin"
-      data.openid = this.data.regToken
-      data.fromSource = "WECHATXCX"
-      if(app.globalData.category_id){
-        data.category_id = app.globalData.category_id;
-      }
-      api = user._post
+    let data={
+        code:this.data.inputData.code,
+        mobile:this.data.inputData.phone,
+        smsCodeId:this.data.codeId,
+        password: pwEncode.handleEncrypt(this.data.inputData.password),
+        confirm_password:pwEncode.handleEncrypt(this.data.inputData.confirmPassword)
     }
-    api(service,data).then(res=>{
+
+    let service = "pay_password/set"
+    if (this.data.type == 'reset') service = 'pay_password/reset'
+    if (this.data.type == 'edit') {
+        service = "pay_password/modify"
+        data.old_password = pwEncode.handleEncrypt(this.data.vcode)
+    }
+    console.log(data)
+    commonApi.user_post(service,data).then(res=>{
       if(res.code==1){
-        
+          wx.showToast({
+            title: '密码设置成功',
+            icon: 'none'
+          })
         setTimeout(()=>{
           wx.navigateBack({
             delta:1
diff --git a/subPackages/password/setting/setting.wxml b/subPackages/password/setting/setting.wxml
index c7cca14..f31c4dd 100644
--- a/subPackages/password/setting/setting.wxml
+++ b/subPackages/password/setting/setting.wxml
@@ -9,7 +9,7 @@
         wx:key="index" value="{{vcode[index]}}" catch:tap="handleFoucs"/>
     </view>
 
-    <input type="number" password="true" maxlength="6" focus="{{isFoucs}}" bindinput="passwordChange"  class="passward-box" />
+    <input value="{{vcode}}" type="number" password="true" maxlength="6" focus="{{isFoucs}}" bindinput="passwordChange"  class="passward-box" />
 
   </view>
 
@@ -17,7 +17,7 @@
     <view class="bind-box">
         <view class="bind-item" wx:if="{{type!='edit'}}">
         <view class="bind-item-left">手机号</view>
-        <input type="number" bindinput="inputChange" data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
+        <input type="number" bindinput="inputChange" value="{{inputData.phone}}" data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
         </view>
         <view class="bind-item" wx:if="{{type!='edit'}}">
         <view class="bind-item-left">验证码</view>
diff --git a/subPackages/password/setting/setting.wxss b/subPackages/password/setting/setting.wxss
index 0d011b6..0dace0a 100644
--- a/subPackages/password/setting/setting.wxss
+++ b/subPackages/password/setting/setting.wxss
@@ -40,7 +40,7 @@
   }
 
     .vaild-number{
-        width: 197rpx !important;
+        width: 207rpx !important;
         height: 53rpx !important;
         font-size: 27rpx !important;
         color: #0C898F !important;
diff --git a/utils/jsencrypt.min.js b/utils/jsencrypt.min.js
new file mode 100644
index 0000000..b36656c
--- /dev/null
+++ b/utils/jsencrypt.min.js
@@ -0,0 +1,2 @@
+/*! For license information please see jsencrypt.min.js.LICENSE.txt */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.JSEncrypt=e():t.JSEncrypt=e()}(window,(()=>(()=>{var t={155:t=>{var e,i,r=t.exports={};function n(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function o(t){if(e===setTimeout)return setTimeout(t,0);if((e===n||!e)&&setTimeout)return e=setTimeout,setTimeout(t,0);try{return e(t,0)}catch(i){try{return e.call(null,t,0)}catch(i){return e.call(this,t,0)}}}!function(){try{e="function"==typeof setTimeout?setTimeout:n}catch(t){e=n}try{i="function"==typeof clearTimeout?clearTimeout:s}catch(t){i=s}}();var h,a=[],u=!1,c=-1;function f(){u&&h&&(u=!1,h.length?a=h.concat(a):c=-1,a.length&&l())}function l(){if(!u){var t=o(f);u=!0;for(var e=a.length;e;){for(h=a,a=[];++c<e;)h&&h[c].run();c=-1,e=a.length}h=null,u=!1,function(t){if(i===clearTimeout)return clearTimeout(t);if((i===s||!i)&&clearTimeout)return i=clearTimeout,clearTimeout(t);try{return i(t)}catch(e){try{return i.call(null,t)}catch(e){return i.call(this,t)}}}(t)}}function p(t,e){this.fun=t,this.array=e}function g(){}r.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var i=1;i<arguments.length;i++)e[i-1]=arguments[i];a.push(new p(t,e)),1!==a.length||u||o(l)},p.prototype.run=function(){this.fun.apply(null,this.array)},r.title="browser",r.browser=!0,r.env={},r.argv=[],r.version="",r.versions={},r.on=g,r.addListener=g,r.once=g,r.off=g,r.removeListener=g,r.removeAllListeners=g,r.emit=g,r.prependListener=g,r.prependOnceListener=g,r.listeners=function(t){return[]},r.binding=function(t){throw new Error("process.binding is not supported")},r.cwd=function(){return"/"},r.chdir=function(t){throw new Error("process.chdir is not supported")},r.umask=function(){return 0}}},e={};function i(r){var n=e[r];if(void 0!==n)return n.exports;var s=e[r]={exports:{}};return t[r](s,s.exports,i),s.exports}i.d=(t,e)=>{for(var r in e)i.o(e,r)&&!i.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:e[r]})},i.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e);var r={};return(()=>{"use strict";i.d(r,{default:()=>ct});var t="0123456789abcdefghijklmnopqrstuvwxyz";function e(e){return t.charAt(e)}function n(t,e){return t&e}function s(t,e){return t|e}function o(t,e){return t^e}function h(t,e){return t&~e}function a(t){if(0==t)return-1;var e=0;return 0==(65535&t)&&(t>>=16,e+=16),0==(255&t)&&(t>>=8,e+=8),0==(15&t)&&(t>>=4,e+=4),0==(3&t)&&(t>>=2,e+=2),0==(1&t)&&++e,e}function u(t){for(var e=0;0!=t;)t&=t-1,++e;return e}var c,f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",l="=";function p(t){var e,i,r="";for(e=0;e+3<=t.length;e+=3)i=parseInt(t.substring(e,e+3),16),r+=f.charAt(i>>6)+f.charAt(63&i);for(e+1==t.length?(i=parseInt(t.substring(e,e+1),16),r+=f.charAt(i<<2)):e+2==t.length&&(i=parseInt(t.substring(e,e+2),16),r+=f.charAt(i>>2)+f.charAt((3&i)<<4));(3&r.length)>0;)r+=l;return r}function g(t){var i,r="",n=0,s=0;for(i=0;i<t.length&&t.charAt(i)!=l;++i){var o=f.indexOf(t.charAt(i));o<0||(0==n?(r+=e(o>>2),s=3&o,n=1):1==n?(r+=e(s<<2|o>>4),s=15&o,n=2):2==n?(r+=e(s),r+=e(o>>2),s=3&o,n=3):(r+=e(s<<2|o>>4),r+=e(15&o),n=0))}return 1==n&&(r+=e(s<<2)),r}var d,v={decode:function(t){var e;if(void 0===d){var i="= \f\n\r\t \u2028\u2029";for(d=Object.create(null),e=0;e<64;++e)d["ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(e)]=e;for(d["-"]=62,d._=63,e=0;e<i.length;++e)d[i.charAt(e)]=-1}var r=[],n=0,s=0;for(e=0;e<t.length;++e){var o=t.charAt(e);if("="==o)break;if(-1!=(o=d[o])){if(void 0===o)throw new Error("Illegal character at offset "+e);n|=o,++s>=4?(r[r.length]=n>>16,r[r.length]=n>>8&255,r[r.length]=255&n,n=0,s=0):n<<=6}}switch(s){case 1:throw new Error("Base64 encoding incomplete: at least 2 bits missing");case 2:r[r.length]=n>>10;break;case 3:r[r.length]=n>>16,r[r.length]=n>>8&255}return r},re:/-----BEGIN [^-]+-----([A-Za-z0-9+\/=\s]+)-----END [^-]+-----|begin-base64[^\n]+\n([A-Za-z0-9+\/=\s]+)====/,unarmor:function(t){var e=v.re.exec(t);if(e)if(e[1])t=e[1];else{if(!e[2])throw new Error("RegExp out of sync");t=e[2]}return v.decode(t)}},m=1e13,y=function(){function t(t){this.buf=[+t||0]}return t.prototype.mulAdd=function(t,e){var i,r,n=this.buf,s=n.length;for(i=0;i<s;++i)(r=n[i]*t+e)<m?e=0:r-=(e=0|r/m)*m,n[i]=r;e>0&&(n[i]=e)},t.prototype.sub=function(t){var e,i,r=this.buf,n=r.length;for(e=0;e<n;++e)(i=r[e]-t)<0?(i+=m,t=1):t=0,r[e]=i;for(;0===r[r.length-1];)r.pop()},t.prototype.toString=function(t){if(10!=(t||10))throw new Error("only base 10 is supported");for(var e=this.buf,i=e[e.length-1].toString(),r=e.length-2;r>=0;--r)i+=(m+e[r]).toString().substring(1);return i},t.prototype.valueOf=function(){for(var t=this.buf,e=0,i=t.length-1;i>=0;--i)e=e*m+t[i];return e},t.prototype.simplify=function(){var t=this.buf;return 1==t.length?t[0]:this},t}(),b="…",T=/^(\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/,S=/^(\d\d\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;function E(t,e){return t.length>e&&(t=t.substring(0,e)+b),t}var w,D=function(){function t(e,i){this.hexDigits="0123456789ABCDEF",e instanceof t?(this.enc=e.enc,this.pos=e.pos):(this.enc=e,this.pos=i)}return t.prototype.get=function(t){if(void 0===t&&(t=this.pos++),t>=this.enc.length)throw new Error("Requesting byte offset ".concat(t," on a stream of length ").concat(this.enc.length));return"string"==typeof this.enc?this.enc.charCodeAt(t):this.enc[t]},t.prototype.hexByte=function(t){return this.hexDigits.charAt(t>>4&15)+this.hexDigits.charAt(15&t)},t.prototype.hexDump=function(t,e,i){for(var r="",n=t;n<e;++n)if(r+=this.hexByte(this.get(n)),!0!==i)switch(15&n){case 7:r+="  ";break;case 15:r+="\n";break;default:r+=" "}return r},t.prototype.isASCII=function(t,e){for(var i=t;i<e;++i){var r=this.get(i);if(r<32||r>176)return!1}return!0},t.prototype.parseStringISO=function(t,e){for(var i="",r=t;r<e;++r)i+=String.fromCharCode(this.get(r));return i},t.prototype.parseStringUTF=function(t,e){for(var i="",r=t;r<e;){var n=this.get(r++);i+=n<128?String.fromCharCode(n):n>191&&n<224?String.fromCharCode((31&n)<<6|63&this.get(r++)):String.fromCharCode((15&n)<<12|(63&this.get(r++))<<6|63&this.get(r++))}return i},t.prototype.parseStringBMP=function(t,e){for(var i,r,n="",s=t;s<e;)i=this.get(s++),r=this.get(s++),n+=String.fromCharCode(i<<8|r);return n},t.prototype.parseTime=function(t,e,i){var r=this.parseStringISO(t,e),n=(i?T:S).exec(r);return n?(i&&(n[1]=+n[1],n[1]+=+n[1]<70?2e3:1900),r=n[1]+"-"+n[2]+"-"+n[3]+" "+n[4],n[5]&&(r+=":"+n[5],n[6]&&(r+=":"+n[6],n[7]&&(r+="."+n[7]))),n[8]&&(r+=" UTC","Z"!=n[8]&&(r+=n[8],n[9]&&(r+=":"+n[9]))),r):"Unrecognized time: "+r},t.prototype.parseInteger=function(t,e){for(var i,r=this.get(t),n=r>127,s=n?255:0,o="";r==s&&++t<e;)r=this.get(t);if(0==(i=e-t))return n?-1:0;if(i>4){for(o=r,i<<=3;0==(128&(+o^s));)o=+o<<1,--i;o="("+i+" bit)\n"}n&&(r-=256);for(var h=new y(r),a=t+1;a<e;++a)h.mulAdd(256,this.get(a));return o+h.toString()},t.prototype.parseBitString=function(t,e,i){for(var r=this.get(t),n="("+((e-t-1<<3)-r)+" bit)\n",s="",o=t+1;o<e;++o){for(var h=this.get(o),a=o==e-1?r:0,u=7;u>=a;--u)s+=h>>u&1?"1":"0";if(s.length>i)return n+E(s,i)}return n+s},t.prototype.parseOctetString=function(t,e,i){if(this.isASCII(t,e))return E(this.parseStringISO(t,e),i);var r=e-t,n="("+r+" byte)\n";r>(i/=2)&&(e=t+i);for(var s=t;s<e;++s)n+=this.hexByte(this.get(s));return r>i&&(n+=b),n},t.prototype.parseOID=function(t,e,i){for(var r="",n=new y,s=0,o=t;o<e;++o){var h=this.get(o);if(n.mulAdd(128,127&h),s+=7,!(128&h)){if(""===r)if((n=n.simplify())instanceof y)n.sub(80),r="2."+n.toString();else{var a=n<80?n<40?0:1:2;r=a+"."+(n-40*a)}else r+="."+n.toString();if(r.length>i)return E(r,i);n=new y,s=0}}return s>0&&(r+=".incomplete"),r},t}(),x=function(){function t(t,e,i,r,n){if(!(r instanceof R))throw new Error("Invalid tag value.");this.stream=t,this.header=e,this.length=i,this.tag=r,this.sub=n}return t.prototype.typeName=function(){switch(this.tag.tagClass){case 0:switch(this.tag.tagNumber){case 0:return"EOC";case 1:return"BOOLEAN";case 2:return"INTEGER";case 3:return"BIT_STRING";case 4:return"OCTET_STRING";case 5:return"NULL";case 6:return"OBJECT_IDENTIFIER";case 7:return"ObjectDescriptor";case 8:return"EXTERNAL";case 9:return"REAL";case 10:return"ENUMERATED";case 11:return"EMBEDDED_PDV";case 12:return"UTF8String";case 16:return"SEQUENCE";case 17:return"SET";case 18:return"NumericString";case 19:return"PrintableString";case 20:return"TeletexString";case 21:return"VideotexString";case 22:return"IA5String";case 23:return"UTCTime";case 24:return"GeneralizedTime";case 25:return"GraphicString";case 26:return"VisibleString";case 27:return"GeneralString";case 28:return"UniversalString";case 30:return"BMPString"}return"Universal_"+this.tag.tagNumber.toString();case 1:return"Application_"+this.tag.tagNumber.toString();case 2:return"["+this.tag.tagNumber.toString()+"]";case 3:return"Private_"+this.tag.tagNumber.toString()}},t.prototype.content=function(t){if(void 0===this.tag)return null;void 0===t&&(t=1/0);var e=this.posContent(),i=Math.abs(this.length);if(!this.tag.isUniversal())return null!==this.sub?"("+this.sub.length+" elem)":this.stream.parseOctetString(e,e+i,t);switch(this.tag.tagNumber){case 1:return 0===this.stream.get(e)?"false":"true";case 2:return this.stream.parseInteger(e,e+i);case 3:return this.sub?"("+this.sub.length+" elem)":this.stream.parseBitString(e,e+i,t);case 4:return this.sub?"("+this.sub.length+" elem)":this.stream.parseOctetString(e,e+i,t);case 6:return this.stream.parseOID(e,e+i,t);case 16:case 17:return null!==this.sub?"("+this.sub.length+" elem)":"(no elem)";case 12:return E(this.stream.parseStringUTF(e,e+i),t);case 18:case 19:case 20:case 21:case 22:case 26:return E(this.stream.parseStringISO(e,e+i),t);case 30:return E(this.stream.parseStringBMP(e,e+i),t);case 23:case 24:return this.stream.parseTime(e,e+i,23==this.tag.tagNumber)}return null},t.prototype.toString=function(){return this.typeName()+"@"+this.stream.pos+"[header:"+this.header+",length:"+this.length+",sub:"+(null===this.sub?"null":this.sub.length)+"]"},t.prototype.toPrettyString=function(t){void 0===t&&(t="");var e=t+this.typeName()+" @"+this.stream.pos;if(this.length>=0&&(e+="+"),e+=this.length,this.tag.tagConstructed?e+=" (constructed)":!this.tag.isUniversal()||3!=this.tag.tagNumber&&4!=this.tag.tagNumber||null===this.sub||(e+=" (encapsulates)"),e+="\n",null!==this.sub){t+="  ";for(var i=0,r=this.sub.length;i<r;++i)e+=this.sub[i].toPrettyString(t)}return e},t.prototype.posStart=function(){return this.stream.pos},t.prototype.posContent=function(){return this.stream.pos+this.header},t.prototype.posEnd=function(){return this.stream.pos+this.header+Math.abs(this.length)},t.prototype.toHexString=function(){return this.stream.hexDump(this.posStart(),this.posEnd(),!0)},t.decodeLength=function(t){var e=t.get(),i=127&e;if(i==e)return i;if(i>6)throw new Error("Length over 48 bits not supported at position "+(t.pos-1));if(0===i)return null;e=0;for(var r=0;r<i;++r)e=256*e+t.get();return e},t.prototype.getHexStringValue=function(){var t=this.toHexString(),e=2*this.header,i=2*this.length;return t.substr(e,i)},t.decode=function(e){var i;i=e instanceof D?e:new D(e,0);var r=new D(i),n=new R(i),s=t.decodeLength(i),o=i.pos,h=o-r.pos,a=null,u=function(){var e=[];if(null!==s){for(var r=o+s;i.pos<r;)e[e.length]=t.decode(i);if(i.pos!=r)throw new Error("Content size is not correct for container starting at offset "+o)}else try{for(;;){var n=t.decode(i);if(n.tag.isEOC())break;e[e.length]=n}s=o-i.pos}catch(t){throw new Error("Exception while decoding undefined length content: "+t)}return e};if(n.tagConstructed)a=u();else if(n.isUniversal()&&(3==n.tagNumber||4==n.tagNumber))try{if(3==n.tagNumber&&0!=i.get())throw new Error("BIT STRINGs with unused bits cannot encapsulate.");a=u();for(var c=0;c<a.length;++c)if(a[c].tag.isEOC())throw new Error("EOC is not supposed to be actual content.")}catch(t){a=null}if(null===a){if(null===s)throw new Error("We can't skip over an invalid tag with undefined length at offset "+o);i.pos=o+Math.abs(s)}return new t(r,h,s,n,a)},t}(),R=function(){function t(t){var e=t.get();if(this.tagClass=e>>6,this.tagConstructed=0!=(32&e),this.tagNumber=31&e,31==this.tagNumber){var i=new y;do{e=t.get(),i.mulAdd(128,127&e)}while(128&e);this.tagNumber=i.simplify()}}return t.prototype.isUniversal=function(){return 0===this.tagClass},t.prototype.isEOC=function(){return 0===this.tagClass&&0===this.tagNumber},t}(),B=[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997],O=(1<<26)/B[B.length-1],A=function(){function t(t,e,i){null!=t&&("number"==typeof t?this.fromNumber(t,e,i):null==e&&"string"!=typeof t?this.fromString(t,256):this.fromString(t,e))}return t.prototype.toString=function(t){if(this.s<0)return"-"+this.negate().toString(t);var i;if(16==t)i=4;else if(8==t)i=3;else if(2==t)i=1;else if(32==t)i=5;else{if(4!=t)return this.toRadix(t);i=2}var r,n=(1<<i)-1,s=!1,o="",h=this.t,a=this.DB-h*this.DB%i;if(h-- >0)for(a<this.DB&&(r=this[h]>>a)>0&&(s=!0,o=e(r));h>=0;)a<i?(r=(this[h]&(1<<a)-1)<<i-a,r|=this[--h]>>(a+=this.DB-i)):(r=this[h]>>(a-=i)&n,a<=0&&(a+=this.DB,--h)),r>0&&(s=!0),s&&(o+=e(r));return s?o:"0"},t.prototype.negate=function(){var e=M();return t.ZERO.subTo(this,e),e},t.prototype.abs=function(){return this.s<0?this.negate():this},t.prototype.compareTo=function(t){var e=this.s-t.s;if(0!=e)return e;var i=this.t;if(0!=(e=i-t.t))return this.s<0?-e:e;for(;--i>=0;)if(0!=(e=this[i]-t[i]))return e;return 0},t.prototype.bitLength=function(){return this.t<=0?0:this.DB*(this.t-1)+K(this[this.t-1]^this.s&this.DM)},t.prototype.mod=function(e){var i=M();return this.abs().divRemTo(e,null,i),this.s<0&&i.compareTo(t.ZERO)>0&&e.subTo(i,i),i},t.prototype.modPowInt=function(t,e){var i;return i=t<256||e.isEven()?new I(e):new N(e),this.exp(t,i)},t.prototype.clone=function(){var t=M();return this.copyTo(t),t},t.prototype.intValue=function(){if(this.s<0){if(1==this.t)return this[0]-this.DV;if(0==this.t)return-1}else{if(1==this.t)return this[0];if(0==this.t)return 0}return(this[1]&(1<<32-this.DB)-1)<<this.DB|this[0]},t.prototype.byteValue=function(){return 0==this.t?this.s:this[0]<<24>>24},t.prototype.shortValue=function(){return 0==this.t?this.s:this[0]<<16>>16},t.prototype.signum=function(){return this.s<0?-1:this.t<=0||1==this.t&&this[0]<=0?0:1},t.prototype.toByteArray=function(){var t=this.t,e=[];e[0]=this.s;var i,r=this.DB-t*this.DB%8,n=0;if(t-- >0)for(r<this.DB&&(i=this[t]>>r)!=(this.s&this.DM)>>r&&(e[n++]=i|this.s<<this.DB-r);t>=0;)r<8?(i=(this[t]&(1<<r)-1)<<8-r,i|=this[--t]>>(r+=this.DB-8)):(i=this[t]>>(r-=8)&255,r<=0&&(r+=this.DB,--t)),0!=(128&i)&&(i|=-256),0==n&&(128&this.s)!=(128&i)&&++n,(n>0||i!=this.s)&&(e[n++]=i);return e},t.prototype.equals=function(t){return 0==this.compareTo(t)},t.prototype.min=function(t){return this.compareTo(t)<0?this:t},t.prototype.max=function(t){return this.compareTo(t)>0?this:t},t.prototype.and=function(t){var e=M();return this.bitwiseTo(t,n,e),e},t.prototype.or=function(t){var e=M();return this.bitwiseTo(t,s,e),e},t.prototype.xor=function(t){var e=M();return this.bitwiseTo(t,o,e),e},t.prototype.andNot=function(t){var e=M();return this.bitwiseTo(t,h,e),e},t.prototype.not=function(){for(var t=M(),e=0;e<this.t;++e)t[e]=this.DM&~this[e];return t.t=this.t,t.s=~this.s,t},t.prototype.shiftLeft=function(t){var e=M();return t<0?this.rShiftTo(-t,e):this.lShiftTo(t,e),e},t.prototype.shiftRight=function(t){var e=M();return t<0?this.lShiftTo(-t,e):this.rShiftTo(t,e),e},t.prototype.getLowestSetBit=function(){for(var t=0;t<this.t;++t)if(0!=this[t])return t*this.DB+a(this[t]);return this.s<0?this.t*this.DB:-1},t.prototype.bitCount=function(){for(var t=0,e=this.s&this.DM,i=0;i<this.t;++i)t+=u(this[i]^e);return t},t.prototype.testBit=function(t){var e=Math.floor(t/this.DB);return e>=this.t?0!=this.s:0!=(this[e]&1<<t%this.DB)},t.prototype.setBit=function(t){return this.changeBit(t,s)},t.prototype.clearBit=function(t){return this.changeBit(t,h)},t.prototype.flipBit=function(t){return this.changeBit(t,o)},t.prototype.add=function(t){var e=M();return this.addTo(t,e),e},t.prototype.subtract=function(t){var e=M();return this.subTo(t,e),e},t.prototype.multiply=function(t){var e=M();return this.multiplyTo(t,e),e},t.prototype.divide=function(t){var e=M();return this.divRemTo(t,e,null),e},t.prototype.remainder=function(t){var e=M();return this.divRemTo(t,null,e),e},t.prototype.divideAndRemainder=function(t){var e=M(),i=M();return this.divRemTo(t,e,i),[e,i]},t.prototype.modPow=function(t,e){var i,r,n=t.bitLength(),s=U(1);if(n<=0)return s;i=n<18?1:n<48?3:n<144?4:n<768?5:6,r=n<8?new I(e):e.isEven()?new P(e):new N(e);var o=[],h=3,a=i-1,u=(1<<i)-1;if(o[1]=r.convert(this),i>1){var c=M();for(r.sqrTo(o[1],c);h<=u;)o[h]=M(),r.mulTo(c,o[h-2],o[h]),h+=2}var f,l,p=t.t-1,g=!0,d=M();for(n=K(t[p])-1;p>=0;){for(n>=a?f=t[p]>>n-a&u:(f=(t[p]&(1<<n+1)-1)<<a-n,p>0&&(f|=t[p-1]>>this.DB+n-a)),h=i;0==(1&f);)f>>=1,--h;if((n-=h)<0&&(n+=this.DB,--p),g)o[f].copyTo(s),g=!1;else{for(;h>1;)r.sqrTo(s,d),r.sqrTo(d,s),h-=2;h>0?r.sqrTo(s,d):(l=s,s=d,d=l),r.mulTo(d,o[f],s)}for(;p>=0&&0==(t[p]&1<<n);)r.sqrTo(s,d),l=s,s=d,d=l,--n<0&&(n=this.DB-1,--p)}return r.revert(s)},t.prototype.modInverse=function(e){var i=e.isEven();if(this.isEven()&&i||0==e.signum())return t.ZERO;for(var r=e.clone(),n=this.clone(),s=U(1),o=U(0),h=U(0),a=U(1);0!=r.signum();){for(;r.isEven();)r.rShiftTo(1,r),i?(s.isEven()&&o.isEven()||(s.addTo(this,s),o.subTo(e,o)),s.rShiftTo(1,s)):o.isEven()||o.subTo(e,o),o.rShiftTo(1,o);for(;n.isEven();)n.rShiftTo(1,n),i?(h.isEven()&&a.isEven()||(h.addTo(this,h),a.subTo(e,a)),h.rShiftTo(1,h)):a.isEven()||a.subTo(e,a),a.rShiftTo(1,a);r.compareTo(n)>=0?(r.subTo(n,r),i&&s.subTo(h,s),o.subTo(a,o)):(n.subTo(r,n),i&&h.subTo(s,h),a.subTo(o,a))}return 0!=n.compareTo(t.ONE)?t.ZERO:a.compareTo(e)>=0?a.subtract(e):a.signum()<0?(a.addTo(e,a),a.signum()<0?a.add(e):a):a},t.prototype.pow=function(t){return this.exp(t,new V)},t.prototype.gcd=function(t){var e=this.s<0?this.negate():this.clone(),i=t.s<0?t.negate():t.clone();if(e.compareTo(i)<0){var r=e;e=i,i=r}var n=e.getLowestSetBit(),s=i.getLowestSetBit();if(s<0)return e;for(n<s&&(s=n),s>0&&(e.rShiftTo(s,e),i.rShiftTo(s,i));e.signum()>0;)(n=e.getLowestSetBit())>0&&e.rShiftTo(n,e),(n=i.getLowestSetBit())>0&&i.rShiftTo(n,i),e.compareTo(i)>=0?(e.subTo(i,e),e.rShiftTo(1,e)):(i.subTo(e,i),i.rShiftTo(1,i));return s>0&&i.lShiftTo(s,i),i},t.prototype.isProbablePrime=function(t){var e,i=this.abs();if(1==i.t&&i[0]<=B[B.length-1]){for(e=0;e<B.length;++e)if(i[0]==B[e])return!0;return!1}if(i.isEven())return!1;for(e=1;e<B.length;){for(var r=B[e],n=e+1;n<B.length&&r<O;)r*=B[n++];for(r=i.modInt(r);e<n;)if(r%B[e++]==0)return!1}return i.millerRabin(t)},t.prototype.copyTo=function(t){for(var e=this.t-1;e>=0;--e)t[e]=this[e];t.t=this.t,t.s=this.s},t.prototype.fromInt=function(t){this.t=1,this.s=t<0?-1:0,t>0?this[0]=t:t<-1?this[0]=t+this.DV:this.t=0},t.prototype.fromString=function(e,i){var r;if(16==i)r=4;else if(8==i)r=3;else if(256==i)r=8;else if(2==i)r=1;else if(32==i)r=5;else{if(4!=i)return void this.fromRadix(e,i);r=2}this.t=0,this.s=0;for(var n=e.length,s=!1,o=0;--n>=0;){var h=8==r?255&+e[n]:F(e,n);h<0?"-"==e.charAt(n)&&(s=!0):(s=!1,0==o?this[this.t++]=h:o+r>this.DB?(this[this.t-1]|=(h&(1<<this.DB-o)-1)<<o,this[this.t++]=h>>this.DB-o):this[this.t-1]|=h<<o,(o+=r)>=this.DB&&(o-=this.DB))}8==r&&0!=(128&+e[0])&&(this.s=-1,o>0&&(this[this.t-1]|=(1<<this.DB-o)-1<<o)),this.clamp(),s&&t.ZERO.subTo(this,this)},t.prototype.clamp=function(){for(var t=this.s&this.DM;this.t>0&&this[this.t-1]==t;)--this.t},t.prototype.dlShiftTo=function(t,e){var i;for(i=this.t-1;i>=0;--i)e[i+t]=this[i];for(i=t-1;i>=0;--i)e[i]=0;e.t=this.t+t,e.s=this.s},t.prototype.drShiftTo=function(t,e){for(var i=t;i<this.t;++i)e[i-t]=this[i];e.t=Math.max(this.t-t,0),e.s=this.s},t.prototype.lShiftTo=function(t,e){for(var i=t%this.DB,r=this.DB-i,n=(1<<r)-1,s=Math.floor(t/this.DB),o=this.s<<i&this.DM,h=this.t-1;h>=0;--h)e[h+s+1]=this[h]>>r|o,o=(this[h]&n)<<i;for(h=s-1;h>=0;--h)e[h]=0;e[s]=o,e.t=this.t+s+1,e.s=this.s,e.clamp()},t.prototype.rShiftTo=function(t,e){e.s=this.s;var i=Math.floor(t/this.DB);if(i>=this.t)e.t=0;else{var r=t%this.DB,n=this.DB-r,s=(1<<r)-1;e[0]=this[i]>>r;for(var o=i+1;o<this.t;++o)e[o-i-1]|=(this[o]&s)<<n,e[o-i]=this[o]>>r;r>0&&(e[this.t-i-1]|=(this.s&s)<<n),e.t=this.t-i,e.clamp()}},t.prototype.subTo=function(t,e){for(var i=0,r=0,n=Math.min(t.t,this.t);i<n;)r+=this[i]-t[i],e[i++]=r&this.DM,r>>=this.DB;if(t.t<this.t){for(r-=t.s;i<this.t;)r+=this[i],e[i++]=r&this.DM,r>>=this.DB;r+=this.s}else{for(r+=this.s;i<t.t;)r-=t[i],e[i++]=r&this.DM,r>>=this.DB;r-=t.s}e.s=r<0?-1:0,r<-1?e[i++]=this.DV+r:r>0&&(e[i++]=r),e.t=i,e.clamp()},t.prototype.multiplyTo=function(e,i){var r=this.abs(),n=e.abs(),s=r.t;for(i.t=s+n.t;--s>=0;)i[s]=0;for(s=0;s<n.t;++s)i[s+r.t]=r.am(0,n[s],i,s,0,r.t);i.s=0,i.clamp(),this.s!=e.s&&t.ZERO.subTo(i,i)},t.prototype.squareTo=function(t){for(var e=this.abs(),i=t.t=2*e.t;--i>=0;)t[i]=0;for(i=0;i<e.t-1;++i){var r=e.am(i,e[i],t,2*i,0,1);(t[i+e.t]+=e.am(i+1,2*e[i],t,2*i+1,r,e.t-i-1))>=e.DV&&(t[i+e.t]-=e.DV,t[i+e.t+1]=1)}t.t>0&&(t[t.t-1]+=e.am(i,e[i],t,2*i,0,1)),t.s=0,t.clamp()},t.prototype.divRemTo=function(e,i,r){var n=e.abs();if(!(n.t<=0)){var s=this.abs();if(s.t<n.t)return null!=i&&i.fromInt(0),void(null!=r&&this.copyTo(r));null==r&&(r=M());var o=M(),h=this.s,a=e.s,u=this.DB-K(n[n.t-1]);u>0?(n.lShiftTo(u,o),s.lShiftTo(u,r)):(n.copyTo(o),s.copyTo(r));var c=o.t,f=o[c-1];if(0!=f){var l=f*(1<<this.F1)+(c>1?o[c-2]>>this.F2:0),p=this.FV/l,g=(1<<this.F1)/l,d=1<<this.F2,v=r.t,m=v-c,y=null==i?M():i;for(o.dlShiftTo(m,y),r.compareTo(y)>=0&&(r[r.t++]=1,r.subTo(y,r)),t.ONE.dlShiftTo(c,y),y.subTo(o,o);o.t<c;)o[o.t++]=0;for(;--m>=0;){var b=r[--v]==f?this.DM:Math.floor(r[v]*p+(r[v-1]+d)*g);if((r[v]+=o.am(0,b,r,m,0,c))<b)for(o.dlShiftTo(m,y),r.subTo(y,r);r[v]<--b;)r.subTo(y,r)}null!=i&&(r.drShiftTo(c,i),h!=a&&t.ZERO.subTo(i,i)),r.t=c,r.clamp(),u>0&&r.rShiftTo(u,r),h<0&&t.ZERO.subTo(r,r)}}},t.prototype.invDigit=function(){if(this.t<1)return 0;var t=this[0];if(0==(1&t))return 0;var e=3&t;return(e=(e=(e=(e=e*(2-(15&t)*e)&15)*(2-(255&t)*e)&255)*(2-((65535&t)*e&65535))&65535)*(2-t*e%this.DV)%this.DV)>0?this.DV-e:-e},t.prototype.isEven=function(){return 0==(this.t>0?1&this[0]:this.s)},t.prototype.exp=function(e,i){if(e>4294967295||e<1)return t.ONE;var r=M(),n=M(),s=i.convert(this),o=K(e)-1;for(s.copyTo(r);--o>=0;)if(i.sqrTo(r,n),(e&1<<o)>0)i.mulTo(n,s,r);else{var h=r;r=n,n=h}return i.revert(r)},t.prototype.chunkSize=function(t){return Math.floor(Math.LN2*this.DB/Math.log(t))},t.prototype.toRadix=function(t){if(null==t&&(t=10),0==this.signum()||t<2||t>36)return"0";var e=this.chunkSize(t),i=Math.pow(t,e),r=U(i),n=M(),s=M(),o="";for(this.divRemTo(r,n,s);n.signum()>0;)o=(i+s.intValue()).toString(t).substr(1)+o,n.divRemTo(r,n,s);return s.intValue().toString(t)+o},t.prototype.fromRadix=function(e,i){this.fromInt(0),null==i&&(i=10);for(var r=this.chunkSize(i),n=Math.pow(i,r),s=!1,o=0,h=0,a=0;a<e.length;++a){var u=F(e,a);u<0?"-"==e.charAt(a)&&0==this.signum()&&(s=!0):(h=i*h+u,++o>=r&&(this.dMultiply(n),this.dAddOffset(h,0),o=0,h=0))}o>0&&(this.dMultiply(Math.pow(i,o)),this.dAddOffset(h,0)),s&&t.ZERO.subTo(this,this)},t.prototype.fromNumber=function(e,i,r){if("number"==typeof i)if(e<2)this.fromInt(1);else for(this.fromNumber(e,r),this.testBit(e-1)||this.bitwiseTo(t.ONE.shiftLeft(e-1),s,this),this.isEven()&&this.dAddOffset(1,0);!this.isProbablePrime(i);)this.dAddOffset(2,0),this.bitLength()>e&&this.subTo(t.ONE.shiftLeft(e-1),this);else{var n=[],o=7&e;n.length=1+(e>>3),i.nextBytes(n),o>0?n[0]&=(1<<o)-1:n[0]=0,this.fromString(n,256)}},t.prototype.bitwiseTo=function(t,e,i){var r,n,s=Math.min(t.t,this.t);for(r=0;r<s;++r)i[r]=e(this[r],t[r]);if(t.t<this.t){for(n=t.s&this.DM,r=s;r<this.t;++r)i[r]=e(this[r],n);i.t=this.t}else{for(n=this.s&this.DM,r=s;r<t.t;++r)i[r]=e(n,t[r]);i.t=t.t}i.s=e(this.s,t.s),i.clamp()},t.prototype.changeBit=function(e,i){var r=t.ONE.shiftLeft(e);return this.bitwiseTo(r,i,r),r},t.prototype.addTo=function(t,e){for(var i=0,r=0,n=Math.min(t.t,this.t);i<n;)r+=this[i]+t[i],e[i++]=r&this.DM,r>>=this.DB;if(t.t<this.t){for(r+=t.s;i<this.t;)r+=this[i],e[i++]=r&this.DM,r>>=this.DB;r+=this.s}else{for(r+=this.s;i<t.t;)r+=t[i],e[i++]=r&this.DM,r>>=this.DB;r+=t.s}e.s=r<0?-1:0,r>0?e[i++]=r:r<-1&&(e[i++]=this.DV+r),e.t=i,e.clamp()},t.prototype.dMultiply=function(t){this[this.t]=this.am(0,t-1,this,0,0,this.t),++this.t,this.clamp()},t.prototype.dAddOffset=function(t,e){if(0!=t){for(;this.t<=e;)this[this.t++]=0;for(this[e]+=t;this[e]>=this.DV;)this[e]-=this.DV,++e>=this.t&&(this[this.t++]=0),++this[e]}},t.prototype.multiplyLowerTo=function(t,e,i){var r=Math.min(this.t+t.t,e);for(i.s=0,i.t=r;r>0;)i[--r]=0;for(var n=i.t-this.t;r<n;++r)i[r+this.t]=this.am(0,t[r],i,r,0,this.t);for(n=Math.min(t.t,e);r<n;++r)this.am(0,t[r],i,r,0,e-r);i.clamp()},t.prototype.multiplyUpperTo=function(t,e,i){--e;var r=i.t=this.t+t.t-e;for(i.s=0;--r>=0;)i[r]=0;for(r=Math.max(e-this.t,0);r<t.t;++r)i[this.t+r-e]=this.am(e-r,t[r],i,0,0,this.t+r-e);i.clamp(),i.drShiftTo(1,i)},t.prototype.modInt=function(t){if(t<=0)return 0;var e=this.DV%t,i=this.s<0?t-1:0;if(this.t>0)if(0==e)i=this[0]%t;else for(var r=this.t-1;r>=0;--r)i=(e*i+this[r])%t;return i},t.prototype.millerRabin=function(e){var i=this.subtract(t.ONE),r=i.getLowestSetBit();if(r<=0)return!1;var n=i.shiftRight(r);(e=e+1>>1)>B.length&&(e=B.length);for(var s=M(),o=0;o<e;++o){s.fromInt(B[Math.floor(Math.random()*B.length)]);var h=s.modPow(n,this);if(0!=h.compareTo(t.ONE)&&0!=h.compareTo(i)){for(var a=1;a++<r&&0!=h.compareTo(i);)if(0==(h=h.modPowInt(2,this)).compareTo(t.ONE))return!1;if(0!=h.compareTo(i))return!1}}return!0},t.prototype.square=function(){var t=M();return this.squareTo(t),t},t.prototype.gcda=function(t,e){var i=this.s<0?this.negate():this.clone(),r=t.s<0?t.negate():t.clone();if(i.compareTo(r)<0){var n=i;i=r,r=n}var s=i.getLowestSetBit(),o=r.getLowestSetBit();if(o<0)e(i);else{s<o&&(o=s),o>0&&(i.rShiftTo(o,i),r.rShiftTo(o,r));var h=function(){(s=i.getLowestSetBit())>0&&i.rShiftTo(s,i),(s=r.getLowestSetBit())>0&&r.rShiftTo(s,r),i.compareTo(r)>=0?(i.subTo(r,i),i.rShiftTo(1,i)):(r.subTo(i,r),r.rShiftTo(1,r)),i.signum()>0?setTimeout(h,0):(o>0&&r.lShiftTo(o,r),setTimeout((function(){e(r)}),0))};setTimeout(h,10)}},t.prototype.fromNumberAsync=function(e,i,r,n){if("number"==typeof i)if(e<2)this.fromInt(1);else{this.fromNumber(e,r),this.testBit(e-1)||this.bitwiseTo(t.ONE.shiftLeft(e-1),s,this),this.isEven()&&this.dAddOffset(1,0);var o=this,h=function(){o.dAddOffset(2,0),o.bitLength()>e&&o.subTo(t.ONE.shiftLeft(e-1),o),o.isProbablePrime(i)?setTimeout((function(){n()}),0):setTimeout(h,0)};setTimeout(h,0)}else{var a=[],u=7&e;a.length=1+(e>>3),i.nextBytes(a),u>0?a[0]&=(1<<u)-1:a[0]=0,this.fromString(a,256)}},t}(),V=function(){function t(){}return t.prototype.convert=function(t){return t},t.prototype.revert=function(t){return t},t.prototype.mulTo=function(t,e,i){t.multiplyTo(e,i)},t.prototype.sqrTo=function(t,e){t.squareTo(e)},t}(),I=function(){function t(t){this.m=t}return t.prototype.convert=function(t){return t.s<0||t.compareTo(this.m)>=0?t.mod(this.m):t},t.prototype.revert=function(t){return t},t.prototype.reduce=function(t){t.divRemTo(this.m,null,t)},t.prototype.mulTo=function(t,e,i){t.multiplyTo(e,i),this.reduce(i)},t.prototype.sqrTo=function(t,e){t.squareTo(e),this.reduce(e)},t}(),N=function(){function t(t){this.m=t,this.mp=t.invDigit(),this.mpl=32767&this.mp,this.mph=this.mp>>15,this.um=(1<<t.DB-15)-1,this.mt2=2*t.t}return t.prototype.convert=function(t){var e=M();return t.abs().dlShiftTo(this.m.t,e),e.divRemTo(this.m,null,e),t.s<0&&e.compareTo(A.ZERO)>0&&this.m.subTo(e,e),e},t.prototype.revert=function(t){var e=M();return t.copyTo(e),this.reduce(e),e},t.prototype.reduce=function(t){for(;t.t<=this.mt2;)t[t.t++]=0;for(var e=0;e<this.m.t;++e){var i=32767&t[e],r=i*this.mpl+((i*this.mph+(t[e]>>15)*this.mpl&this.um)<<15)&t.DM;for(t[i=e+this.m.t]+=this.m.am(0,r,t,e,0,this.m.t);t[i]>=t.DV;)t[i]-=t.DV,t[++i]++}t.clamp(),t.drShiftTo(this.m.t,t),t.compareTo(this.m)>=0&&t.subTo(this.m,t)},t.prototype.mulTo=function(t,e,i){t.multiplyTo(e,i),this.reduce(i)},t.prototype.sqrTo=function(t,e){t.squareTo(e),this.reduce(e)},t}(),P=function(){function t(t){this.m=t,this.r2=M(),this.q3=M(),A.ONE.dlShiftTo(2*t.t,this.r2),this.mu=this.r2.divide(t)}return t.prototype.convert=function(t){if(t.s<0||t.t>2*this.m.t)return t.mod(this.m);if(t.compareTo(this.m)<0)return t;var e=M();return t.copyTo(e),this.reduce(e),e},t.prototype.revert=function(t){return t},t.prototype.reduce=function(t){for(t.drShiftTo(this.m.t-1,this.r2),t.t>this.m.t+1&&(t.t=this.m.t+1,t.clamp()),this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3),this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);t.compareTo(this.r2)<0;)t.dAddOffset(1,this.m.t+1);for(t.subTo(this.r2,t);t.compareTo(this.m)>=0;)t.subTo(this.m,t)},t.prototype.mulTo=function(t,e,i){t.multiplyTo(e,i),this.reduce(i)},t.prototype.sqrTo=function(t,e){t.squareTo(e),this.reduce(e)},t}();function M(){return new A(null)}function L(t,e){return new A(t,e)}var j="undefined"!=typeof navigator;j&&"Microsoft Internet Explorer"==navigator.appName?(A.prototype.am=function(t,e,i,r,n,s){for(var o=32767&e,h=e>>15;--s>=0;){var a=32767&this[t],u=this[t++]>>15,c=h*a+u*o;n=((a=o*a+((32767&c)<<15)+i[r]+(1073741823&n))>>>30)+(c>>>15)+h*u+(n>>>30),i[r++]=1073741823&a}return n},w=30):j&&"Netscape"!=navigator.appName?(A.prototype.am=function(t,e,i,r,n,s){for(;--s>=0;){var o=e*this[t++]+i[r]+n;n=Math.floor(o/67108864),i[r++]=67108863&o}return n},w=26):(A.prototype.am=function(t,e,i,r,n,s){for(var o=16383&e,h=e>>14;--s>=0;){var a=16383&this[t],u=this[t++]>>14,c=h*a+u*o;n=((a=o*a+((16383&c)<<14)+i[r]+n)>>28)+(c>>14)+h*u,i[r++]=268435455&a}return n},w=28),A.prototype.DB=w,A.prototype.DM=(1<<w)-1,A.prototype.DV=1<<w,A.prototype.FV=Math.pow(2,52),A.prototype.F1=52-w,A.prototype.F2=2*w-52;var q,H,C=[];for(q="0".charCodeAt(0),H=0;H<=9;++H)C[q++]=H;for(q="a".charCodeAt(0),H=10;H<36;++H)C[q++]=H;for(q="A".charCodeAt(0),H=10;H<36;++H)C[q++]=H;function F(t,e){var i=C[t.charCodeAt(e)];return null==i?-1:i}function U(t){var e=M();return e.fromInt(t),e}function K(t){var e,i=1;return 0!=(e=t>>>16)&&(t=e,i+=16),0!=(e=t>>8)&&(t=e,i+=8),0!=(e=t>>4)&&(t=e,i+=4),0!=(e=t>>2)&&(t=e,i+=2),0!=(e=t>>1)&&(t=e,i+=1),i}A.ZERO=U(0),A.ONE=U(1);var k,_,z=function(){function t(){this.i=0,this.j=0,this.S=[]}return t.prototype.init=function(t){var e,i,r;for(e=0;e<256;++e)this.S[e]=e;for(i=0,e=0;e<256;++e)i=i+this.S[e]+t[e%t.length]&255,r=this.S[e],this.S[e]=this.S[i],this.S[i]=r;this.i=0,this.j=0},t.prototype.next=function(){var t;return this.i=this.i+1&255,this.j=this.j+this.S[this.i]&255,t=this.S[this.i],this.S[this.i]=this.S[this.j],this.S[this.j]=t,this.S[t+this.S[this.i]&255]},t}(),Z=256,G=null;if(null==G){G=[],_=0;var $=void 0;if("undefined"!=typeof window&&window.crypto&&window.crypto.getRandomValues){var Y=new Uint32Array(256);for(window.crypto.getRandomValues(Y),$=0;$<Y.length;++$)G[_++]=255&Y[$]}var J=0,X=function(t){if((J=J||0)>=256||_>=Z)window.removeEventListener?window.removeEventListener("mousemove",X,!1):window.detachEvent&&window.detachEvent("onmousemove",X);else try{var e=t.x+t.y;G[_++]=255&e,J+=1}catch(t){}};"undefined"!=typeof window&&(window.addEventListener?window.addEventListener("mousemove",X,!1):window.attachEvent&&window.attachEvent("onmousemove",X))}function Q(){if(null==k){for(k=new z;_<Z;){var t=Math.floor(65536*Math.random());G[_++]=255&t}for(k.init(G),_=0;_<G.length;++_)G[_]=0;_=0}return k.next()}var W=function(){function t(){}return t.prototype.nextBytes=function(t){for(var e=0;e<t.length;++e)t[e]=Q()},t}(),tt=function(){function t(){this.n=null,this.e=0,this.d=null,this.p=null,this.q=null,this.dmp1=null,this.dmq1=null,this.coeff=null}return t.prototype.doPublic=function(t){return t.modPowInt(this.e,this.n)},t.prototype.doPrivate=function(t){if(null==this.p||null==this.q)return t.modPow(this.d,this.n);for(var e=t.mod(this.p).modPow(this.dmp1,this.p),i=t.mod(this.q).modPow(this.dmq1,this.q);e.compareTo(i)<0;)e=e.add(this.p);return e.subtract(i).multiply(this.coeff).mod(this.p).multiply(this.q).add(i)},t.prototype.setPublic=function(t,e){null!=t&&null!=e&&t.length>0&&e.length>0?(this.n=L(t,16),this.e=parseInt(e,16)):console.error("Invalid RSA public key")},t.prototype.encrypt=function(t){var e=this.n.bitLength()+7>>3,i=function(t,e){if(e<t.length+11)return console.error("Message too long for RSA"),null;for(var i=[],r=t.length-1;r>=0&&e>0;){var n=t.charCodeAt(r--);n<128?i[--e]=n:n>127&&n<2048?(i[--e]=63&n|128,i[--e]=n>>6|192):(i[--e]=63&n|128,i[--e]=n>>6&63|128,i[--e]=n>>12|224)}i[--e]=0;for(var s=new W,o=[];e>2;){for(o[0]=0;0==o[0];)s.nextBytes(o);i[--e]=o[0]}return i[--e]=2,i[--e]=0,new A(i)}(t,e);if(null==i)return null;var r=this.doPublic(i);if(null==r)return null;for(var n=r.toString(16),s=n.length,o=0;o<2*e-s;o++)n="0"+n;return n},t.prototype.setPrivate=function(t,e,i){null!=t&&null!=e&&t.length>0&&e.length>0?(this.n=L(t,16),this.e=parseInt(e,16),this.d=L(i,16)):console.error("Invalid RSA private key")},t.prototype.setPrivateEx=function(t,e,i,r,n,s,o,h){null!=t&&null!=e&&t.length>0&&e.length>0?(this.n=L(t,16),this.e=parseInt(e,16),this.d=L(i,16),this.p=L(r,16),this.q=L(n,16),this.dmp1=L(s,16),this.dmq1=L(o,16),this.coeff=L(h,16)):console.error("Invalid RSA private key")},t.prototype.generate=function(t,e){var i=new W,r=t>>1;this.e=parseInt(e,16);for(var n=new A(e,16);;){for(;this.p=new A(t-r,1,i),0!=this.p.subtract(A.ONE).gcd(n).compareTo(A.ONE)||!this.p.isProbablePrime(10););for(;this.q=new A(r,1,i),0!=this.q.subtract(A.ONE).gcd(n).compareTo(A.ONE)||!this.q.isProbablePrime(10););if(this.p.compareTo(this.q)<=0){var s=this.p;this.p=this.q,this.q=s}var o=this.p.subtract(A.ONE),h=this.q.subtract(A.ONE),a=o.multiply(h);if(0==a.gcd(n).compareTo(A.ONE)){this.n=this.p.multiply(this.q),this.d=n.modInverse(a),this.dmp1=this.d.mod(o),this.dmq1=this.d.mod(h),this.coeff=this.q.modInverse(this.p);break}}},t.prototype.decrypt=function(t){var e=L(t,16),i=this.doPrivate(e);return null==i?null:function(t,e){for(var i=t.toByteArray(),r=0;r<i.length&&0==i[r];)++r;if(i.length-r!=e-1||2!=i[r])return null;for(++r;0!=i[r];)if(++r>=i.length)return null;for(var n="";++r<i.length;){var s=255&i[r];s<128?n+=String.fromCharCode(s):s>191&&s<224?(n+=String.fromCharCode((31&s)<<6|63&i[r+1]),++r):(n+=String.fromCharCode((15&s)<<12|(63&i[r+1])<<6|63&i[r+2]),r+=2)}return n}(i,this.n.bitLength()+7>>3)},t.prototype.generateAsync=function(t,e,i){var r=new W,n=t>>1;this.e=parseInt(e,16);var s=new A(e,16),o=this,h=function(){var e=function(){if(o.p.compareTo(o.q)<=0){var t=o.p;o.p=o.q,o.q=t}var e=o.p.subtract(A.ONE),r=o.q.subtract(A.ONE),n=e.multiply(r);0==n.gcd(s).compareTo(A.ONE)?(o.n=o.p.multiply(o.q),o.d=s.modInverse(n),o.dmp1=o.d.mod(e),o.dmq1=o.d.mod(r),o.coeff=o.q.modInverse(o.p),setTimeout((function(){i()}),0)):setTimeout(h,0)},a=function(){o.q=M(),o.q.fromNumberAsync(n,1,r,(function(){o.q.subtract(A.ONE).gcda(s,(function(t){0==t.compareTo(A.ONE)&&o.q.isProbablePrime(10)?setTimeout(e,0):setTimeout(a,0)}))}))},u=function(){o.p=M(),o.p.fromNumberAsync(t-n,1,r,(function(){o.p.subtract(A.ONE).gcda(s,(function(t){0==t.compareTo(A.ONE)&&o.p.isProbablePrime(10)?setTimeout(a,0):setTimeout(u,0)}))}))};setTimeout(u,0)};setTimeout(h,0)},t.prototype.sign=function(t,e,i){var r=function(t,e){if(e<t.length+22)return console.error("Message too long for RSA"),null;for(var i=e-t.length-6,r="",n=0;n<i;n+=2)r+="ff";return L("0001"+r+"00"+t,16)}((et[i]||"")+e(t).toString(),this.n.bitLength()/4);if(null==r)return null;var n=this.doPrivate(r);if(null==n)return null;var s=n.toString(16);return 0==(1&s.length)?s:"0"+s},t.prototype.verify=function(t,e,i){var r=L(e,16),n=this.doPublic(r);return null==n?null:function(t){for(var e in et)if(et.hasOwnProperty(e)){var i=et[e],r=i.length;if(t.substr(0,r)==i)return t.substr(r)}return t}(n.toString(16).replace(/^1f+00/,""))==i(t).toString()},t}(),et={md2:"3020300c06082a864886f70d020205000410",md5:"3020300c06082a864886f70d020505000410",sha1:"3021300906052b0e03021a05000414",sha224:"302d300d06096086480165030402040500041c",sha256:"3031300d060960864801650304020105000420",sha384:"3041300d060960864801650304020205000430",sha512:"3051300d060960864801650304020305000440",ripemd160:"3021300906052b2403020105000414"},it={};it.lang={extend:function(t,e,i){if(!e||!t)throw new Error("YAHOO.lang.extend failed, please check that all dependencies are included.");var r=function(){};if(r.prototype=e.prototype,t.prototype=new r,t.prototype.constructor=t,t.superclass=e.prototype,e.prototype.constructor==Object.prototype.constructor&&(e.prototype.constructor=e),i){var n;for(n in i)t.prototype[n]=i[n];var s=function(){},o=["toString","valueOf"];try{/MSIE/.test(navigator.userAgent)&&(s=function(t,e){for(n=0;n<o.length;n+=1){var i=o[n],r=e[i];"function"==typeof r&&r!=Object.prototype[i]&&(t[i]=r)}})}catch(t){}s(t.prototype,i)}}};var rt={};void 0!==rt.asn1&&rt.asn1||(rt.asn1={}),rt.asn1.ASN1Util=new function(){this.integerToByteHex=function(t){var e=t.toString(16);return e.length%2==1&&(e="0"+e),e},this.bigIntToMinTwosComplementsHex=function(t){var e=t.toString(16);if("-"!=e.substr(0,1))e.length%2==1?e="0"+e:e.match(/^[0-7]/)||(e="00"+e);else{var i=e.substr(1).length;i%2==1?i+=1:e.match(/^[0-7]/)||(i+=2);for(var r="",n=0;n<i;n++)r+="f";e=new A(r,16).xor(t).add(A.ONE).toString(16).replace(/^-/,"")}return e},this.getPEMStringFromHex=function(t,e){return hextopem(t,e)},this.newObject=function(t){var e=rt.asn1,i=e.DERBoolean,r=e.DERInteger,n=e.DERBitString,s=e.DEROctetString,o=e.DERNull,h=e.DERObjectIdentifier,a=e.DEREnumerated,u=e.DERUTF8String,c=e.DERNumericString,f=e.DERPrintableString,l=e.DERTeletexString,p=e.DERIA5String,g=e.DERUTCTime,d=e.DERGeneralizedTime,v=e.DERSequence,m=e.DERSet,y=e.DERTaggedObject,b=e.ASN1Util.newObject,T=Object.keys(t);if(1!=T.length)throw"key of param shall be only one.";var S=T[0];if(-1==":bool:int:bitstr:octstr:null:oid:enum:utf8str:numstr:prnstr:telstr:ia5str:utctime:gentime:seq:set:tag:".indexOf(":"+S+":"))throw"undefined key: "+S;if("bool"==S)return new i(t[S]);if("int"==S)return new r(t[S]);if("bitstr"==S)return new n(t[S]);if("octstr"==S)return new s(t[S]);if("null"==S)return new o(t[S]);if("oid"==S)return new h(t[S]);if("enum"==S)return new a(t[S]);if("utf8str"==S)return new u(t[S]);if("numstr"==S)return new c(t[S]);if("prnstr"==S)return new f(t[S]);if("telstr"==S)return new l(t[S]);if("ia5str"==S)return new p(t[S]);if("utctime"==S)return new g(t[S]);if("gentime"==S)return new d(t[S]);if("seq"==S){for(var E=t[S],w=[],D=0;D<E.length;D++){var x=b(E[D]);w.push(x)}return new v({array:w})}if("set"==S){for(E=t[S],w=[],D=0;D<E.length;D++)x=b(E[D]),w.push(x);return new m({array:w})}if("tag"==S){var R=t[S];if("[object Array]"===Object.prototype.toString.call(R)&&3==R.length){var B=b(R[2]);return new y({tag:R[0],explicit:R[1],obj:B})}var O={};if(void 0!==R.explicit&&(O.explicit=R.explicit),void 0!==R.tag&&(O.tag=R.tag),void 0===R.obj)throw"obj shall be specified for 'tag'.";return O.obj=b(R.obj),new y(O)}},this.jsonToASN1HEX=function(t){return this.newObject(t).getEncodedHex()}},rt.asn1.ASN1Util.oidHexToInt=function(t){for(var e="",i=parseInt(t.substr(0,2),16),r=(e=Math.floor(i/40)+"."+i%40,""),n=2;n<t.length;n+=2){var s=("00000000"+parseInt(t.substr(n,2),16).toString(2)).slice(-8);r+=s.substr(1,7),"0"==s.substr(0,1)&&(e=e+"."+new A(r,2).toString(10),r="")}return e},rt.asn1.ASN1Util.oidIntToHex=function(t){var e=function(t){var e=t.toString(16);return 1==e.length&&(e="0"+e),e},i=function(t){var i="",r=new A(t,10).toString(2),n=7-r.length%7;7==n&&(n=0);for(var s="",o=0;o<n;o++)s+="0";for(r=s+r,o=0;o<r.length-1;o+=7){var h=r.substr(o,7);o!=r.length-7&&(h="1"+h),i+=e(parseInt(h,2))}return i};if(!t.match(/^[0-9.]+$/))throw"malformed oid string: "+t;var r="",n=t.split("."),s=40*parseInt(n[0])+parseInt(n[1]);r+=e(s),n.splice(0,2);for(var o=0;o<n.length;o++)r+=i(n[o]);return r},rt.asn1.ASN1Object=function(){this.getLengthHexFromValue=function(){if(void 0===this.hV||null==this.hV)throw"this.hV is null or undefined.";if(this.hV.length%2==1)throw"value hex must be even length: n="+"".length+",v="+this.hV;var t=this.hV.length/2,e=t.toString(16);if(e.length%2==1&&(e="0"+e),t<128)return e;var i=e.length/2;if(i>15)throw"ASN.1 length too long to represent by 8x: n = "+t.toString(16);return(128+i).toString(16)+e},this.getEncodedHex=function(){return(null==this.hTLV||this.isModified)&&(this.hV=this.getFreshValueHex(),this.hL=this.getLengthHexFromValue(),this.hTLV=this.hT+this.hL+this.hV,this.isModified=!1),this.hTLV},this.getValueHex=function(){return this.getEncodedHex(),this.hV},this.getFreshValueHex=function(){return""}},rt.asn1.DERAbstractString=function(t){rt.asn1.DERAbstractString.superclass.constructor.call(this),this.getString=function(){return this.s},this.setString=function(t){this.hTLV=null,this.isModified=!0,this.s=t,this.hV=stohex(this.s)},this.setStringHex=function(t){this.hTLV=null,this.isModified=!0,this.s=null,this.hV=t},this.getFreshValueHex=function(){return this.hV},void 0!==t&&("string"==typeof t?this.setString(t):void 0!==t.str?this.setString(t.str):void 0!==t.hex&&this.setStringHex(t.hex))},it.lang.extend(rt.asn1.DERAbstractString,rt.asn1.ASN1Object),rt.asn1.DERAbstractTime=function(t){rt.asn1.DERAbstractTime.superclass.constructor.call(this),this.localDateToUTC=function(t){return utc=t.getTime()+6e4*t.getTimezoneOffset(),new Date(utc)},this.formatDate=function(t,e,i){var r=this.zeroPadding,n=this.localDateToUTC(t),s=String(n.getFullYear());"utc"==e&&(s=s.substr(2,2));var o=s+r(String(n.getMonth()+1),2)+r(String(n.getDate()),2)+r(String(n.getHours()),2)+r(String(n.getMinutes()),2)+r(String(n.getSeconds()),2);if(!0===i){var h=n.getMilliseconds();if(0!=h){var a=r(String(h),3);o=o+"."+(a=a.replace(/[0]+$/,""))}}return o+"Z"},this.zeroPadding=function(t,e){return t.length>=e?t:new Array(e-t.length+1).join("0")+t},this.getString=function(){return this.s},this.setString=function(t){this.hTLV=null,this.isModified=!0,this.s=t,this.hV=stohex(t)},this.setByDateValue=function(t,e,i,r,n,s){var o=new Date(Date.UTC(t,e-1,i,r,n,s,0));this.setByDate(o)},this.getFreshValueHex=function(){return this.hV}},it.lang.extend(rt.asn1.DERAbstractTime,rt.asn1.ASN1Object),rt.asn1.DERAbstractStructured=function(t){rt.asn1.DERAbstractString.superclass.constructor.call(this),this.setByASN1ObjectArray=function(t){this.hTLV=null,this.isModified=!0,this.asn1Array=t},this.appendASN1Object=function(t){this.hTLV=null,this.isModified=!0,this.asn1Array.push(t)},this.asn1Array=new Array,void 0!==t&&void 0!==t.array&&(this.asn1Array=t.array)},it.lang.extend(rt.asn1.DERAbstractStructured,rt.asn1.ASN1Object),rt.asn1.DERBoolean=function(){rt.asn1.DERBoolean.superclass.constructor.call(this),this.hT="01",this.hTLV="0101ff"},it.lang.extend(rt.asn1.DERBoolean,rt.asn1.ASN1Object),rt.asn1.DERInteger=function(t){rt.asn1.DERInteger.superclass.constructor.call(this),this.hT="02",this.setByBigInteger=function(t){this.hTLV=null,this.isModified=!0,this.hV=rt.asn1.ASN1Util.bigIntToMinTwosComplementsHex(t)},this.setByInteger=function(t){var e=new A(String(t),10);this.setByBigInteger(e)},this.setValueHex=function(t){this.hV=t},this.getFreshValueHex=function(){return this.hV},void 0!==t&&(void 0!==t.bigint?this.setByBigInteger(t.bigint):void 0!==t.int?this.setByInteger(t.int):"number"==typeof t?this.setByInteger(t):void 0!==t.hex&&this.setValueHex(t.hex))},it.lang.extend(rt.asn1.DERInteger,rt.asn1.ASN1Object),rt.asn1.DERBitString=function(t){if(void 0!==t&&void 0!==t.obj){var e=rt.asn1.ASN1Util.newObject(t.obj);t.hex="00"+e.getEncodedHex()}rt.asn1.DERBitString.superclass.constructor.call(this),this.hT="03",this.setHexValueIncludingUnusedBits=function(t){this.hTLV=null,this.isModified=!0,this.hV=t},this.setUnusedBitsAndHexValue=function(t,e){if(t<0||7<t)throw"unused bits shall be from 0 to 7: u = "+t;var i="0"+t;this.hTLV=null,this.isModified=!0,this.hV=i+e},this.setByBinaryString=function(t){var e=8-(t=t.replace(/0+$/,"")).length%8;8==e&&(e=0);for(var i=0;i<=e;i++)t+="0";var r="";for(i=0;i<t.length-1;i+=8){var n=t.substr(i,8),s=parseInt(n,2).toString(16);1==s.length&&(s="0"+s),r+=s}this.hTLV=null,this.isModified=!0,this.hV="0"+e+r},this.setByBooleanArray=function(t){for(var e="",i=0;i<t.length;i++)1==t[i]?e+="1":e+="0";this.setByBinaryString(e)},this.newFalseArray=function(t){for(var e=new Array(t),i=0;i<t;i++)e[i]=!1;return e},this.getFreshValueHex=function(){return this.hV},void 0!==t&&("string"==typeof t&&t.toLowerCase().match(/^[0-9a-f]+$/)?this.setHexValueIncludingUnusedBits(t):void 0!==t.hex?this.setHexValueIncludingUnusedBits(t.hex):void 0!==t.bin?this.setByBinaryString(t.bin):void 0!==t.array&&this.setByBooleanArray(t.array))},it.lang.extend(rt.asn1.DERBitString,rt.asn1.ASN1Object),rt.asn1.DEROctetString=function(t){if(void 0!==t&&void 0!==t.obj){var e=rt.asn1.ASN1Util.newObject(t.obj);t.hex=e.getEncodedHex()}rt.asn1.DEROctetString.superclass.constructor.call(this,t),this.hT="04"},it.lang.extend(rt.asn1.DEROctetString,rt.asn1.DERAbstractString),rt.asn1.DERNull=function(){rt.asn1.DERNull.superclass.constructor.call(this),this.hT="05",this.hTLV="0500"},it.lang.extend(rt.asn1.DERNull,rt.asn1.ASN1Object),rt.asn1.DERObjectIdentifier=function(t){var e=function(t){var e=t.toString(16);return 1==e.length&&(e="0"+e),e},i=function(t){var i="",r=new A(t,10).toString(2),n=7-r.length%7;7==n&&(n=0);for(var s="",o=0;o<n;o++)s+="0";for(r=s+r,o=0;o<r.length-1;o+=7){var h=r.substr(o,7);o!=r.length-7&&(h="1"+h),i+=e(parseInt(h,2))}return i};rt.asn1.DERObjectIdentifier.superclass.constructor.call(this),this.hT="06",this.setValueHex=function(t){this.hTLV=null,this.isModified=!0,this.s=null,this.hV=t},this.setValueOidString=function(t){if(!t.match(/^[0-9.]+$/))throw"malformed oid string: "+t;var r="",n=t.split("."),s=40*parseInt(n[0])+parseInt(n[1]);r+=e(s),n.splice(0,2);for(var o=0;o<n.length;o++)r+=i(n[o]);this.hTLV=null,this.isModified=!0,this.s=null,this.hV=r},this.setValueName=function(t){var e=rt.asn1.x509.OID.name2oid(t);if(""===e)throw"DERObjectIdentifier oidName undefined: "+t;this.setValueOidString(e)},this.getFreshValueHex=function(){return this.hV},void 0!==t&&("string"==typeof t?t.match(/^[0-2].[0-9.]+$/)?this.setValueOidString(t):this.setValueName(t):void 0!==t.oid?this.setValueOidString(t.oid):void 0!==t.hex?this.setValueHex(t.hex):void 0!==t.name&&this.setValueName(t.name))},it.lang.extend(rt.asn1.DERObjectIdentifier,rt.asn1.ASN1Object),rt.asn1.DEREnumerated=function(t){rt.asn1.DEREnumerated.superclass.constructor.call(this),this.hT="0a",this.setByBigInteger=function(t){this.hTLV=null,this.isModified=!0,this.hV=rt.asn1.ASN1Util.bigIntToMinTwosComplementsHex(t)},this.setByInteger=function(t){var e=new A(String(t),10);this.setByBigInteger(e)},this.setValueHex=function(t){this.hV=t},this.getFreshValueHex=function(){return this.hV},void 0!==t&&(void 0!==t.int?this.setByInteger(t.int):"number"==typeof t?this.setByInteger(t):void 0!==t.hex&&this.setValueHex(t.hex))},it.lang.extend(rt.asn1.DEREnumerated,rt.asn1.ASN1Object),rt.asn1.DERUTF8String=function(t){rt.asn1.DERUTF8String.superclass.constructor.call(this,t),this.hT="0c"},it.lang.extend(rt.asn1.DERUTF8String,rt.asn1.DERAbstractString),rt.asn1.DERNumericString=function(t){rt.asn1.DERNumericString.superclass.constructor.call(this,t),this.hT="12"},it.lang.extend(rt.asn1.DERNumericString,rt.asn1.DERAbstractString),rt.asn1.DERPrintableString=function(t){rt.asn1.DERPrintableString.superclass.constructor.call(this,t),this.hT="13"},it.lang.extend(rt.asn1.DERPrintableString,rt.asn1.DERAbstractString),rt.asn1.DERTeletexString=function(t){rt.asn1.DERTeletexString.superclass.constructor.call(this,t),this.hT="14"},it.lang.extend(rt.asn1.DERTeletexString,rt.asn1.DERAbstractString),rt.asn1.DERIA5String=function(t){rt.asn1.DERIA5String.superclass.constructor.call(this,t),this.hT="16"},it.lang.extend(rt.asn1.DERIA5String,rt.asn1.DERAbstractString),rt.asn1.DERUTCTime=function(t){rt.asn1.DERUTCTime.superclass.constructor.call(this,t),this.hT="17",this.setByDate=function(t){this.hTLV=null,this.isModified=!0,this.date=t,this.s=this.formatDate(this.date,"utc"),this.hV=stohex(this.s)},this.getFreshValueHex=function(){return void 0===this.date&&void 0===this.s&&(this.date=new Date,this.s=this.formatDate(this.date,"utc"),this.hV=stohex(this.s)),this.hV},void 0!==t&&(void 0!==t.str?this.setString(t.str):"string"==typeof t&&t.match(/^[0-9]{12}Z$/)?this.setString(t):void 0!==t.hex?this.setStringHex(t.hex):void 0!==t.date&&this.setByDate(t.date))},it.lang.extend(rt.asn1.DERUTCTime,rt.asn1.DERAbstractTime),rt.asn1.DERGeneralizedTime=function(t){rt.asn1.DERGeneralizedTime.superclass.constructor.call(this,t),this.hT="18",this.withMillis=!1,this.setByDate=function(t){this.hTLV=null,this.isModified=!0,this.date=t,this.s=this.formatDate(this.date,"gen",this.withMillis),this.hV=stohex(this.s)},this.getFreshValueHex=function(){return void 0===this.date&&void 0===this.s&&(this.date=new Date,this.s=this.formatDate(this.date,"gen",this.withMillis),this.hV=stohex(this.s)),this.hV},void 0!==t&&(void 0!==t.str?this.setString(t.str):"string"==typeof t&&t.match(/^[0-9]{14}Z$/)?this.setString(t):void 0!==t.hex?this.setStringHex(t.hex):void 0!==t.date&&this.setByDate(t.date),!0===t.millis&&(this.withMillis=!0))},it.lang.extend(rt.asn1.DERGeneralizedTime,rt.asn1.DERAbstractTime),rt.asn1.DERSequence=function(t){rt.asn1.DERSequence.superclass.constructor.call(this,t),this.hT="30",this.getFreshValueHex=function(){for(var t="",e=0;e<this.asn1Array.length;e++)t+=this.asn1Array[e].getEncodedHex();return this.hV=t,this.hV}},it.lang.extend(rt.asn1.DERSequence,rt.asn1.DERAbstractStructured),rt.asn1.DERSet=function(t){rt.asn1.DERSet.superclass.constructor.call(this,t),this.hT="31",this.sortFlag=!0,this.getFreshValueHex=function(){for(var t=new Array,e=0;e<this.asn1Array.length;e++){var i=this.asn1Array[e];t.push(i.getEncodedHex())}return 1==this.sortFlag&&t.sort(),this.hV=t.join(""),this.hV},void 0!==t&&void 0!==t.sortflag&&0==t.sortflag&&(this.sortFlag=!1)},it.lang.extend(rt.asn1.DERSet,rt.asn1.DERAbstractStructured),rt.asn1.DERTaggedObject=function(t){rt.asn1.DERTaggedObject.superclass.constructor.call(this),this.hT="a0",this.hV="",this.isExplicit=!0,this.asn1Object=null,this.setASN1Object=function(t,e,i){this.hT=e,this.isExplicit=t,this.asn1Object=i,this.isExplicit?(this.hV=this.asn1Object.getEncodedHex(),this.hTLV=null,this.isModified=!0):(this.hV=null,this.hTLV=i.getEncodedHex(),this.hTLV=this.hTLV.replace(/^../,e),this.isModified=!1)},this.getFreshValueHex=function(){return this.hV},void 0!==t&&(void 0!==t.tag&&(this.hT=t.tag),void 0!==t.explicit&&(this.isExplicit=t.explicit),void 0!==t.obj&&(this.asn1Object=t.obj,this.setASN1Object(this.isExplicit,this.hT,this.asn1Object)))},it.lang.extend(rt.asn1.DERTaggedObject,rt.asn1.ASN1Object);var nt,st,ot=(nt=function(t,e){return nt=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])},nt(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function i(){this.constructor=t}nt(t,e),t.prototype=null===e?Object.create(e):(i.prototype=e.prototype,new i)}),ht=function(t){function e(i){var r=t.call(this)||this;return i&&("string"==typeof i?r.parseKey(i):(e.hasPrivateKeyProperty(i)||e.hasPublicKeyProperty(i))&&r.parsePropertiesFrom(i)),r}return ot(e,t),e.prototype.parseKey=function(t){try{var e=0,i=0,r=/^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/.test(t)?function(t){var e;if(void 0===c){var i="0123456789ABCDEF",r=" \f\n\r\t \u2028\u2029";for(c={},e=0;e<16;++e)c[i.charAt(e)]=e;for(i=i.toLowerCase(),e=10;e<16;++e)c[i.charAt(e)]=e;for(e=0;e<r.length;++e)c[r.charAt(e)]=-1}var n=[],s=0,o=0;for(e=0;e<t.length;++e){var h=t.charAt(e);if("="==h)break;if(-1!=(h=c[h])){if(void 0===h)throw new Error("Illegal character at offset "+e);s|=h,++o>=2?(n[n.length]=s,s=0,o=0):s<<=4}}if(o)throw new Error("Hex encoding incomplete: 4 bits missing");return n}(t):v.unarmor(t),n=x.decode(r);if(3===n.sub.length&&(n=n.sub[2].sub[0]),9===n.sub.length){e=n.sub[1].getHexStringValue(),this.n=L(e,16),i=n.sub[2].getHexStringValue(),this.e=parseInt(i,16);var s=n.sub[3].getHexStringValue();this.d=L(s,16);var o=n.sub[4].getHexStringValue();this.p=L(o,16);var h=n.sub[5].getHexStringValue();this.q=L(h,16);var a=n.sub[6].getHexStringValue();this.dmp1=L(a,16);var u=n.sub[7].getHexStringValue();this.dmq1=L(u,16);var f=n.sub[8].getHexStringValue();this.coeff=L(f,16)}else{if(2!==n.sub.length)return!1;if(n.sub[0].sub){var l=n.sub[1].sub[0];e=l.sub[0].getHexStringValue(),this.n=L(e,16),i=l.sub[1].getHexStringValue(),this.e=parseInt(i,16)}else e=n.sub[0].getHexStringValue(),this.n=L(e,16),i=n.sub[1].getHexStringValue(),this.e=parseInt(i,16)}return!0}catch(t){return!1}},e.prototype.getPrivateBaseKey=function(){var t={array:[new rt.asn1.DERInteger({int:0}),new rt.asn1.DERInteger({bigint:this.n}),new rt.asn1.DERInteger({int:this.e}),new rt.asn1.DERInteger({bigint:this.d}),new rt.asn1.DERInteger({bigint:this.p}),new rt.asn1.DERInteger({bigint:this.q}),new rt.asn1.DERInteger({bigint:this.dmp1}),new rt.asn1.DERInteger({bigint:this.dmq1}),new rt.asn1.DERInteger({bigint:this.coeff})]};return new rt.asn1.DERSequence(t).getEncodedHex()},e.prototype.getPrivateBaseKeyB64=function(){return p(this.getPrivateBaseKey())},e.prototype.getPublicBaseKey=function(){var t=new rt.asn1.DERSequence({array:[new rt.asn1.DERObjectIdentifier({oid:"1.2.840.113549.1.1.1"}),new rt.asn1.DERNull]}),e=new rt.asn1.DERSequence({array:[new rt.asn1.DERInteger({bigint:this.n}),new rt.asn1.DERInteger({int:this.e})]}),i=new rt.asn1.DERBitString({hex:"00"+e.getEncodedHex()});return new rt.asn1.DERSequence({array:[t,i]}).getEncodedHex()},e.prototype.getPublicBaseKeyB64=function(){return p(this.getPublicBaseKey())},e.wordwrap=function(t,e){if(!t)return t;var i="(.{1,"+(e=e||64)+"})( +|$\n?)|(.{1,"+e+"})";return t.match(RegExp(i,"g")).join("\n")},e.prototype.getPrivateKey=function(){var t="-----BEGIN RSA PRIVATE KEY-----\n";return(t+=e.wordwrap(this.getPrivateBaseKeyB64())+"\n")+"-----END RSA PRIVATE KEY-----"},e.prototype.getPublicKey=function(){var t="-----BEGIN PUBLIC KEY-----\n";return(t+=e.wordwrap(this.getPublicBaseKeyB64())+"\n")+"-----END PUBLIC KEY-----"},e.hasPublicKeyProperty=function(t){return(t=t||{}).hasOwnProperty("n")&&t.hasOwnProperty("e")},e.hasPrivateKeyProperty=function(t){return(t=t||{}).hasOwnProperty("n")&&t.hasOwnProperty("e")&&t.hasOwnProperty("d")&&t.hasOwnProperty("p")&&t.hasOwnProperty("q")&&t.hasOwnProperty("dmp1")&&t.hasOwnProperty("dmq1")&&t.hasOwnProperty("coeff")},e.prototype.parsePropertiesFrom=function(t){this.n=t.n,this.e=t.e,t.hasOwnProperty("d")&&(this.d=t.d,this.p=t.p,this.q=t.q,this.dmp1=t.dmp1,this.dmq1=t.dmq1,this.coeff=t.coeff)},e}(tt),at=i(155),ut=void 0!==at?null===(st=at.env)||void 0===st?void 0:"3.3.2":void 0;const ct=function(){function t(t){void 0===t&&(t={}),t=t||{},this.default_key_size=t.default_key_size?parseInt(t.default_key_size,10):1024,this.default_public_exponent=t.default_public_exponent||"010001",this.log=t.log||!1,this.key=null}return t.prototype.setKey=function(t){this.log&&this.key&&console.warn("A key was already set, overriding existing."),this.key=new ht(t)},t.prototype.setPrivateKey=function(t){this.setKey(t)},t.prototype.setPublicKey=function(t){this.setKey(t)},t.prototype.decrypt=function(t){try{return this.getKey().decrypt(g(t))}catch(t){return!1}},t.prototype.encrypt=function(t){try{return p(this.getKey().encrypt(t))}catch(t){return!1}},t.prototype.sign=function(t,e,i){try{return p(this.getKey().sign(t,e,i))}catch(t){return!1}},t.prototype.verify=function(t,e,i){try{return this.getKey().verify(t,g(e),i)}catch(t){return!1}},t.prototype.getKey=function(t){if(!this.key){if(this.key=new ht,t&&"[object Function]"==={}.toString.call(t))return void this.key.generateAsync(this.default_key_size,this.default_public_exponent,t);this.key.generate(this.default_key_size,this.default_public_exponent)}return this.key},t.prototype.getPrivateKey=function(){return this.getKey().getPrivateKey()},t.prototype.getPrivateKeyB64=function(){return this.getKey().getPrivateBaseKeyB64()},t.prototype.getPublicKey=function(){return this.getKey().getPublicKey()},t.prototype.getPublicKeyB64=function(){return this.getKey().getPublicBaseKeyB64()},t.version=ut,t}()})(),r.default})()));
\ No newline at end of file
diff --git a/utils/passwordEncode.js b/utils/passwordEncode.js
new file mode 100644
index 0000000..032958e
--- /dev/null
+++ b/utils/passwordEncode.js
@@ -0,0 +1,21 @@
+const JSEncrypt = require('./jsencrypt.min.js');
+
+
+// 支付密码加密
+// 公钥
+const keyPub = "-----BEGIN PUBLIC KEY-----\n" +
+"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1yLtKwRwC/Uv35920h7X4on8/\n"+
+"hR8AuYnWOsyDCGbepY+1cMhSX2zOu8BUINk5UcwIbm62Ki7xZIWT9+1Wn0y7dfJb\n"+
+"kub5O6/lM3oHuY7eT9alYs5kw8EWsznT/zeE9sapTJyPVDhRuFwslEayzPhx6lVR\n"+
+"6lwfQTK/gfUtz8gbxwIDAQAB\n"+
+"-----END PUBLIC KEY-----\n"
+
+const handleEncrypt = (str) => {
+    const jsencrypt = new JSEncrypt();
+    jsencrypt.setPublicKey(keyPub); // 设置公钥
+    return jsencrypt.encrypt(str); // 对数据进行加密
+}
+
+module.exports = {
+    handleEncrypt: handleEncrypt,
+}

From b3817f93088b16e1b81e8d9a297892007e221cf0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 13 Feb 2025 17:39:22 +0800
Subject: [PATCH 277/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.wxml |  6 ++++--
 pages/order/pay/index.wxss | 15 +++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index e78639a..db267b0 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -129,11 +129,13 @@
 
     <view wx:if="{{haveSBPassword}}">
         <view class="passward-box-container">
+            <input type="number" value="{{vcode}}" password="true" maxlength="6" focus="{{isFoucs}}" 
+            bindinput="passwordChange"  class="passward-box"   cursor-spacing="20"/>
+
             <input type="number" password="true" class="show-code" wx:for="{{6}}" disabled 
             wx:key="index" value="{{vcode[index]}}" catch:tap="handleFoucs"/>
         </view>
-        <input type="number" value="{{vcode}}" password="true" maxlength="6" focus="{{isFoucs}}" 
-        bindinput="passwordChange"  class="passward-box" />
+        
         <view class="resetPassword">
             <navigator url="/subPackages/password/setting/setting?type=reset">忘记密码</navigator>
         </view>
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index d4206b5..337b03e 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -123,11 +123,18 @@ page {
     border: none;
 }
 .passward-box{
-    width: 0;
-    height: 0;
     border: none;
-    opacity: 0;
+    /* opacity: 0; */
     color: rgba(0,0,0,0);
+    width: 100%;
+    height: 100%;
+    top: 0;
+    position: absolute;
+    caret-color: transparent;
+    text-indent: -999em; /*文本向左缩进*/ 
+    margin-left: -100%; /*输入框光标起始点向左左移*/ 
+    width: 200%; /*输入框增大一倍*/ 
+    text-align: left;
 }
 .resetPassword{
     width: 160rpx;
@@ -135,7 +142,7 @@ page {
     font-weight: 500;
     font-size: 27rpx;
     color: #0C898F;
-    margin: 0 0 0 auto;
+    margin: 30rpx 0 0 auto;
     text-align: right;
 }
 

From 74c65a4f95df371ab7e4338050328e71206bdd56 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Feb 2025 14:17:04 +0800
Subject: [PATCH 278/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js | 20 +++++++++++---------
 utils/passwordEncode.js  | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 954b961..ac5b3c4 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -271,7 +271,7 @@ Page({
     })
   },
   // 电子钱包支付
-  walletPay:function(password){
+  walletPay:function(otherData){
     let item = this.data.payList[this.data.numIndex];
     commonApi.user_post("order/pay",{
       order_id:this.data.id,
@@ -279,8 +279,7 @@ Page({
       pay_platform:"MINI",
       app_name:"WxXcxConfig",
       ins_no:item.ins_no,
-      password: password,
-      type: 1,
+      ...otherData
     }).then(res=>{
       let data = res.data?JSON.parse(res.data):{};
       if(data && data.RESULT && data.RESULT=='Y'){
@@ -377,15 +376,18 @@ Page({
     if (val.length==6) {
         let password = pwEncode.handleEncrypt(val)
         // 验证密码
-        commonApi.user_post("pay_password/verifyPassword",{password:password})
-        .then(res=>{
+        commonApi.user_post("pay_password/verifyPassword",{password:password}).then(res =>{
             // 密码校验成功
             if (res.code == 1) {
-                this.setData({
-                    vcode: '',
-                    SBMask: false,
+                this.setData({vcode: '',SBMask: false})
+                commonApi.user_post('pay_password/getNonce',{}).then(nonceRes =>{
+                    if (nonceRes.code == 1) {
+                        let pwSign =  pwEncode.getPWSignature(password, nonceRes.data)
+                        pwSign.password = password
+                        pwSign.type = 1
+                        this.walletPay(pwSign)
+                    }
                 })
-                this.walletPay(password)
             } else {
                 this.setData({
                     vcode: '',
diff --git a/utils/passwordEncode.js b/utils/passwordEncode.js
index 032958e..254f3b2 100644
--- a/utils/passwordEncode.js
+++ b/utils/passwordEncode.js
@@ -1,4 +1,5 @@
 const JSEncrypt = require('./jsencrypt.min.js');
+import CryptoJS from "crypto-js";
 
 
 // 支付密码加密
@@ -16,6 +17,41 @@ const handleEncrypt = (str) => {
     return jsencrypt.encrypt(str); // 对数据进行加密
 }
 
+// 生成支付加密参数
+const getPWSignature = (password,nonce) => {
+    const salt = generateRandomSalt(16)
+   // 使用 PBKDF2 派生密钥
+   const iterations = 10000;
+   const keySize = 256 / 32; // 256 位密钥
+   const clientKey = CryptoJS.PBKDF2(password, salt, {
+     keySize: keySize,
+     iterations: iterations
+   }).toString(CryptoJS.enc.Base64);
+   // 生成 signature
+   const signature = CryptoJS.HmacSHA256(nonce, clientKey).toString(CryptoJS.enc.Base64)
+
+   return {
+      //  nonce: nonce,
+       signature: signature,
+       client_salt: salt,
+      //  clientKey: clientKey,
+   }
+}
+
+  // 生成指定长度的随机 Salt
+  const generateRandomSalt = (length)=> {
+    const charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let salt = '';
+    for (let i = 0; i < length; i++) {
+      const randomIndex = Math.floor(Math.random() * charset.length);
+      salt += charset.charAt(randomIndex);
+    }
+    return salt;
+  }
+
+
+
 module.exports = {
     handleEncrypt: handleEncrypt,
+    getPWSignature: getPWSignature
 }

From c384413756b75c73348fb82c0ad37673a84eaf76 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Feb 2025 16:00:19 +0800
Subject: [PATCH 279/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js                    | 14 ++++++++++++++
 pages/order/pay/index.wxml                  | 14 +++++++-------
 pages/user/profile/index.js                 | 15 +++++++++++++++
 pages/user/profile/index.wxml               |  6 +++---
 subPackages/password/overview/overview.js   | 21 ++++++++++++++++++---
 subPackages/password/overview/overview.wxml |  5 +++--
 subPackages/password/setting/setting.js     | 18 +++++++++---------
 subPackages/password/setting/setting.wxml   |  2 +-
 8 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index ac5b3c4..dd30a7e 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -45,6 +45,8 @@ Page({
     sendFlag:true,
     regToken:null,
     codeId:null,
+    inputAreaHeight: 0,
+    heightTimer: null,
   },
 
   /**
@@ -359,6 +361,7 @@ Page({
             this.setData({
                 SBMask: true,
                 inputData: inputData,
+                haveSBPassword: false,
             })
         }
       })
@@ -520,6 +523,17 @@ Page({
     })
   },
 
+  inputfocus: function () {
+      clearTimeout(this.data.heightTimer)
+      this.setData({inputAreaHeight: 600})
+  },
+  inputblur: function () {
+      let _this = this
+      this.data.heightTimer = setTimeout(()=>{
+        _this.setData({inputAreaHeight: 0})
+      },300)
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index db267b0..8dbfc57 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -130,7 +130,7 @@
     <view wx:if="{{haveSBPassword}}">
         <view class="passward-box-container">
             <input type="number" value="{{vcode}}" password="true" maxlength="6" focus="{{isFoucs}}" 
-            bindinput="passwordChange"  class="passward-box"   cursor-spacing="20"/>
+            bindinput="passwordChange"  class="passward-box"   cursor-spacing="100"/>
 
             <input type="number" password="true" class="show-code" wx:for="{{6}}" disabled 
             wx:key="index" value="{{vcode[index]}}" catch:tap="handleFoucs"/>
@@ -141,25 +141,25 @@
         </view>
     </view>
 
-    <view wx:else>
-        <view class="bind-box">
+    <view wx:else style="min-height: {{inputAreaHeight}}px;">
+        <view class="bind-box" >
             <view class="bind-item" >
             <view class="bind-item-left">手机号</view>
-            <input type="number" bindinput="inputChange" value="{{inputData.phone}}"  data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
+            <input type="number" bindinput="inputChange" bindfocus="inputfocus" bindblur="inputblur" value="{{inputData.phone}}"  data-keyname="phone" class="weui-input" disabled placeholder="请输入您的手机号" />
             </view>
             <view class="bind-item" >
             <view class="bind-item-left">验证码</view>
-            <input type="number" bindinput="inputChange" data-keyname="code" class="weui-input" placeholder="请输入验证码" />
+            <input type="number" bindinput="inputChange" bindfocus="inputfocus" bindblur="inputblur"  data-keyname="code" class="weui-input" placeholder="请输入验证码" />
             <button class="vaild-number" type="primary" size="mini" bindtap="getCode">{{buttonText}}</button>
             </view>
 
             <view class="bind-item" >
                 <view class="bind-item-left">设置支付密码</view>
-                <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="password" class="weui-input" placeholder="请设置您的支付密码" />
+                <input type="number" password="true" maxlength="6" bindfocus="inputfocus" bindblur="inputblur"  bindinput="inputChange" data-keyname="password" class="weui-input" placeholder="请设置您的支付密码" />
             </view>
             <view class="bind-item">
             <view class="bind-item-left">再次填写密码</view>
-            <input type="number" password="true" maxlength="6" bindinput="inputChange" data-keyname="confirmPassword"  class="weui-input" placeholder="再次填写您的支付密码" />
+            <input type="number" password="true" maxlength="6" bindfocus="inputfocus" bindblur="inputblur"  bindinput="inputChange" data-keyname="confirmPassword"  class="weui-input" placeholder="再次填写您的支付密码" />
             </view>
         </view>
         <view class="btn {{canSubmit?'':'disabled'}}" bindtap="submit">确 定</view>
diff --git a/pages/user/profile/index.js b/pages/user/profile/index.js
index 2154e6e..ffd5591 100644
--- a/pages/user/profile/index.js
+++ b/pages/user/profile/index.js
@@ -159,6 +159,19 @@ Page({
     })
   },
 
+  goOverview () {
+      if (this.data.info && this.data.info.mobile) {
+          wx.navigateTo({
+            url: '/subPackages/password/overview/overview',
+          })
+      } else {
+          wx.showToast({
+            title: '请先绑定手机号',
+            icon: 'none'
+          })
+      }
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -181,6 +194,8 @@ Page({
           sexIndex:1
         })
       }
+
+      console.log(this.data.info)
     })
   },
 
diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml
index 3af30d5..4883063 100644
--- a/pages/user/profile/index.wxml
+++ b/pages/user/profile/index.wxml
@@ -23,7 +23,7 @@
 </navigator>
 <navigator url="../bindtel/index" class="profile-item" wx:if="{{info}}">
   <text>手机号</text>
-  <view class="info">{{info.mobile}}</view>
+  <view class="info">{{info.mobile?info.mobile:''}}</view>
   <view class="iconfont icon-you"></view>
 </navigator>
 <view class="profile-item">
@@ -48,11 +48,11 @@
   </view>
   <view class="iconfont icon-you"></view>
 </view>
-<navigator url="/subPackages/password/overview/overview" class="profile-item">
+<view bind:tap="goOverview" url="/subPackages/password/overview/overview" class="profile-item">
   <text>支付密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
-</navigator>
+</view>
 <navigator url="../logout/index" class="profile-item">
   <text>注销账号</text>
   <view class="info">注销后账号无法恢复，请谨慎操作</view>
diff --git a/subPackages/password/overview/overview.js b/subPackages/password/overview/overview.js
index c98e147..5a7da4a 100644
--- a/subPackages/password/overview/overview.js
+++ b/subPackages/password/overview/overview.js
@@ -33,9 +33,24 @@ Page({
           })
           return
       }
-      wx.navigateTo({
-        url: '/subPackages/password/setting/setting?type='+type,
-      })
+
+      if (type == 'reset') {
+        commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+            if (res.code!=1) {
+                return
+            } else {
+                wx.navigateTo({
+                    url: '/subPackages/password/setting/setting?type='+type,
+                })
+            }
+          })
+      } else {
+          wx.navigateTo({
+            url: '/subPackages/password/setting/setting?type='+type,
+          })
+      }
+
+      
   },
 
 
diff --git a/subPackages/password/overview/overview.wxml b/subPackages/password/overview/overview.wxml
index d8026cb..08d0cfc 100644
--- a/subPackages/password/overview/overview.wxml
+++ b/subPackages/password/overview/overview.wxml
@@ -5,14 +5,15 @@
 <view bindtap="goSetting" data-type="add" class="profile-item" >
   <text>设置支付密码</text>
   <view class="info" wx:if="{{havePassword}}">已设置</view>
+  
   <view class="iconfont icon-you" wx:else></view>
 </view>
-<view bindtap="goSetting" data-type="edit" class="profile-item" >
+<view bindtap="goSetting" data-type="edit" class="profile-item"  wx:if="{{havePassword}}">
   <text>修改密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
 </view>
-<view bindtap="goSetting" data-type="reset" class="profile-item">
+<view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword}}">
   <text>忘记密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
diff --git a/subPackages/password/setting/setting.js b/subPackages/password/setting/setting.js
index bb6eef5..64f8229 100644
--- a/subPackages/password/setting/setting.js
+++ b/subPackages/password/setting/setting.js
@@ -44,14 +44,6 @@ Page({
         title: options.type=='reset'?'忘记密码':options.type=='edit'?'修改密码':'设置支付密码',
         editConfrim: options.type == 'edit'?true:false
     })
-
-    let userinfo = wx.getStorageSync('jstrip_userInfo')
-    if (userinfo && userinfo.mobile) {
-        this.data.inputData.phone = userinfo.mobile
-        this.setData({
-            inputData: this.data.inputData
-        })
-    }
   },
 
   // 编辑时输入原密码
@@ -237,7 +229,15 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-   
+    commonApi.user_post("user/getMyInfo",{}).then(res=>{
+        let userinfo = res.data
+        if (userinfo && userinfo.mobile) {
+            this.data.inputData.phone = userinfo.mobile
+            this.setData({
+                inputData: this.data.inputData
+            })
+        }
+    })
   },
 
   /**
diff --git a/subPackages/password/setting/setting.wxml b/subPackages/password/setting/setting.wxml
index f31c4dd..5e30328 100644
--- a/subPackages/password/setting/setting.wxml
+++ b/subPackages/password/setting/setting.wxml
@@ -17,7 +17,7 @@
     <view class="bind-box">
         <view class="bind-item" wx:if="{{type!='edit'}}">
         <view class="bind-item-left">手机号</view>
-        <input type="number" bindinput="inputChange" value="{{inputData.phone}}" data-keyname="phone" class="weui-input" auto-focus placeholder="请输入您的手机号" />
+        <input type="number" bindinput="inputChange" disabled value="{{inputData.phone}}" data-keyname="phone" class="weui-input" placeholder="请输入您的手机号" />
         </view>
         <view class="bind-item" wx:if="{{type!='edit'}}">
         <view class="bind-item-left">验证码</view>

From d6f073dc4ee7e1ef1949c2bf4384cfbc17af772d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Feb 2025 17:32:35 +0800
Subject: [PATCH 280/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |  2 +-
 pages/info/activityInfo/index.js            | 43 ++++++++++++++++++++-
 pages/order/scene/index.js                  |  1 +
 pages/user/order/activityOrderInfo/index.js |  3 +-
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 419407e..6cc941c 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.isTest164? true : false;
+      data.isTest = data.isTest165? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/activityInfo/index.js b/pages/info/activityInfo/index.js
index a2082a2..8f8e824 100644
--- a/pages/info/activityInfo/index.js
+++ b/pages/info/activityInfo/index.js
@@ -339,9 +339,48 @@ Page({
         product: res.data.product
       }
       app.globalData.retailId = this.data.retailId;
-      wx.navigateTo({
-        url: '/pages/order/scene/index',
+
+      this.getDefaultTime()
+
+      
+    })
+  },
+
+
+  // 获取默认时间
+  getDefaultTime () {
+    let today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 60 * 24 * 60 * 60 * 1000));
+    commonApi.user_post("product/product_date_price", {
+        start_date: today,
+        end_date: end_date,
+        sku_id: this.data.info.sku_id
+      }).then(res => {
+          for (let i = 0; i < res.data.length; i++) {
+            if (res.data[i].stock > 0) {
+              this.getTimeStock(res.data[i])
+              break;
+            }
+          }
       })
+  },
+
+  getTimeStock: function (dateObj) {
+    commonApi.user_post("product/product_timestock_price", {
+      date: dateObj.date,
+      sku_id: this.data.info.sku_id
+    }).then(res => {
+      for (let i = 0; i < res.data.length; i++) {
+        if (res.data[i].stock_number > 0) {
+            app.globalData.product.date = dateObj
+            app.globalData.product.time = res.data[i]
+            // app.globalData.product.changeFlag = true
+          break
+        }
+      }
+    }).finally(()=>{
+        wx.navigateTo({
+            url: '/pages/order/scene/index?type=museum',
+          })
     })
   },
 
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 1bdae09..98a9afd 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -399,6 +399,7 @@ Page({
 	
   },
   changed() {
+      console.log('time---',this.data.date,this.data.time)
     app.globalData.product.date = this.data.date
     app.globalData.product.time = this.data.time
     app.globalData.product.changeFlag = true
diff --git a/pages/user/order/activityOrderInfo/index.js b/pages/user/order/activityOrderInfo/index.js
index f46cc3d..6137a8a 100644
--- a/pages/user/order/activityOrderInfo/index.js
+++ b/pages/user/order/activityOrderInfo/index.js
@@ -26,10 +26,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(productState)
     this.setData({
       id:options.id
     })
+    console.log(this.data.id)
+
   },
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];

From 09b0b0a25ee9a2b438d7d37f0c58b35487950bac Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Feb 2025 17:42:32 +0800
Subject: [PATCH 281/471] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js                    | 11 +++++++++++
 pages/order/pay/index.wxml                  |  2 +-
 subPackages/password/overview/overview.js   | 11 ++++++++++-
 subPackages/password/overview/overview.wxml |  4 ++--
 subPackages/password/setting/setting.js     |  2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index dd30a7e..a9e23e0 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -533,6 +533,17 @@ Page({
         _this.setData({inputAreaHeight: 0})
       },300)
   },
+  goReset: function () {
+    commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+        if (res.code!=1) {
+            return
+        } else {
+            wx.navigateTo({
+                url: '/subPackages/password/setting/setting?type='+type,
+            })
+        }
+      })
+  },
 
   /**
    * 生命周期函数--监听页面隐藏
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 8dbfc57..e798803 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -137,7 +137,7 @@
         </view>
         
         <view class="resetPassword">
-            <navigator url="/subPackages/password/setting/setting?type=reset">忘记密码</navigator>
+            <view bind:tap="goReset" url="/subPackages/password/setting/setting?type=reset">忘记密码</view>
         </view>
     </view>
 
diff --git a/subPackages/password/overview/overview.js b/subPackages/password/overview/overview.js
index 5a7da4a..7b4667e 100644
--- a/subPackages/password/overview/overview.js
+++ b/subPackages/password/overview/overview.js
@@ -11,7 +11,7 @@ Page({
   data: {
   
     havePassword:false,
-   
+    isLock: false
   },
 
   /**
@@ -69,6 +69,15 @@ Page({
       this.setData({
         havePassword:res.data,
       })
+
+      if (res.data) {
+        commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+            this.setData({
+                isLock: !res.data
+            })
+          })
+      }
+
     })
   },
 
diff --git a/subPackages/password/overview/overview.wxml b/subPackages/password/overview/overview.wxml
index 08d0cfc..6f8d57c 100644
--- a/subPackages/password/overview/overview.wxml
+++ b/subPackages/password/overview/overview.wxml
@@ -8,12 +8,12 @@
   
   <view class="iconfont icon-you" wx:else></view>
 </view>
-<view bindtap="goSetting" data-type="edit" class="profile-item"  wx:if="{{havePassword}}">
+<view bindtap="goSetting" data-type="edit" class="profile-item"  wx:if="{{havePassword&&!isLock}}">
   <text>修改密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
 </view>
-<view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword}}">
+<view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword&&!isLock}}">
   <text>忘记密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
diff --git a/subPackages/password/setting/setting.js b/subPackages/password/setting/setting.js
index 64f8229..f1a03b2 100644
--- a/subPackages/password/setting/setting.js
+++ b/subPackages/password/setting/setting.js
@@ -229,7 +229,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post("user/getMyInfo",{}).then(res=>{
+    commonApi.user_post("uservice/user/getMyInfo",{}).then(res=>{
         let userinfo = res.data
         if (userinfo && userinfo.mobile) {
             this.data.inputData.phone = userinfo.mobile

From 5ac6c359039c27dc34ea68b5c9bf65b99a0eb4cb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 17 Feb 2025 09:17:15 +0800
Subject: [PATCH 282/471] =?UTF-8?q?=E5=86=AC=E5=AD=A3=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                         |   16 +-
 images/{home.png => index.png}   |  Bin
 pages/index/index.js             |  891 ++++++++++----------------
 pages/index/index.wxml           | 1009 +++++++++++++++++++-----------
 pages/index/index.wxss           |  632 +++++--------------
 subPackages/indexGQ/imgSource.js |  113 ++++
 subPackages/indexGQ/index.js     |    6 +-
 subPackages/indexGQ/index.wxml   |   63 +-
 subPackages/indexGQ/index.wxss   |    5 +-
 9 files changed, 1298 insertions(+), 1437 deletions(-)
 rename images/{home.png => index.png} (100%)
 mode change 100755 => 100644
 create mode 100644 subPackages/indexGQ/imgSource.js

diff --git a/app.json b/app.json
index 0bbbcb6..b2b9524 100644
--- a/app.json
+++ b/app.json
@@ -231,27 +231,27 @@
   "style": "v2",
   "sitemapLocation": "sitemap.json",
   "tabBar": {
-    "color": "#999999",
-    "selectedColor": "#FF4848",
+    "color": "#97D0EC",
+    "selectedColor": "#5184B0",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
-        "iconPath": "/images/aindex.png",
-        "selectedIconPath": "/images/aindex_seld.png",
+        "iconPath": "/images/index.png",
+        "selectedIconPath": "/images/index_seld_2.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
-        "iconPath": "/images/amap.png",
-        "selectedIconPath": "/images/amap_seld.png",
+        "iconPath": "/images/map.png",
+        "selectedIconPath": "/images/map_seld_2.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
-        "iconPath": "/images/auser.png",
-        "selectedIconPath": "/images/auser_seld.png",
+        "iconPath": "/images/user.png",
+        "selectedIconPath": "/images/user_seld_2.png",
         "text": "我的"
       }
     ]
diff --git a/images/home.png b/images/index.png
old mode 100755
new mode 100644
similarity index 100%
rename from images/home.png
rename to images/index.png
diff --git a/pages/index/index.js b/pages/index/index.js
index d5cf101..f0ffd00 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,11 +1,16 @@
 //index.js
 //获取应用实例
 let app = getApp()
+import imageSource from "./imgSource"
+
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
+import https from "../../utils/https.js"
+
 Page({
 	data: {
+        bannerInterver: 1000*60,
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -17,9 +22,7 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
-			"gongyeyuanqu", "gaoxin"
-		],
+		
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -33,8 +36,9 @@ Page({
 		videoPrize: false,
 		prizeInfo: null,
 		otherPlat: null,
-		activeBannerIndex: 5,
-		smBannerIndex: 0,
+		activeBannerIndex: 0,
+        smBannerIndex: 0,
+        XPathBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -48,98 +52,43 @@ Page({
 		showTime: false,
 		xpth: {}, // 元旦新增 新品特惠和sqjNew
 		djs: null, // 元旦新增 新品特惠倒计时
-		djsTime: null,
+        djsTime: null,
+        area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
 		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
+            'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
+			'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓
+            'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山
+            'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江
+            'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区
+            'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港
+            'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中
+            'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城
+            'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
+			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
 		],
 		viewHeight: "0px",
 		isMuted: true,
-    videoPlay: false,
-    hdrlNavList:[
-      {
-        type:null,
-        title:'全部'
-      },
-      {
-        type:'scene',
-        title:'景区活动'
-      },
-      {
-        type:'show',
-        title:'演出'
-      },
-      {
-        type:'exhibition',
-        title:'展览'
-      },
-      {
-        type:'movie',
-        title:'电影'
-      },
-      {
-        type:'other',
-        title:'其他'
-      }
-    ], //活动日历板块导航分类
-    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
-    today:null,
-    hdrlList:[],
-    yszNav:['公共服务','旅游助手'],
-    yszIndex:0,
-    bdList:[
-        {
-            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/4b46ddaa6f9b66fd33c85b4cd34aa2e3.png', //游 景点
-            url:'',
-            path:'/pages/list/scene/index',
-            list: [],
-            
-        },
-        {
-            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/218d224b27b6363e11a5e2ec25990ff2.png', //非玩不可 景点产品
-            path:'/pages/list/night/index',
-            url:'',
-            list: [],
-            
-        },
-        {
-            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/b53c5039299b3152f72eae11a88b7eae.png', //非看不可
-            url:'',
-            path:'/pages/list/theatre/index',
-            list: [],
-            
-        },
-        {
-            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/307d96f6b88be850eb5cd67ef7942f32.png', //非买不可
-            path:'/subPackages/techanNew/index',
-            url:'',
-            list: [],
-            
-        },
-      
-      
-    ],
-    list1:[], //游-景点
-    list2:[], //非晚-夜游
-    list3:[], //非看-剧场演出
-    list4:[], //非买-文创
-    
-    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
-    
+        videoPlay: false,
+
+        // 页面图片
+        imageSourceList:imageSource,
 	},
 	onLoad: function(options) {
+        console.log('onload')
+
+        wx.getLocation({type: 'gcj02'})
+           
+		console.log('options',options)
+		// 相城小程序跳转获取用户信息
+		if(options && options.szxcCode) {
+			commonApi._post("uservice/user/loginByXC", {
+				code: options.szxcCode
+			}).then(res => {
+				if(res.data && res.data.id && res.data.token) {
+				  https.set_logininfo(res);
+				}
+			})
+		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -151,11 +100,9 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
-					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
-					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -198,21 +145,7 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-    }
-    // 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-    let d = new Date();
-    let month = d.getMonth() + 1,
-      day = d.getDate();
-    month = month > 10 ? month : ("0" + month);
-    day = day > 10 ? day : ("0" + day);
-    this.setData({
-      today: d.getFullYear() + "-" + month + "-" + day
-    })
+		}
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -223,12 +156,10 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-        this.getList()
-        this.getHdrlList()
+				this.getList()
 			},
 			fail: (err) => {
-        this.getList()
-        this.getHdrlList()
+				this.getList()
 			}
 		})
 		this.setData({
@@ -247,260 +178,99 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-    this.getWeather()
-  },
-  gobdDetail(e) {
-    let item = e.currentTarget.dataset.item
-    // wx.navigateTo({
-    //   url: url
-    // })
-    util.gotoDetail(item)
-  },
-  getList() {
-    let bdList = this.data.bdList
-    // 游--景点
-    commonApi._post("scene/get_scene_by_tag",{
-      tag_id:"4",
-      limit:6,
-      lon:this.data.lon,
-      lat:this.data.lat,
-      offset:0,
-      sort:"weight",
-      title:'',
-      area_id:''
-    }).then(res=>{
-      console.log('景点', res)
-      res.data.list.map(item => {
-        if (item.distance || item.distance == 0) {
-          if (item.distance >= 1000) {
-            item.distance = (item.distance / 1000).toFixed(2) + 'km';
-          } else {
-            item.distance = (item.distance).toFixed(2) + 'm';
-          }
-        }
-      })
-      bdList[0].list = res.data.list
-      this.setData({
-        list1:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非买不可--文创
-    commonApi._post('product/get_product_by_tag',{
-        product_model: 'post',
-      offset: 0,
-      limit: 6,
-      sort:'sales_number',
-      order:'desc',
-    }).then(res=>{
-        bdList[3].list = res.data.list
-      this.setData({
-        list4:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非游不可--线路一日游
-    commonApi._post('product/get_product_by_tag',{
-    //   type_id: 23,
-      tag_id: "10,11,12",
-      offset: 0,
-      limit: 6,
-      sort: 'weight'
-    }).then(res=>{
-        bdList[1].list = res.data.list
-      this.setData({
-        list2:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非看不可--剧场演出
-    commonApi._post("product/get_product_by_tag",{
-      tag_id:"477",
-      offset:0,
-      limit:6,
-      sort:'',
-      order:'',
-      lat:this.data.lat,
-      lon:this.data.lon,
-      title:''
-    }).then(res=>{
-        bdList[2].list = res.data.list
-      this.setData({
-        list3:res.data.list,
-        bdList: bdList
-      })
-    })
-  },
-  goDetail(e) {
-    let item = e.currentTarget.dataset.item;
-    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
-    if (type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
-    }else {
-      wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id=' + item.id,
-      })
-    }
-  },
-  // 分类为电影时调这个接口
-  getMovieList() {
-    let service = "Cinema/getHotMovieList";
-		let data = {
-			page: 1,
-			pageSize: 5
-    };
-    commonApi._post(service, data).then(res => {
-      console.log(res.data);
-			this.setData({
-				hdrlList: res.data
-			})
-    })
-    console.log(this.data.hdrlList);
-  },
-  // 推荐榜单更多跳转
-  moreBtn(e) {
-    let item = e.currentTarget.dataset.item
-    if (item.path!='') {
-      wx.navigateTo({
-        url: item.path,
-      })
-    } else {
-      // if (e.currentTarget.dataset.event) {
-      //   this.pagePoint({
-      //     event: e.currentTarget.dataset.event
-      //   }, 1)
-      // }
-      let url = item.url;
-      app.globalData.weburl = url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-      })
-    }
-  },
-  // 活动日历下的列表
-  getHdrlList() {
-    commonApi._post('pbservice/Actcalendar/getActList', {
-      page_no: 1,
-      date: this.data.today,
-      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
-      keywords: '',
-      area_key: '',
-      lat: this.data.lat,
-      lon: this.data.lon,
-      page_num: 5
-    }).then(res => {
-        res.data.rows.forEach(v=>{
-            if (!v.post_url) {
-                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
-            }
+		this.getWeather()
+		// 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
         })
-      this.setData({
-        hdrlList:res.data.rows
-      })
-    })
-  },
-  // 切换活动日历分类
-  changeHdrlNav(e) {
-    console.log(e.currentTarget.dataset);
-    this.setData({
-      hdrlList:[],
-      hdrlNavIndex:e.currentTarget.dataset.index,
-    })
-    if (this.data.hdrlNavIndex == 4) {
-      this.getMovieList()
-    } else {
-      this.getHdrlList() //切换分类重新获取活动日历列表
-    }
-  },
-  // 游苏州下的公共服务和旅游助手切换
-  changeType(e) {
-    this.setData({
-      yszIndex:e.currentTarget.dataset.index,
-    })
-  },
-  xlzs: function (e) {
-
-    wx.navigateToMiniProgram({
-      appId: 'wx757dd1ee184e75e9',
-      page: "pages/tabBar/index/index"
-    })
-  },
-  // 获取导航栏项目标题高度
+        // 调用接口如果token过期会导致一进入就要登陆
+		// this.getVideoPrize()
+		this.getXpthList()
+	},
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
-				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
-				console.log(that.data.viewHeight)
 			}
 		})
 	},
-	// getXpthList: function() {
-	// 	// 元旦新增 新品特惠
-	// 	commonApi._post("product/get_product_indulgence", {
-	// 		tag_id: 275,
-	// 		typeId: 3,
-	// 	}).then(res => {
-	// 		console.log('data', res.data);
-	// 		this.setData({
-	// 			xpth: res.data,
-	// 			djsTime: res.data.time
-	// 		})
-	// 		let time = setInterval(() => {
-	// 			this.setData({
-	// 				djsTime: this.data.djsTime - 1
-	// 			})
-	// 			this.formatDate(this.data.djsTime)
-	// 		}, 1000)
-	// 		if (this.data.djsTime == 0) {
-	// 			clearInterval(time)
-	// 		}
-	// 	})
-	// },
+	getXpthList: function() {
+		// 元旦新增 新品特惠
+		commonApi._post("product/get_product_indulgence", {
+			tag_id: 275,
+            typeId: 3,
+            type: 1, // 返回数组
+		}).then(res => {
+            // res.data.adv = [res.data.adv]
+			this.setData({
+				xpth: res.data,
+				djsTime: res.data.time
+			})
+			let time = setInterval(() => {
+				this.setData({
+					djsTime: this.data.djsTime - 1
+				})
+				this.formatDate(this.data.djsTime)
+			}, 1000)
+			if (this.data.djsTime == 0) {
+				clearInterval(time)
+			}
+		})
+	},
 	// 元旦新品特惠 倒计时 
-	// formatDate: function(oTime) {
-	// 	let h = parseInt(oTime / 3600)
-	// 	let m = parseInt((oTime % 3600) / 60)
-	// 	let s = parseInt(oTime % 60)
-	// 	h = h < 10 ? "0" + h : h;
-	// 	m = m < 10 ? "0" + m : m;
-	// 	s = s < 10 ? "0" + s : s;
-	// 	this.setData({
-	// 		djs: {
-	// 			h: h,
-	// 			m: m,
-	// 			s: s
-	// 		}
-	// 	})
-	// 	return
-	// },
-  // 非遗跳转
-  // goFeiyi: function() {
-	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-	// 	wx.navigateTo({
-	// 		url: "/pages/pbService/web/index"
-	// 	})
-	// },
-	// onTabItemTap: function(e) {
-	// 	console.log(e, 99999999)
-  // },
-  // 大轮播的监听方法
+	formatDate: function(oTime) {
+		let h = parseInt(oTime / 3600)
+		let m = parseInt((oTime % 3600) / 60)
+		let s = parseInt(oTime % 60)
+		h = h < 10 ? "0" + h : h;
+		m = m < 10 ? "0" + m : m;
+		s = s < 10 ? "0" + s : s;
+		this.setData({
+			djs: {
+				h: h,
+				m: m,
+				s: s
+			}
+		})
+		return
+	},
+	goFeiyi: function() {
+		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+		wx.navigateTo({
+			url: "/pages/pbService/web/index"
+		})
+	},
+	onTabItemTap: function(e) {
+		console.log(e, 99999999)
+	},
 	changeBannerIndex: function(e) {
 		this.setData({
-			activeBannerIndex: e.detail.current
+            activeBannerIndex: e.detail.current,
+            bannerInterver: 5000
 		})
-  },
-  // 小轮播监听方法
+	},
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
-	},
+    },
+    changeXPathBannerIndex: function(e) {
+		this.setData({
+			XPathBannerIndex: e.detail.current
+		})
+    },
+    xlzs: function (e) {
+
+        wx.navigateToMiniProgram({
+          appId: 'wx757dd1ee184e75e9',
+          page: "pages/tabBar/index/index"
+        })
+      },
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -578,10 +348,14 @@ Page({
 		this.setData({
 			indexHot: app.globalData.configJson.indexHot,
 			isTest: app.globalData.configJson.isTest,
-			otherPlat: app.globalData.configJson.otherPlats,
-			indexSeason: app.globalData.configJson.indexSeason
+            otherPlat: app.globalData.configJson.otherPlats,
+            // 正式数据
+            indexSeason: app.globalData.configJson.indexSeason,
+            // 开发数据
+            // indexSeason: imageSource.testImgs.indexSeason
 		})
-		this.getFourProduct()
+        this.getFourProduct()
+        console.log(this.data)
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
@@ -627,7 +401,6 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -725,7 +498,6 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-    console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -751,13 +523,19 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
+		// 	wx.navigateToMiniProgram({
+		// 		appId: 'wxdd39069b9a91dbfe',
+		// 		path: 'pages/index/index'
+		// 	})
+		// 	return;
+		} else if (e.currentTarget.dataset.title == 'e读书') {
 			wx.navigateToMiniProgram({
-				appId: 'wxdd39069b9a91dbfe',
+				appId: 'wx26e6f4c0baba005b',
 				path: 'pages/index/index'
 			})
 			return;
-		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
@@ -803,15 +581,14 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
-		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
+        app.globalData.weburl = url;
+        console.log(url)
 		wx.navigateTo({
 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
 		})
 	},
 	gotoUrl: function(e) {
-		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -823,8 +600,8 @@ Page({
 			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
-    },
-    	// 实时路况跳转外链
+	},
+	// 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -864,7 +641,6 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -886,33 +662,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	// getList: function() {
-	// 	if (!this.data.listMore) return;
-	// 	commonApi._post("search/recommend", {
-	// 		offset: this.data.list.length,
-	// 		limit: 16
-	// 	}).then(res => {
-	// 		res.data.map(item => {
-	// 			if (item.ext.display_tags) {
-	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-	// 			} else {
-	// 				item.ext.display_tags = []
-	// 			}
-	// 		})
-	// 		if (res.data.length < 15) {
-	// 			this.setData({
-	// 				listMore: false
-	// 			})
-	// 		}
-	// 		this.setData({
-	// 			list: this.data.list.concat(res.data)
-	// 		})
-	// 	})
-	// },
+	getList: function() {
+		if (!this.data.listMore) return;
+		commonApi._post("search/recommend", {
+			offset: this.data.list.length,
+			limit: 16
+		}).then(res => {
+			res.data.map(item => {
+				if (item.ext.display_tags) {
+					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+				} else {
+					item.ext.display_tags = []
+				}
+			})
+			if (res.data.length < 15) {
+				this.setData({
+					listMore: false
+				})
+			}
+			this.setData({
+				list: this.data.list.concat(res.data)
+			})
+		})
+	},
 	onReachBottom: function() {
-		// if (this.data.list.length < 30) {
-		// 	this.getList()
-		// }
+		if (this.data.list.length < 30) {
+			this.getList()
+		}
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -963,7 +739,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -972,7 +747,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -989,7 +763,6 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
-						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -1032,7 +805,6 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
-		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -1040,190 +812,189 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	// bannerClick2: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.action == 'href') {
-	// 		if (item.href.indexOf(",") != -1) {
-	// 			let info = item.href.split(",");
-	// 			wx.navigateToMiniProgram({
-	// 				appId: info[0],
-	// 				path: info[1]
-	// 			})
-	// 		} else if (item.href.indexOf('map/index') != -1) {
-	// 			wx.reLaunch({
-	// 				url: item.href
-	// 			})
-	// 		} else {
-	// 			wx.navigateTo({
-	// 				url: item.href,
-	// 			})
-	// 		}
-	// 	} else if (item.action == "web") {
-	// 		app.globalData.weburl = item.href;
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-	// 		})
-	// 	}
-	// },
+	bannerClick2: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.action == 'href') {
+			if (item.href.indexOf(",") != -1) {
+				let info = item.href.split(",");
+				wx.navigateToMiniProgram({
+					appId: info[0],
+					path: info[1]
+				})
+			} else if (item.href.indexOf('map/index') != -1) {
+				wx.reLaunch({
+					url: item.href
+				})
+			} else {
+				wx.navigateTo({
+					url: item.href,
+				})
+			}
+		} else if (item.action == "web") {
+			app.globalData.weburl = item.href;
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+			})
+		}
+	},
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// // 获取短视频大赛是否中奖 中奖详情
-	// getVideoPrize() {
-	// 	let user_id = wx.getStorageSync('jstrip_userid');
-	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-	// 	commonApi.user_post('actonline/video_act/getRaffle', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			videoPrize: res.data
-	// 		})
-	// 	})
-	// },
-	// noMoreTip() {
-	// 	wx.setStorageSync('indexPriceNoTip', true)
-	// 	this.closePrice()
-	// },
-	// closePrice() {
-	// 	this.setData({
-	// 		videoPrize: false,
-	// 		prizeInfo: null
-	// 	})
-	// },
+	// 获取短视频大赛是否中奖 中奖详情
+	getVideoPrize() {
+		let user_id = wx.getStorageSync('jstrip_userid');
+        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+		commonApi.user_post('actonline/video_act/getRaffle', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				videoPrize: res.data
+			})
+		})
+	},
+	noMoreTip() {
+		wx.setStorageSync('indexPriceNoTip', true)
+		this.closePrice()
+	},
+	closePrice() {
+		this.setData({
+			videoPrize: false,
+			prizeInfo: null
+		})
+	},
 	// 抽奖
-	// choosePrize() {
-	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			prizeInfo: res.data
-	// 		})
-	// 		if (res.data.type != 'none') {
-	// 			// 抽奖成功的话 弹框
-	// 			wx.showModal({
-	// 				title: "提示",
-	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-	// 				showCancel: false
-	// 			})
-	// 		}
-	// 	})
-	// },
-	// bannerJumpNew(item) {
-	// 	let that = this
-	// 	item = item.currentTarget.dataset.item
-	// 	if (item.tdata == '') return
-	// 	that.pagePoint({
-	// 		event: "banner_click",
-	// 		type: 'banner'
-	// 	}, 1)
-	// 	switch (item.jump_type) {
-	// 		case 0:
-	// 			break;
-	// 		case 1:
-	// 			util.gotoDetail(item.product_model)
-	// 			break;
-	// 		case 2:
-	// 			if (item.front_model && item.front_model.mini) {
-	// 				wx.navigateTo({
-	// 					url: "/" + item.front_model.mini
-	// 				})
-	// 			}
-	// 			break;
-	// 		case 3:
-	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-	// 				// 外部h5
-	// 				console.log(item.tdata)
-	// 				app.globalData.weburl = item.tdata.url;
-	// 				wx.navigateTo({
-	// 					url: "/pages/pbService/web/index"
-	// 				})
-	// 			} else {
-	// 				let page = item.tdata.url.split("/");
-	// 				page = page[page.length - 1].split("?")
-	// 				console.log(page[0])
-	// 				let url = this.data.urltopage[page[0]];
-	// 				if (url && url.indexOf('map') != -1) {
-	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-	// 							'cinema', 'academes'
-	// 						],
-	// 						type = page[1] ? page[1].split("=") : [];
-	// 					wx.reLaunch({
-	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-	// 					})
-	// 				} else if (url) {
-	// 					wx.navigateTo({
-	// 						url: url,
-	// 					})
-	// 				} else {
-	// 					app.globalData.weburl = item.tdata.url;
-	// 					wx.navigateTo({
-	// 						url: "/pages/pbService/web/index"
-	// 					})
-	// 				}
-	// 			}
-	// 			break;
-	// 		case 4:
-	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-	// 				// 如果是苏心游的小程序 直接把authCode带过去
-	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-	// 					let weburl = item.tdata.page
-	// 					if (weburl.indexOf('?') != -1) {
-	// 						weburl += '&authCode=' + res.data;
-	// 					} else {
-	// 						weburl += '?authCode=' + res.data
-	// 					}
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: weburl
-	// 					})
-	// 				}).catch(err => {
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: item.tdata.page
-	// 					})
-	// 				})
-	// 			} else {
-	// 				wx.navigateToMiniProgram({
-	// 					appId: item.tdata.appid,
-	// 					path: item.tdata.page
-	// 				})
-	// 			}
-	// 			break;
-	// 		default:
-	// 			break;
-	// 	}
-	// 	return
-	// },
+	choosePrize() {
+		commonApi.user_post('actonline/video_act/luckyDraw', {
+			act_id: 5
+		}).then(res => {
+			this.setData({
+				prizeInfo: res.data
+			})
+			if (res.data.type != 'none') {
+				// 抽奖成功的话 弹框
+				wx.showModal({
+					title: "提示",
+					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+					showCancel: false
+				})
+			}
+		})
+	},
+	bannerJumpNew(item) {
+		let that = this
+		item = item.currentTarget.dataset.item
+		if (item.tdata == '') return
+		that.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index"
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index"
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return
+	},
 	onReady: function() {
 
 
 	},
-	// gotoOther: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.type == 'h5') {
-	// 		app.globalData.weburl = item.url
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-	// 		})
-	// 	} else if (item.type == 'mini') {
-	// 		wx.navigateToMiniProgram({
-	// 			appId: item.appid,
-	// 			path: item.path
-	// 		})
-	// 	} else if (item.type == 'page') {
-	// 		wx.navigateTo({
-	// 			url: item.page,
-	// 		})
-	// 	}
-	// },
+	gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
+	},
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
+
 		if (app.globalData.loadIndexSeason) {
 			this.getIndexSeason()
 		} else {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1551e47..3445f12 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,402 +1,691 @@
-<!--pages/indexs/index.wxml-->
+<!--index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
+<!-- <view class="old-btn">关怀模式</view> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
+<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20250121/540fa46b838ea3166cd8701bd611ca9d.gif" mode="widthFix"></image>
-<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-  <view class="weather-num">{{weather.max_temp}}°</view>
-  <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20250120/213c1a6ae49848fa54047d6f9059fec2.png" mode="aspectFill"></image>
-</view>
-<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-    <view class="iconfont icon-sousuo"></view>
-    <view class="textOver">搜索想要的旅游产品或服务</view>
-  </navigator>
-</view>
-<view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
-    <block wx:for="{{banner}}" wx:key="index">
-      <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
-      </swiper-item>
-    </block>
-  </swiper>
-  <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
-  </view>
-</view>
-<view class="content" wx:if="{{!isTest}}">
-  <!-- 活动日历 -->
-  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20240925/9d10d5ff4a5314573328dd6cdab67b82.png"></image>
-    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
-    <view class="nowDate"> 
-        <view class="num">{{nowDate[0]}}</view>
-        <view>月</view>
-        <view class="num">{{nowDate[1]}}</view>
-        <view>日</view>
-    </view>
-  </view>
-  <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
-      {{item.title}}
+<view wx:if="{{!isTest}}">
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+    <view class="weather-num">{{weather.max_temp}}°</view>
+    <view class="weather">{{weather.weather}}</view>
+    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
+    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
+        mode="aspectFill"></image>
+    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
     </view>
-  </view>
-  <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
-        <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
-          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-          <view class="hdrlItem-content">
-            <view class="hdrlItem-title textOver3">{{item.name}}</view>
-            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
-          </view>
-        </view>
-      </view>
+    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+        <!-- <view class="iconfont icon-sousuo"></view> -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20241225/59b88ab6ae2800ebe02f8c25eaf29636.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+        <view class="textOver" style="color:rgba(41, 48, 90, 0.5);">搜索想要的旅游产品或服务</view>
+    </navigator>
     </view>
-  </view>
-  <view wx:else>
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
-        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
-          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-          
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
-            <view>{{item.title}}</view>
-            <view style="display: flex;justify-content: flex-end;">
-              <view class="buyMovie">去购票 ></view>
-            </view>
-          </view>
-        </view>
-      </view>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="index">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
     </view>
-  </view>
-  <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" wx:if="{{!isTest}}">
-    <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20250117/a480fadd053c80bc2efb3239fd956ceb.png" mode=""/>
-      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20250117/57373a69fac19bc39cb91d44c233257d.png" mode=""/>
     </view>
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
-            <view class="text">文创特产</view>
-          </view>
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
-            <view class="text">酒店住宿</view>
+
+ 
+    <view class="top-icons" wx:if="{{!isTest}}">
+        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
+            <view class="top-icon-text">活动日历</view>
+        </view>
+        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
+            <view class="top-icon-text">场馆预约</view>
+        </view>
+        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
+            <view class="top-icon-text">非遗专卖</view>
+        </view>
+
+        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
+            <view class="top-icon-text">剧场演出</view>
+        </view>
+        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
+            <view class="top-icon-text">文创特产</view>
+        </view>
+        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
+            <view class="top-icon-text">景点门票</view>
+        </view>
+        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
+            <view class="top-icon-text">酒店住宿</view>
         </view>
         <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
-            <view class="text">酒店住宿</view>
+        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
+            <view class="top-icon-text">酒店住宿</view>
         </view> -->
+        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
+            <view class="top-icon-text">夜游苏州</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
+            <view class="top-icon-text">一日游</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
+            <view class="top-icon-text">研学游</view>
+        </view>
+    </view>
+    <view class="content">
+        <view class="sale-road-boxes" wx:if="{{false}}">
+            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
+            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
+            <view class="sale-product">
+                <view class="sale-product-bg"></view>
+                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
+                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
+                </image>
+                <view class="sale-info">
+                <view class="sale-product-title textOver2">
+                    <view>限时特惠</view>
+                    <view>新品推荐</view>
+                </view>
+                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
+                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
+                </view>
+            </view>
+            </view>
+            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
+            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
+            <view class="sale-product">
+                <view class="sale-product-bg road-product-bg"></view>
+                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
+                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
+                </image>
+                <view class="sale-info">
+                <view class="sale-product-title textOver2">
+                    <view>四季苏州</view>
+                    <view>最是江南</view>
+                </view>
+                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
+                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+                </view>
+            </view>
+            </view>
+        </view>
+        <!-- ai避高峰 -->
+        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
+            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
+            <image src="{{indexSeason.ai}}" mode=""/>
+            </view>
+            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+            <image src="{{indexSeason.avoid}}" mode=""/>
+            </view>
+        </view>
 
-          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
-            <view class="text">一日游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
-            <view class="text">一卡游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
-            <view class="text">非遗专卖</view>
-          </view>
+        <!-- 小banner 五一修改 一张banner不滚动 -->
+        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+        </view>
+        <view class="small-swiper-box" wx:else>
+            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+            <block wx:for="{{xiaobanner}}" wx:key="index">
+                <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <!-- 原 圆角77rpx，现改为13rpx -->
+                <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                </swiper-item>
+            </block>
+            </swiper>
+            <view class="dot-list com-flex sm-dot-list">
+            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+            </view>
+        </view>
+    
+        <!-- 限时特惠--新版-->
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+            <!-- 上方标题部分 -->
+            <view class="xsth-title">
+            <view class="xsth-left" style="display: flex;">
+                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
+            </view>
+            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
+                倒计时
+                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
+                <text>:</text>
+                <view class="xsth-time">{{djs.m}}</view>
+                <text>:</text>
+                <view class="xsth-time">{{djs.s}}</view>
+            </view>
 
-          <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
-            <view class="text">研学游</view>
+            </view>
+            <!-- 商品部分 -->
+            <view class="xpth-product">
+            <!-- 左边的2个产品 -->
+            <view class="xpth-left">
+                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                <image src="{{item.headimg}}" mode="" />
+                <view class="xpth-item-content">
+                    <view class="xpth-item-title textOver2">{{item.title}}</view>
+                    <!-- <view class="xpth-tag">唇齿留香</view> -->
+                    <view class="xpth-item-bottom">
+                    <view class="xpth-item-price">{{item.price/100}}</view>
+                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                    </view>
+                </view>
+                </view>
+            </view>
+            <!-- 右边的banner -->
+            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
+                <block wx:for="{{xpth.adv}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <view class="xpth-banner-dot-list">
+                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                </view>
+            </view>
+            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
+            </view>
         </view>
 
+
+        <!-- 数字文旅-->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode="" />
         </view>
-      </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
-      </view>
-    </view>
-  </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="index">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-        </swiper-item>
-      </block>
-    </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-    </view>
-  </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
-      </view>
-    </view>
-    <image class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250117/e0d0cf611cfa9f63259de578a6065b50.png" mode=""/>
-  </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
-        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
-          <view>电子社保卡</view>
-        </view> -->
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
-         class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/857299fcd14ee5c7a1621598e0e05bae.png" mode="widthFix"></image>
-          <view>高峰预警</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/9a1611d20a32fc4b18438dabffaaacf9.png" mode="widthFix"></image>
-          <view>实时路况</view>
-        </view>
-        <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20250120/cdd4faf804f1cd494b6a7cccdc7f7f23.png" mode="widthFix"></image>
+        <view class="slide-out-box">
+            <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+            <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+            <view class="pbservice" style="margin-bottom:30rpx">
+                <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[0]}}" mode="widthFix"></image>
+                <view class="text">数字非遗</view>
+                </view>
+                <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[1]}}" mode="widthFix"></image>
+                <view class="text">数字博物馆</view>
+                </view>
+                <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[2]}}" mode="widthFix"></image>
+                <view class="text">数字名人馆</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[3]}}" mode="widthFix"></image>
+                <view>云上观展</view>
+                </view>
+                <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[4]}}" mode="widthFix"></image>
+                <view class="text">云上文博会</view>
+                </view>
+                <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[5]}}" mode="widthFix"></image>
+                <view class="text">精彩回顾</view>
+                </view>
+                <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[6]}}" mode="widthFix"></image>
+                <view class="text">文化场馆查询</view>
+                </view>
+                <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[7]}}" mode="widthFix"></image>
+                <view class="text">苏影通</view>
+                </view>
+                <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[8]}}" mode="widthFix"></image>
+                <view class="text">书仓</view>
+                </view>
+                <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[9]}}" mode="widthFix"></image>
+                <view class="text">e读书</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[10]}}" mode="widthFix"></image>
+                <view class="text">数字公共文化</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[11]}}" mode="widthFix"></image>
+                <view class="text">云游苏州</view>
+                </view>
+                <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+                <image src="{{imageSourceList.SZWL[12]}}" mode="widthFix"></image>
+                <view class="text">美图鉴赏</view>
+                </view>
+            </view>
+            </scroll-view>
+            <view class="scroll-line">
+            <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+            <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+            <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
+            <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+            </view>
+        </view>
+
+        <!-- 旅游助手 -->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" />
+        </view>
+        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
+            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
+            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
+            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
+        </view>
+
+        <!-- 公共服务 -->
+        <view class="sale-road-boxes" style="margin-top:0;">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
+            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
+            </navigator>
+            
+        </view>
+        <view style="overflow-x:auto">
+            <!-- 元旦修改 ggfw为新增类名 -->
+            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
+                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
+                <view>高峰预警</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="xlqc"
+                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
+                <view>实时路况</view>
+                </view>
+                <view bindtap="xlzs"  class="pbservice-item ggfw" >
+                <image src="https://static.ticket.sz-trip.com/uploads/20250115/18e8e2274a8191d0be0b8c63884ebe04.png" mode="widthFix"></image>
                 <view>行李直送</view>
+                </view>
+                <view bindtap="gotoUrl" data-event="xlqc"
+                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
+                <view>行李寄存</view>
+                </view>
+                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+                    data-path="/pages/pbService/bike/index?type=1">
+                    <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
+                    <view>找厕所</view>
+                </view>
+            </view>
         </view>
 
-        <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
-      <image src="https://static.ticket.sz-trip.com/uploads/20250126/083b1053137c4e0350eb92b8144f018c.png" mode="widthFix"></image>
-      <view>停车场</view>
+        <!-- 十全十美 -->
+        <view class="sale-road-boxes">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" />
+        </view>
+        <view class="six-box-new" wx:if="{{!isTest}}">
+            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
+            </image>
+        </view>
+
+        <!-- 长三角文旅平台 -->
+        <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" />
+        </view>
+        <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
+            <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+            <image src="{{imageSourceList.CSJWLPT[index]}}" mode="widthFix"></image>
+            <view>{{item.name}}</view>
+            </view>
+        </view>
+
+        <!-- 热门推荐 -->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode="" />
+        </view>
+        <view class="hot-list" wx:if="{{isTest==false}}">
+            <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
+            <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+                <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
+                <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+                <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
+                <view class="today-date">{{date}} {{month}}</view>
+                <view class="today-hot-box">
+                    <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
+                    {{item.ext.display_tags[0]}}</view>
+                    <view class="today-hot-title">{{item.title}}</view>
+                </view>
+                </view>
+                <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+                <view style="position:relative">
+                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                    <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+                </view>
+                <view class="hot-info">
+                    <view class="hot-title">{{item.title}}</view>
+                    <view class="tags textOver" style="margin-bottom:0">
+                    <view class="icon-box">
+                        <text class="iconfont icon-xin"></text>
+                        <text>{{item.ext.like_number}}</text>
+                    </view>
+                    <view class="icon-box">
+                        <text class="iconfont icon-eye"></text>
+                        <text>{{item.ext.view_number}}</text>
+                    </view>
+                    </view>
+                </view>
+                </view>
+                <view wx:else class="hot-item">
+                <view style="position:relative">
+                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                    <!-- <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' && item.ext.price}}" class="hot-price">
+                    <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                    </view>
+                </view>
+                </view>
+            </view>
+            </view>
+        </view>
+        <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
+        <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
     </view>
 
-        <!-- <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
-          <view>行李寄存</view>
+    <view class="mask prizeMask" wx:if="{{videoPrize}}">
+    <view class="mask-bg"></view>
+    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
+        <!-- 中奖的卡券 -->
+        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
         </view> -->
-        
-        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-            data-path="/pages/pbService/bike/index?type=1">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250117/1565d2b5a46180d53b5b3c225ce91068.png" mode="widthFix"></image>
-            <view>找厕所</view>
         </view>
-
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
-          <view>安全服务</view>
+        <!-- 中奖的产品 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">{{prizeInfo.prize_name}}</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <!-- <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
         </view> -->
-        
-        
-      </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
+        </view>
+        <!-- 未中奖 -->
+        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
+        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
+        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
+        <view class="prize-img">
+            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
+        </view>
+        <view class="btn-box">
+            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
+            <view bindtap="closePrice">我知道了</view>
+        </view>
+        </view>
+        <!-- 未抽奖状态 -->
+        <view style="position:relative" wx:else>
+        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
+        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
+        </view>
+        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
     </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-          data-path="/pages/list/{{isTest?'road':'food'}}/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
-      </view>
     </view>
-  </view>
-  <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20250117/c91744bedb5bf427faf21b2802f7194b.png" mode=""/>
-  <!-- 4个产品榜单 -->
- <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
-    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
-    <view class="bd-top">
-      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" data-item="{{bdItem}}">更多 ></view>
+    <!-- 广告弹窗 -->
+    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
+    <view class="alertavd" wx:if="{{showAdv}}">
+    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <block wx:for="{{alertSwipeList}}" wx:key="index">
+        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
+            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+        </swiper-item>
+        </block>
+    </swiper>
+    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
     </view>
-    <view style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
-        wx:key="id" data-item="{{item}}">
-        <view class="bd-index">{{index+1}}</view>
-        <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
-            </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
-            </view>
-          </view>
-        </view>
-      </view>
+    <!-- 广告弹窗结束 -->
+    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
+    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
 
-  </view>
- </view>
+    <!-- 视频 -->
+    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+    </view>
+    </view>
+    <!-- <view class="topBox">
+        <view class="Qtop" :style="{height:height}">
+        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
+        </view>
+        <view class="jumpBox">
+        <view class="time">{{time}}s</view>
+        <view bind:tap="gotoIndex">跳过</view>
+        </view>
+    </view> -->
 </view>
 
-<view class="content" wx:else>
-    <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" >
-    <!-- 上面的高峰预警、实时路况 -->
-
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
-
-        </view>
-      </scroll-view>
-      
-    </view>
-  </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="index">
+<view wx:else>
+    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
+    <view style="position:relative;z-index: 1;">
+    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
+        <block wx:for="{{banner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            <image src="{{item.head_img}}" mode="scaleToFill"></image>
         </swiper-item>
-      </block>
+        </block>
     </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+    <view class="com-flex dot-list">
+        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
     </view>
-  </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
-      </view>
     </view>
-    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
-  </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
-          <view>电子社保卡</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
-         class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
-          <view>高峰预警</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
-          <view>行李寄存</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
-          <view>实时路况</view>
-        </view>
+    <view class="top-icons">
+    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">活动日历</view>
+    </view>
+    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">场馆预约</view>
+    </view>
 
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
-          <view>安全服务</view>
-        </view> -->
-        
-        
-      </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
+  
+    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">剧场演出</view>
     </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" >
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
-        </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
-      </view>
+  
+   
+    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item" wx:if="{{false}}">
+        <!-- 夏季修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
+        <view class="top-icon-text">夜游苏州</view>
+    </view>
+    </view>
+    <view class="content">
+ 
+    <!-- 五一修改 一张banner不滚动 -->
+    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
+        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+    </view>
+    <view class="small-swiper-box" wx:else>
+        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <block wx:for="{{xiaobanner}}" wx:key="*this">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+            <!-- 原 圆角77rpx，现改为13rpx -->
+            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+            </swiper-item>
+        </block>
+        </swiper>
+        <view class="dot-list com-flex sm-dot-list">
+        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        </view>
     </view>
-  </view>
-</view>
 
 
-<!-- 开屏页 -->
-<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
-	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    <view class="sale-road-boxes" style="margin-top:0">
+        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
+        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
     </view>
-	
-	<!-- 视频 -->
-	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-		<video
-			style="width:100vw;height:100vh;display:block;"
-			id="myVideo" 
-			src="{{startList.head_img}}" 
-			show-center-play-btn="{{false}}"
-			show-play-btn="{{true}}" 
-			autoplay
-			controls="{{false}}"
-			bindended="videoend"
-			loop="{{true}}"
-			muted="{{isMuted}}"
-			object-fit="fill"
-		></video>
-		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-	</view>
-</view>
+    <!-- 五一修改 .slide-out-box 增加背景色-->
+    <view class="slide-out-box">
+        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
+        <view class="pbservice" style="margin-bottom:30rpx">
+            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
+            <view class="text">数字非遗</view>
+            </view>
+            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
+            <view class="text">数字博物馆</view>
+            </view>
+            
+            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
+            <view>云上观展</view>
+            </view>
+            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
+            <view class="text">云上文博会</view>
+            </view>
+            
+            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
+            <view class="text">文化场馆查询</view>
+            </view>
+            
+            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view>
+            
 
+            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
+            <view class="text">数字公共文化</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
+            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
+            <view class="text">文旅单位</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+            <view class="text">书仓</view>
+            </view> -->
+            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
+            <view class="text">云游苏州</view>
+            </view>
+            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
+            <view class="text">美图鉴赏</view>
+            </view>
+            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
+            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
+            <view>文物查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
+            data-path="/pages/pbService/museum/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
+            <view>博物馆查询</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
+            <view>云上文博会</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
+            <view class="text">投资导引图</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="数字文物"
+            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
+            <view>数字文物</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
+            <view>团体预约</view>
+            </view> -->
+            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
+            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+            <view>廉洁地图</view>
+            </view> -->
+            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+            class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+            <view>文化配送</view>
+            </view> -->
+        </view>
+        </scroll-view>
+        <view class="scroll-line">
+        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
+        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+        </view>
+    </view>
+
+
+
+
+
+
+  
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 11f779a..b543000 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,12 +1,12 @@
-/* pages/indexs/index.wxss */
+/**index.wxss**/
 /* 元旦修改 */
 page {
-  height: fit-content;
+  /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  background: url("https://static.ticket.sz-trip.com/uploads/20250120/b42c1ac742bee3ddff35151ecd860f81.jpg");
-  background-size: 100% auto;
-  /* background-repeat: round; */
-  background-repeat: no-repeat;
+  
+  background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
+  background-repeat: repeat-y;
+  background-size: 100% 100%;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -39,19 +39,31 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
+  /* height: 64rpx; */
+  /* background: rgba(255, 255, 255, 0.6); */
+  /* border-radius: 32rpx; */
+  /* color: #666; */
+  /* height: 70.67rpx; */
   height: 64rpx;
-  background: rgba(255,255,255,0.7);
-  border-radius: 32rpx;
-  color: #000;
+  /* background: rgba(255,255,255,0.7); */
+  border-radius: 0rpx;
+  /* color: #72674E; */
+  color: #333333;
+  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
+  background-size: 100% 100%; */
   display: flex;
   align-items: center;
   font-size: 25rpx;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png");
+  background-size: 100% 100%;
+  padding: 2rpx 5rpx;
+  box-sizing: border-box;
 }
 .search-box .iconfont {
   font-size: 30rpx;
   margin-left: 20rpx;
-  margin-right: 10rpx;
-  color: #000;
+  margin-right: 20rpx;
+  /* color: #72674E; */
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -62,18 +74,14 @@ page {
   font-size: 29rpx;
   margin-bottom: 10rpx;
   margin-left: 4rpx;
-  color: white;
 }
 .top-box .weather {
   font-size: 19rpx;
   margin-top: 20rpx;
   margin-left: -4rpx;
   margin-right: 30rpx;
-  color: white;
 }
 .top-icons {
-  /* background: #FFFFFF; */
-  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
   width: 697rpx;
   margin: 0 auto;
@@ -81,12 +89,11 @@ page {
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 7rpx;
+  padding-bottom: 29.33rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  background: #FFFED6;
-  margin-top: -20rpx;
-  padding-top: 54rpx;
+  margin-top: -50rpx;
+  padding-top: 84rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -101,14 +108,13 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 113rpx;
+  width: 86rpx;
   display: block;
   margin: 0 auto;
   margin-bottom: 10rpx;
 }
 .content {
-  /* margin: 0 25rpx; */
-  margin-top: 20.67rpx;
+  margin: 0 25rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -116,7 +122,6 @@ page {
   margin-top: 40rpx;
   position: relative;
   align-items: flex-end;
-  margin-bottom: 28rpx;
 }
 .sale-box {
   flex-shrink: 0;
@@ -198,11 +203,13 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 24rpx 26.67rpx 26.67rpx;
-  /* width: 100%; */
+  margin: 50rpx 0;
+  width: 100%;
   height: 154rpx;
   border-radius: 20rpx;
+  /* border-radius: 77rpx; */
   overflow: hidden;
+  margin-top: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -310,56 +317,54 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  /* width: 100%;
+  width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap; */
-    display: flex;
-    justify-content: space-between;
-    margin: 0 28rpx;
+  flex-wrap: wrap;
 }
 .title-more {
-  font-size: 24rpx;
-  /* color: #0B898E; */
-  /* 元旦修改 */
-  color: #54504D;
+  font-size: 27rpx;
+  font-weight: 500;
+  color: #29305A;
   z-index: 9;
   width: 173rpx;
-  height: 40rpx;
-  line-height: 40rpx;
-  background: rgba(255, 255, 255, 0.5);
+  height: 80rpx;
   border-radius: 20rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  /* margin-top: 20rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
+  margin-top: 20rpx;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  /* margin-bottom: 40rpx; */
+  margin-bottom: 40rpx;
 }
 .pbservice {
-  width: calc(160rpx * 8);
+  /* width: calc(175rpx * 6); */
+  /* 元旦修改 */
+  width: calc(190rpx * 7);
   display: flex;
-  margin-top: 5rpx;
-  /* flex-wrap: wrap; */
-  flex-wrap: nowrap;
-  /* padding-left: 12rpx; */
-  /* overflow-x: scroll; */
+  margin-top: 30rpx;
+  flex-wrap: wrap;
+  /* margin-bottom: 60rpx; */
+  /* 元旦修改 注释margin-bottom */
 }
 .pbservice-item {
-  width: 106rpx;
-  margin-bottom: 25rpx;
-  margin-right: 32.33rpx;
+  /* 元旦修改 截止到注释的width*/
+  width: 120rpx;
+  margin-bottom: 33.33rpx;
+  margin-right: 62.33rpx;
+  /* width: 175rpx; */
   text-align: center;
-  font-size: 27rpx;
-  color: #000;
+  font-size: 25rpx;
+  color: #111111;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -374,7 +379,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 80rpx;
+  width: 106rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -535,47 +540,36 @@ page {
 }
 .more-btn-text {
   text-align: center;
-  /* color: #0b898e;
-  font-size: 27rpx;
-  width: 200rpx;
-  line-height: 65rpx;
-  border: 1px solid #0b898e;
-  border-radius: 33rpx; */
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #111;
-  border-radius: 35rpx;
+  border: 1px solid #5184B0;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
+  color: #5184B0;
 }
 .scroll-line {
-  /* height: 6rpx;
-  border-radius: 3rpx;
-  background: #ccc;
-  overflow: hidden;
-  margin: 30rpx auto; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
-  width: 48rpx !important;
-  height: 8rpx;
+
+  width: 73rpx !important;
+  height: 7rpx;
   /* background: #DDCEAC; */
-  background: #fff;
-  border-radius: 4rpx;
-  margin: 15rpx auto 10rpx;
+  background: #97D0EC;
+  border-radius: 3rpx;
+  margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  height: 8rpx;
-  background: #FF4848;
-  border-radius: 4rpx;
+  height: 7rpx;
+  background: #5184B0;
+  border-radius: 3rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 24rpx;
-  background: #FF4848;
-  height: 8rpx;
-  border-radius: 4rpx;
+  margin-left: 37.33rpx;
+  background: #5184B0;
+  height: 7rpx;
+  border-radius: 3rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -681,22 +675,20 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
-  background: #FFFED6;
   justify-content: space-around;
   height: 187rpx;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
 }
 .other-plats image {
-  width: 80rpx;
+  width: 106rpx;
   display: block;
-  height: 80rpx;
+  height: 106rpx;
   margin-bottom: 15rpx;
 }
 .other-plat {
   /* 春节新增样式 */
-  color: #54504D;
+  color: #111111;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -830,7 +822,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .time-box {
-  font-size: 25rpx;
+  font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
   /* color: #54504D; */
@@ -841,26 +833,22 @@ page {
   margin-left: -50rpx;
   z-index: 9;
   flex-wrap: nowrap;
+
+  position: relative;
+  left: -150rpx;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  /* margin: 0 5rpx; */
-  /* width: 50rpx; */
-  /* height: 33rpx; */
-  width: 43rpx;
+  /* width: 43rpx; */
   height: 43rpx;
+  padding: 0 7rpx;
   line-height: 43rpx;
-  background: #4AB648;
-  /* background: #F9F1DB; */
-  /* border-radius: 5rpx; */
   border-radius: 13rpx;
-  font-size: 25rpx;
+  font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  /* color: #D62828; */
-  color: white;
+  color: #FF6A57;
   text-align: center;
-  /* line-height: 33rpx; */
 }
 .time-box text {
   width: 18rpx;
@@ -906,60 +894,67 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-product {
-  /* position: absolute; */
-  width: 697rpx;
+  width: 700rpx;
   height: 373rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx 15rpx;
+  padding: 25rpx 13rpx;
   box-sizing: border-box;
-  /* left: 0;
-  bottom: 15.33rpx;
-  /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
-  /* width: 270rpx; */
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
-  /* background-size: 100% 100%; */
-  border-radius: 20rpx;
   flex: 1;
   margin-left: 15rpx;
-  /* padding: 4rpx;
-  background: #72674e;
-  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  height: 319rpx;
+  height: 322rpx;
+  width: 100%;
+  border-radius: 0rpx;
+  overflow: hidden;
+  position: relative;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
+  background-size: 100% 100%;
+  padding: 3rpx;
+}
+.xpth-banner-swiper{
+    height: 100%;
+    border-radius: 20rpx;
+    overflow: hidden;
 }
 .xpth-banner image {
-  /* width: 270rpx; */
   flex: 1;
-  height: 319rpx;
+  height: 100%;
+  width: 100%;
   border-radius: 20rpx;
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  /* border-radius: 20rpx; */
+}
+.xpth-banner-dot-list{
+    position: absolute;
+    right: 0;
+    bottom: 10rpx;
+    padding: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+.xpth-banner-dot-list .xpth-dot{
+    width: 9rpx;
+    height: 9rpx;
+    background: #FFFFFF;
+    border-radius: 50%;
+    opacity: 0.6;
+    margin: 0 4rpx;
+}
+.xpth-banner-dot-list .xpth-dot.active{
+    opacity: 1;
 }
 /* 元旦修改新增样式 */
 .xpth-item {
-  /* width: 413rpx;
-  height: 160rpx; */
-  /* background: #FFFFFF; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
-  background-size: 100% 100%; */
   border-radius: 20rpx;
   height: 153rpx;
-  background: #FFFFFF;
   display: flex;
   margin-bottom: 13rpx;
-  /* margin-bottom: 10rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
-  /* padding: 5rpx; */
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png");
+  background-size: 100% 100%;
+  padding: 1rpx;
 }
 .xpth-item:last-child {
   margin-bottom: 0;
@@ -989,7 +984,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 230rpx;
+  width: 210rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
@@ -1012,15 +1007,15 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-price {
-  font-size: 32rpx;
+  font-size: 31rpx;
   font-family: PingFang SC;
-  font-weight: 500;
-  color: #D62828;
+  font-weight: bold;
+  color: #ED1C19;
 }
 /* 元旦修改新增样式 */
 .xpth-item-price::before {
   content: "￥";
-  font-size: 20rpx;
+  font-size: 23rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-item-buy {
@@ -1038,22 +1033,24 @@ page {
 /* 元旦修改新增样式 */
 .new-pic {
   width: 160rpx !important;
-  height: 255rpx !important;
-  /* margin-bottom: 26.67rpx; */
+  height: 220rpx !important;
+  margin-bottom: 26.67rpx;
 }
 
-.ggfw-list{
-    display: flex;
-    justify-content: space-around;
+.ggfw-list {
+  justify-content: space-around !important;
+}
+.ggfw-list .pbservice-item{
+    margin-right: 0;
+    color: #111111;
 }
 .ggfw {
   width: auto;
-  margin:0;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 113.33rpx !important;
-  height: 113.33rpx !important;
+  width: 93rpx !important;
+  height: 93rpx !important;
 }
 
 .six-box-new {
@@ -1080,7 +1077,7 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #54504D;
+  color: #111111;
 }
 
 .rmtj-right {
@@ -1161,343 +1158,30 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-
-.right-more {
-  width: 120rpx;
-  height: 47rpx;
-  background: rgba(255,208,165,0.4);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #FFFFFF;
-  text-align: center;
-  line-height: 47rpx;
-}
-
-.hdrlNavList {
-  display: flex;
-  margin: 28rpx 26.67rpx 10rpx;
-  overflow-x: scroll;
-  flex-wrap: nowrap;
-}
-.hdrlNav {
-  flex-shrink: 0;
-  /* width: 160rpx; */
-  padding: 0 20rpx;
-  height: 53rpx;
-  background: rgba(255,208,165,0.4);
-  border-radius: 13rpx;
-  /* border: 1px solid #FFFFFF; */
-  min-width: 133rpx;
-
-  font-size: 32rpx;
-  color: #FFFFFF;
-  text-align: center;
-  line-height: 53rpx;
-  margin-right: 14rpx;
-  box-sizing: border-box;
-}
-.hdrlNavActive {
-  background: linear-gradient(180deg, #FFECD9, #FFBD7A);
-  font-size: 32rpx;
-  color: #E6201C;
-  border: none;
-}
-.hdrlItem {
-  flex-shrink: 0;
-  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
-  /* width: 593.33rpx; */
-  display: flex;
-  background: url("https://static.ticket.sz-trip.com/uploads/20250117/8d7f5ce0ecafbc2f836342e4226ec364.png");
-  background-size: 100% 100%;
-}
-.hdrlItem-img {
-  width: 240rpx;
-  height: 213rpx;
-  background: #8C8C8C;
-  border-radius: 13rpx;
+.jqssd {
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
+  background-size: 100% 100%; */
+  width: 344.33rpx;
+  height: 160rpx;
   flex-shrink: 0;
-  margin-right: 12rpx;
-  overflow: hidden;
-}
-.hdrlItem-content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 213rpx;
-}
-.hdrlItem-title {
-  font-weight: bold;
-  font-size: 28rpx;
-  color: #000000;
-  margin-top: 15.33rpx;
-}
-.hdrlItem-date {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #000000;
-  margin-bottom: 19.33rpx;
-}
-
-.main-box {
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/98ca9dfa8253e50d624ce64d24295570.png");
-  background-size: 100% 100%;
-  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
-  margin: 0 8rpx;
-}
-.main-box-top {
-  display: flex;
-  margin-bottom: 5.33rpx;
 }
-.gfyj,.sslk {
-  width: 369.33rpx;
-  height: 146rpx;
-  flex-shrink: 0;
+.jqssd image, .sslk image{
+  width: 100%;
+  height: 100%;
 }
 .sslk {
-  margin-left: -48rpx;
-}
-
-.movieItem {
-  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-  flex-shrink: 0;
-  height: 206.67rpx;
-}
-.movieItem-img {
-  width: 213rpx;
-  height: 213rpx;
-  border-radius: 18rpx;
-  margin-right: 18rpx;
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
+  background-size: 100% 100%; */
+  width: 344rpx;
+  height: 160rpx;
   flex-shrink: 0;
 }
-.ysz-box {
-    margin: 0 8rpx 15.33rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/8efd4c072b3c95fe7c31d1e7b79759d3.png");
-    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
-    background-size: 100% 100%;
-    width: 733.33rpx;
-    height: 320rpx;
-    padding-top: 33.33rpx;
-    position: relative;
-    z-index: 1;
-}
-.ysz-more {
-    width: 267rpx;
-    height: 53rpx;
-    background: #FFFFFF;
-    border-radius: 27rpx;
-    margin: 38rpx auto 0;
-    text-align: center;
-    line-height: 53rpx;
-    font-weight: 500;
-    font-size: 25rpx;
-    color: #FF4D48;
-}
-.ysz-box2 {
-  /* padding: 20rpx 35rpx; */
-  padding-top: 23.33rpx;
-}
-.tjbd-title {
-  width: 286.67rpx;
-  height: 80rpx;
-}
 
-.bd-box {
-  position: relative;
-  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
-  margin-left: 26.67rpx;
-  width: 582rpx;
-  /* height: 1133rpx; */
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-  /* box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(224,61,60,0.26); */
-  border-radius: 20rpx 80rpx 20rpx 20rpx;
-}
-.bd-top {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 30rpx;
-  position: relative;
-}
-.zz {
-    width: 236.67rpx;
-    height: 206.67rpx;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 2;
-}
-.bd-type {
-  width: 125.33rpx;
-  height: 38.67rpx;
-}
-.bd-more {
-  width: 120rpx;
-  height: 47rpx;
-  background: rgba(255,255,255,.7);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #F34017;
-  z-index: 9;
-  text-align: center;
-  line-height: 47rpx;
-}
-.bd-index {
-  font-weight: bold;
-  font-size: 40rpx;
-  color: #000000;
+.xsth-left{
+    /* flex: 1;
+    width: 1rpx; */
 }
-.bd-item {
-  margin-left: 45.33rpx;
-  width: 453rpx;
-  height: 147rpx;
-  background: #FFFFFF;
-  border-radius: 13rpx;
-  display: flex;
-}
-.bd-item-img {
-    width: 147rpx;
-    height: 147rpx;
-    background: #D9D9D9;
-    border-radius: 13rpx;
-    flex-shrink: 0;
-    margin-right: 12.67rpx;
-}
-.bd-item-content {
-    padding: 14rpx 29.33rpx 13.33rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-.bd-item-title {
-    font-weight: bold;
-    font-size: 27rpx;
-    color: #333333;
-}
-.bd-item-bottom {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    width: 260rpx;
-}
-.bd-price {
-    font-size: 29.33rpx;
-    color: #F93434;
-    font-weight: bold;
-}
-.bd-price:after {
-  content:'起';
-  color: #999999;
-  font-size: 23rpx;
-  font-weight: 700;
-}
-.bd-price::before {
-  content:'￥';
-  font-size: 23rpx;
-}
-.bd-distance {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #999999;
-}
-
-.buyMovie {
-    width: 160rpx;
-    height: 56rpx;
-    background: #FF4848;
-    color: #fff;
-    border-radius: 20rpx;
-    text-align: center;
-    line-height: 56rpx;
-}
-
-.bg1 {
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-}
-.bg2 {
-  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
-}
-.bg3 {
-  background: linear-gradient(180deg, #E0F7DC, #A0F292);
-}
-.bg4 {
-  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
-}
-
-.hdrlNavList::-webkit-scrollbar{
-  display:none;
-}
-.hdrlList::-webkit-scrollbar{
-  display:none;
-}
-.bottom-box::-webkit-scrollbar{
-  display:none;
-}
-.slide-box::-webkit-scrollbar{
-  display:none;
-}
-.pbservice::-webkit-scrollbar{
-  display:none;
-}
-.textOver3 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
-.public-box {
-  width: 593.33rpx;
-  height: 266.67rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-}
-.one::-webkit-scrollbar{
-  display:none;
-}
-
-
-.date-container{
-    position: relative;
-}
-.nowDate{
-    display: flex;
-    position: absolute;
-    left: 228.77rpx;
-    bottom: 7.33rpx;
-}
-
-.nowDate>view{
-
-    width: 44rpx;
-    height: 44rpx;
-    border-radius: 7rpx;
-    text-align: center;
-    line-height: 44rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    font-size: 29rpx;
-    color: #FFFFFF;
-}
-.nowDate .num{
-    background: #FFD0A5;
-    color: #111111;
-
-    font-family: PingFang SC;
-    font-weight: bold;
-    font-size: 29rpx;
-    color: #111111;
-}
-
-.ysz-right-img{
-    width: 200.8rpx;
-    height: 207.33rpx;
-    position: absolute;
-    right: -26rpx;
-    top: 0;
-    z-index:1;
-}
-.hidden{
-  display: none;
+.xsth-left>image{
+    max-width: 100%;
+    overflow: hidden;
 }
\ No newline at end of file
diff --git a/subPackages/indexGQ/imgSource.js b/subPackages/indexGQ/imgSource.js
new file mode 100644
index 0000000..588f666
--- /dev/null
+++ b/subPackages/indexGQ/imgSource.js
@@ -0,0 +1,113 @@
+const imageSource = {
+    // 活动日历、场馆预约等
+    mainFunImgs: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
+    ],
+    // 数字文旅
+    SZWL: [
+        // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
+        // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
+        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
+
+    ],
+    // 旅游助手
+    LVZS: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
+    ],
+    // 公共服务
+    GGFW: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
+    ],
+    
+    // 十全十美
+    SQSM: [
+        // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
+
+    ],
+
+    // 长三角文旅平台
+    CSJWLPT: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
+    ],
+
+    // 导航标题侧边图片
+    CBTP: [
+        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
+        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+    ],
+
+    // 其他后台配置的图片，开发时使用
+    testImgs: {
+        indexSeason : {
+             // 头图
+             topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
+            // ai伴你游
+            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
+            // ai避高峰
+            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
+            // 新品特惠
+            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            // 文旅鉴赏
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            // 出行助手
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            // 公共服务
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            // 十全十美
+            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            // 长三角文旅平台
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            // 热门推荐
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            
+        }
+    },
+}
+
+
+module.exports = imageSource
\ No newline at end of file
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
index e420bb4..d5cf101 100644
--- a/subPackages/indexGQ/index.js
+++ b/subPackages/indexGQ/index.js
@@ -33,7 +33,7 @@ Page({
 		videoPrize: false,
 		prizeInfo: null,
 		otherPlat: null,
-		activeBannerIndex: 0,
+		activeBannerIndex: 5,
 		smBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
@@ -290,6 +290,8 @@ Page({
         product_model: 'post',
       offset: 0,
       limit: 6,
+      sort:'sales_number',
+      order:'desc',
     }).then(res=>{
         bdList[3].list = res.data.list
       this.setData({
@@ -313,7 +315,7 @@ Page({
     })
     // 非看不可--剧场演出
     commonApi._post("product/get_product_by_tag",{
-      tag_id:"6",
+      tag_id:"477",
       offset:0,
       limit:6,
       sort:'',
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index fc06ec0..1551e47 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/newYear2025/topBg.png" mode="widthFix"></image>
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20250121/540fa46b838ea3166cd8701bd611ca9d.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
@@ -19,7 +19,7 @@
   </navigator>
 </view>
 <view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -43,7 +43,7 @@
     </view>
   </view>
   <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
       {{item.title}}
     </view>
   </view>
@@ -107,6 +107,16 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
+          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
+        </view>
+        <!-- 临时跳转专题页 -->
+        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase"  class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
+        </view> -->
+
           <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
             <view class="text">一日游</view>
@@ -124,6 +134,12 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
+
+          <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <view class="text">研学游</view>
+        </view>
+
         </view>
       </scroll-view>
       <view class="scroll-line">
@@ -178,11 +194,17 @@
                 <image src="https://static.ticket.sz-trip.com/uploads/20250120/cdd4faf804f1cd494b6a7cccdc7f7f23.png" mode="widthFix"></image>
                 <view>行李直送</view>
         </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
+
+        <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
+      <image src="https://static.ticket.sz-trip.com/uploads/20250126/083b1053137c4e0350eb92b8144f018c.png" mode="widthFix"></image>
+      <view>停车场</view>
+    </view>
+
+        <!-- <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
           <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
           <view>行李寄存</view>
-        </view>
+        </view> -->
         
         <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
             data-path="/pages/pbService/bike/index?type=1">
@@ -255,42 +277,19 @@
     <!-- 高峰预警、实时路况及几个板块 -->
   <view class="main-box" >
     <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image  data-title="景区舒适度"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20240923/c4115b53ebfe5ae3c49bdb4f5f026726.png" mode=""/>
-      <image  class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20240923/3ac9e07109e38dbbcd43bc3140c62e89.png" mode=""/>
-    </view>
+
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+        <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          
-          
+
         </view>
       </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
-      </view>
+      
     </view>
   </view>
   <!-- 小轮播 -->
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
index abaade5..11f779a 100644
--- a/subPackages/indexGQ/index.wxss
+++ b/subPackages/indexGQ/index.wxss
@@ -1311,7 +1311,7 @@ page {
   width: 582rpx;
   /* height: 1133rpx; */
   background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-  box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(27,128,97,0.56);
+  /* box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(224,61,60,0.26); */
   border-radius: 20rpx 80rpx 20rpx 20rpx;
 }
 .bd-top {
@@ -1497,4 +1497,7 @@ page {
     right: -26rpx;
     top: 0;
     z-index:1;
+}
+.hidden{
+  display: none;
 }
\ No newline at end of file

From e6b9250e96f0c4994b307e3d9db0875461ed21d0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 17 Feb 2025 09:22:03 +0800
Subject: [PATCH 283/471] =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 6cc941c..ee846ce 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.isTest165? true : false;
+      data.isTest = data.isTest170? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 995e9b6bf1207aecc9b862ea3247fbb4dbad71a9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 17 Feb 2025 17:49:38 +0800
Subject: [PATCH 284/471] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |   4 +-
 pages/info/postProductInfo/index.js           |   1 -
 pages/user/likes/index.js                     |   7 +-
 pages/user/order/sceneOrderInfo/index.js      |   7 +-
 pages/user/order/sceneOrderInfo/index.wxml    |   3 +-
 pages/user/order/showOrderInfo/index.js       |   7 +-
 pages/user/order/showOrderInfo/index.wxml     |   3 +-
 project.private.config.json                   |   7 +
 subPackages/goods/oneCardTour/info/index.js   | 902 ++++++++++++++++++
 subPackages/goods/oneCardTour/info/index.json |   9 +
 subPackages/goods/oneCardTour/info/index.wxml | 202 ++++
 subPackages/goods/oneCardTour/info/index.wxss | 683 +++++++++++++
 utils/util.js                                 |  12 +-
 13 files changed, 1838 insertions(+), 9 deletions(-)
 create mode 100644 subPackages/goods/oneCardTour/info/index.js
 create mode 100644 subPackages/goods/oneCardTour/info/index.json
 create mode 100644 subPackages/goods/oneCardTour/info/index.wxml
 create mode 100644 subPackages/goods/oneCardTour/info/index.wxss

diff --git a/app.json b/app.json
index a9d623e..79b11e5 100644
--- a/app.json
+++ b/app.json
@@ -188,7 +188,6 @@
     "pages/order/showOrderNew/index",
     "pages/user/order/showOrderInfo/index",
     "pages/user/suggest/suggest"
-    
   ],
   "subpackages": [
     {
@@ -204,7 +203,8 @@
         "indexGQ/index",
         "transferPage/transferPage",
         "password/overview/overview",
-        "password/setting/setting"
+        "password/setting/setting",
+        "goods/oneCardTour/info/index"
       ]
     }
   ],
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 5c2ee7f..260946b 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -370,7 +370,6 @@ Page({
                         wx.navigateTo({
                             url: '/pages/order/WineSceneOrder/index',
                         })
-
                     } else {
                         wx.navigateTo({
                             url: '/pages/order/postOrder/index',
diff --git a/pages/user/likes/index.js b/pages/user/likes/index.js
index 52c4270..8e55461 100644
--- a/pages/user/likes/index.js
+++ b/pages/user/likes/index.js
@@ -137,11 +137,16 @@ Page({
     console.log(item)
     let type = item.product?item.product.type:item.scene.type
 
-    if (item.product.is_package) {
+    if (item.product.is_package==1) {
         wx.navigateTo({
             url: '/pages/info/postProductInfo/index?id='+item.product.id
           });
           return
+    } else if (item.product.is_package==2) {
+        wx.navigateTo({
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.product.id
+          });
+          return
     }
 
 
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index f0f4a84..ca5999f 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -223,11 +223,16 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
-    if (item.is_package) {
+    if (item.is_package == 1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id
         })
         return
+    } else if (item.is_package==2) {
+        wx.navigateTo({
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.product_id
+          });
+          return
     }
 
     if (item.product_model=='ticket') {
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 29da784..2baeb89 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -55,7 +55,8 @@
   <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <view wx:if="{{info.state!='UNPAID'}}">
-        <navigator wx:if="{{info.order_product_list[0].is_package}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+        <navigator wx:if="{{info.order_product_list[0].is_package==1}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+        <navigator wx:elif="{{info.order_product_list[0].is_package==2}}" url="/subPackages/goods/oneCardTour/info/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
 
         <navigator wx:else  url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
     </view>
diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js
index f290e3a..02f7a8d 100644
--- a/pages/user/order/showOrderInfo/index.js
+++ b/pages/user/order/showOrderInfo/index.js
@@ -223,11 +223,16 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
-    if (item.is_package) {
+    if (item.is_package==1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id
         })
         return
+    } else if (item.is_package==2) {
+        wx.navigateTo({
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.product_id
+          });
+          return
     }
 
     if (item.product_model=='ticket') {
diff --git a/pages/user/order/showOrderInfo/index.wxml b/pages/user/order/showOrderInfo/index.wxml
index bd534d9..c46c547 100644
--- a/pages/user/order/showOrderInfo/index.wxml
+++ b/pages/user/order/showOrderInfo/index.wxml
@@ -46,7 +46,8 @@
   <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <view wx:if="{{info.state!='UNPAID'}}">
-        <navigator wx:if="{{info.order_product_list[0].is_package}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+        <navigator wx:if="{{info.order_product_list[0].is_package==1}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+        <navigator wx:elif="{{info.order_product_list[0].is_package==2}}" url="/subPackages/goods/oneCardTour/info/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
 
         <navigator wx:else  url="/pages/info/showInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
     </view>
diff --git a/project.private.config.json b/project.private.config.json
index 5001ef7..9669f05 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subPackages/goods/oneCardTour/info/index",
+          "pathName": "subPackages/goods/oneCardTour/info/index",
+          "query": "id=456888",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",
diff --git a/subPackages/goods/oneCardTour/info/index.js b/subPackages/goods/oneCardTour/info/index.js
new file mode 100644
index 0000000..cf40f15
--- /dev/null
+++ b/subPackages/goods/oneCardTour/info/index.js
@@ -0,0 +1,902 @@
+// pages/info/sceneProductInfo/index.js
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
+import commonApi from "../../../../utils/https/common"
+import util from "../../../../utils/util"
+import QRCode from '../../../../utils/weapp-qrcode.js'
+let app = getApp()
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    info: null,
+    bookingInfo: null,
+    bookingInfoTitle: "",
+    safeBottom: app.globalData.safeBottom,
+    isLike: 0,
+
+    isTest: true,
+    retailId: "",
+    shareImg: null,
+    showShareFlag: false,
+    showAllowance: false,
+    allowance_data: null,
+    //购物车数量
+    productNum: 1,
+    skuIndex: 0,
+    aniSkuIndex: -1,
+    cartCount: 0,
+    cartImgInfo: null,
+    cartTop: 0,
+    top: 0,
+    skuList: [], //立即预定的列表
+    sku_ids: [],
+    showQrCode: false,
+    wxqrcode: null,
+    product: {},
+    date: "",
+    time: "",
+    showDate:false,
+    showPrice:0,
+    showDate2:false,
+
+    skuDoms: [], // sku 节点Dom
+    activeItem: {}, // sku 侧边栏
+    activeItemIndex: 0, // 年卡权益、合作景区。使用说明
+    scrollLeft: 0,
+    menuTop: 0,
+    fixed: false,
+    ZTPoint:'',
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options);
+    if (!options.id) {
+      util.back()
+      return;
+    }
+    if (options.retailId) {
+      this.setData({
+        retailId: options.retailId
+      })
+    }
+    if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
+
+    this.setData({
+      id: options.id
+    })
+    commonApi._post("scene/detail", {
+      id: options.id
+    }).then(res => {
+      let flag = false
+      if (!res.data) {
+        wx.showToast({
+          title: '产品已下架',
+          icon: 'none'
+        })
+        setTimeout(() => {
+          util.back();
+        }, 1000)
+        return;
+      }
+      res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+      // 如果是带有指定good_id的 那么取指定的
+      if (options.gid) {
+        let pItem = res.data.product.find(item => item.id == options.gid);
+        if (pItem) {
+          res.data.product = [pItem];
+        }
+      }
+      // 如果带有指定skuid的话 那么取指定的sku展示
+      if (options.skuid) {
+        let pItem = null;
+        for (let i = 0; i < res.data.product.length; i++) { //3
+          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+            if (res.data.product[i].sku[j].id == options.skuid) {
+              res.data.product[i].sku = [res.data.product[i].sku[j]];
+              pItem = res.data.product[i];
+              break;
+            }
+          }
+        }
+        if (pItem) {
+          res.data.product = [pItem];
+        }
+      } else if (options.zhuanti_type) {
+        flag = true
+        commonApi._post("theme/getYihuFreeList", {
+          zhuanti_type: options.zhuanti_type
+        }).then(res1 => {
+          let skuArr = res1.data.sku_ids
+          let newArr = []
+          for (let i = 0; i < res.data.product.length; i++) { //3
+            for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+              for (let k = 0; k < skuArr.length; k++) {
+                if (res.data.product[i].sku[j].id == skuArr[k]) {
+                  newArr.push(res.data.product[i].sku[j])
+                }
+              }
+            }
+            res.data.product[i].sku = newArr;
+          }
+          res.data.product.map(product => {
+            product.sku.map(sku => {
+              sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []);
+              sku.display_tags_str = sku.display_tags.join(' | ')
+            })
+          })
+          this.setData({
+            info: res.data
+          })
+          var arr = []
+          res.data.product.forEach((item, index) => {
+            item.sku.forEach(itemB => {
+              itemB.proIndex = index
+              arr.push(itemB)
+            })
+          });
+          this.setData({
+            skuList: arr
+          })
+          util.pagePoint({
+            event: 'scene_view',
+            param: {
+              type: res.data.type,
+              id: res.data.id
+            }
+          }, 1)
+          this.BroswerRecord()
+        })
+
+      }
+      console.log(res.data.product);
+      if (flag) {
+        return
+      }
+
+      res.data.product.map(product => {
+        product.sku.map(sku => {
+          sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : [])
+          sku.display_tags_str = sku.display_tags.join(' | ')
+        })
+      })
+      this.setData({
+        info: res.data
+      })
+
+      try {
+        let activeItem = res.data.product[0].sku[0]
+        this.setData({
+            activeItem: activeItem
+        })
+      } catch(e) {
+
+      }
+
+
+      this.drawImg()
+      var arr = []
+      res.data.product.forEach((item, index) => {
+        item.sku.forEach(itemB => {
+          itemB.proIndex = index
+          arr.push(itemB)
+        })
+      });
+      this.setData({
+        skuList: arr
+      })
+      util.pagePoint({
+        event: 'scene_view',
+        param: {
+          type: res.data.type,
+          id: res.data.id
+        }
+      }, 1)
+      this.BroswerRecord()
+    })
+    // 获取收藏的状态
+    if (wx.getStorageSync("jstrip_token")) {
+      commonApi.user_post("scene/is_scene_collection", {
+        scene_id: options.id
+      }).then(res => {
+        this.setData({
+          isLike: res.data
+        })
+      })
+    }
+
+    let rect = wx.getMenuButtonBoundingClientRect()
+    let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+    this.setData({
+        menuTop: height,
+    })
+  },
+  // 获取日期
+  changeDate: function (e) {
+    console.log(e);
+    this.setData({
+      date: e.detail,
+      showPrice:e.detail.price
+    })
+    console.log(this.data.date);
+  },
+  // 获取分时
+  changeTime: function (e) {
+    console.log(e);
+    this.setData({
+      time: e.detail
+    })
+    console.log(this.data.time);
+  },
+  changeAllowance: function () {
+    this.setData({
+      showAllowance: !this.data.showAllowance
+    })
+  },
+  BroswerRecord: function () {
+    setTimeout(() => {
+      if (app.globalData.uuid) {
+        commonApi._post('browse/browse_record', {
+          type: "scene",
+          title: this.data.info.title,
+          drive: "mini",
+          source_id: this.data.info.id,
+          url: "/pages/info/sceneProductInfo/index?id=" + this.data.info.id,
+          uuid: app.globalData.uuid
+        }).then(res => {})
+      } else {
+        this.BroswerRecord();
+      }
+    }, 500)
+  },
+  like: function () {
+    let id = this.data.id,
+      isLike = Number(this.data.isLike);
+    commonApi.user_post(isLike != 1 ? "scene/scene_collection" : "scene/scene_cancel_collection", {
+      scene_id: id
+    }).then(res => {
+      if (res.code == 1) {
+        wx.showToast({
+          title: '操作成功',
+        })
+        this.setData({
+          isLike: isLike == 1 ? 0 : 1
+        })
+      }
+    })
+  },
+  gotolocation: function () {
+    let info = this.data.info;
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon)
+    })
+  },
+
+  selectSku: function (e) {
+    console.log(e.currentTarget.dataset.item);
+    if (e.currentTarget.dataset.item.stock == 0 && e.currentTarget.dataset.item.is_third_stock != 1) {
+      wx.showToast({
+        title: "该商品暂无库存",
+        icon: 'none'
+      })
+      return
+    }
+    let index = e.currentTarget.dataset.index;
+    this.setData({
+      skuIndex: index,
+      productNum: 1
+    })
+
+  },
+  order: function (e) {
+    console.log(this.data.skuList)
+
+    commonApi.user_post("/product/checkStock", {
+      sku_id: this.data.skuList[this.data.skuIndex].id,
+    }).then(res => {
+      if (res && res.code != 1) {
+        wx.showModal({
+          title: "温馨提示",
+          content: '商品已经被抢光啦~要不要瞧瞧别的~',
+          showCancel: false
+        })
+        return;
+      } else {
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        app.globalData.listName = null
+        if (this.data.skuFlag == 'order') {
+          console.log(app.globalData.sku);
+          if (app.globalData.product.product.flag==0 || app.globalData.product.sku.flag=='off') return;
+          // if (e.currentTarget.dataset.disable === 1) return;
+          util.pagePoint({
+            event: 'scene_order',
+            param: {
+              type: this.data.info.type,
+              id: this.data.info.id
+            }
+          }, 1)
+          wx.setStorageSync('login_from', 'scene_order_login')
+          wx.setStorageSync('order_from', 'scene_order_submit')
+          app.globalData.couponInfo = null;
+          app.globalData.retailId = this.data.retailId;
+          // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
+          // let sku = {sku:e.currentTarget.dataset.product.sku[this.data.skuIndex]},product = {product: e.currentTarget.dataset.product}
+          // let sku = {
+          //     sku: this.data.skuList[this.data.skuIndex]
+          //   },
+          //   product = {
+          //     product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
+          //   }
+          // product.productNum = this.data.productNum
+          app.globalData.product.date = this.data.date
+          app.globalData.product.time = this.data.time
+          app.globalData.product.product.ZTPoint = this.data.ZTPoint
+
+
+          // app.globalData.product = {
+          //   ...sku,
+          //   ...product
+          // }
+          app.globalData.index = 0
+          wx.navigateTo({
+            url: '/pages/order/scene/index',
+          })
+        } else {
+          commonApi.user_post("cart/add_sku", {
+            sku_id: this.data.skuList[this.data.skuIndex].id,
+            num: this.data.productNum
+          }).then(res => {
+            if (res.code == 1) {
+              commonApi.user_post('cart/get_list', {}).then(res => {
+                this.setData({
+                  cartCount: res.data.length //5
+                })
+              })
+              // 加动效
+              this.setData({
+                skuFlag: null,
+                aniSkuIndex: this.data.skuIndex,
+                cartImgInfo: null
+              })
+              setTimeout(() => {
+                this.setData({
+                  aniSkuIndex: -1
+                })
+                wx.showModal({
+                  title: "提示",
+                  content: "去购物车结算？",
+                  success: function (res) {
+                    if (res.confirm) {
+                      wx.navigateTo({
+                        url: '/pages/user/cartlist/list',
+                      })
+                    }
+                  }
+                })
+              }, 650)
+            }
+          })
+        }
+      }
+    })
+  },
+  pagePoint: function (e) {
+    util.pagePoint({
+      event: e.currentTarget.dataset.event,
+      param: {
+        type: this.data.info.type,
+        id: this.data.info.id
+      }
+    }, 1)
+  },
+  // 分享
+  share: function () {
+    if (!wx.getStorageSync("jstrip_token")) {
+      wx.setStorageSync('login_from', 'scene_share_login')
+      commonApi.user_post("user/getMyInfo", {}).then(res => {}).catch(err => {})
+      return;
+    }
+    if (!this.data.shareImg) {
+      wx.showToast({
+        title: '图片生成中，稍后再试',
+        icon: 'none'
+      })
+      return;
+    }
+    this.setData({
+      showShareFlag: !this.data.showShareFlag
+    })
+  },
+  // 保存
+  save() {
+    let url = this.data.shareImg,
+      that = this;
+    wx.authorize({
+      /* 这个就是保存相册的 */
+      scope: 'scope.writePhotosAlbum',
+      success() {
+        wx.saveImageToPhotosAlbum({
+          filePath: url,
+          success(res) {
+            wx.showToast({
+              title: '保存成功',
+              icon: "success"
+            })
+            that.setData({
+              showShareFlag: !that.data.showShareFlag
+            })
+            util.pagePoint({
+              event: 'scene_share_save',
+              param: {
+                type: that.data.info.type,
+                id: that.data.info.id
+              }
+            }, 1)
+          },
+          fail(res) {
+            wx.showToast({
+              title: '保存失败',
+              icon: 'none'
+            })
+          }
+        })
+      },
+      complete(res) {
+        /* 这里判断一下如果没有授权重新打开设置选项 */
+        wx.getSetting({
+          success(res) {
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+              /* 打开设置的方法 */
+              // opensit();
+              wx.showToast({
+                title: '请打开权限后再试',
+                icon: 'none'
+              })
+            }
+          }
+        });
+      }
+    });
+
+  },
+  // 绘制海报
+  drawImg: function () {
+    var that = this,
+      userinfo = wx.getStorageSync('jstrip_userInfo');
+    if (!userinfo) {
+      // 去登录
+      return false;
+    }
+    const ctx = wx.createCanvasContext('imageCanvas');
+    // const device = wx.getSystemInfoSync();
+    // const ratio = device.screenWidth / 750;
+    // 先获取到图片信息
+    let promise2 = new Promise(function (resolve, reject) {
+      wx.getImageInfo({
+        src: that.data.info.headimg,
+        success: function (res) {
+          resolve(res);
+        },
+        fail: function (res) {
+          reject(res);
+        }
+      })
+    })
+    let promise3 = new Promise(function (resolve, reject) {
+      let userid = wx.getStorageSync('jstrip_userid')
+      new QRCode('myQrcode', {
+        text: 'https://m.cloud.sz-trip.com/ScenicDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+        width: 500,
+        height: 500,
+        padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+        correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+        callback: (res) => {
+          resolve(res);
+        }
+      })
+    })
+    //成功得到图片信息后，开始绘图
+    Promise.all([promise2, promise3]).then(imgs => {
+      ctx.save();
+      ctx.beginPath(); //开始绘制
+      that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+      ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+      ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+      ctx.restore();
+      ctx.save();
+      that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+      ctx.restore();
+      // 绘制二维码
+      ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+      // 开始文字绘制
+      ctx.setFillStyle("#000");
+      ctx.setFontSize(30 * ratio); //字大小
+      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+      // 售价
+      ctx.setFillStyle("#D62828");
+      ctx.setFontSize(40 * ratio); //字大小
+      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      let price = "￥" + (that.data.info.price / 100);
+      let width = ctx.measureText(price).width;
+      ctx.fillText(price, 25 * ratio, 620 * ratio);
+      // 副标题
+      ctx.setFillStyle("#999999");
+      ctx.setFontSize(28 * ratio); //字大小
+      ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      let subtitle = that.data.info.sub_title
+      if (subtitle && subtitle.length > 10) {
+        subtitle = subtitle.substr(0, 10) + '...'
+      }
+      if (subtitle) {
+        ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+      }
+
+      // ctx.draw();
+      // 划线价
+      // ctx.setFillStyle("#999999");
+      // ctx.setFontSize(32 * ratio); //字大小
+      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      // let market_price = "￥"+(Number(that.data.info.market_price)/100)
+      // ctx.fillText(market_price, 40*ratio + width, 620*ratio);
+      // let market_price_width = ctx.measureText(market_price).width;
+      // 划线
+      // ctx.beginPath()
+      // ctx.setLineWidth(1)
+      // ctx.moveTo(40*ratio + width, 608*ratio)
+      // ctx.lineTo(45*ratio + width, 608*ratio)
+      // ctx.stroke();
+      // 长按识别二维码
+      // ctx.setFillStyle("#666");
+      // ctx.setFontSize(22 * ratio); //字大小
+      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+      // 长按图片转发或保存
+      // ctx.setFillStyle("#000");
+      // ctx.setFontSize(24 * ratio); //字大小
+      // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+      // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+      ctx.draw();
+      // 转为图片
+      setTimeout(() => {
+        wx.canvasToTempFilePath({
+          x: 0,
+          y: 0,
+          canvasId: 'imageCanvas',
+          success: function (res) {
+            that.setData({
+              shareImg: res.tempFilePath
+            })
+          },
+          fail(err) {
+            console.log('agdgjgdajhg', err)
+          }
+        })
+      }, 500)
+      return false;
+    }).catch(err => {
+      console.log("this err", err)
+    })
+  },
+  // 圆角矩形
+  handleBorderRect(ctx, x, y, w, h, r, color) {
+    ctx.beginPath();
+    ctx.moveTo(x + w, y + h);
+    ctx.lineTo(x, y + h)
+    // 左上角
+    ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+    ctx.moveTo(x + r, y);
+    ctx.lineTo(x + w - r, y);
+    ctx.lineTo(x + w, y + r);
+    // 右上角
+    ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+    ctx.lineTo(x + w, y + h);
+    ctx.lineTo(x + w - r, y + h);
+    ctx.fillStyle = color;
+    ctx.fill();
+    ctx.closePath();
+  },
+  handleBorderRect2(ctx, x, y, w, h, r, color) {
+    ctx.beginPath();
+    ctx.moveTo(x, y);
+    ctx.lineTo(x + w, y)
+    // 右下角
+    ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+    ctx.lineTo(x + r, y + h);
+    ctx.lineTo(x, y + h - r);
+    // 左下角
+    ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+    ctx.lineTo(x, y);
+    ctx.lineTo(x, y);
+    ctx.fillStyle = color;
+    ctx.fill();
+    ctx.closePath();
+  },
+  // 绘制两行文字
+  drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+    let row = [],
+      temp = "",
+      chr = str.split("");
+    for (var a = 0; a < chr.length; a++) {
+      if (ctx.measureText(temp).width < canvasWidth) {
+        temp += chr[a];
+      } else {
+        a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+        row.push(temp);
+        temp = "";
+      }
+    }
+    row.push(temp);
+
+    //如果数组长度大于2 则截取前两个
+    if (row.length > 2) {
+      var rowCut = row.slice(0, 2);
+      var rowPart = rowCut[1];
+      var test = "";
+      var empty = [];
+      for (var a = 0; a < rowPart.length; a++) {
+        if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+          test += rowPart[a];
+        } else {
+          break;
+        }
+      }
+      empty.push(test);
+      var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+      rowCut.splice(1, 1, group);
+      row = rowCut;
+    }
+    for (var b = 0; b < row.length; b++) {
+      ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+    }
+  },
+  //加入购物车
+  showCart: function () {
+    commonApi.user_post('wx/get_user_keep', {
+      jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
+      title: this.data.info.title,
+      type: 'mini'
+    }).then(res => {
+      if (res.data.subscribe == 0) {
+        this.setData({
+          wxqrcode: res.data.qrcode,
+          showQrCode: true
+        })
+      } else {
+        if (this.data.info.product[0].sku.length == 0) {
+          wx.showToast({
+            title: '该产品未设置规格，不能加购',
+            icon: 'none'
+          })
+          return;
+        }
+        this.setData({
+          skuFlag: "cart"
+        })
+        let that = this
+        wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+          that.setData({
+            cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+          })
+        }).exec()
+      }
+    })
+  },
+  hideSku: function () {
+    this.setData({
+      skuFlag: null,
+      cartImgInfo: null
+    })
+  },
+  hideDate: function () {
+    this.setData({
+      showDate: false
+    })
+  },
+  //加减数量
+  minus: function () {
+    if (this.data.productNum == 1) return;
+    this.setData({
+      productNum: this.data.productNum - 1
+    })
+  },
+  add: function () {
+    if (this.data.productNum == this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num) {
+      wx.showToast({
+        title: '本产品单笔限购' + this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num,
+        icon: 'none'
+      });
+    } else {
+      this.setData({
+        productNum: this.data.productNum + 1
+      })
+    }
+  },
+  // 选择日期
+  selectDate(e) {
+    console.log(e.currentTarget.dataset);
+    let sku = {
+        sku: e.currentTarget.dataset.sku
+      },
+      product = {
+        product: e.currentTarget.dataset.product
+      },
+      ticket_type = e.currentTarget.dataset.sku.ticket_type
+      console.log(sku,product);
+    product.productNum = 1
+    app.globalData.product = {
+      ...sku,
+      ...product
+    }
+    console.log(app.globalData.product);
+    console.log(ticket_type);
+    if (ticket_type != 2) {
+      this.setData({
+        showDate: true,
+      })
+      this.setData({
+        product: product,
+        showDate2: true,
+        skuFlag: 'order',
+        showPrice:e.currentTarget.dataset.sku.price
+      })
+    }else {
+        let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id)
+
+      this.setData({
+        skuFlag: 'order',
+        skuIndex: skuIndex,
+      })
+      this.order()
+    }
+  },
+  //立即预定
+  showOrder: function () {
+    console.log(this.data.id);
+    commonApi.user_post('wx/get_user_keep', {
+      jumpurl: '/pages/info/sceneProductInfo/index?id=' + this.data.id,
+      title: this.data.info.title,
+      type: 'mini'
+    }).then(res => {
+      if (res.data.subscribe == 0) {
+        this.setData({
+          wxqrcode: res.data.qrcode,
+          showQrCode: true
+        })
+      } else {
+        if (this.data.info.product[0].sku.length == 0) {
+          wx.showToast({
+            title: '该产品未设置规格，不能购买',
+            icon: 'none'
+          })
+          return;
+        }
+        if (this.data.info.product[0].type == 'line') {
+          wx.navigateTo({
+            url: '/pages/order/road/index?id=' + this.data.info.product[0].id
+          })
+          return
+        }
+        this.setData({
+          skuFlag: 'order'
+        })
+      }
+    })
+
+  },
+
+  changeActiveMenu: function (e) {
+        let activeItem = e.currentTarget.dataset.item,
+            that = this;
+        this.setData({
+            activeItem: activeItem,
+            activeItemIndex: 0
+        })
+
+
+        const query = wx.createSelectorQuery(); //创建节点查询器
+        query.select("#menus").boundingClientRect() //选择toViewid获取位置信息
+        query.selectViewport().scrollOffset() //获取页面查询位置的
+        query.select("#scroll-sku-"+activeItem.id).boundingClientRect()
+
+        query.exec(function (res) {
+            console.log(res)
+            let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - 44;
+            wx.pageScrollTo({
+                scrollTop: scrollTop + 4,
+                duration: 0
+            })
+
+            that.setData({
+                scrollLeft: res[2].left
+            })
+        })
+  },
+
+  changeActiveIndex: function (e) {
+    let index = e.currentTarget.dataset.index;
+    this.setData({
+        activeItemIndex: index
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    if (app.globalData.configJson) {
+      this.setData({
+        isTest: app.globalData.configJson.isTest
+      })
+    } else {
+      setTimeout(() => {
+        this.onReady()
+      }, 300)
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    console.log(11111);
+    commonApi.user_post('cart/get_list', {}).then(res => {
+      this.setData({
+        cartCount: res.data.length //1
+      })
+    })
+    if (!wx.getStorageSync('jstrip_token')) {
+      return;
+    }
+    if (this.data.info && this.data.info.id) {
+      this.drawImg()
+    } else {
+      console.log(2222);
+      setTimeout(() => {
+        // this.onShow()
+      }, 200)
+    }
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {}
+})
\ No newline at end of file
diff --git a/subPackages/goods/oneCardTour/info/index.json b/subPackages/goods/oneCardTour/info/index.json
new file mode 100644
index 0000000..ee48bc8
--- /dev/null
+++ b/subPackages/goods/oneCardTour/info/index.json
@@ -0,0 +1,9 @@
+{
+    "usingComponents": {
+      "title":"/pages/component/TitleHeader",
+          "notice":"/pages/component/notice/notice",
+      "code":"/pages/order/components/wxqrCode/index",
+      "date":"/pages/order/components/date"
+          
+    }
+  }
\ No newline at end of file
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
new file mode 100644
index 0000000..58693d4
--- /dev/null
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -0,0 +1,202 @@
+<!--pages/info/sceneProductInfo/index.wxml-->
+<wxs src="../../../../utils/filter.wxs" module="tool" />
+<title title="{{info.title}}"></title>
+<view class="iconfont icon-fenxiang" bindtap="share"></view>
+<image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
+<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
+  <block wx:for="{{info.listimg}}" wx:key="*this">
+    <swiper-item>
+      <image src="{{item}}" mode="aspectFill"></image>
+    </swiper-item>
+  </block>
+</swiper>
+<view class="top-info" wx:if="{{info}}" style="position:relative">
+  <view class="title">{{info.title}}</view>
+</view>
+
+
+<view class="sku-type-container" wx:if="{{info}}">
+    <view class="box" wx:for="{{info.product}}" wx:key="index">
+        <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI"
+            bind:tap="changeActiveMenu" data-item="{{sku}}">
+            <view class="sku-title-container">
+                <view class="skutitle textOver2">{{sku.sku_name}}</view>
+                <view class="sku-more-icon">详情 ></view>
+
+            </view>
+            <view class="product-box">
+            <view class="product-left textOver">
+                <view class="product-tags">
+                    <view class="product-tag textOver" wx:for="{{sku.display_tags}}" wx:for-item="tag" wx:for-index="tagI">{{tag}}</view>
+                </view>
+                <view class="order-tip-text" data-item="{{sku}}">已售999+</view>
+            </view>
+            <view class="product-right">
+                <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>
+                <view catch:tap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
+                data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
+                class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">购买</view>
+            </view>
+            </view>
+        </view>
+    </view>
+</view>
+
+<view class="scroll-all-box" id="menus" wx:if="{{info}}">
+    <scroll-view scroll-x enable-flex style="flex-direction: row;" 
+        class="no-scrollbar scroll-menus{{fixed?' fixed-menus':''}}"
+        scroll-left="{{scrollLeft}}">
+        <view class="scroll-menu-item-container" wx:for="{{info.product}}" wx:key="index">
+            <view class="scroll-menu-item {{activeItem.id==sku.id?'active':''}}"  wx:for="{{item.sku}}"
+            wx:for-item="sku" wx:for-index="itemI" id="scroll-sku-{{sku.id}}"
+            bind:tap="changeActiveMenu" data-item="{{sku}}">{{sku.sku_name}}</view>
+        </view>
+
+    </scroll-view>
+
+
+    
+
+  <view style="height:85rpx" wx:if="{{fixed}}"></view>
+
+  
+  <view class="scroll-content">
+    <view class="com-flex sku-info-type-container">
+        <view class="sku-info-type {{activeItemIndex==0?'active':''}}" bind:tap="changeActiveIndex" data-index="0">年卡权益</view>
+        <view class="sku-info-type {{activeItemIndex==1?'active':''}}" bind:tap="changeActiveIndex" data-index="1">合作景区</view>
+        <view class="sku-info-type {{activeItemIndex==2?'active':''}}" bind:tap="changeActiveIndex" data-index="2">使用说明</view>
+    </view>
+
+    <view style="padding:0 30rpx 30rpx;">
+        <rich-text wx:if="{{activeItemIndex==0}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.detailinfo)}}"></rich-text>
+
+        <rich-text wx:if="{{activeItemIndex==1}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.bookinfo)}}"></rich-text>
+
+        <rich-text wx:if="{{activeItemIndex==2}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.expenseinfo)}}"></rich-text>
+
+    </view>
+  </view>
+
+</view>
+
+<view style="height:140rpx"></view>
+
+  <view class="fixed-bottom">
+    <navigator url="/pages/user/service/index" catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+      <view class="iconfont icon-kefu"></view>
+      <view>客服</view>
+    </navigator>
+    <view bindtap="like" class="kefu-box" style="margin-left:70rpx">
+      <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
+      <view>收藏</view>
+    </view>
+    <view style="flex:1"></view>
+    <view class="btns" wx:if="{{info.id!=914626}}">
+      <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line' }}">加入购物车</view>
+      <!-- <view class="btn {{info.product[0].type=='line' ? 'btn-r':''}}" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view> -->
+      <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
+    </view>
+  </view>
+  <!-- 购物车悬浮框 -->
+  <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+    <view class="cart-num">{{cartCount}}</view>
+  </navigator>
+ <!-- 日期弹框 -->
+
+  <view class="mask" wx:if="{{showDate}}">
+    <view class="mask-bg" bindtap="hideDate"></view>
+    <view class="mask-content1">
+      <view class="iconfont icon-close" bindtap="hideDate"></view>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <view class="bottom-box">
+        <view>
+          合计: <text class="totalPrice">{{showPrice/100}}</text>
+        </view>
+        <view class="next" bindtap="order" data-sku="{{sku}}" data-product="{{item}}">
+          下一步
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- 规格弹框 -->
+  <view class="mask" wx:if="{{skuFlag == 'cart'}}">
+    <view class="mask-bg" bindtap="hideSku"></view>
+    <view class="mask-content">
+      <view class="iconfont icon-close" bindtap="hideSku"></view>
+      <view class="sku-info-box">
+        <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
+        <view class="sku-info">
+          <view class="sku-price">{{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
+            <view class="allowance" wx:if="{{allowance_data}}">
+              补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+          </view>
+          <view class="sku-name">已选择：{{skuList[skuIndex].sku_name || skuList[0].sku_name}}</view>
+        </view>
+      </view>
+      <view class="sku-names">
+        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}} {{(item.stock==0&&item.is_third_stock!=1)||item.is_salee==1?' disable':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
+      </view>
+      <view class="number-box">
+        <text>数量</text>
+        <view class="iconfont icon-sami-select" bindtap="minus"></view>
+        <view class="number">{{productNum}}</view>
+        <view class="iconfont icon-add-select" bindtap="add"></view>
+      </view>
+      <view style="height:138rpx"></view>
+      <view class="btn-box">
+        <view class="mask-btn" bindtap="order"  data-product="{{item}}" wx:if="{{info && info.flag==1}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+        </view>
+        <!-- <view class="mask-btn" bindtap="order"  data-product="{{item}}" wx:if="{{info && info.flag==1}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+        </view> -->
+        <view class="mask-btn disable" wx:else>该商品已下架</view>
+      </view>
+    </view>
+  </view>
+
+
+
+
+
+<view style="height:{{safeBottom}}px"></view>
+
+<view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
+  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
+  </canvas>
+  <canvas class="canvasCode" style="opacity:0;width:500px;height:500px" canvas-id="myQrcode"></canvas>
+</view>
+<view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
+  <view class="mask-bg" bindtap="share"></view>
+  <view class="mask-content share-img-box" style="bottom: 200rpx;">
+    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <view class="share-tips">
+      <view style="position:relative">
+        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        </image>
+        <view>保存图片到相册</view>
+        <view class="tipimg">
+          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+        </view>
+      </view>
+      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <view style="position:relative">
+        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        </image>
+        <view>微信识别二维码</view>
+        <view class="tipimg">
+          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+        </view>
+      </view>
+    </view>
+    <view class="save-btn" bindtap="save">保存到相册</view>
+  </view>
+</view>
+<view class="mask mask-allowance" wx:if="{{showAllowance}}">
+  <view bindtap="changeAllowance" class="mask-bg"></view>
+  <view class="mask-content rule-box">
+    <view class="rule-title">{{info.allowance.title}}</view>
+    <rich-text nodes="{{info.allowance.content}}"></rich-text>
+  </view>
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
\ No newline at end of file
diff --git a/subPackages/goods/oneCardTour/info/index.wxss b/subPackages/goods/oneCardTour/info/index.wxss
new file mode 100644
index 0000000..dce63ac
--- /dev/null
+++ b/subPackages/goods/oneCardTour/info/index.wxss
@@ -0,0 +1,683 @@
+/* pages/info/sceneProductInfo/index.wxss */
+page {
+    background: #f8f8f8;
+  }
+  
+  .swiper {
+    width: 100%;
+    height: 400rpx;
+  }
+  
+  .swiper image {
+    height: 400rpx;
+    display: block;
+    width: 100%;
+  }
+  
+  .top-info {
+    border-radius: 20rpx 20rpx 0 0;
+    background: white;
+    position: relative;
+    z-index: 1;
+    margin-top: -20rpx;
+    padding: 50rpx 40rpx;
+  }
+  
+  .top-info .title {
+    font-size: 33rpx;
+    font-weight: bold;
+    color: #000;
+  }
+  
+  /* sku、产品区域 */
+  .box {
+    background: white;
+    border-radius: 13rpx;
+  }
+    
+  .sku-type-container{
+    display: flex;
+    margin-top: 21rpx;
+    flex-direction: column;
+    padding: 26rpx 26rpx 0;
+    background: white;
+}
+  
+  .product-item {
+    padding: 26rpx 20rpx;
+    background-color: rgba(11,137,142, .06);
+    border-radius: 13rpx;
+    margin-bottom: 26rpx;
+  }
+
+  .sku-title-container{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+  }
+  
+  .skutitle {
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #000000;
+    flex-shrink: 0;
+    flex: 1;
+    padding-right: 20rpx;
+  }
+  .sku-more-icon{
+    width: 80rpx;
+    font-weight: 500;
+    font-size: 25rpx;
+    color: #666666;
+  }
+  
+  .product-box {
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    margin-top: 13rpx;
+    /* margin-top: 20rpx; */
+  }
+  
+  .product-left {
+    flex: 1;
+  }
+  
+  .product-tags {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .product-tag {
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #0B898E;
+    margin-bottom: 13rpx;
+    display: flex;
+    align-items: center;
+  }
+  .product-tag::before {
+    content: ' ';
+    width: 11rpx;
+    height: 11rpx;
+    background: #0B898E;
+    border-radius: 50%;
+    display: inline-block;
+    margin-right: 13rpx;
+  }
+  .order-tip-text {
+    /* margin-top: 33rpx;
+    font-size: 24rpx;
+    color: #666; */
+    margin-top: 18rpx;
+
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+  }
+  
+  .product-right {
+    text-align: center;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+  }
+  
+  .product-right .price {
+    font-weight: bold;
+    color: #D62828;
+    font-size: 24rpx;
+    /* margin-bottom: 20rpx; */
+    margin-right: 19rpx;
+  }
+  
+  .product-right .price text:nth-child(2) {
+    font-size: 36rpx;
+  }
+  
+  .product-right .btn {
+    width: 107rpx;
+    height: 67rpx;
+    background: #0B898E;
+    border-radius: 13rpx;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 67rpx;
+  }
+  
+  .product-right .btn.disable {
+    background: #ccc;
+  }
+  
+  
+/* 结束 */
+
+  
+  .mask-content {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+  }
+  
+  .mask-content .icon-close {
+    position: absolute;
+    right: 40rpx;
+    top: 40rpx;
+  }
+  
+  .share-img-box {
+    /* width: 551rpx; */
+    position: static;
+    background: none;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .share-img {
+    display: block;
+    width: 551rpx;
+  }
+  
+  .share-tips {
+    width: 426rpx;
+    height: 150rpx;
+    background: #FFFFFF;
+    border-radius: 25rpx;
+    margin-top: 25rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 65rpx;
+    color: #999;
+    font-size: 24rpx;
+    text-align: center;
+    line-height: 40rpx;
+  }
+  
+  .share-tips .img {
+    display: block;
+    width: 55rpx;
+    margin: 0 auto;
+    margin-bottom: 4rpx;
+  }
+  
+  .tipimg {
+    position: absolute;
+    left: 50%;
+    margin-left: 16rpx;
+    width: 24rpx;
+    height: 24rpx;
+    background: #D62828;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    top: 34rpx;
+  }
+  
+  .tipimg image {
+    width: 21rpx;
+    display: block;
+  
+  }
+  
+  .save-btn {
+    width: 403rpx;
+    line-height: 77rpx;
+    background: #D62828;
+    border-radius: 39rpx;
+    text-align: center;
+    color: #fff;
+    font-size: 31rpx;
+    font-weight: 500;
+    margin-top: 50rpx;
+  }
+
+  
+
+  .mask-allowance .mask-content {
+    margin: auto;
+    width: auto;
+    top: initial;
+    bottom: initial;
+    padding: 20rpx;
+    width: 80%;
+  }
+  
+  .mask-allowance .mask-content .rule-title {
+    text-align: center;
+    margin-bottom: 20rpx;
+  }
+  
+  .fixed-bottom {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 140rpx;
+    background: white;
+    display: flex;
+    align-items: center;
+    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+    padding: 0 40rpx;
+    color: #666666;
+    font-size: 23rpx;
+    justify-content: space-between;
+    text-align: center;
+  }
+  
+  .fixed-bottom .iconfont {
+    font-size: 34rpx;
+    line-height: 40rpx;
+  }
+  
+  .btns {
+    color: #fff;
+    font-size: 32rpx;
+    font-weight: 500;
+    border-radius: 39rpx;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .btns .btn {
+    width: 216rpx;
+    line-height: 78rpx;
+    background: #D62828;
+  }
+  
+  .btns .btn:nth-child(1) {
+    margin-right: 3rpx;
+    border-radius: 39rpx;
+  }
+  
+  .btns .btn:nth-child(2) {
+    border-radius: 0 39rpx 39rpx 0;
+  }
+  
+  .btns .btn.disable {
+    background: #ccc;
+  }
+  
+  .mask-content {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+  }
+  
+  .mask-content .icon-close {
+    position: absolute;
+    right: 40rpx;
+    top: 40rpx;
+  }
+  
+  .sku-info-box {
+    margin: 50rpx 40rpx;
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .sku-info-box image {
+    width: 218rpx;
+    height: 180rpx;
+    border-radius: 13rpx;
+    display: block;
+    margin-right: 40rpx;
+    flex-shrink: 0;
+  }
+  
+  .sku-info {
+    flex: 1;
+  }
+  
+  .sku-price {
+    font-size: 40rpx;
+    font-weight: 500;
+    color: #D62828;
+    margin: 20rpx 0;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  
+  .sku-price::before {
+    content: "￥";
+    font-weight: 400;
+    font-size: 27rpx;
+    vertical-align: baseline;
+  }
+  
+  .sku-price view {
+    font-size: 24rpx;
+    color: #FFFFFF;
+    background-color: #D62828;
+    border-radius: 22rpx;
+    line-height: 44rpx;
+    margin-left: 7rpx;
+    padding: 0 20rpx;
+  }
+  
+  .sku-name {
+    font-size: 27rpx;
+    color: #666666;
+  }
+  
+  .sku-names {
+    display: flex;
+    font-size: 29rpx;
+    color: #333;
+    margin: 0 40rpx;
+    text-align: center;
+    flex-wrap: wrap;
+    margin-bottom: 20rpx;
+  }
+  
+  .sku-name-item {
+    background: #EFEFEF;
+    border: 1rpx solid #EFEFEF;
+    width: 318rpx;
+    line-height: 77rpx;
+    border-radius: 14rpx;
+    margin-bottom: 25rpx;
+    margin-right: 10rpx;
+  }
+  
+  .sku-name-item:nth-child(2n) {
+    margin-right: 0;
+  }
+  
+  .sku-name-item.active {
+    color: #0B898E;
+    border-color: #0B898E;
+    background: rgba(11, 137, 142, 0.1);
+  }
+  
+  .number-box {
+    display: flex;
+    align-items: center;
+    border-top: 1rpx solid #ccc;
+    justify-content: space-between;
+    margin: 0 40rpx;
+    padding: 40rpx 0;
+  }
+  
+  .number-box text {
+    flex: 1;
+    font-size: 29rpx;
+    color: #333;
+  }
+  
+  .number-box view {
+    border: 1rpx solid #666;
+    border-radius: 7rpx;
+    text-align: center;
+    width: 67rpx;
+    line-height: 67rpx;
+    font-size: 33rpx;
+    color: #000;
+  }
+  
+  .number-box view.disable {
+    border-color: #ccc;
+    color: #999;
+  }
+  
+  .sku-name-item.disable {
+    border-color: transparent;
+    color: #fff;
+    background: #d7d7d7;
+  }
+  
+  .number-box view.number {
+    width: 94rpx;
+    margin: 0 15rpx;
+  }
+  
+  .btn-box {
+    height: 138rpx;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+  
+  .mask-btn {
+    width: 670rpx;
+    line-height: 78rpx;
+    background: #D62828;
+    border-radius: 39rpx;
+    color: #fff;
+    text-align: center;
+    font-size: 33rpx;
+    font-weight: 500;
+  }
+  
+  .mask-btn.disable {
+    background: #ccc;
+  }
+  
+  /* 购物车 */
+  .cart-box {
+    position: fixed;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 80rpx;
+    height: 80rpx;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.2);
+    border-radius: 50%;
+    right: 20rpx;
+    bottom: 166rpx;
+  }
+  
+  .cart-box image {
+    display: block;
+    width: 49rpx;
+  }
+  
+  .cart-num {
+    width: 26rpx;
+    border: 1rpx solid;
+    border-radius: 50%;
+    line-height: 26rpx;
+    text-align: center;
+    font-size: 23rpx;
+    color: #D20000;
+    position: absolute;
+    right: -2rpx;
+    top: -5rpx;
+  }
+  .headimg {
+    position: fixed;
+    z-index: 3;
+    left: -218rpx;
+    width: 218rpx;
+    height: 180rpx;
+    top: 0;
+  }
+  .headimg.active {
+    transition: left .6s linear, top .6s cubic-bezier(0.5, -0.5, 1, 1), width .6s ease, height .6s ease;
+    width: 80rpx;
+    height: 80rpx;
+    left: 650rpx;
+    border-radius: 50%;
+  }
+  .imgs{
+    width: 200rpx;
+    height: 200rpx;
+    margin: 10rpx;
+    border-radius: 8rpx;
+  }
+  .img-box{
+    display: inline-block;
+    position: relative;
+  }
+  .all{
+    color: #fff;
+    position:absolute;
+    bottom: 17rpx;
+    right: 10rpx;
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 8rpx;
+    background-color: rgba(0, 0, 0, .5);
+  }
+  .all view{
+    text-align: center;
+  }
+  .all view:first-child{
+    font-size: 40rpx;
+    margin-top: 40rpx;
+  }
+  .all view:last-child{
+    margin-top: 10rpx;
+    font-size: 30rpx;
+  
+  }
+  .sku{
+    margin-left: 10rpx;
+    color: #666;
+    font-size: 24rpx;
+    margin-top: 8rpx;
+  }
+  .btn-r{
+    border-radius: 39rpx !important;
+  }
+  .totalPrice {
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 48rpx;
+    color: #D62828;
+  }
+  .totalPrice::before {
+    content: "￥";
+    font-size: 24rpx;
+  }
+  .bottom-box {
+    height: 133rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
+    padding: 0 50rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+  }
+  .next {
+    width: 250rpx;
+    height: 80rpx;
+    background: #D62828;
+    border-radius: 40rpx;
+    font-family: PingFang;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 80rpx;
+  }
+  .mask-content1 {
+    position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      width: 100%;
+      background: white;
+      border-radius: 12rpx;
+      overflow-y: auto;
+      height: 1100rpx;
+  }
+  .icon-close {
+    position: absolute;
+    top: 30rpx;
+    right: 30rpx;
+  }
+  
+
+/* 产品sku对应锚点信息 */
+  .scroll-all-box {
+    margin: 20rpx 0;
+    background: white;
+  }
+  
+  .scroll-menus {
+    display: flex;
+    font-size: 29rpx;
+    color: #333;
+    height: 84rpx;
+    border-bottom: 1px solid #CCC;
+    overflow-x: auto;
+    overflow-y: hidden;
+
+  }
+  .scroll-menu-item-container{
+      display: flex;
+      align-items: center;
+      height: 100%;
+      flex-shrink: 0;
+  }
+  
+  .scroll-menu-item {
+    line-height: 84rpx;
+    position: relative;
+    padding: 0 53rpx;
+    flex-shrink: 0;
+  }
+  .scroll-menu-item.active{
+    color: #0B898E;
+  }
+  
+  .scroll-menu-item.active::after {
+    content: "1";
+    font-size: 0;
+    display: block;
+    position: absolute;
+    width: 60rpx;
+    height: 6rpx;
+    border-radius: 3rpx;
+    background: #0B898E;
+    left: 50%;
+    margin-left: -30rpx;
+    bottom: 0rpx;
+  }
+  .sku-info-type-container{
+      padding: 57rpx 30rpx;
+      justify-content: space-between;
+  }
+  .sku-info-type{
+    width: 200rpx;
+    height: 53rpx;
+    border-radius: 27rpx;
+    border: 1px solid #999999;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #666666;
+    line-height: 53rpx;
+    text-align: center;
+  }
+  .sku-info-type.active{
+    border: 1px solid #0B898E;
+    color: #0B898E;
+  }
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 7b5921e..46688e8 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -186,7 +186,12 @@ const gotoDetail = (item,isPagePoint) =>{
         url: '/pages/info/postProductInfo/index?id='+item.id,
     })
       return
-  }
+  }else if (item.is_package==2) {
+    wx.navigateTo({
+        url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
+      });
+      return
+}
 
   console.log(item)
 
@@ -336,6 +341,11 @@ const orderMoreTime = function(item){
         wx.navigateTo({
             url: '/pages/info/postProductInfo/index?id='+info.product_id,
         })
+    }else if (info.is_package==2) {
+        wx.navigateTo({
+            url: '/subPackages/goods/oneCardTour/info/index?id='+info.product_id
+          });
+          return
     }
     else if(info.product_model=='movie'){
       wx.navigateTo({

From 5e361b891c635d076f85d3c55eebb95b4f345ed1 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 17 Feb 2025 17:52:13 +0800
Subject: [PATCH 285/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index a9e23e0..9d934e6 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -539,7 +539,7 @@ Page({
             return
         } else {
             wx.navigateTo({
-                url: '/subPackages/password/setting/setting?type='+type,
+                url: '/subPackages/password/setting/setting?type=reset'
             })
         }
       })

From 457746e4e1fcade70e9b6c4c8b564dd37b807865 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 18 Feb 2025 14:23:56 +0800
Subject: [PATCH 286/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3445f12..3cc6f36 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -137,7 +137,7 @@
 
         <!-- 小banner 五一修改 一张banner不滚动 -->
         <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%;height: 100%;" src="{{xiaobanner[0].head_img}}" mode="aspectFill"></image>
         </view>
         <view class="small-swiper-box" wx:else>
             <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">

From 5a6fcd9fea84b0c759017c72201aa3a0326efaab Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 21 Feb 2025 09:17:08 +0800
Subject: [PATCH 287/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index ee846ce..06fae80 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.isTest170? true : false;
+      data.isTest = data.isTest171? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

From 874fde39e72ac08672424ebf0b59be1c05b63a62 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 21 Feb 2025 15:41:39 +0800
Subject: [PATCH 288/471] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/scene/index.wxml                  | 2 +-
 pages/user/likes/index.js                     | 7 ++++---
 pages/user/order/sceneOrderInfo/index.js      | 2 +-
 pages/user/order/showOrderInfo/index.js       | 2 +-
 subPackages/goods/oneCardTour/info/index.wxml | 6 +++---
 utils/util.js                                 | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 0a896a9..1e5683e 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -47,7 +47,7 @@
       <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
     </view>
     <view class="text1">
-      <text wx:for="{{product.sku.display_tags}}">
+      <text wx:for="{{product.sku.display_tags}}" wx:if="{{index<=1}}">
         {{item}}<text style="margin:0 8rpx;" wx:if="{{index+1<=product.sku.display_tags.length}}">|</text> 
       </text>
       <text bindtap="showBookingInfo">预订须知 ></text>
diff --git a/pages/user/likes/index.js b/pages/user/likes/index.js
index 8e55461..44d3ca6 100644
--- a/pages/user/likes/index.js
+++ b/pages/user/likes/index.js
@@ -137,14 +137,15 @@ Page({
     console.log(item)
     let type = item.product?item.product.type:item.scene.type
 
-    if (item.product.is_package==1) {
+    if (item.product && item.product.is_package==1) {
         wx.navigateTo({
             url: '/pages/info/postProductInfo/index?id='+item.product.id
           });
           return
-    } else if (item.product.is_package==2) {
+    }
+    if (item.product &&item.product.is_package==2) {
         wx.navigateTo({
-            url: '/subPackages/goods/oneCardTour/info/index?id='+item.product.id
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
           });
           return
     }
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index ca5999f..93faa07 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -230,7 +230,7 @@ Page({
         return
     } else if (item.is_package==2) {
         wx.navigateTo({
-            url: '/subPackages/goods/oneCardTour/info/index?id='+item.product_id
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
           });
           return
     }
diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js
index 02f7a8d..ef6d292 100644
--- a/pages/user/order/showOrderInfo/index.js
+++ b/pages/user/order/showOrderInfo/index.js
@@ -230,7 +230,7 @@ Page({
         return
     } else if (item.is_package==2) {
         wx.navigateTo({
-            url: '/subPackages/goods/oneCardTour/info/index?id='+item.product_id
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
           });
           return
     }
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
index 58693d4..a7669fe 100644
--- a/subPackages/goods/oneCardTour/info/index.wxml
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -29,7 +29,7 @@
                 <view class="product-tags">
                     <view class="product-tag textOver" wx:for="{{sku.display_tags}}" wx:for-item="tag" wx:for-index="tagI">{{tag}}</view>
                 </view>
-                <view class="order-tip-text" data-item="{{sku}}">已售999+</view>
+                <view class="order-tip-text" data-item="{{sku}}">已售{{item.sales_number>999?'999+':item.sales_number}}</view>
             </view>
             <view class="product-right">
                 <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>
@@ -86,10 +86,10 @@
       <view class="iconfont icon-kefu"></view>
       <view>客服</view>
     </navigator>
-    <view bindtap="like" class="kefu-box" style="margin-left:70rpx">
+    <!-- <view bindtap="like" class="kefu-box" style="margin-left:70rpx">
       <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
       <view>收藏</view>
-    </view>
+    </view> -->
     <view style="flex:1"></view>
     <view class="btns" wx:if="{{info.id!=914626}}">
       <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line' }}">加入购物车</view>
diff --git a/utils/util.js b/utils/util.js
index 46688e8..871c27e 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -343,7 +343,7 @@ const orderMoreTime = function(item){
         })
     }else if (info.is_package==2) {
         wx.navigateTo({
-            url: '/subPackages/goods/oneCardTour/info/index?id='+info.product_id
+            url: '/subPackages/goods/oneCardTour/info/index?id='+info.scene_id
           });
           return
     }

From c2bce108bab2b3c78d0a0df4590556a78aa16bd3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 22 Feb 2025 13:19:58 +0800
Subject: [PATCH 289/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=92=E5=BA=97?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=96=B0=E8=83=BD=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        | 2 +-
 pages/index/index.wxml                        | 8 ++++----
 subPackages/goods/oneCardTour/info/index.js   | 1 -
 subPackages/goods/oneCardTour/info/index.wxml | 5 ++++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 06fae80..2d29919 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.isTest171? true : false;
+      data.isTest = data.isTest173? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3cc6f36..3714909 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -65,15 +65,15 @@
             <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <!-- <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
-        </view>
+        </view> -->
         <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
+        <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
-        </view> -->
+        </view>
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
             <view class="top-icon-text">夜游苏州</view>
diff --git a/subPackages/goods/oneCardTour/info/index.js b/subPackages/goods/oneCardTour/info/index.js
index cf40f15..ea8eb10 100644
--- a/subPackages/goods/oneCardTour/info/index.js
+++ b/subPackages/goods/oneCardTour/info/index.js
@@ -811,7 +811,6 @@ Page({
             let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - 44;
             wx.pageScrollTo({
                 scrollTop: scrollTop + 4,
-                duration: 0
             })
 
             that.setData({
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
index a7669fe..aab520f 100644
--- a/subPackages/goods/oneCardTour/info/index.wxml
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -12,6 +12,8 @@
 </swiper>
 <view class="top-info" wx:if="{{info}}" style="position:relative">
   <view class="title">{{info.title}}</view>
+  <view class="order-tip-text">已售{{info.sales_number>999?'999+':info.sales_number}}</view>
+
 </view>
 
 
@@ -29,7 +31,8 @@
                 <view class="product-tags">
                     <view class="product-tag textOver" wx:for="{{sku.display_tags}}" wx:for-item="tag" wx:for-index="tagI">{{tag}}</view>
                 </view>
-                <view class="order-tip-text" data-item="{{sku}}">已售{{item.sales_number>999?'999+':item.sales_number}}</view>
+                <!-- <view class="order-tip-text" data-item="{{sku}}">已售{{item.sales_number>999?'999+':item.sales_number}}</view> -->
+                <view class="order-tip-text" data-item="{{sku}}"></view>
             </view>
             <view class="product-right">
                 <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>

From c30d61ee13506100e7ac16d88eabc3cf165918f1 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 27 Feb 2025 15:47:22 +0800
Subject: [PATCH 290/471] =?UTF-8?q?=E9=85=92=E5=BA=97=E7=94=A8=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 pages/index/index.js                       | 30 +++++++++++++++++++++-
 pages/index/index.wxml                     |  8 +++---
 pages/user/order/sceneOrderInfo/index.wxml |  2 +-
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 2d29919..707b737 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.isTest173? true : false;
+      data.isTest = data.isTest176? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index f0ffd00..2919db8 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -72,6 +72,9 @@ Page({
 
         // 页面图片
         imageSourceList:imageSource,
+
+        // 酒店住宿配置链接   /pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/carPurchase
+        hotelUrl: ''
 	},
 	onLoad: function(options) {
         console.log('onload')
@@ -1009,7 +1012,32 @@ Page({
 
 		this.pagePoint({
 			event: 'home_view'
-		}, 1)
+        }, 1)
+        
+        if(!this.data.hotelUrl) {
+        commonApi._post("pbservice/Other/getClientConfig", {
+            unique_key: "wechatxcx"
+          }).then(res => {
+              try {
+                let data = JSON.parse(res.data);
+                if (data.hotelUrl) {
+                    this.setData({
+                        hotelUrl: data.hotelUrl
+                    })
+                }
+              } catch(e) {
+                this.setData({
+                    hotelUrl: '/pages/list/hotel/index'
+                })
+              }
+          }).catch(err => {
+              this.setData({
+                  hotelUrl: '/pages/list/hotel/index'
+              })
+          })
+        }
+		  })
+        }
 		// this.data.time!=5?wx.showTabBar():1
 	},
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3714909..53a986e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -65,15 +65,15 @@
             <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
-        <!-- <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="{{hotelUrl}}" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
-        </view> -->
+        </view>
         <!-- 临时跳转专题页 -->
-        <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
+        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
-        </view>
+        </view> -->
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
             <view class="top-icon-text">夜游苏州</view>
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 2baeb89..002c8df 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -86,7 +86,7 @@
       </view>
       <view class="row" wx:if="{{item.product_model == 'ticket' && !item.order_advance.id}}">
         <view>出行日期：</view>
-        <view>{{item.use_date}} <text wx:if="{{item.start_time && item.end_time}}">{{ item.start_time }}-{{ item.end_time }}</text> </view>
+        <view>{{item.use_date}}<text style="padding-left: 20rpx;" wx:if="{{item.start_time && item.end_time}}">{{ item.start_time }}-{{ item.end_time }}</text> </view>
       </view>
 
       <view class="row" wx:if="{{item.product_model == 'ticket' && item.order_advance.id}}">

From a209c66232f7343f2259bf98afdf764ab8db20ba Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 27 Feb 2025 15:50:04 +0800
Subject: [PATCH 291/471] 1

---
 pages/index/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 2919db8..0fd2d47 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1036,8 +1036,7 @@ Page({
               })
           })
         }
-		  })
-        }
+
 		// this.data.time!=5?wx.showTabBar():1
 	},
 

From a42ab2abc928ceb923e0d8d9a21a8320ff8fef5a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 13 Mar 2025 16:05:44 +0800
Subject: [PATCH 292/471] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.wxss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index a7621ab..1f34eac 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -331,7 +331,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: center;
-  z-index: 10;
+  z-index: 1;
 }
 .text-shadow-state {
   width: 200rpx;

From 5f3f06413bec1d3fc0a815efca7564fd211f3975 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 13 Mar 2025 16:06:03 +0800
Subject: [PATCH 293/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   |   2 +-
 pages/index/imgSource.js | 119 ++++++++++++++++++++-------------------
 pages/index/index.wxml   |  22 ++++----
 pages/index/index.wxss   |  24 +++-----
 4 files changed, 82 insertions(+), 85 deletions(-)

diff --git a/app.js b/app.js
index 707b737..376310c 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.isTest176? true : false;
+      data.isTest = data.isTest177? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 588f666..617d48a 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -1,84 +1,89 @@
 const imageSource = {
     // 活动日历、场馆预约等
     mainFunImgs: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/c69cdbafb16ed468fef68eb77865e6ff.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/05dd30d02e74178134242cc64aaa11ac.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e93e655b524001d25d7d4fd848f5bb3b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
+
+        "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e2cc47fa5a2d01d436dad0a85948f060.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/6d0c2112960ee56f5c15069e629dd5b4.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a094d635976194782fbdcf2bc596b082.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/11b1ab7ec62cc4022d4ce2f7c6ac0727.png",
     ],
     // 数字文旅
     SZWL: [
         // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
         // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
-        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/1994615fcbc125da641541ea1f04c364.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/f054ca452f27dac54723255ba6445790.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/590822c40c769cb4f673f460f1a37a0b.png",
+
+        "https://static.ticket.sz-trip.com/uploads/20250312/41c21568ed9c4b15084c9669ca99a6fd.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/1ee056f091a42e51ce8168767704708a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/b418843c04ddfa00be91fb793019cb99.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+       
+        "https://static.ticket.sz-trip.com/uploads/20250312/0ad69db116004e735e1bd13cd54fd75c.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/f2400b009c8e92efcdd645080f14b28a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bbda2dd4e332f457a6aa06a4a15b639b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/06b500881204a4a40c5bc8d126f38a58.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/d188c19334c9170e5c963459b7187f20.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a25506779b745291cb8d9051abce07c1.png",
 
     ],
     // 旅游助手
     LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
     ],
     // 公共服务
     GGFW: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/9799b276d76f884fd0130d7378c974fe.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/c40b456687490eafe5414addaaae0c2b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a95959dcba2f494b69980d16a895e9c8.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e16b8e640169e99639cef6ff7897b6a7.png"
     ],
     
     // 十全十美
     SQSM: [
         // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
+
+        
 
     ],
 
     // 长三角文旅平台
     CSJWLPT: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e44c2f4756948e8a5d837c759f643edc.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
     ],
 
     // 导航标题侧边图片
     CBTP: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
-        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/2f7f177fd27fd2f10b65b713880a8e72.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bedb1ab9dee396bbb59aa6675eb1c1f6.png",
+        "",
+        "https://static.ticket.sz-trip.com/uploads/20250312/cfdad61878bced7ad903d7c4e82ed322.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/8c7142c91a298733abf7fff3090042b8.png",
     ],
 
     // 其他后台配置的图片，开发时使用
@@ -91,19 +96,19 @@ const imageSource = {
             // ai避高峰
             avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
             // 新品特惠
-            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            xpth: "https://static.ticket.sz-trip.com/uploads/20250107/345f9202818f8375bf8c920b739323d7.png",
             // 文旅鉴赏
-            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20250312/6f62a4b1c24553758bdd30fcd24551bd.png",
             // 出行助手
-            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20250312/e178075d466b9160e049f6babb040ed8.png",
             // 公共服务
-            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20250312/d04eef216a072fcf3a5b8395840b89dd.png",
             // 十全十美
-            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            sqj: "https://static.ticket.sz-trip.com/uploads/20250312/baea137cb150200f8f03cc583a5d7b6d.png",
             // 长三角文旅平台
-            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20250312/8c268fb4b27e8be3fa10594492c9da56.png",
             // 热门推荐
-            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20250312/6556a06f8fb60b771004fe5859012d3c.png",
             
         }
     },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 53a986e..ae24e10 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -21,8 +21,8 @@
     <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
     <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
         <!-- <view class="iconfont icon-sousuo"></view> -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20241225/59b88ab6ae2800ebe02f8c25eaf29636.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-        <view class="textOver" style="color:rgba(41, 48, 90, 0.5);">搜索想要的旅游产品或服务</view>
+        <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+        <view class="textOver" >搜索想要的旅游产品或服务</view>
     </navigator>
     </view>
     <view style="position:relative;z-index: 1;">
@@ -206,8 +206,8 @@
 
         <!-- 数字文旅-->
         <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode="" />
+            <image mode="heightFix" style="height:68rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 346rpx;height: 88rpx;"/>
         </view>
         <view class="slide-out-box">
             <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
@@ -278,7 +278,7 @@
         <!-- 旅游助手 -->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 76rpx;"/>
         </view>
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
             <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
@@ -314,17 +314,17 @@
                 <view>实时路况</view>
                 </view>
                 <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20250115/18e8e2274a8191d0be0b8c63884ebe04.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
                 <view>行李直送</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
                 <view>行李寄存</view>
                 </view>
                 <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
                     data-path="/pages/pbService/bike/index?type=1">
-                    <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
+                    <image src="{{imageSourceList.GGFW[4]}}" mode="widthFix"></image>
                     <view>找厕所</view>
                 </view>
             </view>
@@ -333,7 +333,7 @@
         <!-- 十全十美 -->
         <view class="sale-road-boxes">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" />
+            <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
         </view>
         <view class="six-box-new" wx:if="{{!isTest}}">
             <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
@@ -343,7 +343,7 @@
         <!-- 长三角文旅平台 -->
         <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 180rpx;height: 144rpx;"/>
         </view>
         <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
             <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
@@ -355,7 +355,7 @@
         <!-- 热门推荐 -->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 188rpx;height: 80rpx;"/>
         </view>
         <view class="hot-list" wx:if="{{isTest==false}}">
             <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index b543000..87d969a 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -4,9 +4,10 @@ page {
   /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
   
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
+  /* background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
   background-repeat: repeat-y;
-  background-size: 100% 100%;
+  background-size: 100% 100%; */
+  background: #F3FBFB;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -39,22 +40,13 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
-  /* height: 64rpx; */
-  /* background: rgba(255, 255, 255, 0.6); */
-  /* border-radius: 32rpx; */
-  /* color: #666; */
-  /* height: 70.67rpx; */
   height: 64rpx;
-  /* background: rgba(255,255,255,0.7); */
   border-radius: 0rpx;
-  /* color: #72674E; */
-  color: #333333;
-  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
-  background-size: 100% 100%; */
+  color: #15B593;
   display: flex;
   align-items: center;
   font-size: 25rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/6cc354588441d7f89a36a91d7e1edd52.png");
   background-size: 100% 100%;
   padding: 2rpx 5rpx;
   box-sizing: border-box;
@@ -847,7 +839,7 @@ page {
   font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #FF6A57;
+  color: #D62828;
   text-align: center;
 }
 .time-box text {
@@ -911,7 +903,7 @@ page {
   border-radius: 0rpx;
   overflow: hidden;
   position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/004153a812042b46ca750146f5259ef7.png");
   background-size: 100% 100%;
   padding: 3rpx;
 }
@@ -952,7 +944,7 @@ page {
   height: 153rpx;
   display: flex;
   margin-bottom: 13rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/a41b881279749fba4c506c164914b601.png");
   background-size: 100% 100%;
   padding: 1rpx;
 }

From fdf70aca7e5d46fcf027ab103443fab91405a4d3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 13 Mar 2025 16:58:13 +0800
Subject: [PATCH 294/471] =?UTF-8?q?=E6=88=B7=E5=A4=96=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   | 2 +-
 pages/index/imgSource.js | 2 +-
 pages/index/index.wxml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 707b737..376310c 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.isTest176? true : false;
+      data.isTest = data.isTest177? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 588f666..1507313 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -10,7 +10,7 @@ const imageSource = {
         "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
         "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
         "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
+        "https://static.ticket.sz-trip.com/uploads/20250313/11f63fdb6dea69c4f1b29677d74d1b3e.png",
     ],
     // 数字文旅
     SZWL: [
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 53a986e..be40d3b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -82,9 +82,9 @@
             <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
             <view class="top-icon-text">一日游</view>
         </view>
-        <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+        <view bindtap="gotoUrl" data-event="movie" data-title="户外游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
-            <view class="top-icon-text">研学游</view>
+            <view class="top-icon-text">户外游</view>
         </view>
     </view>
     <view class="content">

From 480a94cc3a47a5412c475a6842e09d0c774d137f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Mar 2025 11:49:37 +0800
Subject: [PATCH 295/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                |  10 +++++-----
 images/index.png        | Bin 3876 -> 3705 bytes
 images/index_seld_1.png | Bin 0 -> 3734 bytes
 images/map.png          | Bin 6407 -> 6090 bytes
 images/map_seld_1.png   | Bin 0 -> 6376 bytes
 images/user.png         | Bin 4631 -> 4423 bytes
 images/user_seld_1.png  | Bin 0 -> 4576 bytes
 pages/index/index.wxss  |   4 ++--
 8 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 images/index_seld_1.png
 create mode 100644 images/map_seld_1.png
 create mode 100644 images/user_seld_1.png

diff --git a/app.json b/app.json
index 79b11e5..603cee1 100644
--- a/app.json
+++ b/app.json
@@ -234,27 +234,27 @@
   "style": "v2",
   "sitemapLocation": "sitemap.json",
   "tabBar": {
-    "color": "#97D0EC",
-    "selectedColor": "#5184B0",
+    "color": "#999999",
+    "selectedColor": "#169D7E",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/index.png",
-        "selectedIconPath": "/images/index_seld_2.png",
+        "selectedIconPath": "/images/index_seld_1.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/map_seld_2.png",
+        "selectedIconPath": "/images/map_seld_1.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/user_seld_2.png",
+        "selectedIconPath": "/images/user_seld_1.png",
         "text": "我的"
       }
     ]
diff --git a/images/index.png b/images/index.png
index 1b46e083635ee54775468d6f29ed21bbbe2c20cd..3ad0a3baefbdb05701dc27becf7972d51df521e3 100644
GIT binary patch
delta 3691
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
JPDHLkV1gLE4vzo;

delta 3864
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
a{|B?kR1w5a!YfVy0000<MNUMnLSTXcSYp@!

diff --git a/images/index_seld_1.png b/images/index_seld_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..07ce11b5ac71441d199a6048f07ba4fe05b86b5c
GIT binary patch
literal 3734
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
AZvX%Q

literal 0
HcmV?d00001

diff --git a/images/map.png b/images/map.png
index 41f62a8aca77d8336400156b822857e6b599a187..b8f45d818d4e4da110e6def25e785089dbd20725 100755
GIT binary patch
literal 6090
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
Qw*UYD07*qoM6N<$g4s#fjQ{`u

literal 6407
zcmV+i8TjUjP)<h;3K|Lk000e1NJLTq003G5003GD1^@s6IH*Aa00001b5ch_0Itp)
z=>Py2!AV3xRCr$PU3q*|)%E|L`(}oqERvZlqE=Bs{ZW_+MC;m?pSD)(R<zW;qGB=$
zs6Q9fA~m%xt%_AN8!oujT58?u)>cJqt0+ij0;siGwNxRQC4rEHWai!T<Gxw)lFXhV
z;OE2rFM0Q#d+zt0ckVsQJww>th6Mo{mRWXBg55w5lMw6%dN<I+gupOOvs<Ef13gR#
z4AV4OOLXn})=`?SO<~CgGq{MDMuMON+yjuGB{tedSU>OjqIJXNCr|9jb{$KXe^#Iu
z7w+2|?%A856+_BGCX6PKjV0Si2nKTx1hx@Vha?%$KrP{(p0A1yAOF=XB0bwVhogVS
zK;QlLhLI!p*z-b=tN^e#fKgx?0k8!C1JD`VOF%auIstBBiRBXd^Zv~rtg4wYBb;nO
z_1;azEG;Jy;dlb3F=!MZM*@mIYyhb_1c8N`2n<O?YQ8W)J?bShxSJS3BJFL-@(qX0
z{@Sd`v~@T@%w&#?fNosfa*))tyFoZbEjSax@jgV7!T%(wKSC&Yws%yxWzQDLJ!7mz
z(8I?8m@Np$GN5HeH*II`BBGb1E|-!J%>`{8f!Q-AY)d<A2X#mbbmQ8VgIKpb!r)_v
z&I7j+(Fz7a%zPAq4ghxeSzZFPmcefk_%9+HdZVIzeAm#|k{yMVKsT=bY7e$pmoeyv
zX0ojGG0{p$ZX%E$L?f8Eh`{?pk_%+0mLWE70f~>9<rjj)CaKE~66jPP6hn?7rm-O2
zn}`l%#zX*PQ%*>b1ZoH416|i|^=(=IS}JumMCJz#PYHCr$NwV&9%f*#$Vj!(@CwQD
z>MB=}mxv6NIj}V}wN7LfCqeLeV44m}sTM*2f&gs-@!NV>zDc_Fj_>8dFKcQ@X0qVM
z)og_=aFEpbI3jVp1eXz!9g_D-JU4|I^6Bm0QjNpn_-xi>>dj=Hq4Y@#^wQ6`U|V}&
z5eV-1=S}nqlXhO!)V<nLO<Kb&ir4tdpiwmeX9F0Sp#K&IRxt5fLet&}ZRNF>A8Fq*
zl*Pox)_XgOWw?8q(CBCY-v#Jfkxg|_+d!ZP8T^pj<@homb0?#b6zB)mZY>Gx+nxcS
zm{qNdiH@&w+E=DysKMhuUxIHY(EfuqPeKnf{=h63k!JhCJ!NcrvM(duJn5b<XSRIQ
zytNSM`6d_(!1&G}2`BUr<6}v(y2@Gnw{$dfeV!EPx>YR)3Y)fq8T%T<ncojHPMbHa
z=&OX2F;jhWOA$-U&xufN?n4A-rgj3afaF^@y->TRrluw%wUFz=29B#)&X&?b|4A(A
z1|m#lV9x=4wg7U$o+OuE=q&Bb*Ss-0Nr7JC@lDb}s{o9N0F4(|vs{!+Z8WS2{0{{G
zia|dB*lJ=l1kf7*H;S<R#foxLI(etH#?`^G(kjmdQw6}zevA-0SmH4fBW`v(N4Msa
z$)rFl;8^h5_@~eOJ6k6zE;+WSV;}>yO>HiX^xrdZaDP?7+d!7<L`Zw`vgxA(J4!`l
z3&=8NE#M8567w}6QN`ds{msho!g9&lrE{l^`yyM~S?lQ9wf@6|PTsh55}p<zacM<)
z;pP~z$foBzMp(2bnE4x~NpujrV7T2b$9wr=Hs5p_SFg58%Y+L+Tm!~_Ci=|GuS&MK
z^96QtiB?B6p{)dSp}_#*H4(C%Q&B#~A7iM_8#s~}4TC;G=4Hg;UsRTreuyMTz<h(2
zE4`YU8c}lQ72jrE{*u7Qm<%We(JQ(xs`3GLQlM+s2KEy={{_IIkwwrt3*n?WPWyk=
zUk`rJwtuK6{5lE4U@+(~SPBx0Mo4kn?6Ps~xh{TZjH_#IKae<dADB++2R87AMbpol
zGo_?uD10Radhwc#MOMxF6d3;--3+%_EI4w`6vv0rm+(gbhxbj+Jp@tPL7|^ty90LZ
zp)4}fv5o74-;iOs6pR@ruyrt&NSmBrJ-Ik%Csk6Q@7};8NBaGXL3C-1QPSvat5v=n
z+9vK|V7B>m!HinjyX~gA-`Y2j>B4r!ezorf_9L6DqlnufhR;?4epcyn+?OlQ$xU!(
zs%`dPEm+*v2Pi)dh&KVg-)!wM;js}NJU7vaBv;0E=D7R3n<iMK^$`$%+r&o)33*E8
z)Z({t;Vq@Fqrn^a!S*BD6JWMSiEn1GMuxvQqEHBUlWD}+`962%vY331srC3~2%<;L
zrx7Art99e#IY&nJscc$mr;>M5G1#Ks;30{K66n7W;=IZ!d;M)!KV4)4iXlPD()9)}
z5<r9LoZSn;odv;;Te9_Sr}jrPQ-jz40D~?`3^cn7KXyDYYu2tAKFSu{f&C3%iPwJz
zK>rtiM%WY%g}*<qyi^%;8Mm~K|AsYzqgb$VwwNOzN@YA>>2mxi<C(su9qT>*eE@z5
zpgwb*@pMc3+H<n;XQu_4nMGrB;ET9(NdZQ*fpl?d<+O3$uPJ^Rv#reapw~YKAa&A;
zI-)4dQa`O~TJbBH5=sm7;+26h)&f?(+SmrDG+2{O;*?90dGa!y{cF;%arLKTrDcqg
zYGpY_P63R!HQoNbigL;*ES3gnrn)BI4MgJBewaiYFK1PiIiCBPU^QemYdwMQ3*g1r
zQJ08<%<`vhSJ8`^5Kjs8!)rQ<dPL6~0KPeh7-4mHXZN?SI(onEOeXre_o=C2QG9yv
z1tN~cPnF}LzPq#gnoKZA33OeP{|pe8Qaom8f{P%f<jU%@q6fb2AZE&ceUtCIAiNsQ
zH&MQwkF~J&y^8X}|D>al6zH1u>usf>(%TuVjyAD=8vwIAkv<Abd3@5SOPbl$9Q%Yz
zr-hh*M!+#3^g`lUjcoUP<sAJ<4P_RbO}EH=Jy(f7klG(W6t@_4VCGzx<Joj`Bn7&0
zwQp}}q32_cBWCU<q6!fGrq5Djm5_2{OPk}~ni-Td6DbiB%a*a`pBS7e1mDMu5>p=)
zSzjf>_-RGC<D+y77|!P^99B{oywQk1Ml!UN1U{F^F*kY4@O|HO((sSiX9D0o5#}?b
zMi+x{OKgDzthZ@&(#2EkO4>7ShIFvy_mL>|pvC|%al48tGbT7p9gR(q`AHBWZVBdY
zTPI4=`FWB8UGMQ<58!s=t*PKDP+t)2xVocojKj+OGJq-ZwK48!dES0Qrg<1@+!D{0
zNjiF00~nnIqgJ=eVV3k^f-?0q53ku+)FUi^1E|j}LHb#4XNhtfCvC}r_WJ({#tG4p
z-9pfn6;tg?mM>?^hvWR06G%z5k*~o(rv^T?!d0|9Q#2Zz{fA1)O#l@n8Pnl*IU<4K
zU98o6{7(QlFaA|C>MF||{UZMZSxyMFilwpTfHqS|zLiOwRpl%+@*a$!fUx`-pfVG|
zRTfP@HPcAMVsBvIL0?9H?p}1e9H;JL7#r*~c>NbL<Iy;8gf$}c`H>an<w+y_34yMA
zzhx?ETAz7M_*8`WxQg<kjWObet|EROjF?3B5~1dhp#9Dn8ElN|W$M}i*Anr<fl|$Y
zk0EDPyNdswE6^%UEG&I?Xc%R)32R8&q}26oR>|#`O&_;qC=vO4n_4H@NPHZZXwYY2
z*)wDAwDC!!<_UqWZ}Oc7BK3I~je&O^PWv(alDwIz&f~v(yM=UlJjH<M-<ssJFDrAX
ze2}#5!S$O9!{JZ`K<6;aNeqOE#rs64E3_6qn@didip-aI1Le$g77>mC<Rn0h1vmu4
zMld{pd|8A${#a3dP&}famRVDWn&rzaC52O4!8|UCP>W<av%0M0?PPQk1MLmeY<I}s
z)c3~lM5W7d!9XG^#-@klG6Ga?o6(5y&L)ffyEPdm4l2nO)(It&c$BW3z$j?5|8rCz
z7uTzDYkuJI&nBV;6glrF%;jcqCo#PvLmd}XA2DH5HXz6P)_MFZW9ufMT{32;a!Dix
z+T&je;G#YqL^W=w{TG86GW^wT=P_j6fYZYrcB_41E)to`qK&Uk@v<)XW9a-)e+O7f
zimODp_pFNY@o6o)fmG_7e7^<JxzYc30W{C;vOk=aL^pT?FER7UeS^5t?J8<aM5K0k
z>nJf!+za4h)AKeE&1soh`0Q|5cT3j!57)!|B0$BNzAR=aBdc+g2w#_NzFmVSu!zA|
zMdu1J)BLJ3`#o6!UGMe34aQNiK~k4zS5Gfi#zn$*|GWRSYXu|U1he6MiY7HSi!hy*
zi60<SV3PG){4XA1>kPcW!1r^Y)h5VtLWOg$HQ9_c+ZpQq4gm`)U5;O82eikp(zxO|
z8_ax4RawzXsTgT!4jjdjmC0UY`Vy9juw!<nKHF>-YVKR#6g&nbmBEmkfkSk!+iAZt
zoB12OzH6B2&bTl#|Dw9As3u#W)!U7qkuw2WNtLB5a5XV*j2SWnuw?nGZQVV;%*2(L
z%|iPD?Fn2Au*$jEBS#t^xLuCP*^I4Q<GYFkEsBp}u5p(Y4c^D19TK0TO*^X5kLWD7
z)1K1ARNYictZvbtA|rJ-+8A4);fj`L?2lz*qGz>ekN-LXRB$4<n_Yxnx6`4n+GX78
zoBZ=Zh^Y!mgc~cJ4#Q=Us3kkz{T0kH^BWAhxXNW$Cy}(R_Px(ag>}^5L3B{8GZ8)|
z@T>}FQC4~|?PSpowN0%Hgb+7_v%H!YXD|n#J$?nM@&~D=?mJ%ZcG>$Rd;s&wj(7cR
zd1frADs$YH>B5zRoJc&(;0b+#ja3qS{#;j4+@i{qUb=quO};rGQYW88cV*HISI@In
z9Sxp<THov_@oq3(;V!c$4T2<A9ZkMFi0InB7mlTsE{FN}mXdj8IhBrcUMivAMWDVb
z42%^Pi~f^L{UMnkr26cP&9J`7_aunUiSS69iEwG9)Bbc;s-w0kFh>wCF-haQt<Twy
z&PK;JGF#c}zdxFM6VshKKo5#=`*pdRzlj#IbB=c{Cla)!42)v1hd}3~y4jUbqHCK1
zM+@SA#23Z*MCiRoRg{m9C!uE|ZN_~Oi@Xm|78J+8R>9o+@@+Xr3>N$;n<L&(3>M|I
zl3Lpl5ZF&x@OH)I)N#YaK(AjvN(+^=o9<_S6_$MZylF+sQJ+<dWcomv#V48u_A+CU
z!)0HXuWAH_3GNO47#JQCJSz}V-NUYL@~;MAdX(T+Fju<Eihi5z1gd|d*Edaqo&e)8
zliu%SiJu8+ug}*_t!$l27K?s<zW0l)bhNR-c>L;&I6tE6A&GG(g+E`I%DJ8DB}78?
zr1ZYJw;kO>u!%tntDN=+b9sS@#>CvD#B`QXD1dlk#7!zgAj*rIG#6fzhq5BTyl!$e
z{#Ar~&&^g(o0+Qf29G0_zXPDuNvv&wpljSylOK(8S(w@J51X)(WGQt^UL60q@RK~<
zK;7pE$=6~M$UwUu4u3n_bX7A`#&x;1ZD*5|%F7k^i746t=C!ujpUO6EA(ut(j4?@p
zj=DdUpSjQBPh8`6Cb#D^S%9%yTYMJ);w}Ku2!%0ngCH!da60;8ahVX@Nqtma%B)#X
zwLlV9co@i5$~!FeUjJnP{U&a45jGW!u}_#ifreDcMKRer$#<p(p>(#n&c<dISWq>^
zUbm~>AW&({4Nbne5Zc8Ix!Pv6&A)W=*kHQ%oig|CevfaG0A3|f+>{343b)g)&c+$N
z$z%)|m*DpbTqX&(4#@56Ac*;e)^QIHXM`plP_gHAYkc1!LCXL{0t|%P+)l@WbmLP3
zt!|Z;o>5)Tpv(GB3fv5)lk-vELRoayPX9&Qv!RrOrcaG9`=QaDEn3SxHIpar@S-K@
zKr%nSzsY~PAUx719OM^Pnx2!vVkWGvf?3(}5%(1qQEKDbN~gVcC?WgU94e#U=WRV*
zu(l+gW)*qZ4aQQT_g=d*Y9J*8-!Q<KSD3w%%zRf>Sy9|KlxS?)jDIz#-s4xEv3W5A
zhlt+Q1%6zeWxic9=9SJ4Olm(D&{f336eXb$ftOI&R%5<{o{a?Vh`x0m|1SwffFs)Y
z-xd<ziCy2$8R**g{f7w){sczU$4n|lc6+7EzA#@4QIg%>96Un@?f~<FCc3KL$Fn-*
z!X4pa&4vG{RC_?=h^T3FO2~OtuA)bh?Ohp3bR<P=!VTLC`l+`VD|*tU6Hc4!bSR@H
zFHQL?YTpkWAuM=^0CQ-G8SEu1Rk$bb8f7WWma|f!41R1+*sCveQo`yr83C<OG%lov
zqzcf+uURnTLqh0eciG;b=LP8~kw$O(G|6G*L|1XkJ|0;`YRFA`;hXvLkL1dCy*Kzx
zuv8w-Xd)*6J52fs^PHuh<*Yhl1DALMXX-3}8^2n>2$P^kLfyDJUlqP$bJf1zda%$m
zr3+`8E5wj0-Ny1Ri)}<>Cg;~&flN0}rL%>?VRe05m7P#cGULo-*-9Bpw4$WWzQyAL
zw`{LJdYx$_*ao6o+)hXTn_KBP&EWZ?A8xUC_4Y0VlN+XTJVe;W63+<TcE!%xB$Yd%
z)a$>IK|ePIg&%jj92X8*q7{K?rv8(FQO6_lqKqnum|bYGKb3DILq%$2b6`FgDk~^b
z4JX<NSgSKG@!49uJLA0F&>TFOrF`7PSIePo_I(p&(`F^n#`@G{^!05=BP1UM#ZDo{
zlOPez@BK3PL@wow(+PNEv;Pb!p`^z(z>mI(h!)W(dZ6N<zIspT=;h;i?R#JDM>g9E
zv*j#VE2}OW=NU*pd!UsHQJ;+`csvuU(2+SGqAi-=pqx>8ZEDWF*9Im@2~{iP_yNSb
zKzK)l^ook|l27wGaSCFF@4GqhhEcdM_LWI?S57Nx$P3UhBK4lYEPxeJvlouHpCxY!
zZNt6!-XPVyk;-2C-%b#hFgRK>HNLD?NL&-@rRR6V+=(!+Yx3PmMAyWhG3woAj;g!@
zz4%}M8e#3UUj)ehz6z*%cj5`i-dpp1^ivB^J`%0NKT`<0q2HyY$m&$s?N7p{)s0&}
z?wwrnth4zd8oYr^m^mIHBBEC-o%YyCBu*+P)nR5tfo<z7JcEfJF<rAz*SNw&_!v6o
zxu-kSHRrsxWy_XnzQc|mPhq}=2<InAI{%V@rMgxAdMHJw(lOo86g-*9urG|pz^W>j
z<A}UUw3%34v;PE0UNW%wcEmj8MOG3ITspPz%X~PZ2EJ%(=h!)bb~RM}>cNG-*AdBU
zyJhFf|8pI%Ip2QnXe`up8;#bvUG~1Kfic~k?u}*oTuE5lq!W&kkSe1xQo^n8HLJ>w
ztBCP96Q0k9i?ttlW@=owdAbaT=MwNEP|RA3_v!-C%V2)8psnMTY|Hed!l1$9pUHqZ
z0d%F?<%s8&$Hop>b@T@`QgN5qb`_Jn65Q`ZqCPC;V*MwB9&*^bADp#cek&uWU(^s`
zJ`t>`FqtZAZ`P44fz1T0A;N8iQ|)i&Bd4UkIj|6tZ;k`X_(NrxW7ZB+9cIEt^u!T7
zlO^8-iAjm8lC!!>R}a#k-NUxW#%-OWx8%!zVf+dPYl~INLBhFN{hSH?S=0D8U0wRx
z@&76I=dx)U#mqMcUqhtSrqM`<>no=g4$Az`uS5@cjYbK2AueL(a|GxBb?!^>8MYCy
zN-{S?&^n>>`fjp(a;0mp&6(<Rb)NmkCtK~^Te~J|WI2SHoe*>cz-8tQI>Fq%AbJ<T
z>yqVL1qE1r$)SU*2`5q=%B}17_<tgZYWqs_BMcH{ZfD`TVUcL_Br597A~=x+y8)wS
zv$?i(e^m=~5wIBqRXTYC0Uty1XAsmHme{PxXi!+=JpdZV#HGUUU5i5)Tng}LfJPHA
zGRaF#tZtQrld^2F0if4)iRXH{yPA^SQizmA4*pdAMgW2Ljn!sVMPpm07M_ymg47O`
z=z*(JKQ$u5;(8FNBzF}_$u*xj)&4a2nR;;&8@5+Me};`akz59%!c>Xt(Oi=zVtfd~
z2Ei1RBu9gBD2ToXK%H><8Y3VCepumjs4rwt8&;sz>_!qzvwvcw&?+56z>$FAGs!nE
zDyX|2jFk-jyUuuXUYTR#;!j|+bp?)90cHj(z*Ih<QF|lTrjD>I#LWeP&5M(rX!5<d
z%z0JOln;D+a!=T9(QF4Z^GO7u{3la$z9M1#d=%bg@N$cVUeUw&D%mdzEnCkvpA430
zIv*|x7YU{l`&CBIa3##>2Jux|vE#9d@yRQO?L459Eaah&J{sNKRamBJVlp!yEFkug
z%*BGR2gh#@u=;5cRRPxr!sn1Gf18^(j&!Wc^lJ3L=?&laww{>~I0F)gK+v9GL$wt|
zeydB>WHsuRs0s!uT&0Ykl~UMluAVab!*uUumjgN-!^83Xo|P>nwvm<z1nk3-O9hEh
z%zA+e43eOr)cFgG&HBMcf72J4R&(49^l-en9k2ln6Wd?EX?9EWFuk+gKo1kp{|_3}
Vq4C9(quT%g002ovPDHLkV1jxOR@eXl

diff --git a/images/map_seld_1.png b/images/map_seld_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..516c0ebdc53bda92b939929a643ac22b9fa18360
GIT binary patch
literal 6376
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

literal 0
HcmV?d00001

diff --git a/images/user.png b/images/user.png
index 255798258475e7a125c140b684c897a5c767f9c9..73eb19244266eb3553c931167bd3fad1fef88380 100755
GIT binary patch
delta 4415
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
FV1nUmo~8f*

delta 4625
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
Hu0mjf;ic}`

diff --git a/images/user_seld_1.png b/images/user_seld_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d08c4e3a3d4aa290af0f52215c92791c32a8c86
GIT binary patch
literal 4576
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
KMNUMnLSTZesjZ*@

literal 0
HcmV?d00001

diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index b543000..ed48388 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -544,11 +544,11 @@ page {
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #5184B0;
+  border: 1px solid #169D7E;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #5184B0;
+  color: #169D7E;
 }
 .scroll-line {
 

From 0025e9006bfab97fda31d8e1e4aa068a670627fd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Mar 2025 17:24:07 +0800
Subject: [PATCH 296/471] =?UTF-8?q?=E6=98=A5=E5=AD=A3UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   |   2 +-
 pages/index/imgSource.js | 114 +++++++++++++++++++--------------------
 pages/index/index.wxml   |  10 ++--
 pages/index/index.wxss   |   5 +-
 4 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/app.js b/app.js
index 376310c..65d14be 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.isTest177? true : false;
+      data.isTest = data.isTest178? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index c999397..0da0a86 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -1,16 +1,6 @@
 const imageSource = {
     // 活动日历、场馆预约等
     mainFunImgs: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
-        "https://static.ticket.sz-trip.com/uploads/20250313/11f63fdb6dea69c4f1b29677d74d1b3e.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/c69cdbafb16ed468fef68eb77865e6ff.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/05dd30d02e74178134242cc64aaa11ac.png",
@@ -21,75 +11,79 @@ const imageSource = {
         "https://static.ticket.sz-trip.com/uploads/20250312/e2cc47fa5a2d01d436dad0a85948f060.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/6d0c2112960ee56f5c15069e629dd5b4.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/a094d635976194782fbdcf2bc596b082.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/11b1ab7ec62cc4022d4ce2f7c6ac0727.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/5238f9ee4762266abf0c279501ea4028.png",
     ],
     // 数字文旅
     SZWL: [
         // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
         // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
-        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/1994615fcbc125da641541ea1f04c364.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/f054ca452f27dac54723255ba6445790.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/590822c40c769cb4f673f460f1a37a0b.png",
+
+        "https://static.ticket.sz-trip.com/uploads/20250312/41c21568ed9c4b15084c9669ca99a6fd.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/1ee056f091a42e51ce8168767704708a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/b418843c04ddfa00be91fb793019cb99.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+       
+        "https://static.ticket.sz-trip.com/uploads/20250312/0ad69db116004e735e1bd13cd54fd75c.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/f2400b009c8e92efcdd645080f14b28a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bbda2dd4e332f457a6aa06a4a15b639b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/06b500881204a4a40c5bc8d126f38a58.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/d188c19334c9170e5c963459b7187f20.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a25506779b745291cb8d9051abce07c1.png",
 
     ],
     // 旅游助手
     LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
     ],
     // 公共服务
     GGFW: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/9799b276d76f884fd0130d7378c974fe.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/c40b456687490eafe5414addaaae0c2b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a95959dcba2f494b69980d16a895e9c8.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e16b8e640169e99639cef6ff7897b6a7.png"
     ],
     
     // 十全十美
     SQSM: [
         // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
+
+        
 
     ],
 
     // 长三角文旅平台
     CSJWLPT: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e44c2f4756948e8a5d837c759f643edc.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
     ],
 
     // 导航标题侧边图片
     CBTP: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
-        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/5d051d37148757eb5daa6e51439e711a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/d47ce5d4f2a780f46192afeb715d873d.png",
+        "",
+        "https://static.ticket.sz-trip.com/uploads/20250314/03413a9bd8a0b7a99141903e04cbc05f.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/1075c176fb20563a48945fce020db57f.png",
     ],
 
     // 其他后台配置的图片，开发时使用
@@ -98,23 +92,23 @@ const imageSource = {
              // 头图
              topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
             // ai伴你游
-            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
+            ai: "https://static.ticket.sz-trip.com/uploads/20250314/3fb020cf3471d3731b4a7efae25e8e64.png",
             // ai避高峰
-            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
+            avoid: "https://static.ticket.sz-trip.com/uploads/20250314/8c0f1c421b1de36265948d52c249dc57.png",
             // 新品特惠
-            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            xpth: "https://static.ticket.sz-trip.com/uploads/20250314/349596880742665ac7249b5f4218263f.png",
             // 文旅鉴赏
-            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20250314/073759b9fcd3e217de9ecea774451364.png",
             // 出行助手
-            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20250314/7f5d199286e62ba6c9d43fdfd6f55de3.png",
             // 公共服务
-            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20250314/271ffedb33dcfacf170ff78c1425f9cf.png",
             // 十全十美
-            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            sqj: "https://static.ticket.sz-trip.com/uploads/20250314/edceba87f00e37ef50cf6a9fafb8a29f.png",
             // 长三角文旅平台
-            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20250314/c88a44d385e0bf36370475ace8e5669e.png",
             // 热门推荐
-            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20250314/dcc02bb22b721e281037cecf22e74728.png",
             
         }
     },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 89d9e44..484ec2a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -206,8 +206,8 @@
 
         <!-- 数字文旅-->
         <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:68rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 346rpx;height: 88rpx;"/>
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="slide-out-box">
             <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
@@ -278,7 +278,7 @@
         <!-- 旅游助手 -->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 76rpx;"/>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
             <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
@@ -343,7 +343,7 @@
         <!-- 长三角文旅平台 -->
         <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 180rpx;height: 144rpx;"/>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
             <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
@@ -355,7 +355,7 @@
         <!-- 热门推荐 -->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 188rpx;height: 80rpx;"/>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="hot-list" wx:if="{{isTest==false}}">
             <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 11dc07c..8107fa6 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1052,7 +1052,6 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-left: 13.33rpx;
   overflow: scroll;
   margin-bottom: 53.33rpx;
   z-index: 1;
@@ -1060,8 +1059,8 @@ page {
 }
 
 .six-box-new image {
-  width: 440rpx;
-  height: 213.33rpx !important;
+  width: 334rpx;
+  height: 193.33rpx !important;
   /* background: #FFE7C0; */
   border-radius: 20rpx;
   flex-shrink: 0;

From 32fa33e98a97ed3cd0520ea2b8d9c59ca751a06c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 18 Mar 2025 11:53:22 +0800
Subject: [PATCH 297/471] =?UTF-8?q?=E5=A4=9C=E6=B3=8A=E8=8B=8F=E5=B7=9E?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              |  2 +-
 pages/order/WineSceneOrder/index.js |  1 +
 pages/order/postOrder/index.js      |  1 +
 pages/order/roadOrder/index.js      |  1 +
 pages/order/scene/index.js          |  1 +
 pages/order/showOrderNew/index.js   |  1 +
 project.private.config.json         | 14 +++++++-------
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index 65d14be..63d2a28 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.isTest178? true : false;
+      data.isTest = data.isTest179? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js
index c1c4722..9676795 100644
--- a/pages/order/WineSceneOrder/index.js
+++ b/pages/order/WineSceneOrder/index.js
@@ -296,6 +296,7 @@ Page({
     }
     if (this.data.product.product.ZTPoint) {
         data.partner_code = this.data.product.product.ZTPoint
+        data.channel = this.data.product.product.ZTPoint
     }
     let service = 'order/create', postData = {
       data: JSON.stringify(data)
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 06b2343..922fd0f 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -184,6 +184,7 @@ Page({
     let ZTPointProduct = this.data.product.find(v=>v.product&&v.product.ZTPoint)
     if (ZTPointProduct) {
         data.partner_code = ZTPointProduct.product.ZTPoint
+        data.channel = ZTPointProduct.product.ZTPoint
     }
 	console.log(app.globalData.list)
 	if(!app.globalData.list || app.globalData.list.length == 0){
diff --git a/pages/order/roadOrder/index.js b/pages/order/roadOrder/index.js
index 0090e4a..333ef3a 100644
--- a/pages/order/roadOrder/index.js
+++ b/pages/order/roadOrder/index.js
@@ -266,6 +266,7 @@ Page({
     }
     if (this.data.product.ZTPoint) {
         data.partner_code = this.data.product.ZTPoint
+        data.channel = this.data.product.ZTPoint
     }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 98a9afd..48ea546 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -480,6 +480,7 @@ Page({
     }
     if (this.data.product.product.ZTPoint) {
         data.partner_code = this.data.product.product.ZTPoint
+        data.channel = this.data.product.product.ZTPoint
     }
     let service = 'order/create', postData = {
       data: JSON.stringify(data)
diff --git a/pages/order/showOrderNew/index.js b/pages/order/showOrderNew/index.js
index 2c2467d..1118f99 100644
--- a/pages/order/showOrderNew/index.js
+++ b/pages/order/showOrderNew/index.js
@@ -446,6 +446,7 @@ Page({
     }
     if (this.data.product.product.ZTPoint) {
         data.partner_code = this.data.product.product.ZTPoint
+        data.channel = this.data.product.product.ZTPoint
     }
     console.log(data)
     let service = 'order/create', postData = {
diff --git a/project.private.config.json b/project.private.config.json
index 9669f05..f732fa7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https://m.cloud.sz-trip.com/nightMooring",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/goods/oneCardTour/info/index",
           "pathName": "subPackages/goods/oneCardTour/info/index",
@@ -41,13 +48,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2FcouponAndKs%3FksCode%3D3995803e3e3ef3154554f14c2fc8511b",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",

From 2084198b06512f9c2a269f0e82755bc76a02af50 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 20 Mar 2025 10:22:50 +0800
Subject: [PATCH 298/471] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 002c8df..e6f6023 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -126,14 +126,14 @@
           <view>使用说明</view>
           <view bindtap="showMsg" data-msg="sysm1" style="color: rgb(49, 154, 158);">{{sysmText}}</view>
         </view>
-        <rich-text wx:if="{{sysm}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+        <rich-text class="detail-item {{sysm?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
       </view>
       <view wx:if="{{item.product_model=='post'}}">
         <view class="box-title tflex">
           <view>使用说明</view>
           <view bindtap="showMsg" data-msg="sysm2" style="color: rgb(49, 154, 158);">{{sysm2Text}}</view>
         </view>
-        <rich-text wx:if="{{sysm2}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+        <rich-text class="detail-item {{sysm2?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
       </view>
       <!-- <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view> -->
     </view>

From ffc5739d572e26efe15d0941cda311706655d384 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 25 Mar 2025 15:31:14 +0800
Subject: [PATCH 299/471] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |  2 +-
 pages/index/index.wxml | 34 +++++++++++++++++++++++++++++++++-
 pages/index/index.wxss |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 63d2a28..64885a1 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.isTest179? true : false;
+      data.isTest = data.isTest181? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 484ec2a..c10e9f4 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -154,7 +154,7 @@
         </view>
     
         <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{false}}">
             <!-- 上方标题部分 -->
             <view class="xsth-title">
             <view class="xsth-left" style="display: flex;">
@@ -203,6 +203,38 @@
             </view>
         </view>
 
+        <!-- 热门推荐-->
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+            <!-- 上方标题部分 -->
+            <view class="xsth-title">
+            <view class="xsth-left" style="display: flex;">
+                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
+            </view>
+            <view class="time-box" style="z-index: 2;flex-shrink: 0;"></view>
+
+            </view>
+            <!-- 商品部分 -->
+            <view class="xpth-product" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+            <!-- 左边的2个产品 -->
+            <view class="xpth-left" >
+                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[0]}}" style="background: none;">
+                    <image src="{{xpth.adv[0].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset;"/>
+                </view>
+                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[1]}}"  style="background: none;">
+                    <image src="{{xpth.adv[1].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset"/>
+                </view>
+            </view>
+            <!-- 右边的banner -->
+            <view class="xpth-banner" style="background: none;" >
+                <view class="xpth-banner-swiper"  bindtap="bannerClick" data-item="{{xpth.adv[2]}}"  style="border-radius: 0">
+                    <image src="{{xpth.adv[2].head_img}}" style="border-radius: 0;object-fit: unset"></image>
+                </view>
+
+            </view>
+            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
+            </view>
+        </view>
+
 
         <!-- 数字文旅-->
         <view class="sale-road-boxes" style="margin-top:0">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 8107fa6..7263c86 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -959,7 +959,7 @@ page {
   border-radius: 15rpx 0 0 15rpx; */
   width: 157rpx;
   height: 154rpx;
-  background: #72707D;
+  /* background: #72707D; */
   border-radius: 20rpx;
   /* margin-right: 15.33rpx; */
   flex-shrink: 0;

From e45f18d27ee3e46bad0f40a6a6f3d43e31abfea0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 3 Apr 2025 17:56:25 +0800
Subject: [PATCH 300/471] 1

---
 pages/info/sceneProductInfo/index.wxss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 9db679b..beb7c40 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -933,6 +933,8 @@ page {
     background: #F8F8F8;
     display: flex;
     flex-direction: column;
+    max-height: 1100rpx;
+    overflow: auto;
 }
 .left-type-container .sku-type{
     padding: 38rpx 12rpx;

From f666595d4abd917c18497f2e94550e944f537e3c Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 3 Apr 2025 18:16:31 +0800
Subject: [PATCH 301/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=B0=B4=E4=B8=8A=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      | 2 +-
 pages/index/imgSource.js    | 2 +-
 pages/index/index.wxml      | 2 +-
 pages/list/night/index.wxml | 7 ++++---
 pages/list/night/index.wxss | 8 ++++++++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 64885a1..c9c885c 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.isTest181? true : false;
+      data.isTest = data.isTest182? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 0da0a86..2122384 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -9,7 +9,7 @@ const imageSource = {
 
         "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/e2cc47fa5a2d01d436dad0a85948f060.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/6d0c2112960ee56f5c15069e629dd5b4.png",
+        "https://static.ticket.sz-trip.com/jundaosuzhou/images/spring2025/ssy.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/a094d635976194782fbdcf2bc596b082.png",
         "https://static.ticket.sz-trip.com/uploads/20250314/5238f9ee4762266abf0c279501ea4028.png",
     ],
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c10e9f4..96d6cdf 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -76,7 +76,7 @@
         </view> -->
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
-            <view class="top-icon-text">夜游苏州</view>
+            <view class="top-icon-text">水上游</view>
         </view>
         <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
diff --git a/pages/list/night/index.wxml b/pages/list/night/index.wxml
index e0144be..cc536d0 100644
--- a/pages/list/night/index.wxml
+++ b/pages/list/night/index.wxml
@@ -1,13 +1,14 @@
 <!--pages/list/night/index.wxml-->
 <search bind:onload="search"></search>
-<view class="night-types">
+<!-- <view class="night-types">
   <view class="night-type {{type=='10,11,12'?'active':''}}" bindtap="changeType" data-type="10,11,12">全部</view>
   <view class="night-type {{type==10?'active':''}}" bindtap="changeType" data-type="10">线路</view>
   <view class="night-type {{type==11?'active':''}}" bindtap="changeType" data-type="11">门票</view>
   <view class="night-type {{type==12?'active':''}}" bindtap="changeType" data-type="12">演出</view>
   
-</view>
-<view style="height:87rpx"></view>
+</view> -->
+<!-- <view style="height:87rpx"></view> -->
+<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/shuishangyou.png" class="topImg"></image>
 <view bindtap="gotoDetail" data-item="{{item}}" class="hotel-item" wx:for="{{list}}">
   <image mode="widthFix" class="headimg" src="{{item.headimg}}"></image>
   <view class="infos">
diff --git a/pages/list/night/index.wxss b/pages/list/night/index.wxss
index 74313de..4ef97a0 100644
--- a/pages/list/night/index.wxss
+++ b/pages/list/night/index.wxss
@@ -1,4 +1,8 @@
 /* pages/list/night/index.wxss */
+page {
+	background: #E6E5E3;
+	padding-bottom: 30rpx;
+}
 .night-types {
   display: flex;
   justify-content: space-around;
@@ -38,6 +42,10 @@
   margin-left: -23rpx;
   bottom: 0;
 }
+.topImg {
+	width: 750rpx;
+	height: 333.33rpx;
+}
 .hotel-item {
   width: 700rpx;
   background: #FFFFFF;

From 5540a8dd9dec7d79e879ce420f488e7e38ad549a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 18 Apr 2025 09:09:18 +0800
Subject: [PATCH 302/471] =?UTF-8?q?=E6=B0=B4=E4=B8=8A=E6=B8=B8fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                   |  2 +-
 pages/list/night/index.js                |  3 ++-
 project.private.config.json              |  7 +++++++
 subPackages/transferPage/transferPage.js |  8 ++++++--
 utils/https.js                           | 17 ++++++++++++++++-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index c9c885c..26b4e39 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.isTest182? true : false;
+      data.isTest = data.isTest183? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/night/index.js b/pages/list/night/index.js
index 6ac9fa9..77ac364 100644
--- a/pages/list/night/index.js
+++ b/pages/list/night/index.js
@@ -43,7 +43,8 @@ Page({
     let list = this.data.list;
     if(list.length>=this.data.total) return;
     commonApi._post("product/get_product_by_tag",{
-      tag_id:this.data.type,
+    //   tag_id:this.data.type,
+      tag_id: 632,
       offset:list.length,
       limit:10,
       title:this.data.keywords
diff --git a/project.private.config.json b/project.private.config.json
index f732fa7..cce0b19 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https://test.m.cloud.sz-trip.com/culturalTravelHelp",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
diff --git a/subPackages/transferPage/transferPage.js b/subPackages/transferPage/transferPage.js
index 5a5ee19..2cbb6e6 100644
--- a/subPackages/transferPage/transferPage.js
+++ b/subPackages/transferPage/transferPage.js
@@ -12,10 +12,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+      console.log(options)
     this.setData({
         back: false
     })
     if (options.action = 'otherMiniProgram') {
+        // let path = decodeURIComponent(options.path)
+        // console.log(path)
         this.goOtherMiniProgrogram(options)
     } else {
         wx.navigateBack()
@@ -28,14 +31,15 @@ Page({
         // appId: 'wx114d514f39cb1fed',
         // path: "pages/entry/index",
         appId: data.appId,
-        path: data.path,
+        path:  decodeURIComponent(data.path),
         shortLink: data.shortLink,
         success: () =>{
             this.setData({
                 back: true
             })
         },
-        fail: ()=>{
+        fail: (e)=>{
+            console.log(e)
             wx.navigateBack()
         }
     })
diff --git a/utils/https.js b/utils/https.js
index d661db6..0dc3ef0 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -319,10 +319,25 @@ const set_logininfo = r => {
 }
 
 let canToLogin = true
+let appData = getApp()
 const checkLogin = () => {
   // 判断是否已经授权过
   let page = getCurrentPages();
-  if (page[page.length - 1].route != 'pages/login/index' && canToLogin) {
+
+    // 审核不强制登录
+    if (!appData) {
+        console.log("获取app")
+        appData = getApp()
+    }
+    console.log(appData,page)
+    if(appData.globalData.configJson.isTest) {
+        if (page[page.length - 1].route != 'pages/user/user') {
+            return
+        }
+    }
+
+
+  if ('pages/login/index' && canToLogin) {
       canToLogin = false
     wx.navigateTo({
       url: '/pages/login/index',

From 12ba59384802c276638489d1f6ac0f2c4fcdf111 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 22 Apr 2025 11:56:40 +0800
Subject: [PATCH 303/471] =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/newCalendar/index.js   |  3 ++-
 pages/component/newCalendar/index.wxml |  5 ++++-
 pages/component/newCalendar/index.wxss | 19 +++++++++++++++++--
 pages/list/activitynew/index.wxss      | 18 ++++++++++++++++--
 5 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 26b4e39..3752d15 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.isTest183? true : false;
+      data.isTest = data.isTest184? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js
index 0e5322e..b64552c 100644
--- a/pages/component/newCalendar/index.js
+++ b/pages/component/newCalendar/index.js
@@ -257,7 +257,8 @@ Component({
                 return {
                     ...item,
                     color:'#DE4126',
-                    background:'#FFECDB'
+                    background:'#FFECDB',
+                    borderBottom: "0.02px solid #E99C3C"
                   }
               }else if (item.name == '春节') {
                 return {
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 6e81ebf..02d248a 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -19,6 +19,8 @@
 </view>
 <!-- 日期 -->
 <view class="date-wrap">
+    <image wx:if="{{currentViewType === 'month'}}" class="bottom-image" src="https://static.ticket.sz-trip.com/uploads/20250421/a0b731399b5c348ae4dc5199c9034ab5.png"></image>
+
     <view class="week">
         <text wx:for="{{weeksArr}}" wx:key="*this">{{item}}</text>
     </view>
@@ -32,7 +34,8 @@
     <view class="mouth-date current-mouth  " wx:for="{{currentViewType === 'month' ? nowMonthDays : weekDay}}" wx:key="*this" bindtap="selectDate"
      data-item="{{item}}" data-type="nowMonthDays" data-index="{{index}}"
     > 
-       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}{{item.isHoliday&&item.isNowMonthDay ? 'active' : ''}}" style="background: {{ item.isHoliday.background }};color: {{ item.isHoliday.color }}">
+       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}{{item.isHoliday&&item.isNowMonthDay ? 'active' : ''}}" 
+       style="background: {{ item.isHoliday.background }};color: {{ item.isHoliday.color }};border-bottom: {{item.isHoliday.borderBottom||'none'}};">
         <text class="day-text">
         <!-- <text class="day-text {{item.isHoliday?'color':''}} "> -->
           <text>{{item.date}}</text> 
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index 6e957c1..65cdd95 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -1,4 +1,7 @@
 /* components/xx-calendar/xx-calendar.wxss */
+page{
+    background: #F0B643;
+}
 /* 头部样式start */
 .title-wrap{
     /* background-color: #F2F2F2; */
@@ -16,7 +19,10 @@
     /* background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png"); */
     background-size: 100% 100%;
     width: 100%;
-    height: 65.67rpx
+    /* height: 65.67rpx; */
+    height: 256.67rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/58fee5695a0b676a14e8157b809ba1d6.png");
+    box-sizing: border-box;
 }
 .change-date{
     display: flex;
@@ -58,7 +64,7 @@
     display: flex;
     flex-wrap: wrap;
     border-radius: 20rpx;
-    margin-top: -28rpx;
+    margin-top: -144rpx;
     position: relative;
 }
 .mouth-date{
@@ -191,3 +197,12 @@
   width: 20rpx;
   height: 20rpx;
 }
+
+
+.bottom-image{
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 290.13rpx;
+    height: 146rpx;
+}
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 155d0d1..1b79993 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -128,6 +128,8 @@ background: rgba(11, 137, 142, .1);
   border-radius: 20rpx 20rpx 0 0;
   margin-top: 20rpx;
   position: relative;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/63b9ec7a1192790eed3e5dcf915212c0.png");
+  background-size: 100% 100%;
 }
 .activity-list {
   width: 697rpx;
@@ -325,6 +327,7 @@ background: rgba(11, 137, 142, .1);
   color: #0B898E;
   /* 节假日花样 */
   /* color: #DE4126; */
+  color: #DE4126;
 }
 .new-top-search-box {
   display: flex;
@@ -350,9 +353,10 @@ flex-shrink: 0;
     position: relative;
     z-index: 9;
     align-items: center;
+    
 }
 .types-item {
-    border: 1px solid #999999;
+    /* border: 1px solid #999999; */
     border-radius: 27rpx;
     height: 53rpx;
     padding: 0 25rpx;
@@ -360,6 +364,7 @@ flex-shrink: 0;
     line-height: 53rpx;
     margin-right: 13rpx;
     flex-shrink: 0;
+    border: 1px solid #FFC987;
 }
 .types-item-active {
   /* padding: 0 79rpx; */
@@ -369,7 +374,7 @@ flex-shrink: 0;
   /* height: 91.33rpx; */
   line-height: 57rpx;
   display: inline-block;
-  background: #0B898E;
+  /* background: #0B898E; */
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
@@ -379,6 +384,15 @@ flex-shrink: 0;
   background-size: 100% 100%;
   /* margin-top: -15rpx; */
     text-align: center;
+    min-width: 177.33rpx;
+    box-sizing: border-box;
+    color: #DA4939;
+    text-shadow: 
+                -1px -1px 0 white,  
+                1px -1px 0 white,
+                -1px 1px 0 white,
+                1px 1px 0 white;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/48ce52adb4044d6b91bbce05047695a5.png");
 }
 /* 不显示滚动条 */
 .types-box::-webkit-scrollbar {

From 501589f2f53c6020d76fffff72a4684c652766bd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 24 Apr 2025 10:56:42 +0800
Subject: [PATCH 304/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                   |  2 +-
 pages/index/imgSource.js | 34 ++++++++++++++++++++++++++++++----
 pages/index/index.wxml   |  8 +++++---
 pages/index/index.wxss   |  4 ++--
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 3752d15..3c2a2be 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.isTest184? true : false;
+      data.isTest = data.isTest185? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 2122384..8a4e16d 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -38,7 +38,7 @@ const imageSource = {
     ],
     // 旅游助手
     LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
+        "https://static.ticket.sz-trip.com/uploads/20250423/662eb322f8851e04df41fd836c6a88f3.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
@@ -72,9 +72,35 @@ const imageSource = {
 
     // 长三角文旅平台
     CSJWLPT: [
-        "https://static.ticket.sz-trip.com/uploads/20250312/e44c2f4756948e8a5d837c759f643edc.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
+        {
+            "name":"玉见昆山",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/40319f04a78f25c2741e4ce11b375597.png",
+            "type":"mini",
+            "path":"",
+            "appid":"wx8888a3fd0862b4c8"
+        },
+        {
+            "name":"智游常熟",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/619870022ca676c31d2d6395f81dd3d7.png",
+            "type":"mini",
+            "path":"",
+            "appid":"wxdaf3d5edd07dc7af"
+        },
+        {
+            "name":"常享游",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
+            "type":"h5",
+            "url":"https://tour.wlczy.com/h5/"
+        },
+        {
+            "name":"畅游宿迁",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
+            "type":"mini",
+            "path":"/pages/index/index",
+            "appid":"wxcb00a59c4fba136e"
+        },
+
+
     ],
 
     // 导航标题侧边图片
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 96d6cdf..b9d4c20 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -313,7 +313,9 @@
             <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
+            <image class="new-pic" bindtap="gotoMini"  data-appid="wx241e4ce1442c5de4" data-path=""
             src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
             <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
             src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
@@ -378,8 +380,8 @@
             <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-            <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{imageSourceList.CSJWLPT[index]}}" mode="widthFix"></image>
+            <view class="other-plat" wx:for="{{imageSourceList.CSJWLPT}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+            <image src="{{item.icon}}" mode="heightFix"></image>
             <view>{{item.name}}</view>
             </view>
         </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 7263c86..7b46194 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -673,9 +673,9 @@ page {
   align-items: center;
 }
 .other-plats image {
-  width: 106rpx;
+  width: 80rpx;
   display: block;
-  height: 106rpx;
+  height: 80rpx;
   margin-bottom: 15rpx;
 }
 .other-plat {

From 33759dd194fc5f7c6304a8d806fd83b9e0865dec Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 24 Apr 2025 15:39:04 +0800
Subject: [PATCH 305/471] =?UTF-8?q?=E6=9C=80=E7=BE=8E=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                       |  10 ++++++++++
 pages/index/index.wxml                         |   2 +-
 project.private.config.json                    |  16 ++++++++--------
 subPackageCheckPoint/app.js                    |   1 +
 subPackageCheckPoint/app.wxss                  |   2 ++
 subPackageCheckPoint/common/assets.js          |   1 +
 subPackageCheckPoint/common/vendor.js          |   7 +++++++
 subPackageCheckPoint/components/audioCom.js    |   1 +
 subPackageCheckPoint/components/audioCom.json  |   4 ++++
 subPackageCheckPoint/components/audioCom.wxml  |   1 +
 subPackageCheckPoint/components/audioCom.wxss  |   1 +
 subPackageCheckPoint/pages/content/index.js    |   2 ++
 subPackageCheckPoint/pages/content/index.json  |   7 +++++++
 subPackageCheckPoint/pages/content/index.wxml  |   1 +
 subPackageCheckPoint/pages/content/index.wxss  |   2 ++
 subPackageCheckPoint/pages/detailsmap/index.js |   2 ++
 .../pages/detailsmap/index.json                |   7 +++++++
 .../pages/detailsmap/index.wxml                |   1 +
 .../pages/detailsmap/index.wxss                |   2 ++
 subPackageCheckPoint/pages/index/index.js      |   2 ++
 subPackageCheckPoint/pages/index/index.json    |   7 +++++++
 subPackageCheckPoint/pages/index/index.wxml    |   1 +
 subPackageCheckPoint/pages/index/index.wxss    |   2 ++
 subPackageCheckPoint/pages/scopemap/index.js   |   2 ++
 subPackageCheckPoint/pages/scopemap/index.json |   4 ++++
 subPackageCheckPoint/pages/scopemap/index.wxml |   1 +
 subPackageCheckPoint/pages/scopemap/index.wxss |   1 +
 subPackageCheckPoint/pages/web/index.js        |   2 ++
 subPackageCheckPoint/pages/web/index.json      |   4 ++++
 subPackageCheckPoint/pages/web/index.wxml      |   1 +
 subPackageCheckPoint/pages/web/index.wxss      |   2 ++
 .../static/images/audio/audio.png              | Bin 0 -> 2835 bytes
 .../static/images/audio/audioClose.png         | Bin 0 -> 2947 bytes
 subPackageCheckPoint/static/images/btn.png     | Bin 0 -> 2566 bytes
 .../static/images/descriptionIco.png           | Bin 0 -> 724 bytes
 subPackageCheckPoint/static/images/homeBg.jpg  | Bin 0 -> 243794 bytes
 .../static/images/mapPointIco.png              | Bin 0 -> 906 bytes
 .../static/images/scopeMap/bird.png            | Bin 0 -> 2651 bytes
 .../static/images/scopeMap/changshushi.png     | Bin 0 -> 2639 bytes
 .../static/images/scopeMap/gaoxinqu.png        | Bin 0 -> 2459 bytes
 .../static/images/scopeMap/gongyeyuanqu.png    | Bin 0 -> 2483 bytes
 .../static/images/scopeMap/gusuqu.png          | Bin 0 -> 2599 bytes
 .../static/images/scopeMap/kunshanshi.png      | Bin 0 -> 2360 bytes
 .../static/images/scopeMap/person.png          | Bin 0 -> 10865 bytes
 .../static/images/scopeMap/scopeMapBg.jpg      | Bin 0 -> 261356 bytes
 .../static/images/scopeMap/scopeMapBg.png      | Bin 0 -> 68453 bytes
 .../images/scopeMap/scopeMapDefaultBg.jpg      | Bin 0 -> 13471 bytes
 .../static/images/scopeMap/taicangshi.png      | Bin 0 -> 2360 bytes
 .../static/images/scopeMap/title.png           | Bin 0 -> 7034 bytes
 .../static/images/scopeMap/wujiangqu.png       | Bin 0 -> 2379 bytes
 .../static/images/scopeMap/wuzhongqu.png       | Bin 0 -> 2445 bytes
 .../static/images/scopeMap/xiangchengqu.png    | Bin 0 -> 2536 bytes
 .../static/images/scopeMap/zhangjiagangshi.png | Bin 0 -> 3215 bytes
 subPackageCheckPoint/static/logo.png           | Bin 0 -> 4023 bytes
 subPackageCheckPoint/utils/request.js          |   1 +
 55 files changed, 91 insertions(+), 9 deletions(-)
 create mode 100644 subPackageCheckPoint/app.js
 create mode 100644 subPackageCheckPoint/app.wxss
 create mode 100644 subPackageCheckPoint/common/assets.js
 create mode 100644 subPackageCheckPoint/common/vendor.js
 create mode 100644 subPackageCheckPoint/components/audioCom.js
 create mode 100644 subPackageCheckPoint/components/audioCom.json
 create mode 100644 subPackageCheckPoint/components/audioCom.wxml
 create mode 100644 subPackageCheckPoint/components/audioCom.wxss
 create mode 100644 subPackageCheckPoint/pages/content/index.js
 create mode 100644 subPackageCheckPoint/pages/content/index.json
 create mode 100644 subPackageCheckPoint/pages/content/index.wxml
 create mode 100644 subPackageCheckPoint/pages/content/index.wxss
 create mode 100644 subPackageCheckPoint/pages/detailsmap/index.js
 create mode 100644 subPackageCheckPoint/pages/detailsmap/index.json
 create mode 100644 subPackageCheckPoint/pages/detailsmap/index.wxml
 create mode 100644 subPackageCheckPoint/pages/detailsmap/index.wxss
 create mode 100644 subPackageCheckPoint/pages/index/index.js
 create mode 100644 subPackageCheckPoint/pages/index/index.json
 create mode 100644 subPackageCheckPoint/pages/index/index.wxml
 create mode 100644 subPackageCheckPoint/pages/index/index.wxss
 create mode 100644 subPackageCheckPoint/pages/scopemap/index.js
 create mode 100644 subPackageCheckPoint/pages/scopemap/index.json
 create mode 100644 subPackageCheckPoint/pages/scopemap/index.wxml
 create mode 100644 subPackageCheckPoint/pages/scopemap/index.wxss
 create mode 100644 subPackageCheckPoint/pages/web/index.js
 create mode 100644 subPackageCheckPoint/pages/web/index.json
 create mode 100644 subPackageCheckPoint/pages/web/index.wxml
 create mode 100644 subPackageCheckPoint/pages/web/index.wxss
 create mode 100644 subPackageCheckPoint/static/images/audio/audio.png
 create mode 100644 subPackageCheckPoint/static/images/audio/audioClose.png
 create mode 100644 subPackageCheckPoint/static/images/btn.png
 create mode 100644 subPackageCheckPoint/static/images/descriptionIco.png
 create mode 100644 subPackageCheckPoint/static/images/homeBg.jpg
 create mode 100644 subPackageCheckPoint/static/images/mapPointIco.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/bird.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/changshushi.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/gaoxinqu.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/gongyeyuanqu.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/gusuqu.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/kunshanshi.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/person.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/scopeMapBg.jpg
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/scopeMapBg.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/scopeMapDefaultBg.jpg
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/taicangshi.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/title.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/wujiangqu.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/wuzhongqu.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/xiangchengqu.png
 create mode 100644 subPackageCheckPoint/static/images/scopeMap/zhangjiagangshi.png
 create mode 100644 subPackageCheckPoint/static/logo.png
 create mode 100644 subPackageCheckPoint/utils/request.js

diff --git a/app.json b/app.json
index 603cee1..5347794 100644
--- a/app.json
+++ b/app.json
@@ -206,6 +206,16 @@
         "password/setting/setting",
         "goods/oneCardTour/info/index"
       ]
+    },
+    {
+        "root": "subPackageCheckPoint",
+        "pages": [
+            "pages/index/index",
+            "pages/scopemap/index",
+            "pages/detailsmap/index",
+            "pages/content/index",
+            "pages/web/index"
+        ]
     }
   ],
   "plugins": {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b9d4c20..3eb48fc 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -315,7 +315,7 @@
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
             <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
             src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
-            <image class="new-pic" bindtap="gotoMini"  data-appid="wx241e4ce1442c5de4" data-path=""
+            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
             src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
             <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
             src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
diff --git a/project.private.config.json b/project.private.config.json
index cce0b19..1e1341f 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,29 +1,29 @@
 {
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https://test.m.cloud.sz-trip.com/culturalTravelHelp",
+          "name": "subPackageCheckPoint/pages/index/index",
+          "pathName": "subPackageCheckPoint/pages/index/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
-          "query": "weburl=https://m.cloud.sz-trip.com/nightMooring",
+          "query": "weburl=https://test.m.cloud.sz-trip.com/culturalTravelHelp",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "subPackages/goods/oneCardTour/info/index",
-          "pathName": "subPackages/goods/oneCardTour/info/index",
-          "query": "id=456888",
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https://m.cloud.sz-trip.com/nightMooring",
           "launchMode": "default",
           "scene": null
         },
diff --git a/subPackageCheckPoint/app.js b/subPackageCheckPoint/app.js
new file mode 100644
index 0000000..8133c65
--- /dev/null
+++ b/subPackageCheckPoint/app.js
@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("./common/vendor.js");Math;const o={globalData:{baseUrl:null,innerAudioContext:t.index.createInnerAudioContext(),T:""},onLaunch:function(){this.globalData.baseUrl="https://jdsz.ispush.com",this.globalData.innerAudioContext.src=`${this.globalData.baseUrl}/static/audio/bg.mp3`,this.globalData.innerAudioContext.obeyMuteSwitch=!1,this.globalData.innerAudioContext.autoplay=!1,this.globalData.innerAudioContext.loop=!0,console.log("App Launch")},onShow:function(){console.log("App Show")},onHide:function(){console.log("App Hide")},onShareAppMessage:t=>({title:"君到苏州最美打卡点",path:"pages/index/index"}),onShareTimeline:()=>({title:"君到苏州最美打卡点",path:"pages/index/index"})};function e(){return{app:t.createSSRApp(o)}}e().app.mount("#app"),exports.createApp=e;
diff --git a/subPackageCheckPoint/app.wxss b/subPackageCheckPoint/app.wxss
new file mode 100644
index 0000000..d2e2c04
--- /dev/null
+++ b/subPackageCheckPoint/app.wxss
@@ -0,0 +1,2 @@
+:root{--base-width: 750/2160}
+page::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(https://cdn1.dcloud.net.cn/517a6379517a5a474e43556c64336730596d4933596a59774e5441344d7a466d4e546731/img/shadow-grey.png)}100%{background-image:url(https://cdn1.dcloud.net.cn/517a6379517a5a474e43556c64336730596d4933596a59774e5441344d7a466d4e546731/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(https://cdn1.dcloud.net.cn/517a6379517a5a474e43556c64336730596d4933596a59774e5441344d7a466d4e546731/img/shadow-grey.png)}100%{background-image:url(https://cdn1.dcloud.net.cn/517a6379517a5a474e43556c64336730596d4933596a59774e5441344d7a466d4e546731/img/shadow-grey.png)}}page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}[data-c-h="true"]{display: none !important;}
\ No newline at end of file
diff --git a/subPackageCheckPoint/common/assets.js b/subPackageCheckPoint/common/assets.js
new file mode 100644
index 0000000..e7af2f9
--- /dev/null
+++ b/subPackageCheckPoint/common/assets.js
@@ -0,0 +1 @@
+"use strict";exports._imports_0="/subPackageCheckPoint/static/images/btn.png",exports._imports_0$1="/subPackageCheckPoint/static/logo.png",exports._imports_0$2="/subPackageCheckPoint/static/images/mapPointIco.png",exports._imports_1="/subPackageCheckPoint/static/images/homeBg.jpg",exports._imports_1$1="/subPackageCheckPoint/static/images/descriptionIco.png",exports._imports_2="/subPackageCheckPoint/static/images/scopeMap/scopeMapDefaultBg.jpg",exports._imports_3="/subPackageCheckPoint/static/images/scopeMap/bird.png",exports._imports_4="/subPackageCheckPoint/static/images/scopeMap/scopeMapBg.png",exports._imports_5="/subPackageCheckPoint/static/images/scopeMap/title.png",exports._imports_6="/subPackageCheckPoint/static/images/scopeMap/person.png";
diff --git a/subPackageCheckPoint/common/vendor.js b/subPackageCheckPoint/common/vendor.js
new file mode 100644
index 0000000..790391c
--- /dev/null
+++ b/subPackageCheckPoint/common/vendor.js
@@ -0,0 +1,7 @@
+"use strict";
+/**
+* @vue/shared v3.4.21
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
+function e(e,t){const n=new Set(e.split(","));return t?e=>n.has(e.toLowerCase()):e=>n.has(e)}const t={},n=[],o=()=>{},r=()=>!1,i=e=>111===e.charCodeAt(0)&&110===e.charCodeAt(1)&&(e.charCodeAt(2)>122||e.charCodeAt(2)<97),s=e=>e.startsWith("onUpdate:"),c=Object.assign,u=(e,t)=>{const n=e.indexOf(t);n>-1&&e.splice(n,1)},a=Object.prototype.hasOwnProperty,l=(e,t)=>a.call(e,t),f=Array.isArray,p=e=>"[object Map]"===x(e),d=e=>"[object Set]"===x(e),h=e=>"function"==typeof e,g=e=>"string"==typeof e,m=e=>"symbol"==typeof e,v=e=>null!==e&&"object"==typeof e,_=e=>(v(e)||h(e))&&h(e.then)&&h(e.catch),y=Object.prototype.toString,x=e=>y.call(e),b=e=>"[object Object]"===x(e),w=e=>g(e)&&"NaN"!==e&&"-"!==e[0]&&""+parseInt(e,10)===e,$=e(",key,ref,ref_for,ref_key,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted"),S=e=>{const t=Object.create(null);return n=>t[n]||(t[n]=e(n))},k=/-(\w)/g,O=S((e=>e.replace(k,((e,t)=>t?t.toUpperCase():"")))),C=/\B([A-Z])/g,P=S((e=>e.replace(C,"-$1").toLowerCase())),E=S((e=>e.charAt(0).toUpperCase()+e.slice(1))),A=S((e=>e?`on${E(e)}`:"")),I=(e,t)=>!Object.is(e,t),j=(e,t)=>{for(let n=0;n<e.length;n++)e[n](t)},R=e=>{const t=parseFloat(e);return isNaN(t)?e:t};let L;function T(e){if(f(e)){const t={};for(let n=0;n<e.length;n++){const o=e[n],r=g(o)?D(o):T(o);if(r)for(const e in r)t[e]=r[e]}return t}if(g(e)||v(e))return e}const M=/;(?![^(]*\))/g,V=/:([^]+)/,N=/\/\*[^]*?\*\//g;function D(e){const t={};return e.replace(N,"").split(M).forEach((e=>{if(e){const n=e.split(V);n.length>1&&(t[n[0].trim()]=n[1].trim())}})),t}function H(e){let t="";if(g(e))t=e;else if(f(e))for(let n=0;n<e.length;n++){const o=H(e[n]);o&&(t+=o+" ")}else if(v(e))for(const n in e)e[n]&&(t+=n+" ");return t.trim()}const B=(e,t)=>t&&t.__v_isRef?B(e,t.value):p(t)?{[`Map(${t.size})`]:[...t.entries()].reduce(((e,[t,n],o)=>(e[U(t,o)+" =>"]=n,e)),{})}:d(t)?{[`Set(${t.size})`]:[...t.values()].map((e=>U(e)))}:m(t)?U(t):!v(t)||f(t)||b(t)?t:String(t),U=(e,t="")=>{var n;return m(e)?`Symbol(${null!=(n=e.description)?n:t})`:e};function z(e,t=null){let n;return(...o)=>(e&&(n=e.apply(t,o),e=null),n)}function W(e,t){if(!g(t))return;const n=(t=t.replace(/\[(\d+)\]/g,".$1")).split(".");let o=n[0];return e||(e={}),1===n.length?e[o]:W(e[o],n.slice(1).join("."))}function F(e){let t={};return b(e)&&Object.keys(e).sort().forEach((n=>{const o=n;t[o]=e[o]})),Object.keys(t)?t:e}const K=/:/g;const q=encodeURIComponent;function G(e,t=q){const n=e?Object.keys(e).map((n=>{let o=e[n];return void 0===typeof o||null===o?o="":b(o)&&(o=JSON.stringify(o)),t(n)+"="+t(o)})).filter((e=>e.length>0)).join("&"):null;return n?`?${n}`:""}const J=["onInit","onLoad","onShow","onHide","onUnload","onBackPress","onPageScroll","onTabItemTap","onReachBottom","onPullDownRefresh","onShareTimeline","onShareAppMessage","onShareChat","onAddToFavorites","onSaveExitState","onNavigationBarButtonTap","onNavigationBarSearchInputClicked","onNavigationBarSearchInputChanged","onNavigationBarSearchInputConfirmed","onNavigationBarSearchInputFocusChanged"];const Z=["onShow","onHide","onLaunch","onError","onThemeChange","onPageNotFound","onUnhandledRejection","onExit","onInit","onLoad","onReady","onUnload","onResize","onBackPress","onPageScroll","onTabItemTap","onReachBottom","onPullDownRefresh","onShareTimeline","onAddToFavorites","onShareAppMessage","onShareChat","onSaveExitState","onNavigationBarButtonTap","onNavigationBarSearchInputClicked","onNavigationBarSearchInputChanged","onNavigationBarSearchInputConfirmed","onNavigationBarSearchInputFocusChanged"],Q=(()=>({onPageScroll:1,onShareAppMessage:2,onShareTimeline:4}))();function X(e,t,n=!0){return!(n&&!h(t))&&(Z.indexOf(e)>-1||0===e.indexOf("on"))}let Y;const ee=[];const te=z(((e,t)=>{if(h(e._component.onError))return t(e)})),ne=function(){};ne.prototype={_id:1,on:function(e,t,n){var o=this.e||(this.e={});return(o[e]||(o[e]=[])).push({fn:t,ctx:n,_id:this._id}),this._id++},once:function(e,t,n){var o=this;function r(){o.off(e,r),t.apply(n,arguments)}return r._=t,this.on(e,r,n)},emit:function(e){for(var t=[].slice.call(arguments,1),n=((this.e||(this.e={}))[e]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,t);return this},off:function(e,t){var n=this.e||(this.e={}),o=n[e],r=[];if(o&&t){for(var i=o.length-1;i>=0;i--)if(o[i].fn===t||o[i].fn._===t||o[i]._id===t){o.splice(i,1);break}r=o}return r.length?n[e]=r:delete n[e],this}};var oe=ne;function re(e,t){if(!e)return;if(e=e.trim().replace(/_/g,"-"),t&&t[e])return e;if("chinese"===(e=e.toLowerCase()))return"zh-Hans";if(0===e.indexOf("zh"))return e.indexOf("-hans")>-1?"zh-Hans":e.indexOf("-hant")>-1?"zh-Hant":(n=e,["-tw","-hk","-mo","-cht"].find((e=>-1!==n.indexOf(e)))?"zh-Hant":"zh-Hans");var n;let o=["en","fr","es"];t&&Object.keys(t).length>0&&(o=Object.keys(t));const r=function(e,t){return t.find((t=>0===e.indexOf(t)))}(e,o);return r||void 0}function ie(e){return function(){try{return e.apply(e,arguments)}catch(t){console.error(t)}}}let se=1;const ce={};function ue(e,t,n){if("number"==typeof e){const o=ce[e];if(o)return o.keepAlive||delete ce[e],o.callback(t,n)}return t}const ae="success",le="fail",fe="complete";function pe(e,t={},{beforeAll:n,beforeSuccess:o}={}){b(t)||(t={});const{success:r,fail:i,complete:s}=function(e){const t={};for(const n in e){const o=e[n];h(o)&&(t[n]=ie(o),delete e[n])}return t}(t),c=h(r),u=h(i),a=h(s),l=se++;return function(e,t,n,o=!1){ce[e]={name:t,keepAlive:o,callback:n}}(l,e,(l=>{(l=l||{}).errMsg=function(e,t){return e&&-1!==e.indexOf(":fail")?t+e.substring(e.indexOf(":fail")):t+":ok"}(l.errMsg,e),h(n)&&n(l),l.errMsg===e+":ok"?(h(o)&&o(l,t),c&&r(l)):u&&i(l),a&&s(l)})),l}const de="success",he="fail",ge="complete",me={},ve={};function _e(e,t){return function(n){return e(n,t)||n}}function ye(e,t,n){let o=!1;for(let r=0;r<e.length;r++){const i=e[r];if(o)o=Promise.resolve(_e(i,n));else{const e=i(t,n);if(_(e)&&(o=Promise.resolve(e)),!1===e)return{then(){},catch(){}}}}return o||{then:e=>e(t),catch(){}}}function xe(e,t={}){return[de,he,ge].forEach((n=>{const o=e[n];if(!f(o))return;const r=t[n];t[n]=function(e){ye(o,e,t).then((e=>h(r)&&r(e)||e))}})),t}function be(e,t){const n=[];f(me.returnValue)&&n.push(...me.returnValue);const o=ve[e];return o&&f(o.returnValue)&&n.push(...o.returnValue),n.forEach((e=>{t=e(t)||t})),t}function we(e){const t=Object.create(null);Object.keys(me).forEach((e=>{"returnValue"!==e&&(t[e]=me[e].slice())}));const n=ve[e];return n&&Object.keys(n).forEach((e=>{"returnValue"!==e&&(t[e]=(t[e]||[]).concat(n[e]))})),t}function $e(e,t,n,o){const r=we(e);if(r&&Object.keys(r).length){if(f(r.invoke)){return ye(r.invoke,n).then((n=>t(xe(we(e),n),...o)))}return t(xe(r,n),...o)}return t(n,...o)}function Se(e,t){return(n={},...o)=>function(e){return!(!b(e)||![ae,le,fe].find((t=>h(e[t]))))}(n)?be(e,$e(e,t,n,o)):be(e,new Promise(((r,i)=>{$e(e,t,c(n,{success:r,fail:i}),o)})))}function ke(e,t,n,o={}){const r=t+":fail";let i="";return i=n?0===n.indexOf(r)?n:r+" "+n:r,delete o.errCode,ue(e,c({errMsg:i},o))}function Oe(e,t,n,o){const r=function(e,t){e[0]}(t);if(r)return r}function Ce(e,t,n,o){return n=>{const r=pe(e,n,o),i=Oe(0,[n]);return i?ke(r,e,i):t(n,{resolve:t=>function(e,t,n){return ue(e,c(n||{},{errMsg:t+":ok"}))}(r,e,t),reject:(t,n)=>ke(r,e,function(e){return!e||g(e)?e:e.stack?("undefined"!=typeof globalThis&&globalThis.harmonyChannel||console.error(e.message+"\n"+e.stack),e.message):e}(t),n)})}}function Pe(e,t,n,o){return function(e,t,n,o){return(...e)=>{const n=Oe(0,e);if(n)throw new Error(n);return t.apply(null,e)}}(0,t)}let Ee=!1,Ae=0,Ie=0;function je(){const{platform:e,pixelRatio:t,windowWidth:n}=wx.getSystemInfoSync();Ae=n,Ie=t,Ee="ios"===e}const Re=Pe(0,((e,t)=>{if(0===Ae&&je(),0===(e=Number(e)))return 0;let n=e/750*(t||Ae);return n<0&&(n=-n),n=Math.floor(n+1e-4),0===n&&(n=1!==Ie&&Ee?.5:1),e<0?-n:n}));function Le(e,t){Object.keys(t).forEach((n=>{h(t[n])&&(e[n]=function(e,t){const n=t?e?e.concat(t):f(t)?t:[t]:e;return n?function(e){const t=[];for(let n=0;n<e.length;n++)-1===t.indexOf(e[n])&&t.push(e[n]);return t}(n):n}(e[n],t[n]))}))}function Te(e,t){e&&t&&Object.keys(t).forEach((n=>{const o=e[n],r=t[n];f(o)&&h(r)&&u(o,r)}))}const Me=Pe(0,((e,t)=>{g(e)&&b(t)?Le(ve[e]||(ve[e]={}),t):b(e)&&Le(me,e)})),Ve=Pe(0,((e,t)=>{g(e)?b(t)?Te(ve[e],t):delete ve[e]:b(e)&&Te(me,e)}));const Ne=new class{constructor(){this.$emitter=new oe}on(e,t){return this.$emitter.on(e,t)}once(e,t){return this.$emitter.once(e,t)}off(e,t){e?this.$emitter.off(e,t):this.$emitter.e={}}emit(e,...t){this.$emitter.emit(e,...t)}},De=Pe(0,((e,t)=>(Ne.on(e,t),()=>Ne.off(e,t)))),He=Pe(0,((e,t)=>(Ne.once(e,t),()=>Ne.off(e,t)))),Be=Pe(0,((e,t)=>{f(e)||(e=e?[e]:[]),e.forEach((e=>Ne.off(e,t)))})),Ue=Pe(0,((e,...t)=>{Ne.emit(e,...t)}));let ze,We,Fe;function Ke(e){try{return JSON.parse(e)}catch(t){}return e}const qe=[];function Ge(e,t){qe.forEach((n=>{n(e,t)})),qe.length=0}const Je=Se(Ze="getPushClientId",function(e,t,n,o){return Ce(e,t,0,o)}(Ze,((e,{resolve:t,reject:n})=>{Promise.resolve().then((()=>{void 0===Fe&&(Fe=!1,ze="",We="uniPush is not enabled"),qe.push(((e,o)=>{e?t({cid:e}):n(o)})),void 0!==ze&&Ge(ze,We)}))}),0,Qe));var Ze,Qe;const Xe=[],Ye=/^\$|getLocale|setLocale|sendNativeEvent|restoreGlobal|requireGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getDeviceInfo|getAppBaseInfo|getWindowInfo|getSystemSetting|getAppAuthorizeSetting/,et=/^create|Manager$/,tt=["createBLEConnection"],nt=["createBLEConnection"],ot=/^on|^off/;function rt(e){return et.test(e)&&-1===tt.indexOf(e)}function it(e){return Ye.test(e)&&-1===nt.indexOf(e)}function st(e){return!(rt(e)||it(e)||function(e){return ot.test(e)&&"onPush"!==e}(e))}function ct(e,t){return st(e)&&h(t)?function(n={},...o){return h(n.success)||h(n.fail)||h(n.complete)?be(e,$e(e,t,n,o)):be(e,new Promise(((r,i)=>{$e(e,t,c({},n,{success:r,fail:i}),o)})))}:t}Promise.prototype.finally||(Promise.prototype.finally=function(e){const t=this.constructor;return this.then((n=>t.resolve(e&&e()).then((()=>n))),(n=>t.resolve(e&&e()).then((()=>{throw n}))))});const ut=["success","fail","cancel","complete"];const at=()=>{const e=h(getApp)&&getApp({allowDefault:!0});return e&&e.$vm?e.$vm.$locale:re(wx.getSystemInfoSync().language)||"en"},lt=[];"undefined"!=typeof global&&(global.getLocale=at);let ft;function pt(e=wx){return function(t,n){ft=ft||e.getStorageSync("__DC_STAT_UUID"),ft||(ft=Date.now()+""+Math.floor(1e7*Math.random()),wx.setStorage({key:"__DC_STAT_UUID",data:ft})),n.deviceId=ft}}function dt(e,t){if(e.safeArea){const n=e.safeArea;t.safeAreaInsets={top:n.top,left:n.left,right:e.windowWidth-n.right,bottom:e.screenHeight-n.bottom}}}function ht(e,t){let n="",o="";return n=e.split(" ")[0]||"",o=e.split(" ")[1]||"",{osName:n.toLocaleLowerCase(),osVersion:o}}function gt(e,t){let n=e.deviceType||"phone";{const e={ipad:"pad",windows:"pc",mac:"pc"},o=Object.keys(e),r=t.toLocaleLowerCase();for(let t=0;t<o.length;t++){const i=o[t];if(-1!==r.indexOf(i)){n=e[i];break}}}return n}function mt(e){let t=e;return t&&(t=t.toLocaleLowerCase()),t}function vt(e){return at?at():e}function _t(e){let t=e.hostName||"WeChat";return e.environment?t=e.environment:e.host&&e.host.env&&(t=e.host.env),t}const yt={returnValue:(e,t)=>{dt(e,t),pt()(e,t),function(e,t){const{brand:n="",model:o="",system:r="",language:i="",theme:s,version:u,platform:a,fontSizeSetting:l,SDKVersion:f,pixelRatio:p,deviceOrientation:d}=e,{osName:h,osVersion:g}=ht(r);let m=u,v=gt(e,o),_=mt(n),y=_t(e),x=d,b=p,w=f;const $=i.replace(/_/g,"-"),S={appId:"__UNI__C72C6F4",appName:"君到苏州最美打卡点",appVersion:"1.0.0",appVersionCode:"100",appLanguage:vt($),uniCompileVersion:"4.36",uniCompilerVersion:"4.36",uniRuntimeVersion:"4.36",uniPlatform:"mp-weixin",deviceBrand:_,deviceModel:o,deviceType:v,devicePixelRatio:b,deviceOrientation:x,osName:h,osVersion:g,hostTheme:s,hostVersion:m,hostLanguage:$,hostName:y,hostSDKVersion:w,hostFontSizeSetting:l,windowTop:0,windowBottom:0,osLanguage:void 0,osTheme:void 0,ua:void 0,hostPackageName:void 0,browserName:void 0,browserVersion:void 0,isUniAppX:!1};c(t,S)}(e,t)}},xt=yt,bt={args(e,t){let n=parseInt(e.current);if(isNaN(n))return;const o=e.urls;if(!f(o))return;const r=o.length;return r?(n<0?n=0:n>=r&&(n=r-1),n>0?(t.current=o[n],t.urls=o.filter(((e,t)=>!(t<n)||e!==o[n]))):t.current=o[0],{indicator:!1,loop:!1}):void 0}},wt={args(e,t){t.alertText=e.title}},$t={returnValue:(e,t)=>{const{brand:n,model:o,system:r="",platform:i=""}=e;let s=gt(e,o),u=mt(n);pt()(e,t);const{osName:a,osVersion:l}=ht(r);t=F(c(t,{deviceType:s,deviceBrand:u,deviceModel:o,osName:a,osVersion:l}))}},St={returnValue:(e,t)=>{const{version:n,language:o,SDKVersion:r,theme:i}=e;let s=_t(e),u=o.replace(/_/g,"-");t=F(c(t,{hostVersion:n,hostLanguage:u,hostName:s,hostSDKVersion:r,hostTheme:i,appId:"__UNI__C72C6F4",appName:"君到苏州最美打卡点",appVersion:"1.0.0",appVersionCode:"100",appLanguage:vt(u),isUniAppX:!1,uniPlatform:"mp-weixin",uniCompileVersion:"4.36",uniCompilerVersion:"4.36",uniRuntimeVersion:"4.36"}))}},kt={returnValue:(e,t)=>{dt(e,t),t=F(c(t,{windowTop:0,windowBottom:0}))}},Ot={$on:De,$off:Be,$once:He,$emit:Ue,upx2px:Re,interceptors:{},addInterceptor:Me,removeInterceptor:Ve,onCreateVueApp:function(e){if(Y)return e(Y);ee.push(e)},invokeCreateVueAppHook:function(e){Y=e,ee.forEach((t=>t(e)))},getLocale:at,setLocale:e=>{const t=h(getApp)&&getApp();if(!t)return!1;return t.$vm.$locale!==e&&(t.$vm.$locale=e,lt.forEach((t=>t({locale:e}))),!0)},onLocaleChange:e=>{-1===lt.indexOf(e)&&lt.push(e)},getPushClientId:Je,onPushMessage:e=>{-1===Xe.indexOf(e)&&Xe.push(e)},offPushMessage:e=>{if(e){const t=Xe.indexOf(e);t>-1&&Xe.splice(t,1)}else Xe.length=0},invokePushCallback:function(e){if("enabled"===e.type)Fe=!0;else if("clientId"===e.type)ze=e.cid,We=e.errMsg,Ge(ze,e.errMsg);else if("pushMsg"===e.type){const t={type:"receive",data:Ke(e.message)};for(let e=0;e<Xe.length;e++){if((0,Xe[e])(t),t.stopped)break}}else"click"===e.type&&Xe.forEach((t=>{t({type:"click",data:Ke(e.message)})}))}};const Ct=["qy","env","error","version","lanDebug","cloud","serviceMarket","router","worklet","__webpack_require_UNI_MP_PLUGIN__"],Pt=["lanDebug","router","worklet"],Et=wx.getLaunchOptionsSync?wx.getLaunchOptionsSync():null;function At(e){return(!Et||1154!==Et.scene||!Pt.includes(e))&&(Ct.indexOf(e)>-1||"function"==typeof wx[e])}function It(){const e={};for(const t in wx)At(t)&&(e[t]=wx[t]);return"undefined"!=typeof globalThis&&"undefined"==typeof requireMiniProgram&&(globalThis.wx=e),e}const jt=["__route__","__wxExparserNodeId__","__wxWebviewId__"],Rt=(Lt={oauth:["weixin"],share:["weixin"],payment:["wxpay"],push:["weixin"]},function({service:e,success:t,fail:n,complete:o}){let r;Lt[e]?(r={errMsg:"getProvider:ok",service:e,provider:Lt[e]},h(t)&&t(r)):(r={errMsg:"getProvider:fail:服务["+e+"]不存在"},h(n)&&n(r)),h(o)&&o(r)});var Lt;const Tt=It();let Mt=Tt.getAppBaseInfo&&Tt.getAppBaseInfo();Mt||(Mt=Tt.getSystemInfoSync());const Vt=Mt?Mt.host:null,Nt=Vt&&"SAAASDK"===Vt.env?Tt.miniapp.shareVideoMessage:Tt.shareVideoMessage;var Dt=Object.freeze({__proto__:null,createSelectorQuery:function(){const e=Tt.createSelectorQuery(),t=e.in;return e.in=function(e){return t.call(this,function(e){const t=Object.create(null);return jt.forEach((n=>{t[n]=e[n]})),t}(e))},e},getProvider:Rt,shareVideoMessage:Nt});const Ht={args(e,t){e.compressedHeight&&!t.compressHeight&&(t.compressHeight=e.compressedHeight),e.compressedWidth&&!t.compressWidth&&(t.compressWidth=e.compressedWidth)}};var Bt=Object.freeze({__proto__:null,compressImage:Ht,getAppAuthorizeSetting:{returnValue:function(e,t){const{locationReducedAccuracy:n}=e;t.locationAccuracy="unsupported",!0===n?t.locationAccuracy="reduced":!1===n&&(t.locationAccuracy="full")}},getAppBaseInfo:St,getDeviceInfo:$t,getSystemInfo:yt,getSystemInfoSync:xt,getWindowInfo:kt,previewImage:bt,redirectTo:{},showActionSheet:wt});const Ut=It();var zt=function(e,t,n=wx){const o=function(e){function t(e,t,n){return function(r){return t(o(e,r,n))}}function n(e,n,o={},r={},i=!1){if(b(n)){const s=!0===i?n:{};h(o)&&(o=o(n,s)||{});for(const c in n)if(l(o,c)){let t=o[c];h(t)&&(t=t(n[c],n,s)),t?g(t)?s[t]=n[c]:b(t)&&(s[t.name?t.name:c]=t.value):console.warn(`微信小程序 ${e} 暂不支持 ${c}`)}else if(-1!==ut.indexOf(c)){const o=n[c];h(o)&&(s[c]=t(e,o,r))}else i||l(s,c)||(s[c]=n[c]);return s}return h(n)&&(n=t(e,n,r)),n}function o(t,o,r,i=!1){return h(e.returnValue)&&(o=e.returnValue(t,o)),n(t,o,r,{},i)}return function(t,r){if(!l(e,t))return r;const i=e[t];return i?function(e,r){let s=i;h(i)&&(s=i(e));const c=[e=n(t,e,s.args,s.returnValue)];void 0!==r&&c.push(r);const u=wx[s.name||t].apply(wx,c);return it(t)?o(t,u,s.returnValue,rt(t)):u}:function(){console.error(`微信小程序 暂不支持${t}`)}}}(t);return new Proxy({},{get:(t,r)=>l(t,r)?t[r]:l(e,r)?ct(r,e[r]):l(Ot,r)?ct(r,Ot[r]):ct(r,o(r,n[r]))})}(Dt,Bt,Ut);new Set(Object.getOwnPropertyNames(Symbol).filter((e=>"arguments"!==e&&"caller"!==e)).map((e=>Symbol[e])).filter(m));{const e=L||(L="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:{}),t=(t,n)=>{let o;return(o=e[t])||(o=e[t]=[]),o.push(n),e=>{o.length>1?o.forEach((t=>t(e))):o[0](e)}};t("__VUE_INSTANCE_SETTERS__",(e=>e)),t("__VUE_SSR_SETTERS__",(e=>e))}let Wt,Ft;class Kt{constructor(e=!1){this.detached=e,this._active=!0,this.effects=[],this.cleanups=[],this.parent=Wt,!e&&Wt&&(this.index=(Wt.scopes||(Wt.scopes=[])).push(this)-1)}get active(){return this._active}run(e){if(this._active){const t=Wt;try{return Wt=this,e()}finally{Wt=t}}}on(){Wt=this}off(){Wt=this.parent}stop(e){if(this._active){let t,n;for(t=0,n=this.effects.length;t<n;t++)this.effects[t].stop();for(t=0,n=this.cleanups.length;t<n;t++)this.cleanups[t]();if(this.scopes)for(t=0,n=this.scopes.length;t<n;t++)this.scopes[t].stop(!0);if(!this.detached&&this.parent&&!e){const e=this.parent.scopes.pop();e&&e!==this&&(this.parent.scopes[this.index]=e,e.index=this.index)}this.parent=void 0,this._active=!1}}}class qt{constructor(e,t,n,o){this.fn=e,this.trigger=t,this.scheduler=n,this.active=!0,this.deps=[],this._dirtyLevel=4,this._trackId=0,this._runnings=0,this._shouldSchedule=!1,this._depsLength=0,function(e,t=Wt){t&&t.active&&t.effects.push(e)}(this,o)}get dirty(){if(2===this._dirtyLevel||3===this._dirtyLevel){this._dirtyLevel=1,en();for(let e=0;e<this._depsLength;e++){const t=this.deps[e];if(t.computed&&(t.computed.value,this._dirtyLevel>=4))break}1===this._dirtyLevel&&(this._dirtyLevel=0),tn()}return this._dirtyLevel>=4}set dirty(e){this._dirtyLevel=e?4:0}run(){if(this._dirtyLevel=0,!this.active)return this.fn();let e=Qt,t=Ft;try{return Qt=!0,Ft=this,this._runnings++,Gt(this),this.fn()}finally{Jt(this),this._runnings--,Ft=t,Qt=e}}stop(){var e;this.active&&(Gt(this),Jt(this),null==(e=this.onStop)||e.call(this),this.active=!1)}}function Gt(e){e._trackId++,e._depsLength=0}function Jt(e){if(e.deps.length>e._depsLength){for(let t=e._depsLength;t<e.deps.length;t++)Zt(e.deps[t],e);e.deps.length=e._depsLength}}function Zt(e,t){const n=e.get(t);void 0!==n&&t._trackId!==n&&(e.delete(t),0===e.size&&e.cleanup())}let Qt=!0,Xt=0;const Yt=[];function en(){Yt.push(Qt),Qt=!1}function tn(){const e=Yt.pop();Qt=void 0===e||e}function nn(){Xt++}function on(){for(Xt--;!Xt&&sn.length;)sn.shift()()}function rn(e,t,n){if(t.get(e)!==e._trackId){t.set(e,e._trackId);const n=e.deps[e._depsLength];n!==t?(n&&Zt(n,e),e.deps[e._depsLength++]=t):e._depsLength++}}const sn=[];function cn(e,t,n){nn();for(const o of e.keys()){let n;o._dirtyLevel<t&&(null!=n?n:n=e.get(o)===o._trackId)&&(o._shouldSchedule||(o._shouldSchedule=0===o._dirtyLevel),o._dirtyLevel=t),o._shouldSchedule&&(null!=n?n:n=e.get(o)===o._trackId)&&(o.trigger(),o._runnings&&!o.allowRecurse||2===o._dirtyLevel||(o._shouldSchedule=!1,o.scheduler&&sn.push(o.scheduler)))}on()}const un=(e,t)=>{const n=new Map;return n.cleanup=e,n.computed=t,n},an=new WeakMap,ln=Symbol(""),fn=Symbol("");function pn(e,t,n){if(Qt&&Ft){let t=an.get(e);t||an.set(e,t=new Map);let o=t.get(n);o||t.set(n,o=un((()=>t.delete(n)))),rn(Ft,o)}}function dn(e,t,n,o,r,i){const s=an.get(e);if(!s)return;let c=[];if("clear"===t)c=[...s.values()];else if("length"===n&&f(e)){const e=Number(o);s.forEach(((t,n)=>{("length"===n||!m(n)&&n>=e)&&c.push(t)}))}else switch(void 0!==n&&c.push(s.get(n)),t){case"add":f(e)?w(n)&&c.push(s.get("length")):(c.push(s.get(ln)),p(e)&&c.push(s.get(fn)));break;case"delete":f(e)||(c.push(s.get(ln)),p(e)&&c.push(s.get(fn)));break;case"set":p(e)&&c.push(s.get(ln))}nn();for(const u of c)u&&cn(u,4);on()}const hn=e("__proto__,__v_isRef,__isVue"),gn=new Set(Object.getOwnPropertyNames(Symbol).filter((e=>"arguments"!==e&&"caller"!==e)).map((e=>Symbol[e])).filter(m)),mn=vn();function vn(){const e={};return["includes","indexOf","lastIndexOf"].forEach((t=>{e[t]=function(...e){const n=oo(this);for(let t=0,r=this.length;t<r;t++)pn(n,0,t+"");const o=n[t](...e);return-1===o||!1===o?n[t](...e.map(oo)):o}})),["push","pop","shift","unshift","splice"].forEach((t=>{e[t]=function(...e){en(),nn();const n=oo(this)[t].apply(this,e);return on(),tn(),n}})),e}function _n(e){const t=oo(this);return pn(t,0,e),t.hasOwnProperty(e)}class yn{constructor(e=!1,t=!1){this._isReadonly=e,this._isShallow=t}get(e,t,n){const o=this._isReadonly,r=this._isShallow;if("__v_isReactive"===t)return!o;if("__v_isReadonly"===t)return o;if("__v_isShallow"===t)return r;if("__v_raw"===t)return n===(o?r?Jn:Gn:r?qn:Kn).get(e)||Object.getPrototypeOf(e)===Object.getPrototypeOf(n)?e:void 0;const i=f(e);if(!o){if(i&&l(mn,t))return Reflect.get(mn,t,n);if("hasOwnProperty"===t)return _n}const s=Reflect.get(e,t,n);return(m(t)?gn.has(t):hn(t))?s:(o||pn(e,0,t),r?s:lo(s)?i&&w(t)?s:s.value:v(s)?o?Xn(s):Qn(s):s)}}class xn extends yn{constructor(e=!1){super(!1,e)}set(e,t,n,o){let r=e[t];if(!this._isShallow){const t=to(r);if(no(n)||to(n)||(r=oo(r),n=oo(n)),!f(e)&&lo(r)&&!lo(n))return!t&&(r.value=n,!0)}const i=f(e)&&w(t)?Number(t)<e.length:l(e,t),s=Reflect.set(e,t,n,o);return e===oo(o)&&(i?I(n,r)&&dn(e,"set",t,n):dn(e,"add",t,n)),s}deleteProperty(e,t){const n=l(e,t);e[t];const o=Reflect.deleteProperty(e,t);return o&&n&&dn(e,"delete",t,void 0),o}has(e,t){const n=Reflect.has(e,t);return m(t)&&gn.has(t)||pn(e,0,t),n}ownKeys(e){return pn(e,0,f(e)?"length":ln),Reflect.ownKeys(e)}}class bn extends yn{constructor(e=!1){super(!0,e)}set(e,t){return!0}deleteProperty(e,t){return!0}}const wn=new xn,$n=new bn,Sn=new xn(!0),kn=e=>e,On=e=>Reflect.getPrototypeOf(e);function Cn(e,t,n=!1,o=!1){const r=oo(e=e.__v_raw),i=oo(t);n||(I(t,i)&&pn(r,0,t),pn(r,0,i));const{has:s}=On(r),c=o?kn:n?so:io;return s.call(r,t)?c(e.get(t)):s.call(r,i)?c(e.get(i)):void(e!==r&&e.get(t))}function Pn(e,t=!1){const n=this.__v_raw,o=oo(n),r=oo(e);return t||(I(e,r)&&pn(o,0,e),pn(o,0,r)),e===r?n.has(e):n.has(e)||n.has(r)}function En(e,t=!1){return e=e.__v_raw,!t&&pn(oo(e),0,ln),Reflect.get(e,"size",e)}function An(e){e=oo(e);const t=oo(this);return On(t).has.call(t,e)||(t.add(e),dn(t,"add",e,e)),this}function In(e,t){t=oo(t);const n=oo(this),{has:o,get:r}=On(n);let i=o.call(n,e);i||(e=oo(e),i=o.call(n,e));const s=r.call(n,e);return n.set(e,t),i?I(t,s)&&dn(n,"set",e,t):dn(n,"add",e,t),this}function jn(e){const t=oo(this),{has:n,get:o}=On(t);let r=n.call(t,e);r||(e=oo(e),r=n.call(t,e)),o&&o.call(t,e);const i=t.delete(e);return r&&dn(t,"delete",e,void 0),i}function Rn(){const e=oo(this),t=0!==e.size,n=e.clear();return t&&dn(e,"clear",void 0,void 0),n}function Ln(e,t){return function(n,o){const r=this,i=r.__v_raw,s=oo(i),c=t?kn:e?so:io;return!e&&pn(s,0,ln),i.forEach(((e,t)=>n.call(o,c(e),c(t),r)))}}function Tn(e,t,n){return function(...o){const r=this.__v_raw,i=oo(r),s=p(i),c="entries"===e||e===Symbol.iterator&&s,u="keys"===e&&s,a=r[e](...o),l=n?kn:t?so:io;return!t&&pn(i,0,u?fn:ln),{next(){const{value:e,done:t}=a.next();return t?{value:e,done:t}:{value:c?[l(e[0]),l(e[1])]:l(e),done:t}},[Symbol.iterator](){return this}}}}function Mn(e){return function(...t){return"delete"!==e&&("clear"===e?void 0:this)}}function Vn(){const e={get(e){return Cn(this,e)},get size(){return En(this)},has:Pn,add:An,set:In,delete:jn,clear:Rn,forEach:Ln(!1,!1)},t={get(e){return Cn(this,e,!1,!0)},get size(){return En(this)},has:Pn,add:An,set:In,delete:jn,clear:Rn,forEach:Ln(!1,!0)},n={get(e){return Cn(this,e,!0)},get size(){return En(this,!0)},has(e){return Pn.call(this,e,!0)},add:Mn("add"),set:Mn("set"),delete:Mn("delete"),clear:Mn("clear"),forEach:Ln(!0,!1)},o={get(e){return Cn(this,e,!0,!0)},get size(){return En(this,!0)},has(e){return Pn.call(this,e,!0)},add:Mn("add"),set:Mn("set"),delete:Mn("delete"),clear:Mn("clear"),forEach:Ln(!0,!0)};return["keys","values","entries",Symbol.iterator].forEach((r=>{e[r]=Tn(r,!1,!1),n[r]=Tn(r,!0,!1),t[r]=Tn(r,!1,!0),o[r]=Tn(r,!0,!0)})),[e,n,t,o]}const[Nn,Dn,Hn,Bn]=Vn();function Un(e,t){const n=t?e?Bn:Hn:e?Dn:Nn;return(t,o,r)=>"__v_isReactive"===o?!e:"__v_isReadonly"===o?e:"__v_raw"===o?t:Reflect.get(l(n,o)&&o in t?n:t,o,r)}const zn={get:Un(!1,!1)},Wn={get:Un(!1,!0)},Fn={get:Un(!0,!1)},Kn=new WeakMap,qn=new WeakMap,Gn=new WeakMap,Jn=new WeakMap;function Zn(e){return e.__v_skip||!Object.isExtensible(e)?0:function(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}((e=>x(e).slice(8,-1))(e))}function Qn(e){return to(e)?e:Yn(e,!1,wn,zn,Kn)}function Xn(e){return Yn(e,!0,$n,Fn,Gn)}function Yn(e,t,n,o,r){if(!v(e))return e;if(e.__v_raw&&(!t||!e.__v_isReactive))return e;const i=r.get(e);if(i)return i;const s=Zn(e);if(0===s)return e;const c=new Proxy(e,2===s?o:n);return r.set(e,c),c}function eo(e){return to(e)?eo(e.__v_raw):!(!e||!e.__v_isReactive)}function to(e){return!(!e||!e.__v_isReadonly)}function no(e){return!(!e||!e.__v_isShallow)}function oo(e){const t=e&&e.__v_raw;return t?oo(t):e}function ro(e){return Object.isExtensible(e)&&((e,t,n)=>{Object.defineProperty(e,t,{configurable:!0,enumerable:!1,value:n})})(e,"__v_skip",!0),e}const io=e=>v(e)?Qn(e):e,so=e=>v(e)?Xn(e):e;class co{constructor(e,t,n,o){this.getter=e,this._setter=t,this.dep=void 0,this.__v_isRef=!0,this.__v_isReadonly=!1,this.effect=new qt((()=>e(this._value)),(()=>ao(this,2===this.effect._dirtyLevel?2:3))),this.effect.computed=this,this.effect.active=this._cacheable=!o,this.__v_isReadonly=n}get value(){const e=oo(this);return e._cacheable&&!e.effect.dirty||!I(e._value,e._value=e.effect.run())||ao(e,4),uo(e),e.effect._dirtyLevel>=2&&ao(e,2),e._value}set value(e){this._setter(e)}get _dirty(){return this.effect.dirty}set _dirty(e){this.effect.dirty=e}}function uo(e){var t;Qt&&Ft&&(e=oo(e),rn(Ft,null!=(t=e.dep)?t:e.dep=un((()=>e.dep=void 0),e instanceof co?e:void 0)))}function ao(e,t=4,n){const o=(e=oo(e)).dep;o&&cn(o,t)}function lo(e){return!(!e||!0!==e.__v_isRef)}function fo(e){return function(e,t){if(lo(e))return e;return new po(e,t)}(e,!1)}class po{constructor(e,t){this.__v_isShallow=t,this.dep=void 0,this.__v_isRef=!0,this._rawValue=t?e:oo(e),this._value=t?e:io(e)}get value(){return uo(this),this._value}set value(e){const t=this.__v_isShallow||no(e)||to(e);e=t?e:oo(e),I(e,this._rawValue)&&(this._rawValue=e,this._value=t?e:io(e),ao(this,4))}}function ho(e){return lo(e)?e.value:e}const go={get:(e,t,n)=>ho(Reflect.get(e,t,n)),set:(e,t,n,o)=>{const r=e[t];return lo(r)&&!lo(n)?(r.value=n,!0):Reflect.set(e,t,n,o)}};function mo(e){return eo(e)?e:new Proxy(e,go)}function vo(e,t,n,o){try{return o?e(...o):e()}catch(r){yo(r,t,n)}}function _o(e,t,n,o){if(h(e)){const r=vo(e,t,n,o);return r&&_(r)&&r.catch((e=>{yo(e,t,n)})),r}const r=[];for(let i=0;i<e.length;i++)r.push(_o(e[i],t,n,o));return r}function yo(e,t,n,o=!0){t&&t.vnode;if(t){let o=t.parent;const r=t.proxy,i=`https://vuejs.org/error-reference/#runtime-${n}`;for(;o;){const t=o.ec;if(t)for(let n=0;n<t.length;n++)if(!1===t[n](e,r,i))return;o=o.parent}const s=t.appContext.config.errorHandler;if(s)return void vo(s,null,10,[e,r,i])}!function(e,t,n,o=!0){console.error(e)}(e,0,0,o)}let xo=!1,bo=!1;const wo=[];let $o=0;const So=[];let ko=null,Oo=0;const Co=Promise.resolve();let Po=null;function Eo(e){const t=Po||Co;return e?t.then(this?e.bind(this):e):t}function Ao(e){wo.length&&wo.includes(e,xo&&e.allowRecurse?$o+1:$o)||(null==e.id?wo.push(e):wo.splice(function(e){let t=$o+1,n=wo.length;for(;t<n;){const o=t+n>>>1,r=wo[o],i=Lo(r);i<e||i===e&&r.pre?t=o+1:n=o}return t}(e.id),0,e),Io())}function Io(){xo||bo||(bo=!0,Po=Co.then(Mo))}function jo(e){f(e)?So.push(...e):ko&&ko.includes(e,e.allowRecurse?Oo+1:Oo)||So.push(e),Io()}function Ro(e,t,n=(xo?$o+1:0)){for(;n<wo.length;n++){const e=wo[n];e&&e.pre&&(wo.splice(n,1),n--,e())}}const Lo=e=>null==e.id?1/0:e.id,To=(e,t)=>{const n=Lo(e)-Lo(t);if(0===n){if(e.pre&&!t.pre)return-1;if(t.pre&&!e.pre)return 1}return n};function Mo(e){bo=!1,xo=!0,wo.sort(To);try{for($o=0;$o<wo.length;$o++){const e=wo[$o];e&&!1!==e.active&&vo(e,null,14)}}finally{$o=0,wo.length=0,function(e){if(So.length){const e=[...new Set(So)].sort(((e,t)=>Lo(e)-Lo(t)));if(So.length=0,ko)return void ko.push(...e);for(ko=e,Oo=0;Oo<ko.length;Oo++)ko[Oo]();ko=null,Oo=0}}(),xo=!1,Po=null,(wo.length||So.length)&&Mo()}}function Vo(e,n,...o){if(e.isUnmounted)return;const r=e.vnode.props||t;let i=o;const s=n.startsWith("update:"),c=s&&n.slice(7);if(c&&c in r){const e=`${"modelValue"===c?"model":c}Modifiers`,{number:n,trim:s}=r[e]||t;s&&(i=o.map((e=>g(e)?e.trim():e))),n&&(i=o.map(R))}let u,a=r[u=A(n)]||r[u=A(O(n))];!a&&s&&(a=r[u=A(P(n))]),a&&_o(a,e,6,i);const l=r[u+"Once"];if(l){if(e.emitted){if(e.emitted[u])return}else e.emitted={};e.emitted[u]=!0,_o(l,e,6,i)}}function No(e,t,n=!1){const o=t.emitsCache,r=o.get(e);if(void 0!==r)return r;const i=e.emits;let s={},u=!1;if(!h(e)){const o=e=>{const n=No(e,t,!0);n&&(u=!0,c(s,n))};!n&&t.mixins.length&&t.mixins.forEach(o),e.extends&&o(e.extends),e.mixins&&e.mixins.forEach(o)}return i||u?(f(i)?i.forEach((e=>s[e]=null)):c(s,i),v(e)&&o.set(e,s),s):(v(e)&&o.set(e,null),null)}function Do(e,t){return!(!e||!i(t))&&(t=t.slice(2).replace(/Once$/,""),l(e,t[0].toLowerCase()+t.slice(1))||l(e,P(t))||l(e,t))}let Ho=null;function Bo(e){const t=Ho;return Ho=e,e&&e.type.__scopeId,t}function Uo(e,t){return e&&(e[t]||e[O(t)]||e[E(O(t))])}const zo={};function Wo(e,t,n){return Fo(e,t,n)}function Fo(e,n,{immediate:r,deep:i,flush:s,once:c,onTrack:a,onTrigger:l}=t){if(n&&c){const e=n;n=(...t)=>{e(...t),k()}}const p=Wr,d=e=>!0===i?e:Go(e,!1===i?1:void 0);let g,m,v=!1,_=!1;if(lo(e)?(g=()=>e.value,v=no(e)):eo(e)?(g=()=>d(e),v=!0):f(e)?(_=!0,v=e.some((e=>eo(e)||no(e))),g=()=>e.map((e=>lo(e)?e.value:eo(e)?d(e):h(e)?vo(e,p,2):void 0))):g=h(e)?n?()=>vo(e,p,2):()=>(m&&m(),_o(e,p,3,[y])):o,n&&i){const e=g;g=()=>Go(e())}let y=e=>{m=$.onStop=()=>{vo(e,p,4),m=$.onStop=void 0}},x=_?new Array(e.length).fill(zo):zo;const b=()=>{if($.active&&$.dirty)if(n){const e=$.run();(i||v||(_?e.some(((e,t)=>I(e,x[t]))):I(e,x)))&&(m&&m(),_o(n,p,3,[e,x===zo?void 0:_&&x[0]===zo?[]:x,y]),x=e)}else $.run()};let w;b.allowRecurse=!!n,"sync"===s?w=b:"post"===s?w=()=>Hr(b,p&&p.suspense):(b.pre=!0,p&&(b.id=p.uid),w=()=>Ao(b));const $=new qt(g,o,w),S=Wt,k=()=>{$.stop(),S&&u(S.effects,$)};return n?r?b():x=$.run():"post"===s?Hr($.run.bind($),p&&p.suspense):$.run(),k}function Ko(e,t,n){const o=this.proxy,r=g(e)?e.includes(".")?qo(o,e):()=>o[e]:e.bind(o,o);let i;h(t)?i=t:(i=t.handler,n=t);const s=Gr(this),c=Fo(r,i.bind(o),n);return s(),c}function qo(e,t){const n=t.split(".");return()=>{let t=e;for(let e=0;e<n.length&&t;e++)t=t[n[e]];return t}}function Go(e,t,n=0,o){if(!v(e)||e.__v_skip)return e;if(t&&t>0){if(n>=t)return e;n++}if((o=o||new Set).has(e))return e;if(o.add(e),lo(e))Go(e.value,t,n,o);else if(f(e))for(let r=0;r<e.length;r++)Go(e[r],t,n,o);else if(d(e)||p(e))e.forEach((e=>{Go(e,t,n,o)}));else if(b(e))for(const r in e)Go(e[r],t,n,o);return e}function Jo(){return{app:null,config:{isNativeTag:r,performance:!1,globalProperties:{},optionMergeStrategies:{},errorHandler:void 0,warnHandler:void 0,compilerOptions:{}},mixins:[],components:{},directives:{},provides:Object.create(null),optionsCache:new WeakMap,propsCache:new WeakMap,emitsCache:new WeakMap}}let Zo=0;let Qo=null;function Xo(e,t,n=!1){const o=Wr||Ho;if(o||Qo){const r=o?null==o.parent?o.vnode.appContext&&o.vnode.appContext.provides:o.parent.provides:Qo._context.provides;if(r&&e in r)return r[e];if(arguments.length>1)return n&&h(t)?t.call(o&&o.proxy):t}}function Yo(e,t){tr(e,"a",t)}function er(e,t){tr(e,"da",t)}function tr(e,t,n=Wr){const o=e.__wdc||(e.__wdc=()=>{let t=n;for(;t;){if(t.isDeactivated)return;t=t.parent}return e()});if(or(t,o,n),n){let e=n.parent;for(;e&&e.parent;)e.parent.vnode.type.__isKeepAlive&&nr(o,t,n,e),e=e.parent}}function nr(e,t,n,o){const r=or(t,e,o,!0);lr((()=>{u(o[t],r)}),n)}function or(e,t,n=Wr,o=!1){if(n){(function(e){return J.indexOf(e)>-1})(e)&&(n=n.root);const r=n[e]||(n[e]=[]),i=t.__weh||(t.__weh=(...o)=>{if(n.isUnmounted)return;en();const r=Gr(n),i=_o(t,n,e,o);return r(),tn(),i});return o?r.unshift(i):r.push(i),i}}const rr=e=>(t,n=Wr)=>(!Qr||"sp"===e)&&or(e,((...e)=>t(...e)),n),ir=rr("bm"),sr=rr("m"),cr=rr("bu"),ur=rr("u"),ar=rr("bum"),lr=rr("um"),fr=rr("sp"),pr=rr("rtg"),dr=rr("rtc");function hr(e,t=Wr){or("ec",e,t)}const gr=e=>e?Zr(e)?ei(e)||e.proxy:gr(e.parent):null,mr=c(Object.create(null),{$:e=>e,$el:e=>e.__$el||(e.__$el={}),$data:e=>e.data,$props:e=>e.props,$attrs:e=>e.attrs,$slots:e=>e.slots,$refs:e=>e.refs,$parent:e=>gr(e.parent),$root:e=>gr(e.root),$emit:e=>e.emit,$options:e=>Sr(e),$forceUpdate:e=>e.f||(e.f=()=>{e.effect.dirty=!0,Ao(e.update)}),$watch:e=>Ko.bind(e)}),vr=(e,n)=>e!==t&&!e.__isScriptSetup&&l(e,n),_r={get({_:e},n){const{ctx:o,setupState:r,data:i,props:s,accessCache:c,type:u,appContext:a}=e;let f;if("$"!==n[0]){const u=c[n];if(void 0!==u)switch(u){case 1:return r[n];case 2:return i[n];case 4:return o[n];case 3:return s[n]}else{if(vr(r,n))return c[n]=1,r[n];if(i!==t&&l(i,n))return c[n]=2,i[n];if((f=e.propsOptions[0])&&l(f,n))return c[n]=3,s[n];if(o!==t&&l(o,n))return c[n]=4,o[n];xr&&(c[n]=0)}}const p=mr[n];let d,h;return p?("$attrs"===n&&pn(e,0,n),p(e)):(d=u.__cssModules)&&(d=d[n])?d:o!==t&&l(o,n)?(c[n]=4,o[n]):(h=a.config.globalProperties,l(h,n)?h[n]:void 0)},set({_:e},n,o){const{data:r,setupState:i,ctx:s}=e;return vr(i,n)?(i[n]=o,!0):r!==t&&l(r,n)?(r[n]=o,!0):!l(e.props,n)&&(("$"!==n[0]||!(n.slice(1)in e))&&(s[n]=o,!0))},has({_:{data:e,setupState:n,accessCache:o,ctx:r,appContext:i,propsOptions:s}},c){let u;return!!o[c]||e!==t&&l(e,c)||vr(n,c)||(u=s[0])&&l(u,c)||l(r,c)||l(mr,c)||l(i.config.globalProperties,c)},defineProperty(e,t,n){return null!=n.get?e._.accessCache[t]=0:l(n,"value")&&this.set(e,t,n.value,null),Reflect.defineProperty(e,t,n)}};function yr(e){return f(e)?e.reduce(((e,t)=>(e[t]=null,e)),{}):e}let xr=!0;function br(e){const t=Sr(e),n=e.proxy,r=e.ctx;xr=!1,t.beforeCreate&&wr(t.beforeCreate,e,"bc");const{data:i,computed:s,methods:c,watch:u,provide:a,inject:l,created:p,beforeMount:d,mounted:g,beforeUpdate:m,updated:_,activated:y,deactivated:x,beforeDestroy:b,beforeUnmount:w,destroyed:$,unmounted:S,render:k,renderTracked:O,renderTriggered:C,errorCaptured:P,serverPrefetch:E,expose:A,inheritAttrs:I,components:j,directives:R,filters:L}=t;if(l&&function(e,t,n=o){f(e)&&(e=Pr(e));for(const o in e){const n=e[o];let r;r=v(n)?"default"in n?Xo(n.from||o,n.default,!0):Xo(n.from||o):Xo(n),lo(r)?Object.defineProperty(t,o,{enumerable:!0,configurable:!0,get:()=>r.value,set:e=>r.value=e}):t[o]=r}}(l,r,null),c)for(const o in c){const e=c[o];h(e)&&(r[o]=e.bind(n))}if(i){const t=i.call(n,n);v(t)&&(e.data=Qn(t))}if(xr=!0,s)for(const f in s){const e=s[f],t=h(e)?e.bind(n,n):h(e.get)?e.get.bind(n,n):o,i=!h(e)&&h(e.set)?e.set.bind(n):o,c=ti({get:t,set:i});Object.defineProperty(r,f,{enumerable:!0,configurable:!0,get:()=>c.value,set:e=>c.value=e})}if(u)for(const o in u)$r(u[o],r,n,o);function T(e,t){f(t)?t.forEach((t=>e(t.bind(n)))):t&&e(t.bind(n))}if(function(){if(a){const e=h(a)?a.call(n):a;Reflect.ownKeys(e).forEach((t=>{!function(e,t){if(Wr){let n=Wr.provides;const o=Wr.parent&&Wr.parent.provides;o===n&&(n=Wr.provides=Object.create(o)),n[e]=t,"app"===Wr.type.mpType&&Wr.appContext.app.provide(e,t)}}(t,e[t])}))}}(),p&&wr(p,e,"c"),T(ir,d),T(sr,g),T(cr,m),T(ur,_),T(Yo,y),T(er,x),T(hr,P),T(dr,O),T(pr,C),T(ar,w),T(lr,S),T(fr,E),f(A))if(A.length){const t=e.exposed||(e.exposed={});A.forEach((e=>{Object.defineProperty(t,e,{get:()=>n[e],set:t=>n[e]=t})}))}else e.exposed||(e.exposed={});k&&e.render===o&&(e.render=k),null!=I&&(e.inheritAttrs=I),j&&(e.components=j),R&&(e.directives=R),e.ctx.$onApplyOptions&&e.ctx.$onApplyOptions(t,e,n)}function wr(e,t,n){_o(f(e)?e.map((e=>e.bind(t.proxy))):e.bind(t.proxy),t,n)}function $r(e,t,n,o){const r=o.includes(".")?qo(n,o):()=>n[o];if(g(e)){const n=t[e];h(n)&&Wo(r,n)}else if(h(e))Wo(r,e.bind(n));else if(v(e))if(f(e))e.forEach((e=>$r(e,t,n,o)));else{const o=h(e.handler)?e.handler.bind(n):t[e.handler];h(o)&&Wo(r,o,e)}}function Sr(e){const t=e.type,{mixins:n,extends:o}=t,{mixins:r,optionsCache:i,config:{optionMergeStrategies:s}}=e.appContext,c=i.get(t);let u;return c?u=c:r.length||n||o?(u={},r.length&&r.forEach((e=>kr(u,e,s,!0))),kr(u,t,s)):u=t,v(t)&&i.set(t,u),u}function kr(e,t,n,o=!1){const{mixins:r,extends:i}=t;i&&kr(e,i,n,!0),r&&r.forEach((t=>kr(e,t,n,!0)));for(const s in t)if(o&&"expose"===s);else{const o=Or[s]||n&&n[s];e[s]=o?o(e[s],t[s]):t[s]}return e}const Or={data:Cr,props:Ir,emits:Ir,methods:Ar,computed:Ar,beforeCreate:Er,created:Er,beforeMount:Er,mounted:Er,beforeUpdate:Er,updated:Er,beforeDestroy:Er,beforeUnmount:Er,destroyed:Er,unmounted:Er,activated:Er,deactivated:Er,errorCaptured:Er,serverPrefetch:Er,components:Ar,directives:Ar,watch:function(e,t){if(!e)return t;if(!t)return e;const n=c(Object.create(null),e);for(const o in t)n[o]=Er(e[o],t[o]);return n},provide:Cr,inject:function(e,t){return Ar(Pr(e),Pr(t))}};function Cr(e,t){return t?e?function(){return c(h(e)?e.call(this,this):e,h(t)?t.call(this,this):t)}:t:e}function Pr(e){if(f(e)){const t={};for(let n=0;n<e.length;n++)t[e[n]]=e[n];return t}return e}function Er(e,t){return e?[...new Set([].concat(e,t))]:t}function Ar(e,t){return e?c(Object.create(null),e,t):t}function Ir(e,t){return e?f(e)&&f(t)?[...new Set([...e,...t])]:c(Object.create(null),yr(e),yr(null!=t?t:{})):t}function jr(e,t,n,o=!1){const r={},i={};e.propsDefaults=Object.create(null),Rr(e,t,r,i);for(const s in e.propsOptions[0])s in r||(r[s]=void 0);n?e.props=o?r:Yn(r,!1,Sn,Wn,qn):e.type.props?e.props=r:e.props=i,e.attrs=i}function Rr(e,n,o,r){const[i,s]=e.propsOptions;let c,u=!1;if(n)for(let t in n){if($(t))continue;const a=n[t];let f;i&&l(i,f=O(t))?s&&s.includes(f)?(c||(c={}))[f]=a:o[f]=a:Do(e.emitsOptions,t)||t in r&&a===r[t]||(r[t]=a,u=!0)}if(s){const n=oo(o),r=c||t;for(let t=0;t<s.length;t++){const c=s[t];o[c]=Lr(i,n,c,r[c],e,!l(r,c))}}return u}function Lr(e,t,n,o,r,i){const s=e[n];if(null!=s){const e=l(s,"default");if(e&&void 0===o){const e=s.default;if(s.type!==Function&&!s.skipFactory&&h(e)){const{propsDefaults:i}=r;if(n in i)o=i[n];else{const s=Gr(r);o=i[n]=e.call(null,t),s()}}else o=e}s[0]&&(i&&!e?o=!1:!s[1]||""!==o&&o!==P(n)||(o=!0))}return o}function Tr(e,o,r=!1){const i=o.propsCache,s=i.get(e);if(s)return s;const u=e.props,a={},p=[];let d=!1;if(!h(e)){const t=e=>{d=!0;const[t,n]=Tr(e,o,!0);c(a,t),n&&p.push(...n)};!r&&o.mixins.length&&o.mixins.forEach(t),e.extends&&t(e.extends),e.mixins&&e.mixins.forEach(t)}if(!u&&!d)return v(e)&&i.set(e,n),n;if(f(u))for(let n=0;n<u.length;n++){const e=O(u[n]);Mr(e)&&(a[e]=t)}else if(u)for(const t in u){const e=O(t);if(Mr(e)){const n=u[t],o=a[e]=f(n)||h(n)?{type:n}:c({},n);if(o){const t=Dr(Boolean,o.type),n=Dr(String,o.type);o[0]=t>-1,o[1]=n<0||t<n,(t>-1||l(o,"default"))&&p.push(e)}}}const g=[a,p];return v(e)&&i.set(e,g),g}function Mr(e){return"$"!==e[0]&&!$(e)}function Vr(e){if(null===e)return"null";if("function"==typeof e)return e.name||"";if("object"==typeof e){return e.constructor&&e.constructor.name||""}return""}function Nr(e,t){return Vr(e)===Vr(t)}function Dr(e,t){return f(t)?t.findIndex((t=>Nr(t,e))):h(t)&&Nr(t,e)?0:-1}const Hr=jo,Br=Jo();let Ur=0;function zr(e,n,o){const r=e.type,i=(n?n.appContext:e.appContext)||Br,s={uid:Ur++,vnode:e,type:r,parent:n,appContext:i,root:null,next:null,subTree:null,effect:null,update:null,scope:new Kt(!0),render:null,proxy:null,exposed:null,exposeProxy:null,withProxy:null,provides:n?n.provides:Object.create(i.provides),accessCache:null,renderCache:[],components:null,directives:null,propsOptions:Tr(r,i),emitsOptions:No(r,i),emit:null,emitted:null,propsDefaults:t,inheritAttrs:r.inheritAttrs,ctx:t,data:t,props:t,attrs:t,slots:t,refs:t,setupState:t,setupContext:null,attrsProxy:null,slotsProxy:null,suspense:o,suspenseId:o?o.pendingId:0,asyncDep:null,asyncResolved:!1,isMounted:!1,isUnmounted:!1,isDeactivated:!1,bc:null,c:null,bm:null,m:null,bu:null,u:null,um:null,bum:null,da:null,a:null,rtg:null,rtc:null,ec:null,sp:null,$uniElements:new Map,$templateUniElementRefs:[],$templateUniElementStyles:{},$eS:{}};return s.ctx={_:s},s.root=n?n.root:s,s.emit=Vo.bind(null,s),e.ce&&e.ce(s),s}let Wr=null;const Fr=()=>Wr||Ho;let Kr,qr;Kr=e=>{Wr=e},qr=e=>{Qr=e};const Gr=e=>{const t=Wr;return Kr(e),e.scope.on(),()=>{e.scope.off(),Kr(t)}},Jr=()=>{Wr&&Wr.scope.off(),Kr(null)};function Zr(e){return 4&e.vnode.shapeFlag}let Qr=!1;function Xr(e,t=!1){t&&qr(t);const{props:n}=e.vnode,o=Zr(e);jr(e,n,o,t);const r=o?function(e,t){const n=e.type;e.accessCache=Object.create(null),e.proxy=ro(new Proxy(e.ctx,_r));const{setup:o}=n;if(o){const t=e.setupContext=o.length>1?function(e){const t=t=>{e.exposed=t||{}};return{get attrs(){return function(e){return e.attrsProxy||(e.attrsProxy=new Proxy(e.attrs,{get:(t,n)=>(pn(e,0,"$attrs"),t[n])}))}(e)},slots:e.slots,emit:e.emit,expose:t}}(e):null,n=Gr(e);en();const r=vo(o,e,0,[e.props,t]);tn(),n(),_(r)?r.then(Jr,Jr):function(e,t,n){h(t)?e.render=t:v(t)&&(e.setupState=mo(t));Yr(e)}(e,r)}else Yr(e)}(e):void 0;return t&&qr(!1),r}function Yr(e,t,n){const r=e.type;e.render||(e.render=r.render||o);{const t=Gr(e);en();try{br(e)}finally{tn(),t()}}}function ei(e){if(e.exposed)return e.exposeProxy||(e.exposeProxy=new Proxy(mo(ro(e.exposed)),{get:(t,n)=>n in t?t[n]:e.proxy[n],has:(e,t)=>t in e||t in mr}))}const ti=(e,t)=>{const n=function(e,t,n=!1){let r,i;const s=h(e);return s?(r=e,i=o):(r=e.get,i=e.set),new co(r,i,s||!i,n)}(e,0,Qr);return n},ni="3.4.21";function oi(e){return ho(e)}const ri="[object Array]",ii="[object Object]";function si(e,t){const n={};return ci(e,t),ui(e,t,"",n),n}function ci(e,t){if((e=oi(e))===t)return;const n=x(e),o=x(t);if(n==ii&&o==ii)for(let r in t){const n=e[r];void 0===n?e[r]=null:ci(n,t[r])}else n==ri&&o==ri&&e.length>=t.length&&t.forEach(((t,n)=>{ci(e[n],t)}))}function ui(e,t,n,o){if((e=oi(e))===t)return;const r=x(e),i=x(t);if(r==ii)if(i!=ii||Object.keys(e).length<Object.keys(t).length)ai(o,n,e);else for(let s in e){const r=oi(e[s]),i=t[s],c=x(r),u=x(i);if(c!=ri&&c!=ii)r!=i&&ai(o,(""==n?"":n+".")+s,r);else if(c==ri)u!=ri||r.length<i.length?ai(o,(""==n?"":n+".")+s,r):r.forEach(((e,t)=>{ui(e,i[t],(""==n?"":n+".")+s+"["+t+"]",o)}));else if(c==ii)if(u!=ii||Object.keys(r).length<Object.keys(i).length)ai(o,(""==n?"":n+".")+s,r);else for(let e in r)ui(r[e],i[e],(""==n?"":n+".")+s+"."+e,o)}else r==ri?i!=ri||e.length<t.length?ai(o,n,e):e.forEach(((e,r)=>{ui(e,t[r],n+"["+r+"]",o)})):ai(o,n,e)}function ai(e,t,n){e[t]=n}function li(e){const t=e.ctx.__next_tick_callbacks;if(t&&t.length){const e=t.slice(0);t.length=0;for(let t=0;t<e.length;t++)e[t]()}}function fi(e,t){const n=e.ctx;if(!n.__next_tick_pending&&!function(e){return wo.includes(e.update)}(e))return Eo(t&&t.bind(e.proxy));let o;return n.__next_tick_callbacks||(n.__next_tick_callbacks=[]),n.__next_tick_callbacks.push((()=>{t?vo(t.bind(e.proxy),e,14):o&&o(e.proxy)})),new Promise((e=>{o=e}))}function pi(e,t){const n=typeof(e=oi(e));if("object"===n&&null!==e){let n=t.get(e);if(void 0!==n)return n;if(f(e)){const o=e.length;n=new Array(o),t.set(e,n);for(let r=0;r<o;r++)n[r]=pi(e[r],t)}else{n={},t.set(e,n);for(const o in e)l(e,o)&&(n[o]=pi(e[o],t))}return n}if("symbol"!==n)return e}function di(e){return pi(e,"undefined"!=typeof WeakMap?new WeakMap:new Map)}function hi(e,t,n){if(!t)return;(t=di(t)).$eS=e.$eS||{};const o=e.ctx,r=o.mpType;if("page"===r||"component"===r){t.r0=1;const r=o.$scope,i=Object.keys(t),s=si(t,n||function(e,t){const n=e.data,o=Object.create(null);return t.forEach((e=>{o[e]=n[e]})),o}(r,i));Object.keys(s).length?(o.__next_tick_pending=!0,r.setData(s,(()=>{o.__next_tick_pending=!1,li(e)})),Ro()):li(e)}}function gi(e,t,n){t.appContext.config.globalProperties.$applyOptions(e,t,n);const o=e.computed;if(o){const e=Object.keys(o);if(e.length){const n=t.ctx;n.$computedKeys||(n.$computedKeys=[]),n.$computedKeys.push(...e)}}delete t.ctx.$onApplyOptions}function mi(e,t=!1){const{setupState:n,$templateRefs:o,$templateUniElementRefs:r,ctx:{$scope:i,$mpPlatform:s}}=e;if("mp-alipay"===s)return;if(!i||!o&&!r)return;if(t)return o&&o.forEach((e=>vi(e,null,n))),void(r&&r.forEach((e=>vi(e,null,n))));const c="mp-baidu"===s||"mp-toutiao"===s,u=e=>{if(0===e.length)return[];const t=(i.selectAllComponents(".r")||[]).concat(i.selectAllComponents(".r-i-f")||[]);return e.filter((e=>{const o=function(e,t){const n=e.find((e=>e&&(e.properties||e.props).uI===t));if(n){const e=n.$vm;return e?ei(e.$)||e:function(e){v(e)&&ro(e);return e}(n)}return null}(t,e.i);return!(!c||null!==o)||(vi(e,o,n),!1)}))},a=()=>{if(o){const t=u(o);t.length&&e.proxy&&e.proxy.$scope&&e.proxy.$scope.setData({r1:1},(()=>{u(t)}))}};r&&r.length&&fi(e,(()=>{r.forEach((e=>{f(e.v)?e.v.forEach((t=>{vi(e,t,n)})):vi(e,e.v,n)}))})),i._$setRef?i._$setRef(a):fi(e,a)}function vi({r:e,f:t},n,o){if(h(e))e(n,{});else{const r=g(e),i=lo(e);if(r||i)if(t){if(!i)return;f(e.value)||(e.value=[]);const t=e.value;if(-1===t.indexOf(n)){if(t.push(n),!n)return;n.$&&ar((()=>u(t,n)),n.$)}}else r?l(o,e)&&(o[e]=n):lo(e)&&(e.value=n)}}const _i=jo;function yi(e,t){const n=e.component=zr(e,t.parentComponent,null);return n.ctx.$onApplyOptions=gi,n.ctx.$children=[],"app"===t.mpType&&(n.render=o),t.onBeforeSetup&&t.onBeforeSetup(n,t),Xr(n),t.parentComponent&&n.proxy&&t.parentComponent.ctx.$children.push(ei(n)||n.proxy),function(e){const t=wi.bind(e);e.$updateScopedSlots=()=>Eo((()=>Ao(t)));const n=()=>{if(e.isMounted){const{next:t,bu:n,u:o}=e;$i(e,!1),en(),Ro(),tn(),n&&j(n),$i(e,!0),hi(e,xi(e)),o&&_i(o)}else ar((()=>{mi(e,!0)}),e),hi(e,xi(e))},r=e.effect=new qt(n,o,(()=>Ao(i)),e.scope),i=e.update=()=>{r.dirty&&r.run()};i.id=e.uid,$i(e,!0),i()}(n),n.proxy}function xi(e){const{type:t,vnode:n,proxy:o,withProxy:r,props:s,propsOptions:[c],slots:u,attrs:a,emit:l,render:f,renderCache:p,data:d,setupState:h,ctx:g,uid:m,appContext:{app:{config:{globalProperties:{pruneComponentPropsCache:v}}}},inheritAttrs:_}=e;let y;e.$uniElementIds=new Map,e.$templateRefs=[],e.$templateUniElementRefs=[],e.$templateUniElementStyles={},e.$ei=0,v(m),e.__counter=0===e.__counter?1:0;const x=Bo(e);try{if(4&n.shapeFlag){bi(_,s,c,a);const e=r||o;y=f.call(e,e,p,s,h,d,g)}else{bi(_,s,c,t.props?a:(e=>{let t;for(const n in e)("class"===n||"style"===n||i(n))&&((t||(t={}))[n]=e[n]);return t})(a));const e=t;y=e.length>1?e(s,{attrs:a,slots:u,emit:l}):e(s,null)}}catch(b){yo(b,e,1),y=!1}return mi(e),Bo(x),y}function bi(e,t,n,o){if(t&&o&&!1!==e){const e=Object.keys(o).filter((e=>"class"!==e&&"style"!==e));if(!e.length)return;n&&e.some(s)?e.forEach((e=>{s(e)&&e.slice(9)in n||(t[e]=o[e])})):e.forEach((e=>t[e]=o[e]))}}function wi(){const e=this.$scopedSlotsData;if(!e||0===e.length)return;const t=this.ctx.$scope,n=t.data,o=Object.create(null);e.forEach((({path:e,index:t,data:r})=>{const i=W(n,e),s=g(t)?`${e}.${t}`:`${e}[${t}]`;if(void 0===i||void 0===i[t])o[s]=r;else{const e=si(r,i[t]);Object.keys(e).forEach((t=>{o[s+"."+t]=e[t]}))}})),e.length=0,Object.keys(o).length&&t.setData(o)}function $i({effect:e,update:t},n){e.allowRecurse=t.allowRecurse=n}const Si=function(e,t=null){h(e)||(e=c({},e)),null==t||v(t)||(t=null);const n=Jo(),o=new WeakSet,r=n.app={_uid:Zo++,_component:e,_props:t,_container:null,_context:n,_instance:null,version:ni,get config(){return n.config},set config(e){},use:(e,...t)=>(o.has(e)||(e&&h(e.install)?(o.add(e),e.install(r,...t)):h(e)&&(o.add(e),e(r,...t))),r),mixin:e=>(n.mixins.includes(e)||n.mixins.push(e),r),component:(e,t)=>t?(n.components[e]=t,r):n.components[e],directive:(e,t)=>t?(n.directives[e]=t,r):n.directives[e],mount(){},unmount(){},provide:(e,t)=>(n.provides[e]=t,r),runWithContext(e){const t=Qo;Qo=r;try{return e()}finally{Qo=t}}};return r};function ki(e,t=null){("undefined"!=typeof window?window:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof global?global:"undefined"!=typeof my?my:void 0).__VUE__=!0;const n=Si(e,t),r=n._context;r.config.globalProperties.$nextTick=function(e){return fi(this.$,e)};const i=e=>(e.appContext=r,e.shapeFlag=6,e),s=function(e,t){return yi(i(e),t)},c=function(e){return e&&function(e){const{bum:t,scope:n,update:o,um:r}=e;t&&j(t);{const t=e.parent;if(t){const n=t.ctx.$children,o=ei(e)||e.proxy,r=n.indexOf(o);r>-1&&n.splice(r,1)}}n.stop(),o&&(o.active=!1),r&&_i(r),_i((()=>{e.isUnmounted=!0}))}(e.$)};return n.mount=function(){e.render=o;const t=yi(i({type:e}),{mpType:"app",mpInstance:null,parentComponent:null,slots:[],props:null});return n._instance=t.$,t.$app=n,t.$createComponent=s,t.$destroyComponent=c,r.$appInstance=t,t},n.unmount=function(){},n}function Oi(e,t,n,o){h(t)&&or(e,t.bind(n),o)}function Ci(e,t,n){!function(e,t,n){const o=e.mpType||n.$mpType;o&&"component"!==o&&Object.keys(e).forEach((o=>{if(X(o,e[o],!1)){const r=e[o];f(r)?r.forEach((e=>Oi(o,e,n,t))):Oi(o,r,n,t)}}))}(e,t,n)}function Pi(e,t,n){return e[t]=n}function Ei(e,...t){const n=this[e];return n?n(...t):(console.error(`method ${e} not found`),null)}function Ai(e){return function(t,n,o){if(!n)throw t;const r=e._instance;if(!r||!r.proxy)throw t;r.proxy.$callHook("onError",t)}}function Ii(e,t){return e?[...new Set([].concat(e,t))]:t}let ji;const Ri="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",Li=/^(?:[A-Za-z\d+/]{4})*?(?:[A-Za-z\d+/]{2}(?:==)?|[A-Za-z\d+/]{3}=?)?$/;function Ti(){const e=zt.getStorageSync("uni_id_token")||"",t=e.split(".");if(!e||3!==t.length)return{uid:null,role:[],permission:[],tokenExpired:0};let n;try{n=JSON.parse((o=t[1],decodeURIComponent(ji(o).split("").map((function(e){return"%"+("00"+e.charCodeAt(0).toString(16)).slice(-2)})).join(""))))}catch(r){throw new Error("获取当前用户信息出错，详细错误信息为："+r.message)}var o;return n.tokenExpired=1e3*n.exp,delete n.exp,delete n.iat,n}function Mi(e){const t=e._context.config;var n;t.errorHandler=te(e,Ai),n=t.optionMergeStrategies,Z.forEach((e=>{n[e]=Ii}));const o=t.globalProperties;!function(e){e.uniIDHasRole=function(e){const{role:t}=Ti();return t.indexOf(e)>-1},e.uniIDHasPermission=function(e){const{permission:t}=Ti();return this.uniIDHasRole("admin")||t.indexOf(e)>-1},e.uniIDTokenValid=function(){const{tokenExpired:e}=Ti();return e>Date.now()}}(o),o.$set=Pi,o.$applyOptions=Ci,o.$callMethod=Ei,zt.invokeCreateVueAppHook(e)}ji="function"!=typeof atob?function(e){if(e=String(e).replace(/[\t\n\f\r ]+/g,""),!Li.test(e))throw new Error("Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");var t;e+="==".slice(2-(3&e.length));for(var n,o,r="",i=0;i<e.length;)t=Ri.indexOf(e.charAt(i++))<<18|Ri.indexOf(e.charAt(i++))<<12|(n=Ri.indexOf(e.charAt(i++)))<<6|(o=Ri.indexOf(e.charAt(i++))),r+=64===n?String.fromCharCode(t>>16&255):64===o?String.fromCharCode(t>>16&255,t>>8&255):String.fromCharCode(t>>16&255,t>>8&255,255&t);return r}:atob;const Vi=Object.create(null);function Ni(e){delete Vi[e]}function Di(e){if(!e)return;const[t,n]=e.split(",");return Vi[t]?Vi[t][parseInt(n)]:void 0}var Hi={install(e){Mi(e),e.config.globalProperties.pruneComponentPropsCache=Ni;const t=e.mount;e.mount=function(n){const o=t.call(e,n),r=function(){const e="createSubpackageApp";if("undefined"!=typeof global&&void 0!==global[e])return global[e];if("undefined"!=typeof my)return my[e]}();return r?r(o):"undefined"!=typeof createMiniProgramApp&&createMiniProgramApp(o),o}}};function Bi(e,t){const n=Fr(),r=n.ctx,i=void 0===t||"mp-weixin"!==r.$mpPlatform&&"mp-qq"!==r.$mpPlatform&&"mp-xhs"!==r.$mpPlatform||!g(t)&&"number"!=typeof t?"":"_"+t,s="e"+n.$ei+++i,u=r.$scope;if(!e)return delete u[s],s;const a=u[s];return a?a.value=e:u[s]=function(e,t){const n=e=>{var r;(r=e).type&&r.target&&(r.preventDefault=o,r.stopPropagation=o,r.stopImmediatePropagation=o,l(r,"detail")||(r.detail={}),l(r,"markerId")&&(r.detail="object"==typeof r.detail?r.detail:{},r.detail.markerId=r.markerId),b(r.detail)&&l(r.detail,"checked")&&!l(r.detail,"value")&&(r.detail.value=r.detail.checked),b(r.detail)&&(r.target=c({},r.target,r.detail)));let i=[e];t&&t.ctx.$getTriggerEventDetail&&"number"==typeof e.detail&&(e.detail=t.ctx.$getTriggerEventDetail(e.detail)),e.detail&&e.detail.__args__&&(i=e.detail.__args__);const s=n.value,u=()=>_o(function(e,t){if(f(t)){const n=e.stopImmediatePropagation;return e.stopImmediatePropagation=()=>{n&&n.call(e),e._stopped=!0},t.map((e=>t=>!t._stopped&&e(t)))}return t}(e,s),t,5,i),a=e.target,p=!!a&&(!!a.dataset&&"true"===String(a.dataset.eventsync));if(!Ui.includes(e.type)||p){const t=u();if("input"===e.type&&(f(t)||_(t)))return;return t}setTimeout(u)};return n.value=e,n}(e,n),s}const Ui=["tap","longpress","longtap","transitionend","animationstart","animationiteration","animationend","touchforcechange"];function zi(e){return g(e)?e:function(e){let t="";if(!e||g(e))return t;for(const n in e)t+=`${n.startsWith("--")?n:P(n)}:${e[n]};`;return t}(T(e))}const Wi=function(e,t=null){return e&&(e.mpType="app"),ki(e,t).use(Hi)};const Fi=["externalClasses"];const Ki=/_(.*)_worklet_factory_/;function qi(e,t){const n=e.$children;for(let r=n.length-1;r>=0;r--){const e=n[r];if(e.$scope._$vueId===t)return e}let o;for(let r=n.length-1;r>=0;r--)if(o=qi(n[r],t),o)return o}const Gi=["createSelectorQuery","createIntersectionObserver","selectAllComponents","selectComponent"];function Ji(e,t){const n=e.ctx;n.mpType=t.mpType,n.$mpType=t.mpType,n.$mpPlatform="mp-weixin",n.$scope=t.mpInstance,n.$mp={},n._self={},e.slots={},f(t.slots)&&t.slots.length&&(t.slots.forEach((t=>{e.slots[t]=!0})),e.slots.d&&(e.slots.default=!0)),n.getOpenerEventChannel=function(){return t.mpInstance.getOpenerEventChannel()},n.$hasHook=Zi,n.$callHook=Qi,e.emit=function(e,t){return function(n,...o){const r=t.$scope;if(r&&n){const e={__args__:o};r.triggerEvent(n,e)}return e.apply(this,[n,...o])}}(e.emit,n)}function Zi(e){const t=this.$[e];return!(!t||!t.length)}function Qi(e,t){"mounted"===e&&(Qi.call(this,"bm"),this.$.isMounted=!0,e="m");const n=this.$[e];return n&&((e,t)=>{let n;for(let o=0;o<e.length;o++)n=e[o](t);return n})(n,t)}const Xi=["onLoad","onShow","onHide","onUnload","onResize","onTabItemTap","onReachBottom","onPullDownRefresh","onAddToFavorites"];function Yi(e,t=new Set){if(e){Object.keys(e).forEach((n=>{X(n,e[n])&&t.add(n)}));{const{extends:n,mixins:o}=e;o&&o.forEach((e=>Yi(e,t))),n&&Yi(n,t)}}return t}function es(e,t,n){-1!==n.indexOf(t)||l(e,t)||(e[t]=function(e){return this.$vm&&this.$vm.$callHook(t,e)})}const ts=["onReady"];function ns(e,t,n=ts){t.forEach((t=>es(e,t,n)))}function os(e,t,n=ts){Yi(t).forEach((t=>es(e,t,n)))}const rs=z((()=>{const e=[],t=h(getApp)&&getApp({allowDefault:!0});if(t&&t.$vm&&t.$vm.$){const n=t.$vm.$.appContext.mixins;if(f(n)){const t=Object.keys(Q);n.forEach((n=>{t.forEach((t=>{l(n,t)&&!e.includes(t)&&e.push(t)}))}))}}return e}));const is=["onShow","onHide","onError","onThemeChange","onPageNotFound","onUnhandledRejection"];function ss(e,t){const n=e.$,o={globalData:e.$options&&e.$options.globalData||{},$vm:e,onLaunch(t){this.$vm=e;const o=n.ctx;this.$vm&&o.$scope&&o.$callHook||(Ji(n,{mpType:"app",mpInstance:this,slots:[]}),o.globalData=this.globalData,e.$callHook("onLaunch",t))}},{onError:r}=n;r&&(n.appContext.config.errorHandler=t=>{e.$callHook("onError",t)}),function(e){const t=fo(re(wx.getSystemInfoSync().language)||"en");Object.defineProperty(e,"$locale",{get:()=>t.value,set(e){t.value=e}})}(e);const i=e.$.type;ns(o,is),os(o,i);{const e=i.methods;e&&c(o,e)}return o}function cs(e,t){if(h(e.onLaunch)){const t=wx.getLaunchOptionsSync&&wx.getLaunchOptionsSync();e.onLaunch(t)}h(e.onShow)&&wx.onAppShow&&wx.onAppShow((e=>{t.$callHook("onShow",e)})),h(e.onHide)&&wx.onAppHide&&wx.onAppHide((e=>{t.$callHook("onHide",e)}))}const us=["eO","uR","uRIF","uI","uT","uP","uS"];function as(e){e.properties||(e.properties={}),c(e.properties,function(e,t=!1){const n={};if(!t){let e=function(e){const t=Object.create(null);e&&e.forEach((e=>{t[e]=!0})),this.setData({$slots:t})};us.forEach((e=>{n[e]={type:null,value:""}})),n.uS={type:null,value:[]},n.uS.observer=e}return e.behaviors&&e.behaviors.includes("wx://form-field")&&(e.properties&&e.properties.name||(n.name={type:null,value:""}),e.properties&&e.properties.value||(n.value={type:null,value:""})),n}(e),function(e){const t={};return e&&e.virtualHost&&(t.virtualHostStyle={type:null,value:""},t.virtualHostClass={type:null,value:""}),t}(e.options))}const ls=[String,Number,Boolean,Object,Array,null];function fs(e,t){const n=function(e,t){return f(e)&&1===e.length?e[0]:e}(e);return-1!==ls.indexOf(n)?n:null}function ps(e,t){return(t?function(e){const t={};b(e)&&Object.keys(e).forEach((n=>{-1===us.indexOf(n)&&(t[n]=e[n])}));return t}(e):Di(e.uP))||{}}function ds(e){const t=function(){const e=this.properties.uP;e&&(this.$vm?function(e,t){const n=oo(t.props),o=Di(e)||{};hs(n,o)&&(!function(e,t,n,o){const{props:r,attrs:i,vnode:{patchFlag:s}}=e,c=oo(r),[u]=e.propsOptions;let a=!1;if(!(o||s>0)||16&s){let o;Rr(e,t,r,i)&&(a=!0);for(const i in c)t&&(l(t,i)||(o=P(i))!==i&&l(t,o))||(u?!n||void 0===n[i]&&void 0===n[o]||(r[i]=Lr(u,c,i,void 0,e,!0)):delete r[i]);if(i!==c)for(const e in i)t&&l(t,e)||(delete i[e],a=!0)}else if(8&s){const n=e.vnode.dynamicProps;for(let o=0;o<n.length;o++){let s=n[o];if(Do(e.emitsOptions,s))continue;const f=t[s];if(u)if(l(i,s))f!==i[s]&&(i[s]=f,a=!0);else{const t=O(s);r[t]=Lr(u,c,t,f,e,!1)}else f!==i[s]&&(i[s]=f,a=!0)}}a&&dn(e,"set","$attrs")}(t,o,n,!1),r=t.update,wo.indexOf(r)>-1&&function(e){const t=wo.indexOf(e);t>$o&&wo.splice(t,1)}(t.update),t.update());var r}(e,this.$vm.$):"m"===this.properties.uT&&function(e,t){const n=t.properties,o=Di(e)||{};hs(n,o,!1)&&t.setData(o)}(e,this))};e.observers||(e.observers={}),e.observers.uP=t}function hs(e,t,n=!0){const o=Object.keys(t);if(n&&o.length!==Object.keys(e).length)return!0;for(let r=0;r<o.length;r++){const n=o[r];if(t[n]!==e[n])return!0}return!1}function gs(e,t){e.data={},e.behaviors=function(e){const t=e.behaviors;let n=e.props;n||(e.props=n=[]);const o=[];return f(t)&&t.forEach((e=>{o.push(e.replace("uni://","wx://")),"uni://form-field"===e&&(f(n)?(n.push("name"),n.push("modelValue")):(n.name={type:String,default:""},n.modelValue={type:[String,Number,Boolean,Array,Object,Date],default:""}))})),o}(t)}function ms(e,{parse:t,mocks:n,isPage:o,initRelation:r,handleLink:i,initLifetimes:s}){e=e.default||e;const u={multipleSlots:!0,addGlobalClass:!0,pureDataPattern:/^uP$/};f(e.mixins)&&e.mixins.forEach((e=>{v(e.options)&&c(u,e.options)})),e.options&&c(u,e.options);const a={options:u,lifetimes:s({mocks:n,isPage:o,initRelation:r,vueOptions:e}),pageLifetimes:{show(){this.$vm&&this.$vm.$callHook("onPageShow")},hide(){this.$vm&&this.$vm.$callHook("onPageHide")},resize(e){this.$vm&&this.$vm.$callHook("onPageResize",e)}},methods:{__l:i}};var p,d,h,g;return gs(a,e),as(a),ds(a),function(e,t){Fi.forEach((n=>{l(t,n)&&(e[n]=t[n])}))}(a,e),p=a.methods,d=e.wxsCallMethods,f(d)&&d.forEach((e=>{p[e]=function(t){return this.$vm[e](t)}})),h=a.methods,(g=e.methods)&&Object.keys(g).forEach((e=>{const t=e.match(Ki);if(t){const n=t[1];h[e]=g[e],h[n]=g[n]}})),t&&t(a,{handleLink:i}),a}let vs,_s;function ys(){return wx.$subpackages.subPackageCheckPoint.$vm}function xs(e,t){const{parse:n,mocks:o,isPage:r,initRelation:i,handleLink:s,initLifetimes:c}=t,u=ms(e,{mocks:o,isPage:r,initRelation:i,handleLink:s,initLifetimes:c});!function({properties:e},t){f(t)?t.forEach((t=>{e[t]={type:String,value:""}})):b(t)&&Object.keys(t).forEach((n=>{const o=t[n];if(b(o)){let t=o.default;h(t)&&(t=t());const r=o.type;o.type=fs(r),e[n]={type:o.type,value:t}}else e[n]={type:fs(o)}}))}(u,(e.default||e).props);const a=u.methods;return a.onLoad=function(e){var t;return this.options=e,this.$page={fullPath:(t=this.route+G(e),function(e){return 0===e.indexOf("/")}(t)?t:"/"+t)},this.$vm&&this.$vm.$callHook("onLoad",e)},ns(a,Xi),os(a,e),function(e,t){if(!t)return;Object.keys(Q).forEach((n=>{t&Q[n]&&es(e,n,[])}))}(a,e.__runtimeHooks),ns(a,rs()),n&&n(u,{handleLink:s}),u}const bs=Page,ws=Component;function $s(e){const t=e.triggerEvent,n=function(n,...o){return t.apply(e,[(r=n,O(r.replace(K,"-"))),...o]);var r};try{e.triggerEvent=n}catch(o){e._triggerEvent=n}}function Ss(e,t,n){const o=t[e];t[e]=o?function(...e){return $s(this),o.apply(this,e)}:function(){$s(this)}}Page=function(e){return Ss("onLoad",e),bs(e)},Component=function(e){Ss("created",e);return e.properties&&e.properties.uP||(as(e),ds(e)),ws(e)};var ks=Object.freeze({__proto__:null,handleLink:function(e){const t=e.detail||e.value,n=t.vuePid;let o;n&&(o=qi(this.$vm,n)),o||(o=this.$vm),t.parent=o},initLifetimes:function({mocks:e,isPage:t,initRelation:n,vueOptions:o}){return{attached(){let r=this.properties;!function(e,t){if(!e)return;const n=e.split(","),o=n.length;1===o?t._$vueId=n[0]:2===o&&(t._$vueId=n[0],t._$vuePid=n[1])}(r.uI,this);const i={vuePid:this._$vuePid};n(this,i);const s=this,c=t(s);let u=r;this.$vm=function(e,t){vs||(vs=ys().$createComponent);const n=vs(e,t);return ei(n.$)||n}({type:o,props:ps(u,c)},{mpType:c?"page":"component",mpInstance:s,slots:r.uS||{},parentComponent:i.parent&&i.parent.$,onBeforeSetup(t,n){!function(e,t){Object.defineProperty(e,"refs",{get(){const e={};return function(e,t,n){e.selectAllComponents(t).forEach((e=>{const t=e.properties.uR;n[t]=e.$vm||e}))}(t,".r",e),t.selectAllComponents(".r-i-f").forEach((t=>{const n=t.properties.uR;n&&(e[n]||(e[n]=[]),e[n].push(t.$vm||t))})),e}})}(t,s),function(e,t,n){const o=e.ctx;n.forEach((n=>{l(t,n)&&(e[n]=o[n]=t[n])}))}(t,s,e),function(e,t){Ji(e,t);const n=e.ctx;Gi.forEach((e=>{n[e]=function(...t){const o=n.$scope;if(o&&o[e])return o[e].apply(o,t)}}))}(t,n)}}),c||function(e){const t=e.$options;f(t.behaviors)&&t.behaviors.includes("uni://form-field")&&e.$watch("modelValue",(()=>{e.$scope&&e.$scope.setData({name:e.name,value:e.modelValue})}),{immediate:!0})}(this.$vm)},ready(){this.$vm&&(this.$vm.$callHook("mounted"),this.$vm.$callHook("onReady"))},detached(){var e;this.$vm&&(Ni(this.$vm.$.uid),e=this.$vm,_s||(_s=ys().$destroyComponent),_s(e))}}},initRelation:function(e,t){e.triggerEvent("__l",t)},isPage:function(e){return!!e.route},mocks:["__route__","__wxExparserNodeId__","__wxWebviewId__"]});const Os=function(e){return App(ss(e))},Cs=(Ps=ks,function(e){return Component(xs(e,Ps))});var Ps;const Es=function(e){return function(t){return Component(ms(t,e))}}(ks),As=function(e){cs(ss(e),e)},Is=function(e){const t=ss(e),n=h(getApp)&&getApp({allowDefault:!0});if(!n)return;e.$.ctx.$scope=n;const o=n.globalData;o&&Object.keys(t.globalData).forEach((e=>{l(o,e)||(o[e]=t.globalData[e])})),Object.keys(t).forEach((e=>{l(n,e)||(n[e]=t[e])})),cs(t,e),(wx.$subpackages||(wx.$subpackages={})).subPackageCheckPoint={$vm:e}};wx.createApp=global.createApp=Os,wx.createPage=Cs,wx.createComponent=Es,wx.createPluginApp=global.createPluginApp=As,wx.createSubpackageApp=global.createSubpackageApp=Is,exports._export_sfc=(e,t)=>{const n=e.__vccOpts||e;for(const[o,r]of t)n[o]=r;return n},exports.createSSRApp=Wi,exports.e=(e,...t)=>c(e,...t),exports.f=(e,t)=>function(e,t){let n;if(f(e)||g(e)){n=new Array(e.length);for(let o=0,r=e.length;o<r;o++)n[o]=t(e[o],o,o)}else if("number"==typeof e){n=new Array(e);for(let o=0;o<e;o++)n[o]=t(o+1,o,o)}else if(v(e))if(e[Symbol.iterator])n=Array.from(e,((e,n)=>t(e,n,n)));else{const o=Object.keys(e);n=new Array(o.length);for(let r=0,i=o.length;r<i;r++){const i=o[r];n[r]=t(e[i],i,r)}}else n=[];return n}(e,t),exports.index=zt,exports.n=e=>H(e),exports.o=(e,t)=>Bi(e,t),exports.resolveComponent=function(e,t){return function(e,t,n=!0,o=!1){const r=Ho||Wr;if(r){const n=r.type;if("components"===e){const e=function(e,t=!0){return h(e)?e.displayName||e.name:e.name||t&&e.__name}(n,!1);if(e&&(e===t||e===O(t)||e===E(O(t))))return n}const i=Uo(r[e]||n[e],t)||Uo(r.appContext[e],t);return!i&&o?n:i}}("components",e,!0,t)||e},exports.s=e=>zi(e),exports.sr=(e,t,n)=>function(e,t,n={}){const{$templateRefs:o}=Fr();o.push({i:t,r:e,k:n.k,f:n.f})}(e,t,n),exports.t=e=>(e=>g(e)?e:null==e?"":f(e)||v(e)&&(e.toString===y||!h(e.toString))?JSON.stringify(e,B,2):String(e))(e),exports.wx$1=Ut;
diff --git a/subPackageCheckPoint/components/audioCom.js b/subPackageCheckPoint/components/audioCom.js
new file mode 100644
index 0000000..7f29643
--- /dev/null
+++ b/subPackageCheckPoint/components/audioCom.js
@@ -0,0 +1 @@
+"use strict";const t=require("../common/vendor.js"),a={name:"audioCom",data:()=>({appInstance:"",audio:"",isPlaying:!1,animeState:!0}),mounted(){this.appInstance=getApp(),this.initAudioState()},methods:{togglePlay(){this.appInstance.$vm.globalData.innerAudioContext.paused?(this.appInstance.$vm.globalData.innerAudioContext.play(),this.animeState=!0,t.index.setStorageSync("audioState","true")):(this.appInstance.$vm.globalData.innerAudioContext.pause(),this.animeState=!1,t.index.setStorageSync("audioState","false"))},initAudioState(){""==t.index.getStorageSync("audioState")&&t.index.setStorageSync("audioState","true");let a=t.index.getStorageSync("audioState");"true"==a&&this.appInstance.$vm.globalData.innerAudioContext.paused&&(this.appInstance.$vm.globalData.innerAudioContext.play(),this.animeState=!0),"false"==a&&(this.appInstance.$vm.globalData.innerAudioContext.pause(),this.animeState=!1)}}};const e=t._export_sfc(a,[["render",function(a,e,n,i,o,s){return{a:o.animeState?1:"",b:t.o(((...t)=>s.togglePlay&&s.togglePlay(...t)))}}],["__scopeId","data-v-b5d52ec1"]]);wx.createComponent(e);
diff --git a/subPackageCheckPoint/components/audioCom.json b/subPackageCheckPoint/components/audioCom.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/subPackageCheckPoint/components/audioCom.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subPackageCheckPoint/components/audioCom.wxml b/subPackageCheckPoint/components/audioCom.wxml
new file mode 100644
index 0000000..186b6c5
--- /dev/null
+++ b/subPackageCheckPoint/components/audioCom.wxml
@@ -0,0 +1 @@
+<view class="{{['audioBox', 'data-v-b5d52ec1', a && 'audioBoxActive']}}" bindtap="{{b}}"></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/components/audioCom.wxss b/subPackageCheckPoint/components/audioCom.wxss
new file mode 100644
index 0000000..8835fa5
--- /dev/null
+++ b/subPackageCheckPoint/components/audioCom.wxss
@@ -0,0 +1 @@
+.audioBox.data-v-b5d52ec1{position:fixed;width:63rpx;height:63rpx;left:655rpx;top:85rpx;z-index:99999;background-image:url(data:image/png;base64,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);background-size:100% 100%}.audioBoxActive.data-v-b5d52ec1{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD8AAAA/CAMAAABggeDtAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAMAUExURQAAAPy1DP+dFfyyDf2uD/2rEP6nEv+eFPu6Cvu8Cv6pEf6lEv2nEv+hE/6lEv6jE/6mEvy3DPyzDf2sEP2sD/y2DP/Mgv7CU/yvDv6lEv6jE/2zJ/y1Dfu5C/zTYvzKQf25Lvy3Hf6sJvzGO/u3C/zHNf+pJ//Hdfy0GvytD//LfPvAIv2+O/3GSfzDMv27NP/FcP6/Wf7EYvzDKfzJPfzSW/3EPfy5JP24NP+8VP2sFv63Sf6pFv3Vov7p1vu4C/u5Dv66Tf3ITv3MUP+8W/2uD/yqFv7s3f6mEf6kEvu6Ev6tHP7GaP6+U/3OWv28PP22Iv+4UP+0R/y0EPywIvyyFfywE/urDfqrG/2sD/y2DP7JcvzOT/3MVfzNSvzPVP3AOv2vG//CZP60Qv+gFPu9Fvu+Gv3BQfzRV/7EXPzMRfzAMPzQXvy4EPy4KP7AYP/Iev/CbP2mGvujDv+hE/y3DPu7Cv7KeP7CXf/Eav6nG/6nIf3CNv3DRfzFL/u9IfzJRv2+RP/Kfv+tNP6xOf2uM/++YPuqD/ynD/2uDv2xDv6kEvu6Cvu8FfzSYv2wJP6kGvy/KvzBKf3GQ/y6Svy9Kf21Lf+rL/6zPvuwPP6qIPufEf7Ibf29Nf23RfzLS/u7F/2/Svy2FP+vOf/AZv6pG/umGP7n0f2uDvyyDf7Hbvy2Ffu6NP3IU/y6Kv6zN/y2QP6tLf+xP/3Zrf3Yp/6gE/6pGPy3Evy7Hf65UP+xQ/+6Vv7t4PzCKvzCNv6qIP2qEPuyKfzJf/uvDfy+X/yuGP7LdvzLTfzAJv27NvzHO/y4GfzOWP/Gdv69X/7ixv+jH/+dFP3DSPu3DP21GP7GbvuoKP3euP6hFPvDJfy/Kf6mG/zQU/27Of6lGfzIP/6kF/zKTP6jEv6rLvzJbP3ETfzOUf67Vv7EZ/3Tj//Eaf+vPf+uPPzDcvzOkvvMRfvINP3Qkf6oKv6oLP63U/y1Gf/w8f/6+v/x8//29//19v/4+f/z9P/09f/v8P/v6KdEWs4AAAD2dFJOUwBBOEA/PTw5Q0ToO+Y64zrkQvPrAfbs7u8S4e31L/z78PPl+fj84ury7e368vb58enq7fz7/ff17+jq5uf8/UL46ff65u7t/ion+Ojt7frw8eXj8+/x8PPzGxbu/fn9/PTr6ucj+fn0/e/89vr28erq6ObuGCA97ezr4uL49Pz5+u/p4ubn5vDsAgcGKlD46uH4+vju9e7i5e3l7O546/r37/bj5+bv/TcK7PL2+PVj7+bj+/wzR0l/e2/l/myCc2D09vX17+67jdqHzeHUsPxEMfBsrt7s+zbkwJzpuL2X2OxWTPvezI7Z+7/MfvX4xub726/PnI0jhVUAAAavSURBVEjHldd7XFNlGMDxAwzYAEFwFAjLC0piGpnl0ISlJts0CxUmW1lSUysTSxmWWampCAwTFUyJNAqBVMC4Y4ggqAiK9/v9fu/6mXiDnuc977kMBfXL+PN33vecnZ33PQzTBnmOt95o1Gq0RqPeO0fOPJXEGG2RI6cDOKKNSXzSWO6ttXW0dRT3bkhjeJJZxMfstbW1rmnv7FwUE/+43BtrLj+fV15WnnfejeagyLv989Zy9Z6y3bvmPcOat2t3WTHJHRwcNO1cB+8iiOHjXHaNazm9r5XZY+7gkN3mFPS2ZHSHy7vm8XoLDl6WkAM46B992Y0Y2zqW7/pMZCZn28xt2w6Wkd7eKG8jt3Xcs/v5h73Du1YMub295uEDGMl1y7vyUmu/UT8SV/LskfYR5w55+cHPRb7kvCmWTg5ganXlSX7jV7EPeC9b2UwOYPUtJBaR0RcKpsHfwmnoC8HHLDIDZ/F9oMVbJu8Na/369cN/zrMCuAYSiUY0e3LH/beJN3DTQN4oMba/WCIB/BnE78V+92grQ0YPESynfmbtO4l9NvdjisG8fAzrNbGfqPz8/JXLR+Xnz+Wk4wHofSjHR4XD9TGcDwUriVE3bxU0tjRZqvPf5tS54wTkwtnf+J3zA2v+/AULVtZUBx8OaXrw4P79+01NTQVBQUGk7hMYuEMisbMzkF6DT4nrv/DmEwumNbbcuwPu3sW+CfvUIBSI6uyAgnz3OHzld7wFrI1Zt+/dIznXWwp8UrvySqGXJHJX798Vgo3EoRCu56ZvKQj3ieYdwwno6b2z5x9//xX+xEZ//+7IusfpWwrDw8N8fKLDkDK6hD0B+RE4+0p/Aam7r5oeYjX95hCLpbA2nLRh3RCcgE2snMnBJ+zxrwSriEy+b2kMrq5ZuXYt9JG1vVjYH7ABOYw3Pp9PLQGzqEw0PS3k3oPDt24uP7QWhIaGRloswZG1ERFQryPqsTcweuzPLCEHWDJrOisz0wV6dVoaSUMHDarthH2cLgKsGwsyMqKwNzHGDm4dipd0ZrmCjh07ugx2cUnLgn6RUyciICCA9F463ViWr69vEvRa6Du4nbPKXYAT7Wkc4BXH9h5eHsjXw9fXcwv0ZkYDS8sW69GJtKw76hmLaD6c7cdt9WDB6J6e+23c3RWiXpQ7OTlxPcTDvbysel/MfT33u9PeeQtbdxRqp0UzsCc15rTnahjdswf0KgWjhYXxHBnb1ZWduZPQx+Gpo3HjuJ7Pe2yB8c2MEZbF4s78hWPzTp1oz44eNy6yStxj3aNHkkolNTN6XFfP0HowgHwQXDba63SQVxU0W1qg34r1VM/XiXUq6E2MNy7Lp1ynZ5IYDAKhoez4ATpUpW6yoOCtYzOmEpCPqFdJpVIDk4Or+vHMzMGZbErq0JrqmpA76rhavN90fzeRvjl4a0ZGxtQR1AHIpTmM3A1W1Eq440eiKFAbmq8mvx11nA7u9ghdFjt8c/DYjDXUxIkTSyGH3x+jgb541Ug+j4oKb2F/+urIiF7d4AAhXE/zSVBPnJQEPT7A9LikH/ieFQ6iqm/Tvpb8UHsVstNvvpCxZhKvHqePz59E7Cuh9aHCC+iTR90rTAm6TW4hfZbyW+IFAqevSiDPX9gRSOr53Cc8mPZZYdG5ucoUpXKDGvrGCVyKjsro9BnGgMtpaSrVNbWqhvZXo3NTCGXuhgt9lcrk5KWg/9L+YIeUfHtk/cmGXlKHj3b2+Vx1mDz4Q9bn5qZMSZmSnJyckkwsJT06WiKVymLpAqjHCVTyS0NgUNerf9xpKVy/fgrnReobDpy9TMbtQeJxAvYnycqEAgPXExMmzOaRvCfnmFQ0PKyA2BfXsXWfCZwBA+Dj5+c324/q6cfmfyXJYHiDsIHQ4AHy5k6eDB/OAIqUr1ipgFqmEO1fEpxhQyJJ3/c1b9myZfiPunTpMgf+BKVQy2ITrPZfuKORbN7X19ocwSe8HZiLZ49MuKGQpJ8dKrJ66GqR91irN5Pc1HoDqSUHqLi4gRq2Ydj4YYJ3qbMVJDc/vP/V4I7CrmT7+NbeF/kzieSKR22gtXZEesNbVj4SnGDnLjM/+kXIhBOws5GdbvhU8CrvxOkSUktNbb5/2GNvYyPdeWkx8Zzg0k62lsW28wqUoLChknZub+DyxQ3bdyZJ2VqmSGj3DcqQTXJYGtxVqqSK9M3pFfigwvudDG547PufPpvLVVIenbo+/knePw0KG5Jb91KF4YnfghP0ilipOI9V6BOe7hVanmMwmc0KhcJsNhnafv/+H3e3URIEGx/cAAAAAElFTkSuQmCC);background-size:100% 100%}.audioBox .imagesDom.data-v-b5d52ec1{width:100%;height:100%}@keyframes audioBoxAnime-b5d52ec1{0%{transform:rotate(0)}to{transform:rotate(360deg)}}
diff --git a/subPackageCheckPoint/pages/content/index.js b/subPackageCheckPoint/pages/content/index.js
new file mode 100644
index 0000000..987ea44
--- /dev/null
+++ b/subPackageCheckPoint/pages/content/index.js
@@ -0,0 +1,2 @@
+require('../../app.js');
+"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e<t.mapConfig.length;e++)if(this.tag==t.mapConfig[e].address_name){this.addressName=t.mapConfig[e].address_name,this.description=t.mapConfig[e].description,this.scopeName=t.mapConfig[e].scopeName,this.longitude=t.mapConfig[e].longitude,this.latitude=t.mapConfig[e].latitude,this.mapUrl=t.mapConfig[e].mapUrl,this.isLink(t.mapConfig[e].openUrl)||this.isWechatApp(t.mapConfig[e].openUrl)?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].openUrl):this.openUrlBtnState=!1;for(let i=0;i<t.mapConfig[e].imgList.length;i++){let o=`https://jdsz.ispush.com/static/contentImg/${t.mapConfig[e].imgList[i]}.jpg`;this.imgList.push(o)}break}},isLink:t=>/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)&&t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}),this.isLink(this.openUrl)&&t.index.navigateTo({url:`/subPackageCheckPoint/pages/web/index?url=${this.openUrl}`})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const a=t._export_sfc(o,[["render",function(e,o,a,n,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","95e0a5ea-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-95e0a5ea"]]);wx.createPage(a);
diff --git a/subPackageCheckPoint/pages/content/index.json b/subPackageCheckPoint/pages/content/index.json
new file mode 100644
index 0000000..e1f28c0
--- /dev/null
+++ b/subPackageCheckPoint/pages/content/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "君到苏州最美打卡点",
+  "navigationStyle": "default",
+  "usingComponents": {
+    "audio-com": "../../components/audioCom"
+  }
+}
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/content/index.wxml b/subPackageCheckPoint/pages/content/index.wxml
new file mode 100644
index 0000000..35e9598
--- /dev/null
+++ b/subPackageCheckPoint/pages/content/index.wxml
@@ -0,0 +1 @@
+<audio-com wx:if="{{a}}" class="r data-v-95e0a5ea" u-r="audioCom" u-i="95e0a5ea-0" bind:__l="__l"></audio-com><view class="content data-v-95e0a5ea"><view class="swiperContent data-v-95e0a5ea"><swiper class="swiper data-v-95e0a5ea" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-95e0a5ea"><view class="swiper-item uni-bg-red data-v-95e0a5ea"><image class="data-v-95e0a5ea" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-95e0a5ea"><label class="data-v-95e0a5ea">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-95e0a5ea"><view class="detailsTitle data-v-95e0a5ea">{{k}}</view><view class="detailsMapPoint data-v-95e0a5ea"><view class="icoBox data-v-95e0a5ea"><image class="data-v-95e0a5ea" src="{{l}}"/></view><view class="contentText data-v-95e0a5ea">{{m}}</view></view><view class="detailsText data-v-95e0a5ea"><view class="icoBox data-v-95e0a5ea"><image class="data-v-95e0a5ea" src="{{n}}"/></view><view class="contentText data-v-95e0a5ea">{{o}}</view></view></view><view class="toNewPage data-v-95e0a5ea"><view class="btn data-v-95e0a5ea" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-95e0a5ea" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/content/index.wxss b/subPackageCheckPoint/pages/content/index.wxss
new file mode 100644
index 0000000..9dabc85
--- /dev/null
+++ b/subPackageCheckPoint/pages/content/index.wxss
@@ -0,0 +1,2 @@
+@import "../../app.wxss";
+.content.data-v-95e0a5ea{width:100vw;height:100vh}span.data-v-95e0a5ea{font-size:35rpx}.content .swiperContent.data-v-95e0a5ea{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-95e0a5ea{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-95e0a5ea{width:100%;height:100%}.swiper-item.data-v-95e0a5ea{width:750rpx;height:730rpx}.swiper-item>image.data-v-95e0a5ea{width:100%;height:100%}.contentDetails.data-v-95e0a5ea{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-95e0a5ea{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-95e0a5ea{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-95e0a5ea{display:flex}.detailsMapPoint .icoBox.data-v-95e0a5ea{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-95e0a5ea{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-95e0a5ea{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-95e0a5ea{object-fit:cover;width:100%;height:100%}.contentText.data-v-95e0a5ea{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-95e0a5ea{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-95e0a5ea{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-95e0a5ea{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx}
diff --git a/subPackageCheckPoint/pages/detailsmap/index.js b/subPackageCheckPoint/pages/detailsmap/index.js
new file mode 100644
index 0000000..fabdc10
--- /dev/null
+++ b/subPackageCheckPoint/pages/detailsmap/index.js
@@ -0,0 +1,2 @@
+require('../../app.js');
+"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({isMoveDisabled:!0,comDom:!0,tag:"",animeState:!0,movableViewWidth:750,movableViewHeight:1334,detailsMapSource:"",hitPointList:[],hitPointScale:"scale(0.5)",titleSource:"",titleSourceW:0,titleSourceH:0,titleSourceX:0,titleSourceY:0,x:0,y:0,scaleValue:0,old:{x:0,y:0},mapList:[],contentBgColor:"",defaultBg:""}),onLoad(t){this.tag=t.tag,this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/detailsmap","get");this.mapList=t.mapList;for(let e=0;e<this.mapList.length;e++)this.tag==this.mapList[e].tag&&(this.movableViewWidth=this.mapList[e].w,this.movableViewHeight=this.mapList[e].h,this.detailsMapSource=this.mapList[e].detailsMapSource,this.hitPointList=this.mapList[e].hitPointList,this.contentBgColor=this.mapList[e].bgColor,this.defaultBg=this.mapList[e].defaultBg,this.titleSource=this.mapList[e].titleSource,this.titleSourceW=this.mapList[e].titleSourceW,this.titleSourceH=this.mapList[e].titleSourceH,this.titleSourceX=this.mapList[e].titleSourceX,this.titleSourceY=this.mapList[e].titleSourceY,this.scaleValue=this.mapList[e].scaleValue,this.x=this.mapList[e].dX,this.y=this.mapList[e].dY)},openMap(){t.wx$1.openLocation({latitude:31.31428,longitude:120.603015,name:"桃花坞",scale:18})},openContent(e){encodeURIComponent(e.tag),t.index.navigateTo({url:`/subPackageCheckPoint/pages/content/index?tag=${e.tag}`})},onChange(t){this.old.x=t.detail.x,this.old.y=t.detail.y},touchScale(t){t.detail.scale>=.4?this.isMoveDisabled=!1:this.isMoveDisabled=!0}}};if(!Array){t.resolveComponent("audio-com")()}const o=t._export_sfc(i,[["render",function(e,i,o,s,a,l){return t.e({a:a.comDom},a.comDom?{b:t.sr("audioCom","5f2d6979-0")}:{},{c:a.defaultBg,d:"750rpx",e:750/2160*3840+"rpx",f:a.detailsMapSource,g:t.f(a.hitPointList,((e,i,o)=>({a:i,b:e.w+"rpx",c:e.h+"rpx",d:e.x+"rpx",e:e.y+"rpx",f:e.zIndex,g:t.o((t=>l.openContent(e)),i),h:e.tag}))),h:a.movableViewWidth+"rpx",i:a.movableViewHeight+"rpx",j:a.isMoveDisabled,k:a.scaleValue,l:a.scaleValue,m:a.x,n:a.y,o:t.o(((...t)=>l.onChange&&l.onChange(...t))),p:t.o(((...t)=>l.touchScale&&l.touchScale(...t))),q:a.titleSource,r:750/2160*a.titleSourceW+"rpx",s:750/2160*a.titleSourceH+"rpx",t:750/2160*a.titleSourceX+"rpx",v:750/2160*a.titleSourceY+"rpx",w:a.contentBgColor})}],["__scopeId","data-v-5f2d6979"]]);wx.createPage(o);
diff --git a/subPackageCheckPoint/pages/detailsmap/index.json b/subPackageCheckPoint/pages/detailsmap/index.json
new file mode 100644
index 0000000..e1f28c0
--- /dev/null
+++ b/subPackageCheckPoint/pages/detailsmap/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "君到苏州最美打卡点",
+  "navigationStyle": "default",
+  "usingComponents": {
+    "audio-com": "../../components/audioCom"
+  }
+}
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/detailsmap/index.wxml b/subPackageCheckPoint/pages/detailsmap/index.wxml
new file mode 100644
index 0000000..192f41d
--- /dev/null
+++ b/subPackageCheckPoint/pages/detailsmap/index.wxml
@@ -0,0 +1 @@
+<audio-com wx:if="{{a}}" class="r data-v-5f2d6979" u-r="audioCom" u-i="5f2d6979-0" bind:__l="__l"></audio-com><view class="content data-v-5f2d6979" style="{{'background:' + w}}"><view class="bgBox data-v-5f2d6979"><view class="bgItem bgGusuItem data-v-5f2d6979" style="{{'width:' + d + ';' + ('height:' + e)}}"><image class="data-v-5f2d6979" src="{{c}}"/></view></view><movable-area class="movableArea data-v-5f2d6979" style="width:100vw;height:100vh"><movable-view class="data-v-5f2d6979" style="{{'width:' + h + ';' + ('height:' + i)}}" disabled="{{j}}" animation="{{false}}" scale-value="{{k}}" scale-min="{{l}}" x="{{m}}" y="{{n}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{o}}" bindscale="{{p}}"><view class="detailsMap data-v-5f2d6979"><image class="data-v-5f2d6979" src="{{f}}"/></view><view wx:for="{{g}}" wx:for-item="item" wx:key="a" class="detailsMapPoint data-v-5f2d6979" style="{{'width:' + item.b + ';' + ('height:' + item.c) + ';' + ('left:' + item.d) + ';' + ('top:' + item.e) + ';' + ('z-index:' + item.f)}}" bindtap="{{item.g}}" data-name="{{item.h}}"></view><view class="stickyMask data-v-5f2d6979"></view></movable-view></movable-area><view class="stickyMask data-v-5f2d6979"><view class="stickyItem data-v-5f2d6979"><view class="stickyTitle data-v-5f2d6979" style="{{'width:' + r + ';' + ('height:' + s) + ';' + ('left:' + t) + ';' + ('top:' + v)}}"><image class="data-v-5f2d6979" src="{{q}}"/></view></view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/detailsmap/index.wxss b/subPackageCheckPoint/pages/detailsmap/index.wxss
new file mode 100644
index 0000000..3fbae8c
--- /dev/null
+++ b/subPackageCheckPoint/pages/detailsmap/index.wxss
@@ -0,0 +1,2 @@
+@import "../../app.wxss";
+.content.data-v-5f2d6979{background:#eeeeed}.detailsMap.data-v-5f2d6979{width:100%;height:100%}.detailsMap>image.data-v-5f2d6979{width:100%;height:100%}.detailsMapPoint.data-v-5f2d6979{position:absolute}.detailsMapPoint>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask.data-v-5f2d6979{position:absolute;pointer-events:none;width:750rpx;height:1334rpx;z-index:999;top:0}.stickyMask .stickyItem.data-v-5f2d6979{position:absolute;left:0;top:0;width:750rpx;height:1334rpx}.stickyMask .stickyItem .stickyTitle.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*1188rpx);height:calc(var(--base-width)*378rpx);left:calc(var(--base-width)*708rpx);top:calc(var(--base-width)*200rpx);transform:translate(150%);opacity:0;animation:1s stickyTitleAnime-5f2d6979 ease-in-out forwards}.stickyMask .stickyItem .stickyTitle>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask .stickyItem .stickyGusuLeft.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*1067rpx);height:calc(var(--base-width)*759rpx);left:calc(var(--base-width)*0rpx);top:calc(var(--base-width)*2388rpx);transform:translate(-150%);opacity:0;animation:1s stickyGusuLeftAnime-5f2d6979 ease-in-out forwards}.stickyMask .stickyItem .stickyGusuLeft>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask .stickyItem .stickyGusuRight.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*601rpx);height:calc(var(--base-width)*258rpx);right:0;top:calc(var(--base-width)*3260rpx);transform:translate(150%);opacity:0;animation:1s ease-in-out stickyGusuRightAnime-5f2d6979 forwards}.stickyMask .stickyItem .stickyGusuRight>image.data-v-5f2d6979{width:100%;height:100%}.bgBox.data-v-5f2d6979{position:absolute;width:calc(var(--base-width) * 2160rpx);height:calc(var(--base-width) * 3840rpx);top:0}.bgBox .bgItem.data-v-5f2d6979{width:100%;height:100%;top:0}.bgBox .bgItem>image.data-v-5f2d6979{width:100%;height:100%}@keyframes stickyTitleAnime-5f2d6979{0%{transform:translate(150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes stickyGusuLeftAnime-5f2d6979{0%{transform:translate(-150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes stickyGusuRightAnime-5f2d6979{0%{transform:translate(150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes bgGusuItemAnime-5f2d6979{0%{transform:scale(.8);opacity:0}to{transform:scale(1);opacity:1}}
diff --git a/subPackageCheckPoint/pages/index/index.js b/subPackageCheckPoint/pages/index/index.js
new file mode 100644
index 0000000..46a57d2
--- /dev/null
+++ b/subPackageCheckPoint/pages/index/index.js
@@ -0,0 +1,2 @@
+require('../../app.js');
+"use strict";const e=require("../../common/vendor.js"),t=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,homeShowState:!0,scopeMapShowState:!1,x:0,y:0,old:{x:0,y:0},scopePointList:[{w:"76rpx",h:"55rpx",x:"270rpx",y:"715rpx",tag:"姑苏区",source:"/subPackageCheckPoint/static/images/scopeMap/gusuqu.png",state:!0},{w:"76rpx",h:"54rpx",x:"177rpx",y:"667rpx",tag:"高新区",source:"/subPackageCheckPoint/static/images/scopeMap/gaoxinqu.png",state:!0},{w:"73rpx",h:"60rpx",x:"520rpx",y:"710rpx",tag:"昆山市",source:"/subPackageCheckPoint/static/images/scopeMap/kunshanshi.png",state:!0},{w:"76rpx",h:"58rpx",x:"616rpx",y:"510rpx",tag:"太仓市",source:"/subPackageCheckPoint/static/images/scopeMap/taicangshi.png",state:!0},{w:"100rpx",h:"56rpx",x:"360rpx",y:"706rpx",tag:"工业园区",source:"/subPackageCheckPoint/static/images/scopeMap/gongyeyuanqu.png",state:!0},{w:"75rpx",h:"58rpx",x:"390rpx",y:"464rpx",tag:"常熟市",source:"/subPackageCheckPoint/static/images/scopeMap/changshushi.png",state:!0},{w:"76rpx",h:"55rpx",x:"343rpx",y:"940rpx",tag:"吴江区",source:"/subPackageCheckPoint/static/images/scopeMap/wujiangqu.png",state:!0},{w:"75rpx",h:"54rpx",x:"220rpx",y:"810rpx",tag:"吴中区",source:"/subPackageCheckPoint/static/images/scopeMap/wuzhongqu.png",state:!0},{w:"76rpx",h:"56rpx",x:"278rpx",y:"613rpx",tag:"相城区",source:"/subPackageCheckPoint/static/images/scopeMap/xiangchengqu.png",state:!0},{w:"101rpx",h:"49rpx",x:"236rpx",y:"284rpx",tag:"张家港市",source:"/subPackageCheckPoint/static/images/scopeMap/zhangjiagangshi.png",state:!0}]}),async onLoad(){},onShareAppMessage:e=>({title:"君到苏州最美打卡点",path:"pages/index/index"}),onShareTimeline:()=>({title:"君到苏州最美打卡点",path:"pages/index/index"}),onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{openMap(){e.index.navigateTo({url:"/subPackageCheckPoint/pages/scopemap/index"})},getClass:e=>`scopePoint${e+1}`,showScopeMap(){this.homeShowState=!1,this.scopeMapShowState=!0},getScopePointStyle:e=>({width:e.w,height:e.h,left:e.x,top:e.y}),openDetailsMap(t){t.state?e.index.navigateTo({url:`/subPackageCheckPoint/pages/detailsmap/index?tag=${t.tag}`}):e.index.showToast({title:"暂未开放",icon:"error",duration:2e3})},onChange(e){this.old.x=e.detail.x,this.old.y=e.detail.y}}};if(!Array){e.resolveComponent("audio-com")()}const a=e._export_sfc(o,[["render",function(o,a,p,s,i,r){return e.e({a:i.comDom},i.comDom?{b:e.sr("audioCom","46c0ccd2-0")}:{},{c:t._imports_0,d:t._imports_1,e:i.homeShowState,f:e.o(((...e)=>r.showScopeMap&&r.showScopeMap(...e))),g:t._imports_2,h:t._imports_3,i:i.scopeMapShowState,j:t._imports_4,k:e.f(i.scopePointList,((t,o,a)=>({a:t.source,b:e.n(r.getClass(o)),c:o,d:e.s(r.getScopePointStyle(t)),e:t.tag,f:e.o((e=>r.openDetailsMap(t)),o)}))),l:"750rpx",m:"1334rpx",n:i.x,o:i.y,p:e.o(((...e)=>r.onChange&&r.onChange(...e))),q:i.scopeMapShowState,r:t._imports_5,s:i.scopeMapShowState,t:t._imports_6,v:i.scopeMapShowState})}],["__scopeId","data-v-46c0ccd2"]]);o.__runtimeHooks=6,wx.createPage(a);
diff --git a/subPackageCheckPoint/pages/index/index.json b/subPackageCheckPoint/pages/index/index.json
new file mode 100644
index 0000000..e1f28c0
--- /dev/null
+++ b/subPackageCheckPoint/pages/index/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "君到苏州最美打卡点",
+  "navigationStyle": "default",
+  "usingComponents": {
+    "audio-com": "../../components/audioCom"
+  }
+}
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/index/index.wxml b/subPackageCheckPoint/pages/index/index.wxml
new file mode 100644
index 0000000..36c5245
--- /dev/null
+++ b/subPackageCheckPoint/pages/index/index.wxml
@@ -0,0 +1 @@
+<audio-com wx:if="{{a}}" class="r data-v-46c0ccd2" u-r="audioCom" u-i="46c0ccd2-0" bind:__l="__l"></audio-com><view class="content data-v-46c0ccd2"><view class="home data-v-46c0ccd2" hidden="{{!e}}" bindtap="{{f}}"><view class="goScopeMapBtn data-v-46c0ccd2"><image class="data-v-46c0ccd2" src="{{c}}"/></view><image class="data-v-46c0ccd2" src="{{d}}" alt=""/></view><view class="scopeMapDefaultBg data-v-46c0ccd2" hidden="{{!i}}"><image class="data-v-46c0ccd2" src="{{g}}"/><view class="scopeBird data-v-46c0ccd2"><image class="data-v-46c0ccd2" src="{{h}}"/></view></view><movable-area class="movableArea data-v-46c0ccd2" style="width:100vw;height:100vh" hidden="{{!q}}"><movable-view class="data-v-46c0ccd2" style="{{'width:' + l + ';' + ('height:' + m)}}" scale-value="1" scale-min="1" scale-max="1.3" x="{{n}}" y="{{o}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{p}}"><view class="scopeMap data-v-46c0ccd2"><view class="scopeMapBg data-v-46c0ccd2"><image class="data-v-46c0ccd2" src="{{j}}"/></view><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="{{['scopePoint', 'data-v-46c0ccd2', item.b]}}" style="{{item.d}}" data-tag="{{item.e}}" bindtap="{{item.f}}"><image class="data-v-46c0ccd2" src="{{item.a}}"/></view></view></movable-view></movable-area><view class="scopeTitle data-v-46c0ccd2" hidden="{{!s}}"><image class="data-v-46c0ccd2" src="{{r}}"/></view><view class="scopePerson data-v-46c0ccd2" hidden="{{!v}}"><image class="data-v-46c0ccd2" src="{{t}}"/></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/index/index.wxss b/subPackageCheckPoint/pages/index/index.wxss
new file mode 100644
index 0000000..78fa941
--- /dev/null
+++ b/subPackageCheckPoint/pages/index/index.wxss
@@ -0,0 +1,2 @@
+@import "../../app.wxss";
+.content.data-v-46c0ccd2{width:100vw;height:100vh;overflow-y:scroll;background:#89d4cf;display:flex;justify-content:center;align-items:flex-start}.content .home.data-v-46c0ccd2{position:relative;width:750rpx;height:1334rpx;margin:0 auto}.content .home>image.data-v-46c0ccd2{width:100%;height:100%}.content .home .goScopeMapBtn.data-v-46c0ccd2{position:absolute;width:140rpx;height:55rpx;left:288rpx;top:1240rpx;z-index:99;animation:.8s goScopeMapBtnAnime-46c0ccd2 linear alternate infinite}.content .home .goScopeMapBtn>image.data-v-46c0ccd2{width:100%;height:100%}@keyframes goScopeMapBtnAnime-46c0ccd2{0%{transform:scale(1.3)}to{transform:scale(1.6)}}.scopeMapDefaultBg.data-v-46c0ccd2{position:absolute;top:0;width:750rpx;height:1334rpx}.scopeMapDefaultBg>image.data-v-46c0ccd2{width:100%;height:100%}.content .scopeMap.data-v-46c0ccd2{position:relative;width:750rpx;height:1334rpx}.content .scopeMap .scopeMapBg.data-v-46c0ccd2{position:absolute;top:0;left:0;width:100%;height:100%;opacity:0;animation:1s scopeMapBgAnime-46c0ccd2 linear forwards}@keyframes scopeMapBgAnime-46c0ccd2{0%{opacity:0}to{opacity:1}}.content .scopeMap .scopeMapBg>image.data-v-46c0ccd2{width:100%;height:100%}.content .scopeMap .scopePoint.data-v-46c0ccd2{position:absolute;z-index:99}.content .scopeMap .scopePoint>image.data-v-46c0ccd2{width:100%;height:100%}.content .scopeMap .scopePoint1.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .4s ease-in alternate infinite}.content .scopeMap .scopePoint3.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .8s ease-in alternate infinite}.content .scopeMap .scopePoint5.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .6s ease-in alternate infinite}.content .scopeMap .scopePoint7.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .3s ease-in alternate infinite}.content .scopeMap .scopePoint9.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .8s ease-in alternate infinite}.content .scopeMap .scopePoint2.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .5s ease-in alternate infinite}.content .scopeMap .scopePoint4.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .9s ease-in alternate infinite}.content .scopeMap .scopePoint6.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 1s ease-in alternate infinite}.content .scopeMap .scopePoint8.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .6s ease-in alternate infinite}.content .scopeMap .scopePoint10.data-v-46c0ccd2{animation:.8s scopePointAnime-46c0ccd2 .8s ease-in alternate infinite}@keyframes scopePointAnime-46c0ccd2{0%{transform:translateY(-10%)}to{transform:translateY(0)}}.scopePerson.data-v-46c0ccd2{pointer-events:none;position:absolute;width:287rpx;height:434rpx;bottom:0;right:37rpx;opacity:0;animation:1s scopePerson-46c0ccd2 1s ease-in-out forwards}.scopePerson>image.data-v-46c0ccd2{width:100%;height:100%}@keyframes scopePerson-46c0ccd2{0%{transform:translate(100%);opacity:0}to{transform:translate(0);opacity:1}}.scopeTitle.data-v-46c0ccd2{pointer-events:none;position:absolute;width:428rpx;height:214rpx;top:62rpx;right:100rpx;opacity:0;animation:1s scopePerson-46c0ccd2 ease-in-out forwards}.scopeTitle>image.data-v-46c0ccd2{width:100%;height:100%}.scopeBird.data-v-46c0ccd2{pointer-events:none;position:absolute;width:113rpx;height:100rpx;top:410rpx;left:56rpx;opacity:0;animation:1s scopeBird-46c0ccd2 .5s ease-in-out forwards}.scopeBird>image.data-v-46c0ccd2{width:100%;height:100%}@keyframes scopeBird-46c0ccd2{0%{transform:translate(-50%,50%);opacity:0}to{transform:translate(0);opacity:1}}
diff --git a/subPackageCheckPoint/pages/scopemap/index.js b/subPackageCheckPoint/pages/scopemap/index.js
new file mode 100644
index 0000000..6aabe47
--- /dev/null
+++ b/subPackageCheckPoint/pages/scopemap/index.js
@@ -0,0 +1,2 @@
+require('../../app.js');
+"use strict";const e=require("../../common/vendor.js"),o=require("../../common/assets.js"),t={data:()=>({title:"Hello",x:0,y:0,old:{x:0,y:0}}),onLoad(){},methods:{openMap(){e.wx$1.openLocation({latitude:31.31428,longitude:120.603015,name:"桃花坞",scale:18})},onChange(e){this.old.x=e.detail.x,this.old.y=e.detail.y}}};const n=e._export_sfc(t,[["render",function(t,n,a,s,d,i){return{a:o._imports_0$1,b:d.x,c:d.y,d:e.o(((...e)=>i.onChange&&i.onChange(...e)))}}]]);wx.createPage(n);
diff --git a/subPackageCheckPoint/pages/scopemap/index.json b/subPackageCheckPoint/pages/scopemap/index.json
new file mode 100644
index 0000000..9b46100
--- /dev/null
+++ b/subPackageCheckPoint/pages/scopemap/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "君到苏州最美打卡点",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/scopemap/index.wxml b/subPackageCheckPoint/pages/scopemap/index.wxml
new file mode 100644
index 0000000..d4924f3
--- /dev/null
+++ b/subPackageCheckPoint/pages/scopemap/index.wxml
@@ -0,0 +1 @@
+<view class="content"><movable-area style="width:750rpx;height:1334rpx"><movable-view style="width:750rpx;height:1334rpx;background-color:aqua" scale-value="0.5" x="{{b}}" y="{{c}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{d}}"><image class="logo" src="{{a}}"></image></movable-view></movable-area></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/scopemap/index.wxss b/subPackageCheckPoint/pages/scopemap/index.wxss
new file mode 100644
index 0000000..8ebb47b
--- /dev/null
+++ b/subPackageCheckPoint/pages/scopemap/index.wxss
@@ -0,0 +1 @@
+@import "../../app.wxss";
diff --git a/subPackageCheckPoint/pages/web/index.js b/subPackageCheckPoint/pages/web/index.js
new file mode 100644
index 0000000..8a877df
--- /dev/null
+++ b/subPackageCheckPoint/pages/web/index.js
@@ -0,0 +1,2 @@
+require('../../app.js');
+"use strict";const r={data:()=>({url:""}),onLoad(r){this.url=r.url}};const e=require("../../common/vendor.js")._export_sfc(r,[["render",function(r,e,t,o,n,a){return{a:n.url}}],["__scopeId","data-v-7f27f19b"]]);wx.createPage(e);
diff --git a/subPackageCheckPoint/pages/web/index.json b/subPackageCheckPoint/pages/web/index.json
new file mode 100644
index 0000000..9b46100
--- /dev/null
+++ b/subPackageCheckPoint/pages/web/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "君到苏州最美打卡点",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/web/index.wxml b/subPackageCheckPoint/pages/web/index.wxml
new file mode 100644
index 0000000..ad6577b
--- /dev/null
+++ b/subPackageCheckPoint/pages/web/index.wxml
@@ -0,0 +1 @@
+<view class="content data-v-7f27f19b"><view class="webPage data-v-7f27f19b"><web-view class="data-v-7f27f19b" src="{{a}}"></web-view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/web/index.wxss b/subPackageCheckPoint/pages/web/index.wxss
new file mode 100644
index 0000000..7dbf2cd
--- /dev/null
+++ b/subPackageCheckPoint/pages/web/index.wxss
@@ -0,0 +1,2 @@
+@import "../../app.wxss";
+.content.data-v-7f27f19b{position:relative;width:100vw;height:100vh}.webPage.data-v-7f27f19b{position:absolute;top:0;left:0;width:100vw;height:100vh}
diff --git a/subPackageCheckPoint/static/images/audio/audio.png b/subPackageCheckPoint/static/images/audio/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f3c943e36c6af5b050cafe092dafda85caed07
GIT binary patch
literal 2835
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
L>ughW#6SAK)yGG|

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/audio/audioClose.png b/subPackageCheckPoint/static/images/audio/audioClose.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ac94494d58802aa3309712395ff966c81d6a9dd
GIT binary patch
literal 2947
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
VH#Jg`Ap0y3+*~}I3mt<K{tvlec~}4d

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/btn.png b/subPackageCheckPoint/static/images/btn.png
new file mode 100644
index 0000000000000000000000000000000000000000..146c66fc307b23b33a8b22cf2ea609e9265d66ba
GIT binary patch
literal 2566
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/descriptionIco.png b/subPackageCheckPoint/static/images/descriptionIco.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6221dc9ed08e1050e748de7b1794d700b8e6bcb
GIT binary patch
literal 724
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3-oHx~}5|QY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D%zMFM<6T!DfXt1?FsatPF|^U4N>OLR$)Uoe9TqwJs5pPx*kBaOd*dBYko
zi__rWhtFzGWsaNfeyd|kw(l{OzY$~j_w@U&6sC96o_Z*i#Aof$-+kF(>*D*|YrHiZ
z)AAk*F3<UTC}Q)<6&-R4lT}Maf(qT{=tQN+fa2u4r;B5V#`)xg1}10QGL-|XPc^X3
z*s?f~p`U9Olbc)!>&2#B2AXwh3W5)$dii=BCzUB2I)C`+U1KTX2&<X5A{s?lTpzP2
z`6PJnDLA>=(jn%dT1V`?Fot*S39fp6CJWRQbXq<v*<)qSZuP*-iHlV=$4tVY>FJ@x
zM-JC)*zIWIVsT-%qmGokKxbOVk<|*b`W2_}u4k%eYvTyC`Ls`Az0u=o*V`+C#FjI$
zb})&xOn$Ot%FZQ%ToD&VP8c-*oMa*D;V^lE8XxPP4HK>(TzG(K*#Vh$rtAtXx8Mbg
zPiGwzu{b1R;rt^i>A{&pY5c(oa=a()a@2Tu7#6v1{W+1T)&>{^44$rjF6*2UngB*Z
BA2k2~

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/homeBg.jpg b/subPackageCheckPoint/static/images/homeBg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3cbca99fae1681b755b99c6ccc8c276aae6ecc30
GIT binary patch
literal 243794
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%0A-`D=u!pg3Hv$K3JbOGlsb1w(8D2$
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
z%0D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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/mapPointIco.png b/subPackageCheckPoint/static/images/mapPointIco.png
new file mode 100644
index 0000000000000000000000000000000000000000..6857772ed0b255caaea77b4e3a78e1c00742dd5a
GIT binary patch
literal 906
zcmeAS@N?(olHy`uVBq!ia0vp^Qb4T2!3-o9Jh`O^q*&4&eH|GXHuiJ>Nn{1`8H<D5
zofy`glX(eb#|QX?xB>+&R%MPN8ihd7hn63}ATB8h@(X5Q;hl3v{RZ<B(S*nooov6|
z(kK3X74|8gkN@aPNvT6!yYwpleSW0j@ZoOiEXO|=!yhU#nr~@h`gZf0Zl%JTj)Uuq
zxLzCFVzu|W)4uMMOvbjQi|uCqc>dFR>zCY(Rqu5UFQ5CuKiZimAjk0C+WT#J-{Wdq
z<WznxIsuGoPfr)e5RLPtm%mmYG7w;UaQK>-eDaA4hUH*z|I>f_#XDP;9Qy8E{QX;|
za23Oppx?1SI_*^s%-J7rzOZs{rICZtcUPBBzI#<A->bB}$uIi2;>aAPuEz}##r~PI
zrkAd4TR6#9EcNFE(aCbGbM^^_T@}gXoi4igM}=xb=^NIDyHg*|4%)WyBai!z6(a2=
zWf#twy1e+RqVbo(ddt%`n|)UlCr;m%r|7*txXUH+)~*KgJNFm46y6GYD7<~*G>-j_
zVwXIQJ5Adl%vf>!s^;`w(WvlH=9&%0>ld9lzM&_JVWx=j*0Zmrqxm<!irN4E+_Tve
zv}@W<YZXuTxV51*>gTdsXE&+#86`}4w`4)&ew|+vmz?DFd}8GHzGuQT$IB_-i&wrk
z=CAdi5_sTKeS@Be{f!j=>78!Ym&AG|tENw%V5~7Yrg)JI>*1oW{O$^;1U=*2YJic-
N;OXk;vd$@?2>`NllaT-b

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/bird.png b/subPackageCheckPoint/static/images/scopeMap/bird.png
new file mode 100644
index 0000000000000000000000000000000000000000..d04beefe31f015390915ce256ced4e00e20f3100
GIT binary patch
literal 2651
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/changshushi.png b/subPackageCheckPoint/static/images/scopeMap/changshushi.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dcb0aa54c21f63e1d0492abb850166d70a29beb
GIT binary patch
literal 2639
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
KO{$@u_x=rASisu=

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/gaoxinqu.png b/subPackageCheckPoint/static/images/scopeMap/gaoxinqu.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7a3c7c117f933527dd2196dc967850b71f9d66a
GIT binary patch
literal 2459
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/gongyeyuanqu.png b/subPackageCheckPoint/static/images/scopeMap/gongyeyuanqu.png
new file mode 100644
index 0000000000000000000000000000000000000000..69e091e13f368983a4e5b009edffdeef9c494cc4
GIT binary patch
literal 2483
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
a`=b24Jd{nejh^6vgCI5aHOka%LjD2JpGlzr

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/gusuqu.png b/subPackageCheckPoint/static/images/scopeMap/gusuqu.png
new file mode 100644
index 0000000000000000000000000000000000000000..48365e68a2899d9c34f9b6221078152438e092e5
GIT binary patch
literal 2599
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/kunshanshi.png b/subPackageCheckPoint/static/images/scopeMap/kunshanshi.png
new file mode 100644
index 0000000000000000000000000000000000000000..b539f20e0e98031907dc7ee8fb1e997151361d6a
GIT binary patch
literal 2360
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/person.png b/subPackageCheckPoint/static/images/scopeMap/person.png
new file mode 100644
index 0000000000000000000000000000000000000000..84cd24dc55ccca590bbd59d78b72916477f876fb
GIT binary patch
literal 10865
zcmbt)Wl$YKw=M22!QDML0djD6cXthNa1IU!cXtRL+$|)y2X{TVdk6<h9^ZXcuj<`b
zb^pAsnmuc;HN9s~_n!ID(=qC*a+qkOXfQA^m<saJnlLc1RPRSK3j8~BhW=6Q{e)mA
zp&|hT)0Bk%YJvFf!vZzsBw^~O$xmTm;9=C2wPoJP|DT5aUw8W-A{>CY{s;BHNrdPK
z|BZQfpLciO?Op)a{{I~c9TD#Ty?7DG_P@z(KhAdm-PwA#RJcfM-W-3nHunNJmp$3v
z83qF6cgx4g*=xu24klb#HhehV!T)J{ljD7LwGcnfa5>Ts`1k@8=%iTx8NfaVCRRoU
zHX;-}9GvaZ5gJO$vxPY{RMcP(_jmPZW?F=wf7hS0!Hhmon#7zB|DEI_L2b2Uhyev)
zVPGu$_+F|{^RTtyEd1eJx?Nj&x03Xjoz{%%Y&gm+*vc}}T&%2PE-bS>T@{A34nl;9
zDikMkGXbtHso`OlOABf0l$jcox!TlM%S+iY(XxzKBp*IJLAKp(tjS1-n~Dm1zg1Ud
zWkxHKm!+i^B_-;pD8CQF?~S#N^3pjEwg?|@b$NL!1N|CfI$>&zVJGJIWW2<P3w5dK
zX{d*r8f)`%RtNe3w3s#m1O^}Retlt;5*0Po(H5h{@OE@ikdUx9F&=AeDTt3-9~zkK
zXw&AzeJ5w!*r>?K=iJ$>_z84XRo>nA=aR}AexLpK>4SxZr6VSUhl52#fQLgwM*Tp6
zfQBWJ)`x<O%;gY^j6=w39w?UB#h~RP9A1M(&4R=5k%&)PGINOVBLIVxPQWLRR8*B*
zTuZ>eh*s5>-71Vm$&%MIOEjtx5Zm%8xPn+nfl}H)Jo!7fYchwiH$IyXuSYtStO=7o
zkXqhMz&aS0nP12?o{^rBN6U^&!H}7qn?p>Q?UNJ>w~&)8LD+k)W1gC-S}@hKi*JuF
zu<$rkJs66&4(Hz2WWvu+zike8Tj&RnR{j#Wb8M6Z8%gM)ov48YA6+^uG{>gi!k=Hc
z%UPM;hWobD;$;p3OmDKElW)%+pvS0J#HTACwk`|v01c4E`#I>*1I^mi`SaH8(cgvI
z{i8n%b1QtOi?gq5^S>7|uVQwVHaB<9H&^DCXAYL;PUdIk&S!W2ye{3(&d<)z&22(&
z=J)2eSLgQE@8)N3mgd&?msfW7*Y+0oRu*SAmp34gd&tt!ZgKj>6ATPBjDoa;w(t6-
zi4RCy=T8xRnlfV<G9I3}Br8jDG7J))q~r+$J8T)!siw3)?o)M0q@{#<e{5Jip}J3<
zli5lU7jN2780Y!=Mt$Jcl9$g`rjJ>U;Fs;dhr$=im)qA;dfo;Q@Ve_5qz3Go_8ga=
z_~PgipP1-cm8->DzkK|xAU#f|m-Q<`=?IeRcPmD-!0;nT$5mEC^Vs{J!zqTmjW#`F
z`9<)V7k)1oa795lX)o_+xc3i<&n7$<T*j+xJXPgiuycc<Z09NOH<8m2Ey^Hcu!r8o
zbSfMO#<uWOZ2jy%rnhOBFSjT80PitiR+T3pUihjk+kudGp)Mt3;-gyM?oaq-20TWT
zTT@+SNFt@#ne#(tWXms%LCg85ihcMor}A%Gc~`u|IJrDoQQ>O=Sw)_n2z(lM!-C2~
zK%N%KzNYkAMIk+9NjYN!j#*T2Uhaq2$0G(_+cFDA9niA;-*v)@di7Gr&V&8L!>gwF
zPvb1bF=|$;LCh}Ppisk(=W|c3_6x_ZCEzGO6DEARXc8@8t~sCstCl|^MNezAo%P$1
z#~-}{Y$Q0XX?_fK=U{*6f%Nva$tsiMK-J!B=u-KcQaARD`u&IRfvskh(!1tzRo<dR
zC#h`(U|5f&Qg9L{Lry;ag1U~+ZAfcjxdP!}WgL2~vvFb}9n;;=d1TP7I?VVJW4byT
z2S~YktaEV_Y+C1pbgtDjhbyQeCH6BVoXKt6@fhyF2Erg0v=A%wXOx%m4vN5OPL8e~
zh6!z@K5TLM38MyCW#P@Ls|Z!&Km=J@KaxiVJ)2Y0>*aOT2H+rq6qz9la_v3I{hn<I
zg?)dqv<w>&D2x6Q+*E6>n&>H~@8SDyE=H!Y_1#uigs7RUQXn^q3AYJg6!s|s^;9o0
z6K2HGpvov#bF*t+^weo2N1P_v$ni7!XwZw~?MAYfG_&ztR8i}@bxe*%=tXhJjQ;o=
zQj?f|pa}xtI5N=cp__@T^BK*A$ZQ{W_}CH+DlhailYDq<iGhac;(+&lMpA6OMSf-p
zIb=^u4z|d>`BHSh5e^U*<2zh9JF{Fb;Oloc9|s4Z5g3^CAEdY^gzP@9RMXih1p7-9
zF=3KCI+TT|DRj2?7{V6z&CD_BjVHd9c7ITJgyZ+0iZHHI*jbEi!du?i@m7W{v`c~Q
z<=oTbI-x^>>{&);-md*iUuMcg6U^)Td+v?sOSwJr_b8GD_vfsGo?Iw}<)QBGC&7<q
z=X7D1S^c?SF4g!5I|jqBbJ|_hO_zZPYSyOA4n69d>=C)W@{%$mf=q0l!UpKiF|+(O
z$uB1)(J6oQw@r@`;MANNPhWfQR*BCE6(@4GOrkh7)_tB$mUgkqv3peW2L-F`D&+UA
zkC}HD4vn3)gnxT|;abMOmxNg504}UudhN8uQYV2=&bc$J3=56t(C)yW^GU~KeyOfF
zPZEQ5dqBL~(r<FFI10u8rbBSMHfBrX;rc2ESOHx2RD)ZRnad?HvXGoFHwMq2l1&dS
z`2w^P@Hxps-*(P1If_Ox07}kv_a{sDb9v;tB2iuJ)y%pECYA_=$O*`b(JeOnwR^x`
zZxn*l$edaiXeX|3#isSEL-hFxK@D_sf=b-5-39Oxj7`>mtiYQjWhhr^Fnp})B1JT3
z#XVq9saGiQC>r7AnV<tIJTg0`e309A))p~q`?YzGvpknpyGPd;D7Y_{y69EJ_$PRJ
z0egl)Fek8>{OhR?@LjA*Z-XXH0lW6J-0QQNFT@=F#ylr0L*kobXB7V?Fz%_Gz->=;
zn+S@sVH^0Bbs^kVH^(NO=<c-~@c3Ff|1|Y=y>9)Z{B&@0YDGwOTYlXaM4z%@>aW&d
zm1Pvj=#vUOIYy3H>Bdzux!pJi734k{k2G83iVVquhhdw`hiSR$MY<$`B@I~iM<M0+
zl`E7cH=^P&lwcMn!Z{q?SF5<x@0?k7zPZt>hcn)vHt>@!i~ijJJ2qdZ5Y@JUkKI7*
z@qG^7)?1SC!!d8lrN|iyYe~hfh*h4#AXQ2>(-|Vx3jM&*U$~5uyU6uMJsvZkIsjg=
zs7W>!w=qZZ6-1u>K&<L)BPt#mD%B$X$dUr;I(;LrzmXI9zZ4nsIfpC8_&rqPIrpD#
zSS=;SO#zxOHA%*KZ3K~94jTzXdvHe-qpgCnY(Da5nqo7!@$0fFH-`a7?TNZj_tXnx
zqla0I;gBb*l3=TcGh?m^LD352qEXbn!9~~)wf@~|C=E+LPd}~I<Wo^j3CI3wWS3<T
z<2qY6-H_iKl<v=rUD8t{#v|(9;NP8$`uwa%zLX-K9g&JxIDgoRuNr@Xm~VXKk@1Vn
zD1%V-L0%FauOQ&_GQllov~*V3^R6m)1G=f<h&zKa8~v@j^cYv}SGu1b`D`(7Grayc
zT^YWPD#~z(A;!1HA57&pl%-z>r8<90#IR{^Msn2@1=k}N-N)<?md&%|$~oAU_<W~e
zAdpuL+!iJmEvc?=Qs?`qRmvJco=ZZIaQrc*RP%PTpm*u>SL`m8k#;JX-@tf%;<E=^
zdV2Z;1qHazo3C9M5z-p=Tf0D|LEdQROeCi(X%aX;$4?-^Q*%AFP{?3>nR>&-RSr|6
za~QRgjv4L0L8}@WB;fXDO5<xKi=K>r{3tQCyIPp3Bw(Dxa~b24kw1;F62C&27MHQx
z@dDA+8gMe@p37`Vn$dCEu8$tM^J|AB-lRlHY?@{RA$QQKW9?~Y)D<=U-Mj;vt@vIV
z)t)AmKE03NiibD#RnID3i53qiQG9QZ9vcp@qbDC7FH&|LS)~KY{YScqFNXBxZ-fJl
zkQQ^H&WsN*F49X{O~DG6S%kHd;Bjk+eG`61wf{9mk)`$t7|6`RG?mv4epASpy!m5k
zJ$@JJ)p)bmuk&2ooQghNman5JU{5<Q2ferWc;%-zKJzG*e1hNvgI+?42tGeinJ<e-
zcF9gS{3>8oBs9Qago&c|$6g*Apalh%_Imo2X{pD*xu)2jm=cKl#)`)z&cO{v>Nic-
zz<F$Z#M%I{Vs8Yy<mE3G!r4(U_8UgQBM88ggb_vb5<Y9B#~{=Oz@^{BY`|{)aYZSr
z4#n7%vT$A0spT4haG-+%XT#HP9LTZa6WNl6i-EKa`Gaf-t_PAKBW*xC=}!|HD4r89
ze#N`)8FwiMPP7T8^)2#h7kamcb3Qd0CwRO$dG<K7z|P<3W%(il3BuBom3xB-&?6(X
z45T>u!3Fj6uQY4qPp^{JnP_%o%jQ4V$X-q;vO*T3=#)NdLs-Opde97}<0w(2SHaN1
z0^kdwO#xh>FQS5H>ViFgsx((uf|A`&t=)uJJ}iJtmkw+ZAw8j5VO(Z$B1x86@r|Bb
zJ5Bh`!GrMK-GLq*ZQaA-ta}CxI`m(PM`43{(b5TzyFbgpbA4|Nfv`>+XKd<F4qJRg
zF?I{)ZF_*yH`Sfrp=|-Ky*=USpXFP6DwNjyr7QBg&{BzCX-YK7=_5=lMFY+g&gE@g
zFcdsAGRgDDJuq%@p<y^lipO&zj7Sx=pp)t}iDtQH2tBroFIuA<&$kH*k_K0AtF1T}
z40i{1_c@}b{&eF{YSNxmKa{LM@g-Sg+<uezB0g8&zbKU}$Y|TBy#&ogq{!X7N?cKG
zx6K;(uk6Rfsb1tRi7ry59@*#tEO6+37Hy4YQ3=N;GkERD_Fha69MszM@5Vx3Mqe^)
zUi%rI=f)ik&zcqP-2c)$zTw3AB=M7KaftnJYB$pXb1rs)Cq|FDoYMe8!KiCsVB-#1
zS-UIey6|>`l=tIo8qIRcFu>E8M8f8fTu5z8K)LU-9<s+4yuZTclQ4_6-kRCzOjr_V
zEq#j_%VW1|Y+clBweCK+eH%pAtVCGwTSLi20G(>nh@MG`O2001eoq6f%g40aB6O!p
zG)azW9agFVA&Bj3HLjxgkZzuw?whx9yG8F#M0`K-YK~VTajtH>#&lGddLz&EMam#P
zXm1-aD9xi9PdM_)k5dkXsNgi23D2#aW{`QrdH;Aq^$xz}?a0Q-T8PcDb(G}9?XzAw
zE8UZ`Te$?|w(ERW^`>vuPAYq{OQUfmdx83esN|<Omwp1xWmbB^Jc^m3&r@G?+T||~
zJ|&VajoAroh5g!3Y@7lOmxN_HAdkMFj>*u}rR_D6M6kpfxRtoxHr;WhN5`ujS8N6G
zc&K+;H|>LmX~Vt(Iog$JMPB#YEE_h)kv~8cVv37>gfJ;MYh+3qtz*Sq4i&K<@L&rd
z_m3~A6Rv-o2PvY|bgbKDeF^6w$vqj2$rhhK2)x8hn7l@231b#Mn_IUdHDj6)-0YGr
z_&JUWphVqd21GrhD)9!N(pT<=V?7cru2(!*s@1;Y1P8CZ1>Mm?77jl8`nM2@6rjln
zmauPL@Th5?40YRo+rf@j>lz$6mX$g9B=;dDJ&u1`son$<l~Nr~C%EdSTVAVaUr@Yg
z?>q^%2x5Lp&_6o*KB!c3-0zj5V4Agkjhy}>qd0g@?JGOUhT!fZFC6@71e=uxt*H_S
zk!b35L1QtM8w7gFI_F;^X9j4b>-NITP|hf^M6%Q-m@#B)W{$xg1T@J?f9z+uDPAqy
zOUGA;g|zlcy%AW`eG8HZWWO&6!_I3YHLiZ|hg&e*^ZZ;rMmN@VLUA>-%C<%5Q8F;<
z#cq03$q;8iJG}4cmWX{cse{&`lxyuxd7*?!8O#ta+*&GboJ)7pKSKiXhwA*zr4;^K
zBEc!;-JORkvbMp7=#I-^YB7wUl*=+OI7fETEz$ZDUbPY0fA_p`V;P3awGa_iik*g#
zW>x$KEmII?Kp==kZP$t%4K8nVwndT|8Q0Z~|K$zPYbvKgL*uMKPYT8l7k2YT4G0_d
zD`@Nqn_>0VlR&jf(j2kN?R1<SptR!!Fq7TO%J{0QyD{1LE+Y@~Mf)Qslef7GEkt3X
zahAr<xGL<xFS9FkWXSxMu~I4O^K({rBen5;Wm-kvi$YP;Z160nhX0uUotR)#iHvIb
zMKQxelV4yU94Uz{4`4i?f2h6=)xNX9Ywd2)RtoJe$FO-J*DwWC3C_5*?&gqYS|!l7
zF1QRLdp#AFi1uM5M4#uYkQMb>1pc~PI=2WZm*!5=BPDn(-@$rFW3inhu-68LDOx6a
z2!zoy`x3eMf*(+7)P9%AGA5`WVhobKjO9gMm;C^FPb!LjrLX*Kv-^#iYlxkSfIu`)
z7=Ui`K~3!;mQ`N%hq1jyDLpf@P#u>SNdK74AXNaYf5P7`v!Ms^FE%reb2*{H-*s;i
z=Gg*YY-=jhR?u72j?Pr=18s)<64UA56gy8(F%q>7M>p2Z$)4XP*9Q7Nj@adYW)EaL
zqY9uvDs0hRvn2D_sNuelz$cFRDdFeyxon;AFT?YsU8$sI7zG+L7vYM!3{S;_&Djk`
zjW)IR`65|RUx7*Gv{u303&PtWuzlY2OhGJm&a8>ZQNFNwRNz2y|A0g5yxK@Se<#v?
zW6ktlU=7@2@Pmi{YeliKWVS|%MmB9&<5kPXDOXYCgi2ZpPx0zj<#NKfRt97InmHL(
zo%VDzsr(A!eKFi7@YZTgV_;SCJtO#$`RejX*aR)Q;fM%sGG{4k5jGX+Xgh@yNyl_x
zJ1GkzeY{Kashgg%orE7bFUzi0scdZ19b162)IY99eB9Wj9(VkVczu3NWqINk#6Vx$
zk~<#kOvW7v<f5+FK=2`|mB1=k4YF~{)LmUJS&Bzd&VKW8!;L3!1Lt-+GFx4Q3_htG
z56m@S6FRsK4jer<1ayk8AQ+O97y`KV-s?`<nyj9wSBTNc-KC12fppYTd%;8FxXS&T
z<)gtsyTy)^NUQ4552MCjHhmJ+amoCg>dj-`O@Rw)Co+N3x<Th9zJl8vaG|xqDPJ-H
zn?PvRV;qAM+4dxV#QN8x8O(y(5_5fYZj^1s{!t#p8mt;fI3s@Y6e87(V9i>GDX$}L
zc}6+Hwsjj-Kvv!oxUIQ5_%Y=-32WEy0Iz^=IVP4lju{`qs}Q(XM?BdQ9oN7;V>X6Y
z`*D4vPL<A87?XHm#IrHEz5L`__1Pi$E}a29dTv!VDkUwS<$7C)$<&Ayq(mBY`jH9o
z^QniuT@HlV*_XeiPzkGy7IPj9z}v-+emvtf(%^<=*|<48H2zr@nQH^-;1>Rd;$5{a
zCtYT$B!b_H8MQU?fSxO=Bw{@w401QDGgRCq<WpSMyH$SgNwVQKWvR;jW!^MC@OnYU
zlwD>4(x=ANcKPs;Wux&Lw!TC>sZJOW?=M5>_(x0TgC_>PsHq^nK=0?`)xgXU7oi7$
z>+NQ-9gFJaQ1Y~gg_7T9vWvqUR$+q$86E_)BME}8>&3wzacE4D6wJ*x-0#6$qXUYo
ziMav)61=%o`rTIC`Qc$|4(M9S4C1E-bU}sDo3i_wUB<X5DJq5S5Ij$8x7k9-7*+I=
zay+)|IPSn&K0N+vUeo`wD|TF%(FZ(c-?)D{m2KJ8t$_ov6KD5pl&p)c-WL;`f2LYP
z8drkY0mu67n2}aaF<1WGbzpz#hXGGP2KtLbk=rvr@Njms`TfT{&qp5z*}5a9lR#K=
z>~NDprhaFse)IZ8wL}alGnPdaG~MuaU`$e)8gmjmA3uc_r9atEUrzqnLhsW4r~SMK
zL&XYu*o`8Y3xJdGj@u*OkB%l>M{5$RMo%7G6|;ze%76m`W51GWg$=iUK#AC_F8oez
zLi7p}9rqmh7(BZI2MzujnDHJ{P#f)rT=46(#uU?*`gIEH7<}zd(kI}MCr2zqmDolW
zhpA$iWWpNn09H4)!Q&WB<<|ijR*x>vg>@Wm!jgsLTG)|9O{DiUw?W)pRjZmPFb6gx
z@`&#+Ge^BdMc|^rtHOEk_GO?)mb6%wQ>tJcJswXV!@PqG;qL=fav@Om^6>JtxO_Z-
z2;+0&E85mh@3OU%vcPj5yu&|cK?lG5w<Thrk<(C{ROFD2?3dC=0}95j16ctSY-t*Q
zOTtmS#>k3`{cZE<gRb;zCGV6_O*hl0Y<Yp~xI8sU$<<S>ni<W$<73%?RSXdtXO6kA
z-&e$qNm+{6dFvh*8d2*(e^kA+<{}Ci!=qKQAuOzX{PTmhB-bjQoUaDHSEsP>6Qcwg
z!tyT9C3c>KL=7qeasyZce6(Fl+3%Ie6XbN6?pS-<t@B!ob?<5m8}z-XQk%!XGbAUD
z$(9xT6RUyeJ=~k@wnoDy&fhpn;d@J=Lwpz2@k|RjE1x7RUVddS_Ve=2eoDUguj0n^
ziy;NsAqMN@;qTcR(EP7I+QZ~GF+`I{fbzUKi8sO?2I>uUDyNn>J<%!5l#xEAiy5L5
zZ9oMZ;wnm`$XAdnumnbFvG1&^*npIy@DN$JUXz)xS3Ya9RiC)E1wD&eP^oBxzwbAR
zaoJ)`8Iu^m@rF9WIM#tJpjc8WB*1eWY!#8?lP^)F-1cSmPCoh0fv*VJjQq6!h0$#$
zgD(H2iul{+)RK`0E$HK7g!G1h^IwLa{oyYkjc#oy9Ba8^6K#y_Gj&LJv*_>A&W|Fd
zRN6soli#s}9e;dB9p_Q;j41gjXs&YbaM3_D*Z(wR;IQ0bP>7b+UtpA@ImI)4RR#{k
zK=||ZZMS{bqxZzQ%k0o9BNt<~x%dz!LQnV9r0<u<czv=+E+f80Cu(2RGWZt!cqV0c
z2mWDr$WX8zaZl<LNIO4hImIx3GEQ0{cOlUdqpeWo;YUVgTj(J_C_qm4wZ*zeb^!KH
z-7YQ8n?<SB(<R*lSuc$%HIm=tVk&{?qVuS+DzJX22W~Hac_KU)Nr2R#q!|`hCf#P~
ziIV+OUMI_i`x2VFI=af+)7llUE)v|aXVofru$>d@m&1I@mqw+ngpJ|k6Ycoiwc9P)
z1tB}n!c?>l9)hoC?2pSe>P~j?E}f7*Jlq2O?tI?GPCL31^`5h*X%lcbQ%jF!^58s;
zIu4zePI_vGUGJiUula;Je{9gn2Xs@1u^^@0f33Yp3^EoYL=4TWBGZOqnmeod8O4KP
zmnBt0fp+IfB+clq&AE4~?ejw)gG}8!R-;*rFezmoEV@+bN;Epdl}rDa{E6=L44WZ4
ztC>bZ6G_MZr2SeU`|9u}k#;su$W$oDUX<y<^Y(SWG~Loa$<=ruo07wqyu;|tN>(4u
zm}4tt!n{n|{VADvEiIdMh8g-WFkV8&)ir-Zeu&>m5cN=nL$`iV28rdDKw{Hre#^*G
zcDAQsUA*kSj<R^9!mcB)7zOasb!t3fl;<C-jNNgs{9xkyp>Mz#3C|b0IaF!c^x}NK
zeJm#*)iJ}9HOftB#c{#^<!LIP%$m<Sflt;1mwu&=Qlj^}-{6mNi<Wz=+^bl=TB)Y3
zYm)-oHyX1bo>GoEKbmq<mBz8gr1@W0Ej-|8#BR+`gMMYG9Zo=uQYFb)%$)e9h!GN&
zHy3Y1$Lh%MZ4ZhQqb{KF7o<*-0$TFBUMtkhXuonF6s&1!3~<|c9P`edpkijy?Gr{D
zcf4!NF4R!1^nfapLFzlmxFbCtLw4|GneI`xf_hrkb;Z1N=3;!t8Uv-nTK$hUd9^?u
z<urAI3&k;E^a@#R|KM=;;2NH^kR8bbo2@Q4m_BF8l|<fx0AERum>`Yxb4hRxJ@<g4
z!$MeeX8Q&SFNyp81WEXOTX5jXcajTWsC>zgE+5xt>(YVFttI<-jfb+Xgn_}%QOs+b
zHTY#s*%>2Fa%+|o+&g%VwN<}!7n>>cMdFm8=N2tKmXlkaiCO&*CYSQ)H&d`-Q7z?m
z1|!IRRXvfxZ_Y8dTT8qPaH3u2mtXXIKoJiPk9JWqaq10g%5<&{N-2n**+Px$TReiH
z3k6=D<qY1x3LM8x73W3P(L`Ux0Vvhfi@IOGR7(FURbAmmn%?+(nh6=7fFG=6ss<+;
zN#?{?<(0sGqxk`DV#M!*>`Kzoue&xXXchzxgLvREkMFt-B9NQglmr<p2jYu~9b2lt
zrFr>m){QlxVQV2psnL);OqCAUPX0D=Wme3>vm>GGL$xSW4sUZgBREH;$z#{6^x$N(
ztVK7s%gV8?wcCXe;bf;Ou!z{^Mu3DmtLQf5Ae0$p0!0Wps0!++pPAA^kUd_dd_17e
zdlUKXC(fq}UbWZeWAfzW0EROIaoLDpcbI@~j19TM*Cy57S5_K9C*-b+&za|kq$uR)
zU#<K0q-^CM7uCT(69*?#J2<ltK7x*JQzYPknNeORf{#W=AE!t{)k1N+gB`A~);_$*
z#q{f|T;_j__#|~Rp1fUAI@&s%)$0k`4eceH-VW5e53?A-_B}APkMxwS<h4Tsm@d5}
zR$ahdq{IoB`dJPx+q8`E)r{ao-9~09*MP?X%fIruq4dO{R9vOZ9iKJEh}E^0k*Q4C
zbZoRD4WHicy~KNPE8XoyOLG5NK$)&5Y`^Ku#;x5x?I}(c6~)+ml?@TAI5TT8`_PBk
z0$FUydtLbEEA>MGBckuAau`M}PR%`U8ySJJb0qrKIA+$VAsMvJTFYgO1&?ifY~?zC
z%vRLV`*)2f7_{H<^W|@;&yTmang&FU&m4)ql*GsgNs+m_n7bYd0Oz#H(+&XiXyF?0
zbT;_79rRD7G)`%)hq=b858<1;3!EWyKiB%=;lm6jN4<iZG>vR=SfxED>b+DR_ouhz
z(Qk1|EP4PI3LHu#=08{azYob=bR*1+gP|t{dQH!xTI3NC$Y;LCXx~f&I})P5vqA8=
z+1HGQL(mqj2@`i-DM)<RReyq;WYJ^?2H=;L>IHo|ix?x+Hm;$g8NWO(iO?~y)BR<E
z-*UJV`WL)&SC(=#zs#*5BqR!KS!;>_WmJRd!D<^KDb7>Bk=%S+PZ(Rm3>CSr)50q+
zJ6_?Vgjc87qM}BnYsBHFMtl%%Km97&v)tAXB1iNM85=x}Uh_S43WK)30WQ8r{${4<
zL9l%)voPjjyUX|u1OLEG568F6lGW;cl`2TTtE`_SNvk9QsfIY)eZ6T7<g928aAYo#
zs)F!Ic8+KlB@b6#sub>q{9*1>Yxt1vi~kz`5paF`<VsiFpN6>K1GFgkf;zbH2UW@_
zWP(#@<+s*6^t%K_5n6U5R`Y>rKmi}%%N&@AbRPN?%_r(|{X>$Zh=3R*v~X#)2Sxe7
z$Dt54H;p)CqSb}2rVs)rA`*=krTGM}<ICP2JHQCB4ks4Vj15nO`2}R<CS0Clpi&>U
z6T$#gK?<HY5CD}90}JTP7a6LVS=ebS)4m(YOu9R;p;1S$*h3;c%Q(@w!jKSbxL;_u
zwgb=)t=PU*Ri{EQmP=sxZ4>MWY&nxa_=p)nJE5lCyRX@kdDn2e_lO*(&cZl=CGq;6
z<SR*3s^Y51#$G_kKvXKM_DT4bsrijMPsnqRc*lwv<i;-vNmR!ib$6>cn_B|#6-LeZ
z3$w3nH|#)ItbwLona2?mF^p?NyBdo%{ZLWYMjRYGfgVH{*rB&!2Z1hz^uq`HYkb79
z0=Yr8L%(pj!E@ug`rIy#<Q3nv_6Ez!A~2xdoAvMA!?Pb>zz*4AicjlDfKXA@yeX+g
zISh&yk+_0G>4#y+noyU*sNPG>Q9LO!B8n^-b%b2=W3faAHr1m)rf)#o8!kqnG1ti*
zNrLMg!$(m!3@4Az%%Y%)GqPDI2(vsd&3t#a`Td=zAT1IoCT|XHym4!J%6{zIbqF9t
zC}cGEHRg9SAR{0?S@yLDsl%T^9DG4P5JM_U5J@TPapyN~-U|n%&%w83clRhS{D6Ew
zggA1ce|I-$se>6Jwb?&riiYhVNv{9{gT(cpy#UxmM4%!#(IG9N=77P$K`pVJg}&oF
zUK~n23b$1X_Am)#N;4irTSD3}jcf^cO2FZh6e~12-h5~_G%9Zo<~lFcyU+6Oq%XXJ
zVD?63T-ZFpRPn~G&hSS$JT^CS?X(;!rK<<;oGBgwc_Rg-;mys+y<PeZ4c@MMrMlE;
zhWv~#V+L(TzBD%FkG;JBLnuzw-E>_g3bx=hxv(o~>UHfgk-x*hK1(IuDh(0r2Cf=D
zWuf2S)DNP%6pIHEoZSQb+<((a0aQkloEIu2lq)!fQ@mW6-OPMX_Jh3m{Atk7{Jyo)
zDAm^-S?V_rsGmXW%05PyY2s9rdIX;x<Ff=+Dn3;BIfpO-3a(CFg%P<c`fQ>+D?!~p
z;~TcGbs7L8NC}Z1R!j_O;mI$~ya<skvC5bv3uFMWc81fps_4qavPk}I?!iCHWuV|H
zxHvY68yV16ISTM~7TQYqbkmP&N;cQD?<q)NLHT{nrbc^qf;27mN+9@fi85e!H}Fwx
zZdlGP_KUO1*GX50;)y9Tg<CHoo7Kd`Np!Q1_MC83@!xzti3{2OrJI1-<B_|24Von4
zD1O=<p}iR|<uS&>U9=a1^1FZ*9ob*BnS>E309StnTzqdx(B_7FO|Vi!7ptW};4l%}
zt4@rpma;6&=}0~)8pd*Am(enX(par$BB*g9zF8*bG$I>_NW=#`IX8gG6&xijDhZZs
zZ`s{FJ`R+lq5?z$mUf{SC7HYp$}l#<WQE_Ud&^91;Hrk_pubD0x{`6lc_|WR$e&Zt
zNno|F?LnQp6Ga;#N#Za%LL`O$V8`VWO|VjG+O0xU<Oa&5TeUY2!0BRFK>riww*7Rs
z?>tMTjKYBlWswHfNM&XTl~4x0wHMY1Q-bS!izSk}AoBj;gXK%hXXp)y_}p}4)V_dy
z2A>5=v&Zq?!WN?=e>^o%gs8}p>`s6dg@<vb3HrN9>n-{-BUps6uvtiCDJh#qXHOd>
zyYVe(h?}Ndb=WSd?o95YpL@0%iqWL=*7_DRTDe+s;~U=ojj9RZ!ZK=aVaN1=4lh~*
zYuGNe_pI`ACccHD(LP`)NuFBvUs;eg?*%!jgi5o)TQrF`Rsv4qJBr}Bz@vys`n9Z<
zg#u;wDtmU{s11@N@y-j@6mvwV;iWS#g^Y&S$0UcY&cr}5+PUr+==5_y$OCC7|G{G$
zH-jGR--;eDBjng6yuOBa5B}&2K!Bw<)PK0Iu7iS3jFB_6#M%$ur155@@)bY-bYv5y
zh5bD52VGRZVECpW&Lo0eB)c(>MTlb0xb1KQwY;40*QG5kAd)y_&D?1vDpW^p+1J!x
zxM1y8r!OwZ8d#sK|B5aHx9*Phohf4=UeN_Np!L(QP^!ejvkV`Xkz?RU3GPwhNp(;o
zNg)pGWh)9WWoz+!d`RKJN06*02~Sl~2&cyfQIhz#O?_h6tuuCzB1K<9B<^frexzC&
ze!dn9>}4YgsP(^4!G7NubvE#ME$QDZnI~u_1wjt47Wmxo=g&`4`eKr#w43Ts7r{R>
zf4qC^x`$W-Oqq5UP();|ub)?vR_W#yFpc(F%*j$)J39WU9LxQ*BhN1BTN(;wa0P8e
zCYfFgQ|6XZM5v)T?~NRrKtUGC#db)aP^esExAoMapt;DT?Z#aBS&?e6AHDOz?{H4g
z?<<q0(W-DBAzPltE$V;Ekx3R|+Y$)s!I0TuvyF{^^^YxkIE2VczSl6WvM-f?{sf=B
z)vktn)dO!FU<#XFlinFJEOQ~I!N{cifnQC}O}%esV0dC3thjun-Fg3>%>^p2o@Yy-
z-zX#vdrM<)=koI3?91B1-YWJe1Rt?L?~&^5{qO46AqfNn0X`r5zCdhD77q-Gkw{Kz
zd?Sp`>r~1g(`Y8&k&tJ4OrR%X<U5{*s58tbGy}4mJ_<=zm3$U1A+ENsx<r8IKoR$`
z3@Lx*p;1Y>OtGs0xnQ=t4vI{gVU^p6i*nbYz%NcO{T2w8Xuj($xQ`}02val&mbkth
zI&@b()+pIhC_~0K-v>D#-^8B9-bz|fq`Ba?o&L(f{|3{;*fNDe%?8vQ?GMa|6W+JR
O!6?Y6O4m!8hy5?c?t!iV

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/scopeMapBg.jpg b/subPackageCheckPoint/static/images/scopeMap/scopeMapBg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5bd8af8347cb46e249ff083a2e93eae9aaf7626e
GIT binary patch
literal 261356
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
A?f?J)

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/scopeMapBg.png b/subPackageCheckPoint/static/images/scopeMap/scopeMapBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..3090436a7f725c53f594a85107542b92ebac3fc6
GIT binary patch
literal 68453
zcmeFYXH*m47dA>qq)Cz9lqR5r-iru=^d=}MARt|uC<%lr(wo%KQ4s09Lx9km^xi_~
zAdrL_AOtSI|6TX{{qTN#vu3TCIXQD?&OUoTv-f`XL>lO6P~K;`kB5gxsrgFH2oH|{
ziHAolbC2+@rJpcQ?QTcpprWgShgTg>er-*BcaHC6r11i;Vw7zU504PfK<D+#yGHj?
zyZ;}X{eOK*?C-Wm2B}A<=&<Qgp4Tb7rpcloV;&i%N;^m1oxT8mduA0MI6VB=2=cYP
zkJltwz&w%vZIVyVz%>rrJlAl1aej1he0*{C*eLY^dx^d{Jv=$QJ4RickFAeBHcDCA
zSzb9h+CADShA$8O+dI0%#LZ6RPR{jgZDcOaO%AQJY_Dg`O(l&?eeeC-0AE91oc~;!
z8rnj%?rbihk>w3z;2+K2DRm>Av#7}@i{(QH$=os}PWyF_+!{LF8@k*Yx*i#%JTgdr
zWC(F@=;ks=x_kIXhG|^-30(S#o=x3fntDRphtqo}Q+g&6yT^T7`*QlHGyA51&Aoxp
zf%vY`NZ8-#&Jo=8l^?YK;_~w5<|e&&;{4+DTiehz_5^iyetChqJXt#1X+uptyT<IC
z9dCIwcDgmdjt}N{j!?@rBm0L(=sBgc?dYRL?b8h(_#Wz@QQ&yReEo3u@(3EzIdp<>
zE}UAZoLOFn&7SRL$M=u#&up};uI&siPwnoYW+YWA+|TxpPq!*D$LGV#+tSuK!O+3g
z=82=NL+u)1|N3U*!m8S*-zfOr#bH_A_#CqR`O(49VT;7o{^;pSCaPQa>U4N|{a@F@
z#+$~V!wlh+(!taD*k98PCyPZ%6BQ#n^Cwe*?lDc-qca9yOKhMKUE_$OVTa_wNn!K!
z$e&%vUyA5{^Y)<y`1&@wSQp%v8UDARY!L=dZ9g4|b?ZzhZJS&;fY<fR@tdUP*N+{K
ze{NhEIDr2>9nJ1sA3I)bnq5GA45@h=P|0nWbll)@RBe9J8JIRaH9WHz&|FiH(}h@Q
zIBE5&Ebc$d<=Gt+8XWYg9?BRl>K~Y>JSYVux95(uD^wQiZY;-5Ph|urL;iFGLmS3^
z<Z3M@Km8W%X_eF1o~rn%)I1~SQ+848Y}1d4YV*{twuy#`vg!iSD4;~HD{7j%WgGMK
z&IUBU80i_~k=`RCA|b{nAf&iYPEGlM9&^*5=qb6+pU<K;w}Sd+Y_rkCl;@B%Rvuv7
zwanWfvHW5hF;umk-ha~q*+cHN06pfryLv!V$?WHPcz9fRnrbSqL5l}%WCqDQ85ma{
zem>!%SS&#ld6arAAIosspysHwG5w3i#f;yrhvC2XC`SpUo{dOsF&uCu(}yykIt7EH
z%4EqN-(Odu@1%=tC9-+{s#jXpn13e|<F^x=^l{Wk+<3M2^!Na$plb^lJF86BdGTKC
zcw_9g9l76v6t#WM_23>6LGb_G{ht&;)Z5sNht~^1dAXlq96b8t_`W}`Uy*LB)Tpxm
zARVOm%EiGWJ{t`B0ewrlt|At~9zi-7^}oh>e2@W8=M6L{2xL$PyMeyNNB@in!};tH
ztg9s4!=40_N07dxJs69B|L8GC`{eV<pCBbiU%^e4;(PQmkDv$bT)zulj}5qpW7$&h
zo@1!}(V!4*d;_#2C)r-tKzvY>=LUj<g8s{VNN~%8<Bi8JVG$J8f!4q8hPT#gb)3!J
zN+#M21{p*+F?L_o-aP!uM-3aGId>>{(h@=Hn3r*$@JkqW?U-wkOZ}OZ^#MS6o;WBV
z&LARz^N^1ePpQR`@mn^;(~VdU`g%K;`VSt+XHxj@mDgilg3F+BaKLL~*f8@sp5cz2
z<%<yAT_WgklDBfv?Kka!gh06-(%EjlR1luPXD3F&)_bF&MT~}dY_2`LA=EGp`9p;&
zZJzA#OIXx#erMDCDkBIIUGLR>6OG4{0P>vf5V@bIqwwG%@9b!=T=a$m=pn_XDz_7i
z&^X~`tK)p{w^8c09v<b-n)}-{FE~K)Hj6meO$^V`<J$vAF6HAJ5{~s?Oi^KW$XC9<
zw#+P?(YTjPK9LxMd{|S{Dt%DA*kVDKFwxbzq);LRdb}PDXiu!0#Xa&IAZ3vL25UMU
zdV=PtudDsAqwarHBI)wxsjlxvFQb+3W%*au4Ux7MKY^{`AV!}+b}5zQi`8CgGz=^;
zKI(qRRz;^5_b4Z;Zj<uwh?Vc&7Ub4xC2WLMsy|692JCuyzvYB9%|)FAh)1cI)e}v?
zffxO8k-2Kh%<6^M&1}n8R_Re~9_G2C8PhgB-6u*&NVI8hPfvuZCH=Qf+xPTmFJOeI
zi5K!A><kAo^`h?W7svaR?r`YkSLrQ!_Bn?pAFB+BM`84w$KMpC^zlDC`G0yGL^|*|
z+1qVi^TQnUeYGryhPjLSgX|0e@fUvhf5EPUQA|<4w^;%xdMAa-vo(4S8POb_b>u|M
za)2-M{2f;+WWD3%_iXIY6*D_c8-Fv%(yku^!n!^@5+(r$AaJY-K@75WUgq-o4{FZ~
z{^^jw<=WDZ64(^ai4&MG+j%B*%ZVS46Vq>BKIqYh(ua^v=6&<lAM_j~-I@Mm$8}G!
z)5Y7&6P^SC`%vTgs33d2p5{UNtrG5m;ysoxofv}@?R&LnP~6OH(9-&Qc?JG3M<bW*
z-nJIUk)B98nIDYC$<*(Iy`|As0g<E}AEI9`I#u=eJcXZja$i3wk#>;@niFAD(uhB~
zS<EZg;9sY8KMoeV)j_QDa)2QChY|q_RkpL1Icp=re3X#xDKV%uL?xZ6F~DbXJ<^RV
z<NEDUI=4(r^#0xvsREiqr88T+q1L+JF}Ef%by0NP>>=|(erufZElszw5*4|G3;z|5
z<FRc>AM&jzt-9qs5JHi5WX1i*kvVn|Vn)nd9~T13&S6<AZ>2bT`?HfG;2K1=-kiWG
z-x7n(zw4d=CHzdI*~)kxSs7s9hLHR9??HYT^O_T*zPegw1nYIwQPX!FrM}8Dk`&KJ
z+q?wSP>rXDPhI*|-k*JbS-n`aBQz+Y6!5<C*NSYqNQjj_lLGrC*-gTZjUii`s0|N#
zNhFvQ&P@-juESRO)aE6>dSdU-$B1@50o&Qx^(tZJka_<2Z_nf=5&XSkkvnQid>_K&
z$X+Q7oZthZfG}ZNr+%ljy1fvwcC2yi<;M~C_hv=i={r?FD`-m-lMTahq5m+I8zdcU
zgm6^_$e{j%IyfFvE)4K!+pOn=`A&eMhU!lbOLrZnDZV>KJo;TZ@OeI-P2r0~==d*c
zSBAM}f^R_fywd^7>un!TR!xL$s7?;$V>)$ZOGTB8h}>`Sg=H4iHhYr=LbDYaFnopF
zPC^uo4H8;6WgYKx5@KW@ij(=4R_{FW@+Hn%dY6M;@xoKsJg@Une>74{@OakBJ>mp^
zOzJX{?pl;nVt}!-tFY4ascv7mF?uhV(W(oKu?pBPZwxpqePd~s2=)FJ57G-^?3Dk>
z7-rZ<efai=&u{7Ksg_RAS@MR#{cw?JAfda2kdu*%bmbCL;~+WIY7^&y3U|^f4t%@^
z*G@_rSP=RwMqCJ9`Omb+G8?I|R`Kgn?e%-HFSQxL!8<w<Ffb2dly3Rbkv}A6hS5sF
z2zOCnYjwZT1EIeTb2z9GWcFq6CMOIiC;d-V(ioqu0%%)@<lkLH#iPFNOMS{|^jwjn
zUWz<AVksyLN%|oc0EfnAO7T52r|BljSwaM3UPX)f)!o)~v44!43VtJKveFiA4Enm;
z{k~UIp*!=`oDZEbH|M%o=Qp^hX}R7uFqM|ebZ_H((#G(Eh|2|tr?p>4&hA4pY40xk
z0AiOS&T*cKrKSMQ$@OXq1n)7`MQCI*wtzj{|GJd({m*IBFV0^*>-WEz#;Rg%A7(uM
zt;%T&v!$w3iD6+tN2d9=2NR+geK?L6lx>dhkktdgFB<5Q&3FX*j%^6K4vY|_dr@$E
z_LVgW^7K5#={o`CJeYpG{h~a|#`o+xX_=e!q}HOBsRrZBE+7yP)cC6)t<mL7U6StN
zqNhoQ8m+YMKj5W0R^IC(3J9DK=Z|}tLYYaoH&x45(M@`E`y+A!rHXSpVwL9Q?~Sqh
zp8+Ai)m8djHu_#2I=$q`nZ>YuSwq5O|6I^nLdyEur6|~_IF;iG6sV7Hiu(<2XQBaX
zJGu&CwvR!I?ZYq*rNK=SOASuVUjf|Xh}s5QjXwDYOm20`!@BYeOQNm$&-1?eH--NM
zaYk*lKUDk&!6XxE96zh@Vkuxyp-_NTrb|SID$w~h*t{vXh$4kRZk!0c7hl^9X4+3j
zB)s&d0uCP^S=4bzo44xwEoTnf+Jb^e;oa=On<w3WaP?6dAF0O0ob+YiM=()llvfZ6
zJpOWu=x-=<PNJ1({nr!}_|-6x8YFl8=^tZj^fR?*M_Yki-?SC<bK_JhH<&~u9uIhW
z6A~TrZyVeSc=}HojXk`>e+$DfE%3pg`{K4Qin~<7L*WHlv6>xTy9QA*)(p9&MT4)+
ztJONU(9x;<l@<z4w4|p=D_h3}$xB?o=eg4E;`xE$6NO&y1G9wMH><7|s!$Yii-3*N
z@h3aD&l5JNl!{kyd`y)D5Py-e<E0bpIPKuiD_iPA@Ka`{qP?Y_X8B8Fs=#D-fv5F?
zUg-U|4CwuUvpykr9$tV&wfEtoq>Bj5pFz*kd%b`G_3{Ubtz>E{^N^X<{fqDR8%Cdn
z(Cqh4IE4#HSZb@avZw#Ckrg#z?|+6M3JkU_$vig!m`siOk`NUSoba6y-e+T(8CeSv
zp#5@+4!>kL4ap#vRrig1(?7;t@pX0$g8|_F@xIs;R$6`Oux_vT2HiI>@)HB60}@#7
zoyxw435lP!*VZl};-^^7+a@?`F(!02G8C2yD3~=UT|Vhtaz;|_J6sfT>?=<qY;JjS
zPrlS!kgD+2<b*0#`R`c$M+b*it-r4YXS8&$!zfRlELJ_T%<sG<cJ)b0$PaSksZ9;v
zu!x~M@@zBfCRXtFo*kF-{ae@V8n&~^$_dFjaQlcJ!=Avv^9bRLb1Tzigz8Lk)(^vr
z2@Yp}&)XX)OBQgcoqll9>&t38&ZqeyN>p1iy|qX{BP7k~T)U+r(s%kaNL!5#MQwk+
z_as_dTi+69VrnlqDr;%(-<EOlh=sdN&UwZw^$8gmG9=%V?jZ`iK_CloS>Un!9dWBN
znXd2Nx#c>=Wr`;0v}tk3v9S`BQ|8mwS&Q^jnDu(i)`qXCrns>_F5)W$0~wKMmo9sr
zefB#`FI?5SQ~?C)D8Kp^<^ke9gNTZhoTY#7rUP3j#yaC4Q#}a_ZT4a}wkmCc6>X*D
zVHaQ=>f$NNrVHmp1K^?H_~Qv9J~V|xLyb1%dvIoY<onq1cCo*$QNyDtRG7SmD{j)}
z(J9jN9Xpe(?sj#GQ!BEG3H>V5r|Y)o?S8S1;z<x-1S-KA8S~`CIW*n8s;Xr8zVdb%
z>;PCi*$P1Elf4aB8ftt!4R!eWt}zT>p|IOld9>#mFV$5{Tkw5_C8W#7Q$|3XKWh<K
z1<xxIekMNAF24DoL)n$$&8_cprgoox7K}n707SanJ#Yu{xm7t0i;UV5!mMLHU*b0s
z{`D_*4Z(c+e_-eBtDgvJ4MX`V?Yt=*xYVC9qD>WX^1<i+-EF0+8dU6ZUq0jxxXXg6
z*vtObHkF)BKYtmZ`pX0?1#S7*t2O}*X$z-8LJh-y`mgsz*~G98?X+CmT6$BN7QN0u
z{t6M`p2#62Rlbr@W(;rNrcr50U(o*}`dAKWlNZO~DCZ{o+o3c+TzTlLVqQQlSH5yv
z%7+O-pfMksBe=;c6RdO4cmMhY&C!Zr&fl%dwgc5O<`QsrTylcTSa7!nnzn%Ws|n;i
zDBeV<as5#EJyqZ`PC8yo`7*Z4s2NbTiu+)>M(lj5QTGKww~+|Z$=H?r&(%R%J0R<x
zg!q8}plV2{D`qZVFcvnO(&fP)t+~x8pWazV?Uwz<G(<`8PiPtix6Magb!NQ)BiuX4
zW1*$(G6j&MKBD7n?fSmZ8J5f}@3fw_OkXSRY)pP0Oq3=cdd`O8o7zyT$EkMaXoPDP
zh?%S`=F+}rSM)#+go9w6Re<ZCEzr$`L9NNclW8u=?Zo5NfGT+*`8mUQc1;ZNn)czn
zs|athmxM}6Zn(tXCNH4acyYYVscwt!&HD2fDxznfEi(;4YD_fm;<O4%4vTb{+1Y#l
za%?D3Q_C(eT|Fr=pkH6iOmVH2RaW?nhUIYGc!z)5V!0|W4er7!U`*d={<m)B&HX(l
zS@}|Lo#1aSe&K=$^4ZBzqsfMIIr-STh4;HabmFiW&IQ1GYYM2|Y4xy{@?$y;!m$JA
zWdP$dhT;EA5|%x-e5Ai}bw6oQ&55=8>f}5bH$#N1k4t_+!{9iy>kz`$<7i;y%gsOO
zgMmvQ^#Wmvr)FVO%X4p%Y38)x<X-~eIf;ot{C-@&;5)79T@R$@_Jd|-`A4ljfnGjk
z4^R&rx)_0ShoZMH;)JaoUe`>?Yph}LeDO?d>k6Zp&0^Wu2P%a>oITxr@OQKN`eyiL
zX`dHbSZNe5SzmeBBOTlEI`>rAzo%53Z#uBqE-*C815?zcxV76aT#@kLnf-BC)9;5H
zxD%>#4&=5Hrm<j}jBJGXb&pB$MuKIbR=gOnpWr$?6lLd8S5REvN2#6Ee{w7=*iM*g
z9fZxgh_XmtkaX3ph<G%udcR<(WGqr{+1M!V34HEdbCCY~3^t*^cVa?!X2+k;FDRQD
zu-a+4+8{NR1$)aB6*W-q>2HbtaXHU=)^XT20b&c#NF?J4<LaYP1-oTj8unW;MhPa?
z>OhZ8QV@kCYj}xIdI|)_<h<Z1fOP0M&9J5$^F+D}=k_2hKKqf1s3zI@Nn*Y?$}5i-
z&8QzI7R%{Rvya}~|8{;F*aoar;uZAacm5%<PB#ZIqY;Arr>-B<tEX0xWdmr5u#~8L
zTv7RaEO-WelkB*;vMD^kCFkxEY!3%8mLDAp)30{IyXk=kN%bDi&lbqitF_<peV$*m
zMefx@4#7rwi9mhDN#|3lG@ib;W<OEV|5i@1#aQ^Y=yK`cwumm7pj%2``!Ys?=nx~9
zWvD5CPHeHeuRQBZqO;x03rN@5Vqe!uTOZA|6Im`T8N7U5`)bixsceF)j{v$`A(Kp7
za8>k8N%Pw~zfS0xrZ#`%8vB7Fn<uCCx}}~1w;5mRIWF|hC!;a;MPy1pMzrs3d`^i{
zQgt-w+j!^j3eF$(U;n2bh2A$dO>+o#@g23PiUFR)m>GjmWVHFR@%dKn@1u&>tY=|8
zO`E?p363muvhd|{jlS%N0Vy!Ze@V`V{8FCHAFbMk{}m6thv(Av$^~WYL4{K6anQMe
zH`Bj+nX51&gJPmgNNH_nor?IE%xCS~&6319C4bAW6enW9L)M|GgRS-_Ez%JE1lWIy
zF(k%>T+&ayNNt=t-ft%ir$#CtPlTVH`A}t!to<D>5oxv7M?tq0GH6$>suq76ioPS0
zvMw}<yPztZsp`SWQZ26no+<2h;&$&Yrm~Hg+u7Q&&kwDLI-X2S+7V7pk1GE|ZkO>T
zNht)X$6kYq{Jdy<{!3Q9r)M6lnq}GsO**=h3WeuR3{nQ!mmvn}-5wZjG^?pK2rbQP
z`E&YyArup9{!sUK`Tl9xDQBhNd7)ZI-0RZU%rOoHX!hbHbtZ?P@xqwaxn<Agcu46?
zMwUi_UHWOmlV{tmEPRJ)aaM=r%3Oqt#&O&0OAOQYV>f(aqtFIFVn&pQIi(^pAYVSN
z_17ZSlARKGVC*XL_!VFFd0?B|flS(CYW7FlV<tmvLnR+Zpwf)b?EBK0BE)Heu|yO=
z-Fo+aNkZWA^5+LU{n6MCOST&JWp28~BTJb?;Fc#RI&wcLiGKow>1EbOQP8h;697%W
z^n2b`cVW5I`L?i9y!8$?_zbod;A;}|z_(IWg&>X3COuN0gbE~$US#2esp*z&-!=&e
ztTwh)u|^GZWS3ojoKM+W?f|?rT}-mt-m-9-bXh5!k%s7`8pINTsqvA^{3dJ|fbvg8
z;Fs&RBz|qJQHv+yw#g7GM*AJPth4hW9QUFeOR?Op(Ip7j!SoW!0ibt)!Mm9;;813z
zMe(nyPe_0TZScJ>vu{Xz9@=gW9z}GuPHHI}GR9Yqhse;;e0_DL`LMsOcHKXz{`Xbm
z!!}`wCBr}ixL>U~+4O7pAn9+~4ZlJY04io(KFhS59<vyw@BQu*XJFH9)h@*H<8LU7
z<U`<rL}lj&MSyvz44r6G{Mi~DC%<%)50i|i`qdi4B8W17I{u+>W-EydPI&j;adz}r
zg<F%B5X<#C*Ui(UbhXkB8uG7)=(fwK?q}Z#N&pE!BRDoXaZXR2;y3$%r9(gG41MO9
zB|nxj$&bREB+EQ=+x@ZU$fpqpH|AuYPf6~h!YnE`LUaSxDZUVdGXT$@O?@Y#z#LW(
z;?)}zGQqWeO0X19arAw?_&}Fs%1r@WUTL&ax@UlO=M^~^LLXJc@snh#GdKjz6vkp>
zE}4*pad=ZN%88_aLctSiYb*Zd**zwHq+n{}W&UT~9;hPHKQHTP+2%@9rl0wGn8%7N
z_gD6K#CIvStF*hw?QC1LY7aAgqTOcKD_si(KaIock|*1%HP99bJexd;=;T9M5>#Ox
zpoM8M+2CIi++|lr?#gw8@~00uH7KMyog^ncIF%^Wu+1)F7gx7!l?zRznKIF+4=C$s
z>^ZAJ<mr+Yf)#0$amw=V|D6xU7>n;{eK`E=4;smFil&g#R46Av=0{>rUg#3>Am0e#
zI|h~$J(S}_YT1#<_8~bweOm{st=;fSL|(e{g1#I0@I&bCZi1*|x%uA$W)oAQZr+iJ
zc{>$Dg}g+<G1;cJYybU8H>a}%gx9EUtpp0G1S=W$GP#Nw>6dQ&2jv)t-KJIO+I%2h
z1ZGO>=j*)(S5I;$e_HJ@f1>?rP7DrgX;Rkc_kSFT9nHqLJ$X8+)%+|mVOi_v3}@j<
z#dp){h)(tm|9VzTwtS<hzt0(oIT^=Tq3V4<M-vSS-y)v+D3$%cQ+?T$XeDrKJWyu^
zvL6gwGbN}`NSpan7sXrquJ=y)=`c=TmK)vLC?r95b2jfO`}3uJEdPIE{oX`QUF!RW
zX50g1`n-cFSLwKpmgzx$AEU$ichXE4JXa9;tsvd(gt^H*bb;^2lwkT_G1R54vcKC&
z(nc^r6gf$eg3)6-M>Jxbt#)Gic3oq?PdWD_+rMpEt;3tW&bE<FZo_D?+eo0Pq=MVR
zH_TE(v9q6G=0A;NqU2MTMj|Gn0I~1e3Ctb3sDN>`f~6A1c7!FD^1Yw<<WO1#=HXoG
z!JT|n7!TNrEvhzE6cpY@^ex*)m@o+lg?#AdTl_#b51vo9zkUq|o_F!&ekh#R?16Pz
zOn;!G@cqsNd_3|rZLgPo2gi`snyXh$P)iLOS}Ad;B8y6}&bH^P_%jclq2&J(Nw(Cw
zk)Y-D;tR#{j2}R%Gn(U3U$$A)Y5mBwrE2{1;TTSK;n%eB?kx4M;WJqwx*t%#U=}hX
zKbmZztE%xq_1HIX&Et&0n6&yjJ;Y|g9q{I&N6Vn#gOzA3ToqPxFCiAD#vjbA@)_#F
zP1y2|7|dz1EPLRe!HRLCH(=l$(i2_R^knyP;<*DA8en7FSoYpFd*~BxEmDJL<>ziM
ze^6j12kP&}%|s&sBg@|`UwP&s>A5Fc7r&#jC;o1v-3>`yD?zu>=MQcqa7$BL1e5GL
zOB%a(>6L1m#(0bqf;i74Hah)x6zSFF)%Nl~KWt5bl}L}Bbl8!}1?LhV*`#%qz!*fk
zze6}>l(<bD;Efe*Le6%jD#4atq$k~AL$47CKrR6TB46at<a5uc_YAo48o2q<c@u;K
zGniS$4_yIBdHIJL1H`^}-mMY{jd=8A*5iJlzmaX1%MZc6m6G2o)CfhQ^Y#xVV{oA9
z%5!$T!tOk#7Qe&A*hkZzM8^u@%a!`(G(1TYa^matL@;d8x{~*`b5t8@*{Am0(qTq7
z597boP@Y{#?_CA*E=(Ia&=ZqeWQn_IO6X|3-xQAr^v<wez;>lC6+^-O7as6N*H)h)
zlHeR()P7QoBpdA<EgnjL6>hs-ks|=ZHs~=jDGb9;00s@TToK+MQRM`v{BZd<{GA7v
zua}vjs|ul}FTU^818pe7``0!$F5a}O`UN^Wg$=_6-jvcYd|r|t#5N$K!Py#AD&h(+
zec~N~y5>E*hcO?^{B|P6VOZm?Y<345n?LT1o9xjNg}z7G^WoMs3dP;`d2wztK^<1A
zqeq(6K!iU%b?GN?U|6s`0QI(L59;d*swDn8-943@)@IBa9O?X9uk!4x`semW!C)X>
zfW+ZScq<-C{+`K<_i4-OpJlJ-?cwvPMew3ujkJ#F(N|EW!OOgG{!w%t0U;_ssC5j!
z2h|UJr+||8UgpXO#mwY`A3EYx(%V0pT9rsXW<H%w-|(fhjCub^cogsM0(nl<w2Zj-
z)lwdaKe)rGlkhs{%Gjz6>t@m~;;WVl+wkJhqO&QeA9eJ$qi>Su=Iv)j_}3j|_sWOe
zJr_mDYFJ|*s+!uiZlk2lI>|1Le@EequTZ(k-=dQhNzWc;O(-E+r4F;h)Km-Fk-Pv*
z3~|S?N&}($raJ~WL)k@nW;>nD5M2)V*9dGyr1EIQ4to&wJUo}N3P^&y0adp6RwoTe
zy1_eI`1;?tDP8p(?%S)WE-~-5yU@}&T%S<ENW0<8P`W1a<54ZNd=YeR=!p5de{&8b
zwBDDlUh*@c&zxF4hD^azod|{J_o0a#t+zhfiPZ~)Cc##{hD6&qkJ@$;nzgkLV|Z9s
zdwYO<s4N)akxDfXfO1<7^<l)jnGKL#j~nv={Z`jWF0iS5hFNIMy%3HAaw##L->?w^
zkDya@vD!Jd6<DE30r}KZmTj#M>RHUps37RuW!y2cH+!g+DCEt+iEoNC>g~5xJ2Y~f
z`wam$T3i82jz>M9y@n&sxyV7EFS$pHgWM3{6=cBacxOm>{LnPqM2ja}bgqZSfd~|+
zLXU#^1)U=|vZL+>#1O2mDL~y<f8ow{$Ln3X9k&cG=dpu2&V^~C18FYzlYt#D!ZYp&
zaq>bfMD{SEgU#rPulv_88+I8;m(l#=YG8Iwi^Sy5G4!b9vz#8zRosa%6$oa@1ayP*
zR|YI`qHgG78}Hv%_;Iv#PJ)9cbSNe4^D|nGvV9gd<1u)_r0CGY>`rV~qmK{90nOH^
zCv6eFl?)g6W_}yO;jAwdY>;)-4}RV=oO10+3yRM^KVMRjxG4QxgZYv&S(NWhu!D%~
z6K@dAz#s?#0AxQ|KeHSvMyA^q{WysK&_Zc{eQ;feD(|;<d*&(0*t{Tbd-QfTmEVI1
z2=Q4WD3^Pnbz05KwWI8S9nj+9H0H#bFt?GK2-KATQ%7KaKH{7ikEeU+0ELbP$b(2$
z1#)vl|H3`t<fr{kNgU26B$)XUCiqJ{PKC|>!9{o*R3H2<xigxe9rL4fMN;+us|EOb
zU{N5(JX6PBe8jo})GfQv+sW=n$VQT8Qp4arpxfSWPA3kdSsilLSEr%mjC%TM0MQ8p
zA5;+}v#s=Xn1v||>cV2`<LHGjtThl3(hn{3=?~5o1tMbxk@&OK;tYD3EJdBGui1WN
zx7m{D-@WaN<WHeT*_pt&=c<G`kc$t70C)HbC7K6iYs*kZpWrCt)8Pm)Tm}2K0Ih$g
zvpB3LCh>`{$1uV7VC1x%6v%u=pd~!l?pTk2Q{3U|FN}6XH#BClb!NC#P_;6@Cw(rp
zGVQPbdpooqwS*3$mrMCEG9P|7{|>GJ?0g#Yl)aXg1P8ow$f0X5|M-iR!=@+BGi46m
z=BdtxB7jA!D?LZ%FT<OCc0?}Hny21qX-c>)cl=8kQHt|#W_}Gfk@d~)haauC^1z9M
zAp=mgf5AX$v=@Vp{##j-^-Ya(znqHeDmn4&25~WC_t_uR^LHs9?+sy?JSTd&C;sti
z&3ZPABNL2nKtDG}#C1z&f+SE>UpN*<Y9Ma(e8a+y%PKxTKED@81urHU!&d+t8C65b
z&>K7_qofKqni(PvNI$q*_a-jYSh!sLjKBVh?asrfrxInUlHra6wscMfG4d(xYM9BQ
zZwQo8V;~>?U?AybaV;IK{TRK}MYN+G4_?R4_$%8v>zBSQdhQ?E3u8Mpnq`soFPEYE
zi1ln%kmq00Qbz%9cqk<Yq0($D_Vj4O)|Qc{j9%iR#F)mTb@9i}@;;mOf&}V?uWxWd
z3*nM+_TYTg-prP^8T5n|$_QdOvPs88`+p$>^vGNNT+^4>R9zyYtJY^Fxz5@f{tk){
zvj3JB96Ze*xFTP}I7ihoDe6Syg^$JEaU^dbJkL^Lt<-mHQo-}v7l<B>hsZ1_IkN)s
z1#@koTW;=yX#cKza9f9woFR5cv}-4gK`iv6i>9tFZm(k;#|?^fh%bN24p3)#0>jQe
z?Jd_guhB{alAv!QATRubdWK_xa5ZsYXBHV9Um|n^R=G_kabaN$Qr@mZjkhmd#v7C2
zuvNB1;^CltCPTlu$Li0LFc&_amBQx3gYr{|<{-xBmJ;Xq4>(Pr<RmPCu#McpNIFH5
zj*P|^wGbIXq`Y5G01pNDetYRKaC?#Sx9{m34fK)rqP(I191D$52#|6VJ1Niwtqm%q
zL52H>E)SDlcp6c{-M{A|BrgU_eS{LbslaV?CKOgsUu{E9Z*{BFre`UC__<$6Sc3Vj
z;`yJ!hg(_5CA0@d5?;gGg2Slp)Z}p*#IhJ7iPAxYMkW6495e5G_ic4y;mFQGdO_S<
z_JHK79Xy^kG_H@&&l1(v`V5|?vc^u1_N;7As0-_oUqSc;J8&z%_-BU?<%IXLT#J7S
z$*tAd#V2yt_LwgxQ}WvkE(jfzPj&p)T#5!$9VkCe{(4T=%d90HtRBwAAH7oNa)cMp
zoAKKu0E8jX=guL&q#<Hs##0vl5W=V>(bP5u7ygD>^jOjxx50YlE2fn5-?A!pB{;V4
zH&QNtzNeP0cp1Ojv>~V*`QXrIanh)Og*0F)?{|IDLU0%>Nbcx*9NTS4aa6Nm!Gfj_
z$?aQ^>_gyyK6i20#PfH8@c}J=^(0=p#zKs4ZFj2>GbO=;t@Y5iPA?y*dg?lbwW`rI
z?!|6tGfq+DP(tyJUW}7lqjE1C36;3uI6~!#6?O5ztpg{r+Bf=J+qhEWwX+wiA=lc)
zP#fM1)D>&>^2wAyr$&)dg*wF-xbD_PDMwi1v6s1(u9(|K;vH35>$5|cLwEVSh??!<
z$-2c;Gy#dS%lS}BY2gS=Dfq2O_GmXYZWMln7QJY{#ugL!9$TGaY*wt;ZYNwAcaIf*
zxQIQHeGMOWu2OX|({-xW%-t)V=;6P@&q)F)Z5Qxm;RVN=!U+lC@4npu>?p*cs~^#^
zk9jX#5Tzxty3<;EqKvcpqO6Q2t(HmJYqd8j*3uGLcNvOcd~#;Wi9UhCz&<-fIgwDj
zQ@?p_UZs*CPX0jzF}DH$Wo&<v^QOB85y^#obGxvwDM1;FgU8?C;)`%1tC44~tkr#6
zW+T#8dLT+h4<SC50^M)+43TEiWCZ$;azde8r|;*n+?Mp{iJn$9#2yJsK(hsWpYIt$
zu@c$jbDuKg5VmU0v5JXrm7X}=q%=@oK5lF+!f^rXk0Z2IPovUldfwmtZi?oGo{lil
zND^Pf`oX*&j0Hp0D(|4oIhe7#^)14Of};btUfwYm)~%{XdPv{Fpe1oTXKI!X>AzZZ
zyj+sL|Bm;KRZsZCoPS^^Sqol};-q|U$!q8J4XNf}&M{JjSdiuJWi_LkB_61m8TtUN
z6XI~9<X?z~vi4kgJ-wPLsO2BeiSfM6)DHBLJ+E#5g4s&Jx@B^ta5I-AdQE$OV_PNk
z*V0|@(|sGJZ`n%>g@E{uug6b5jOjx^BJ!g!&w~m{SO6%m!u#leqgPC9CY;+ATI|hL
zY*v9D)V5-R9X-R?e4_#~Su<6a+=*SUWcqNcMknro6E(sdT?NvU7xU!YWBPu{1b{f8
z9-=rh?4hFqbS%9sDHr46aYq(G!;3o&hF8N3e2Zi~=Dj;Zz=N6xfZi?slsa$GBtuQo
z9H>toK8iOdN`e0*&r6Z>2nrh>MdUKNqNj5RVld6}K0d1q3`^V?g#nZ{Wn9{?ZG_77
z)KgRAFt31$Yen%`OpFB!3z~Jd*Y$cvNYjNsc84z~3@Y)@Ct-&W-qESSh?)%AS@WOO
zvV^;I+n!+?FCj)DeC9<95KJ|;DZ|k1aR#@GbJUTEZ}K_D!t_2$OOi^#`lxi5;Z9L{
zp+x_1bO47CMsnyFf*GF!`+a0(upg}P_CO0)0RTv*b*aYUxR6JrN~2>Hk394N!i~<l
z@f^ivl9G1mzCsT{`DU7=0Vgf7-+L?H>NMU_#%y=e2YkPd2#y!Kv*9s1M<}VOSew@o
z2S*bl<!K>_8RX_X_SxLpKs}{GL-J!e3QW=#@75M?uV703Z)n}$?~Ve{cLG2?BJ{sG
zvgq5Hyv_Qge(?kckugpG80GC=Le6X`Ili)<0y+yimN7VjjWd5IbHJd@3eA<f@4UC)
zEk3ELo&HcoXNxyp2f05}LtCm9vRib*p`M?C4`t{yzWyUEvd&)}=^#E9*~WF!)kBCT
zfMM7Cue>?n-8PMH4R1dLsVO%!)?eUMsB5dHN|65Iwn=bL#Tf+UbmH$!Q1>?Fz7%Z_
z*oczQM{jpw{)C$o4{f+g44_a53@W7O*(uxJP<(3oOp-#Xf#?PHxf_afH)u8YN@kxe
z)t=&>>qMef!GwbmrILob9e!n8U^dsyo64t}mTO8aHR+5RZI0`9AJHoKIUyLc;X9tQ
z_+GSBb!RZ1W8jZ?cGY+*Q-xE~YeH5}%NZt`XOy6%^r6<t-(v=!={Ol1sZ=>^1NIgr
zqkVoA+H`<sGVY4d%HC#VWz~HgJm%HZ9K5T5Sy!<XL>nsi3oa}0g<+V*fuGTqU(d`z
z&?U7B<HWQPR&sKWDDm(KDdn$N?YR4S@5*2ij=QZ@k`#z?HdyI~v^&V(lCAH$rBP(p
z%FkBQ==iR%#<a|$)qW(y<hMu@SxZu4>eIlD6h<q*Bi<M8ZD+G`M()<iUkxXtdb3ti
zY=Z7Qcbe9s4?00G^5b?7`Djd~p4|c_ydRE19Zu?(5;BOJ+3JibG|vfqI(imTL9rh0
z{D51s+XXlwMUTiv%M~ON`qbW>-PLaNsAXNn%0K~a*T<C}Kdm}XC$(kZfR1Z1O-x^`
z=Ls!YTe~&k`IHBZa?-1pLVTX}<Kn@Arc4)}HAFeX2p>?cd`d629L?<bFA=UW4!PBA
zc|+X6F+|&N5pe7)X<_%%y<5t7Rj50qSlYQcqCbx+tSu~vV=iojsf&Y`&#mt^{ehnJ
zk#6u0J$Jrab=AimPM3KF(Zz;2c1L-%y3^0}Der*-;G)aSM{Qa(QUJF1HHxWzm5UL`
zA)UejklC8w(+@|O39n7+*IT>AH1MBeAMh$AAM;UWf(p#s4U9kX$(TAzAOjnGVfIf{
z-A}I{=;k@R6$y(5-NKZqVP2#xd?<21*89s%b75l}N2^%&Ra>D-xs^|O$2o2R?gLV=
zTe~R-p|2;FL1~U8`b54g3(Oaf`4~_v`3Xaw+rotGp9sG(H3doU`YVr#KW&QgqD>_Q
z`7lA7wh26;fceo)f3Ww(r%{(th+p;9__2x^pV9NJHrT}t<rg$QDp<18d>={5H(JzA
z6rYx&gGjk}{AWW4F?bAxSoHMZy|Y#S%c6(yAFX^8PMkCsfoIv$8P7~t&{G@4xal8;
zWiKoicNqP0lJih~Owu3FCQws3vetrjAsj)F|Lq8<gka_u#fn6ledcz{>*g{e8blu^
zA=%m{U>83|rD?yBrdgOWET|Jze}0+4hFTTc*ePGCbDBu3r)!SDKpb=8okJMKyAL54
zGP*wfTxGBAYr9g$zjr1fIoSF*##_iABl072rl0Cfq-?e@`|-YYGGIzUT`^eQ?hi3b
zN(w6|)^Mx}M2REhQyYH4dfNw+@?qz_a#@#lUu?SbT7(#)NiC&Fl>1PrR5Vciw2)vW
z2Qj5F>Da&Gj!ey1AcmFDnH#jbtLXFr&;5CTzp5u>X&oSIVJeO4KO?3<=sHs&Qe^)w
z^0@L4QJ=E7hvsB#2zVn0m8NT-PMF1qUTBK4$zNUbWE4q*0%22kr9`M4pLl`N$ZL3P
z*aSzl`w4+7-M)s9_d}5&{jq5XMLtlLToSj-Esau}$UfpKNF@ge5rTwVdDMzu#;{zq
zC1aoL3k`yzr0crNzjmurTx<#PdEkw)ui1UJdB~MBg$VV@Rc%L4FzW&O8{ZP3{MeqC
zrbm)sK(>Pq<UqN)*Mu4`|L~79rF=nD=kpczzT0E}m|<~RLwTchZ|-Xu!-Tk&WJKJR
z{vS$D&wU90GX}gIz=Q$-h)9RteuH54dg{(0Yo}rhjlmmnyvZu3Nm*a0(zU_0S%lQ)
zZ>>0c-Qbj08-ihC4|;xY$<<HZbBOtlU|t<EEa_LyQPD@=JLHVrUtdpTC|_F^q9y@c
z)Fs`65BeMmcpYg_mvjlV2IflV<zU)<U!D;QBgkV4B-_k@q`R#094(WI{HEEK!$g*L
zBHXX|qCw($zld49NBaJLmF<OQ56!>SmdO~|M>pp2-NOU8gmBUk-9<9IA4mer#g5}k
zln|t!qE?gNHyLDg^4x)TyMbKY+&WXwPyW~&+JCr4LHi{pfv;5Gn9>@{>+V%bv6z|o
z_^EP2x;LzzD8ZO}hcCWnTE46MhTVD~0=k7N?}r0F<NnrUue51&kz%<1mYyrJLBVsu
zd2N!6brJ~i2jcDWsE;E*$V1w1tvf;{-I6LMMda63dNLo_yC$}TlXZC6Sg5Y`aLbm(
zJD>6W6HN_}Ej1lox+uv67Q=?85rhc;&gpEEgOmvk0qJrLY7Rf=l*_O_#6d=9Irav&
zQWj-%)ofDf70zm`srz+=I6rQvRV&&<7OG`;=J)6#3YmWTeC*-8IL)jheX76M6OH*8
zi__=15z3azh7Ukytk+BeQ1JHU?$#>`O!i76lfLciydogwIsVet@UF3WYtP#+a>ueW
z;f`dAlW))Zoyfvx1AZD=2XlvzgUZJ)S2VK%)Ft;Qwe;3$w)+JZNToq)-P_p&eq1EV
zdg>%&z}232IcBet9gxj}0s#S4jjg6@Hw5!LyCBR;$*;l$R3_<3h*FmSpy3eIZN`{8
zE)}jHIT2&W$V-YoEeesoH%0Z^SsY9<WRW=dJCG;Dx5>ozGHeiQ1n<A)8m|h1m<RBC
ztTxw!=aE}DJo8pp4Sw0xFEGzL%2+yFNTW63pf$YVCUyGfeqwoDkXga6lpWpEo0>0q
zB<cB^pFy>WO0-=~c3T7JkHuj*PSdBH5Y1NaUXWFL@`me^fRI2HI0+yJn5Uq+-tM(O
zGRy&|o|lWT(2nW`pC4*ewqu0{Tm8TI+*T;3$@dgNr3IA)gg&T&oV$ZfE43Z)D!Ys#
zb}mCWC3y?@^hue^72GAnIo6dbq(9Gc#ft|?r!&`IZ}>s=@j@`9(7MmRS%F!=W6Hzs
zU6ap^Z+8r&eDl5gTixJ*_<wXuBeAjhs`3GWa)^P?{+~y+*a<`@z?5QUu+lodr=Z*Y
zHb6Li2%%Ky3qvi1HeI1Hhw&xqfv6b05qyOWk>OV_E~N2TP=gyj!K5LKn=4j6_P-o5
z-1kRWN4rU>=33>L-6>mrZvUy{CML+mnyHO7jGs|oq4J`ljJ$#&Xae7#4zqh?wy37X
zeI7nNVT*sYG_9{^KAKF%f=M*0;ZYv3-#@4sYacCIm~Kns)y8Aav=eRluQVkL5-Ez<
zntzCm%!w|`FMB4PH8g}{T=KV3FVB~+C$_RboO@=951XjUHK$HIb`My6{b}}*I<9gx
z5Y?8*3JDMQ#n{U}i5@{Nl?*3uE`H+-RQT#TA8Map)cZ~FecOyAZ~WinJ|D{S*hd<@
zIl=42<4xLU@EcGT=J#OCj>TP217Z{&6Y=TyTph*Di$r6F^P9A50FFx)xcTd#5fiV@
zj0(wX7L|Zl>sZgj#c1;y!_e+MC>ZEb<@(`g$L-n%)*rIVzmpn3YL0tyvR*t4ei(wo
z3}!Ac{KcS@k?yVgb=Fpz_CsRS-=8`e1^+Q?v4%8$G}dA1Fb~JEt$&kr^EaAYKjN0U
z@D$r)IRU;eNM0pd?mfC09r-m;+Cf_5#r=F8MJ?mHU`DmG(uvQuPwLM!zwZ13a+lMF
zvm??u``Z)QqKpXl<x;y8RwflM)!!N09{Z7ttT}xAdi`Jh1w%Y(2sJHA30#Ok=3)d-
z4TuhJDTA*_CiKgu+1yQy^=pP=ET)MnJ%Ix*`l*m~C@Md@d#7`!mj>#EKjwn2k*ki1
zLVbd3E;pi<n~itN#i&v2`EzWm4la=daAN@F&n=RFMfb{S!WRNQj3-HICW+-YHC?=y
zy}9B|b&ycUg*9z%mA-}ci%?p&^P3tTW%stS0;{3av5RzNFI^`-pgu17M`mEWwd|xO
z0A^?Hyh}S;0yv3%sRU?zT<7pv)4xs&9+XvFUfWKgdgK+$Lta_a?Eu2nC|6&*_5=Sh
zir0ghTJo`<;eR$?3PDlKA)Tb5cNEh)=+^nvyD(rCq-+k-Z&Ti_5^yeS&n{)IJ16`%
z9??*DP4EK#A_Za?ej{<RZfTLjvxu;3Pv7wIgkn7y`?2+gLZkGGpR{B7&gu>0%I(#3
zEvjP;_^j*WhsFfHMi^!q>J7`vpgc9-lPH^xBev)qi4L;kF`>q*sXf>y?Hki`X)G4b
z%xHZ5w=H9cmCG<A;2e{FsyK(LasOEKyAD4xCO<T&--B^PJ`VdtSh(q<cC3^|9-h0@
zB%NPalqaQ$X->#Ekhw@Q((}LMmmC>|5=^Fh(;q*ql^$M7pFb;eGM|va5(?Wf%~W8w
zW4XF-3T#a`(zZWO;@yN>|8tbKMr)^*MV`5!gR|dm^~p0LUqIh1s2>(&^pO@%6r~2d
zLvcTDcG+c5b{;F0<<}<D1}N?v<{X`+6{kd=c!cEsbw%H3CmOOl_C?B9T!HvKATX@s
zVZZP{_fML!M)eBbg3b|hbTM*Q5y>>GUIwOaCKKf1&U6K;9LhBnRyFU(5gL<f+(LJ%
zbGc5DiJ4gJI(4<Qa;7hJ$NQSXQ2JW-o<DcNVhoc@#H@{-r;jK`OAD$&D}J%r`<T+w
zG`Q~;`D*d(-wRq`2Ndkl;U{uY#Hr}93){G!elmwsdAG(NA1BV3>ZI)wlMXt0Zq^*R
z`{<|6nJ7g-xmpM#*e2E->~QiQ@sSAPr1EC$1U8<0(sRgf14v%Ygj1)V-uyZJm`;sJ
zk~AL~{G1yl>+loJ?czb9v`7#u0Wa)$7K;Hq#D=td{o}}mQYp#$vKMd*`?*1fQlk&R
zI6o5(_<~#}US5u_KlOBf){Br9HdB+nU^*fJKrjM0w317^8eATbPxWqmyKbN5@LBP(
zac&o*y<cq*h%)igl*;B0^Yt;$qY#MQPa4b65d<zh<<s(IP9ku>bg_h0WuX>$Iv!MR
z6;@T)pkS~o-aISKjOH!-+iOcQR4}Cue1kuNXhvo6kYqU40(16F#>`9zP^k7L=I@_3
zfffyY!P><&J#DMoB|d;~a!?AD=pAvwq^lGXpI;xVDFIr0&P@kz3pcslx-*p(Gj4*m
z6|+E@t#|LNN<N+a6vbXGtjYJWJ%jX$&(5%6kb7LT3YDG8+{Pi09_;*{cyAvtw=I6N
zxgEu^qj=%s?r-H5?dN&hP*eP?xwL)|3B~p*zb-l5=<p2iGS{@w)O^Q&@UCu056vxo
zm!9*_k_gNl{);Mog9TZoiuj+uPHk&dA3xWVXi&b)v^D6fYm{Utpb;$DuL&%_IzC>F
z_FX)<{W<b{g5l6kOgQ^4JWvUN08nFhvAkB-Ye8hGEx(UXuCnd%=HQeWH2(Kt8$j7)
z`wH#`oQf+w9$S1D*n9h@|3-uGD@oM(MR>xD6yGSKfH>nxEwH`ul411pNGWi(CsI5$
z0Xp_x#7Qg#NR7;n3(`(-3c-mLwk^zNs2gVEI)nrD&HYPpt3`@kB<7*&+D_l&PwHZc
z<;T?oP=ArHI8ow^h`{gSrt5WpcOp)-cjQ&N4w$;`^k#+dT{P6`R;p4c_Rsbod(^6F
zz)8KkJN{vTxTK8@)Ai?!POM@z0V;U~MZOFLWNKG*<%qj(4SknQ;%oM?5=n}~j;z7f
zb>6(YAxzH%>)Wz)L@gGRxc_vG9XrJ(fzjMPp5uhNUl4aGUOT1(afh+vih%fRde;5k
z>|XG5W4~3!fk2QZa<HvNQTNr?*CB71oyg$3;PWw8w9BP_Suk;i=;t+my{;iAaYw*O
zvnRigl}t()wwD|KYyGfdqpcZVhu#BVSmzFx^Obh5^D2VW9_`MfDR$@N#z)G*tq@B%
zj$z;8m?1F12pmkfkPDeTH#l!vb<;WFH~%I*zM3b!D*!2r%&{Q8q0C`+ya2_sEaT9~
zB}MVzUin~b)&l)9ig;Qb?V7(F0{(}&R1EMeWQB$uRau3>r|h4vm^_!fNJvKXs{v41
z`YA{K>9VD5(7+j1gH>?!a;aExae0c9&Ge_++R6^tCsR@HPA~%l$T=}OguyZI9xwoY
z$!S?Ik4<JaR%}|m?-*8D)S-L6?dI|zRNgY=HpxAu%Cgj^eHWrCdcixa7-`=VY_BtY
zGU|k)n?F~w8<LPlvd0Da+6!-C2H7!x{zz2+`^5xZbTqBzkWnq$On4{`dOA_ICISi!
z4hzAE)~s91!*>EgPb_Dc=l=}Ub>fR)<R+R5B@HN*RL2g!zbWy$i+p<LG<~DcdHQ7s
z&*}U_O5a1V^5v6<{=zx-Zg#)SG=9U2Ib{40t)x^7{1|U=2E8>2N@!xYDQ8=XiH1ib
zcFu8@e~r9`a0ho;)Z?GEE7NU_a?ew>GX3?8`bK+QTvstRu9Zro{h;*6s+6~8S2p}*
zz7)54PUEiEz`|jD7r&`!uzidUXh*i($TK$)i)a@o*XDt=O!!}r6Pcaal%QS`_Uxnl
zYp9XMt2+z@ny<xY5J!qSS{&=5aI1H95~g=#mk%f178KhE)Xzvi0bDR>DEz3q?%%>)
zr1d35-@k=2QZCwY+ARO8Db!@R!(_tTPBLg;(P~VGL33Iq5kL$U&&-`K!~Fx!ub;ED
zcj^bvxen(B04f1zgAl1euuRnA0j#-Dcq)S-sESB`LGh2&g#4PnYiA23t3Q4~p21HV
zgn!K6yDA23mpT8Iv4(w8uJF}D5N-vhfcAFZclY9IDx5KC@Yl_@ADQ;DXQ{us`*0`{
zPZ`dMf(G-oc(>p2`hue(RHfwd*$4V-ffQtKoLCOVA8tn@oq~&t>W}qLR}%S%1~(BF
zwLVj&(WWsF4oB#n%G<yT7O))@UNa-NCvFuXtr-8+HJoc~Ghxu>tGw2C7U#;WjxeE=
ziw#m{9r#QntCdB&L~1wU<*^bUix0*H#nx15MB&k&$nbYfmP9t|GK7#CrJBg>^aTT#
z#Z?E5%3lt7QxX1;jpNs6pmA&>yiRl6w%Bz}Q7H3u5jVEnuwpkTmC5>iI{s*=_^dVD
z#{l@zWCc8_{xgivnG=fnm8tXHw6rs`Zx&!y^HydYO?n|Jwr(*1-|<Fo+-%;e3LU0C
zoo?3W!!8mYaJ^zp&k*XkB+Uf!=9`8{Yw|s_l2odCF3u<Cb62*aw9IJwi@*yA;ZXX2
z0Omj$zivtW>6YVAO3KkAM-F@k+cnr~ZcH1gZrlH;<p5r3)l(KRkxjvCVx<R~Xu(|!
z?_6nya?`YM>&3hNKA}(kOX0NJ2L3nN-Uwq$Y)cT^{3{&c|BZ`xC3V%FyQ3f=-p52Y
z?|##a5BHnBBHp#`yMHP5$=~fjJBRumZ9O9fzS;ige;7D;r_Qk|HJ*+F8t?)E-g{sj
z6Ro^c?OjBgS-5p;$6Y{nMC$9$YaKD~MXmNf>JgoW4LoIzRf+MwJb9A%ie$9mKE|)T
z^QIXO?%NfY0ND`TG|_HZo9uto84<+F<Xvgq<(X?$ClVbrk^{|{G0_S<m%Y={3={XQ
zmmdSLBP>Q*(t@G7R{J;qQ0owc_4c;OyNV`0Zhg`c8t)TC@IEHmdH0uQ+~FO^{S-6=
zjI=tFmlhlq-L`*ox&R~ItfBL+^}g6g?8aUbD{4^Q#sB~y07*naR9ul{@;)Ydc^6JI
zwD3;iei1qXLU^&t>XgJX&DZz?HwHTJI>dKi#S1jCQg|OD58fGRh8f;T-0wLa4zxXd
z0F42G-!#>w1yNY0`J+~)G2_5fC;B|kA7BCgwM8ppc>_Ghfptt2^DZU4<G63_xOVaC
zt)VPuKb%=5r}kFIz=Ou7wBQOmwf<XyN@>;`RJ7+0j=TQ`FVHNF^#mIK0bVY+zrYjT
z>9~^**WCQ_n&K`r2}slJyym9H_Ozg@xw7p~n75k|+A128nNpxhp3F3Oe%{B($lkfb
zI}3N5_^S#ywn~aI`ORsgq}#+es|GRBrdRduJEuglKqEH5kBMg91;abNG(*RI$Bx?n
z1^zC@-0f+jCcIZN9p46@!}WeyVq9GE@>ODa9}~^IOE{}8+)2Z|bJz(dRtd>Hzb9=J
z)norZUlXfnsM~@Oov$FdXbmmE^YcC?`t6-Ryz}8+`#Z%$pgl~?-96ri8@$GIMkSP^
zC->55@B+=+Sl$3nEzpdSlf8??y>@Ruz#b;aoni1MYJ%5z8sQU(jxjL@)-m!;Gt|-y
z4fkPac$5}p+S<}aT@6imiAH7ErKK%S&G7J!cZ~TD@MC1ay9nH4DY$n!fM7}L$}dWL
z3c79oLjmjg1NWvqcgL7t-erUP3j(DXI_{Uj+$E`Q^rMXDiB=-em`(KkV#MGFQIK5a
z_rN+vrs16*_gWN!yENKwr#&U%CsyM9GTM3qEivij9_ix>@D$$1L^tn3xR2$={RUhx
zNzkPx+f$>RSV;2+4IbbP4B!!i(mm2AT%eIF?$1zhA5X!(Qvv2Kz9iFTYpP3onyRb(
zKX_9CqGPR0%_K(pRtWPxMmFJ{a#j_<z1wvkC>DQ4ZE8q+%EAK8U$8)PT+dtvuS1OP
zjxm7)>liuMJ8x;mS9o{hesdUl-bL3REAyJuLZB|9iAIf>*;}zUtXsb%X|lk96>z8G
z-u=5lz*uaMX{;<t3yJC~oBl++=X9L4HZ^|ZCZc03mWOx1oq~I9FVHTY_NKIu={9j<
zRp}T{5R)A=M8_B<&`^1o5AHAc#r-M@6?f4|CX}>$4PIr^XRvt}C`bbC9^7x<azf9q
z_}p$!3#p38Hh6r}iQ({q1scGez<t$gr(A<jffTLVc|~a<mb-~YrDQ&DQy|bW2DoFm
z$0p|v_CElK#hZJ6b6V)-PVmIaRO-Exn!jTVaK~_8?u1!vY3J13v~Z9o!4ua^MoJ;x
z(=o;>&;afeCnm$>l2kPg_B4b6?|2hUfqM;&)`%d-DZCRMV@%!w_lb*9IHF2bOTRPM
z_Dxslfo~=a-qZh%AnsVh(J_Ye4t4j~*Pz%QSa;aNySBEFXZWIaqD12>%$UgMZMZwe
z0Qb2!pxPcV@%;{Gd#GzPbxm!5NvEw{GT|-3o*iQ}-U0W8Ly%=gpa+At)=<azF8d$8
zrtQ@uT7roJ4Wl3_d)#BE^#blAv-mb!s2#qpvh`1N-j!;z-bxf`XgkJai959cc*gu;
zX!#u}@Pm#JpIVEWn*PGzU8&URUuW(ZlRfSWwqJwnKJrN8s0^{ex3;l)SDH3#q;-q|
z?hCfVn@qu|Ot$6Kg_!rszi3#zD>tvB6(nUpytiO#H_T!OLl5&q%zJy~9}pv>K~k-b
zU$>4@pph%?-c1Axrf!EfnS#T6sN2TyMKmVFNT2FcYhK^v>lg#vr*7|nd#0eM$sYQG
zWPwU+)MwIxPh9t^r(;a+xKG4zuTlW2!Re%F3Ni0JM31CW$7l&o+_=fTV+?Sgx_$dz
zXow8XdDYn#;ylyrzHqYYX{*NK<2EG`OW<XP`!6_fhst}fcpr4!Zb<v-4?RVp<GqW#
zV9lU8eEhsk$#{VVaK~`J1&hOiR)D{YW?Ak!LszA#v)^_%6j&*n3e@rQHsT#)vhM%&
z;C{6YI1Qr3<5il_omv|z+dT~hI=yemNt1~2zC!lx?l|sHnhCao_I!3gytjH<;MGPW
zb)@gr<<U*Mh=xcU_f97O8swT}C~Gui0}W~L8I(l@iE--zcMSJhc)%d2`nEMcv^~KX
z@9CZn8l#!w?|^$%cXtQi9!&M**+bm{f7||dFYi|0gMIO`D$KBOU$w-Mg=V35Vd+K?
zt-UQT3}#p>>%R7muxfUBJ89&IySGDZZEhQkb_82tuyH9Zt*a7ucW+0qcOAT}aeoCm
z-GguLjbY&J?UjGfn^Y9ubw(ND&glQ0aRch@!N)z+eZZc|j8&gO;XQ+Vpi<7bPw)Pn
z^L|UqrM?IEANJoJ1gj6qIW<4zyTzK?|3Wys*{JsMPQE!TgTf4Nhgib)?Hxm?MbSHS
z`P!*3J8<>^*Ac2KzbDjF+V($wts<o*44(R^yqs~LzMa%gTwAwp?HIN=1_%242il-z
zEHHg<Zw&RGrPiiDrK`L$n<;@tgO~w#AMRVX-t6qSdg|20t3wVbO$MO4{PvKaQX5+B
z_J8}@%X_9?LoxUax!f{wwal<_#~;ncwc|?#7`$|Ee|irJ3pW9`wf@!1yLOj>!aLy3
ziTjRPcwSX<O~&4o79J{UqVTTPXZm;t+_`bzF$8f&>M1oG?w34^up94s53DMa*~>fN
z4!8%a;NFuKJ}Rnft^7lQoA(U8*3G+IPO6f_3@o3KsP@LR@Y3zdKY09IgXl=!<y4rF
za#a0auzN<Lx##tS8SZJV?SG|IXbdXAod@?$6rzmO<Q{J3js+Tfov$LPHX1d6J2&pV
z;O$b2km1nv%jy(s{fqC$Nu|}B0e3FkVY*5Bb!t=i(T>}@mcl!BWCh$gaK8sTfu*TA
zFC1yd?7jUjRx0l*z@3IW$$J$Fcd8Qfz@Fa~mb9le*z5jbmLu*jNWp#EmwRE+l4xgd
z%x^DB3sc>0`gf~d3%Cp8zN2a{lxD<*_R276l;PV+(Eir~#00nt<G$l6Y+4diY;U)<
z7KJnIX+@P?e@eINt$@2A?iU9DX8-C5{iL4%_}=w(y2|8EG|@~u7w*rA!@X7kD+<Ki
zq;{o+z3S{e81Dr}L?dh5$9i$!&ceN00ryNI)M`&liv-^Pu1UxHW{euS;{J><?o|pn
zsfy?u$Zv=Q+=-<#=|rO#0=RSGzU|)L0qBVIN4u>#Ei%;F`WJ$Cl?HI<Zi(!^1>>s1
zxxFbrQfSAgo7}tu?tJqd_aM*+2ARr+w1`nrV^KQ6JK)ZT`;L1K$TNJ_-Woa9PN=Qx
zPXzCB#yvq8_Z>H&lYp;pz}^s1w5K)LZ-0&R4(`s6dnfb(b9aQ<+S4LU_=`=N^mIAn
zK6j?TwJI(Jytm5EF_n4kMQM?z27Avxq7V0R5^x{CV3`;9`7=3ihiwELXVk_>gdI~)
z<sVMU8uyq9Gp5a+J#E^wgoNpH=O!#;;eHv~-dVa`nHHgH>Ozfj#GUpw)5MA6$H&IT
zPMS0cWB;G$Pu;d{>Qp!GRS;&_YRT`3P~3Z(9A$vJ7xzg^9F4gzy_T?W`cxeEukQ6i
zWrpjdYHN;6+#BqbC9=jnhKBnZ2j*Rmoi8RQUAsKgtH^Rfl;PC<@bCKNmc6waaQEOo
z>z~Pqj>iN24<A41gB-)F{>BIm@9l+vy9f6Luzx_T8gEA=?p>`mz}<uU!Y=`LvDF!S
zMB-j#Zv@;4+$XJAx(Qms#Huwyi;+F;vcmmYUfh$MgZ(hBC$@<oFGA0%X=!rDeFBO5
zE8y%RRoB>fyC@BC4?o%kabKLgBzct^_bCatpu{e+hak5-ErJ#O=FW}#Dn;AFHe2#U
z0{2<-;g~9t_Wb5Fz&-MCUxM5DCFi15B<>x6yBIatBAa%(;y#ybhiMtGC9N7ie$^?c
z%7{`^QySnNfw)i0a(@CZ4dg0b%pHWPj40WA0QU&QeeQhJ_c^=-tcz|RsE05Ufw)h5
z+X7?P0r75YYyjLN5BFZM^Z;*E?SOma;eHJY?SZKsaF0OTq4F3Y?YYf>dpKXJa^v0&
zuVM$F=Da+(W{O1I-yVWlC8_$hHMc7*4RDV{+%L8PzY=M$%&$uW+#?J3=iIo%Q^8Vc
zkKn#v!2NBMZyFUsJrC^-X@Gmg;y%m_?~m^~9S#L*$;yIf$fA^XdE)*H9QRX<%KN}j
zM`vwqRrk$pRX3nY$)vq0KN@J4G436Vms1_JzAcf%a0x|MS8j6};2z1iGxuz?UGw2y
zi^9u$RDEx|od&o^749vL4j=EGy@Rk<iBf{JrvdH}g*&bA&J|`-AK#$tyuNu#0ryZI
z)#Ww-?vaA~^W3;I$5Suey+~W}UJDaW-g9bG8sHvPxVQA9x3<&YR;_hFo*{9M{M%Id
z;{F^*cJCWNf7i);N_fY`K|mc>Lw*|I9{#wG^N)MW{k!PhHmBlNE#-M85AR>OU<QQf
zgKPxcBOdpvA=IJB8tSO(=%{tSM#i-Ft6=X$84}z*@^Qz2udRBU_SPg5_nYuq4WYaq
zz&+A%r=C?w+;MH+&imNpwjDcQmmZ<}QFB(61MX~l_u>9F7w%r(JDtEfu7|d79yT`=
z6*U0v(Tw|!y>M71>$DFCov0-X&33fG;*F@m9ny?HUFwhMA&;oWecXs~ht0t3=EzFG
zJrZ!IoK-n+=RT`;N7c5mpMLl$2zRWxfO|xx85-_>!h3HtHO_qc#TS2<cT2$-S%&xN
zqH&L=@czVg=J&ftev=T%t7hbh`>bVR!+S>*U94VGY}s=9`iRq6e<k1^t!LG!+Rvdl
zzh%pv5r4aCiQqINC)@)$tKN*3v+5J<e@>s?vLy)Lt|Hjp<$*ivtePM?yhlY><WE1J
z`1JgzpI*Q6KR1UTj{MFka^EA9CGG;@orU}5C>YXya{erO{km)S>Hn!3zROpmd?NnW
zi`=ExW1^e)k>9JHih|P2PrI*dAynn!*%<Zn`7h44$iUv^ihF|e(#&I9cD8LG5~KXz
zuamU@_hmlXPZwVKY(NI~K1LpChK2h=vABC@{Q4~Ry5>qt?r1M4=yPOS@<jb6;=b~J
z`r+p*XGz@eIou!lcLwdBxlU|3FQH$eC9ex`kEGJfoRwlrGoIC{kF)Ua;0=wI(M>m(
zER8+wjh1}B*FpWc*%lFB6+fRpeKzZJ68C@L|LISD{`9ji{y_a9Kb*m6-}0%HX6Fa_
zfO{n2PDwK!+NZ9ZJ$qV0!t`lVskraB=p@OzkCN*rDlHF36ZZj25%!xj=jQTMgxa#R
za~tiA*tdYDhP+(AzuXU>6`r|rf~0-RorkGUemM5o?lV^ulwbXaD~0$E_)$_fT!aod
z$prW31#tK9zH(M<>?B+ZeZ23$c}JZ#OKx_y#eF`rk7_C2=_G!WhCFWTevsAP++=TT
zti;nqd#=Cl0Y9C&er$_ZSI(Y4f4cAv_L0-xp#J3NGrK><|K-<`3i3_ufO}-)zB<;8
z`{d~~+;`l(R^QrGiK(fz{dP~Cf5=4ZeqMfKKmAv;)svr?BJR}GZ=sA=H2XbB{7j<k
z(P`J&&(7n2b6(;3dN^_RI{8EXF#x#BsWh|9<L;9u&!(oC9Xni<x?4kClcg_6_TFM?
zY-_Y+H&VMU9rd2ysnWvnp3Xxe>$p{9@q_3OcTR8N)^#GiKl$N&;Tg}Df|QK*t-T9y
zj~d+PB+R7X-knAJBkKxUai+!6hW~nbmOLNuPKWn5YPB@Bu%kWoKPA6W_<HI0u46p7
zf2#P?4?p~T?6l%@Z_<&H-Ro>cfO}-)K6|nk_sNszuJ++x>!AISHCTeyB{^szx~+Qh
zEOt+%Q8+1ISe87D_r5{OxpL4({ZFwApH+XLM;V&VyRP3ki{3fm{lGETA0(K2D^zA8
z8~3RTVkx*!o-^Bvd#98BXV%2wx&c-lv)s|8J=a2n_)Coz>V;)<uI)jK&61zWW&VW!
zQ-XgB>qv3>&K3ckzw$ZF`_C)>BC?U-+or}Mz&)bwnV7gQn?8kx`;=MBc-$R#-C(`m
z^f1evfs1Z8=4NBcrx*C@^0KpSw<+n#7ww5}3%L&{ZD2n$c|ZI47AZPk_?f8TzHi$a
zBXu1C;7;JaY}%ah<LS6hSvb{=`&U`a&#om{kFvI8Q+7!g)zz_0vkr56TOJYH^ZHX$
z(Ls8yBC9t~e){3(Prt}wrtiW}CE>p1*quTV2LEkkq<XuIad&qS%v?Et=CYLub0$t?
z;XY-xr!q6lC_@xw2gltX+btF`qY~{F`@=yj?pPkDX1CG)jm`cOe&WQAo~L)8Io8X#
zno^wDB2k|g-obvoC&IMb!=Co$t_HxJhWq4&(=a8>ikUNO%7h6Mxo}@F)s6erHpZV?
zV|L?+eZ9?=ZOLmDM^1ZwuA`|aE!Td@;;DDnb+xzO?#WYpe&x*RJJ+)cKRdDIf0(`b
z*UwAE9W!{vo$F^WMKtY2_TI~A7vN5Rpy`=so*6rKY)nkd1Ww#1Pnk2*jXNv67v<VV
zdPvR9ZIV0#XU}bP-!k2HpkI9U*%xQOID7WaXJ>x@Ibq``P{wca&6zFI_34$*PxIF#
zzikcwB-3{Jt9NP@J%GCu+%Zja<Gzg<-YYF5y;!}U6~MJ*UA~Ppt){{&T%a=NYVUus
zB_JI`dDo3}h5!4i&5G`K-g&1}Q3SY4!+pj~689ZLbgO8!jQpZ$Fe~s8i8{qGZc3Sf
z2@MSQEuZln#lMe$!4CVycW~WcTn!Yp+AHe-cLCgI&3EH|<2LONE*SSreOZBD!#AMZ
zm!*Y&r_HDS@I&E=z;HkB;JaQ5|3}Fh&~5^E=52}na>uE9z+C|MIV;_`pQ1TMa}c@+
z1}x5z7}ym~N`LR7Tz`Fj_UvbhV*%Pb&pQr1`QcxJY`;O!{?1n@?Z36lb#q7eUfJHN
z`p11m($WP}cW{(u>T=s2^fy|vErCvL-^YG(+XyNTT@J4MqyPEuuYN~qqEuY@{LH5T
z(!RyLE09r<{5}$fnCkD5xWCg&D+M^d#Jiv5i~BRexG!GhXsv%^K8btBAU(V1X6H8E
zu4~MfT6`RE<mTq*S+et+0(Z&g`rPYW=KkMRr}jE2rkr(ROW?YLw@3bT>^yCy<oAsc
z@V;tM)=dxY#4)3;l{j0s4-=nAz}=1ecpUdhUfdVISXq=-<mlkU-L1SliL~2nm94E!
zmF*)*1a-D6+zI7##h?40{N(Eb7(6oq+|S%iP5t51vxS8ZsI)iQ?R9BI&EDEfLu*^u
zg`4JHH|_7-AZlNZ-#M}W#v(<hjB)=31NVt6+!s|+Jb``BM1UuCYV~1O5Q=!W`P#nD
z@BZxki7RLRlKSL_pMU=0Not>B1onO+>pzcO*?oqbZuJypEO)M)an$F!+*de7w{4$Y
z54&{JHSDJS-A+Xv{uzAtGWN-9y|F`1xW6EP`veB=IPJ;xMI_NvIgYBH+YG5gd=D)_
zz`ePUw_1MMRrtke*B^gAeO+<=%)h68^ZOCl`<2~=uJc>AeCEZyIah(71U~)z*p^ST
zDqGu|?6$M#w_Fdqk=14w2|K2Xj^<`X?YrHs);hFShPZQ_RL62g_r<9Dm}BeYY?>iw
zE2Q462F2aeoS*yg<+ER$Kk@k;#a~X3B+YC&_9@vE{O>>g@B{YW-kN=u@_YRL^k=8>
zf$tM&_=R^zCkZ>I4iv@HXw^{G)g7|HJ+Q*eoPYML4XP)?dsP-!M9s_ZOTF}1!V1a$
z>|i9_E|+k1@$)n8DDN7HyL+cw3(uUn^Y{Pv8<g`GJ7Ebo*z4+AuX$*H_uZS_JE+>W
z4eF2_xX-%mxmIeug}2NMan9~E=VxbUTO`bBI~~Dk2^s$H|NifHI{hW{6K9SE0rxGR
zfA-m#-RNgLzZM!6yRX{^$<u#B8@kuEx5ESbjvWlx<%0VQ!Y5TmVP;AK+Tgvezj^Z%
z%G=&jl-3}A(&N4*NawmX#i^^q4)ny9r=?GMzi`fm!w{c+`08b6b3;!XdaBCj>>RMm
z3wNfubDvZvO`bL17fIWC6?Q=f%Wr(j=8k_~X>GfmR{8raq1WfO){wW1wGMst&O29o
z(O$o>M?3D%2Xs=M(M>sl_4xUAExP#LVhOGjHl5iL4!oZY_1gwLiYiZ~{atR_xA`Q;
zEaNY_&zPzZA4%IS`MIJB@Q<^C+f3;EJRES}a!e809?3ezJr?bJutz!W9Of<}x?{Ls
ztQY?+y1A*f(IzI#*n)dJyS^nnbS9+sUgW$e9`<cp<z1KIzGRv)b?Ysgl;j~MzYkb~
zdI4Ey`!q~&KNiwwg)47JfPL#$$TI9prWsSWZL1v;Z(2Pf8iEIco!n1{3+<nW@~Ww|
z_a=>YVc4S#cS+_hjQh5mF439vcCO#Mrap`GhTpC>rwz3^+t~N?MRjTQ;gQ_8oGAQF
z==uoi>_gqW*3JQYRO9}<Uvu|mnH9?w7Tb#}D7bICCVH5(Avd=%J6mwGSX)++<WO2z
zUY41WSyo!;V6;#cHQMsR<e<9cyfaj+_q5y5i(m0sJ16YXg}bCELpArsi}Ko=8ydRu
z7p+*eYRxJV_g?X?)lg}_-D437@D9mTbh*;gbvj)-rVABlCG|h1F8k33*<li9PFO<I
z0^CsFd#$5eBJ5Fx`?vtioxpwZi|(<7qW1b+o5P0Q=)75VtzK%3WNjyS@PPS9fs}95
zXfckuPM4|6NY5xOMD4e|SH0Qk1*qpz_4Ctr&Q=s=W!*Uz8s0<G6ItZE#VE+|(!O<T
zRN^j;cB;8AXXNU-R;R@#d2pfKgL_L~Ukes&?mM!xy(=6CrB@-_T?Of+GITlV>6s-J
zS@zq+e^ggidiw6XVVw6XuHT;O`0`$7ZRhVobjf-qBoj_;Ltg~|`_`RuqMZl#HHx5o
zKd!V8XVOMXwp;ZL4UO&%9er5=yv$f%n(mb@2V-A*vciV%Vrr^L*C=|L6jzRY@!O7$
zAAcl%L`8^jzY>bFdvjJTAMHZ0@7x)kuzP72VeWHY4$iwPJ(m3be!IolRYcTI8puPX
z<>CE-#@y^cR_4~BRv+)_nK}4hbIQ?rI~H@ywj%7`e|GWSkM3^)=L(O>2>1F^RNDEh
zodtW8;66???HtK{K~|8OoSGYRZF!6@og%x%Vry&-?Au4vC+Sq_4ESF)7tUe-_c!?O
z<GlK#`(G85?mi!)v+8H9p)mJu|JKfCJvwk7CysVLbN}a%mD2p%djXC244voiii!N?
z?C|{K2WLZd$9iIS2s+*?PjS-j0sX6K3s!T&9{ISB8y6t$UUNSczS|_6=Q1<s2CpUm
z@5wf*`<LwwSugOh>wgYGSq81*3Nl__pEhOkoY`Ek@7x}Btox&#S(ceT6jsy44egZw
zoWXOLqk9mi@?J`Oi8dD!|DY+n60)-Uoj-=+f@z3@c3+BFIR$@fXc-6W+qXv>>ps}o
zw6miOjyoC_t5S+?+Z*%p^73t{#TWnYJ|YgOI*P@Ud8Qb>jTa=Zlc&_PA*20MMJWF8
zx`u^l-<CkE#hS)~eQLzwK8{yR*m-F8n)|GOz8e;%o^Nqgl$Y0(UdX8S4L#Y<c|yCE
z;qPVz#=E_Q_(*x^<~+`{h2jsZxmSSpt;=Q+xX)Tfg&iY(+KlN_w?`H0Y-{&N`^1H}
z!s5w9d!fd|bD8fI*QOe88B*t~ND^NE$c~+44P?bVbnP>rh2rh(BF9yJYu~zcHV*rw
zNt0G@rNX{_*_??J6J|ya>SAbTMVX1yd&6R3xue|6bB=GBMYBS~I;Fb3zN9IwwVM2A
z*ZI)l9s;kZbDrY2_N^rDcx&rQD(u^*F2Fw7u`{9ubuQTXXs0y(CS--h3AM6N>)~CS
zO)>r7cw@WP=u7aJ*Oyd!qfT|`X0(6*)bE&@+Z0y?X~%FUr_xqZVBfxdb?n56*rz;7
zP^ZE!h4vZu!lUZmknQtt3hqTsiVGy*m(i@uOv;HBL5rMa<lmQk5i;CQJhivt8|s>y
zd)g}<ic?j>v~QhF(mrV#LHpEc^Ksf|&YeIg>R4yOE=c?M>0yL>I>|HD-P6)~Y>%*f
za~W-FMhh}1yr;W*>Myu`e|HGejQwdidXv+F?(OXzx^}hm9mXM*eT(YGJ$BYg+}c-<
zUx-&^rV+5m#6&*oJh1ztoy0xi=HB+O;5{2p=~}$xn3GK}GH3O=@MSLT6<BJgR3vMf
z+G=#VO#C~-N!N)`;ePCT<!JkRL*?F!oj2**1_Wq#;~pCuJ8KzsK%Iph&!%GMR08%e
z$6YGxJl4)n`}l;NwXXVbSo~(mbRR=APBKQF>&S~I=ObDhL3)|9y_$&e*oR78A-iZg
zcE@phRR3VwZMVFvi=mys9fLh~{P<Z3(`MlZ)VT|1kg$g{?vha#w03UVV-t4nym=9A
z4}&n{ZEpXdUZ{V@d*xJswpDnWgH6BLeJ501GoN3#+1r|KkB-SVJBMoDkwp8>X&&0g
zkDrLk9b+(IpZ#cL-2*!#$Z*h(<Gyoi?cUp=#{D+x?f$Yf3pT%dubg@<)xPH7fBo@P
z=o)8ET>1T(QCTL2oz$<sBZ77>>no=(TsVUt_VC0#0M>b77p5J@9s5(NMMJ&lu+rs0
zw}f-<sV<9Jh9rO=qPD~9GO-hDC^yes8HF=zgY$B?7}{qqSU4Ytef7dw-XOyXdpP1Q
z9d%CFnL&n=_DKml30Jrr>Nt~M<1y`XoLh?O6gujt2S&FctA^Susnuy}LO88`%oY4b
zy9URpci6PQ%c6btoXL~tCL|;*oHL1@V<vcMcf<b7GttF5r?qp@PA-=5;(j&6dp&zB
zT6Y;TU6aLmQ|Y*%qtR`4p?ki|U;qFh07*naRJ0FZUjxS7$3jN?7vGFRV+Eb|cX((g
zdt}_jc1~;e!X9S02a9!X*g0sQlt5;_FGJiX*7yNo&;;-$mL`s9)m5mWb^>Sa%|7Yb
z%i(P<2-UdimJ`>9gMU(O-g{FF?K9_c)6UE>1P0GU4(xtVr@$_TcK6mWH|`;J_jXIM
zJCWf0p3AaTcGWTYsV_<QU8|bVN<{&=mxEG@581rx7o*Yj-gQ|F?OUhQX{QDm7VOXb
zBI26Acvu&L-4kTkw0m&B5z6e|&}8xL9Kao0TUuzzwb|%XR`{AFts8C~+EdA@)Zo35
zp-Jy26r<7#Mss&Q+7qUDY3H(bI_$srMI^v3g>@S2bZh6J-Hm%yC`UZnZRkn*gq|5Y
zikcpMz$nq=W{}rV>FEWo+i57RVa$VmXy%&E*N@5{Oxtib19w(YW^2M^KH7cO?t?u{
za1XfV$OAje+NrdUr_k=k{YD7KRhuj|1v>gfDuH!P7UMF&dBOc}GT*CDYgW*{Ks-O+
zygL-_1f$g`)~2}nm7uv#ojyf~b{6bmfqSr7XIr}`w)-lOo~H{4+^;%9XYS3Gll0~Q
zk7ct8G<MJTfK0T`+w1Q6>hPrc>X1w}ogJkt*yB{(s^z79=IjMr-tGx9)Ewg`;<@J{
z3U&e1xnbuEGTw(eaNJKhLfAB8|G<;k>9}8Dy;wTv!Tm;CTAJe#IkK(smfguK*}{-a
zHhpRvt!ujGHpSk{mxp`zx;p5zPn|uTD9KEw9#VO%-3xojaSs;j0<a6wj^W<@J7*}b
zR2?<GLn;;bf-I(Ey2DI*x}uKEGMT1pd$Y<sKf#Ruq}?GJTRkn|PPMD4Nz#>6bJy*z
z=DHr&yEJbnVvHZ!S+Iv1_kdyNW}OZ@-P$>6pPbOSw=FG{$}6Wta2=(gy`1qZWkZ&U
z{1+O`_gnEV62soX9)}lqZ6<z26{1SyF_+k`qq@AaXHEyugxYqCX71C3Y4=$>4ff}r
zjR@F9g%}U(EZDu)&Zd3w|6>brcNi6SqVR4eMz1x$-JQoc(pI~#q0-T2Vr~zw&)6$`
zWk@{FRD`M#_`FRVz(o$?`_J!fQhN@ZomATA&zd5Ib`R{&J{yj-OEC851Yu`cyRRgJ
z)4nQMQ5oXium;PcOm<a9r!CEDrSVhLs>tx%yOuf{@MG(H^=XwA8p_>Mx-R2_D`YKV
z4tFDGLu+M|_dmU%%~4MSyXlU*Ygi)hMQAril;NPA7G#*PhY)wE^BSU9XT#16GAoul
zvT_wKzOsDzD+*g>sJ9RlHSWe3)-r)lKfb$(ei3D>uzKu2GrhX43+?T7G}|k*#D{!4
z3Qq10T}z~*zOAXU-htk^a@u3{w{53CJ@fyw_a?wmomsx8x~jU}Wg7z-W-$b9SBy=0
z0h{uaqhEAPzp8mLHE$#fNyfsaa^LgjO{H?tl2S@aWh#~0QbK#86-fwz7K4zm5MT<h
zBpbvcEQ7I)2|QzXG%jrSL`96N+uac}_uky@zNBtu-X!Mh4!dlFB&6Rx_kYg!Kj)xj
z{b5nKP<p|}>3e_Z9GdnG8#&V+LPlt`)4|TfIs@zw?W<q1A3so4bpT3#uAUM=6VoA3
z8+G)ePCXFW)G=%>Ej9PmpasuN>CS_P&mJi43$=u3!@qsTn#7GwZ5QUJ<}V;PPn9B-
z-Hydsc+D^>=Pr$ktvS}!oP%c%cU12~;eK-+d)hIuCkywL!cN0FDePe(^Xr10f;!>4
z3=Vi>B)A{6)hioM8?e_<=ivW(*j7)NL6gKDZQSTcWDT<jG2l-umWErMjxNVg%{gwq
ze*Va1bZ}q0K8ky=-cCY0Dzrzi`Q<N#Io^@l>qwfM5@06{?N2@Rs;x?3xR0YP?2!|l
zo7b@yH|iQX3OIH`v}^H`QkCXRp`1xr%HI!_MdzlGr6W7fih4O$a}FLY-}gss4RY7o
z&A8xBMLRaM!yKg?>~w)09odPY{i#)d_*7W5@4O1uVX87As-5BBepV!jwkw5>Mg);`
z*nBH&7>-WT(^m@ycSx%oJ$Nl5U3wSHhpG<Ruu^N*T)?2;4<0KuU)=XcQrvM;hLUzP
z?8(4=C9tz#of`I4>y8{1819gGAG_ti^eI7s+5v{k7R5v8ry(k3&YEv!;j&bzuyD`p
zT?Upg|5#wh-+}c`F%0>+I(Fjn9|^Q04ILb553?jh+8F~o3F}m_qiA3C+DFHPhWpO5
zr69)sQtufX9}Dj)J?qqBhP%VzTw^{6(S8~;A2n2l%y(uA_p~`D3Ayb8gO&1t2xFEB
z2lwYt!aeGfVMF^bQwDZ6tkc52YW21gLflJp97GXa19X&{i%*5hl%+#i*!3L}sl5C+
zM0+FA90vVQy(u$=&Xjfh3R7{W_yh^<&k}??743M~fBE-9qdf-LNm$3h{?zlYBDn7_
z79j2;P889%qK(;AXG{CAJVWQ?@Y$VL%`@mH0QKLky(t5G+w}E6{|mF$JA%jk=8M0g
zN>kCalZJK(ujJFt0d^YJX<>iKVzIsa{OWBNg(qfq9s;yVR32&y1-yd=Ky_UfPM~My
zl~z?96X`K_G8FGgob=AQ-|s6{4jU1sEVE(Dwso6UlSvtB+R?Bl6!#cmr@T5PuugzI
zq+?#{sM>j;!1n9wrB%X{GQdnQ4-K|xIKa^5S3#eY*skO#KYPHAT&1FckH-JLxm2Nj
z*2(TiarFF0@9#%we{tJu&#vEuH4kv6{qKcIJ15vNtm9#SYSro;!D{>A<5z`8`%$1j
zO085XnK6fy3?Pw6(Mc-8`03KC<~l+PQ#AgkPIR9eX8E%?)p1R9{<Gb?*KS^eoYmOi
z&X)EtV}hZb7IwCQod`R0{?M^gpyzM_(2s5E2#@bOAd0LVLtR7N0;&yUYgR)(F+=hO
z&2S$~W3jRBa6MIgB#irN8Yx3fdz7-2gq<bpLG$Bt7mo`R_7RJy5ktG9Kb%}3&3O_n
z&K#`OWs$B~MZA)Yd#!URRG4Y&Wk0F#VCfkY?i5mnSd;lBf%eCQOFJX%Sk@_EU$thN
z=zt(;KWKBFmSCH*wGje>Z5u?hByN%tsx05{oSeu^r8CQ6T*m=(5O)SC!$3R4T&lp%
zighCFt5$6~cTAYUy~F7U4i-S&F@?X>tJN5lf+JpnU$dILrtB4*g@;`1?or%Hf;(Qg
zlM9*05`#N?+9?KTFu{&y{c#NIt5&`G`{62K;$BoA5h)>P#o_l*mF+Yk4aMkq2~p3~
z2*wV{@^E<RRux=CaHk3GjI;-_OAhVqLOY$?5zjg%u&;jQh3z)cOIu&r`jX|4Kxsb+
zVCGfBg~*w3@^+{NrBbwHz~jteh}pfmEtP1$u*lv>SA6br1ozlz4}&Mb&`#HlhrLcB
z3+zv=dVcG6`|-mE4;(Kj=r}G+-3}uyBJ}KC50_=k#w-KADuX=|+?rLS3^|`lxG%9R
zARIm>x_$$8L1KeDQOaPQ1LU+nmR#CnhyD2-udXIx{nb}~y&V`iyHohb-bd(B4Ug^{
zuESJaLV`zw3-E-gd8emSsW8K`E_2L$W&iG7QQSENcLME?2{W{l!~XN1uX^=KB(OjK
z22flC*tWm4b;nad*q?v(m8~zlVY3w+JzKRi6;5#<K4uSv-1tYU9XOt0cR`<N3^(5z
z-QFQZdZ1FtAjWPW{PFAig8l&rcMidwiuT6@K|4ig$HD&i);A!+UxjghWuyveV!YZ>
z1Qc)IzFlMiibjqdJ$rCx%ADiov3ePX-}6Bu<S~(waE+8@EFWmF;^tdp%JR^EX{=76
z;O=DCnf>YeA#Yd+cgo;SO*@7@Aqg2;*nj?tXawTn&<l`Y-~3GURakZ4@ZrM;Qi$`&
zU12F$UW1yXq(!t$RY7$PanxyzwJD={EGs+$I2_+G@n2cDm_k)ZmfJo~mG2AVP8Qq=
zQig%{#{?JJDPVu~e=0s3yqwwb<de_7eWbK%XUd<0mZ9KfDS~jY=w8r=UXC4tyAf>8
z$Y>fT40Oj%Qq4~tF*8@q_Q!WzbYeHIKXnDc{V_p@_Go0^Y6}+>kK06V{9)hQmkLrJ
z_bO9<bdpjQ@_Ii7-#wvK3VaQ98m2vCpq``*iMf^aq>PDR=_>1Q(pk~_1l(f|?vEu9
zb{4dg!~XoQMW`V>2M(Nt)Aj2|Qy%xDW)!P4#fUlN7D1&*>cIwx_KaqyBMUq47r(rt
zF=g62ra9Ek4x9I3aAykciI44^g$%Whf&N6VzwtZI2u=nZGM_I_b=nWu(00iBL$LL)
zk63l72fH(n)6=3PF^8d+cVyM4N-1*r6w7bX@#CjX6@M1quZPnznBYz-WrRRGi>;6-
z*jK&$n|~ZDCxr5YSI?$6?PrUes2K#}^21dHq8Z{f(%#Mx?HLU{;At{*ShQZ_@T7?0
zeex*FfN<sFS6`jE3E}=LjFuq}?n$AYkI){yQ`+(S-~K}*kov-f@QUuRISr^7eyO0!
z-X~V#TbLYu?PVF^)7%~&dW|!~!`dJD=lX>dNmbcpUWdbVnc(0sVxmeF+)1R25QPjL
z_9wS)|3`7I9yt7{(SE21tal)nrAU~ToGU#z+=o*s@Z$HDo+#}Z8Qq;uQauwMQ6o*2
zi&eH>_d}vH`w`r?ZNeq0T!Xtna#Y&T{^|?A{ja&uv35LSv>ylRB`8e0M2D&lwK(t;
zOLWeG49sZ;q*5}USma_hRZ8#3fXGwKQ?CykD=t4nnW)kScYzBT!rZ%8-uRsuraiab
z_K4w*Nm8>EqEkB$M>a=Bc{bu{&nW9Wjp<RvZ|oadPL*5L>f=!Co@P^SI160fwPC#w
zgF9E+>2`<x{P|!11_|v-xk~kjshO()DoJ%*Dn78Y%05I;DH3N>84mXh2zPXuQi)SE
zeJNv#oHd`_`Q6kaWBtAAxacFSbQel+=QXrHvEz;3Nph72wOXOf%@sXbx$1}~N~z|0
zK^5X~m*UKh8qYvCp7spHB#$mrYS9s1V@{p9N^`cWr57&P8MMqH%k>kXOqHq%$s)K5
zhj!8(s6YStQ!j7-of<-2i-?)r>PJevR{@QPg&hj<B?>eAB%g()4A#P4V;yK9(B5Rt
zBA6wWQQuhqQY!VTE>C7=R@12Ws;k4mxz8en8G@Gi83pc%2<|J&Q3<=lUVZ5|a$|1v
zc;bzF)!78frK@1j!k+ilSLMU-=RIs|#P=xmgH1%*yTN|qHB_h$3B4SQDHPm8XP&Ym
zdA0+*erDgUT^QUM64itS_mvA7^zN`%;PPYiNM@{8;|t&+zyu^>QT)M<5hz9L2(Aup
z6onS%9I)NOS$b<c?F}I%)7=o2H0>TG(MAxxZ0cJ`HQF=V%oOcr2h3;oMaH1M1>ug?
zGPH?m{Aqt|B|?S}+Mj<Rn4?B$4~)fmi~AwdWZNVVe-rURJ6LTyyt6cD73dE?V5LLY
zmJP{XD6}J4YFShJz(7w==%1RbDlNJyk2@(C+%q#LDWc4$M^ICLQMd~rxN~k=q7gDr
zJn=f5qoU6ccqq;!njsb02F5+S9~=Q|q|Tz_p&10zp;y+?YOIBQ2ps6{4%r5f+DuvV
zKo6vBx`BFhR40@n`%^EtQ(ib7I)528<2sBxn?zMOw9^ZjP-uVoH~*ZAJuSoW#?S;0
zB$|x3RiO%^9nvY)HZVAYpe5*&I%uvzTi9ou?G0rx<lRj@(PXuuCnIA3@z_YQ=3rDo
zGu0+<guK8c-}SSlUwwcM?hx)m(K0c5eJMiwj^F=IgQGpy6X&@|hb_Uo$fY>*UH}9~
z<lQ<Qq_i&>-4FGlvQ$XNG$XKQbhkI7>ySNV8J+zEvy24Q&6i5Od*}iUZav(=Q-_Mn
z-^Xk)K;h0^%Lq-#phElOTYvM9c-V8Z<6D+FP+(dN4QQ#hUyWmZ<|r_O9xNcq>OUIH
z$&At5Q*Z4FWu|2V&6w-d_Oc9<fh<c6Rb^6C%fR0ENExE)aMkfr^H)bsglD?%qQX5%
z!Tqt72pK|XfAxjmYKgRGw~WM(!BfR1QRF7lY%&3Hn>ltEsK-r4>PH^qg8JxX>JZq}
zjD+@vf%YbB!5#WXla{Q7DYCVxWiB;wzfc;!KeZn-pSy9Bu%70vFz(6LGTaAi&<UA{
zMFs<Vc6Pn()YVfQWineeZJNdk-Z?N{O@SjGeC==s{#1t}t0c1w^_`(wdvi|%&OQJe
zBf%N+9@S9Hch06J?xCxuD!a*iWZ#}Wf26~mrItxD?aVpq6HkOKGI-dtvyI@$h@DH>
z<gCqP>R=_>iP_zpDNf-X9KzQQ8{x1v9F6(6z^0Ip=^=P!;OO2yrlcuDrqZSwva6<}
zri+*N?7`r^ixKw(2KN>9qY`seeEBg*d#+KZRuAp1YvJIDJZN{$EwiBZEI{H8pNJRk
z#e1_bi+_W-A24ge(!>ac9bsiX13f(h&1mM!1_sKSK%){B&GEqRolH^Ok*lUE8#o3B
zcXHgHUK3*(QfN79koHyK@}tHmH9!YWzYGdBbaX}}!b?o7xf(W^rZOiYqU6BQf`UV2
z8R#h!nZsl`US4C%5M~*0NX#7Tk4Td-lq0OWyR5qj8{?Y?y1^lI&$dL0)$lXRDT;gM
z0`%%GSegc_tw%2JA<;4$)~zA&%Oq6G@G4|ped)JKalRb(gc+n-=)kxeHQCWq!y5Mk
zz&u=NSuhm@8$wOyY9|Pm5-u~Ynn)@c7Zyxc<CUq3(aV70^VRX4Rp$I~?irk}fdw4%
zj{^-oRtI*H9$b})1o@O25s7`H+NzF0U;M<B(|L(Ry1%%Y;Yu~`T87sg^~qOY_oGZN
zA*lA~>1Q2ut87l>E`1posoHtSG(8c_K#OtSjDr9P?NcUmyh`tfoY=K9Qi)zvwewVU
z<TACKDA=)<$mW3tununyLyd<YO4;b1IbBfQmf5zjSZ(@>M9Vylx4I{~F2nCV>I>U{
zrx%musHoGzzF=||4Av+X0NWv8D$-40JB-a{$u4D_@vHC`wBSdyk3&z^v2dcQZ3Kx1
z$mS+&>AkxLl#uQ>Ko)xJol05UC*f=DWt-V_{sal`&tTk;6lKWx-7!73^1&Jyi_CAu
zxeTyFxN`vUunk1AwhN13G~i8$z=*Z_Yyn`JCY$|V9lz0J9p(LjaU+^hxc*ig8RI_G
znL+gX_GIA0dp&lr47$t1JdvujUnn=tX0`!m_FdjXCf%PQwYrl@_jm+%UJYR+78x?y
zx!tT*b%4a8TyHhf0eHN$2ryMok$DGat4*ikhWmkHzy@MER7D3MMb#B4(||<WGurXh
z$N><)LpWN8Tu9yEei59XUp$X1Lz3a1_%bA~IVy=oCOdnjxF5FxCK8<6oVJ5I3xMgR
zNm8F|+q9`P&Mh9t%KOKo69}pg?>t)_u{BCe-6XhU<$PIBL->i2;%`=mQfpNW_O9dP
zzkPb=uOG0*J%MG&7;{u|+Q}?3<g{ly*{6`FOiSb|7iU4+h-sFx_-l*%ShB-50JKJ~
zmHG>IUhRuECV6@oqdO#L20#a@Dx*YA|4msb1AXtUaKU{K)g{xmHO%JU_(*rYy01eW
zdPIv11?{;YD;BE`+3j`{<y(DXx|;IlaVbHwJvyABNlIBYqQi&!qn58BfKZt!YbVrd
znm}Ypyz*9mU*GA-@USdLOX}vS@HhV>I^17dL!GI{v+B-oj!I&Yp@2Onrx9Rv*J%f*
zr>A3cN-Yj22KS?);3TCQCukZes0*595H&+A&6M>Jlh<~zug_xz%bS{;f`(wEDpS9h
z%Cu)rT|wiHH~;=BIhpE;a#TF+)D{^M+H?BYjr%pl-ig0#PYmv%4P+8)bF<~BsSY(s
ziHLhQQQtHTwD+{P_aMKt4Ag|GGKN%^GO&2RM1%W=jY+v=;#J7JPPE8Sz^;)h)G8}G
z>3$51d92VBkPzCB13{@?-;>d71AxA0qcw?`X&4}>O_nt@bccRrd1I&wX`N4L+B4@b
z617YO_bnTfP?+I0M}6w$-~4knIqi~som{P!$)Nw2!JZklLaND`VcRxc?2P#$8%V$a
z?W&`;(8d{O12W+h?7LM{Q)4)NYupJE*=}ee$eSkgzv>CizxFJ)r8w?aXmH=KKJkSa
zzH`)nAQ3VWDFnD&YLsAf40N(Rtc3M}gHZ5{xf$PC8t;zSQ-?-ueU6a(F^q3dXJ==7
zc~4LKKpD-gYQsQJd(Qy$7t9#FX6H<eL(<r1a)xkko1INb@TZQ@WU5KPoreVlQQBYG
zPEvmClBs0*Vxnq?&y1Ni@*X(WaSEcT2mlTr0Ae<M&jImVuzlcof!z*N*M%HiLpW6q
zDHM`hrlzoI3~u)*E9>sYKM~D6pvlzP1DI!FgViEnf{rK!o0{NMb>EF6NA{E9{^F(t
z*CF}NQETwDcd1nd32Bas9FNIPa{+YNWCg*3gSP4mR={qGebkCMeukOD9d;YoQl|}8
zQlyeBPg4eq6E=;NwU?3q0^}KJXlO<_2iswXd@~59p6`9a8gN>dCnr5OiMVfjj+<j<
z#nL^_IjTgiGKjOOVb76Rm&_n_t~yeknK=oXL~WT93)3qIZOd_6_H@+__BEnr{%Z9=
z0}I+Cb;t(BhXXZgtPC`#UKd~Q1td(hoWSG$;<KCR3}SI8yYp0RM`&L~u*fK7Y9&?q
zF?6)$a}$eZJKE23_IOlznBi-s*}0X9)@oC{#QRxWi?RfJ;}3STz&%oj9ANWsL={eF
z$~u9kKf`3I8(w>QBW{fWZWb!<xbtcVgWEW;kzFQ}Fu<OZa~kd_oidy4#}5QCud<r}
z@OT&|6E8LAHd9BuMwQt;QVAA!PbVvI2bvnX%gP!C2Ds3kQ3il1+oZieiu;Cb&um_^
zW;NLwgZSMt@hW7X92HxBG^jM$jI`&>fN<n)n{tAn39wb|tSYwl_AY|Ky~0;bJPmoC
zwj7LCsa;v3#m@UOHL(M?87atcitTWC2c4-|m~1oO4C4O5<=q>eTLYiO;=YmzVSh`p
zjU%dKRQhZdwCB_TVTCu>J7+$1)*^z0UfVKgIdt`Cv5Bw5tQU-rjo^T7yaYNDl%wl3
z$dzDjr>8SD&A=1o`~JA^#77s;1A*P^)(~-jGS0ZiGe?DVjF=7VIXU$pDgc0y&WyQ5
zzywb7cY8hu#$!0&LAyv?f*g2~5@K-48tW{JEAEh-NljD1q}60?S(=)ia6Y{z;kffT
zvmKwKD%CPgE<4(D`mN{)FopU_^83!7jK>D30#I8L#yx0o(VhmIGU9uhQa4)-zG+39
zm~rRXL%`=cj#qz=&QZk%m0XgW&5rhLO~9F$Z}OaJ<SgI%{SeStQi9<<s|IW@i!<&i
z8{WfV3<$xVINW&@GEbuKQN;$ex{J~gmXjma8f2KG@FZrU#G=`58~NmOUV*=Ash29T
zxEsvv%^C4NP3;RQ9p0_4CN{eBDP&OFIP&ExSw6M@QDcy)Wd>s|CcHO#64JUbC3^48
z_r4w}I>saL2W)*MB}yqu&N%A8_NKVg4u|)Yc8yiPp3vydqmY4fR52vhrSMQNy@uNC
ztCg$d+FZPr$;#>n6R?A2b^-kIP569x%u?|6zwl&$v^yQ4s!Wi0@lbhZ0%AK{vTsl6
z_NL{nl+is7LuT00&O*qndU^ZrWNNicAyv{@+ck2PPLe}B@SRKow9F(>`t_Tk^WK+s
z`<D>#D`&nVlBPn$8x-{|V0-&OcOq!dXaGg2jQivZl+m4k+<6?DwBz@<dsI@|r7F25
zJBOThWqJH9PgABZ-$b7;?DmnO;+2Y;qrj~o>&nyheNF&ky?vk|BSELL^Fj*aKD!+k
z-Q%~FiAN#x<W{2Bmq@z-xo#qdJu7RbJnmQG6Q)nz#GMbn_++Kq{;pb(`z39EIndb-
zqu$g|mXWa2)Sl9{$m*>T+T)A+iiHemj!F%Cmr6<wdysa=m^J=2nc_DI=ab?CD>a7o
zl}NQ3SirP5H8*r;B=)3uvN|hzJt4UBC}c?bQ3<q5)QW66+9h?)xaVBGrY{Jzf4)*F
zbE>EsN>eo+i1mhyWSsW)xl|7CbK4VvJAXpvd6Irq0_`D>7$xm`kFzE2L261w4DKJ>
zKlyM)y1l3cqTSKgIZ&37oYUMsoyxdpI(J|TGjUkU#G{be@%!H~=BRo^$56}mtgL!)
zKK`%dg&rdAZ+`Ky?UUGRGsi7`P-ws9?CePv?I~Y+pME9Yxbr7uSmdZ;9X0GZ(LRU-
zd}HUqKaueM=AZ1xV&%OGzFry!JA0BxJEUerDO{VGoi2Yh&bV`=okqyK`oeGjD?RP`
zYPB|-mUf3mtJMxA!u!!?zVjw2??qq7DrL+@Y2*3!f#!@Po~HJt)WyB!qit*Ai~CAt
zdsN80PO>o)1-n?UR_k-KDQTBT<ubKQuG8!FW9CG>ke9EK;{N6rk;!5QKm5PA;6B_^
zQu43u-5E(e-Kl)jRK0&2Wp@W3xbq|1$@@`Jw2R?cGSXa1|D(j9R?G9lL!pN}3F)eL
z9wW#7%_5{cbMO;OQIY*~4#1a=UHqq>=8PmCFm)FkWVW1mEuOf?B-_b_%<oY%lO)D`
zsWe}!gie=Ur&g<FQZcpJR|C6dP)%;PJP8?Ez6`to{y+i0M}fQj3z&A>$B?%FVx;Jk
zFF*g{i_bs)<V!|LU(ngp)SYbFGkV%nc9!0}=kjZGy?g9%e=Pn&=9M>s{isR<Jo8Q-
zTp6i@j=qb~&w*hbN?qleXp#!6cc(J};c3cj`H+J4H$NWv<dd(z2uYm}zdTkjGE(r#
zm!C4Ov^mt1A%J4=9wz_*AOJ~3K~$5v7prrg{k!6bJ8wcJ*pI4IsMQKBo5{Y>z%Em3
zb1<-HWi^(^-_<uO0;rS>e7^kn;{xDg{J&+IzJ1hICIsA5SG+q<>>|PaNq%sTNw$*;
z8F=-zQKphBS&a6@z^;}_a&WXu`aSU<<2-K~dGAfmr|2O4W~g>S(4LV2q^fuaE;Hc%
zH?iZ+TmA9Lt-tw4xk@2nJG4D~a^*qTF|^l=l`qHL=T71cV{=AM(Ygl)1VVf2n%<XB
zo<MM4%|GtE37J=4`t6WR$$mvaWJs7wn?s=8FlJ4_k7`L23+-=y0*@@HIyN%$1u?Xb
z6gOuG<urGu=u(fi1rICS|Be^jV-hm2zwujzIF~c+ut$tQyJN^>O~jSp1>k%PTIS6!
zieR6>wGY39a@MM<e?cqx<2@O|Ib|lGH#K>;-oWDiRQzy{Nyt3^^7h}w0J}yO(lJ;e
zGw!KQjOx4qR>#77(dSS;`fqQ3SoFmw1ta!?kE34Uf@T5Xp3yE!(Nd&!e+2hc@x`5U
z{V`|=`;9i2Gwt~*xg>`e+Uq^m$waxECSv0K^P(?4F8ch<H$N@<<ns?d{JdZ!lDiH!
z2nqM5&J=Y;&X2tl!u^$(cf=F-n1syM?Z3<ANPA;_V0=iDL!e!9I^da3U_l{9-baq1
zJ@O-waoooQ72Uf{K#IB|r*8yte_?S!^fIa4ofq6=p`Em8i3)avcCmEa16oa>b!<k1
zqTSdyH16>@6I)J*jd$F2ROI66c$1KD&*<z-(H@V<BM9z0tZkXSq8)L<or`RbT%?j3
z!YD&Ka@{JM@xWEaiK!OA>glVWIeq%{P=5d-9jsnRxNCL7ykg$J9*OMfD9#X;nn}@%
z)%hz3?tg%%LoK{aW0_e2?y=M#pCmPeMQB$_4RV=GrIyK|197gF>EKy1b>Z1DZF5W2
zAYipxL9k_M>OxXpy%Xm074rT?q>cNaMNqgmq-u}H{6z@&)$1?8srH38xZwWxY;li8
z$PgA3L}53=mM~ptk)Buro#@P@Arq#|Ix*3k%%94N<NJHS;hhlhRfn&3*aU@p2AHC1
z=E69P`!g32VJq6oKkhLJnXn-YPrF8^QtOm71xT}?ehMq*{Zsp)kpeqVJRkrg<RhVG
z+N%He9Xnq6UC>4{>)eVe%y7W{F-qKHsXspdGFgtAt5K-rMuyS8ebs{c?)F+&#`}B6
zMn*~-GK6<hR?SQ-JDtnnM&()aYJPE#Mab;<J;`8=T)j%BWFBOlkS5dw@($_uPcwvg
zQnogOInEtahRB$3kKrQqiLJjOc3+DXp?+(ovF*3O-bal0KV1_f?kRiIggy(~U*!>Z
z&axdTwv%*U>r_UTOA7jhhWpBSFX$E`?%k%;-fV!J>OZWaGDLF6J(l_-S+QNK%4Z3C
zj={4mI7!)SU0FTy<NJaP?>+64DUbWaA{5?v!aWArzT*XAv0W^av)w-fuSykQ$XOxp
z?~Q!_KZKa9g66i=mot-ZkX)+9f;;#6<5Mqh|DXSXsAH7btZC0_6e8{`<^4~`1S#L!
zd!|w!_e}74Y+(k|-GSbk%@TLk^+ytm43wdE<#M1sM`IOay<o+9Mu@yObb|A#k2^qz
z`!6};&RWPk@d948cd6CJT=qgn1Fx;|2(w<WQavNY+Iv~2$<&+bw9jsTG8Wt)qrjbg
zBgZS_*!)zcGKgvXkCJ?aOpV>7C)L2SPBR}x-ajrD9___|3z+@?aYy6MzL8^7Kp))&
zY*4EW5=#GLZkJrGmP<8c6Ch`VYQ%<k|I-S>yGd}>$ZJL3L9;Nw*HhE1C2gB?yUDcu
z6}qxJYuq{XUqA7OdW3W%JT)mYONNAXiB6?9Xeg)q)&oL~BfZYf74TlvBsALX73n@<
z&YNiiZ+KW|6>SrlnHNN_^ME^twxuUt9#g~9!DPBFF^#t!UW=_I%~3<ND?KfOeQ&l^
zgCE9z*Ca4CbEl{^J-rqXq))8Px@Vt<Qx<(e^!$o(=P(iPiLC(^d-RlQbv{K!CfvBx
zZx!(D@wRE;^Ozew0Ab;7uT6)JUyu_C=1%T`c*nOTPt4MMt;;V{m)+Un&R(`Z@%YOD
zBO~ovm0Xg|K>LtK*rUgnfq##ccT=;lf;&umdW9gv`}B=Hd-i;AavIJ1g=*)RwR*Cb
zGGpZlcNRkC`4@hxVWM55Qsibc(5@d(%w*q{@D9eR-$#TrXeQ%RKZ1L@3lN@@V50oy
z9{5~Ag}!;`XS;UoI&sBGR!Uk}Uao$LAKY0id*AVUqD=-L+I4D4HWTexfyB+#i1}2P
z$B6rvf>JYfZxDA#&Is<JW9kY*`<~0zNG!kL+_!rdd~R4F-rHs|SMPIy8}FZ3&kOF%
zTO&!gE#Y7{hCO0AbhKxAQecTnuj%VYLCshSL%2ifs?f5f>Cb|=|MA>hq}q5RNIS%P
zxzh<+=dq8++i$PkjLKB;xRZEhh`f{69|=O{*Nhv1jbR-_8``16Y3qA0{OE^Y25pIZ
zD=c1n1k}u((e%hE5?FX|122bgzZj-^{@m^`?r*)bfB)qh)o2YrdF1VP*RIDEW@5md
zg>2vP2GdBqe3e3+&5HJ{@?|cUd=tqjDl9z;Y9=h*;WH|%c1ffzgV6rRBa`9aej-f!
zuD6hL#yS<zGZ(D;L%0*P3@6-~>yJ-vB^j=PNl@h~LvA)L?GBAnsgyY2IbnS!_Ltfd
zi$%8H%t?4;<b{RBYSH3Sg1lu@;3H6*DR4(|9~78vW9mp4_s>EP;{3_oINaYlanS>|
zEG<kfEIB=&z0C*i%=Je|$Y^P3H_BCV4YemM8@Yg$$>4=G3fMCvH}pFhb!6M@JoIN=
zS}?l{N2eBwk1e!K+g;wuO0UaanvifGyLcCnni=&*ajyl0WkQ`gc_T>sAO9GbA`k9w
zz4gvJ?|g9L{g2L^dH=-Q5beC-&aomBrroGht8^Ml17tSrnlTt1*d;Vd57T>fcG+Ay
z=yJQ=uFCXuZ|Pt~rCH<)WnEs&gM=8Krh8If%@kFnqtp!GToh1AtZl00qY&=<;aUD|
z%NKW(;r`A$Z--A1_rIaYRN3QBQ-8!(WW?|eJ$OQrrc1AYrzRPx?Y_wRRN`8WtgQNS
zhTy(b>}pNNp32I|Pi@#{qxk(3^HU4FS-WRVUkF~!l+o`ADYIa{hqZ&FfLTD-tMgZa
zv_rg)JEyG|FO$<wg*!gDv&NmK{ursq<im8UWeP}<!1M3mMS8U6_I%h$K%8a`4?bn`
zx=)z#uw#E{Ue|rn-?w1v@Vl#ddu1<H3tY`~7XxNM)YH@qorZ1_@;~+Azj+mafI6F&
zKMLc%d-whu`*-hV!2Ml*aHp@xNOF<Yzj`I(Y~LvDxjL2JK~j@p7u++aed)BvTTJ>+
zK;({Vp?BiK+=X5~!u#jKRx@@e5iP8&eR$_u!L?EmU@Pr7hW!P@Zo;?DBAh#q3F`+D
z+JlENxWl*;wG1cR8H9{Pp;Al5Y$jPpXwOxIw=I#;ZeVU?nh<&EdAE~DmPtGEPN*2R
z*@p{;%{*M1Pg@0Tdhag6MebVHs0H0lRc0Z+B?VM{pFR@`?z>~c{qHEGI~&}ogv>vy
zWJV5i+mRzx8FQ#<SB_D3W%tg`O-(LOSDQ`4h4i>r5)Ir_#ptvwz12QFIkm!+whfH&
zs>zZN)B80)@f*|XwwK<CXqiFcFBla}r^nRTP0qm`kNYoT!ktRU{8p9Ec1b~mc8SW6
zLqoe`yqr9loLCZBN(=lhx3{u_0e1MOhSx*$m?8vp3f+FceQ|b$a^~M+6YmKzy_eRK
zeP;??mSf@IUP+Sq0MpBpLP%HV%lA>xPLDe=xO37nY1BfdUzy95_FRQpLQ8wSXMrrN
zL+Po%GM)VyyoUqRM*6#JZ7WM$7h=0>`Zys&-fa~WuRi<e$H?R0C;P81yB$dK{c7**
zg{hXY{d>3vcO32*+S%exdXf743)}U%Txl2UFrpntyS{$Bf6OyYR{8CnTpmtOUjgpR
zE-KZtqIouLKuqENPo{)KcOOND0|ofurlw*a)k`vot*dSG%TB<0{^XU<ZgQj@h5O&G
zK+B|22^lea*t0`RBh^MqpG-|%{g~BhZJ{cQUl0`(a=?8Q7qy)fkuKf6veazB99!i*
z5%V|7uGy)+J%zP?e=TL=10=0FbHRG<{rw?l7%op`BV|yyQwDc7xYJ%Ou?p=Hol35u
zbcIRkJRk_-^mZG@{M9z?=775o_t=Q2a4)naBfQ%Zk*k&!`_p4NE>p7H1Z~#O_C!w%
z!5zV!OK>N}ogiemY|?{hS1MF8Beez6p%`;kPvFeEv&&AWb#Z!eI&`nyE8?Qvy|yV#
zzBNr5%UmmKTU#>olB+hi^Zx*p#zuR3VbW^v6P`VI+^J|M5AG4%qqK9z9T(bvzJtpq
zJ#m*pt=4I%4Zm8sT0LeZXqXF&;NF>;7EfP`+1ZwPVPZn$;`B4C9JHagug)z}{lZpD
zTjIm}G2Dix28(O-8t-NI!q{;4nUdA$G2x6gxW604oxCi=R?DOjh0H%w!=7u*Hz?$C
zg-)+GDBuYka=nJe-kz^k$r|g%u$xkQFU-v^R9m&-*zc^Knwz(|IR`112o>O4zGGdp
zOh9<Y->a6o(km=wJhyK6(qq&zNo#9r16L+xVBG(fi*l#H9W7*jOCe+sD}hWW)oLUX
zjZv%BYI3RD^kCXGa#g>_S?&ZeHkMw9bkGF$86#Rp11>MvD`WV<`R}v2h+QG>ZL!qe
zzrdAdilIN=D9^^RvZBhEaQ7#1pcQa)MN%e=``@h$cSa$TD}_jxidhZ!4biSu$!o@}
z(^EM6%IvhcuhHnh6yujn_SRT_aNc3`B^`y5t+b)UOf2gxV+rpc0%Zi;{d}vLPi?g^
zeb<sWFw(kjWx*YVJ2~wvaQ_)YMJ89TQtQQRM_C7HSE_UlV*n-DXP2s%+Ti9S@N^db
zeCLl%g;v^vcNTMyi0`eY_}TkW=9ym6a$>^!hXB?!Qw+U&+`JFNZYUa!A;4E8vCX4;
zKda#W4pndu;?6#}li-f>$dCycZEz$QC)yn{xdWN6fl4L8KC5*e`dcG`_S?SL-pc9e
z!_&)V*bru0=w0+v7TzZ&=9hx^=97aq^s9zttdAkQe_`n+M0al-oCViLWB9I_k~i%=
zJbWM&+&8S{P;$rO9&2z<qiw&Is&wLPuCz;4N@Tu<d3kwydU1N8H*>1mnV*%_2biry
z+Orm7EU3Y^DQ=|R-dbRx{1}D);^GdsA4zMcYkkqk*1K#ovy%0_+{63VSlr9t`4<&H
z8UMW7x$Bu$Q}Uww@(oOI|J6EfQYMHyu?Wc#cdGVlsY;*C8Fr=05K2M&Jf4=8z7{Ju
z?eu7n+ol=^k@l>i``;ozhi`tYNRQhYgx@sI$~(vlr)_R>a@p)J^xA%4^+OVIHqDqY
zXg486l+ie>_P8^eQetN5BaCu?Zq2hdIpnE9-2aY!a3{r`O2}wbx@^w0cc~Nvr2C!y
z;w;Lekq1ux=Z}B>^N(j*{PDvbF%y8T?nO9{a1Oit$a}#(%r3lt$r1NYFonqOpf$15
zc87o70q$uJu#hy|C(odR`-aVH);zm*H+v}qoy{ath7;~oLPimuf5)D7u})=hWU)WU
z+8Tv6tEO&zY%EZJ#}z-^y%6WUw)Dc{sfo#GMZ<S5GcMtM1l{0KCJNmtxb6HK31YzA
zzL-3Z`w?_--?Dzqnl;aDz|g+owWnX(vX(;1y!-BkjU1#58SQE0LPkfkTZ|lbv0f$9
z=Fq?`k?Qhfvb;RxFQK(Hl8Dj3k#*148b91CEx_`8DfIUOyT1Zu5ME?s{^mM_<BJgs
z*o2cZ{K}cKZs?SiH5U)YQg~0=ID+|$=&}rg`<mz0qG*3@{iaoGHg0~AJWpM_;n^o?
zqzp^k2|`9Ar-Pk@_H3g<C4)P$DM%Mf<xm)xYA8a#1J*kCeBShUo>mu0KSW`z-^QX0
zJ<Tn=fBx}cWob`XzL!QWj4M_uXBwKC1_pY}0ALms7mGk!sVjyOt~YtpBIhm<abLe7
ziu<;WtDy7LQyX6-p?$;V^&5Z2Maq!k9&Eox&DJoeWXfFDwC5W2GIe+@4Jph<xjIiu
zE#6D+J#_hhdhpQaPEX2l54W)h@0_}{|75F7FB}v>Xu>i6S~LQCi>|GpJkwoVddTgr
z^;Q(F>`!b-TEFUradgc+i2KGZ5!%;27o`2E$JalzVZ)1Cu()qoMO$)bi91HfXml!d
zKCS-|(%aD`dTQwZbXqY*>k`tMDp%<wv;zK~&sFQa*5UUihxYV}qW_15dZ(<tzxVkk
z9R(eSFptBR2;g3qyVf@V8+D^ONyVULAXYDYnT@A_-~y7h!+FAblYsl0XCk;iy*iBh
z<Ez)N-?;uojBtPEaoUnQJKEDCLI&QWC)d*0A2oV-kW#)RhiT?%M5Gv03VPPFa&G%z
zi81IaOcL$sm39`mw}E%aqWFhj7g&4{)oz#l6LcNY6_qdei2$wcqNdm){Ix;8WL@%V
zGu0oV`msZ}uZslt%@Nvz8{s!Tvmr|RiyQxzwkpFC_k3-aR0m1x=pH>X+H><|YI#>~
zP7aMt1`oSJmCszAxsOyI3zJ4WyXc;IfjCp_bBo39bGL>+%F(Zn6&(8-S<3olM^reJ
z5t^u5eZ?{HUR=r7A9*lo$?C-7#i)NEggcz82J_TtaDOtmMfLHGzuLBC1AMkTyNRom
zA;;Zd(B~T&2FY}(gRU7awCjR*s|+W02LWHF5MYCQ<}_gd_6SB>RQLy7wXV@3Sk-(u
z60Q2d(&ZYi!s?2NcN2dvG$3g{g4y#?+~K-Ae4Y*k_jS17j_eHHv~lA`NZ4#*u!gav
zJ&m!CL#$94#Pm0*MB0sPB0EI;Lw|a*53A@7Wvlq`{z;LYD5kwdhu(Yh>w;(?y+$?>
zCMMo3{9QWRleTDe>QdAk7RG(kGePCP21k2nMfT4ahYzd(cY<J-sg2o8uoLEM$mMLV
zn{sYH9BfTG?xR1jlbwVaOCNq=A!@MJK}(S(ns(Qg!mWD*)je36Ofi#Qn=}(}^@%9%
zuWecr;{8`IuHCY34Owu<(as^bv%#GZ+2v|YHdopm>~stq+XX;-x{n?1#Qg^EeQhC2
zISSE*!a`WQHxn9<3hmtMGewm=3b^TM^I{UFE6t9ftiQhs(Y|K&>W!P%uUbVO+^J_m
z#zK1<9qm$;GMg*y61hst&O`9PB?Q_DGi!pSm|miq`4isu$mU|q*PM~jFiO%}&XxA&
zQ6B%yE|cA#jQY&v5tNo$AE6yOt5)Ij)RjpY7P#ZLUq?M+IV@?19uS#^rDH}s=n?|$
z>F(*?UepYbUU;<Rgvd<r4T4ys*q7|0?O+pecqt;GxQ6#@d^?Jgv8-v~Bhug=#+^pW
zP><T+M0*+)>{^vv%q_G#q%xH>o0@NjR)<_pg={lR{&Yc{!a<v@*d_|$eL>_~%xqh9
zd7bzll@n8Xf6vBFTa0!?fth6f5$9gM(prB1*cHi`zk!PG&xB!L6I*bnr=1aZtY+7v
z`#M<A?&y-MWm4+=RHB!u^YoY|)g^bjfR5KZ4Mq6bYI|*~ZPE!niPf{Tx$4&}FMS3}
zn+D8Yvd%+}#hFrmubo|{#UvEpXRVh$x{TnyZ6l}PP8e_f%h+g7Bf_4Wk7?Lr5Hb=Y
zY~z*bX|7L|3RPY{;Zdl2m@X*ZeUq6}h&R}a7#i;2_gqYuVzdm)cT-`=T2FiqIEMFO
zUZZ<OlD5WA%ukQqgmn9}8!^FsHAQe|BV``rjytOGXi#GtvGIUQ@^#22z3`D6@@b6%
z5}isxD(8)Xe-{+*m3Ffo1*RL{#yyGg&3tHI@og?Q^*&7ZGHmq~7gTZ!?nyJfJOBH0
z&xNzpaCFCN8BS7$8|`UP+9h2&*fm4re}ta}xl}`AlOY6lb)J#xzcmJa5ESp}7^`6+
z-Whzsgh^FbTo?4(8u-G!&|d5s3_8eK*`@#fq-|N9wLXt#omR^*E!m@@od)-iw-Mem
zrdQILeYG-`+?Y-43Bw<)N<q`MmsJxGmY%^?Y^vLE6F4yUs-LVl)Ari9n8k`|w7a_)
zdQiQi7JHG&0+@;hYZ)y_ZXiiJ4ceUl>l(}<Y8fuUoh$8WG|qMu+wfj&36ld7-<wC$
zw~Es<J^|yN?#C@G#+GLOWLxp2e#M~eS_4bs%PceqcLa-+70BX~!b-QVh)L)t%{DW6
zW%C+BbWdDxPh&%SKHW5Hs-sgAG(G-bOb!Ye_w-Th1=JMq9%kGC56^0)-)<@GUa9@J
zkWdu$+L_)xMM<*FRPW!+9NeFv5AG|VJ&hT5y~>cA!<BZeN=mTEER`<SVBNoN0mI%p
zh&PW}@1U&iUwmA|PubsH)U;A9L;OlwM_o*6W*Ib@6CUE*z_pv{q&r^A&<A(!w5KuA
zZdB=WVt}1Y$K3JxmazY#Qn<8xi|*j9k_&Ll>U&=fgC<jveRPnoLU_gKz{)HHWTCu*
zNzeE#ey<N$PBiY;o5biIuFFtp8IH8agnM|tfJ~mtnRcm4M<&{H?o_r88*kq(iTs=4
zLgB{tBBGUM4tVp+ViUMHHCM{-y{@m6v2l;)*{Ut7Abng}JdW-}&sb^$Z*HcM?rehl
zifB)xU8JW|DRVf|Zp<Ufn9%v^uiv-^{eus?q<Xzx+NISqs^1E4vL1+9`vl?Eu@?Y<
zWw<=K%(H)mk@sspx+<ib;`M}#7-{vo27RNWgKpCAWKp7r&RF+tW?7eE3hpt{o<_4s
zPoe6{;Y2&^nxW~$){WmO^m;2@1(RCs?Vo<ShwAMpY$f|?eEZk`ypyDs?LvRCd5XaM
zR9oik(!xS9-`=*uK|582rn|YjjC4h6_#7IhOg=0{qc)4r@2>U2jaFpu09T^J`}Aj<
zsiZqf%lwQQ_m$C}Mn!v<TCL;)yF@CZb<K$30UbdF>h}4eGw2(P`~d#^{rBI0OQii`
zU_6jKeP3ZFt4%vyE`J<`S^A5*2}5ND2AaB?ihQFMy6H&|i>bew!b)%SyXP7$BzrXg
zO9>r2GkIn+sdVQW+#ll$cZ7AB${?mSKsq#9M3P9gTB$(}kuIm1B?CJN^76B@ei{sG
z6zEh&L*x(R{q_BUQ+V2s^gFVQ<M)$h6ZVrWft`-i>&A_pxzx~J?60l$+lDLXBwgh-
z<QK4XtBtmjy~T=5(+M<-T?lMuC*A3Td#tn*aL<7Ua2V*OYiJC}#5;Yy7D63jKHn%|
zN?k)vg8Sr}_uEVGjsyMp_urp6^Ve@e|MHt3uZ+VVS2KP$S^B-uhc8?#n9R0#%_*)$
z@m@Ai%*GK`X>)V<Y9O+`6g9~N=BnoZP7&RST84iqgTY;FG(dtwVWe5hA<@ATI=IX|
zb?Bn0>+)T~_xhW^oH=u;KIoyTuN$iCKZk^%Z~t;6FckbW+Cb9eOd;-~sn^`v8oy`H
zTNE})mi4e(syxi`-lDdMG~Oh1UDMQW=%o9Kf_oZ^6LdGKku`b-t(ea3tC6eZ+AL1T
zp-`bLVs+#9@U(v)s2jrUIH<b=Yk3Ivh>h~}S4pc^x;xsip((Dys&zC}py^?E+uUm5
z`i-d|R&iS0K2t)g@71r66lUnO44<^8vD#4pZ=iwqVrOwYQWe$@X`HV7^N&CN`J1p_
z`Tk4*-^J}%tVsXyWF1-`^&d|X?ca<(#EF?>aaK<QWtf@446g(3Cge&B{(-fdoQb_#
zo!ibN-5Iq^?6jw`gPncDH9A2JFY<_<`kzh)#se4s`s1I!{r1N*f&L-F6Qmix|Km7z
zr%lcEB!zePDDGmlP1G7^-iymJx-Bd}iFcU$XCO?T^(EXq<9wa2Fhj0o7->&S<A^&Q
z>@peWzz*pcqDL&NrXG3%B&X{G<Co3_>XjrF9Jz5ka0~yCT&ze=aKDTHQN_FCu+VR7
z8enTJ_Qr6z>%!}##5a0Oy+9V-Nu@h!a9;`SX)Hp!PR$*5iGu!hpsXPzyjr<hj%Xi3
zMblBA6k~iVah~3MN8G(S9jy0mR>WXZs~slPWfJXtpAeB3W^mG-sAV_~45PuF26m$=
zKZh&qMwv{><=1QAeFp~WdgkfUWXKtBDX|x)SU|p>!WdT7RO0o%*OKswVxm{^(Va%R
zGY9vyG>*8_!me;|q+O$6nCY&8FQ)SH)Oo=f9B>gopRVhvORZi^MlsTThgdcSS_Q<r
zo%@wns|EjxNc=L7=~t)=Gc;O;!%7-j+^J#DS1H7tV0Yx_sTDNRN28a?)C#FG^f-vK
znN^Wot#@QCC&L-<zfY293CXiO7{hl3p9d#lY5c;=6qzcOmZ1smX&evDhE%yqpPj>+
zb_aY(MYom)Hjr_<qC#4`k%wpIyJXNrGEQ&0RzSGBW5^`%^J;vFZ_=LnHN~AO3GNJ9
zhAZu96s&9IDusmB|EQGeV6TiUtVr?<c$E7@X7k>b#t`c&Is+NSyFeXo?XC&jO*~Cx
zvw;^}3H=fZYilbDc`eO!xWo3bT9<!t(4K@P+H?OKU8YJU-AQOqOXC6eY@;ILnxP<F
zr&h~!`AT|x>+F>kgD$rj{tYs<lyh+>3th>qxt@3xF-oFp=M&mq>jg|E6X2`hF;_+2
z2(5$A2L{X{r*k?9dzxmqGvJPs?o`1&Ek@iWN~KaGkw}#JdU$P(K||yAl^E1&9h<UC
zjX4OYMX6QECEQ^*s=Ck%`s!Q>$Gx_Ap?VQ_<#=H@kzax3d`3q104Taj@!w;Z`Cej>
zt84%OAOJ~3K~xFXmh8^?Bn{p`j`>wA?j)HiLAvupdm6kwPp;GH6won9wGvuuyI7}^
zvAtbw3GrE6uXAvR9nvw_-?fl<+|w&vUT^8*1lA>%z|UV{3U#W2*T}i{#gIwZTGPF@
ziOgi4<*jUS{{`Q;b6B^eWzRYkoJ0PlN?T(rksbd&D7llQ9I?=4!)O{&0xx*|VAvwr
z1l}RjE&do{Kxu7yEzp}(+%Ie=#r+9RxTo=pJ03y3%D^Q`-wM9<D=hU~S%+RB#P`8%
zUqyP7j#q@XMJ`i5cC|LZHpuIBn7t?3!`IVEa<lAWTbl8@!jr`cEv0_DIWxIu`qyFH
z35A(xrb;5+S4?{vOW36<j=5%I@cM4BpCjvf@>j_HBu<0BgVyhpR9{G~si&#ORKVva
z2GCO^8#<c^PrRGmr)w=Tnc-o2up(+TEjkw`l8k$=^JR{iDn7WU@rpaMw~;YZ4PLif
zI2b7%U2;`k7x^mrf+Sw=xY2|EFHjZ#0C-wVH{kNtx?L`Bu-4~Y(H*QCz)s&703R|r
zU?@sVX6XGiyJR&1#de@NQvheeyn_~ZMlHi9?rgk`jH#w2SSn-pJCQNkd6YxqOOiTX
zuN5^6xa|UkjlgRPiH_pZrlzLOf?Agy5cOEx{AihQfWL<Oq^xlFh6h6S&Mz&`XA0uL
zwn)ynKNc6<2@OeHt?n9~O0EQuSMOjSnPLg9tqI;wA%9UwX=|IxJ4qd{S34b5ouwV*
z^1RYihKa;I*Se8tAA8EtY9dUJENjQ|Udu+z6c#x%1$U-iBEy|5Qzez|X}sZ%15Ktj
za&!Jl^B~sY9wekF+=?&Ez*kgqy)v7_ht#VS!xhQIy$}p0s|ySB)E7IJcCs-s1BYVw
zFjz^(i2-LZsVa+%rf?LP5FG8Z)*Wo?ki2S{G&<Vh%^U1xj03UpMh9@zBNP8!dvUHA
zZck6JwfkO@M+H|0fwA~IsLP?XCeYML7>?8&`+PmiKao5>0A@T1iw!od_QYErSybLX
z+RRjkq{~#(c)}fB`<AQZMtZ%i2uqUSGCdt`ZB3n}w8#dYj+E_XD$cH%EGev{9t<Yg
zn6-$A_j!7=yW4ljLKtq^V2ky0x<C@z8`{xtmkJw0-LtjU2Z&~cM|-Ao|9W!Vf0jtx
zBOpUzT1VHyq*bWZ3Mo^Qlk#*;jU*DJ4PuU{m)yP$SA-ti9dsp^_Vj|OiTMR5^Oe1?
zlK`kG*5ZtfYz}tMr<hwNS}jvJ2$+EC`Ai`m^A>8{DeI7r@r1kBC^aY)I`|*~TP~H*
zmd0UQ4Yz7~44vJMyRJe1!@GCgexEnVw5Pj8HlLrxSK%dQm+djWnA~K+9VgxC+dF)~
zR9mJ%kMjlw_s7X`{{{cJ!;_Tc2B}e^QNl;UtS)5v*&N9=sFYcpBl|s{yVC0)^t-$Q
z7>ixYrtA-Wou&r9a#dS13GPkpSanbL=4b_`G6j3)t)kbNZ<*qNyEdEcVlkw(h;}bF
zg``pCbBA3BF`cW}Hd*W@Vy-$8+Xw3;tMhbXKbVQu-v-QP3iwRDu!6GtinTkda(Ybj
zH{^2ehDfP@&|8sWw5Qv8dU}YvBfBjzl|F4`Wtj{UcEA*^-MvzX6&cj+^c%^;ogKF_
z?yhx*g0qfs=+&zGF<Gq&-5rsfwqk`B_#B<Om6h%y6ZxLhm@b;!=gB@)lL`B6p&ifK
z3d{)^_X$zbaA#K$<gCB5G<h8FsKipa8lH?@;Ee_L;`1j(1^$lV(qgm8TwV<p)Or*0
zj_?kftINSoimkxyF^v3c75xWUqH6jS=Y^sDHkqb`jC&ifhSjAi@3^zm-<&;S4g=#*
zNry(O)f(YGDv42Q$cx-j{lsyHV_~J+KWx4p=%48ioIE)m2#f{B`|HQY&R3r|7sNZr
zR}_d&2FAzBJ1N$0G<{0`HP;S~x+)MK8Sy>TK`Lb$aKSyDzCa613K{pz>a9ue5Tvmo
zSIf8%n54x|)<qZh^?7QUOs>=G^@d<06}t2FK9@RsrK{9jef{LgKz|MN05#rf)N3`t
z4`t{N^pAV&@h$AQ%wyyADubgQq*|I+O7<qQn@pYMHjBw*DjKz0J}tyK?8z6BnXYp2
z|5_FVjr*)<4QmfU0&$n<xb=0wvt-nCgRwQpjCjgBr<~hAbg<VlmBY@HCn4Zwh%?B7
z6`@<!xX!tAi^lqOnv#+dXFCP%#Cz33KVa%<M%8f2dN9tf!qWdB|4^N{JfMQ^%C-;?
zw3x}v1Yc#-%al;u;cg2i`7KsLk_2w<R(9zXGPR6$mW(z}rJzp&N*?;yw{mzzC;Mk=
z9Hci}p^8u)7|)7k@tC#*J_fLvYDpx3e?m(;n+U(=F#3gYp6Ww^romeDi=c?+I$$u#
z9eRx8H-58PP`GDn6)G8R$=s-e&ATB<0v)NAUaV{6%ua%wdp@?E92K>G^H?L*?6Js0
zHC7ZqInxT9Mrbb?>ZDqomw{8<4?9U73=kz#D$SH1s%!u>nTiJ^7jJ`pvZMgsENQn0
zyD*cPx$s|NZ{6b=cZb#hg=t!+fDyLU7`dn%ExUaP_wl#x-~8qK@4x?%D1S@M*G~p!
zNWV5U`hvh{jh~;g&=d^rCAUDzrKliUffNq+kip#fF-pq(6YWOf<{kw3TKJ>Z;yq%O
zK8p!3I~S*yg=-)PNB8Z|a~v|m8}1IHUM@o)L)~fGs-#S1;8=v$s#wn7=*MY~Z@v%I
z*VPA(V2OvTj)D3iE%`)N>?>p_j&dd(-5p>P6`-A7H0|UI;oGBYLHy?#SH_n$w?oL6
zLcjx<q`qR*<eZ$yOp&u}eql|5J5?dvk&$2qEtX!%Ug~if@Lp`L7o`#v>tQpu?qhiR
z@kl@qLtIxse(p|(t1^_JRtNe|lYB(2oNOX%pDk{3#=f^Cq-Fpr-rKLaA}gy4u9N?o
zfk>|ErIs={<N+vg^`YliS6ZAY!#dJSxVSapxRZ|rtJzyadEKPrez|H;ap)51zw*~V
ze;fH3eihkg<ER@8jET&p1s%iY@$p8Y{T`B6<lU~y_*G~8qLMK0*3PDe?&h9$=&x8C
zL3>k=ogoQr8VDx?#SIxOPZ?-Sw~wL|*XqpFI+MR9ne86u=uSR1V=q-7ou2!UBrUh0
z9pahsz{NA(Z~p>m_P<sHFgI6q{bPagljDIIheRty3ic7#GTn^$As}A2s};blFz+>e
z<>l6L&zQ9nAOz@kIH&x7E6o2vRjuqSq!0h3`{PYTCRAGQ1twC9_Fm`fF;2|m8~33)
z^1Ia-2Ag(qzN2zTRrTY8cafXXi~Yp8+P8)v`6buqE8*){Hm+r{&KkEdHG`lw%zKG;
zXuQ6$#5iMWCPrd6gnI{d5();b2JZ4Q_P95hER~q<!PKIC!g*v<j3dPO!rfRGJbUXy
z|HHU4Z==J&@s3KV&r|0?sliYF`*5->smmw!mMFBGOvp-^OuIL3OJ-W_B1edJNarE{
zb1zA$vD@NJZ?#af+}v4-)F8WA!(P^D^0#7pOWINj_vJIMtzkLaJzlui1R<~AyElZp
z1l1zV*&~*(R?}PEHC=i|US6IYktA|>o3XCT5t@MdRSnq%ZywjKC?nEczPBiDwV6s=
zKg_sBu9AkZZ)qo~tTz-D)|S$Q?#^OP!X0`a6jk6IzrCr2yT|#$>eyzx^DJhD_U<*}
z`#Lys1`o#8JLs;c)bMy2tp-xuVhur(+;?A>5R&9PBi9E`5*j2d8jYuGrbMGqD>M;F
z0}ha3-P2J!Oha#jsUy9#i9PK-gjS{sQ)+4Vw%G~M4ysHwk+>`OHlhoW*$`-4`Z^q1
zc$N&UYevN|BR=O&Z2&)iBZee7QW0vg#SiyZOMjI0(_<bd*g!5mMu+K@IMB&nxR;p-
zgQijq_sq--qSZ`=nMB||Q=ip86UiIZObMzo-vCPzSdl35AVrdAFw#2-<jhfe_$nqx
z)y1&18%mNRQmO`sqjAR95=mB#U}tA%50wLeUYK_`aY$2}f%H_zy?4R+zmR6C3C6t!
z3hgs6ZH|1ons%d-L#u!!iB4*Sf~Xj7?$%_l*aRQ^b;Eb-(fT`|JM2*6i25gU9H;KN
zLbZ3t>6yMx4(fX)r^ilAB2p|>UAXkwI=W1iW>F2FxJ&Bm9Gb?xL+~Cwx)PrfdKUDY
znpY(Xw%lrc-wmy#BBW7ZUr7=mj)R%JAVT|$6^iTwiJ?8CeUv1JNG&O|aOACZbPI&z
ziMvJ`GR@?v`}eBy6o$R@YY2>aDjml@ZHGe5wzlI4)gfb>+94snLi&s1I5697h3k)X
zV0%+Tf?_)v?yUeYpIXX2K#%(`;)FXg5-dFMPEyyucLupvZKR9R+?@pZDh_p(a2*oL
zP`T+CN0(epObzrFU;Jn<w2i@cs$hF}M&eEnp|a`*dQ6MLEyGM>yG?qRmZz`0vyM#5
z#1(fbc0689eZR30;k}NEcTJv*dzZFEt>Xgi{n{}J{0iaH+6|A<hU68=b7%lZ<Cv+|
zmY+uMmJ&%jF;y+JoX==53Dz|;dFg|4IFs&OHk(_f+A^1~y#M~&A>5zjnyIb?ceE~6
z&g`v&P`(9|uIwk}T_TgmGJk{ZLWGhB4{k$$yHgub%IRMr4y{2R91oud_r1zway`{k
zSZ9mpc=!SjtlYtYMADv7W~#uC$SZ?gG+zmIiqgg1XW%6$OIJSl;Kar1-su}}z4g{R
z>zJfF@3><G`QH8@;dOP0p@4*Uor*i`5;<!fQ*w9E2M>nyJ)EXX4PetUaZ5LK;tRxU
z96_ba-(iMtRZmkk@5SkKV#IslD9{}&-V1b=Qm=FO2hRDnx$+No?b`L$nd$jU5bZGT
zkK_GeEHYKTDl=gv5Db%&#ua)SLrww?cU1R$-U_d4(C2cO>Z!*rvD;&e`YmxPL)H$9
zzB+d@Py=^nbGRbn<usT^BhPTfAP_d&fP$1Wy)C9IyLay&w+2qYw7>Pv*m59(`;(ld
zdz=Sv#5{ik?!=~Z5@bobbionvdBLqU(e0`Kd5gj<na6b^t3#nO^Eolw+c7*0rvj}7
z<tGF6Gq(^&q^Bn%!KVQ*6%7v#`bKSlDe6gUG6~T*vvB3+?%lh>2a+-SuAG2q$Kp<@
zWs-q=wqC_?`?bcPR@1cj!B<p-wKdaWMf&Y{K3S3+!`r1xrPc6Rb*~UX0o~l1USSUe
zZiT)hB_(~G83{klJ?)*H?L7mS86Kve1c-afiQQ4$-wGWBcWhloD7eF$H@J9i;k7k%
zK3$1HMcVmYA6}(+x1Pk?7(<ebRD|mJth!eKb&Yx_SPTaGCE@2<RuA@M2;%_P1$lvb
z<FkE4+7a9-v<yMI^HPUofjhiWNk=;`LnBq7x7NsH__Z~-ilIS8WgvSPu8&7ARl}cy
zyOKiYZ@~5jGp|*5yHjJlH5M4FS0aOTWYBZ12iqG2f_rC=5UcK!)6>?=B)C7GU@gOd
zyF{8t@0t<A9iq%@Yp_!>DD7U##c&w@4kz7p+*i9sE(rRIc+@hj?ou#MuQ$kbI-Nlp
z>}anM4(%E3?E<|+^$=-?ai<IJamU@E(Mt7tDSVK23wb_WSXU}k^tKwZyHy3vM|4C+
z|9&@v)iInsVz3!4_@x;^A8&&QDm&oeHWGa2w{U3BXzvsz?$aM(XiqxsM)*!LPp9wF
zcEPlFDaDL_F9p}_2DF2Op?An#A6#7f%a7lFdk-aMlxnUXF^OKSj=Vy~i}<=y^$v?p
z2KsN|XqPyx&4Qslqen2f&pDlwZJCq7`A)N*%S75C+@EBdsPc(BY;H6txkYI?XD0!@
zwbAkLhr7svntu-jE?zm=7%hKt%TUFT{z9h)N`R*!V#s9cI>LpSqouP+IJ9RBfI`vh
z))V_LS)C^@wZNs(r86Y7zr8M|;Jz~4yJVcrjfPlSix@m&HKU`0NErUlI!$9^P2?5A
z*xK!oNWwx4o`n|OV;uajBA$Y~+k7%GMDpPE35xcN0YD(G_u2EickkY}fA{Vyi*1>`
z)(;56{hhbpUPl((BX>;kz+KL9Q~<(l4D&a%ObZe89l?Q+ADuKrP3yF;kdSFvu8<=o
zAxMak*b1DZyae~cj_N=i*;}SR!Dbo8X&gdn(7teTH*$9EI=7HHd66u*!?-`eF1Yig
zWzsk=7n7)T++mk8-%-_k^=*3kx8Dcq5ZX0*8SP|jBigh~b57e_eE4NrORon=AJ-YM
zr%X_|_Xs7r&tD1AzUu=|i*p|t?IGNW!99Ms$IaV_ZhK;W9Y`dS`r$wS<xHSP*=5Ls
zYuOI^ivV_yso2TO@{ZQhz&Po%m!DXdJHu45o=&jSB$S;UEuTehQZIk@0Sfjg?GWx5
z+R1`DzgmVH?%d~ZWEthipcm@@Zb0n2a)si%;gf-Jm0TyKAEOOl@UoU)eRe+FGKHmM
z{p6q0(<z)1WVZ=io?PI|5!pL8xwN!Ay|gejHxa}8qHXCM$~Ul!NIM?)zhNER6NS50
z#<8zMsZ-Mq#)hw`A~xRJzH{|#s_Bdi5zwB5qCq}_d%<}M+UtdsrnYzTCu3%(t(VTc
z|Nf27-v8*xIS<&fFvlq)Xq&6PbQujhIqh$+V;kHPjyv3KA!Z>-5V|EssX|8Y(-j+V
z^LoF#6JT=1b8Y2ow2bmG3e{gdPX5fE7L;)3(LOL${?W}n(R2C4nR8a>^5pyl%0S;c
zJ2yWGodxJDwSXr-+s%S@6z&{?d)#psLt>fsO39%`*4D@r3WXf5kthrdwgRaN?<9EO
zyHv-R?{ZU8O7kcm)-bmyfcwM1(}yATH6$eA&f^8s#Ps;SJ%qFG{WBNGJs?E=9Dbh7
z{IuB`ICtg9nKNfTg3kLVKA?gfOFN7^RdA1wmSMsjSzD7wJ8K5E)!=-*3{Q`OXo4>}
zbSEHTs0eXg?b>JOqpQPf9z#v5gx3nn<oYh9L}IiGNVvm(V1C9bwM|+vp*?*5h@6}I
zZoulMdU|Pcer^^~I1`he8z1b(oL#$E(GKBGLVG;53?6rfQLo4gH(bCrM+0r*DAB28
z99MaW<z)TV_k5RT7<3HRicq74kBWP%Z7lql1*Z>3{v4jpW<ix8%S?Ri4W4se+DA@0
z>RjIc+52a%oEs}QfmV~}$Uc^^<7t0;9gcQ3!JRMM9a=fk0jgn(FYLnN>?9x^8<TUp
z<NmmV7IuymA+dhQY_H@cO$|PVVx1}vvlzM0DyZ93xN+}%%w?E~iC`*vp=IndCf1P?
zM*9O?T*t#sOFIE~JneDAU8&$a5-d;6*``Rj5aGLybB(-}KViX<Cv}eUA!Xd<{lSJ?
z{Ce3s>wv&$&*<T3mzkZPTv%Feae_d(XRO@0v^;GcyTQ!*Zkn@;8Fm!y+cr`KcP#Dv
zX&D4}jhwT&QKQb|d>@<Tkmr#XcW(Rc_tU&W=s%NKnXlIeUCVl%93G<$&xr3Y;-lhT
zVIEV$Ujo4*WDweID$=bz%jMRy+H>X1NAKS_vF`(f?EUY*|JgnU)_3pb!a4?aGTPTO
zNE!Zvdm8-1<ZR@HxQ%K429@;ru49~Z^_fOTzsMLiEvw}QsTMl<5bh`;<{agt;y&y-
z4au)A;-AG@-XJvEIf?h)>A;CSbcY-1MARu@N74TF<|ys7c`Bc{D`J?g%W3{ySjJG_
zQRO`F{cAnh9hI7HGBzZ?)YPWsMhhRoy|%nxN&5ZiD{sya-eE7^+p3Rnft@qzSk}ox
z``d57`y3VRbisXvxO1O>XXNe?ljvxj1P|{7v_`2xr!xd4i6RePTVtem641J4YIrHR
zx7x;3q!#@l!KJAjEAP`sSi{blbZXeKv~O6?PRj5Z+__rBvZS0_q?K~o0*<5Wp6}AQ
z!jKOytkFubl7vbXF*ymU?R>PSc6j<pzwjEcyiAC=v#z|)2X3;1ojd6S*2A!`#nQgz
z#a}%^PkTIqJ2%`l3T}NJ$SfJUFsy}V#QX0DIAj7w7D;jqFH)w`93cNLI0Y!&gW~-G
z%SNO9D}j9%&3TIg_IEaHLnvRn<;5*)p}%ifznU1^Sp@gQ;SS}E3^kH$jaI4)NfLNo
zsXC9gwkZvcU3%a<cZ)+MQ^CR_wzr56uS|i5e06w>AcZ?JWQN^D)cJEPVCMmKl#F?2
z%Q~3yx1Zg#Y14BX-hOxO`ky6(c9ytHq<OU67FlAXvq-0hC5aJ|B>7CceU;&HdL@3^
z8z$`AB9B#*ww{;!RIiA<I9e}E;m%>|M#~LG+Ic`74f{K9Z`k-OTzlLEcQ0*T`|i7&
z8Pe1w;VxF{<?sLwTGtHp3#4K$DkneKZ!NxElJ#JC+`u|-V3k-aMZDyx#bZX{+aO~R
z@4eQWoMGpTI+}G@v~SqBYTb)ZZwmJ6t=q6|6Pk9EaHkLM{Nt_+c7O(_l*(jsomRr&
zB;e|rf%{gW-*NkgyKcYhheOx<+3FZ}kA<U}kNecZ;jtm&ht{jr&hqXI!5)B3DRS-{
zJ?$J=f9ow~)`J=9hV@TAx#o#bXX?*4t|8D)E@gNQ?rGRC4P}nHd=7b|R?Xc>AW`ca
zS-0=HU4w&euiG~~re*ht$XUKW_S*e?tkd)K6LSq&e%6e&S-7-kG@0gDOl&;Eg?6r_
z<5&-uV<6lku>bsLKVzUhUco&Lm5Hil97lrbxlb_&t@bT>=yTNu6~}+pvk2G*_Tz^Q
z7GEnbRT=E}LX)S4?LH1?d6|H5&uC|{&tUlm4ee}Tf9oxdtRuKbXph3qNPC=cm*}{g
z8}+Q_Z<PG-02`#?-&FFGFH$-=$0Si4QifNELu*h(C$froF+!GlFkhB3T>ZQy=-`g<
z?p&Uy@3gDl&o;EL2z6|oeeHUR(4J7*(}JaJ8E033k{Ncf7~VeP^L_WA<o4|cP*xh9
zzp)Uhi?;@7!?uP#HE?L<@Rn{=dNIR`HOyUJkC9)It2K|XgL`lu0bl|aC#jJKFSDb4
zMW|y~hp&}3p<t(=ok_~@f_oRMQa0Wr##j+7G5&D%;oVxFx79!Ba{2v!*TZ{}JE|z|
zmHpJkPX)T2g7nghU|M#FMq7Ca?x>Gzh|U_(0RNPc0;jC09WYrZ$s0>2JgkHa2iD(V
zVm)MSClNBVwDTX_(=;(mNfIkqR0MC|^$kLh!xQT&Yiqq;uiNjtAO3F-Be<Umg;7bq
zP9AQeQU@DfY5QGa(=y2yF;v8d%e@jDLdh?blDcJW$VidX&|@+!kxKU?6u8F%`#bMY
zvc6#pCb;85dknPmfxC=zWY@6Tb_yk<1Pxu`o6Hj5e(=LxS2UZft%t9u)OmOB-uuBl
z$v$r&zu?uHdGY-gc*1|eF04gpui&)|c7UFlAZgl`34R$y+PR|+)4qA*x-A=?eGZ2H
z-FKgTf)e&b($0B`7-P3ZSc>>a?(w}ox6421^PvXWdB0NSNyS<Be9-Y<XZ4{S3aY$8
zBjROWu-DulDzoEDPc5E|lscdYkNeW4%Z#)$!~PCE>hO8($tR!Kxc>1cp4;&5yYFt;
z7=nETv?m;QxDlJaNUnjmAgJLbdUd4t_+EFdw-WOlR4hW;=AL7)HodjdJL<Z}rjkkZ
zauHYaGBgZQ?(m<oORXmKb+nvME!?~DdS)`fk#^2eJ%ala!SnNVYu|nMnJ0*_GteHF
z;LaL%jX_4+ZILB`M^Zp~I}{G@vAydVHfDWSx{N#=t+nomyr*{C=hIBu;ALo7ZFwEM
z4}ok$W?zcop3#JD=$rF=z$o15VP}Ope4dG1Dy`e{^lB9B7}|e<qdm^Sof>zEQL8n=
zhOc}>aNicqB$@2|Je9l)jmPalwuW=pod-VuqAMcre~P&xR9D2u1yg!qv4?V1TAek;
zaL?$(w0t;EtcZ5DsKa&kUj<o*CHtnQC}2-G?IgH6@)gL~bc0@RK=y4J8SYy1p-6~J
zcyB*s?MZAM^!Y1CBO=5*O`A9<>E_DtG9oYC<)NN<BL@F9BZcM6>=?xb6Os0{Yu9do
z4)ixF*x#l-&peK*JQ85%PJ3K%4~_)m(y1+xlkCMVxz8ca7FHIfw?;+CwHm6=q#)^$
zMoD@zFKKFeg_-)|ODh`#|3}KnndL>myo}V~=Pxn^_b}|wY+fHao7ZjIu$Ck1?`~MP
z2F-dHc5G<J%k~7&o`%arIhq?aGV<1<<=DylZieC&LN|U`+XC2lnJWVqAsZ>HpE_|?
zOX~3swl_2ZrYRcS@xlGI&1=@I4xLr2Hm%>h`PnUN*RoJB$l0*%SL?}GCx@LRw3E=z
zJML1ZstZZHl~HU7%f26LtLUHKzev*Bl%J>4(>;fcX5XlfAKGgvnmWSMhaG(>r)NSz
z-Z`6jVT=v!Yu9Z;(;hq<H*enj+`8A0&O5@{^7M0?qi6jl6zllF&W85*1^2XQDLb1Z
z>{$jCS!6GHaQE&H{#bFpQ(q@04&cy>X$)j?wc0uA;zhPYnS_YEsUtr!$jmXGn!I;+
znieO(o3ywiv~PKC4UzU$tDb_-rj47Qd+ym6H(;RO_T0vB5e6gINdh|o_5{<O7OZ!u
zxet!flHT>)zFRx!^NsprEeH-ij2b8<S{=iXczEm*+(yOEN*ZMN!1-I`7JYOzGUfD4
z$W{QFO#7IE``TyMM`_2w{?y}-BU{}!u7{w1?zvw*y=}{uZO=Zp3B~%)$XI6qdqR{<
z5O=+b`>>gO^7$JNTt0toVPWj`zzToqLSCqsN};EnJ}iz-WF4})(s`0HBz?1leN-*w
zsmXgrGf<A)GKJ>k5raFFqOKvK9RqvtAXiA6Hg4R+gnE?qFzhUY$^QTVAOJ~3K~$V+
z=M#4&_Z_M5$`~>b9S;Uqyyvd)&fs@!noN{3bgHq}#z(~+F1c%or6<CxPh$NlBSlZ=
znLT@MUbKR6L(@&T*0|-xZO=TtZr!unHf-1cMQQ~0HDokh^+S{2_ZJa)tAqkdIS^?i
zq(m4YqI5_}gLEm)28<985GiSi5z?Il#z^Vz8e?>`(F_>z-RFnzAMiZ)x#v0e-gD1+
zo!6^2$2{Pr@77Z??%k8ho|Lm%NpXc3{W=}B#0m6S#oOMx%dlI|E0G8#n^`skEvF6h
zXszs$=dH525gx@+MCUU!UCrB<8B(@)>B*tYUk$=?6L-a&f}WVw*k50sw%>mI5Bmh^
zS}7djNwdpV$r*Ac;)L;`3RYG#VCD91IP#_~E3>^Tr`q-Dfu<6aNw`9_rGEM{Y-pzE
z^&-VLrYYt+0o`>~`hy$N>09bwM*;e+p;x6GIe@1~*HZ0l^?m|3cz7<f`J*Z!9!nUX
z;@Q9O;)?MK+n4@wuB=Gw&DE~|D7MVBK0x0}I^f9oj%b*E4kd-3kB*Zb>k;52J@{t&
zIG{9Ja;-MLefX~Dc$+#A<jTIFd%-+`Va?l(q{);lr8B!g%?@_dCo8=nRCh`GDDp%i
z6m>msyWs`X)hBW_{p28=dAoyxAGUd2^L?A0?i-a)%+twr@Z@04L9poOd0+gGCzpjP
z9PM@CUA?5P47?ArAqkG&r6E`alwq%t!|)(~Sa^+*eU3`W%bV>RnoEzKso}mi&;7<^
z`>+j7MF8ecVNT-H^+Xu|f9_9S1c}Sg(=jqLS1@aZNg$RD>`rnNUWDgNSQ(61=bqSa
zZPVL1ZDFxa*zGIl$#&=u(DS{7LhVX*63BZ37*|lt4e)?Nmz%9Vz=gc-=m%abLV0K8
z!*!y4PtVsuBD6KNu9=MYgI}ALfj2%|WU>`}XTuM|U)Gv}xU4&XN>Vqinj~Nmj8$cg
zETBVzeUFeSCO7lUMzrTP7&YtRE2lB;hn^G182Te!rqNeFTC8^d&<pF0bLMm{c`MeP
z%*-qZ**)<b{^lI6#Sw9Je-o}if{WZ>`n9Ak3mlT7V)EqOrJGHW1K!pam=`3tfvDC>
zjsoaT5LZqa{D<azHFhsl$n9uf{!kro7<uif{-uRNCHb9NgMdIx$w$Q^`BtNyvKTTf
zecP*sEhch8qG7BuzUBt})xefO|MCt(gX2$3KW<?^ce`%S0zzAlhi<Qv_gx28YL;0J
zCqGg}+8a=Q`hn|Ti4Qz%>`u*c((Io!LD@!q!4=Z0#YCp|+1(0wv_m67Hq!yJJrazw
ztFjOV8)a^VJ2X7x%z7%C^vB7}tzm4QQcdl|=ymfC`JDq>G^GA7OWc32G>VLxQG4QD
zm`jP9yAK|G?4N!aZo8Ce7X%Ci@uacx?F0o%{Xl%kUm`<%pr}_|^na`0%ZRbPYiTLx
z2B^+_V4vG>tN1cJf4v!WbPpyW^i;LOAH{~GR7mf(ye?3<k8?WkRQ2FY6zUuuPX7~^
z6>TlmUR$6E^rmMx`#o?<>V)1Ae2tM8B&7mKP*Gp;J?i>O<a!>J&;tN*Z&R<pZ?=Bo
zYz}ZnW&s(6)?0Q3%_4agQ1-pUzfw^cJMG9=w#jd<`0`8*WREB+fySWNfcSUwSHr-@
z*A2$U+6^y0+*~WcSe~C8HWw8De8brqw8w^nPR)d>GF)cou)59HOJU4d^!4%^$?tN0
z`<zOn$YIOVSO6yOvL&gj<<i%|$?;A#p}Vk&<3FI@aY1bU3lVIeSFO4M{!wiML3<!l
zBG6NLc2yCGXfCF}WjRlZNl2U@WT-<%W?X55TBp~KkM;blK0;dTXqeu-aj-ASNsW_|
z+qlPH8zsK<=%tghV4iyZ_!v#e&H%F@N;s8N(N%#IT%E6d8N{kLz4`!H_K^(T|HH#@
zZR)9)dG(`a|I7iYEs)$A{+t(95O6H@2npL5lO+UF&n{11OqI7d0JqO~Sekia4%<OL
zP*hZT2}MynDmkBUM$FvPX%Yj#+wcDX)Tq9V>RY~vJZ{llk;<OrGm+HTFOB6cU-5mk
z+i!|JJ7`ZsLbiP~2$kK}jt)`oBBf9V1-`Z8hn;r}3~FcPS}9r1jR)2qil5k(Si1!$
z+{^{*>v7dEv{x%|SL4zNxBV1R!YcRR2f`Rb89XJXSIL0fSi>vD$~YtN_^J<~VEj5F
z;@RYI-b3bh5=?T=hjHZXjDOwT-n$yV+R!O@KoL?#bi1ng5IX}VR0c$tz{V~GIZ(h(
zUkLOkLQo@*^S|lt!;-_?YlSx@9J{|ppWaMs3Wt}13VB1U+M(|Qfp$_Dov9I*`&oXu
zF3wEfU3(P4?_CNQ&;x&$dV@~ywMBOTF3saOY}w<332%AsUT>N-8wm*4)2yYnH5`sF
z(p`O44ce6`HVC*d=6fHiD62Rzn=Da6u1_CS)sO=tlW2$^9}e}nKTUlX2>SIWy_%<a
z?Q#IO*d2Z*V^(abh0%gHGPfpmkSMz3TPw6$Cs?Hs*&LE#08cH;IG)duGqv4I!bvKp
zILP5|XVA@Eot}B&ck7_DuD%`mx;mQw5sgRQw;vsq&|qa!u;m{jrn6i9(`Z)sxBnvv
z5Ifnalb+Ri?=_u*$5UGR|N0|j-zzwn{~%+ydaYP1%L<^sTB46Bo!(~kRJWDvSJ_R^
z2&<VXpKmFJof#t9@<G?F3F;EA=458qSB{u~Ysau|sFyHX*-&iC<@`VXW%Le*jL~(^
z@;WRpK<fE^tI21Sh<yyn!oQ#~?u^{`j*6M{=FZ-Q&)MB~lPQH^9{Kij$EQOG++-eJ
z&rj|TNZ_VNtx$nCL#i?PPYN@m*tjyxTLNCbQC@D%l~a6b6yP{}j3U;#v%LIi;NM1!
z3>M%UeXA)n*Tw8{`9l(**t$O|UW{TmiYrcUoS=RuwrN#UdwZ6HXaM!@lS=NG$6N(_
zHX2{hk~5vobDT<A?xe7}>T!UBK+wrWjx%0x>qwbNcl0nn`AGToMBr0Fnd_7P$^ACa
z44xfI_?6$OYTMGqyhb;A17Fx1`X3Mg_}R-5rt6|z{@DBn9yISHev8@^estg{ui$A|
zb)a84HD}(5zX6rmHb8teH?G4uTc!W-;h4`r+C`J&HIsH5wIqJ$mCXtZy0=q3l*a<}
zH|#B<$9lwqA6ab^>hUw^vMsiQ6T07!5hf^*AMOtJZ?@dKi)#q3xQ1-M*dV_;E5PJ&
z-pxLEaaq=(Zl>zaNL7>VU%*+PNBwhYU;FyaOUA9;<n$KH!Cfb3kx~a{IzcAfT2cZ8
zl$XlCpxXycLdv|Yo*w%cFFnMJam@~WHg1Pvc4_b%4uFI2AOnnjxTT!S;0i0@OZ>l^
zJjLP;nF3s>19<Sm7|p&nz{S9_w-WMGm>yrD2dnnZ8D5FY>f8(K$VFQ~hO18LBUzO_
zP?*<UksT01b5j-kSS|OQnY8V?VA9S%d~iJPoGt)(uo>gzd#!(-exDh|CP{bhAqegq
zDblT(m#WHoyyX$@^@~UOt^8@*&%S2w4beoPIGk3FJZJ8u4P~|z)gTUk7;tU+llkVj
zo@5f^IQKF)!aAJy^TrR>!bPdZxruqmD!=)6gN;kanC@n_t+%|5QT<OIzua)?luXFH
z8-wpAD{S^I4G#x?#K+dFuP}kU!;_VLlHMdIgERAP>Tk4cz+CmLz4}V=4UcxGAcfq2
zM7++?@3?5D?3~CDzUt9L&x2z>w6efuINf@t30X;Qfas1F)?W-ZgkWd#IkNH?z1<Z!
zal2jB(#wxFUwHBy<M$!$!L7J`&DOjk4^0+7nZ-#4Xi%?U<aeHGqkZTwG!+%`T_PIt
z{gCQBDdaY<CjH_X$#rputEF;h%6n*5Y6WIt-^hQX9z=TIw=-e;PLlfwR*uSnUK-OA
zt<2S<@|y9aAW6^vYFp+av--yM^N;SsQrnYIX^hziEmx!m(M`JqA7zw5LwrN#)Y8px
zj3dpzg&2AP**<tom~FDwyphaxh8P??5fIc#oLwmFZXR_m)4{y!Q|r0AVe#{gvRuzq
zR98!if3O=fqveviBKG5waaZ#cW^EY6w0LkZj%0?H%Ur_Js$EWg__o+7`g3YuEem+E
z<1{ixsDNL5ourP%m>Bf%9!H6B2n);5bX0^~V>;wFLTMDME@RAWd`UcFZ5gq)4OXu(
zYG#@Ih|-zivi3<<bY6UM`vm~07xP+dK;j`u^Kkeoj2YOUEs@(H8TT)_8CTwQ!x*iN
zysi2`XS#Z9Uf<newm1oX)eHR)nULoV=^VW?<$`KMrYUfkK86p7*@(p9t1J~VAZ^>L
zeS0R_TfPM%?l(Yp<{{?*L=>=ba-CzSknqD!pe?banS4~C%5D^ChYfyXbeAlaUob=0
zGn;m(80`kyC!jz`+dBD}QRhlV(HF3oPYctYJmri@e@E%r{_QqS=IUeu9fN$;FT-Cj
z>G?xSxv~4L^dtnA(IRVYc4|SPM3QdIo<?fY2lbXet#n2=AjilP$WSnc6xNDsy6dmi
zGC%4R8^_+6p7=^F_2e(<J6K*AIM{oAK33Xwo(at;>{+}xNUYsl??5YnPopPproON6
zO)^9{M2ce{W|^iG5>VXQuHS~fbdDm^HWyu7IN5MH6;Pqi4?Kq&h*cTs+IuwalhEBP
z`nFeYmLs2ZZp@D@p7>wQfe9&+M0HHP6|~jDofQ+SCAo3*K&I|rC+?=Bvo;o{!to^G
zCAf8dcLh~+c>eeHZ{n{^?o2l%)M<|t;=PJMfLrle;GBOWt?(b0+nO`gZ-u$HX146X
zpTx|i-g8^pVTLB8+&!?IqHyL{TG)SX!(9k%TX17z<4u+;to_#H*DH$eR6Bo?&<Z4<
zXvG$s5uawNOMrA)GHM46O$&wrvtP_Cx@Y^E;od8r5J=vhM_5zXyRK%scwi`Ep-Y5D
zU;KO5;t{i%!$Rq$S+%RF{~XaL@A>5(67+Z03TrNm)8wnnYSL${;Z-&{J?EY3kf=8}
zTsSJ`DJz&|`G|Q!1NY_zFIDy)Z+2XB*!aFSDRC_3QF{HQT9CC){J?<Q$B9)%i>A4A
z!Ldm@K2fZXjg}RJQQHu)U!T$K9>WE#O$=;B6uiS`lG$-!8qzQXNO}q#Hxa>i`ea)5
z4N=#q;~Py**)!3AQJ?8sjI&|q^1rnj)|Eci%n>P3mzpd`S?PV~)J=G29Zl<^m^Kx1
z%=2G>?j4+ESNDQI=^ODfm7e_Dd6OZvj*-zPaPEHpC7sD+rx%QX^V;7;%$d9nWCk$d
z42C_QS=;lE4lU^y$K%Vx3pW54NY3~;juL5Gw|`yJZ69%EnU(BE@|@^)g-QzkD8i~v
zro{Gz;Di|uGOfo}`3FKZ^~_)XEuF4e<;^P$=X<lO(5tjg8s~bv*ophC|Mxcn(o2?p
zmXv4g8!8HrV~>#$<?ld=pK1%<PN(-4wsW3s+wN+ju5Pc$nG?=E|1_X<TNdt0HI}4Q
zaP>hqqoi~mGXAdaPH7dC0N4M8KdE=~0Fho9CSql7ga<Hlx4+Doe42K&fTaQM8+f9B
zJR(a+jYXS<LNn7pO@vzldpo_{?OksjbKG&-dVl{xSO)(*ybW1yAElhF$tjyH@jG>H
z4#-Ol;)(w0Mj#`Nf0h@`<zu!f9p8reu+6JggS!2Et3CC1K1EZ?B~snB)R>koTI9Nw
z<m*`UP!}%1TLqT^Da{+8mYW%j_%`sKWy8I(P)*Q(Qj`@k5^_mpdCi{R?7hOQoB)~K
zOk0^xAQQMgCuR@`UBR8FJYTf%Spc9Po6mNeG|vk)bGyFOpIs%eLE%?ZH;;6BY|WCo
z<8`cQU9^d$gu4c$Hr8d}Uzyd*F#H1hPBQao6SU#QVFB~x<HT3J<xVT^Wnp5iV^9<+
z9G%}%*l3!@2d_4XtP-5kVPAEp^pb0uHfkKDk80Z*NX}_*AKi)%S)Q8|o>GjixG5;L
z0-yIn?-3@XXUli&Z56(H+}%=zp;X>bD)w15>Ax;Lgo8g`2qR>Q36*`)FfD}4%_gPH
zPimcjck4r&i#>U^3cYg5a%PLZx%Ia=^c{TKQyG0uFGMbAKJVK-YT9s1o5((?PO11H
z$v09rZrm{Lgg1qqbLW~|PT1?r06B!8UBhd*Is044cJ~6pM?=tWAOmHzpgyRsHsex+
zsZ(j}^tmZcXy}n^66PLNYpPA2B~>uvCnKk%9OBP=<9~i;`Ve|2Z|@t@cI;$F0qi06
zbAjIL-+2+R68K&Kf5{=Asv=r`Tk6q(7q2j*83B(wtwfQIdj5x9N?3HNhrF*TlDSdT
zXg<tFD-gm1T-1$IuaVfZ6y>VVS65MEfi2-xH*r&F)N!(*b|TsMov)kXmA1IIC}}eh
zyMhrDt!T9vg6@$THNx?16|v~2J*sPK#=%rGxpz)%bQ2aEezCnl6`j#4K!P<d3!c3h
zgo&<vdRSWm$PqIjNuMRoa+Sf@#ZCllk0q0!cX8W)Z76G?BC(#80)oO?{j+KKid(;w
zZVw!RJVDyHAVW=F_!WvGnxxdk{S&oQAP;XWsZ5JD-C1TpyndFRiuM{rDJbv!xh`B-
z+Z{cNT9^#mwPR;knJ+$kn}a%*7w##1ACmFu`T|^ky%zF;YsWoqx8jo-x3oecCvMGA
zI0^6C!8DXKg_JfcO`Iu<2HtHn9?Qlv$r@{9>(MMK_N6gSP`7v1S+CQ5TYm`?$;|1u
z$S)cy^-KxWgoEK1&Tip|oU7Su&CJ$3T(VTMk28w*HDZ$=Nu8D?F8#FUQ|_8O<aoBz
zr^u}y;cM>HAc%c(XooYpay>Y(JiOa{Hy+<SA6TB%{Sh)7d(WxRDzyM|h8#yJ)vIO*
z@qot@v?M^-&uQ-_)3({@B7Kj$XcwOqULT_q#QKf=yF$e3NNdH!IL+!c8ytrRU!m_W
z-3dsFCiSL3{1R1F)F;^#bGeVbX&P-fy<U0$=r;OyL0166YW_Z32!3K%5+^)q#6jM*
zFcRRb*|r^VsHi|$ggUC93|1g<zg@eCD+jRP@7OsrWg0kZyKtH!IG1l^W8Eo_oyxKp
z6Su+_n0BLWD8K(oWBW6t0a-%?!Ew27IkV<+#`s4w3<}=Btl<;<KLZvOQHb}xGXlu5
z3-z$>S&z(t<(aFjjz$f4#X4*G3#P~Couv0nD3xIgdN)6~#rt}$J!0MWA6}*#iXx<*
zyT2U`e5>%E=hKGgwFL!8%ZX!Gyk@o$R_0cyy(*clscK<mlZh0w{f7{B`^%Pi2>4^m
z?AYi$HCR!6Nh~a39f8q6;6Kn1Kd%@b8{N98-VPhY5f92FyoZOEx(1uUJF9g3_}2N=
zu%RpHr(2+6A6ng^s1_&6k^7m!$I?GY#aelqlIU%ecPWx{0Ti{H-~~N*)W~DUl$WiD
z)mg!US6kVirv(enFwcGkLGf|ZNf~D7S4-8=&NBGDcu1x_w6`uy(<rd?=9kP~8WCoD
z+>h3NUqmGy(voD}U|rq2IhZ@(OdG%{`>Cg9D$LO_S$b?i_F!nnaXxJ%>GeD`CHBjT
zS@~#!MV`4n=Gr%)IQAlZO+GCZSe7LC0!KHX#y^XeZ?PjMC#THQYW5K*geTLP&@see
z--mYPTSsZ2e<Se<-8L^{druY3Ed0Nwub1|F2~{;AW2e#fEm;NwG>1c~B3ME6X6`mx
ze#KO6>4taO>@5!y->+8VrW5OIzu()WMA8B(6K<$4Ghc8qkugJTkPN2^RsWN*h|@lJ
zbJWm>HGAz=`KQ8_i%C(uU~4y9u7!wngjr7|JrHBciO++8nIrxElv>1@T)f?>4WuYp
z8{aHCn*{JW8iHOot6=2k0%^v*h3Mh_&HLL(Y(FX@#;U3X$NQd0Mo6$~ihnG+L6{wE
z=^BIZLs_e~DM-x-KEGI*M`WTej<m3Vz)KHnFle5ZI@7nrwnHkxjIHM8Lp3Fx9KQF%
z;#ogxtue@3qCEQ#O6@B8r(ceCzR8lmJS&{mb6dSpFA)se9%D#zqC{&rmn}lRZzO_%
zu6~VGc?Dt(U^eFk{aRZe#yOd9F@m+Y5zcz)mtC;0rAtjQBb=mlrnQ@}&4$blKAoyO
z#FGXvTzp^mqlxfjv$BWN@V4)t7Qc<@p|El%((J8p0bbKa1+SLNu4FLQH(Cw*C?)XI
z9-pwkCE3F?b!oGi>SznF-s$*7N*VkNly|0HGrVS6iULS;D&*)&K6ktPJ6TRY`I$8%
z4KGpi`1;Bci5~j0bB1dO+K4bSF`PHvZO&1?sh55lj|j7^SbSk(z8Y(Ce^;;Ec+N<>
zxz1K2TB;1-I)Z^SLV?N?C*RH*dY&jV6AdxlAs_W`UWD$xh*)S%8A5`Y#@T$di8HyI
z1N=8@RMLv_mY2Ikbv<v_XXFZ_!`=2?hWtP|eV>$$M@`g5SDL|v<_d~!%14%KAE8FZ
z;t{e95v=Wn_7dMSkRCmfrH=X@0-zhxkNaSFPyXUns9W^#wzIe7K~bsQ#Ze7<2s6p+
zW5>XxE_Ho^mg?Ke6L8|aG!VEa-`c*kx*Ya|SV!pkI2Hro*yXAds}V?JqNh(8wgSV>
zC~73(%sqP8o$+Qn!lhLHa8UX*JF*Akc^_{0;7Zf%9r|hTPk-;@jZK-`4ab!Yb)T{e
ztECBFmG=5Y8NZ}dlm9l0@qt6I3P{b&mEX-a@_oX!KE@@NQ(VyedkXPtEKKS1?)$w`
zzMBWv@BXxA(0N^oJfSCun!wC!!IO3gLLW0wF&{%bEwfY{XF_Tm<qLCl!#?<gL|$9(
zZ|y}H;jq*@bhc-7Q}Ka};`@sgdC#m`@$qxnd6USQ%)g$yWg}YLQ8u*=GD|L2jY+on
zxX2iW7_Y&SUAk&d8iBg|RN+=`U{c*Z%r4%@3uAzNi0NN5Z9>ssHa7qt?5QUg^Y~nF
zH?n?xoOfYLxlFH%#%#TF=I~qeZv1hvp3$RHq_fXy_TR0j`ZvQf@f>Ux>jdmM<oD~&
zd%ZW|1q4m;kjIfDW$JaCcY^`;0u=)edhB4iNueH*&Ba3;ghY^a1#@?C#5v1g@~o#J
zhVHXu&O`pQ{LD(U{>fv1e_p<FlO2;2>Hs$LH)pogp?0)?0&aq48YPkcA%Qz(4O;R*
zI3oe|w!W6xDj0%!B8S>Xb2b;D&`#D;q76SKx?8Spc0*30KaoMX!^7E?>L018J$&Sx
zuCv2_<NiYOKRS%?hxvCSJk}Gj)Cg6G0=o%N5Y8Bg=-6HE#=Zc6pnfMG1zO|=*%#Vk
zuORJsoJPI2Z2ic#+@r{MUwBO7*6_!OyXWpYxui`Rmyw?aRXJy>W<B*s%rzYMUvt-5
zs-(Ouw~p5QoQ9IJxGOSVlQG6<wg8WrpJ&rxKI4^MQ03!0`1T*{o?SdmDEU7>g#u6V
zJ;0Q%HzrgS+w-&M#3Ws~<k|@t*c^h8X%+iQnR60Zr)0q*CgCBwJMqnvH#f<PmV)S#
zEo45lZ~+hDcslE8Fk(64P(K-0>&QlkY_Pr0CpPKYvRlIS&U&}|dc>T0;qMFC!o{D<
zD$HugTrz-s0A)=wCVLFT*`b$_f((?f5Y4Lk`r|Jn4*Rby-&nIDqxz(tufMIN#bxb2
zHWqZ4A#*69e-2nPAZmc`%e@1>KLJdPDgLAD5#LCY{`<wYD!KzrP+gyi7O?(hh!<3K
zXMGw)AU8R|IbFg;O;{=>o@|<6k1}uNJR{{}2<do>PP)ycd<ciqY)YwR6<9=H2}$0!
zFd{-Vh*_df!+N?o&+m%Mce#}LUHNCaVqg978j5U=dV<jJ-<mZ2fI@_H<-C0|xE(!~
z#uy?pbm}F_w32BtIv&)F)Wd_vB|6vWUyqAgvQi67&ce$EDj%U1<IA;_kc3l1L0>Wy
zc6Pb9aFWQy-`K2urG(73oUD_xoHmnuzQ?p9JZ;yM(d-yvsP{#~ozqcF-c6=k=c$6!
zRpLoP28_cQu)3emPu`ioZpZc7sur@yY3k}E!BbXJY1ZtpG3sQDrD(}+n?uXrn0ydh
z+!KV54aGgE5#bv-qu)!dx><YH6R-VkR}s+$D1c@s2tLMDMw?I>IJ2&*1f8n~T~TPf
z)Bo}z2Yr?CJHltG#N*}ebqhVKNr;q?H1iyr<xFjKkN>FyAL8t<8rFj#x=9PR!2zM^
zc^b2rC@tko{;+{f50Va0MqY{4<w0d^ZOq^a+Z(YB#o1GR4a-*Kr=+g(X>~qpvJR=v
z1=i`QA@D^Qvt~XN@Swq0vxPi6i9h*k+&{a{cgP-&y6HaaNTyu_%#<z?88s+{9uf~A
zE@R9git=Fu?45<rOuwB-%LMsw%KpUJg&(1IzGP}L@n@r$Qdlhn+I--7NFA0ACmjqM
zcDXQl*Hky4ciTOrXbMg(m17}28`ZtwalEKh+Jy9+RMb;c$3507^j-^E2<`6<y}aCU
zP!V77xet*m8v+H%A;uaYbh%yEOfiJ}1)i9qeqz&u)X+Z05=uap@AWy|I7W^||32cX
z3#`R)noU$C8}Uvh!akRj?fo6HsWB|m&G-4x5*&2x;5XHUqDm}={zgTlL6SR^TCF*l
z9#@pPdOlhPArQgZ{$)^A=KYDO^1|qW4NXAKxegYmM)Qq5Sl;SnK%?-@GVIYsQ%g&B
zRdxB_e-6!F(u}m9W=nNXX?FGaJl{M8kz=~jQ89gQ@S~bGNQ}jbVr5p?E0x_Xwl)CB
zdiF*q(X6Jcj&nlh&6^;@dsKbBr!9e9U5YCj7q@SZuSh5mdH1<#tG(yEm5dd8=vlsQ
zxV=1M*bTo6qooJiN*l}WT&tWpVK=%fN4hfePK|$lPaV73IXknM$oOi=v=x5xZBQ+L
z<W=)5qgVWVLW)6;oj_2UTh#w!0V;~PsDr<lJijPB$fz<kHPd6Mitcg}!Sv`q3ds^<
z*Z}QD?<$U?JXIaZ@T_arPcZMIBeU7NuiOLAqrbkHHD2+QhqzJYG&g=G#)}Iw=uB6b
zit6bL&Wgg4?}8B#c(<yg&-L*#HIVeC8p_e%=U-@VUMo~hVkY_m7hr)hQ3{j7%rzaw
z3NP^vd*7m-D(}(lZVp4g=@`=f4T^-y5!5;6bJTBQ?+F5$qh!l%b?hSFI4SyW-~=+R
z&tiM4??9Y|VPTBH^;0;`?fl5n-&KU2w(JqhXJNf{&9s_~4)w{KY|UC>mwkeyn1>7Q
zO*cT=EE3(#I0XGm#jFLln+UtEkFX(ilc<(${{2NX(JK|@n>~r1*3XN&{wmSWQ&Id^
z`4KPz)Zt2bEN%1@_~86m+Tr*4-Q2x_`C!e=8ep3%Hpelm!cM|J-dUu4u|cR_tUwtP
z1$#pVO84|o?E7q~<lOaV$HCEYDC${65m^i&?;jxpcU&mhSvC3AeL=A|HwF`(T>fXb
zrxke||K9@kRVoqIQdmHwcJ<ACqNgeo0@+CSbi+r*(!|Eo@Uy0?x{XN)R1HzpK-!d!
z{|WMVj7UWHq;V^yZ%doj2RHH_AmCw?kM_srUP>TD7HWDbn#;<5kwdy08{kf5mFqM4
zLc0!o@>BkiAXLz%v4Z3%<`{l=vW_8BfPt*XI|;#mV=afmy@;cG^$c^}sTEq>T=w~|
zNjSjP<WeO33m^hoyzm-zy};1J*U6IS1g@V|e!;Q#_;g0&W3$t6S!!0aV`RujH=a1I
zzr%qkn~j7JO|(+ju*Y1i^2~A;{V^)`OQDh!67%0V#y{q<KVM=-p;#}1lzC}!TVcOA
z?C#lLC5+uCJVnKshnRku4ulC|x{I8R%D$epwpXXj;y1Zed_9TU+FBVHzlv%yQ3p_3
z83n2M-91~ee@++vbv(J~$7IH4h6=`E@A>qDS<zZrc5r5{eYaYxLIpdMRdZnTce$57
zkWR_5<#|8q<ByZ<6N@#cvFaFlEZtszXLNyjC4Yz02TTwDqxRYT^%L>)h5H@}i&s(>
zM9DKD{FATBlPY_EnPTj*^cbGKJ$n-yXyn3c<VS3B3K_^f1~)!2Pq*nOKlLlLGi)z=
zK0L(&*e8gtxq6=o>NJ5O|97?>n+rH#Q<p4hf<dkXIBSmd%b`WqXU7*J{?BVK$3jGz
z5RaKWj;1zg!a6Bw*G-C8sl(UB`LJ|^jw0C3r0H)@aZrcDh+9EWJp{ph>v?kX`<<U%
zZJzak^shZan$OmZK2=(E-lrBgD%Gti)>wHTn&SorR(HJJqm1x$8SnLFtE%cqLgm?(
zJF+8nXT6JFl@3%fDnl}WPkfu^6-LIF4FWIySbAb8@@}a#j9jeG_@jUbM39}_&l8po
z;_#PD<$^-gb0(XU(G8iJ4tif^?4cx(F^6QgR@K5hQN6U~q-P_3EXl3DsPXE92KIcv
zWBKQaZ05E0%q|{4Kj|G8^VWIBC{5`lyQ&c&G$Tgwm)Co4*31IUSFfzticF%Q@+Q{M
z2arRDWLLdlTZG<}u!x99fSsKVm)%uO$N9uFam1FqPl0xNO%zj~vcPypi{N`h=)I2n
zf51F6hj>XO(DAScI&c}rFil=)(r$8Jx?HqDuz7~dg&6=~VDg*u3-I#Vl3rJ5kZ~wU
zS(#fJ^GA?V&{?9lz1E_BAd=2@el>xFK;^Z=k<EW#B@MRiIl;3hq#w2&9iL$r%^u&p
zk=)y(SYQVD`DW@QdKsJ2ZrbZ1HZ-O2U&p@H#WOzaL{uL3nUps-X%$-QAP+YWX2%<m
z5>FtSjy*1|zA5%>e<lFbe4$}Bn3Sj#gY4)G_BuVc%m$DnZ>&*c=q1&C25YH_56W07
zOp<cEl3^cLtv143adK+9Z#KdR(YwGDojsr~Oj`-`J3)7G7tDyV7u937qF5IHXacCl
zTxUf~b-RDg_K<mSDg+!QO2SK&Q-+7Tc`oj=0T9wVB6}apumAkchnD}&l5!`4(E1q(
zEp>{BMgPKM&O(y6c`G{0H>VW|U1F0U-|Plt`>bL2XVEyw`o|Q|;5X&-Bs6ig=?OB%
z(}W{bBD1lX1%|2w<ee<J47`3XQ@rzSjrmE8P3J_!+4*YAiUX;oWUpAL3f3DF^`;bb
z>ZM>POcvGHUbX57Zt?;yi*LV1ey1t^Q(37DdnIOba`HyqK7-yj+=p2qm7MlE_NlVl
zerbIij5_~8C8qtgfmjfT9P54Pszo}uRqFTlXYrrpM}<+};ZvbafpRjPR+PM`XgVsO
z^8WGK8rr@{8BFmTHZec5JqasiBmxrSYQ0FeUsB@t3a@XrmX;2-4hntqkPJtm=lpCD
zJ?W<PCYEw`URlmI-G62^A4xXKR<}@v^jQ_xDk`TOH6Fv)_zm)S1W<3gu6h%K8wp2?
zYwI41hLVpYZ|(^T%a4G^H;eCEfEoM7VWgV*3-sGAm&V$MqrpF2s~!n1PR{CEHvfr2
z?mWl23CDx{cbR=Z3C*SucJgxmahsv6Po)vu3&IgQNrT<0ZAGvlr_6_c1rPZ>8h{JB
z@1%t2lqs2+d>?bSl!IE%QZh1466DL+jru1a!!mVDf{MphdpQ^0&BEY4!D#GT?^c`t
zp6&&?;zuo)E3)y+NiJd%-?Hz$y4Ga5x|=yKxK1n0D=}Z@T@CzgA4HkuJ`>u_-`Q!_
z+h8V=TmaY0kg4E8aU&n0g9Nz<1}_uL6p&x6>HEj@wJI#r%kPLjuUKzR?w`Pa!dS?L
zIw)eFbcE_3+Svv3&qCLtdC$VYz(jQ1)H$9VoCgv*`<Kf&(D=BljBWR)&1-dU;jBP#
z%0W1*GQfW)tp|J7csF?tEIko*ynS4CgMVTv_1?PFroX?RhiA8h(ZMxOwcM%4v_7!@
zrk#{M65!hNy<Q`nwVjK1O!0MchkJ_Db5q(?fn+Ao)8yXZnh5qFlb>s5198CAXB?&<
z;`yv!hX73>*^^PWQXS1x`~Sg@j>Ycv$`-4dv+q2tcl*@(eE&?s%iqstvTm03S*ppr
zkxIgUpc5<I43u!kAy*#Rh7kD72~G7k`els^*}MV!r3w1?wUAyd2tu6fEmvrnZ)muZ
zbN7sv8B?%d$rVDEaxVPQZN%MnnqvCF7{E!5l<~btUIMLC8?Y-%is|USK>aMUfYdx~
z4D6fCtEbo@soN-S_&`$854`_H8MClg?M86k4MmstGNGD>o$)e8|2dduP+srWD&<d7
z^%;4(zr8mchw4KHO2i_bomc*Lfmb1Xn`FqZ2u%q77ql8S$#onRCe&3G&L_>>DSOh#
zl#+cWc_uNZmh9AJWsysW^m4NU3rc*t?`#(k5n^3!%K~e@ed#w%v`{xIVj@JSRHo6z
z0fRv<<wH=m8`=d^N@oi&1c7+#?>!iG-z7_rjH2KTN5#4&#?$>lmp-*1yg-blDlc*)
z&peL;+6f?T85lw!KZx;YE;17~YWs6kN|;WWM$+_WP`MK8X>o2t%raa%9vE|G$^N{o
zEOn{CS2|-5ExLYm(Z~%+EHkfffW?$V?Zq7Hs`A%?RgwtUgNa&VPiex!*H(A_X&QI+
zj~R3?c&oOA^#=tA7+mWEfN}g#Y<&@VX3<$gu7%kRkK?iF?m6KAvr_&P|B8L@)wv<>
z@QR4RYm=huE|JK<i;Xd_8v+@~jQB@m3Q}8bqxg$mgK8wF_DHIVAVLMMQfJ-Uw~%EC
zpcF~U=oB19-2Kl@tW5h(o;{9c#D<_^?ojbz|6Y|<>&r)iFaeyXX!0{0M^_6OAKX%z
zzEVB>8k3iN_!&ZWN_E~jEPp~-{wXV>PJ0!6VN8U!E#Y^=#*jZ?hv1)js#1uYCMTV3
zga>eO!HGeJwXia274ip<6byA)ITxpf7L}H8jo~u?Nya26<?2R?WPB4#HvDiyQS)g^
z9UI#CV*fF`-V>V_+EJDo3sLW1+z;7UjQv~?W2-$-g3<f0s<)AJj&QfIAj8hsqhN8s
zFEeZC>AIFghG<yzy;QCK1*N3}b#od0^S;sX@uQpJr*6D8{MxpuNz@v*RzIIrwRTJk
zHO2wYKYy?_x_>o3Zi%5;#GJaHXygajk1}fc(gYl=|2x>za<B(m^NW!_8S(RTjjyV5
zSkIv~@(U1B6_hKpp6mmZ5Cn$dV4Il6eSw0cQ0AEX#2~7(%4Cefcb&TV-QSpR(G)}Z
zS|dsIXP-AgNZr80o3G#d4mx*Zq%ZB94lmBnXFuc?;@si_1`G!XnXvDSJyN7CW$sSa
z-ncnK<u5WPULrPn7U0{Ukw&RC&-J9X<<ZsbWgQ2wqh~dgLHPjkAjzq>N^nvFUUT}@
z9qjB^^(Rv$91weCc%NX&a#Z`9KnRm>es#*c+1#wDkt*L11z*#1zy}i5!CmZ1H4`XX
zL7A(abyFomWq#llo?-lO4QJr9PypdLuJ`^%bL>An>z)z9V>i=o@<4jT-_aW)4C7++
zWmzO$`8qBoODI@2DXnCa5Gd43_f~mmKOeq|P@Nhqk;FB_ESz5c`RzX9)aWRnBMTG;
z2YJz8Fu?ed_brPiM#c;et$V@b(f4aqj3^sP+LOhnqvVHF!##i7%KjcsAAPW-mpn5Y
z4T_W+anEGrTB*^Ph;98lBlH_Z`2$EV`7*}B)^pduK~cZrlB92bBuT4AZiOxH52yCl
zY)AW8a!gog=vcRkgJpShTSIlCoyGG!5kQ}r`sGWlLB5We+v<Z5p0;iU1ya`Y(hGQ0
z-lUd;fhuwrKj2ujoSjY5E_S!&k0GQE(NqPiu5XnnP~U9;|CV>DZR8ZIM$XhnTw3jR
znwd=^J!X(0_hvp|A0Bud{<NQ8L-{bR<$hXxR2B5y^3lngp)8k0>;2H@j{SC-sx;ut
zp{szADIr>qX`!Xme<lxFYNEL94B$~RmCUwo-!D|p6os^hXdszG=VVn$=EjA09VNg|
z&xh;4R1W*@euI#$zA_P<Vr=H=?*2tewBh|YASI5K)l}A>vpo_ltvzHcaF$a>9iXYt
zM_g>sP}1HCIowU#GumS91H|IrRk<@W1{-dCbLj~WsJ9*x8X?XZM3cGGu0KJ0b509!
z!W`+}4GjZc-7NgsME(5WDCwGEb;!IPeWhkVl!pDD8Ud8`4ct2Qt)xBm4N)2~Z4CRe
z1nx3zdgVZ`Oic8(@wjuU1Yo=(J_Q!Kw+$m;v8V6R;!?!6yLQeDUEMWq_*96ACWU+&
zsN1#s;%h-WWTI!OJVq(sVk01DN)zf1HHz6d98M!9l3nf7z;h;W>Us2VJuTJV=?2e9
zX;)o$mlWbDcfx*G18_oyIs8Lhc!6U{VpGA{cOWg8;k;f+TDxn~U?hTa{2OBM_~^2y
zr~4&-t}ey4tJm-5!fM02_JKo++(tRe4JNz(kAuLkyjKLNRtpp&EnISO*u?)+E{c^v
zZ;d64Ed*9O@R@Y?FT6}GK8ADE=n8-1d8pfVGz=SDAhqCq`T$4JD;3ARc>pf7rbq$i
zc=25T0GHCg^t%*0J~#iXEP5OF)vz_G8UJG80Il~Nr4Uy#ui+lhmNG+ymEe5*-A)>t
zzCy|K>8ZB1E{AXYI%>X76wlc6(&)mqJ!Jw?w4#Vz71k@~EjYRrm{)SJKzW3%`QJe;
zhM)VmcZGaagjYD^;VwGUJ>Jzd2nv6q8PQePh_5I&_O3ePH5*cd@20-H^S4NI#_Mzk
z!D)sj2y*dE3DeT7kYJ%wCyiE;;zfV{yB$+->>3pnhWe&5*|cWtZZoIt54zbhCX&YJ
zh_9|)G=`SwE%IILq#~=`ZG~8f1zenSoU>yTKGPg8RhSs<zY1ED1{ky?T?}rz?H;bl
zUm8G_aD|eO)i(W)a?85i5*fmbI{yql-5k%RiD>|X;+RU${#WkOU^|<nebK}f8m8K(
zH{+Ih?f{zor|2d$bbWVHD6EUX=vAyteh_BW(v+P)>~ppU_vPwj#UAkso`~4{`*R4!
z?kSaGoXU!^GViK9PxOjcj|JRN^YeN&@#7n5o$_SVGpgXF;U1Ga&c&_$RE;{8(vf+M
z+2cCej=(hX#PjE11Lk&*HTc`@FP=`-<YJZrtA6ffKjRQy9Ab$~W|9lSDXabz4k^Sj
z+VuOJWj5Nu>pYOHcl@DwV^+mQC1nj<zRV;2cUhTS&62Pm)SEs7_TwEY_%+-Y#dmPx
z4@xT(;q~<uxm0Sb6RT40g#*L6xPKIP%G$4WD6aY*>56h_TU%Spd0tG({XE*~R*r}7
zpdd$Wzec_*pm4du$K@mD!!;Z5nMvJL)t^_FE685WMVDlIXJ==l1x0dRCqfxm*bGJ*
zRt;}Z>B^Mk_B9_dEOFQ!++fg_gRS3LN;cY26WwS;^6Z8i|Lz+gSZ+6VCeF|X0QnB=
zxnAjt_^fjIu%;`=x7TtHt_4BVh9EuUH?KwRq=q2KB&jkfj7Z$fw6(PjDn|UggYPug
z^@D;QdmVWn)a_7Ydo3n$v5@ipcB!bedU(FTiaL?L4b2C*COd=~Ze*=oYZthz9Ipu<
zlsJ%_MLpx+i~47H^227S)3*H)3Mg?z{awN5ESy?`4JG_)8p?`#D}0=q1sJ$~>mtL2
zeP0<)yYfL-&1RswT7J~op)K#~$W6tw`BPrnPQP2OHS-T;Q-0I6mUzF1!c22nk-4#M
z8jwZFMvXL%H+D!8ELk5w8SID3TUuWc+#oqjOx&m)kAPXEXh;7L`|lP>5cQ_ruEWuE
zyUIQmAQ5oepQYkVk5*+nOANb8cp%+#-T!3KKW1;N7X0Ugo!~#+P#&h_O>1j)0G0nn
zLwQ@=NT7y$>o1=#-7gsdf3(Zo_Pw#a_~F>}wlSHP*w;$168LHy#3}nB>d_`YaSThq
z(RntBcuxTwTq>i&mO1<++Et}lrGa(-m4eH`sbcQF+OdaQSiZ?HR0>WErobXsJd12E
z>3+~;E~Cc;#kr;Kzdzw$k8av$YId{P7@8J#ore;XDtkBxJI+J0<z4wF8bTGaw`@js
z5hJd88IYIXlU-?>TJ@#fYS5gfn1a-v)L!HSYDAg2Q0rN78#Ea~)%5GCC_aqV<M1IN
zM>7$Vk_!-VpZ9Z)roml^0b^&VD+&n@tmlzU3Xyh0Wv|Rrdm;!^Mz-IV9=W!NYO?%#
zWCtUTk!r1Oo)%V`LYv1W3YGQ&8id^mRh-{5?HPx1OI?ppx<htQnuC{MBR|9-9tm7U
zFJ{h1^<7Q)<~r~9uOX{1lc?v4K-3`UFC}c7i5NKDE6$teTKjAJ3)3}qqKZ<x4_I2q
z0d};WRxG#%Fej4~`GIPrrvP8j!>TcHd|y892e~5rj6#?VSKkg0FzxV_m8H#G9yT7!
zg&UO|t69Dxo|xE|hg93E>q~qsWq;YXiPsw^CttPH+WUYx{rnfSWcn#x`kE!}T<(L$
zV}a%2hteGjan20D6IY8>;XcJ9`*=gV&CS7H;w$|2+2A4lGt9b89w>i}0%g#U*&WUq
zx9L7|MfBgwF^YSM9kts}*nAcr;%?R^68ld3q}JWM*yh;U{nz`~Y+edZOrjQRej(C7
z{cR?&msOpm=epQxVB4Uvz-LWK7yp8Jr3aczGu*x_Cob`E7#SEuBbET-lBj=v9K!DU
z{{Fr`($y?o(H6E&0ZY2azSJfV1=#6xf4%#0cp^8>UjZd+x+@xg3Q6y?FY%owZaj2#
zaEXTC9n8!w?`<u!<1+e0z<saNZw^y>Ym`Vpf*|l%*6a5y@kLg}We%9)HGhT%+Ck|1
zo8M#Fohl{t56_RfAI@K#M1ExvLd{bIB+Yu9?W_z1R#iRmpl<iA-n{6Rpa7<djf#xr
zwmE4IPL-CAPDlT5I%z;PU-KPNQ?<tdS6<K%e>UUX@lQq|X&@_b#LwyQpx&%{?z#(o
zgtcHh^o2NjZZa?dFC&xcL2F30=~TBl8iPQ@2OumV@PCJ#XrC}*(^uT|>hOLU{eRG;
z)ChP{oEA3T&shLryNVPQ0vS)4dfqe{yb*#o29*NhAnh!^Q1x9lGnd!l6=MvS=0)-9
znriMEIGV5Q6o^}}O*{$y>D{xs9r@jhN3^f<i2psoQLE;Wxy<xH@7+Lu>jl<-cJvY}
zP<XA>q^B<=C1MmN8TsX_Mf2l5(K;cK%Sq&m&GKx*IN2!fmBsr$f4vUz3-2;_ChZ2I
zpAUG`Rzte+XXfg9JDHh(Ry+77ObPr}uB|Q`kuYhQh+<^%G)3Qa8{F}?%-0jELr#XD
zmV^C#Ne=ORQnB)>OW#iClB)Vz76FC`ykf3BAP4#cQovpywGSXSC>bpPG`PFZP*uc8
z?G8LxNp#e0fBS1^=d$0hWD4{K7^t+fkltz~O(mXgFMKUb{pzx+-V>DSJ{uzQt})|@
z?ZfGDn4Fu8BKGSVY;VVpoucU_V&+kISLNJrOLFEY3(m=L&~0%sMO7qfh}kQ7*2~Jh
z;PD<5s!N6097d|HZ)c|_@t7b35l-0jjZ;!;FK<x2zB{HJPK?@Qdmz0^Xk?c;5`<SZ
zd5%)1cfb5IIUH<KXni!RIo}rYOWxH^!*b3wozN3Uk&K@gs^Bx7R`_HBGTxA)G&LR7
znN%66G&PVS;Ixi~;~9!fh#|JN>mRv6Cv2w{A9d9%qY{;XE;3|T=boleF9T-TRg&!s
z%3ol|#3Exi8=%|osMyuGYX!gA5JL{Vp4_SeW`3xQ>=eP&2k=(%Q=P-OfpK14xRa81
zkRI)UwKaL%iU04_mkLLTk*0glb={-M4DY&JZNd;PSf7QOmQ*ry`lczjJ!LniS2#{t
zNnH3~=Z;>HkqCx&7APT6JY1v&0S#v5gA}pOv53&cyJ(?%2b*qc`%!NUWF-3#KOoci
z?!X08;Y`%4=a5jKAne$l6zfcVMbxa(%Pl?e#!_(JtxP00NPb0XNNUy3_V7#HBAzot
zJq{*pxzAPcHxD#wDzqlJ^v&Yb)IRYv+MKEhg@}aUFOkQ@DMZsJ@5@bS37GJZyFfbu
z@+01*ZyYLq3y?WdjYzaGss=qzVbM5#-btbDP+(r+^!vHtKl9B=3RFa7Q$B%}zaE(j
zC8<94`>>x_O=JlqtullLbi^UIQx?9eQ^sjd364*yPg3+P+}WUS8!)m@c)+x2GVFKz
zB9w@;z82<~APCrys7lJt2aP&;oG`2;mWg=m3t{c|-APCBgdniznb32Bl^lwB?}DH0
zWi9k>8MK#B`_^Ukd5z@a`qhhYb;MrdY)qyW)6rdMO;gCUv8e$^Pq`7$MZn_BcL~;{
zw{d^;Clwg{$h7cpd{OOtc}9o={Nf*^j)##1QT>|;^N}qR7ov0Ei+%;PM(aKFA5TEF
z*>M(}9bGbLdon<*EwL^cd}iIfyL9gzNHN|1^)A6ZkYrb9;LjDmuQw!W2qD;vo`HaI
z<>#qXwT<HA#ETAZoxQB)lTP74Jr1uvAJH1)vb}^n-09s-7ggMz<pAN;p_gu_kDD%4
z<sgmJg9%dU$>I^p6_)7R$F<3|UKT-|-Xm@!5CM<9LEm^~#P<b@@@izM=r=Y@iu!9u
zH5j|Q^hZWu4rs~g#Ua_!A-ZNgG95DCjWi7G^P|w~wc`KuiC<G~`q9xUqixw!*pvZQ
ze~%7RAPf9H60Apa;I?laHGbF@??+<VE;jLlkC03_t2U%RJL;EU2OVZpIb7RU3R;q4
z@=PW^Q4@S+Y0p9~EE2!}(D$E6m`UzSthMzU4-cNQX0%l~Ux&Gj>wCrhq~g`dr#pCN
zp=Ux_&ADxk5E;vz-#!8d+!KQwpAmUG7CvN-WpiK4iv-hlOUH?bf7SIobbkr}x)W@g
zS0xxOV3&)Jg}ZedF0gRhW<0I^1PE8P5PP9Uk4bsZIX)*?9C}9G6C+Icsyn7c1Rwf5
ztfQ+k4l&nAu|a<U&kvMX&DJ38XEov+Kz9lLzOp3VWORg{c~oT6xfbnRXVs#pj0yQN
zqm0Q~*g_vJv7-+MrU+|MyVq+nTx=HQ)csVblZaTNG8lBHLj6E_UmW{1?nGMrz}I;5
zpec4uBA>l9J1O`2Q&sTUII+edzskO6{-v*YO?An!e{lGW115=~M2Fx{EYEev|4|eH
znzY*onoIgqgrAbf*_JpWNH}qkXO}$Xlj^9*<xUEuifD&+vx<*xsZ9-BV%2ZeAiGa0
zr+Hj?B04j_Jp@oo?DY$$ZM7d4&jfM2RQKc>INJk3O#e3kbb!^umO-6FTA8k?AJLQ^
zn||`zx?yCS8y#PffOK?0PKA&G@L}HpK_4aK!3I7RFsr7DW?9&|>KZo?e;5u3Ia5vr
zIXDR1Bdm9Wqlf#3>-doB&^@QMl{R0YDnWQtcP7d`F*3>k_$BP^e}`=Qxo-I!2;c;~
zQ7kO_jUc7(2nP;TlgAK+ie?V%sgstvCbA<vibQj7FHFCXX+RE3yswa{W|=TG0Y9l(
zh@L8+TP|trd{`;>d}96j$3H}oHWmsCw)xs(QoNw08#=?!XO&=yeAGpOl=Y=(`UjM5
z&Wz2Nc-FN4VfHc*4>_}1y{}q|tnwuL5;iJex?z%&9?NX}EzJrQn;yVFar5_=0+0lV
z2RuH2k{<A)*Gs1Q)l<Oo*a@kU>baKnry`i6-35)ipr6Df0Svo<G<05B+m<)={7}4b
z+7a*}0SDDh6b||ay|=$R8$pD5e6<ajxELPvV-w<@Ff|=0h5on}As9k`zv0Amj^%h*
zHjBF9&K**9r4O<?-F_=D-@9xMiOVw-vn&)3n<jzZV822|l$(TInF%ax_VxOYCWhTV
zviN4Q^rA&Sm)NqSgcZ{08aTz)j@2EvVzh{Wo!JmuUfa$mP2T&w$C^DhroFW@X1wo!
zBMUVLfY8x{a+sl-M*1*h2Ai_IZx9<*&0irkQer|0I>)|uf#~Jo2EU)CgE5fv?(VhV
zc}9MwA0WlO$06RfhGjPU)V)57zGVyNuMl}Jl2I@ib;akPP72qpZIcsI)=e}VR&?>s
zQwyXZD@UJ4LX`uklxsqqm}&~(S~9%KJRyO5mnlcZ?_t57KZ8%y&B|;_Qc7{xfinyX
zLe;OdUOk$mm}WtL_EA7PO6Z^i6uyNd5N3R87sm1WXFU`xysjGZaog`u)Xc5b<p8;i
z_|H{wySZ9!*^m7rB31tX%C+{Vq_Ze)4`Z#wSC*KplCw49Sd*<8B9^k{1C`Bu;fD6`
zwVAPM@dZSCC%K7Hm{wvB(ONXyTuJ3&mROmkO{TJ634HBtDEJj)lTEYz!oSh|;ml{|
z%(-*V=bU@boim5tnkaV0uP%+kCl)cfwbbb&*-iXz8FaC3miJt!!xH*VW);!g6&N89
zj>~(Tegz&9sxpMNU7^+_WXo?>rr*;oAA5t;;5kGx1j&JiyOVqCjdIM<Zr$^SH+2eX
zY`f6x&}HLBP07m>nrEyVQ-7ALc_1Y@*ky6}TckggDC;nCDGjyq-VqsD#!Fmtd*r}^
z1X!<EsE`_84so;ro3Rx7Z<H`uK$g!11wH8VvL&6J_a)SS+_MrKS-UL9q=iT9*vi;s
zDy{2eN`4JCEj|^*d-uK;-$?C4YJA{5qK$=ZwO~w2)*n}MQH2!dt<ag0z4>D2{6{XC
zMcc5y_S+f!S60uwJ0!Nr{NQ6fBz@t<M91jR=rVZJ3Dn%lETTCphN7TWeb`aZv-}-C
z=Kd<Xiug1oUX<NZ=NXJw@JNsgr2P!o%$9U+?*h_<1848z5Fn<wzH&FKH}8=|HOo%Q
z?NSTRNbGGNy3sGuBS(-RMjgj`#`F*W=((XB;n*A6c$y!Ox;uG8N6+2Q-)9yvn*X|>
zl4?bf|EhLjPbo^H>bqP0`Dwp<(;_<EJC^C~Ar8J@s-1|#nYdl|V%PC1E`K4B^pwN!
zi*6q(ujDbdpKS4#t-uu?4>i!RWy;^c9M#C&lAKJ{b`K#?2Job=vUL;LI9-5v3BUn<
z><N>*_vQ^+r4XOOhvP=F28~r?(N3Cu`Q&1O5FLTyRP)vS>QYjx)8p%#m90%?tBdLy
zb>DDS1C|&}HTjopwV}ThKsV8&cZGm0bSy#K!EfG3*00jHqerQ=z}4A6#!shf=_F@c
z{QfB~*vUIu!LWSS<^0bS9Q`#i=S&~If3B<ekk6E#?<7SRYqk@VZ^?xy)A1#_wIhKj
zJRCELmM}@J8rIhJ=YBAZxhmtD^L7kvQaBi^meI0=>t|PBbx9zml_+zXx~3-oTmz8q
zy^%Od&(VjGhJijQC|w%pBTvBAXFNDf=Xh4Cz0_nulOvEJ@=hJ-S8i^eSOjpY-xKWG
z211691fB2ThU;OM!g6}^pPjhh`OoaGwNC>!ik&vSKS4t%9A>H(eJL!n9tvvbpqq$p
z4pWKHp=rPIn7`k8xzX$4U$O^R0yqSw`!_a5uBWC`iv{cqEZf^d9RSDxlxdcHwcoDd
zuuN%AqzK3t@|_mxl9P8f_K46eMA?`zdTGk7y>;<b9*O1q;n40JCm<GtsOu_Cg0+pA
zjZ1JnC0C>g+Do9Zkc9}5*~^}mK1X)^JT5Pd$ZYVtU}s@X9XGsXv~<v~w)46e9-rul
zx?~>;N?qCU?CgUD1+SQrW7g&vjKf)Tu-$v>n9W-hT#q>bB(P?435G|4fdQln!@UW&
zZx@>to{!}_rbTODRIR7lE;J=iGITIcnfZgOk6%OKe<|9Qq<%2$HBSDp&zzF4@Zqu-
zf!gu{EBIz`;7&i0ZAP!=5QrmY;`T%HqkchdY&nM81bl0_=DxfQv=4QkM<5Qs>Q(0f
z+nGprD;V*B#ms@hCkd$AO4+2H$(6`o$uNBi;d24gM2H!`ut-q|znEcSS#XjCV=eMi
zF#j8-Nn(+#VE#F#32Twy4i^o9{hh~Gx74ip<4>Eza_6G=Jh6gT_|E7b8bbD+`X4TR
Bnlb<Y

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/scopeMapDefaultBg.jpg b/subPackageCheckPoint/static/images/scopeMap/scopeMapDefaultBg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..62c25987c484f6216fc6ddf7af18370efcc2d804
GIT binary patch
literal 13471
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
Lg|)v=VNd=C2srDy

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/taicangshi.png b/subPackageCheckPoint/static/images/scopeMap/taicangshi.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c1c8fc9c7710e7cae8bafe3209fd8ef82267e35
GIT binary patch
literal 2360
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/title.png b/subPackageCheckPoint/static/images/scopeMap/title.png
new file mode 100644
index 0000000000000000000000000000000000000000..576ee520a396f2c32e7c910a3c977d5edf5082ea
GIT binary patch
literal 7034
zcmV-=8-?VFP)<h;3K|Lk000e1NJLTq00FE3007nq0{{R3y4XgI00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px&08mU+MF0Q*m6wz+9T-<yRYONXG#?o{AR7`F4<i^A
zMI;_aB_0wN4<Z;8FC7>#9T+wr88S969~ToP8WbxW7BU?e8y6BF7Zfrc7&9Ij5*H5}
z7ZQItEQC8PHaj#D7Y{fe8bl-=kv}jV7ZX}6BmVyW5*H61BO4PJ4-^*<9TyTb9vKoB
z4|X;x9TyTO8x<QD5;YzfKO!799vLzo88RLjFdP^X7Y`p95)u~=@$vB)7ZGqYC>|IS
z8W<577ZGDGB{d!y5*H5@7Z4H`4-yv-DlR7y7Y|)6BQ_ox?Ck4GCLb&t7neaYHXj=P
z{{H#;`ThO<CMzU_hJt2lWD*w-5*H8q`}^bM<BmQsH6I!@9vM(5ARrkNl$Mhc7Y}PO
zC&kCbJ0Kf}JT5mM8vXtKprW7i^Yc+vPjq*3OixMo_xCg&88;sqr>Lgu>*_~KMQUtk
zKO!8`)6zghKH1sWF&!A_=;!6;<;lv(?d|NYudKDUwAI$tzQ4VSjER_<myVE(HXj;#
zH!GEwluJ%XFdrKF`uhL>{~#bB5*H8MTSUaf#Fv+sTU%S?d@sgRKJU^e7Z(xm@bGzg
zc`q+7i#{*m;o+vHranGCO-)VG($a{Ch_$t~YHDhFeRvZW4{L5|iHnEQS3&>&{@hwa
z)>uO2f;Xv1H~#zip+z+%Cm|FW5f~j7{`mCkoMZLQu-REd{O;qNLo>NfJLif<{PF3^
zR6pc>F~d?l=Z8T3^zHlU-0!Y_@U(~Mj!UvjIqH^Jy}rEn_xJO`ocP<u>5@_U=GeYZ
zJnpJ@&$cEaBOe+V5%Rv5`QXj-#-z?wK=Hbg=gTLnmnB<MBKhOe_td&FHZLtJAWBY1
zk(7|^q;Bk@Yd||8%FD@LVqN9t<#&2^HZvjH!6u=PB;CkLe1Cd@gMY5Dt!Qgz*4Nfj
zR#2CQB#VuSfpa5JNg`ueB1S+V`sLP|oS49}W7Elw>(MrypPaF&cDtn|k%1&>ZD(X#
zBEqXBb7v#=<$^>+F$&?8O#lD@hjda-Qvk~J+~)J`@DS_o;2`(&@bU)x_V)?`^X=^>
z`upzY_w)TN^Zfn%g-$lk_V^R|4374t>E&_H{-)d;_eN$H^x1Jf*|PS)^}qi0RsP8L
z>Gb>2*_x5;)cl%z@m<gQ_s;P9xbV#W;nn2hhp^1p<>~Fs>C}MM=;!m*^8L*1&&-tg
zxb*q<pLA}6000+-Nkl<Zc-rlqd7KpGna6uc1XdkJ?%|X}PC4WjP*4%MMG~{95Dgyd
z5qA@F?Y-IS^XZ<hs$r<A)Y+X`8JQUd7zT#>Rxp5wh-geg5;Z2fn`|!jPWJe0y><0l
zRc~G0)jjVp@9!_F>7(ZP*89BA@zz_Z6s)25-Z^*3?X|XU??qIKM&1-nL-co#GmPFa
zWbVUvFG_{zt_Ny~FwwaC?+Ze;=zd}%taSeZUsjVw67yiDA$R$?Kz*ia{qWTfUP}{o
zrdmFD^}|-v7j8t4E5K^!%LEi2dhO>s4O$ZstQG(t*!lxvC2aKP>x^)GjEB`A5C*pX
zl$Z!3tuS2Sl7Vhm_iC^1c$F9kEB(n1oz?_*&<-Z7pAhq4ra#tUJwDV4>tXG+Z<E*p
zJAKhew;Zf)24xPB*aka2wA1SdKLZBVZNxVC=}&c7{bvrcS@j*Fz3^RP84UH{cmV4{
zzo%?k6G14rf>;JeeO9l+&saDU4llk#?1H7%>VB}trLl8NST|{hFB7}qsV@UqRn6Nr
z83FuMa7YqjO!bUDX${MsyvHcFgF`Z9VXF1|q_r}eUAzjwx?4MXqr2Ngpn&W{iUy)s
z3{ow9(i)J>Zk`Py!U@`egrE6T#;rVUi4v0iEh=Nket|Y$po;rGHo+5I3SjlwrVXu$
zW-$0O{9rMe0P)3K^R$LrRARwmOMow{R1$W07Qh<Zk<E5Y)?nSK9sCf(krf0hLnHi{
zsEs*JAA{zbB!+|87z89vhz=|8YSP%}l)}#|-tS`)u)}kD4Wl`m&2CzhN`YlEzr_z0
z9S@ez+bP6bC@*O1TP-o}7bxGMPZz#h%A2RfCJ5`V0IX?yHCV&7TnqFa|Gvw^qKbm0
zWFm@=0;@0-6NL3U0M@+G8mzNxQmMJ!7#7t<U~Tz^1}j@VD76GnSX4aYvE2aH*hzY|
z2}4)~<@EVL6=3UnjaPA4dE<Zbm4o$-IrziMLvge}tU{<?NXR(NTC_Ipi+a9`3NWI=
zqI~@{gMuabA}$5i$rn>2af2ngl3{-n!dI@Mq&fXX*?NIyp}|9!221gU#d*oOTx4Rf
zF5Q#rg&Qn7ss-I{hSy(Ib=L`oqZkeg<Yp8_$u8rX#^&@Q6qTcC|I?%^2P-@4`hk@*
zUd-8^lYwASh3{2-GjQ59;OGdaX}m|Q2&|r68J6n!99Nh&Oxp<#SfYPf!u&~D8)qV0
z3@oZ5u&TQ<EE?ej87Ppa9k3{WSYS}fCTtMj(Rs-lq+xMSC1G{xktHI$Af2W})trN*
zsIZ*n3_EvYBUGBZIV=HgEiulChJu0w%Gqx+2L|s7;-bTfS$-w33Ka<>5VPhP$vC6}
z8ch<~PsWF(MoH8~3kW5MD#MwdHO@g+x*04gc9P1Y!^KFj6zwvgIlHrBh!*{NBl@>6
z&`6f7k!AiEffbUZa;W#Q5n##wse$0{|D4@XbHZed@1hATSV8fD!-x@JMGj${uy}Zm
zRIN%^w}h3B4a*)O3@A$IQ&^rBN`!@4KVXm$tUw?3e~dAwGTjZ992-_nuN(mjGqjSX
z)f}6S6uQTq91Rk7N!bBQEHkW;m^L378y7=61lC!ExlhLZLI5l&=H$pgkTMJfCk%`;
z&`2H@t}PPQf+fdUV^jnzE^r77v_uEN5*!gpcZFrykXMQbOw7R;0hXY*WN15bXY_R2
zuA->kiOT_tOQT@%-3*p(E?%=GJb}sja!(fFH=XY@xzNF|av+4Gph=QO_(mE5%N{%u
z0#>Gb!4gBtf|6hPCnhW-n3Dv15r=~KHeT@lklhSsv@AMr4NJwyr@Pn45<`o)QR=^Z
z+U`3mXjrU`UUXgrjDIhNaYl=jP{G<Dj<6yW-lOnkka;$uRIl1oq>3zFdDAV{8QND0
z))4Gqv0SDISX42vIIBx3WD0#|DEVTfkaddb%EH1fDQ4wNF|eF5v>ptKp|B)tjSXFJ
zoG>hv_L(Bh`jXtuVJUWaCD{!TNV0DYL+@`<{$@hJQml8gyweNX^$EeJk|81AUlCZ}
z#4)yzS=3lyg1b@yuyWo{(v}yrE(^gmY1(Zo4qY{-x;ZS17Ke6RjLTo4VR8BmKzT+)
zL@k~Iq+|~)#$B0Ith3>fUNGaj5V{|%w8ERsi2zvc>Y!j&4Q0O;2TLKwBqbS_g$jii
zVveHJ!pvx`y<t&aka1lI-4K>Wi>G`7JfHQQp?8sRa6=Lv#+;PNDR8DuyM9I1lU=k&
z6$vcua#qqYVTIjABKmhdSeAjyLvU0HW-8I_wV-@4>jO*bPOyT93vvk(AJUHE16ov^
z!}fA$aZm6RHbmZWRv7{-5Ec`Xjj2KXL=LuX;hnPIc`?q|Q3ptwW&R*oyLOcbtM>YU
z<*HDbE0ny`Oh!hng2~B+#Fq}jYPn9Zkkr2gnnA|<>GZXxeQzJRUSS!l!gvY31Bge%
zQjGgSD8DTzOxGoGKCMiOv!Vq>k13@*9kw-s5C+Rj^Gsb`)7!hQOIXR0ckCfk?s!(D
z83r}<&ehe`?K?wYbqQV5VAUNwO<;8iodC4zjvd*3?CRBXr!O`VSQzVAokNGi0uBPJ
z6ZKY|OHFUK5LlS%T%AX+A0@D`)R{Vjn%*O@a8z3zQg0Gi_~~19K04M&VBw}W{b1Fd
zYb3BR(<uj_J$o+hK7Q(;aqzvCvcgg*hf3J~m*YgCE81R(`8PK<IbiMAUp(^GsQ_BV
z!qV3U2i_pVGtnLvlvCwAbSN16o+*{KwYd<QDS9_sM*E9ZI{K&gJ6)e01YT_O^@PR3
zinQTd_{Ib|j(6<{Vs(&YI_yeS87{#+yqQw(Ah1qcQlq{9s4J>~LV8e!I$mj5nUF7G
zCC`#%mJjRpdCV(`SiqvAU!uC+b>&x3vt-wC?S<V5y1^u175+fg^Gf(W>iHz^rYWqV
zsT3?bayNsDx8VQW-Bj1KC%FJ45m<#a4wQRf<)d52G;hw_E!x<)!jfo)JdwYRst~L_
z7OdlD8Q0N=yx3INh8rv@<GlY=Mc)P$2^O8qATJq~MANxKT<o{qNqUzB>!KOMJ7=kP
zo9fOa4hwOYFC86Lfez=K3F&mF!E%TeV#A6WW$m*vtlg$NeAihyJlK{vEGAtPEWtEJ
z&h~r2XW3qn57_a(%&@}uQ%DHb_e@wVEhe@T&IK8#>-J#c26M%4^?bd+GP_w#`oH!a
z*8X|bkz6&loyG)K)aMiAu3uPYqO~ubZqX8}_W&&?ougNif)(X1H@Q^UfwpqPqKZA0
zPJ)$w-Ee-|zuwcri))ABI)+i|O$ruMVg*C4EG(weVEJDrr*&ATz(23nH61ys(Q3Np
zs7T=gi^&x2NcCHK^6ttcgDEV32Yf_NhhNu|uBN)T(?_*H<M5t<pC}!cr^HTiQ7ohu
z4~z2I5D<Dig1LRPYL}bovct+jc^0^qZ25oWm^o*Gk_D(Y?bjURi6iBNWz`9Co+nNP
z!lI#7=<uTu9Q$aY|57D%>`+EUH7D4Kf)E)N=iJ9Da`~T%S-}9~>7WfOeNG!%>0ND_
zTijJfSS3~6z41oTktl<DheXHrVwEa4SwpMI_-D(hCT)sp(Ozk5!55a19A~@*1R()f
z(Jfa3EU>FC1v&rd-Piq~0co<?zwex$eI4|t)v2&zJ{Jo=SmC?hNP(O8>+3MAkmBfJ
zz20=@urIB$!lFxpm5Uel;|VLoueWF+g<Y@xmI3KVo8P=uG%VMm3#5dSU{Ucd6b=(u
zS7Mb;E*^xsj7N=sHl99s>PRB6sECT<w3Q-Z(TrNy!O?hHlISe?hQJbxU=NC~{nwN5
z)=p~CVEyXjcy+GhaBF10Ssc9f`iVVBz>1j6MmyhPix<vuNe6r}Q^b&tellKIzr1|;
zqgb$ZooGY3$G7)g!wr^P3M>{gSZ}=l(Up(u>+8>d6sv;#?qTGT&ZBMbl@5z50+w%L
zDVj|yWau91NCRNW$gLd92<!X5IbUz-@-JHBbj#mF-#F5^dv{~0u;?U5R*^|@IINJh
zN{Pez=X!_!{olCoE7hj5-!D`wxsaQS&k9v{rs35s-ra}6R>g+Ya=>B}f@MQLU+>b7
z-!HWyl0<-^1yYh#$^p)*u!PICc%dNFk`XDYmGaSGDQX;8>4cnv4eK2@tok2)9|KsB
zCFl~$G?C*JIvkd&uj|dlfyE>Y>lgLDw8{$WA0iu?bBru1tss&XxdN~dNpTn~Gs9Bt
z0EgC}m8FW#r)T8tjZs2iy>B7<zXGlE6@c|}=w~<|uP($ecH}rE7ZnyC2bQndd1U&l
zP+=vQfBmsBRsClH);n0hqWz{|<m>2~lUUl!4uS+R;GIRoif3FXs(k-40Q8$*7g)98
z4U36Bv?!>QV@HF$>*4Ic1^I+wv>f<DCBRaY=yy86QRN#T$hgu9IQ>uk<^Q@;k!Y|4
zSjbkr6y-EHE5MAh09MHJVR2)mW;GfXNT~U!3vuD!Z#`fCqgFkL|K<PwDwDw-mRRg6
z1`0j%_zAuFqm&FR>ybS|Tv(aRfB!m@x$;i^$8Qw1h@-r)XvbekfoVhnQ5ofk5+%P-
z%r_wpjhng9+`9x=yuE^(jSH)^6*uLDrGkB&p*%}4jF<<1q`>>1Y{^NEw~E5h&dqB}
zfCa^u;&lYeby6yPV~HG4fhavA<y|WV{ePkqSl-<?Ltx49GA+DeDYglv0ytFUPL~Xe
z3yU|4hsB3x9j<=4C`M_DV;5j3e6+wlE-V>cO_s_6ixIf!H(v&Ytadt>&j_6eON<^3
zA{~hm6BfeYJb3JId0?fjxi_r2LD9Z%$Z@>>mn+7CSFRIbL6H;h^vxn4$?1F7;kq4=
zcBI;?B<K=aB*nlo_x}#drx{0JL(!aU0?J!Ch#cLY76I$_Sg;s(=$>|Y!Vo_qI{G9s
zt2mDN&`hU%u(YwkhdDu^&|Orl72_;4o#vn~<;nr8S1edEML`dSmGu%R3)9LAkx^y9
zw%zW>&@s74_VvQDH`pi|R+<gnGo_G6+U{R;0b-IJTCrg%{#h(lcz%F=#y)4sx@&vZ
z_6V+~B(M5>feN)@+^~e4oGBSrXjzblR(bGHD8xXu7$MoA6&qH-@&!>qlon99a(UnM
zll9aWWswbuC{@4OY7E<pMSnnmMj1E|;pUE-=+KG{O9)uk?Gwzo(!!i4!goBmK=BM*
zo}>IPY>$1#qF}|o2ZVw13L%3SW?bS!%L^;4Q(VOACg=WWZrq-BpXi~k1`aJIAY(2U
zEWzo6W$4p+xF&7;5VkC^J`DMU?5eQX*AD#nA~qio!gFD_S+F!8ngLM0K_@F!0G4a%
z2@Mrn9DXntx3Lxq>w*PqWQ3=w(u}!mfprDY_G4;g#T6>Jj14`{*6(IF2QDV0@0at5
z)5-~pb52GI#LnsZr1-bk1;d)R8hQfw&*FUn6hIpgtUhZYRPdaqNeeX>A#llTpgZ;^
zL`o55)Yx;D`P^OJRa&MCzDLSiUo0iGIq9bWtbTh<SaY?5Zx;zm)bk{`C2j_Xs@K>W
zEuPDT1;@tRm1q5ecm0NM%C|YmGpZQ*j$lEgjg%z%2+$Y6F@=%FGaOABv7tuC`ei{)
zZWq~416ci=O<4D92RmBg6)cT)oaVW?IzU?5B_r*{=AvB*`HWh`9|i6mtH{2slxn$g
zxbDuDs|5cA0BdlE3F|Z9=m$xDf2lTO(?qt$>##1Fu<iv%KPOhfQ)>a8+5uS;)_vgU
zJH#w_>Pvu5!zc^Z^l@O)`h8*-ETsp7Tc%jB^l-5DyTmS7YAJwI)ojC>0FKw)Mht_Y
z)*DmSHUn05Dm6xb;m?R=FqEEUZP}2uM^<VHc%_vLE&TMt4m~B_Zo;b3VClho?Ozhx
z;5o1w2DBTj+GlI9diT<4{Sh$^X8MZGrQdLKU>#bc!7@UO+VKw&^I)alTWSofttPDI
znE=-GkvgprgceSE@L8S8v`0)<+2I=jtklF>gVtJNB79is6ISh(8SNIV4P$gzsXGl?
z<Nt!hgqUdlmun3tc-CUoUSqIIO`mJfs$Kfbe8Q{Kb=&&qb{IUWY$up)e#(TEx_M-+
zrJW<5|3n$}g->=<eGx(BYo8c#i$mJ`p8e#A9TtmePuQ%oi|?{vrN#`YB`T|ah=}*b
z2Y+PRvR7<Y+iC{cuu?;BBK9n+e&U7oOyCC^sumW;RrZlPQjj+GXdo6XqyEJ^H7yN#
z|GWX)Ay)0xQ(;&O`i&agZwoPMx#V4f@+JQ_Z<$s#Wh=xg`{bi3hh~o6JbKx!1Nz)h
zeS@aKgKxOLHMkF~9_7>E8~OqJ|I`EPd1GR-4c(`Yb!NAY-MbA&mAzCm-3hCA%>jKT
zJFuB3QJq~0CKyjMe!kAC|C9q;A#L7#=<I>^tXpF@rd(RJ@|7%683bUpdIpx>vTwLG
zip^IqPkHp{6k^zNXaH(W(%PN66C54k^BuFMdSUflGn`m9d2Q>XQTeSK)@O}!(zfu=
zAF3XcLTKQczah3wTpfcEOOl?}6XJOhd|5~Jq!dzpXKpw^tedd*PSdcw>VowLM(r=$
z+M{QWN%?8jtYKS;eG}CbkiCB3>VT}%Z@gL@_Sus+zSukEuYr%v8oT!pF>!Jlg$M?X
zfi)n|&g~t;Us^LM6|6z`{q;RH)h}(hu?YPxkw-l=EDUPKy0FX!vw87LJ$t?cf2wEo
z?B#P7q#~(r@0(+4QEwuoMtb85Jru0%VRsfURj-<^nH*N%6j9~12ymegITkdqrpzIB
z!a`t$%g)!l#f#diLxpA)8Ao_%f~S5lUvCA^d%~w#MbvqEz_TsP^G5N)&aqypo=VJw
zg{F>k-v|6Tqct+j9$4F7Bxb@x8{M~kJiX2+w->5{qlOYQ;UTal^PdpWMWJcmyqs7G
z4-Ep##{Lmv^@n<Nv1KJx;TS{AgonTl_B)|2@q;5=VSBcD4Y3j?de~KK`no&1$lgc>
z7AETJ@`7L6VMG`0WX8h2eDTmNh7&w#vwCF{2?cSA1)+u0&lxu}LQ8E&&m=~|B_n>^
z(Ihs~VK~LwMv52M2;5xH+fVhLztimmv%@}5jD(B8wiWh{d`}xudw(brJT#k>+i^;=
zc34{xHX1jcUVxX<Zn%pW38(OaadwBHVtY2borLY!XaO8vn8Ag$YnBmREFeb0MH8U?
zhu0gyMSpnB^AnE|8{wjXpnCBiW*}(Xk=kz=#HxAnAYvq3bT{Z^8P$sy))~RY3}|Wl
z*6N#yjc`%lo9ur6+FQ(Q7+x*Cn5<~RYhaCEp|cuc27(<BtL>ACiSQX%ORQV;Emm+K
znB82nh}a0LfwgnRYmMm_ELMBrb?l=^I*d^$2o_C$bH!KE^UVzusvP$?E+i`jF_OMN
zs`PiatsifWt0%LL35!JS_{iKI^>0771H}q?lQ2<dNq@vk?d|5?fDJt!aqMbQO_p6?
zq@j;HcVTkOSM8%#5es3Y2b`?7JML&)MjDPdX`*8vrU54%tQL}07dUA;ydB`YThBUJ
z4PQ<ILHwc%bA!i~&dm>2PbQ6goHS`1yuqV$*Q~ww^d<(vNPXu*)79QAVTH3M*sS`^
zI7C==4JX)8^@M8|t<{7TUK+T>jslxqJH`y3OjuzV2{u$Mc5i{Ta5;$saZHCBrg?_d
zwy`rweubA7=+82^P&LfG&Fz6vWZ4;J8uWnf0mphaJ3CoT8p9Yy?F~IfokVQ#NbZ=!
zZ^CNmF=M+2)z)QCO(({|OhbF2P-Qzdkp+U-X-t0<s`g>CNn02{-HqC3{p_emNp^*y
z?%0kRR+ETfaMYvjJUH9D=?*fiFooqBS)0dBCINfbaD!W?%qDA?@YPpWLzTcMYvvFS
zh_N19T|iZR2T6nRc7tXMf9tTC&y&U#?s?WQZA^8H9y{wXGODoGz{x#pW<T}SGA364
Y57@|&gc>lB=>Px#07*qoM6N<$f<OmBWB>pF

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/wujiangqu.png b/subPackageCheckPoint/static/images/scopeMap/wujiangqu.png
new file mode 100644
index 0000000000000000000000000000000000000000..45fadaba653faba044d79544a01b7862ee70be22
GIT binary patch
literal 2379
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/wuzhongqu.png b/subPackageCheckPoint/static/images/scopeMap/wuzhongqu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3e5c6f75f12729b48f5eba99f5624e8a1fb0d2a
GIT binary patch
literal 2445
zcmd5-i8s_;A0Jst^0vxrO-W_1tdXY%V;LE;)Xa#+5<-Z0tYs-t;vxH*q{z}(MhlgF
z9n4^6kR@x(7!1Z3>vP}Z9OpT`?;r5~&i&o{xu5&pzxQ{3QKkre{{6!HArJ_^p@FU$
zSdGA|x{njgpX3sn!NTPPHHJbUrLlY)w%lOP;ccd`4Jqjqoq<3&A*R<XVE>Ut9s6x;
zZ*Tv`EKd&nH@PdbwXqKHuE6%z*6z{L7#ZNjpS@sS8mH{?J7Ar)^c%CY-P+uk?{E9x
zM;q%~Tbs)h{kx|dt1HV>gS*?c<@vRxxt$m`Sj!+P_97je0>GRe0RX6PuB~>(Vs-+a
zZY$r~SOfgp5`AUn=Z+*0Se>5+mVt%EQBwcgu+23#kpJhy80r4ijNQ=%TFhTVYz7U8
zt*<NskE5S67{df$XPvpQ@B_az(YL{70d-I-#xRjJI{|WEp^gFdjaBA9&Hle(7JaHG
z*$sp})ljrT8>4o7n(uD~34$y(*V%vvC1Oqw13Xyt3}BEos0Mq1I@?n_)l>ooXa|cn
z-Wp;wSn>k!pva&{!)5VwQUj<JPyqmR9CT-n(nQJe2c|$Vfjbs`5_AVNw>9)ycarN&
zJC52_)fR4wkG#>Hcz3R^Wu3_Y)f@ek-ti0#E)2M4z!y2&k4~xwF4~`%gJQ1E&wv>?
z1>R}IZ+&@>fZ55q{Dr|z!0$ah8v?$8?FVKEbBGkz5pD%e<{pkSveGZA6#vB|aB?s2
z34a;g1ANs7&&&NKA1@iZUr6PGQsYr&;ftcDPBW1F|2`}za_lV3FXoWyx%%jRYGN&|
z^AZg+?Z;0&6JMxR&c5XEU85~Z{m+TVLF72Y@%u<h`|L|&XU)sc!)p3Mk(PnEVF7iH
zi;p5Gkpz-JuEEKS(SZ{;<7!$aJ}!PkNH`Os$LGX}pQdZ~nFapZqv<dfmf4ej#=5gu
zvG8nwd-b4Tq5QMEC5BJlCJ?{5W@YLICu)Vmgq=gu4D9pmDsNjg#p<S)qD@M&O^S?O
z=_}Y{bS^8Rn#)j^<bpq%dcC=NxF9l9+t(=d`VC^^QZxj@En%n&wLsR>6Yo6uVQ{GV
zUcZ?`Yr%oI!X_0;shD?KUyKMM{9cc;v~}QQRre6?tJjAh{O(hcX)P6#@nxQ=HTh#`
zJ6sD*->A@3(kvu8KNPxPV4ZfE9z{6c;qJmE{6?6JX>od?Y(85<;HdZQ_NcP!ILzE{
zV$84ILxpz~9r*((DIM`C8tVMxd+s{(sCK!0;(il6wIV6etSz(_J-R?crIMsS`?VTa
zM4Of>(w&skY&EN1JtRA3uVmX47k%F*xV%*5^Q|r7w)s$1nKCW#xVj{%%^HjMW7Us(
zcV3aL+=kh2#>fnYJ#DuzyC{3xh%22JDanVedwb+~`QVirokp2the56;O+@mCw$5XA
z{@z7VdRf0*4-eRnlp-h=evOUB0d>zd)p>Ia74@@2Y6bInTnBWu@dHW^Bu+~e>we>L
zl4$nYyC)|_FozLq{Ndmbhx-Kuw=;5~fhRD|{+ik>=9e;|t5ESOmnpo0c;robzW;Cm
z!z>l&0Ke)fO;Jhun1CUl8%Rc>p}xe2A|~E<<K&SxSd}t=jK5@jv5TtqJ!S>YO{JQ5
z0vT1dTJO!6$P0?Dq{0oLG5x8yelxhx`9h!JhD7f<ednZ)GYoz4Fts?*c46`m?6|Kh
zz993b)4q0$ukKONX033-MMRQfR@ei9Hv5>#8PCfEh1el!7~>sd^gXKF%k?Oi3y1dn
z=OLWBn=wt^&i00TtoV<@1@)PN%~2NH#s4X{>=7SCNC-zE-G)^rl!<ND|7xr>7b?iy
zEMmV<pPlEq(tyo6J1KwMK?RZDE8>3p`a{-oDRh8erE~=U7xq2wUXVg84MVPsT{YNz
zXH^pbJ$+uU$lcKEmd7PWH+E{*Scp_rAxtkD9`UyKAlBK*0sgi0$_kBmGrP(Tdb3{5
zoA`z6+TP=q=qV+5x&&IF{Lp~9#~+G@@x;Bsp<aD{9B@CLUJ4$m^SYiQ;TNP)j_-aL
z=lLX~-%q1w-KT{_C)C%ac--{Z6hHfMEbo`<81CLSZl=maquV!vVTE=hV#n`BT0M@X
ziGGnu=VxV&a=(thD8hsAWN*|gJB>^SBCYtHQb_B@X99U~JXE<ROEq&x;zW&B=^@!@
zNj*3&n4T^w7R43r5q#B!jY|+q<7+oPrh~rbYFgOidO!{~YV)<LqKRCo*baRm5)cre
zs+^SkXA%ht6SjF2$exaQLmYooe#4b48MJc0N7pJb_cR4n%Y@cZ1?|gtIa;{sqxV?}
zepmxeTiA2bbPhKfZjndr7ULI(zG6RyIS7<gD5aWV;kkNF1m2}JDS}>lIQB^V(=K$b
z#&?t=*|NVvZ`irm-BF+fm7+nI@1OE~Zj!F(b+YEZ9BnQJO`UaY!eE%Mr87DmJd0&+
zjmvv!Cf|9bYYtCVWWToS@HNl-`et4@d^Ihd?t8sU##+|+VPi;Bjp<tLDZz6H!QASD
zwvRg=HL>v`?AzP6VqP=%pJrD&FAnR34A53jq11c|VAj_YdS)o^Z&}7^H)j>{kSr74
zwfABXQjvU}-&ci&-bVN+^W5^{L#kn1ONGg{DV`TE2!^R3_-StVFOexu1$Q!|P*3e>
zHH|JPN?hbfKJnJ0XlmaH>38#s-V@vDmLw|4pXq~@At%Cnp)y_LmYn%d1m9~7zVt47
z*{hZb3(n7R#^|@?x9W5wO&apeBl3+-a2F{>yr0ZIKUY1J@tIRBcRBvmIpu!v+khCt
L5V|GWn6SSAS{aF~

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/xiangchengqu.png b/subPackageCheckPoint/static/images/scopeMap/xiangchengqu.png
new file mode 100644
index 0000000000000000000000000000000000000000..632f1aedf9bfd9fd48a2704e42af13ebb35614d2
GIT binary patch
literal 2536
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
H$Rp-2!w+@h

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/images/scopeMap/zhangjiagangshi.png b/subPackageCheckPoint/static/images/scopeMap/zhangjiagangshi.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aeae6e32c12f0ec0842546036bc53e9e5a689a0
GIT binary patch
literal 3215
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

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/static/logo.png b/subPackageCheckPoint/static/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5771e209bb677e2ebd5ff766ad5ee11790f305a
GIT binary patch
literal 4023
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
SYs}WS&%*SCNx89m_<sQGK?UOg

literal 0
HcmV?d00001

diff --git a/subPackageCheckPoint/utils/request.js b/subPackageCheckPoint/utils/request.js
new file mode 100644
index 0000000..eeca16f
--- /dev/null
+++ b/subPackageCheckPoint/utils/request.js
@@ -0,0 +1 @@
+"use strict";const e=require("../common/vendor.js");exports.request=function(s,t="GET",r={}){return new Promise(((o,u)=>{e.index.request({url:`https://jdsz.ispush.com${s}`,method:t,data:r,success:e=>{o(e.data)},fail:e=>{u(e)}})}))};

From 73b8204122287d4a7691717a9ac355f8508631ed Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 26 Apr 2025 16:36:24 +0800
Subject: [PATCH 306/471] =?UTF-8?q?=E6=9C=80=E7=BE=8E=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackageCheckPoint/pages/content/index.js   | 2 +-
 subPackageCheckPoint/pages/content/index.json | 1 -
 subPackageCheckPoint/pages/content/index.wxml | 2 +-
 subPackageCheckPoint/pages/content/index.wxss | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/subPackageCheckPoint/pages/content/index.js b/subPackageCheckPoint/pages/content/index.js
index 987ea44..674c24c 100644
--- a/subPackageCheckPoint/pages/content/index.js
+++ b/subPackageCheckPoint/pages/content/index.js
@@ -1,2 +1,2 @@
 require('../../app.js');
-"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e<t.mapConfig.length;e++)if(this.tag==t.mapConfig[e].address_name){this.addressName=t.mapConfig[e].address_name,this.description=t.mapConfig[e].description,this.scopeName=t.mapConfig[e].scopeName,this.longitude=t.mapConfig[e].longitude,this.latitude=t.mapConfig[e].latitude,this.mapUrl=t.mapConfig[e].mapUrl,this.isLink(t.mapConfig[e].openUrl)||this.isWechatApp(t.mapConfig[e].openUrl)?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].openUrl):this.openUrlBtnState=!1;for(let i=0;i<t.mapConfig[e].imgList.length;i++){let o=`https://jdsz.ispush.com/static/contentImg/${t.mapConfig[e].imgList[i]}.jpg`;this.imgList.push(o)}break}},isLink:t=>/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)&&t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}),this.isLink(this.openUrl)&&t.index.navigateTo({url:`/subPackageCheckPoint/pages/web/index?url=${this.openUrl}`})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const a=t._export_sfc(o,[["render",function(e,o,a,n,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","95e0a5ea-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-95e0a5ea"]]);wx.createPage(a);
+"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e<t.mapConfig.length;e++)if(this.tag==t.mapConfig[e].address_name){this.addressName=t.mapConfig[e].address_name,this.description=t.mapConfig[e].description,this.scopeName=t.mapConfig[e].scopeName,this.longitude=t.mapConfig[e].longitude,this.latitude=t.mapConfig[e].latitude,this.mapUrl=t.mapConfig[e].mapUrl,this.isLink(t.mapConfig[e].openUrl)||this.isWechatApp(t.mapConfig[e].openUrl)?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].openUrl):t.mapConfig[e].appUrl&&t.mapConfig[e].appUrl.trim().length>0?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].appUrl):this.openUrlBtnState=!1;for(let i=0;i<t.mapConfig[e].imgList.length;i++){let o=`${this.appInstance.globalData.baseUrl}/static/contentImg/${t.mapConfig[e].imgList[i]}.jpg`;this.imgList.push(o)}break}},isLink:t=>/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)?t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}):this.isLink(this.openUrl)?t.index.navigateTo({url:`/pages/web/index?url=${this.openUrl}`}):this.openUrl&&t.index.navigateTo({url:this.openUrl})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const n=t._export_sfc(o,[["render",function(e,o,n,a,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","3e19c77f-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-3e19c77f"]]);wx.createPage(n);
diff --git a/subPackageCheckPoint/pages/content/index.json b/subPackageCheckPoint/pages/content/index.json
index e1f28c0..8110852 100644
--- a/subPackageCheckPoint/pages/content/index.json
+++ b/subPackageCheckPoint/pages/content/index.json
@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "君到苏州最美打卡点",
-  "navigationStyle": "default",
   "usingComponents": {
     "audio-com": "../../components/audioCom"
   }
diff --git a/subPackageCheckPoint/pages/content/index.wxml b/subPackageCheckPoint/pages/content/index.wxml
index 35e9598..5c37f54 100644
--- a/subPackageCheckPoint/pages/content/index.wxml
+++ b/subPackageCheckPoint/pages/content/index.wxml
@@ -1 +1 @@
-<audio-com wx:if="{{a}}" class="r data-v-95e0a5ea" u-r="audioCom" u-i="95e0a5ea-0" bind:__l="__l"></audio-com><view class="content data-v-95e0a5ea"><view class="swiperContent data-v-95e0a5ea"><swiper class="swiper data-v-95e0a5ea" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-95e0a5ea"><view class="swiper-item uni-bg-red data-v-95e0a5ea"><image class="data-v-95e0a5ea" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-95e0a5ea"><label class="data-v-95e0a5ea">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-95e0a5ea"><view class="detailsTitle data-v-95e0a5ea">{{k}}</view><view class="detailsMapPoint data-v-95e0a5ea"><view class="icoBox data-v-95e0a5ea"><image class="data-v-95e0a5ea" src="{{l}}"/></view><view class="contentText data-v-95e0a5ea">{{m}}</view></view><view class="detailsText data-v-95e0a5ea"><view class="icoBox data-v-95e0a5ea"><image class="data-v-95e0a5ea" src="{{n}}"/></view><view class="contentText data-v-95e0a5ea">{{o}}</view></view></view><view class="toNewPage data-v-95e0a5ea"><view class="btn data-v-95e0a5ea" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-95e0a5ea" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
+<audio-com wx:if="{{a}}" class="r data-v-3e19c77f" u-r="audioCom" u-i="3e19c77f-0" bind:__l="__l"></audio-com><view class="content data-v-3e19c77f"><view class="swiperContent data-v-3e19c77f"><swiper class="swiper data-v-3e19c77f" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-3e19c77f"><view class="swiper-item uni-bg-red data-v-3e19c77f"><image class="data-v-3e19c77f" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-3e19c77f"><label class="data-v-3e19c77f">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-3e19c77f"><view class="detailsTitle data-v-3e19c77f">{{k}}</view><view class="detailsMapPoint data-v-3e19c77f"><view class="icoBox data-v-3e19c77f"><image class="data-v-3e19c77f" src="{{l}}"/></view><view class="contentText data-v-3e19c77f">{{m}}</view></view><view class="detailsText data-v-3e19c77f"><view class="icoBox data-v-3e19c77f"><image class="data-v-3e19c77f" src="{{n}}"/></view><view class="contentText data-v-3e19c77f">{{o}}</view></view></view><view class="toNewPage data-v-3e19c77f"><view class="btn data-v-3e19c77f" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-3e19c77f" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/content/index.wxss b/subPackageCheckPoint/pages/content/index.wxss
index 9dabc85..6e82af8 100644
--- a/subPackageCheckPoint/pages/content/index.wxss
+++ b/subPackageCheckPoint/pages/content/index.wxss
@@ -1,2 +1,2 @@
 @import "../../app.wxss";
-.content.data-v-95e0a5ea{width:100vw;height:100vh}span.data-v-95e0a5ea{font-size:35rpx}.content .swiperContent.data-v-95e0a5ea{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-95e0a5ea{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-95e0a5ea{width:100%;height:100%}.swiper-item.data-v-95e0a5ea{width:750rpx;height:730rpx}.swiper-item>image.data-v-95e0a5ea{width:100%;height:100%}.contentDetails.data-v-95e0a5ea{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-95e0a5ea{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-95e0a5ea{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-95e0a5ea{display:flex}.detailsMapPoint .icoBox.data-v-95e0a5ea{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-95e0a5ea{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-95e0a5ea{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-95e0a5ea{object-fit:cover;width:100%;height:100%}.contentText.data-v-95e0a5ea{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-95e0a5ea{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-95e0a5ea{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-95e0a5ea{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx}
+.content.data-v-3e19c77f{width:100vw;height:100vh}span.data-v-3e19c77f{font-size:35rpx}.content .swiperContent.data-v-3e19c77f{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-3e19c77f{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-3e19c77f{width:100%;height:100%}.swiper-item.data-v-3e19c77f{width:750rpx;height:730rpx}.swiper-item>image.data-v-3e19c77f{width:100%;height:100%}.contentDetails.data-v-3e19c77f{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-3e19c77f{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-3e19c77f{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-3e19c77f{display:flex}.detailsMapPoint .icoBox.data-v-3e19c77f{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-3e19c77f{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-3e19c77f{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-3e19c77f{object-fit:cover;width:100%;height:100%}.contentText.data-v-3e19c77f{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-3e19c77f{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-3e19c77f{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-3e19c77f{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx}

From af21b820480dfd77e5922162ce80026a9d5bfaaa Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sun, 27 Apr 2025 09:25:22 +0800
Subject: [PATCH 307/471] =?UTF-8?q?=E6=9C=80=E7=BE=8E=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/imgSource.js                      |  1 +
 pages/order/scene/index.js                    | 35 +++++++++++++++++++
 subPackageCheckPoint/pages/content/index.js   |  2 +-
 subPackageCheckPoint/pages/content/index.json |  1 +
 subPackageCheckPoint/pages/content/index.wxml |  2 +-
 subPackageCheckPoint/pages/content/index.wxss |  2 +-
 utils/https.js                                |  4 +--
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 8a4e16d..0d29963 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -39,6 +39,7 @@ const imageSource = {
     // 旅游助手
     LVZS: [
         "https://static.ticket.sz-trip.com/uploads/20250423/662eb322f8851e04df41fd836c6a88f3.png",
+        // "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
         "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 48ea546..67b9896 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -527,6 +527,41 @@ Page({
 			  url: '/pages/order/orderList/index?flag='+ this.data.flag
 			})
 		}else{
+            // 5442拙政园弹弹框
+            if (this.data.product.product.scene_id == 5442) {
+                wx.showModal({
+                    content: '节假日期间出票时间可能延迟，请耐心等待，最终出票结果以平台通知为准',
+                    confirmColor:"#0B898E",
+                    success: (res)=>{
+                        if (res.confirm) {
+                            commonApi.user_post(service, postData).then(res => {
+                                if (app.globalData.kjId) {
+                                  this.setData({
+                                    kjId: null
+                                  });
+                                  app.globalData.kjId = null;
+                                }
+                                if (app.globalData.gp_id) {
+                                  this.setData({
+                                    gp_id: null
+                                  });
+                                  app.globalData.gp_id = null;
+                                }
+                                if (res.code == 1 && app.globalData.product.isGroup == 1) {
+                                  // 团购跳转到团购详情
+                                  wx.navigateTo({
+                                    url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order'
+                                  })
+                                }
+                              })
+                            
+                        } else if (res.cancel) {}
+                    },
+                })
+                
+                return
+            } 
+
 			commonApi.user_post(service, postData).then(res => {
 			  if (app.globalData.kjId) {
 			    this.setData({
diff --git a/subPackageCheckPoint/pages/content/index.js b/subPackageCheckPoint/pages/content/index.js
index 674c24c..d9964b1 100644
--- a/subPackageCheckPoint/pages/content/index.js
+++ b/subPackageCheckPoint/pages/content/index.js
@@ -1,2 +1,2 @@
 require('../../app.js');
-"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e<t.mapConfig.length;e++)if(this.tag==t.mapConfig[e].address_name){this.addressName=t.mapConfig[e].address_name,this.description=t.mapConfig[e].description,this.scopeName=t.mapConfig[e].scopeName,this.longitude=t.mapConfig[e].longitude,this.latitude=t.mapConfig[e].latitude,this.mapUrl=t.mapConfig[e].mapUrl,this.isLink(t.mapConfig[e].openUrl)||this.isWechatApp(t.mapConfig[e].openUrl)?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].openUrl):t.mapConfig[e].appUrl&&t.mapConfig[e].appUrl.trim().length>0?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].appUrl):this.openUrlBtnState=!1;for(let i=0;i<t.mapConfig[e].imgList.length;i++){let o=`${this.appInstance.globalData.baseUrl}/static/contentImg/${t.mapConfig[e].imgList[i]}.jpg`;this.imgList.push(o)}break}},isLink:t=>/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)?t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}):this.isLink(this.openUrl)?t.index.navigateTo({url:`/pages/web/index?url=${this.openUrl}`}):this.openUrl&&t.index.navigateTo({url:this.openUrl})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const n=t._export_sfc(o,[["render",function(e,o,n,a,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","3e19c77f-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-3e19c77f"]]);wx.createPage(n);
+"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e<t.mapConfig.length;e++)if(this.tag==t.mapConfig[e].address_name){this.addressName=t.mapConfig[e].address_name,this.description=t.mapConfig[e].description,this.scopeName=t.mapConfig[e].scopeName,this.longitude=t.mapConfig[e].longitude,this.latitude=t.mapConfig[e].latitude,this.mapUrl=t.mapConfig[e].mapUrl,t.mapConfig[e].appUrl&&t.mapConfig[e].appUrl.trim().length>0?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].appUrl):this.isLink(t.mapConfig[e].openUrl)||this.isWechatApp(t.mapConfig[e].openUrl)?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].openUrl):this.openUrlBtnState=!1;for(let i=0;i<t.mapConfig[e].imgList.length;i++){let o=`https://jdsz.ispush.com/static/contentImg/${t.mapConfig[e].imgList[i]}.jpg`;this.imgList.push(o)}break}},isLink:t=>/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)?t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}):this.isLink(this.openUrl)?t.index.navigateTo({url:`/pages/web/index?url=${this.openUrl}`}):this.openUrl&&t.index.navigateTo({url:this.openUrl})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const n=t._export_sfc(o,[["render",function(e,o,n,a,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","b48e95cf-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-b48e95cf"]]);wx.createPage(n);
diff --git a/subPackageCheckPoint/pages/content/index.json b/subPackageCheckPoint/pages/content/index.json
index 8110852..e1f28c0 100644
--- a/subPackageCheckPoint/pages/content/index.json
+++ b/subPackageCheckPoint/pages/content/index.json
@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "君到苏州最美打卡点",
+  "navigationStyle": "default",
   "usingComponents": {
     "audio-com": "../../components/audioCom"
   }
diff --git a/subPackageCheckPoint/pages/content/index.wxml b/subPackageCheckPoint/pages/content/index.wxml
index 5c37f54..156a968 100644
--- a/subPackageCheckPoint/pages/content/index.wxml
+++ b/subPackageCheckPoint/pages/content/index.wxml
@@ -1 +1 @@
-<audio-com wx:if="{{a}}" class="r data-v-3e19c77f" u-r="audioCom" u-i="3e19c77f-0" bind:__l="__l"></audio-com><view class="content data-v-3e19c77f"><view class="swiperContent data-v-3e19c77f"><swiper class="swiper data-v-3e19c77f" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-3e19c77f"><view class="swiper-item uni-bg-red data-v-3e19c77f"><image class="data-v-3e19c77f" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-3e19c77f"><label class="data-v-3e19c77f">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-3e19c77f"><view class="detailsTitle data-v-3e19c77f">{{k}}</view><view class="detailsMapPoint data-v-3e19c77f"><view class="icoBox data-v-3e19c77f"><image class="data-v-3e19c77f" src="{{l}}"/></view><view class="contentText data-v-3e19c77f">{{m}}</view></view><view class="detailsText data-v-3e19c77f"><view class="icoBox data-v-3e19c77f"><image class="data-v-3e19c77f" src="{{n}}"/></view><view class="contentText data-v-3e19c77f">{{o}}</view></view></view><view class="toNewPage data-v-3e19c77f"><view class="btn data-v-3e19c77f" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-3e19c77f" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
+<audio-com wx:if="{{a}}" class="r data-v-b48e95cf" u-r="audioCom" u-i="b48e95cf-0" bind:__l="__l"></audio-com><view class="content data-v-b48e95cf"><view class="swiperContent data-v-b48e95cf"><swiper class="swiper data-v-b48e95cf" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-b48e95cf"><view class="swiper-item uni-bg-red data-v-b48e95cf"><image class="data-v-b48e95cf" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-b48e95cf"><label class="data-v-b48e95cf">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-b48e95cf"><view class="detailsTitle data-v-b48e95cf">{{k}}</view><view class="detailsMapPoint data-v-b48e95cf"><view class="icoBox data-v-b48e95cf"><image class="data-v-b48e95cf" src="{{l}}"/></view><view class="contentText data-v-b48e95cf">{{m}}</view></view><view class="detailsText data-v-b48e95cf"><view class="icoBox data-v-b48e95cf"><image class="data-v-b48e95cf" src="{{n}}"/></view><view class="contentText data-v-b48e95cf">{{o}}</view></view></view><view class="toNewPage data-v-b48e95cf"><view class="btn data-v-b48e95cf" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-b48e95cf" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/content/index.wxss b/subPackageCheckPoint/pages/content/index.wxss
index 6e82af8..fc6c398 100644
--- a/subPackageCheckPoint/pages/content/index.wxss
+++ b/subPackageCheckPoint/pages/content/index.wxss
@@ -1,2 +1,2 @@
 @import "../../app.wxss";
-.content.data-v-3e19c77f{width:100vw;height:100vh}span.data-v-3e19c77f{font-size:35rpx}.content .swiperContent.data-v-3e19c77f{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-3e19c77f{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-3e19c77f{width:100%;height:100%}.swiper-item.data-v-3e19c77f{width:750rpx;height:730rpx}.swiper-item>image.data-v-3e19c77f{width:100%;height:100%}.contentDetails.data-v-3e19c77f{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-3e19c77f{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-3e19c77f{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-3e19c77f{display:flex}.detailsMapPoint .icoBox.data-v-3e19c77f{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-3e19c77f{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-3e19c77f{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-3e19c77f{object-fit:cover;width:100%;height:100%}.contentText.data-v-3e19c77f{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-3e19c77f{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-3e19c77f{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-3e19c77f{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx}
+.content.data-v-b48e95cf{width:100vw;height:100vh}span.data-v-b48e95cf{font-size:35rpx}.content .swiperContent.data-v-b48e95cf{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-b48e95cf{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-b48e95cf{width:100%;height:100%}.swiper-item.data-v-b48e95cf{width:750rpx;height:730rpx}.swiper-item>image.data-v-b48e95cf{width:100%;height:100%}.contentDetails.data-v-b48e95cf{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-b48e95cf{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-b48e95cf{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-b48e95cf{display:flex}.detailsMapPoint .icoBox.data-v-b48e95cf{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-b48e95cf{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-b48e95cf{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-b48e95cf{object-fit:cover;width:100%;height:100%}.contentText.data-v-b48e95cf{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-b48e95cf{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-b48e95cf{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-b48e95cf{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx}
diff --git a/utils/https.js b/utils/https.js
index 0dc3ef0..fd37f47 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -331,9 +331,9 @@ const checkLogin = () => {
     }
     console.log(appData,page)
     if(appData.globalData.configJson.isTest) {
-        if (page[page.length - 1].route != 'pages/user/user') {
+        
             return
-        }
+        
     }
 
 

From 99cd1a368ef4f4267c2f434cf3786f4274bbdc73 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 30 Apr 2025 09:42:30 +0800
Subject: [PATCH 308/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                       |    8 +-
 pages/index/imgSource.js       |  150 ++---
 pages/index/index.js           |  911 ++++++++++++++++-----------
 pages/index/index.wxml         | 1050 +++++++++++---------------------
 pages/index/index.wxss         |  647 +++++++++++++++-----
 subPackages/index/imgSource.js |  150 +++--
 subPackages/index/index.js     |   29 +-
 subPackages/index/index.wxml   |   72 ++-
 subPackages/index/index.wxss   |   39 +-
 9 files changed, 1665 insertions(+), 1391 deletions(-)

diff --git a/app.json b/app.json
index 5347794..ac4fa44 100644
--- a/app.json
+++ b/app.json
@@ -245,26 +245,26 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#999999",
-    "selectedColor": "#169D7E",
+    "selectedColor": "#D22A1C",
     "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
         "iconPath": "/images/index.png",
-        "selectedIconPath": "/images/index_seld_1.png",
+        "selectedIconPath": "/images/aindex_seld.png",
         "text": "首页",
         "shareTimeline": true
       },
       {
         "pagePath": "pages/map/index",
         "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/map_seld_1.png",
+        "selectedIconPath": "/images/amap_seld.png",
         "text": "图游"
       },
       {
         "pagePath": "pages/user/user",
         "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/user_seld_1.png",
+        "selectedIconPath": "/images/auser_seld.png",
         "text": "我的"
       }
     ]
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 0d29963..588f666 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -1,116 +1,84 @@
 const imageSource = {
     // 活动日历、场馆预约等
     mainFunImgs: [
-        "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/c69cdbafb16ed468fef68eb77865e6ff.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/05dd30d02e74178134242cc64aaa11ac.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/e93e655b524001d25d7d4fd848f5bb3b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
-
-        "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/e2cc47fa5a2d01d436dad0a85948f060.png",
-        "https://static.ticket.sz-trip.com/jundaosuzhou/images/spring2025/ssy.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/a094d635976194782fbdcf2bc596b082.png",
-        "https://static.ticket.sz-trip.com/uploads/20250314/5238f9ee4762266abf0c279501ea4028.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
     ],
     // 数字文旅
     SZWL: [
         // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
         // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
-        "https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/1994615fcbc125da641541ea1f04c364.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/f054ca452f27dac54723255ba6445790.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/590822c40c769cb4f673f460f1a37a0b.png",
-
-        "https://static.ticket.sz-trip.com/uploads/20250312/41c21568ed9c4b15084c9669ca99a6fd.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/1ee056f091a42e51ce8168767704708a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/b418843c04ddfa00be91fb793019cb99.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
         
-       
-        "https://static.ticket.sz-trip.com/uploads/20250312/0ad69db116004e735e1bd13cd54fd75c.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/f2400b009c8e92efcdd645080f14b28a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/bbda2dd4e332f457a6aa06a4a15b639b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/06b500881204a4a40c5bc8d126f38a58.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20250312/d188c19334c9170e5c963459b7187f20.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/a25506779b745291cb8d9051abce07c1.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+        
+        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
 
     ],
     // 旅游助手
     LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20250423/662eb322f8851e04df41fd836c6a88f3.png",
-        // "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
     ],
     // 公共服务
     GGFW: [
-        "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/9799b276d76f884fd0130d7378c974fe.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/c40b456687490eafe5414addaaae0c2b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/a95959dcba2f494b69980d16a895e9c8.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/e16b8e640169e99639cef6ff7897b6a7.png"
+        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
     ],
     
     // 十全十美
     SQSM: [
         // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-        "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
-
-        
+        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
 
     ],
 
     // 长三角文旅平台
     CSJWLPT: [
-        {
-            "name":"玉见昆山",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/40319f04a78f25c2741e4ce11b375597.png",
-            "type":"mini",
-            "path":"",
-            "appid":"wx8888a3fd0862b4c8"
-        },
-        {
-            "name":"智游常熟",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/619870022ca676c31d2d6395f81dd3d7.png",
-            "type":"mini",
-            "path":"",
-            "appid":"wxdaf3d5edd07dc7af"
-        },
-        {
-            "name":"常享游",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
-            "type":"h5",
-            "url":"https://tour.wlczy.com/h5/"
-        },
-        {
-            "name":"畅游宿迁",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
-            "type":"mini",
-            "path":"/pages/index/index",
-            "appid":"wxcb00a59c4fba136e"
-        },
-
-
+        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
     ],
 
     // 导航标题侧边图片
     CBTP: [
-        "https://static.ticket.sz-trip.com/uploads/20250314/5d051d37148757eb5daa6e51439e711a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250314/d47ce5d4f2a780f46192afeb715d873d.png",
-        "",
-        "https://static.ticket.sz-trip.com/uploads/20250314/03413a9bd8a0b7a99141903e04cbc05f.png",
-        "https://static.ticket.sz-trip.com/uploads/20250314/1075c176fb20563a48945fce020db57f.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
+        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
+        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
     ],
 
     // 其他后台配置的图片，开发时使用
@@ -119,23 +87,23 @@ const imageSource = {
              // 头图
              topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
             // ai伴你游
-            ai: "https://static.ticket.sz-trip.com/uploads/20250314/3fb020cf3471d3731b4a7efae25e8e64.png",
+            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
             // ai避高峰
-            avoid: "https://static.ticket.sz-trip.com/uploads/20250314/8c0f1c421b1de36265948d52c249dc57.png",
+            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
             // 新品特惠
-            xpth: "https://static.ticket.sz-trip.com/uploads/20250314/349596880742665ac7249b5f4218263f.png",
+            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
             // 文旅鉴赏
-            wlcx: "https://static.ticket.sz-trip.com/uploads/20250314/073759b9fcd3e217de9ecea774451364.png",
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
             // 出行助手
-            lyzs: "https://static.ticket.sz-trip.com/uploads/20250314/7f5d199286e62ba6c9d43fdfd6f55de3.png",
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
             // 公共服务
-            ggfw: "https://static.ticket.sz-trip.com/uploads/20250314/271ffedb33dcfacf170ff78c1425f9cf.png",
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
             // 十全十美
-            sqj: "https://static.ticket.sz-trip.com/uploads/20250314/edceba87f00e37ef50cf6a9fafb8a29f.png",
+            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
             // 长三角文旅平台
-            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20250314/c88a44d385e0bf36370475ace8e5669e.png",
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
             // 热门推荐
-            rmtj: "https://static.ticket.sz-trip.com/uploads/20250314/dcc02bb22b721e281037cecf22e74728.png",
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
             
         }
     },
diff --git a/pages/index/index.js b/pages/index/index.js
index 0fd2d47..c06f78d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,16 +1,11 @@
 //index.js
 //获取应用实例
 let app = getApp()
-import imageSource from "./imgSource"
-
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
-import https from "../../utils/https.js"
-
 Page({
 	data: {
-        bannerInterver: 1000*60,
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -22,7 +17,9 @@ Page({
 		fourProduct: [],
 		hotIndex: 0,
 		indexHot: [],
-		
+		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
+			"gongyeyuanqu", "gaoxin"
+		],
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -36,9 +33,8 @@ Page({
 		videoPrize: false,
 		prizeInfo: null,
 		otherPlat: null,
-		activeBannerIndex: 0,
-        smBannerIndex: 0,
-        XPathBannerIndex: 0,
+		activeBannerIndex: 5,
+		smBannerIndex: 0,
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -52,46 +48,100 @@ Page({
 		showTime: false,
 		xpth: {}, // 元旦新增 新品特惠和sqjNew
 		djs: null, // 元旦新增 新品特惠倒计时
-        djsTime: null,
-        area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+		djsTime: null,
 		sqjNew: [
-            'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓
-            'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山
-            'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江
-            'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区
-            'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港
-            'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中
-            'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城
-            'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
+			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
+			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
 		],
 		viewHeight: "0px",
 		isMuted: true,
-        videoPlay: false,
-
-        // 页面图片
-        imageSourceList:imageSource,
+    videoPlay: false,
+    hdrlNavList:[
+      {
+        type:null,
+        title:'全部'
+      },
+      {
+        type:'scene',
+        title:'景区活动'
+      },
+      {
+        type:'show',
+        title:'演出'
+      },
+      {
+        type:'exhibition',
+        title:'展览'
+      },
+      {
+        type:'movie',
+        title:'电影'
+      },
+      {
+        type:'other',
+        title:'其他'
+      }
+    ], //活动日历板块导航分类
+    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+    today:null,
+    hdrlList:[],
+    yszNav:['公共服务','旅游助手'],
+    yszIndex:0,
+    bdList:[
+        {
+            bg: 'linear-gradient(-8deg,#f4f9ff,#b9e1f0)',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250429/069ab247bb2ab5a08fa7707d671b1ac5.png', //游 景点
+            url:'',
+            path:'/pages/list/scene/index',
+            list: [],
+            
+        },
+        {
+            bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
+            path:'/pages/list/night/index',
+            url:'',
+            list: [],
+            
+        },
+        {
+            bg: 'linear-gradient(172deg, #F08528, #D1201B);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250429/9928f46523fd57233b6ef3371a6ba460.png', //非看不可
+            url:'',
+            path:'/pages/list/theatre/index',
+            list: [],
+            
+        },
+        {
+            bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
+            icon:'https://static.ticket.sz-trip.com/uploads/20250429/a4f53072aa51a387593a183799b902e6.png', //非买不可
+            path:'/subPackages/techanNew/index',
+            url:'',
+            list: [],
+            
+        },
+      
+      
+    ],
+    list1:[], //游-景点
+    list2:[], //非晚-夜游
+    list3:[], //非看-剧场演出
+    list4:[], //非买-文创
+    
+    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)],
 
-        // 酒店住宿配置链接   /pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/carPurchase
-        hotelUrl: ''
+    isMayDay: new Date().getTime()>new Date('2025/05/01 00:00:00').getTime()
+    
 	},
 	onLoad: function(options) {
-        console.log('onload')
-
-        wx.getLocation({type: 'gcj02'})
-           
-		console.log('options',options)
-		// 相城小程序跳转获取用户信息
-		if(options && options.szxcCode) {
-			commonApi._post("uservice/user/loginByXC", {
-				code: options.szxcCode
-			}).then(res => {
-				if(res.data && res.data.id && res.data.token) {
-				  https.set_logininfo(res);
-				}
-			})
-		}
 		this.getHeight()
 		//全屏广告
 		wx.hideTabBar() //这里隐藏了底部导航栏
@@ -103,9 +153,11 @@ Page({
 				let length = res.data.length
 				if (res.data.length > 1) {
 					let num = Math.floor(Math.random() * length);
+					console.log('num', num);
 					this.setData({
 						startList: res.data[num]
 					})
+					console.log(this.data.startList.head_img);
 				} else {
 					this.setData({
 						startList: res.data[0]
@@ -148,7 +200,21 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-		}
+    }
+    // 获取今天的日期
+		let today = new Date();
+		this.setData({
+			month: (this.data.months[today.getMonth()]).toUpperCase(),
+			date: today.getDate()
+		})
+    let d = new Date();
+    let month = d.getMonth() + 1,
+      day = d.getDate();
+    month = month > 10 ? month : ("0" + month);
+    day = day > 10 ? day : ("0" + day);
+    this.setData({
+      today: d.getFullYear() + "-" + month + "-" + day
+    })
 		let systemInfo = wx.getSystemInfoSync(),
 			rect = wx.getMenuButtonBoundingClientRect();
 		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
@@ -159,10 +225,12 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			},
 			fail: (err) => {
-				this.getList()
+        this.getList()
+        this.getHdrlList()
 			}
 		})
 		this.setData({
@@ -181,99 +249,251 @@ Page({
 		})
 		this.getTwoProduct()
 		this.getBanner()
-		this.getWeather()
-		// 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
+    this.getWeather()
+  },
+  gobdDetail(e) {
+    let item = e.currentTarget.dataset.item
+    // wx.navigateTo({
+    //   url: url
+    // })
+    util.gotoDetail(item)
+  },
+  getList() {
+    let bdList = this.data.bdList
+    // 游--景点
+    commonApi._post("scene/get_scene_by_tag",{
+      tag_id:"4",
+      limit:6,
+      lon:this.data.lon,
+      lat:this.data.lat,
+      offset:0,
+      sort:"weight",
+      title:'',
+      area_id:''
+    }).then(res=>{
+      console.log('景点', res)
+      res.data.list.map(item => {
+        if (item.distance || item.distance == 0) {
+          if (item.distance >= 1000) {
+            item.distance = (item.distance / 1000).toFixed(2) + 'km';
+          } else {
+            item.distance = (item.distance).toFixed(2) + 'm';
+          }
+        }
+      })
+      bdList[0].list = res.data.list
+      this.setData({
+        list1:res.data.list,
+        bdList: bdList
+      })
+    })
+    // 非买不可--文创
+    commonApi._post('product/get_product_by_tag_subject',{
+      offset: 0,
+      limit: 6,
+      tag_id: 60,
+    }).then(res=>{
+        bdList[3].list = res.data.list
+      this.setData({
+        list4:res.data.list,
+        bdList: bdList
+      })
+    })
+    // 非玩不可--线路一日游
+    commonApi._post('product/get_product_by_tag_subject',{
+      tag_id: "58",
+      offset: 0,
+      limit: 6,
+    }).then(res=>{
+        bdList[1].list = res.data.list
+      this.setData({
+        list2:res.data.list,
+        bdList: bdList
+      })
+    })
+    // 非看不可--剧场演出
+    commonApi._post("product/get_product_by_tag_subject",{
+      tag_id:"59",
+      offset:0,
+      limit:6,
+    }).then(res=>{
+        bdList[2].list = res.data.list
+      this.setData({
+        list3:res.data.list,
+        bdList: bdList
+      })
+    })
+  },
+  goDetail(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+    if (type == 'movie') {
+      wx.navigateTo({
+        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/info/activityInfo/index?id=' + item.id,
+      })
+    }
+  },
+  // 分类为电影时调这个接口
+  getMovieList() {
+    let service = "Cinema/getHotMovieList";
+		let data = {
+			page: 1,
+			pageSize: 5
+    };
+    commonApi._post(service, data).then(res => {
+      console.log(res.data);
+			this.setData({
+				hdrlList: res.data
+			})
+    })
+    console.log(this.data.hdrlList);
+  },
+  // 推荐榜单更多跳转
+  moreBtn(e) {
+    let item = e.currentTarget.dataset.item
+    if (item.path!='') {
+      wx.navigateTo({
+        url: item.path,
+      })
+    } else {
+      // if (e.currentTarget.dataset.event) {
+      //   this.pagePoint({
+      //     event: e.currentTarget.dataset.event
+      //   }, 1)
+      // }
+      let url = item.url;
+      app.globalData.weburl = url;
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+      })
+    }
+  },
+  // 活动日历下的列表
+  getHdrlList() {
+    commonApi._post('pbservice/Actcalendar/getActList', {
+      page_no: 1,
+      date: this.data.today,
+      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+      keywords: '',
+      area_key: '',
+      lat: this.data.lat,
+      lon: this.data.lon,
+      page_num: 5
+    }).then(res => {
+        res.data.rows.forEach(v=>{
+            if (!v.post_url) {
+                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+            }
         })
-        // 调用接口如果token过期会导致一进入就要登陆
-		// this.getVideoPrize()
-		this.getXpthList()
-	},
+      this.setData({
+        hdrlList:res.data.rows
+      })
+    })
+  },
+  // 切换活动日历分类
+  changeHdrlNav(e) {
+    console.log(e.currentTarget.dataset);
+    this.setData({
+      hdrlList:[],
+      hdrlNavIndex:e.currentTarget.dataset.index,
+    })
+    if (this.data.hdrlNavIndex == 4) {
+      this.getMovieList()
+    } else {
+      this.getHdrlList() //切换分类重新获取活动日历列表
+    }
+  },
+  // 游苏州下的公共服务和旅游助手切换
+  changeType(e) {
+    this.setData({
+      yszIndex:e.currentTarget.dataset.index,
+    })
+  },
+  xlzs: function (e) {
+
+    wx.navigateToMiniProgram({
+      appId: 'wx757dd1ee184e75e9',
+      page: "pages/tabBar/index/index"
+    })
+  },
+  // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
 		wx.getSystemInfo({
 			success(res) {
+				console.log(res)
 				that.setData({
 					viewHeight: res.windowHeight + 'px'
 				})
+				console.log(that.data.viewHeight)
 			}
 		})
 	},
-	getXpthList: function() {
-		// 元旦新增 新品特惠
-		commonApi._post("product/get_product_indulgence", {
-			tag_id: 275,
-            typeId: 3,
-            type: 1, // 返回数组
-		}).then(res => {
-            // res.data.adv = [res.data.adv]
-			this.setData({
-				xpth: res.data,
-				djsTime: res.data.time
-			})
-			let time = setInterval(() => {
-				this.setData({
-					djsTime: this.data.djsTime - 1
-				})
-				this.formatDate(this.data.djsTime)
-			}, 1000)
-			if (this.data.djsTime == 0) {
-				clearInterval(time)
-			}
-		})
-	},
+	// getXpthList: function() {
+	// 	// 元旦新增 新品特惠
+	// 	commonApi._post("product/get_product_indulgence", {
+	// 		tag_id: 275,
+	// 		typeId: 3,
+	// 	}).then(res => {
+	// 		console.log('data', res.data);
+	// 		this.setData({
+	// 			xpth: res.data,
+	// 			djsTime: res.data.time
+	// 		})
+	// 		let time = setInterval(() => {
+	// 			this.setData({
+	// 				djsTime: this.data.djsTime - 1
+	// 			})
+	// 			this.formatDate(this.data.djsTime)
+	// 		}, 1000)
+	// 		if (this.data.djsTime == 0) {
+	// 			clearInterval(time)
+	// 		}
+	// 	})
+	// },
 	// 元旦新品特惠 倒计时 
-	formatDate: function(oTime) {
-		let h = parseInt(oTime / 3600)
-		let m = parseInt((oTime % 3600) / 60)
-		let s = parseInt(oTime % 60)
-		h = h < 10 ? "0" + h : h;
-		m = m < 10 ? "0" + m : m;
-		s = s < 10 ? "0" + s : s;
-		this.setData({
-			djs: {
-				h: h,
-				m: m,
-				s: s
-			}
-		})
-		return
-	},
-	goFeiyi: function() {
-		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-		wx.navigateTo({
-			url: "/pages/pbService/web/index"
-		})
-	},
-	onTabItemTap: function(e) {
-		console.log(e, 99999999)
-	},
+	// formatDate: function(oTime) {
+	// 	let h = parseInt(oTime / 3600)
+	// 	let m = parseInt((oTime % 3600) / 60)
+	// 	let s = parseInt(oTime % 60)
+	// 	h = h < 10 ? "0" + h : h;
+	// 	m = m < 10 ? "0" + m : m;
+	// 	s = s < 10 ? "0" + s : s;
+	// 	this.setData({
+	// 		djs: {
+	// 			h: h,
+	// 			m: m,
+	// 			s: s
+	// 		}
+	// 	})
+	// 	return
+	// },
+  // 非遗跳转
+  // goFeiyi: function() {
+	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
+	// 	wx.navigateTo({
+	// 		url: "/pages/pbService/web/index"
+	// 	})
+	// },
+	// onTabItemTap: function(e) {
+	// 	console.log(e, 99999999)
+  // },
+  // 大轮播的监听方法
 	changeBannerIndex: function(e) {
 		this.setData({
-            activeBannerIndex: e.detail.current,
-            bannerInterver: 5000
+			activeBannerIndex: e.detail.current
 		})
-	},
+  },
+  // 小轮播监听方法
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
-    },
-    changeXPathBannerIndex: function(e) {
-		this.setData({
-			XPathBannerIndex: e.detail.current
-		})
-    },
-    xlzs: function (e) {
-
-        wx.navigateToMiniProgram({
-          appId: 'wx757dd1ee184e75e9',
-          page: "pages/tabBar/index/index"
-        })
-      },
+	},
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -351,14 +571,10 @@ Page({
 		this.setData({
 			indexHot: app.globalData.configJson.indexHot,
 			isTest: app.globalData.configJson.isTest,
-            otherPlat: app.globalData.configJson.otherPlats,
-            // 正式数据
-            indexSeason: app.globalData.configJson.indexSeason,
-            // 开发数据
-            // indexSeason: imageSource.testImgs.indexSeason
+			otherPlat: app.globalData.configJson.otherPlats,
+			indexSeason: app.globalData.configJson.indexSeason
 		})
-        this.getFourProduct()
-        console.log(this.data)
+		this.getFourProduct()
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
@@ -404,6 +620,7 @@ Page({
 	},
 	getWeather: function() {
 		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			console.log(res)
 			this.setData({
 				weather: res.data
 			})
@@ -501,6 +718,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
+    console.log(e)
 		// if (e.currentTarget.dataset.event) {
 		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
 		//     wx.navigateToMiniProgram({
@@ -526,19 +744,13 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-		// 	wx.navigateToMiniProgram({
-		// 		appId: 'wxdd39069b9a91dbfe',
-		// 		path: 'pages/index/index'
-		// 	})
-		// 	return;
-		} else if (e.currentTarget.dataset.title == 'e读书') {
+		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
 			wx.navigateToMiniProgram({
-				appId: 'wx26e6f4c0baba005b',
+				appId: 'wxdd39069b9a91dbfe',
 				path: 'pages/index/index'
 			})
 			return;
-		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
+		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
 			wx.navigateToMiniProgram({
 				appId: 'wx8888a3fd0862b4c8',
 				path: 'pages/index/index'
@@ -584,14 +796,15 @@ Page({
 	},
 	// 元旦  新品特惠部分
 	goBanner: function(e) {
+		console.log('新品特惠', e.currentTarget.dataset.url);
 		let url = e.currentTarget.dataset.url;
-        app.globalData.weburl = url;
-        console.log(url)
+		app.globalData.weburl = url;
 		wx.navigateTo({
 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
 		})
 	},
 	gotoUrl: function(e) {
+		console.log(e)
 		if (e.currentTarget.dataset.event) {
 			this.pagePoint({
 				event: e.currentTarget.dataset.event
@@ -603,8 +816,8 @@ Page({
 			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
-	},
-	// 实时路况跳转外链
+    },
+    	// 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -644,6 +857,7 @@ Page({
 	},
 	gotoSku: function() {
 		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+			console.log(res)
 			app.globalData.weburl = res.data.url;
 			wx.navigateTo({
 				url: '/pages/pbService/web/index'
@@ -665,33 +879,33 @@ Page({
 		})
 	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	getList: function() {
-		if (!this.data.listMore) return;
-		commonApi._post("search/recommend", {
-			offset: this.data.list.length,
-			limit: 16
-		}).then(res => {
-			res.data.map(item => {
-				if (item.ext.display_tags) {
-					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-				} else {
-					item.ext.display_tags = []
-				}
-			})
-			if (res.data.length < 15) {
-				this.setData({
-					listMore: false
-				})
-			}
-			this.setData({
-				list: this.data.list.concat(res.data)
-			})
-		})
-	},
+	// getList: function() {
+	// 	if (!this.data.listMore) return;
+	// 	commonApi._post("search/recommend", {
+	// 		offset: this.data.list.length,
+	// 		limit: 16
+	// 	}).then(res => {
+	// 		res.data.map(item => {
+	// 			if (item.ext.display_tags) {
+	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
+	// 			} else {
+	// 				item.ext.display_tags = []
+	// 			}
+	// 		})
+	// 		if (res.data.length < 15) {
+	// 			this.setData({
+	// 				listMore: false
+	// 			})
+	// 		}
+	// 		this.setData({
+	// 			list: this.data.list.concat(res.data)
+	// 		})
+	// 	})
+	// },
 	onReachBottom: function() {
-		if (this.data.list.length < 30) {
-			this.getList()
-		}
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+		// }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -742,6 +956,7 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
+					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -750,6 +965,7 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
+					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -766,6 +982,7 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
+						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -808,6 +1025,7 @@ Page({
 	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
+		console.log(e.currentTarget.dataset.path);
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
 		wx.navigateTo({
@@ -815,189 +1033,190 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	bannerClick2: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.action == 'href') {
-			if (item.href.indexOf(",") != -1) {
-				let info = item.href.split(",");
-				wx.navigateToMiniProgram({
-					appId: info[0],
-					path: info[1]
-				})
-			} else if (item.href.indexOf('map/index') != -1) {
-				wx.reLaunch({
-					url: item.href
-				})
-			} else {
-				wx.navigateTo({
-					url: item.href,
-				})
-			}
-		} else if (item.action == "web") {
-			app.globalData.weburl = item.href;
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-			})
-		}
-	},
+	// bannerClick2: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.action == 'href') {
+	// 		if (item.href.indexOf(",") != -1) {
+	// 			let info = item.href.split(",");
+	// 			wx.navigateToMiniProgram({
+	// 				appId: info[0],
+	// 				path: info[1]
+	// 			})
+	// 		} else if (item.href.indexOf('map/index') != -1) {
+	// 			wx.reLaunch({
+	// 				url: item.href
+	// 			})
+	// 		} else {
+	// 			wx.navigateTo({
+	// 				url: item.href,
+	// 			})
+	// 		}
+	// 	} else if (item.action == "web") {
+	// 		app.globalData.weburl = item.href;
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
+	// 		})
+	// 	}
+	// },
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// 获取短视频大赛是否中奖 中奖详情
-	getVideoPrize() {
-		let user_id = wx.getStorageSync('jstrip_userid');
-        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-		commonApi.user_post('actonline/video_act/getRaffle', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				videoPrize: res.data
-			})
-		})
-	},
-	noMoreTip() {
-		wx.setStorageSync('indexPriceNoTip', true)
-		this.closePrice()
-	},
-	closePrice() {
-		this.setData({
-			videoPrize: false,
-			prizeInfo: null
-		})
-	},
+	// // 获取短视频大赛是否中奖 中奖详情
+	// getVideoPrize() {
+	// 	let user_id = wx.getStorageSync('jstrip_userid');
+	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
+	// 	commonApi.user_post('actonline/video_act/getRaffle', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			videoPrize: res.data
+	// 		})
+	// 	})
+	// },
+	// noMoreTip() {
+	// 	wx.setStorageSync('indexPriceNoTip', true)
+	// 	this.closePrice()
+	// },
+	// closePrice() {
+	// 	this.setData({
+	// 		videoPrize: false,
+	// 		prizeInfo: null
+	// 	})
+	// },
 	// 抽奖
-	choosePrize() {
-		commonApi.user_post('actonline/video_act/luckyDraw', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				prizeInfo: res.data
-			})
-			if (res.data.type != 'none') {
-				// 抽奖成功的话 弹框
-				wx.showModal({
-					title: "提示",
-					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-					showCancel: false
-				})
-			}
-		})
-	},
-	bannerJumpNew(item) {
-		let that = this
-		item = item.currentTarget.dataset.item
-		if (item.tdata == '') return
-		that.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index"
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index"
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return
-	},
+	// choosePrize() {
+	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
+	// 		act_id: 5
+	// 	}).then(res => {
+	// 		this.setData({
+	// 			prizeInfo: res.data
+	// 		})
+	// 		if (res.data.type != 'none') {
+	// 			// 抽奖成功的话 弹框
+	// 			wx.showModal({
+	// 				title: "提示",
+	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
+	// 				showCancel: false
+	// 			})
+	// 		}
+	// 	})
+	// },
+	// bannerJumpNew(item) {
+	// 	let that = this
+	// 	item = item.currentTarget.dataset.item
+	// 	if (item.tdata == '') return
+	// 	that.pagePoint({
+	// 		event: "banner_click",
+	// 		type: 'banner'
+	// 	}, 1)
+	// 	switch (item.jump_type) {
+	// 		case 0:
+	// 			break;
+	// 		case 1:
+	// 			util.gotoDetail(item.product_model)
+	// 			break;
+	// 		case 2:
+	// 			if (item.front_model && item.front_model.mini) {
+	// 				wx.navigateTo({
+	// 					url: "/" + item.front_model.mini
+	// 				})
+	// 			}
+	// 			break;
+	// 		case 3:
+	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+	// 				// 外部h5
+	// 				console.log(item.tdata)
+	// 				app.globalData.weburl = item.tdata.url;
+	// 				wx.navigateTo({
+	// 					url: "/pages/pbService/web/index"
+	// 				})
+	// 			} else {
+	// 				let page = item.tdata.url.split("/");
+	// 				page = page[page.length - 1].split("?")
+	// 				console.log(page[0])
+	// 				let url = this.data.urltopage[page[0]];
+	// 				if (url && url.indexOf('map') != -1) {
+	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+	// 							'cinema', 'academes'
+	// 						],
+	// 						type = page[1] ? page[1].split("=") : [];
+	// 					wx.reLaunch({
+	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
+	// 					})
+	// 				} else if (url) {
+	// 					wx.navigateTo({
+	// 						url: url,
+	// 					})
+	// 				} else {
+	// 					app.globalData.weburl = item.tdata.url;
+	// 					wx.navigateTo({
+	// 						url: "/pages/pbService/web/index"
+	// 					})
+	// 				}
+	// 			}
+	// 			break;
+	// 		case 4:
+	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+	// 				// 如果是苏心游的小程序 直接把authCode带过去
+	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+	// 					let weburl = item.tdata.page
+	// 					if (weburl.indexOf('?') != -1) {
+	// 						weburl += '&authCode=' + res.data;
+	// 					} else {
+	// 						weburl += '?authCode=' + res.data
+	// 					}
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: weburl
+	// 					})
+	// 				}).catch(err => {
+	// 					wx.navigateToMiniProgram({
+	// 						appId: item.tdata.appid,
+	// 						path: item.tdata.page
+	// 					})
+	// 				})
+	// 			} else {
+	// 				wx.navigateToMiniProgram({
+	// 					appId: item.tdata.appid,
+	// 					path: item.tdata.page
+	// 				})
+	// 			}
+	// 			break;
+	// 		default:
+	// 			break;
+	// 	}
+	// 	return
+	// },
 	onReady: function() {
 
 
 	},
-	gotoOther: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.type == 'h5') {
-			app.globalData.weburl = item.url
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-			})
-		} else if (item.type == 'mini') {
-			wx.navigateToMiniProgram({
-				appId: item.appid,
-				path: item.path
-			})
-		} else if (item.type == 'page') {
-			wx.navigateTo({
-				url: item.page,
-			})
-		}
-	},
+	// gotoOther: function(e) {
+	// 	let item = e.currentTarget.dataset.item;
+	// 	if (item.type == 'h5') {
+	// 		app.globalData.weburl = item.url
+	// 		wx.navigateTo({
+	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+	// 		})
+	// 	} else if (item.type == 'mini') {
+	// 		wx.navigateToMiniProgram({
+	// 			appId: item.appid,
+	// 			path: item.path
+	// 		})
+	// 	} else if (item.type == 'page') {
+	// 		wx.navigateTo({
+	// 			url: item.page,
+	// 		})
+	// 	}
+	// },
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
-
 		if (app.globalData.loadIndexSeason) {
 			this.getIndexSeason()
 		} else {
@@ -1012,31 +1231,7 @@ Page({
 
 		this.pagePoint({
 			event: 'home_view'
-        }, 1)
-        
-        if(!this.data.hotelUrl) {
-        commonApi._post("pbservice/Other/getClientConfig", {
-            unique_key: "wechatxcx"
-          }).then(res => {
-              try {
-                let data = JSON.parse(res.data);
-                if (data.hotelUrl) {
-                    this.setData({
-                        hotelUrl: data.hotelUrl
-                    })
-                }
-              } catch(e) {
-                this.setData({
-                    hotelUrl: '/pages/list/hotel/index'
-                })
-              }
-          }).catch(err => {
-              this.setData({
-                  hotelUrl: '/pages/list/hotel/index'
-              })
-          })
-        }
-
+		}, 1)
 		// this.data.time!=5?wx.showTabBar():1
 	},
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3eb48fc..29f0126 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,725 +1,409 @@
-<!--index.wxml-->
+<!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
-<!-- <view class="old-btn">关怀模式</view> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
 <!-- 后台获取的季节动图 -->
-<view wx:if="{{!isTest}}">
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-    <view class="weather-num">{{weather.max_temp}}°</view>
-    <view class="weather">{{weather.weather}}</view>
-    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-        mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20250429/1c137d2a4e74ea71a55bd74bb530560f.png" mode="widthFix"></image>
+<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
+  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <view class="weather-num">{{weather.max_temp}}°</view>
+  <view class="weather">{{weather.weather}}</view>
+  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
+    mode="aspectFill"></image> -->
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20250429/224929eeb4520d0c3ea8f10a657825b4.png" mode="aspectFill"></image>
+</view>
+<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+    <!-- <view class="iconfont icon-sousuo"></view> -->
+    <image class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
+    <view class="textOver">搜索想要的旅游产品或服务</view>
+  </navigator>
+</view>
+<view style="position:relative;z-index: 1;" >
+  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
+    <block wx:for="{{banner}}" wx:key="index">
+      <swiper-item bindtap="bannerClick" data-item="{{item}}">
+        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="com-flex dot-list">
+    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+  </view>
+</view>
+<view class="content" wx:if="{{!isTest}}">
+  <!-- 活动日历 -->
+  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
+    <image mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
+    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
+    <view class="nowDate"> 
+        <view class="num">{{nowDate[0]}}</view>
+        <view>月</view>
+        <view class="num">{{nowDate[1]}}</view>
+        <view>日</view>
     </view>
-    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <!-- <view class="iconfont icon-sousuo"></view> -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-        <view class="textOver" >搜索想要的旅游产品或服务</view>
-    </navigator>
+  </view>
+  <view class="hdrlNavList">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+      {{item.title}}
     </view>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="index">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+  </view>
+  <view wx:if="{{hdrlNavIndex!=4}}">
+    <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" >
+        <view style="background: #fff;display: flex;border-radius: 7rpx;width: 100%;">
+          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
+          <view class="hdrlItem-content">
+            <view class="hdrlItem-title textOver3">{{item.name}}</view>
+            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
+          </view>
+        </view>
+      </view>
     </view>
+  </view>
+  <view wx:else>
+    <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
+        <view style="background: #fff;width: 100%;display: flex;border-radius: 7rpx;width: 100%;">
+          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
+          
+          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
+            <view>{{item.title}}</view>
+            <view style="display: flex;justify-content: flex-end;">
+              <view class="buyMovie">去购票 ></view>
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
-
- 
-    <view class="top-icons" wx:if="{{!isTest}}">
-        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
-            <view class="top-icon-text">活动日历</view>
-        </view>
-        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
-            <view class="top-icon-text">场馆预约</view>
-        </view>
-        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
-            <view class="top-icon-text">非遗专卖</view>
-        </view>
-
-        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
-            <view class="top-icon-text">剧场演出</view>
-        </view>
-        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
-            <view class="top-icon-text">文创特产</view>
-        </view>
-        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
-            <view class="top-icon-text">景点门票</view>
-        </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="{{hotelUrl}}" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view>
-        <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view> -->
-        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
-            <view class="top-icon-text">水上游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
-            <view class="top-icon-text">一日游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="movie" data-title="户外游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
-            <view class="top-icon-text">户外游</view>
-        </view>
+  </view>
+  <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" wx:if="{{!isTest}}">
+    <!-- 上面的高峰预警、实时路况 -->
+    <view class="main-box-top">
+      <image bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj"
+        src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
+      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
-    <view class="content">
-        <view class="sale-road-boxes" wx:if="{{false}}">
-            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-            <view class="sale-product">
-                <view class="sale-product-bg"></view>
-                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>限时特惠</view>
-                    <view>新品推荐</view>
-                </view>
-                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
-                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-                </view>
-            </view>
-            </view>
-            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-            <view class="sale-product">
-                <view class="sale-product-bg road-product-bg"></view>
-                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>四季苏州</view>
-                    <view>最是江南</view>
-                </view>
-                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
-                </view>
-            </view>
-            </view>
-        </view>
-        <!-- ai避高峰 -->
-        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
-            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-            <image src="{{indexSeason.ai}}" mode=""/>
-            </view>
-            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-            <image src="{{indexSeason.avoid}}" mode=""/>
-            </view>
-        </view>
-
-        <!-- 小banner 五一修改 一张banner不滚动 -->
-        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%;height: 100%;" src="{{xiaobanner[0].head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="small-swiper-box" wx:else>
-            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-            <block wx:for="{{xiaobanner}}" wx:key="index">
-                <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <!-- 原 圆角77rpx，现改为13rpx -->
-                <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-                </swiper-item>
-            </block>
-            </swiper>
-            <view class="dot-list com-flex sm-dot-list">
-            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-            </view>
-        </view>
-    
-        <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{false}}">
-            <!-- 上方标题部分 -->
-            <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
-                倒计时
-                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.m}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.s}}</view>
-            </view>
-
-            </view>
-            <!-- 商品部分 -->
-            <view class="xpth-product">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left">
-                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                <image src="{{item.headimg}}" mode="" />
-                <view class="xpth-item-content">
-                    <view class="xpth-item-title textOver2">{{item.title}}</view>
-                    <!-- <view class="xpth-tag">唇齿留香</view> -->
-                    <view class="xpth-item-bottom">
-                    <view class="xpth-item-price">{{item.price/100}}</view>
-                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
-                    </view>
-                </view>
-                </view>
-            </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
-                <block wx:for="{{xpth.adv}}" wx:key="index">
-                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
-                    </swiper-item>
-                </block>
-                </swiper>
-                <view class="xpth-banner-dot-list">
-                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
-                </view>
-            </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
-            </view>
-        </view>
-
-        <!-- 热门推荐-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-            <!-- 上方标题部分 -->
-            <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;"></view>
-
-            </view>
-            <!-- 商品部分 -->
-            <view class="xpth-product" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left" >
-                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[0]}}" style="background: none;">
-                    <image src="{{xpth.adv[0].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset;"/>
-                </view>
-                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[1]}}"  style="background: none;">
-                    <image src="{{xpth.adv[1].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset"/>
-                </view>
-            </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" style="background: none;" >
-                <view class="xpth-banner-swiper"  bindtap="bannerClick" data-item="{{xpth.adv[2]}}"  style="border-radius: 0">
-                    <image src="{{xpth.adv[2].head_img}}" style="border-radius: 0;object-fit: unset"></image>
-                </view>
-
-            </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
-            </view>
-        </view>
-
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;padding-left: 16rpx;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6fcd03c4b5adc17b714186825e1f5da6.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <view class="text">水上游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
+          </view>
+          
+          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
+            <view class="text">剧场演出</view>
+          </view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
+          </view>
 
-        <!-- 数字文旅-->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="slide-out-box">
-            <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-            <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-            <view class="pbservice" style="margin-bottom:30rpx">
-                <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[0]}}" mode="widthFix"></image>
-                <view class="text">数字非遗</view>
-                </view>
-                <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[1]}}" mode="widthFix"></image>
-                <view class="text">数字博物馆</view>
-                </view>
-                <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[2]}}" mode="widthFix"></image>
-                <view class="text">数字名人馆</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[3]}}" mode="widthFix"></image>
-                <view>云上观展</view>
-                </view>
-                <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[4]}}" mode="widthFix"></image>
-                <view class="text">云上文博会</view>
-                </view>
-                <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[5]}}" mode="widthFix"></image>
-                <view class="text">精彩回顾</view>
-                </view>
-                <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[6]}}" mode="widthFix"></image>
-                <view class="text">文化场馆查询</view>
-                </view>
-                <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[7]}}" mode="widthFix"></image>
-                <view class="text">苏影通</view>
-                </view>
-                <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[8]}}" mode="widthFix"></image>
-                <view class="text">书仓</view>
-                </view>
-                <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[9]}}" mode="widthFix"></image>
-                <view class="text">e读书</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[10]}}" mode="widthFix"></image>
-                <view class="text">数字公共文化</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[11]}}" mode="widthFix"></image>
-                <view class="text">云游苏州</view>
-                </view>
-                <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[12]}}" mode="widthFix"></image>
-                <view class="text">美图鉴赏</view>
-                </view>
-            </view>
-            </scroll-view>
-            <view class="scroll-line">
-            <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-            <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-            <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
-            <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-            </view>
-        </view>
+          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
+            <view class="text">场馆预约</view>
+          </view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一日游" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/9de152fe23a392b5b1f86a112d97e644.png" mode="widthFix"></image>
+            <view class="text">户外游</view>
+          </view>
+          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
+            <view class="text">非遗专卖</view>
+          </view>
 
-        <!-- 旅游助手 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
+          <view wx:if="{{isMayDay}}" bindtap="gotoMini" data-event="hotel_click" data-title="酒店住宿" 
+          data-appid="wx0e6ed4f51db9d078" data-path="pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
         </view>
-        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
-            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
-            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
-            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
-            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
+        <!-- 五一前临时跳转专题页 -->
+        <view wx:else bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/nightMooring"  class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
         </view>
 
-        <!-- 公共服务 -->
-        <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
-            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
-            </navigator>
-            
-        </view>
-        <view style="overflow-x:auto">
-            <!-- 元旦修改 ggfw为新增类名 -->
-            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
-                <view>高峰预警</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
-                <view>实时路况</view>
-                </view>
-                <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
-                <view>行李直送</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
-                <view>行李寄存</view>
-                </view>
-                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-                    data-path="/pages/pbService/bike/index?type=1">
-                    <image src="{{imageSourceList.GGFW[4]}}" mode="widthFix"></image>
-                    <view>找厕所</view>
-                </view>
-            </view>
-        </view>
+        <!-- <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <view class="text">研学游</view>
+        </view> -->
 
-        <!-- 十全十美 -->
-        <view class="sale-road-boxes">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
-            <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
-        </view>
-        <view class="six-box-new" wx:if="{{!isTest}}">
-            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
-            </image>
         </view>
-
-        <!-- 长三角文旅平台 -->
-        <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
+      </scroll-view>
+      <view class="scroll-line">
+        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
+        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
+      </view>
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
+        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+    </view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
+    </view>
+    <image class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
+        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view> -->
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
+          <view>高峰预警</view>
         </view>
-        <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-            <view class="other-plat" wx:for="{{imageSourceList.CSJWLPT}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{item.icon}}" mode="heightFix"></image>
-            <view>{{item.name}}</view>
-            </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
+          <view>实时路况</view>
         </view>
-
-        <!-- 热门推荐 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
+        <view bindtap="xlzs"  class="pbservice-item ggfw" >
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
+            <view>行李直送</view>
         </view>
-        <view class="hot-list" wx:if="{{isTest==false}}">
-            <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
-            <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-                <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-                <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-                <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-                <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-                <view class="today-date">{{date}} {{month}}</view>
-                <view class="today-hot-box">
-                    <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
-                    {{item.ext.display_tags[0]}}</view>
-                    <view class="today-hot-title">{{item.title}}</view>
-                </view>
-                </view>
-                <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-                <view style="position:relative">
-                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                    <view class="hot-location textOver">{{item.ext.subtitle}}</view>
-                </view>
-                <view class="hot-info">
-                    <view class="hot-title">{{item.title}}</view>
-                    <view class="tags textOver" style="margin-bottom:0">
-                    <view class="icon-box">
-                        <text class="iconfont icon-xin"></text>
-                        <text>{{item.ext.like_number}}</text>
-                    </view>
-                    <view class="icon-box">
-                        <text class="iconfont icon-eye"></text>
-                        <text>{{item.ext.view_number}}</text>
-                    </view>
-                    </view>
-                </view>
-                </view>
-                <view wx:else class="hot-item">
-                <view style="position:relative">
-                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                    <!-- <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' && item.ext.price}}" class="hot-price">
-                    <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
-                    </view>
-                </view>
-                </view>
-            </view>
-            </view>
+        <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
+            <view>停车场</view>
         </view>
-        <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-        <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
-    </view>
 
-    <view class="mask prizeMask" wx:if="{{videoPrize}}">
-    <view class="mask-bg"></view>
-    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-        <!-- 中奖的卡券 -->
-        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+        <!-- <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
+          <view>行李寄存</view>
         </view> -->
+        
+        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
+            data-path="/pages/pbService/bike/index?type=1">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
+            <view>找厕所</view>
         </view>
-        <!-- 中奖的产品 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
+
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
         </view> -->
-        </view>
-        <!-- 未中奖 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <view bindtap="closePrice">我知道了</view>
-        </view>
-        </view>
-        <!-- 未抽奖状态 -->
-        <view style="position:relative" wx:else>
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-        </view>
-        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
     </view>
+    <view wx:else style="margin: 0rpx 14rpx 0;">
+      <view class="pic-list"  wx:if="{{!isTest}}">
+        <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/eacfc180904e8f1e8717afe2aa959c28.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          data-path="/pages/list/{{isTest?'road':'food'}}/index"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/e86972b98e8fbb5c5983f38124a77cb2.png" mode="aspectFill"></image>
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/62637ab5923016ef9baa573372d2452f.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/13060c57ee40d1f92145968a0fbd8378.png" mode="aspectFill"></image>
+      </view>
     </view>
-    <!-- 广告弹窗 -->
-    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
-    <view class="alertavd" wx:if="{{showAdv}}">
-    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-        <block wx:for="{{alertSwipeList}}" wx:key="index">
-        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
-            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+  </view>
+  <!-- 推荐榜单 -->
+  <image class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
+  src="https://static.ticket.sz-trip.com/uploads/20250429/179e3d1e09a17149f260c8d51458ed15.png" mode=""/>
+  <!-- 4个产品榜单 -->
+ <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
+  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
+    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <view class="bd-top">
+      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" style="color:{{i%2==1?'#55578E':'#F34017'}}" data-item="{{bdItem}}">更多 ></view>
     </view>
-    <!-- 广告弹窗结束 -->
-    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
-    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+    <view style="position: relative;z-index: 9;">
+      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
+        wx:key="id" data-item="{{item}}">
+        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-item">
+          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <view class="bd-item-content">
+            <view class="bd-item-title textOver2">
+              {{item.title}}
+            </view>
+            <view class="bd-item-bottom">
+              <view class="bd-price">{{item.price/100}}</view>
+              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
 
-    <!-- 视频 -->
-    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
+  </view>
+ </view>
 
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-    </view>
-    </view>
-    <!-- <view class="topBox">
-        <view class="Qtop" :style="{height:height}">
-        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
-        </view>
-        <view class="jumpBox">
-        <view class="time">{{time}}s</view>
-        <view bind:tap="gotoIndex">跳过</view>
-        </view>
-    </view> -->
 </view>
 
-<view wx:else>
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="*this">
+<view class="content" wx:else>
+    <!-- 高峰预警、实时路况及几个板块 -->
+  <view class="main-box" >
+    <!-- 上面的高峰预警、实时路况 -->
+
+    <!-- 下面几大板块 -->
+    <view class="slide-out-box">
+      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
+        <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
+          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <view class="text">景点门票</view>
+          </view>
+
+        </view>
+      </scroll-view>
+      
+    </view>
+  </view>
+  <!-- 小轮播 -->
+  <view class="small-swiper-box">
+    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
+      bindchange="changeSmBannerIndex">
+      <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
+          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
-        </block>
+      </block>
     </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-    </view>
+    <view class="dot-list com-flex sm-dot-list">
+      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
     </view>
-    <view class="top-icons">
-    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">活动日历</view>
+  </view>
+  <!-- 游苏州 -->
+  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
+    <view style="margin-bottom:6rpx;">
+      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <view>
+        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
+      </view>
     </view>
-    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">场馆预约</view>
-    </view>
-
-  
-    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">剧场演出</view>
-    </view>
-  
-   
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item" wx:if="{{false}}">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">夜游苏州</view>
-    </view>
-    </view>
-    <view class="content">
- 
-    <!-- 五一修改 一张banner不滚动 -->
-    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-    </view>
-    <view class="small-swiper-box" wx:else>
-        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-        <block wx:for="{{xiaobanner}}" wx:key="*this">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <!-- 原 圆角77rpx，现改为13rpx -->
-            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-            </swiper-item>
-        </block>
-        </swiper>
-        <view class="dot-list com-flex sm-dot-list">
-        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+  </view>
+  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
+    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
+      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+         class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <view>高峰预警</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc"
+          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <view>实时路况</view>
         </view>
-    </view>
-
 
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
+        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <view>安全服务</view>
+        </view> -->
+        
+        
+      </view>
+      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
+        查看更多 >
+      </navigator>
     </view>
-    <!-- 五一修改 .slide-out-box 增加背景色-->
-    <view class="slide-out-box">
-        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-            <view class="text">数字非遗</view>
-            </view>
-            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-            <view class="text">数字博物馆</view>
-            </view>
-            
-            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-            <view>云上观展</view>
-            </view>
-            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-            <view class="text">云上文博会</view>
-            </view>
-            
-            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-            <view class="text">文化场馆查询</view>
-            </view>
-            
-            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view>
-            
-
-            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-            <view class="text">数字公共文化</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-            <view class="text">文旅单位</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view> -->
-            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-            <view class="text">云游苏州</view>
-            </view>
-            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-            <view class="text">美图鉴赏</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-            <view>文物查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-            data-path="/pages/pbService/museum/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-            <view>博物馆查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-            <view>云上文博会</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-            <view class="text">投资导引图</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="数字文物"
-            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-            <view>数字文物</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-            <view>团体预约</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-            <view>廉洁地图</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-            <view>文化配送</view>
-            </view> -->
-        </view>
-        </scroll-view>
-        <view class="scroll-line">
-        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-        </view>
+    <view wx:else>
+      <view class="pic-list" style="margin-top:20rpx" >
+        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
+          
+          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+        </image>
+        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+      </view>
     </view>
+  </view>
+</view>
 
 
-
-
-
-
-  
+<!-- 开屏页 -->
+<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
+	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
-</view>
\ No newline at end of file
+	
+	<!-- 视频 -->
+	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+		<video
+			style="width:100vw;height:100vh;display:block;"
+			id="myVideo" 
+			src="{{startList.head_img}}" 
+			show-center-play-btn="{{false}}"
+			show-play-btn="{{true}}" 
+			autoplay
+			controls="{{false}}"
+			bindended="videoend"
+			loop="{{true}}"
+			muted="{{isMuted}}"
+			object-fit="fill"
+		></video>
+		
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+	</view>
+</view>
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 7b46194..9272311 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,13 +1,12 @@
-/**index.wxss**/
+/* pages/indexs/index.wxss */
 /* 元旦修改 */
 page {
-  /* background: #9DDCF5; */
+  height: fit-content;
   padding-bottom: 36.67rpx;
-  
-  /* background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
-  background-repeat: repeat-y;
-  background-size: 100% 100%; */
-  background: #F3FBFB;
+  background: #F5C564;
+  background-size: 100% auto;
+  /* background-repeat: round; */
+  background-repeat: no-repeat;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -41,21 +40,18 @@ page {
   flex: 1;
   width: 100%;
   height: 64rpx;
-  border-radius: 0rpx;
-  color: #15B593;
+  background: rgba(255,248,235,0.7);
+  border-radius: 13rpx;
+  color: #000;
   display: flex;
   align-items: center;
   font-size: 25rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/6cc354588441d7f89a36a91d7e1edd52.png");
-  background-size: 100% 100%;
-  padding: 2rpx 5rpx;
-  box-sizing: border-box;
 }
 .search-box .iconfont {
   font-size: 30rpx;
   margin-left: 20rpx;
-  margin-right: 20rpx;
-  /* color: #72674E; */
+  margin-right: 10rpx;
+  color: #000;
 }
 .top-box .weather-num,.top-box .weather {
   flex-shrink: 0;
@@ -74,6 +70,8 @@ page {
   margin-right: 30rpx;
 }
 .top-icons {
+  /* background: #FFFFFF; */
+  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
   border-radius: 0 0 27rpx 27rpx;
   width: 697rpx;
   margin: 0 auto;
@@ -81,11 +79,12 @@ page {
   z-index: 0;
   display: flex;
   padding: 34rpx 0;
-  padding-bottom: 29.33rpx;
+  padding-bottom: 7rpx;
   justify-content: space-between;
   flex-wrap: wrap;
-  margin-top: -50rpx;
-  padding-top: 84rpx;
+  background: #FFFED6;
+  margin-top: -20rpx;
+  padding-top: 54rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -100,13 +99,14 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 86rpx;
+  width: 113rpx;
   display: block;
   margin: 0 auto;
   margin-bottom: 10rpx;
 }
 .content {
-  margin: 0 25rpx;
+  /* margin: 0 25rpx; */
+  margin-top: 37.67rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -114,6 +114,7 @@ page {
   margin-top: 40rpx;
   position: relative;
   align-items: flex-end;
+  margin-bottom: 28rpx;
 }
 .sale-box {
   flex-shrink: 0;
@@ -195,13 +196,11 @@ page {
   height: 154rpx;
 }
 .small-swiper-box {
-  margin: 50rpx 0;
-  width: 100%;
+  margin: 24rpx 26.67rpx 26.67rpx;
+  /* width: 100%; */
   height: 154rpx;
   border-radius: 20rpx;
-  /* border-radius: 77rpx; */
   overflow: hidden;
-  margin-top: 33rpx;
   position: relative;
 }
 .product-tags {
@@ -309,54 +308,56 @@ page {
 } */
 /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
 .pic-list {
-  width: 100%;
+  /* width: 100%;
   display: flex;
   margin-right: 26rpx;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap;
+  flex-wrap: wrap; */
+    display: flex;
+    justify-content: space-around;
+    /* margin: 0 28rpx; */
 }
 .title-more {
-  font-size: 27rpx;
-  font-weight: 500;
-  color: #29305A;
+  font-size: 24rpx;
+  /* color: #0B898E; */
+  /* 元旦修改 */
+  color: #54504D;
   z-index: 9;
   width: 173rpx;
-  height: 80rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  background: rgba(255, 255, 255, 0.5);
   border-radius: 20rpx;
   text-align: center;
-  display: flex;
-  align-items: center;
-  justify-content: center;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  margin-top: 20rpx;
+  /* margin-top: 20rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  margin-bottom: 40rpx;
+  /* margin-bottom: 40rpx; */
 }
 .pbservice {
-  /* width: calc(175rpx * 6); */
-  /* 元旦修改 */
-  width: calc(190rpx * 7);
+  width: calc(160rpx * 8);
   display: flex;
-  margin-top: 30rpx;
-  flex-wrap: wrap;
-  /* margin-bottom: 60rpx; */
-  /* 元旦修改 注释margin-bottom */
+  margin-top: 5rpx;
+  /* flex-wrap: wrap; */
+  flex-wrap: nowrap;
+  /* padding-left: 12rpx; */
+  /* overflow-x: scroll; */
 }
 .pbservice-item {
-  /* 元旦修改 截止到注释的width*/
-  width: 120rpx;
-  margin-bottom: 33.33rpx;
-  margin-right: 62.33rpx;
-  /* width: 175rpx; */
+  width: 106rpx;
+  margin-bottom: 25rpx;
+  margin-right: 32.33rpx;
   text-align: center;
-  font-size: 25rpx;
-  color: #111111;
+  font-size: 27rpx;
+  color: #000;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -371,7 +372,7 @@ page {
   margin-bottom: 20rpx;
   margin-top: 50rpx; */
   /* 元旦修改 以上都是之前的*/
-  width: 106rpx;
+  width: 80rpx;
   margin-bottom: 10rpx;
 }
 .six-box {
@@ -532,36 +533,47 @@ page {
 }
 .more-btn-text {
   text-align: center;
+  /* color: #0b898e;
+  font-size: 27rpx;
+  width: 200rpx;
+  line-height: 65rpx;
+  border: 1px solid #0b898e;
+  border-radius: 33rpx; */
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #169D7E;
+  border: 1px solid #111;
+  border-radius: 35rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #169D7E;
 }
 .scroll-line {
-
-  width: 73rpx !important;
-  height: 7rpx;
-  /* background: #DDCEAC; */
-  background: #97D0EC;
+  /* height: 6rpx;
   border-radius: 3rpx;
-  margin: 33.33rpx auto;
+  background: #ccc;
+  overflow: hidden;
+  margin: 30rpx auto; */
+  /* 元旦修改 以上为注释部分 下面为新内容*/
+  width: 48rpx !important;
+  height: 8rpx;
+  /* background: #DDCEAC; */
+  background: #fff;
+  border-radius: 4rpx;
+  margin: 15rpx auto 10rpx;
 }
 .scroll-line-bg {
-  height: 7rpx;
-  background: #5184B0;
-  border-radius: 3rpx;
+  height: 8rpx;
+  background: #FF4848;
+  border-radius: 4rpx;
 }
 /* 元旦修改  新增样式 */
 .scroll-line-bg2 {
-  margin-left: 37.33rpx;
-  background: #5184B0;
-  height: 7rpx;
-  border-radius: 3rpx;
+  margin-left: 24rpx;
+  background: #FF4848;
+  height: 8rpx;
+  border-radius: 4rpx;
 }
 .nomore-tip-btn {
   position: absolute;
@@ -667,8 +679,10 @@ page {
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
+  background: #FFFED6;
   justify-content: space-around;
   height: 187rpx;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
   align-items: center;
 }
@@ -680,7 +694,7 @@ page {
 }
 .other-plat {
   /* 春节新增样式 */
-  color: #111111;
+  color: #54504D;
 }
 .other-plat:nth-child(4n){
   margin-right: 0;
@@ -814,7 +828,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .time-box {
-  font-size: 27rpx;
+  font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
   /* color: #54504D; */
@@ -825,22 +839,26 @@ page {
   margin-left: -50rpx;
   z-index: 9;
   flex-wrap: nowrap;
-
-  position: relative;
-  left: -150rpx;
 }
 /* 元旦修改新增样式 */
 .xsth-time {
-  /* width: 43rpx; */
+  /* margin: 0 5rpx; */
+  /* width: 50rpx; */
+  /* height: 33rpx; */
+  width: 43rpx;
   height: 43rpx;
-  padding: 0 7rpx;
   line-height: 43rpx;
+  background: #4AB648;
+  /* background: #F9F1DB; */
+  /* border-radius: 5rpx; */
   border-radius: 13rpx;
-  font-size: 27rpx;
+  font-size: 25rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #D62828;
+  /* color: #D62828; */
+  color: white;
   text-align: center;
+  /* line-height: 33rpx; */
 }
 .time-box text {
   width: 18rpx;
@@ -886,67 +904,60 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-product {
-  width: 700rpx;
+  /* position: absolute; */
+  width: 697rpx;
   height: 373rpx;
+  background: #FFFED6;
+  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
   border-radius: 27rpx;
-  padding: 25rpx 13rpx;
+  padding: 25rpx 15rpx;
   box-sizing: border-box;
+  /* left: 0;
+  bottom: 15.33rpx;
+  /* width: 710rpx; */
   display: flex;
   justify-content: space-between; 
 }
 /* 元旦修改新增样式 */
 .xpth-banner {
+  /* width: 270rpx; */
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
+  /* background-size: 100% 100%; */
+  border-radius: 20rpx;
   flex: 1;
   margin-left: 15rpx;
-  height: 322rpx;
-  width: 100%;
-  border-radius: 0rpx;
-  overflow: hidden;
-  position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/004153a812042b46ca750146f5259ef7.png");
-  background-size: 100% 100%;
-  padding: 3rpx;
-}
-.xpth-banner-swiper{
-    height: 100%;
-    border-radius: 20rpx;
-    overflow: hidden;
+  /* padding: 4rpx;
+  background: #72674e;
+  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  height: 319rpx;
 }
 .xpth-banner image {
+  /* width: 270rpx; */
   flex: 1;
-  height: 100%;
-  width: 100%;
+  height: 319rpx;
   border-radius: 20rpx;
-}
-.xpth-banner-dot-list{
-    position: absolute;
-    right: 0;
-    bottom: 10rpx;
-    padding: 10rpx;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-.xpth-banner-dot-list .xpth-dot{
-    width: 9rpx;
-    height: 9rpx;
-    background: #FFFFFF;
-    border-radius: 50%;
-    opacity: 0.6;
-    margin: 0 4rpx;
-}
-.xpth-banner-dot-list .xpth-dot.active{
-    opacity: 1;
+  /* height: 333rpx; */
+  /* height: 340rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
+  /* border-radius: 20rpx; */
 }
 /* 元旦修改新增样式 */
 .xpth-item {
+  /* width: 413rpx;
+  height: 160rpx; */
+  /* background: #FFFFFF; */
+  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
+  background-size: 100% 100%; */
   border-radius: 20rpx;
   height: 153rpx;
+  background: #FFFFFF;
   display: flex;
   margin-bottom: 13rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/a41b881279749fba4c506c164914b601.png");
-  background-size: 100% 100%;
-  padding: 1rpx;
+  /* margin-bottom: 10rpx; */
+  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
+  /* padding: 5rpx; */
 }
 .xpth-item:last-child {
   margin-bottom: 0;
@@ -959,7 +970,7 @@ page {
   border-radius: 15rpx 0 0 15rpx; */
   width: 157rpx;
   height: 154rpx;
-  /* background: #72707D; */
+  background: #72707D;
   border-radius: 20rpx;
   /* margin-right: 15.33rpx; */
   flex-shrink: 0;
@@ -976,7 +987,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-title {
-  width: 210rpx;
+  width: 230rpx;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
@@ -999,15 +1010,15 @@ page {
 }
 /* 元旦修改新增样式 */
 .xpth-item-price {
-  font-size: 31rpx;
+  font-size: 32rpx;
   font-family: PingFang SC;
-  font-weight: bold;
-  color: #ED1C19;
+  font-weight: 500;
+  color: #D62828;
 }
 /* 元旦修改新增样式 */
 .xpth-item-price::before {
   content: "￥";
-  font-size: 23rpx;
+  font-size: 20rpx;
 }
 /* 元旦修改新增样式 */
 .xpth-item-buy {
@@ -1024,25 +1035,23 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 160rpx !important;
-  height: 220rpx !important;
-  margin-bottom: 26.67rpx;
+  width: 155rpx !important;
+  height: 255rpx !important;
+  /* margin-bottom: 26.67rpx; */
 }
 
-.ggfw-list {
-  justify-content: space-around !important;
-}
-.ggfw-list .pbservice-item{
-    margin-right: 0;
-    color: #111111;
+.ggfw-list{
+    display: flex;
+    justify-content: space-around;
 }
 .ggfw {
   width: auto;
+  margin:0;
 }
 .ggfw image{
   margin-bottom: 16.67rpx;
-  width: 93rpx !important;
-  height: 93rpx !important;
+  width: 113.33rpx !important;
+  height: 113.33rpx !important;
 }
 
 .six-box-new {
@@ -1052,6 +1061,7 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  padding-left: 13.33rpx;
   overflow: scroll;
   margin-bottom: 53.33rpx;
   z-index: 1;
@@ -1059,8 +1069,8 @@ page {
 }
 
 .six-box-new image {
-  width: 334rpx;
-  height: 193.33rpx !important;
+  width: 440rpx;
+  height: 213.33rpx !important;
   /* background: #FFE7C0; */
   border-radius: 20rpx;
   flex-shrink: 0;
@@ -1068,7 +1078,7 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #111111;
+  color: #54504D;
 }
 
 .rmtj-right {
@@ -1149,30 +1159,363 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-.jqssd {
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
-  background-size: 100% 100%; */
-  width: 344.33rpx;
-  height: 160rpx;
+
+.right-more {
+  width: 120rpx;
+  height: 47rpx;
+  border-radius: 7rpx;
+  border: 1px solid #111111;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #111111;
+  text-align: center;
+  line-height: 47rpx;
+}
+
+.hdrlNavList {
+  display: flex;
+  margin: 28rpx 26.67rpx 26rpx;
+  overflow-x: scroll;
+  flex-wrap: nowrap;
+}
+.hdrlNav {
   flex-shrink: 0;
+  /* width: 160rpx; */
+  padding: 0 20rpx;
+  height: 53rpx;
+  background: #FCE7BF;
+  border-radius: 7rpx;
+  /* border: 1px solid #FFFFFF; */
+  min-width: 133rpx;
+
+  font-size: 32rpx;
+  color: #111111;
+  text-align: center;
+  line-height: 53rpx;
+  margin-right: 14rpx;
+  box-sizing: border-box;
+}
+.hdrlNavActive {
+  background: linear-gradient(180deg, #E2802B, #D1201B);
+  font-size: 32rpx;
+  color: #FFFFFF;
+  border: none;
+}
+.hdrlItem {
+  flex-shrink: 0;
+  padding: 10rpx;
+  /* width: 593.33rpx; */
+  display: flex;
+  background-size: 100% 100%;
+  background: linear-gradient(90deg, #EC2026, #3A3D83);
+  border-radius: 13rpx;
+  margin-right: 20rpx;
+  width: 573rpx;
 }
-.jqssd image, .sslk image{
+.hdrlItem-img {
+  width: 240rpx;
+  height: 213rpx;
+  background: #8C8C8C;
+  border-radius: 7rpx;
+  flex-shrink: 0;
+  margin-right: 12rpx;
+  overflow: hidden;
+}
+.hdrlItem-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 213rpx;
+}
+.hdrlItem-title {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 15.33rpx;
+}
+.hdrlItem-date {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #000000;
+  margin-bottom: 19.33rpx;
+}
+
+.main-box {
+    width: 697rpx;
+    /* height: 273rpx; */
+    background: linear-gradient(180deg, #FFEED6, #FFDCA3);
+    border-radius: 13rpx;
+    margin: 110rpx auto 43rpx;
+    position: relative;
+    padding-top: 93rpx;
+    padding-bottom: 20rpx;
+    /* box-sizing: border-box; */
+}
+.main-box-top {
+  display: flex;
+  justify-content: space-between;
   width: 100%;
-  height: 100%;
+  padding: 16rpx;
+  box-sizing: border-box;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: -72rpx;
 }
-.sslk {
-  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
-  background-size: 100% 100%; */
-  width: 344rpx;
-  height: 160rpx;
+.gfyj,.sslk {
+  width: 324.33rpx;
+  height: 131rpx;
+  flex-shrink: 0;
+}
+
+
+.movieItem {
+  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+  flex-shrink: 0;
+  height: 206.67rpx;
+}
+.movieItem-img {
+  width: 213rpx;
+  height: 213rpx;
+  border-radius: 18rpx;
+  margin-right: 18rpx;
   flex-shrink: 0;
 }
+.ysz-box {
+    margin: 26rpx auto 15.33rpx;
+    width: 697rpx;
+    height: 293rpx;
+    background: linear-gradient(180deg, #FFEED6, #FFDCA3);
+    border-radius: 13rpx;
+
+    padding-top: 3.33rpx;
+    position: relative;
+    z-index: 1;
+    box-sizing: border-box;
+}
+.ysz-more {
+    width: 183rpx;
+    height: 53rpx;
+    border-radius: 7rpx;
+    border: 1px solid #000000;
+
+    margin: 38rpx auto 0;
+    text-align: center;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 25rpx;
+
+}
+.ysz-box2 {
+  /* padding: 20rpx 35rpx; */
+  padding-top: 23.33rpx;
+}
+.tjbd-title {
+  width: 286.67rpx;
+  height: 80rpx;
+}
+
+.bd-box {
+  position: relative;
+  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
+  margin-left: 26.67rpx;
+  width: 582rpx;
+  /* height: 1133rpx; */
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+  /* box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(224,61,60,0.26); */
+  border-radius: 20rpx 80rpx 20rpx 20rpx;
+}
+.bd-top {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+  position: relative;
+}
+.zz {
+    width: 236.67rpx;
+    height: 206.67rpx;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 2;
+}
+.bd-type {
+  width: 125.33rpx;
+  height: 38.67rpx;
+}
+.bd-more {
+  width: 120rpx;
+  height: 47rpx;
+  background: rgba(255,255,255,.7);
+  border-radius: 23rpx;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #F34017;
+  z-index: 9;
+  text-align: center;
+  line-height: 47rpx;
+}
+.bd-index {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: black;
+}
+.bd-item {
+  margin-left: 45.33rpx;
+  width: 453rpx;
+  height: 147rpx;
+  background: #FFFFFF;
+  border-radius: 13rpx;
+  display: flex;
+}
+.bd-item-img {
+    width: 147rpx;
+    height: 147rpx;
+    background: #D9D9D9;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 12.67rpx;
+}
+.bd-item-content {
+    padding: 14rpx 29.33rpx 13.33rpx 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.bd-item-title {
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #333333;
+}
+.bd-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    width: 260rpx;
+}
+.bd-price {
+    font-size: 29.33rpx;
+    color: #F93434;
+    font-weight: bold;
+}
+.bd-price:after {
+  content:'起';
+  color: #999999;
+  font-size: 23rpx;
+  font-weight: 700;
+}
+.bd-price::before {
+  content:'￥';
+  font-size: 23rpx;
+}
+.bd-distance {
+  font-weight: 500;
+  font-size: 23rpx;
+  color: #999999;
+}
+
+.buyMovie {
+    width: 160rpx;
+    height: 56rpx;
+    background: #FF4848;
+    color: #fff;
+    border-radius: 20rpx;
+    text-align: center;
+    line-height: 56rpx;
+}
+
+.bg1 {
+  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
+}
+.bg2 {
+  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
+}
+.bg3 {
+  background: linear-gradient(180deg, #E0F7DC, #A0F292);
+}
+.bg4 {
+  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
+}
 
-.xsth-left{
-    /* flex: 1;
-    width: 1rpx; */
+.hdrlNavList::-webkit-scrollbar{
+  display:none;
+}
+.hdrlList::-webkit-scrollbar{
+  display:none;
+}
+.bottom-box::-webkit-scrollbar{
+  display:none;
+}
+.slide-box::-webkit-scrollbar{
+  display:none;
+}
+.pbservice::-webkit-scrollbar{
+  display:none;
+}
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
 }
-.xsth-left>image{
-    max-width: 100%;
-    overflow: hidden;
+.public-box {
+  width: 593.33rpx;
+  height: 266.67rpx;
+  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
+  background-size: 100% 100%;
+}
+.one::-webkit-scrollbar{
+  display:none;
+}
+
+
+.date-container{
+    position: relative;
+}
+.nowDate{
+    display: flex;
+    position: absolute;
+    left: 200.77rpx;
+    bottom: 7.33rpx;
+}
+
+.nowDate>view{
+
+    width: 44rpx;
+    height: 44rpx;
+    border-radius: 7rpx;
+    text-align: center;
+    line-height: 44rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 29rpx;
+    color: #111111;
+}
+.nowDate .num{
+    background: #FCE7BF;
+    color: #C11A20;
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 29rpx;
+    border-radius: 50%;
+}
+
+.ysz-right-img{
+    width: 213.33rpx;
+    height: 259.33rpx;
+    position: absolute;
+    right: -26rpx;
+    top: 44rpx;
+    z-index:1;
+}
+.hidden{
+  display: none;
+}
+
+.top-box image.search-icon{
+    width: 26.67rpx;
+    height: 26.67rpx;
+    margin-right: 20rpx;
 }
\ No newline at end of file
diff --git a/subPackages/index/imgSource.js b/subPackages/index/imgSource.js
index 588f666..0d29963 100644
--- a/subPackages/index/imgSource.js
+++ b/subPackages/index/imgSource.js
@@ -1,84 +1,116 @@
 const imageSource = {
     // 活动日历、场馆预约等
     mainFunImgs: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/c69cdbafb16ed468fef68eb77865e6ff.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/05dd30d02e74178134242cc64aaa11ac.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e93e655b524001d25d7d4fd848f5bb3b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
+
+        "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e2cc47fa5a2d01d436dad0a85948f060.png",
+        "https://static.ticket.sz-trip.com/jundaosuzhou/images/spring2025/ssy.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a094d635976194782fbdcf2bc596b082.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/5238f9ee4762266abf0c279501ea4028.png",
     ],
     // 数字文旅
     SZWL: [
         // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
         // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
-        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/1994615fcbc125da641541ea1f04c364.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/f054ca452f27dac54723255ba6445790.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/590822c40c769cb4f673f460f1a37a0b.png",
+
+        "https://static.ticket.sz-trip.com/uploads/20250312/41c21568ed9c4b15084c9669ca99a6fd.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/1ee056f091a42e51ce8168767704708a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/b418843c04ddfa00be91fb793019cb99.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
+       
+        "https://static.ticket.sz-trip.com/uploads/20250312/0ad69db116004e735e1bd13cd54fd75c.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/f2400b009c8e92efcdd645080f14b28a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bbda2dd4e332f457a6aa06a4a15b639b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/06b500881204a4a40c5bc8d126f38a58.png",
         
-        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/d188c19334c9170e5c963459b7187f20.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a25506779b745291cb8d9051abce07c1.png",
 
     ],
     // 旅游助手
     LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
+        "https://static.ticket.sz-trip.com/uploads/20250423/662eb322f8851e04df41fd836c6a88f3.png",
+        // "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
     ],
     // 公共服务
     GGFW: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/9799b276d76f884fd0130d7378c974fe.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/c40b456687490eafe5414addaaae0c2b.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/a95959dcba2f494b69980d16a895e9c8.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/e16b8e640169e99639cef6ff7897b6a7.png"
     ],
     
     // 十全十美
     SQSM: [
         // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
+        "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
+
+        
 
     ],
 
     // 长三角文旅平台
     CSJWLPT: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
+        {
+            "name":"玉见昆山",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/40319f04a78f25c2741e4ce11b375597.png",
+            "type":"mini",
+            "path":"",
+            "appid":"wx8888a3fd0862b4c8"
+        },
+        {
+            "name":"智游常熟",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/619870022ca676c31d2d6395f81dd3d7.png",
+            "type":"mini",
+            "path":"",
+            "appid":"wxdaf3d5edd07dc7af"
+        },
+        {
+            "name":"常享游",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
+            "type":"h5",
+            "url":"https://tour.wlczy.com/h5/"
+        },
+        {
+            "name":"畅游宿迁",
+            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
+            "type":"mini",
+            "path":"/pages/index/index",
+            "appid":"wxcb00a59c4fba136e"
+        },
+
+
     ],
 
     // 导航标题侧边图片
     CBTP: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
-        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/5d051d37148757eb5daa6e51439e711a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/d47ce5d4f2a780f46192afeb715d873d.png",
+        "",
+        "https://static.ticket.sz-trip.com/uploads/20250314/03413a9bd8a0b7a99141903e04cbc05f.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/1075c176fb20563a48945fce020db57f.png",
     ],
 
     // 其他后台配置的图片，开发时使用
@@ -87,23 +119,23 @@ const imageSource = {
              // 头图
              topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
             // ai伴你游
-            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
+            ai: "https://static.ticket.sz-trip.com/uploads/20250314/3fb020cf3471d3731b4a7efae25e8e64.png",
             // ai避高峰
-            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
+            avoid: "https://static.ticket.sz-trip.com/uploads/20250314/8c0f1c421b1de36265948d52c249dc57.png",
             // 新品特惠
-            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            xpth: "https://static.ticket.sz-trip.com/uploads/20250314/349596880742665ac7249b5f4218263f.png",
             // 文旅鉴赏
-            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20250314/073759b9fcd3e217de9ecea774451364.png",
             // 出行助手
-            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20250314/7f5d199286e62ba6c9d43fdfd6f55de3.png",
             // 公共服务
-            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20250314/271ffedb33dcfacf170ff78c1425f9cf.png",
             // 十全十美
-            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            sqj: "https://static.ticket.sz-trip.com/uploads/20250314/edceba87f00e37ef50cf6a9fafb8a29f.png",
             // 长三角文旅平台
-            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20250314/c88a44d385e0bf36370475ace8e5669e.png",
             // 热门推荐
-            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20250314/dcc02bb22b721e281037cecf22e74728.png",
             
         }
     },
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index f0ffd00..0fd2d47 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -72,6 +72,9 @@ Page({
 
         // 页面图片
         imageSourceList:imageSource,
+
+        // 酒店住宿配置链接   /pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/carPurchase
+        hotelUrl: ''
 	},
 	onLoad: function(options) {
         console.log('onload')
@@ -1009,7 +1012,31 @@ Page({
 
 		this.pagePoint({
 			event: 'home_view'
-		}, 1)
+        }, 1)
+        
+        if(!this.data.hotelUrl) {
+        commonApi._post("pbservice/Other/getClientConfig", {
+            unique_key: "wechatxcx"
+          }).then(res => {
+              try {
+                let data = JSON.parse(res.data);
+                if (data.hotelUrl) {
+                    this.setData({
+                        hotelUrl: data.hotelUrl
+                    })
+                }
+              } catch(e) {
+                this.setData({
+                    hotelUrl: '/pages/list/hotel/index'
+                })
+              }
+          }).catch(err => {
+              this.setData({
+                  hotelUrl: '/pages/list/hotel/index'
+              })
+          })
+        }
+
 		// this.data.time!=5?wx.showTabBar():1
 	},
 
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 3445f12..3eb48fc 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -21,8 +21,8 @@
     <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
     <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
         <!-- <view class="iconfont icon-sousuo"></view> -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20241225/59b88ab6ae2800ebe02f8c25eaf29636.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-        <view class="textOver" style="color:rgba(41, 48, 90, 0.5);">搜索想要的旅游产品或服务</view>
+        <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+        <view class="textOver" >搜索想要的旅游产品或服务</view>
     </navigator>
     </view>
     <view style="position:relative;z-index: 1;">
@@ -65,7 +65,7 @@
             <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
             <view class="top-icon-text">景点门票</view>
         </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="{{hotelUrl}}" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
             <view class="top-icon-text">酒店住宿</view>
         </view>
@@ -76,15 +76,15 @@
         </view> -->
         <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
-            <view class="top-icon-text">夜游苏州</view>
+            <view class="top-icon-text">水上游</view>
         </view>
         <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
             <view class="top-icon-text">一日游</view>
         </view>
-        <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
+        <view bindtap="gotoUrl" data-event="movie" data-title="户外游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
             <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
-            <view class="top-icon-text">研学游</view>
+            <view class="top-icon-text">户外游</view>
         </view>
     </view>
     <view class="content">
@@ -137,7 +137,7 @@
 
         <!-- 小banner 五一修改 一张banner不滚动 -->
         <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
+            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%;height: 100%;" src="{{xiaobanner[0].head_img}}" mode="aspectFill"></image>
         </view>
         <view class="small-swiper-box" wx:else>
             <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
@@ -154,7 +154,7 @@
         </view>
     
         <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{false}}">
             <!-- 上方标题部分 -->
             <view class="xsth-title">
             <view class="xsth-left" style="display: flex;">
@@ -203,11 +203,43 @@
             </view>
         </view>
 
+        <!-- 热门推荐-->
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
+            <!-- 上方标题部分 -->
+            <view class="xsth-title">
+            <view class="xsth-left" style="display: flex;">
+                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
+            </view>
+            <view class="time-box" style="z-index: 2;flex-shrink: 0;"></view>
+
+            </view>
+            <!-- 商品部分 -->
+            <view class="xpth-product" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+            <!-- 左边的2个产品 -->
+            <view class="xpth-left" >
+                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[0]}}" style="background: none;">
+                    <image src="{{xpth.adv[0].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset;"/>
+                </view>
+                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[1]}}"  style="background: none;">
+                    <image src="{{xpth.adv[1].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset"/>
+                </view>
+            </view>
+            <!-- 右边的banner -->
+            <view class="xpth-banner" style="background: none;" >
+                <view class="xpth-banner-swiper"  bindtap="bannerClick" data-item="{{xpth.adv[2]}}"  style="border-radius: 0">
+                    <image src="{{xpth.adv[2].head_img}}" style="border-radius: 0;object-fit: unset"></image>
+                </view>
+
+            </view>
+            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
+            </view>
+        </view>
+
 
         <!-- 数字文旅-->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="slide-out-box">
             <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
@@ -278,10 +310,12 @@
         <!-- 旅游助手 -->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
+            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
             src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
             <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
             src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
@@ -314,17 +348,17 @@
                 <view>实时路况</view>
                 </view>
                 <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20250115/18e8e2274a8191d0be0b8c63884ebe04.png" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
                 <view>行李直送</view>
                 </view>
                 <view bindtap="gotoUrl" data-event="xlqc"
                 data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
+                <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
                 <view>行李寄存</view>
                 </view>
                 <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
                     data-path="/pages/pbService/bike/index?type=1">
-                    <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
+                    <image src="{{imageSourceList.GGFW[4]}}" mode="widthFix"></image>
                     <view>找厕所</view>
                 </view>
             </view>
@@ -333,7 +367,7 @@
         <!-- 十全十美 -->
         <view class="sale-road-boxes">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" />
+            <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
         </view>
         <view class="six-box-new" wx:if="{{!isTest}}">
             <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
@@ -343,11 +377,11 @@
         <!-- 长三角文旅平台 -->
         <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-            <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{imageSourceList.CSJWLPT[index]}}" mode="widthFix"></image>
+            <view class="other-plat" wx:for="{{imageSourceList.CSJWLPT}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+            <image src="{{item.icon}}" mode="heightFix"></image>
             <view>{{item.name}}</view>
             </view>
         </view>
@@ -355,7 +389,7 @@
         <!-- 热门推荐 -->
         <view class="sale-road-boxes" style="margin-top:0">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode="" />
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
         </view>
         <view class="hot-list" wx:if="{{isTest==false}}">
             <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index b543000..7b46194 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -4,9 +4,10 @@ page {
   /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
   
-  background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
+  /* background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
   background-repeat: repeat-y;
-  background-size: 100% 100%;
+  background-size: 100% 100%; */
+  background: #F3FBFB;
 }
 .swiper,.swiper image {
   width: 697rpx;
@@ -39,22 +40,13 @@ page {
 .search-box {
   flex: 1;
   width: 100%;
-  /* height: 64rpx; */
-  /* background: rgba(255, 255, 255, 0.6); */
-  /* border-radius: 32rpx; */
-  /* color: #666; */
-  /* height: 70.67rpx; */
   height: 64rpx;
-  /* background: rgba(255,255,255,0.7); */
   border-radius: 0rpx;
-  /* color: #72674E; */
-  color: #333333;
-  /* background-image: url("https://static.ticket.sz-trip.com//uploads/20240228/10b93c1389ef5dfc02d07c4091af8f2d.png");
-  background-size: 100% 100%; */
+  color: #15B593;
   display: flex;
   align-items: center;
   font-size: 25rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/510a67a1e78a9eb1aeb6e049348d4701.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/6cc354588441d7f89a36a91d7e1edd52.png");
   background-size: 100% 100%;
   padding: 2rpx 5rpx;
   box-sizing: border-box;
@@ -544,11 +536,11 @@ page {
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #5184B0;
+  border: 1px solid #169D7E;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #5184B0;
+  color: #169D7E;
 }
 .scroll-line {
 
@@ -681,9 +673,9 @@ page {
   align-items: center;
 }
 .other-plats image {
-  width: 106rpx;
+  width: 80rpx;
   display: block;
-  height: 106rpx;
+  height: 80rpx;
   margin-bottom: 15rpx;
 }
 .other-plat {
@@ -847,7 +839,7 @@ page {
   font-size: 27rpx;
   font-family: DIN;
   font-weight: 500;
-  color: #FF6A57;
+  color: #D62828;
   text-align: center;
 }
 .time-box text {
@@ -911,7 +903,7 @@ page {
   border-radius: 0rpx;
   overflow: hidden;
   position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/ba525775a8361dd502c88a4e46552483.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/004153a812042b46ca750146f5259ef7.png");
   background-size: 100% 100%;
   padding: 3rpx;
 }
@@ -952,7 +944,7 @@ page {
   height: 153rpx;
   display: flex;
   margin-bottom: 13rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20241225/d469064b1bcf6c2f7cd59786e66fc249.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/a41b881279749fba4c506c164914b601.png");
   background-size: 100% 100%;
   padding: 1rpx;
 }
@@ -967,7 +959,7 @@ page {
   border-radius: 15rpx 0 0 15rpx; */
   width: 157rpx;
   height: 154rpx;
-  background: #72707D;
+  /* background: #72707D; */
   border-radius: 20rpx;
   /* margin-right: 15.33rpx; */
   flex-shrink: 0;
@@ -1060,7 +1052,6 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-left: 13.33rpx;
   overflow: scroll;
   margin-bottom: 53.33rpx;
   z-index: 1;
@@ -1068,8 +1059,8 @@ page {
 }
 
 .six-box-new image {
-  width: 440rpx;
-  height: 213.33rpx !important;
+  width: 334rpx;
+  height: 193.33rpx !important;
   /* background: #FFE7C0; */
   border-radius: 20rpx;
   flex-shrink: 0;

From 25986a56b2049d34671bcb8b1b190db30cd4a2b3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 30 Apr 2025 11:17:04 +0800
Subject: [PATCH 309/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js        | 31 ++++++++++++++++++++-----------
 pages/index/index.wxml      |  6 +++---
 project.private.config.json | 19 ++++++-------------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index c06f78d..7d8c8f1 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -97,22 +97,26 @@ Page({
     yszIndex:0,
     bdList:[
         {
-            bg: 'linear-gradient(-8deg,#f4f9ff,#b9e1f0)',
+            color: '#FFE4BC',
+            bg: 'linear-gradient(172deg, #F08528, #D1201B);',
             icon:'https://static.ticket.sz-trip.com/uploads/20250429/069ab247bb2ab5a08fa7707d671b1ac5.png', //游 景点
             url:'',
             path:'/pages/list/scene/index',
             list: [],
             
         },
-        {
+        {   
+            color: '#DBD8F6',
             bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
             icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
-            path:'/pages/list/night/index',
-            url:'',
+            // path:'/pages/list/night/index',
+            url:'http://m.cloud.sz-trip.com/nightTour2025',
+            path: '',
             list: [],
             
         },
         {
+            color: '#FFE4BC',
             bg: 'linear-gradient(172deg, #F08528, #D1201B);',
             icon:'https://static.ticket.sz-trip.com/uploads/20250429/9928f46523fd57233b6ef3371a6ba460.png', //非看不可
             url:'',
@@ -121,6 +125,7 @@ Page({
             
         },
         {
+            color: '#DBD8F6',
             bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
             icon:'https://static.ticket.sz-trip.com/uploads/20250429/a4f53072aa51a387593a183799b902e6.png', //非买不可
             path:'/subPackages/techanNew/index',
@@ -328,9 +333,10 @@ Page({
     let item = e.currentTarget.dataset.item;
     let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
     if (type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
+    //   wx.navigateTo({
+    //     // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+    //   })
+        util.goMovieDetail(item.third_id || item.id)
     }else {
       wx.navigateTo({
         url: '/pages/info/activityInfo/index?id=' + item.id,
@@ -354,6 +360,7 @@ Page({
   },
   // 推荐榜单更多跳转
   moreBtn(e) {
+      console.log(e)
     let item = e.currentTarget.dataset.item
     if (item.path!='') {
       wx.navigateTo({
@@ -365,6 +372,7 @@ Page({
       //     event: e.currentTarget.dataset.event
       //   }, 1)
       // }
+      console.log('error', item)
       let url = item.url;
       app.globalData.weburl = url;
       wx.navigateTo({
@@ -705,10 +713,11 @@ Page({
 	tagGotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			wx.navigateTo({
-				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-					item.title,
-			})
+			// wx.navigateTo({
+			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+			// 		item.title,
+            // })
+            util.goMovieDetail(item.third_id || item.id, item.title)
 		} else {
 			util.gotoDetail(item)
 		}
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 29f0126..9028d7b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -101,7 +101,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
             <view class="text">水上游</view>
           </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/nightTour2025" data-event="night_sz" data-title="夜游苏州"  class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
             <view class="text">夜游苏州</view>
           </view>
@@ -124,7 +124,7 @@
             <view class="text">一日游</view>
           </view>
           <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/9de152fe23a392b5b1f86a112d97e644.png" mode="widthFix"></image>
+            <image src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
           <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
@@ -259,7 +259,7 @@
     <view style="position: relative;z-index: 9;">
       <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
         wx:key="id" data-item="{{item}}">
-        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-index" style="color: {{bdItem.color}};">{{index+1}}</view>
         <view class="bd-item">
           <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
diff --git a/project.private.config.json b/project.private.config.json
index 1e1341f..807c999 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,22 +1,22 @@
 {
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": true
+    "urlCheck": false
   },
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "subPackageCheckPoint/pages/index/index",
-          "pathName": "subPackageCheckPoint/pages/index/index",
+          "name": "subPackages/indexGQ/index",
+          "pathName": "subPackages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https://test.m.cloud.sz-trip.com/culturalTravelHelp",
+          "name": "subPackageCheckPoint/pages/index/index",
+          "pathName": "subPackageCheckPoint/pages/index/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
@@ -34,13 +34,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "subPackages/indexGQ/index",
-          "pathName": "subPackages/indexGQ/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "subPackages/index/index",
           "pathName": "subPackages/index/index",

From 11f41c8f73d6083723533e98b56977b52c0c046f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 30 Apr 2025 11:17:08 +0800
Subject: [PATCH 310/471] =?UTF-8?q?=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/activitynew/index.js  |  7 +++---
 pages/user/retail/goods/index.js |  6 +++++-
 subPackages/index/index.js       |  9 ++++----
 subPackages/indexGQ/index.js     | 16 ++++++++------
 subPackages/indexs/index.js      | 18 ++++++++++------
 utils/util.js                    | 37 ++++++++++++++++++++++++++++++--
 6 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 2aef5ab..91e64e3 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -376,9 +376,10 @@ setCity(e){
   gotoDetail: function (e) {
     let item = e.currentTarget.dataset.item;
     if (this.data.type == 4 && this.data.movieType != 2) {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
+    //   wx.navigateTo({
+    //     url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+    //   })
+        util.goMovieDetail(item.third_id || item.id)
     } else if (this.data.type == 4) {
       wx.navigateTo({
         url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
diff --git a/pages/user/retail/goods/index.js b/pages/user/retail/goods/index.js
index e0d1b15..33f0a15 100644
--- a/pages/user/retail/goods/index.js
+++ b/pages/user/retail/goods/index.js
@@ -1,5 +1,6 @@
 // pages/user/retail/goods/index.js
 import spreadApi from "../../../../utils/https/common"
+import utils from "../../../../utils/util"
 Page({
 
   /**
@@ -125,7 +126,10 @@ Page({
         break;
       case "movie":
         // 产品 电影票
-        return '/pages/list/movieticket/list/info/index?id='+item.third_id+'&title='+item.title;
+        let url = utils.goMovieDetail(item.third_id,item.title,true)
+
+        // return '/pages/list/movieticket/list/info/index?id='+item.third_id+'&title='+item.title;
+        return url;
         break;
       case "cinema":
           // 产品 电影票
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 0fd2d47..835e1a0 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -488,10 +488,11 @@ Page({
 	tagGotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			wx.navigateTo({
-				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-					item.title,
-			})
+			// wx.navigateTo({
+			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+			// 		item.title,
+            // })
+            util.goMovieDetail(item.third_id, item.title)
 		} else {
 			util.gotoDetail(item)
 		}
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
index d5cf101..36eb873 100644
--- a/subPackages/indexGQ/index.js
+++ b/subPackages/indexGQ/index.js
@@ -335,9 +335,10 @@ Page({
     let item = e.currentTarget.dataset.item;
     let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
     if (type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
+    //   wx.navigateTo({
+    //     url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+    //   })
+        util.goMovieDetail(item.third_id)
     }else {
       wx.navigateTo({
         url: '/pages/info/activityInfo/index?id=' + item.id,
@@ -712,10 +713,11 @@ Page({
 	tagGotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			wx.navigateTo({
-				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-					item.title,
-			})
+			// wx.navigateTo({
+			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+			// 		item.title,
+            // })
+            util.goMovieDetail(item.third_id,item.title)
 		} else {
 			util.gotoDetail(item)
 		}
diff --git a/subPackages/indexs/index.js b/subPackages/indexs/index.js
index 409e869..98632bd 100644
--- a/subPackages/indexs/index.js
+++ b/subPackages/indexs/index.js
@@ -311,9 +311,11 @@ Page({
     let item = e.currentTarget.dataset.item;
     let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
     if (type == 'movie') {
-      wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-      })
+    //   wx.navigateTo({
+    //     url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+    //   })
+        util.goMovieDetail(item.third_id)
+
     }else {
       wx.navigateTo({
         url: '/pages/info/activityInfo/index?id=' + item.id,
@@ -676,10 +678,12 @@ Page({
 	tagGotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			wx.navigateTo({
-				url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-					item.title,
-			})
+			// wx.navigateTo({
+			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
+			// 		item.title,
+            // })
+            util.goMovieDetail(item.third_id,item.title)
+            
 		} else {
 			util.gotoDetail(item)
 		}
diff --git a/utils/util.js b/utils/util.js
index 871c27e..f3bb4d6 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -291,8 +291,10 @@ const gotoDetail = (item,isPagePoint) =>{
       break;
     case "movie":
       // 产品 电影票
+      let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title
       wx.navigateTo({
-        url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl),
+        // url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title
       })
       break;
     case "cinema":
@@ -475,6 +477,35 @@ const pagePoint = function(data,type) {
   }).then(res=>{
   })
 }
+
+const goMovieDetail= function(id, title, needReturn) {
+    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
+    if (title) {
+        tempUrl += +'&title='+item.title
+    }
+    let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
+    if (needReturn) {
+        return url
+    }
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
+      })
+    //   return  '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
+}
+
+const goMovieList= function(needReturn) {
+    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MoviesChangShu`
+    let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
+    if (needReturn) {
+        return url
+    }
+      wx.navigateTo({
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
+      })
+    //   return  '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
+}
+
+
 module.exports = {
   formatTime: formatTime,
   formatNumber: formatNumber,
@@ -492,5 +523,7 @@ module.exports = {
   goKjOrder:goKjOrder,
   pagePoint: pagePoint,
   formatMing:formatMing,
-  formatHou:formatHou
+  formatHou:formatHou,
+  goMovieDetail: goMovieDetail,
+  goMovieList: goMovieList
 }

From 590b2235ed79ee4265e6c8dbd1e3e1d2e9a46935 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 30 Apr 2025 12:25:14 +0800
Subject: [PATCH 311/471] ui

---
 app.js                 | 2 +-
 pages/index/index.wxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 3c2a2be..4621690 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.isTest185? true : false;
+      data.isTest = data.isTest186? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9028d7b..f3b737e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20250429/1c137d2a4e74ea71a55bd74bb530560f.png" mode="widthFix"></image>
+<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
   <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>

From 49ff0393b16e55c13ba5fb47a391e7c4ebd2f221 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 30 Apr 2025 14:25:20 +0800
Subject: [PATCH 312/471] 1

---
 app.js                      | 2 +-
 pages/index/index.js        | 2 +-
 project.private.config.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 4621690..cc9c5ec 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.isTest186? true : false;
+      data.isTest = data.isTest187? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 7d8c8f1..9d9cb7c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -110,7 +110,7 @@ Page({
             bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
             icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
             // path:'/pages/list/night/index',
-            url:'http://m.cloud.sz-trip.com/nightTour2025',
+            url:'https://m.cloud.sz-trip.com/nightTour2025',
             path: '',
             list: [],
             
diff --git a/project.private.config.json b/project.private.config.json
index 807c999..cbcdfce 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,7 +1,7 @@
 {
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "condition": {
     "miniprogram": {

From a4e3c220caddd845c5e0acdb85253563b662ddb0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 9 May 2025 13:39:50 +0800
Subject: [PATCH 313/471] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 pages/info/sceneProductInfo/index.wxml        |  2 +-
 pages/order/components/date/index.js          |  7 ++++++-
 pages/order/scene/index.wxml                  |  2 +-
 pages/user/order/movieOrderInfo/index.wxml    |  2 +-
 project.private.config.json                   |  7 +++++++
 subPackages/goods/oneCardTour/info/index.wxml | 13 +++++++------
 utils/util.js                                 |  7 ++++---
 8 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index cc9c5ec..13bd865 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.isTest187? true : false;
+      data.isTest = data.isTest188? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index fc15461..52cbacb 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -131,7 +131,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{30}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{showPrice/100}}</text>
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 8193e31..0a26eb7 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -19,6 +19,11 @@ Component({
     isTeam: {
       type: Number,
       default: 0
+    },
+    // 日期结束天数
+    endDays: {
+        type: Number,
+        value: 60
     }
   },
 
@@ -53,7 +58,7 @@ Component({
         skuName
       })
       // 在组件实例进入页面节点树时执行
-      let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 60 * 24 * 60 * 60 * 1000));
+      let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + this.properties.endDays * 24 * 60 * 60 * 1000));
       if (product.product.title.indexOf("苏州博物馆") != -1) {
         this.setData({
           isSzMuseum: true
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 1e5683e..06c34fe 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -135,7 +135,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content2">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{30}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{price}}</text>
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 77c75b6..5c2b8fe 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -48,7 +48,7 @@
     <view class="price">{{info.paid_money/100}}</view>
   </view>
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <navigator url="/pages/list/movieticket/index" class="btn">再次购买</navigator>
+    <!-- <navigator url="/pages/list/movieticket/index" class="btn">再次购买</navigator> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
diff --git a/project.private.config.json b/project.private.config.json
index cbcdfce..7a8a3d8 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/user/order/movieOrderInfo/index",
+          "pathName": "pages/user/order/movieOrderInfo/index",
+          "query": "id=46022504271632102675",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/indexGQ/index",
           "pathName": "subPackages/index/index",
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
index aab520f..25b2774 100644
--- a/subPackages/goods/oneCardTour/info/index.wxml
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -65,17 +65,18 @@
   
   <view class="scroll-content">
     <view class="com-flex sku-info-type-container">
-        <view class="sku-info-type {{activeItemIndex==0?'active':''}}" bind:tap="changeActiveIndex" data-index="0">年卡权益</view>
-        <view class="sku-info-type {{activeItemIndex==1?'active':''}}" bind:tap="changeActiveIndex" data-index="1">合作景区</view>
-        <view class="sku-info-type {{activeItemIndex==2?'active':''}}" bind:tap="changeActiveIndex" data-index="2">使用说明</view>
+        <view class="sku-info-type {{activeItemIndex==0?'active':''}}" bind:tap="changeActiveIndex" data-index="0">使用说明</view>
+        <view class="sku-info-type {{activeItemIndex==1?'active':''}}" bind:tap="changeActiveIndex" data-index="1">年卡权益</view>
+        <view class="sku-info-type {{activeItemIndex==2?'active':''}}" bind:tap="changeActiveIndex" data-index="2">合作景区</view>
     </view>
 
     <view style="padding:0 30rpx 30rpx;">
-        <rich-text wx:if="{{activeItemIndex==0}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.detailinfo)}}"></rich-text>
+        <rich-text wx:if="{{activeItemIndex==0}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.expenseinfo)}}"></rich-text>
 
-        <rich-text wx:if="{{activeItemIndex==1}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.bookinfo)}}"></rich-text>
+        <rich-text wx:if="{{activeItemIndex==1}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.detailinfo)}}"></rich-text>
+
+        <rich-text wx:if="{{activeItemIndex==2}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.bookinfo)}}"></rich-text>
 
-        <rich-text wx:if="{{activeItemIndex==2}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.expenseinfo)}}"></rich-text>
 
     </view>
   </view>
diff --git a/utils/util.js b/utils/util.js
index f3bb4d6..0dcba04 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -350,9 +350,10 @@ const orderMoreTime = function(item){
           return
     }
     else if(info.product_model=='movie'){
-      wx.navigateTo({
-        url: '/pages/list/movieticket/index',
-      })
+    //   wx.navigateTo({
+    //     url: '/pages/list/movieticket/index',
+    //   })
+        goMovieList()
     }
     else if(info.product_model=='activity'){
       wx.navigateTo({

From da8b998c182aa250b566feede3ebb91a420d9986 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 15 May 2025 14:22:42 +0800
Subject: [PATCH 314/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js    | 12 +++++++++++-
 pages/user/cartlist/list.js | 15 +++++++++++++++
 project.private.config.json | 11 +++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 9d934e6..afb040c 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -47,6 +47,9 @@ Page({
     codeId:null,
     inputAreaHeight: 0,
     heightTimer: null,
+
+    isPaying: false,
+
   },
 
   /**
@@ -103,6 +106,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+      // 正在支付中不处理
+    if (this.data.isPaying) return
+
     commonApi.user_post("subwallet.ermb/wallet",{}).then(res=>{
         // 给建设银行子钱包做标识
         let resData = res.data || []
@@ -248,6 +254,7 @@ Page({
     }).then(res=>{
       res.data = JSON.parse(res.data)
       console.log(res.data)
+      _this.data.isPaying = true
       wx.requestPayment({
         nonceStr: res.data.nonceStr || res.data.noncestr,
         package: res.data.package,
@@ -260,12 +267,15 @@ Page({
             icon:'success'
           })
           setTimeout(()=>{
+              // 支付成功不还原isPaying  redirectTo 会删掉当前页面触发unload
+            // _this.data.isPaying = false
             wx.redirectTo({
               url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
             })
           },1000)
         },
         fail:function(err){
+            _this.data.isPaying = false
           console.log(err)
         }
       })
@@ -557,7 +567,7 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-    if (!this.data.status) {
+    if (!this.data.status && !this.data.isPaying) {
       wx.reLaunch({
         url: '/pages/user/order/list',
       })
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index b013ace..cae4009 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -54,10 +54,25 @@ Page({
     getList: function () {
         commonApi.user_post("cart/get_list", {
             // type: '1'
+            offset:0,
+            limit:10,
         }).then(res => {
             this.setData({
                 list: res.data
             })
+
+            commonApi.user_post("cart/get_list", {
+                // type: '1'
+                offset:10,
+                limit:999,
+            }).then(res => {
+                let resData = this.data.list.concat((res.data || []))
+                this.setData({
+                    list: resData
+                })
+            })
+
+
         })
     },
     minus: function (e) {
diff --git a/project.private.config.json b/project.private.config.json
index 7a8a3d8..80b38f3 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,10 +6,17 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/order/pay/index",
+          "pathName": "pages/order/pay/index",
+          "query": "id=28182505151348102853",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/user/order/movieOrderInfo/index",
-          "pathName": "pages/user/order/movieOrderInfo/index",
-          "query": "id=46022504271632102675",
+          "pathName": "pages/order/payresult/index",
+          "query": "id=28182505151342456109",
           "launchMode": "default",
           "scene": null
         },

From 4e7f3914a7a944afcda2b222318a2694ba4ec7f3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 20 May 2025 13:28:38 +0800
Subject: [PATCH 315/471] =?UTF-8?q?=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 pages/index/index.wxml                     |  2 +-
 pages/order/pay/index.js                   |  5 +++++
 pages/pbService/web/index.js               | 15 ++++++++++++-
 pages/user/order/movieOrderInfo/index.js   |  9 +++++++-
 pages/user/order/movieOrderInfo/index.wxml | 25 +++++++++++++++++++---
 pages/user/order/movieOrderInfo/index.wxss | 22 ++++++++++++++++++-
 pages/user/user.wxml                       |  3 +++
 utils/util.js                              |  4 ++--
 9 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 13bd865..713c6ec 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.isTest188? true : false;
+      data.isTest = data.isTest189? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f3b737e..4c2ff70 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -123,7 +123,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
-          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://test.m.cloud.sz-trip.com/movies" data-event="one_card" data-title="户外游"  class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index afb040c..ccf51c9 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -56,6 +56,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+      // 有token 先更换token
+    if (options.token) {
+        wx.setStorageSync("jstrip_token", options.token)
+    }
+
     this.setData({
       id:options.id
     })
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 05c1156..689ac4a 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -73,7 +73,20 @@ Page({
             })
         })
     }
-     else {
+    // 君到苏州 加token
+    else if(lowerUrl.indexOf('m.cloud.sz-trip.com')!=-1) {
+        let token = wx.getStorageSync('jstrip_token')
+        if (token) {
+            if (Object.keys(webParam).length>0) {
+                weburl += '&token='+token
+            } else {
+                weburl += '?token='+token
+            }
+        } 
+        this.setData({
+            webUrl:weburl
+        })
+    } else {
         this.setData({
             webUrl:weburl
         })
diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js
index 165a42c..62c78fa 100644
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@@ -20,7 +20,9 @@ Page({
     id:null,
     minute:"",
     second:"",
-    ids:[]
+    ids:[],
+
+    showKeFuFlag: false,
   },
 
   /**
@@ -90,6 +92,11 @@ Page({
       feeInfoFlag:!this.data.feeInfoFlag
     })
   },
+  showKeFu: function(){
+    this.setData({
+        showKeFuFlag:!this.data.showKeFuFlag
+      })
+  },
   close:function(){
     let _this = this,info = _this.data.info;
     wx.showModal({
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 5c2b8fe..948f2f2 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -3,7 +3,14 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    <view style="display: flex;flex-direction: column;">
+        <view>{{info.state_text}}</view>
+        <text class="movie-type">{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}-电影票</text>
+    </view>
+
+    <image bind:tap="showKeFu" class="kefu" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png"></image>
+</view>
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -141,9 +148,9 @@
 </view>
 
 
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
@@ -153,4 +160,16 @@
     <view class="mask-item"><text>优惠券抵扣</text><text>-￥{{info.preference_money/100}}</text></view>
     <view class="mask-item"><text>订单实付</text><text>￥{{info.paid_money/100}}</text></view>
   </view>
+</view>
+
+<view class="mask" wx:if="{{showKeFuFlag}}">
+  <view class="mask-bg" bindtap="showKeFu"></view>
+  <view class="mask-content kefu-mask">
+    <view class="mask-title"></view>
+    <view class="iconfont icon-close" bindtap="showKeFu"></view>
+    <view>如有问题</view>
+    <view>请联系{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}客服</view>
+    <view style="font-size: 40rpx;color: #0B898E;padding: 41rpx 0;">{{orderDetail.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '4006979968'}}</view>
+    <view style="font-weight: 500;font-size: 26rpx;color: #000000;padding-bottom: 40rpx;">服务时间（9:00-21:00）</view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/user/order/movieOrderInfo/index.wxss b/pages/user/order/movieOrderInfo/index.wxss
index 36a80fc..e464949 100644
--- a/pages/user/order/movieOrderInfo/index.wxss
+++ b/pages/user/order/movieOrderInfo/index.wxss
@@ -12,9 +12,22 @@ page {
 }
 .state-text {
   margin: 20rpx 30rpx;
-  line-height: 100rpx;
+  /* line-height: 100rpx; */
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.state-text .kefu{
+    width: 80rpx;
+    height: 80rpx;
+}
+.movie-type{
+    font-weight: 500;
+font-size: 26rpx;
+color: #FFFFFF;
+padding-top: 20rpx;
 }
 .box {
   padding: 20rpx;
@@ -281,4 +294,11 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
+}
+.kefu-mask{
+    text-align: center;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #111111;
+    line-height: 48rpx;
 }
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 595065a..06731c6 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -122,6 +122,9 @@
     <navigator url="userPrivacy/index?id=14" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       第三方共享信息清单
     </navigator>
+    <navigator url="/pages/pbService/web/index?weburl=https://m.supplier.cloud.sz-trip.com/login" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
+      商户核销
+    </navigator>
   </view>
 
   <view class="bottom-intro">
diff --git a/utils/util.js b/utils/util.js
index 0dcba04..54e4387 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -480,7 +480,7 @@ const pagePoint = function(data,type) {
 }
 
 const goMovieDetail= function(id, title, needReturn) {
-    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
+    let tempUrl = 'https://test.m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
     if (title) {
         tempUrl += +'&title='+item.title
     }
@@ -495,7 +495,7 @@ const goMovieDetail= function(id, title, needReturn) {
 }
 
 const goMovieList= function(needReturn) {
-    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MoviesChangShu`
+    let tempUrl = 'https://test.m.cloud.sz-trip.com/movies'
     let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
     if (needReturn) {
         return url

From c10e81151778d658711a1cc5858aca9d4db7b654 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 20 May 2025 17:32:47 +0800
Subject: [PATCH 316/471] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  97 +++---
 app.json                                      |   1 +
 pages/index/index.js                          | 306 +++---------------
 pages/info/guideInfo/index.json               |   2 +-
 pages/list/six/index.json                     |   1 -
 pages/map/index.json                          |   1 -
 pages/order/WineSceneOrder/index.json         |   4 +-
 pages/order/components/contact/index.json     |   1 -
 pages/order/scene/index.json                  |   1 -
 pages/order/showOrderNew/index.json           |   1 -
 pages/pbService/feiyi/info/index.json         |   3 +-
 pages/pbService/web/index.js                  |  45 ++-
 pages/user/user.js                            |  53 +--
 subPackages/feiyiNew/index.json               |   5 +-
 subPackages/goods/oneCardTour/info/index.json |   1 -
 subPackages/indexs/index.json                 |   1 -
 subPackages/techanNew/index.json              |   4 +-
 17 files changed, 164 insertions(+), 363 deletions(-)

diff --git a/app.js b/app.js
index 713c6ec..f354f30 100644
--- a/app.js
+++ b/app.js
@@ -2,64 +2,58 @@
 import commonApi from "./utils/https/common"
 App({
   onLaunch: function (options) {
+    // 用异步处理
     if (options.query.authCode) {
-      wx.setStorageSync('authCode', options.query.authCode)
+        //wx.setStorageSync('authCode', options.query.authCode)
+        wx.setStorage('authCode', options.query.authCode)
     } else {
-      wx.removeStorageSync('authCode')
+        //wx.removeStorageSync('authCode')
+        wx.removeStorage('authCode')
     }
     this.updateApp()
-    let rect = wx.getSystemInfoSync();
-    this.globalData.safeBottom = rect.safeArea ? (rect.safeArea.bottom - rect.safeArea.height) : 0
-    // 获取uuid
-    commonApi._post("browse/get_uuid", {}).then(res => {
-      // console.log('uuid',res);
-      this.globalData.uuid = res.data.uuid;
-      wx.setStorageSync('uuid', res.data.uuid)
-    })
-    // 获取前端配置文件
-    commonApi._post("pbservice/Other/getClientConfig", {
-      unique_key: "wechatxcx"
-    }).then(res => {
-      let data = JSON.parse(res.data);
-      data.isTest = data.isTest189? true : false;
-      this.globalData.configJson = data
-    }).then(() => {
-      // 获取ui配置文件
-      commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
-        let obj = {}
-        res.data.content.forEach(item => {
-          obj[item.id] = item.image
-        });
-        this.globalData.configJson.indexSeason = obj 
-        this.globalData.loadIndexSeason = true
-      })
-    })
-
-
-
+    
+    this.globalData.appLaunchFlag = false
+  },
 
-    // 获取用户信息
-    // wx.getSetting({
-    //   success: res => {
-    //     if (res.authSetting['scope.userInfo']) {
-    //       // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
-    //       wx.getUserInfo({
-    //         success: res => {
-    //           // 可以将 res 发送给后台解码出 unionId
-    //           this.globalData.userInfo = res.userInfo
+  onShow: function () {
+      // onshow 从后台打开会多次执行 用flag判断
+        console.log("执行App onShow")
+        if (this.globalData.appLaunchFlag) return
+        console.log("执行App onShow2")
+        this.globalData.appLaunchFlag = true
+        // 缓存systemInfo
+        let systemInfo = wx.getSystemInfoSync();
+        this.globalData.safeBottom = systemInfo.safeArea ? (systemInfo.safeArea.bottom - systemInfo.safeArea.height) : 0
+        wx.setStorage('systemInfo', systemInfo)
+        let rect = wx.getMenuButtonBoundingClientRect();
+        wx.setStorage("rect", rect)
 
-    //           // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
-    //           // 所以此处加入 callback 以防止这种情况
-    //           if (this.userInfoReadyCallback) {
-    //             this.userInfoReadyCallback(res)
-    //           }
-    //         }
-    //       })
-    //     }
-    //   }
-    // })
-    this.getShareCategoryId()
+        
+        // 获取uuid
+        commonApi._post("browse/get_uuid", {}).then(res => {
+            // console.log('uuid',res);
+            this.globalData.uuid = res.data.uuid;
+            wx.setStorageSync('uuid', res.data.uuid)
+        })
+        // 获取前端配置文件
+        commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
+            let data = JSON.parse(res.data);
+            data.isTest = data.isTest189? true : false;
+            this.globalData.configJson = data
+        }).then(() => {
+            // 获取ui配置文件 在首页调用
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+                let obj = {}
+                res.data.content.forEach(item => {
+                obj[item.id] = item.image
+                });
+                this.globalData.configJson.indexSeason = obj 
+                this.globalData.loadIndexSeason = true
+            })
+        })
+        this.getShareCategoryId()
   },
+
   // 更新提示
   updateApp: function () {
     const updateManager = wx.getUpdateManager()
@@ -180,6 +174,7 @@ App({
     })
   },
   globalData: {
+    appLaunchFlag: false, // App onLaunch执行结束
     CategoryIds: {}, //分享出去的页面id
     category_id: "", //分享进来的参数
     from: "", // 是否是从其他小程序跳转过来的 如果是从其他小程序跳转的话 会记录
diff --git a/app.json b/app.json
index ac4fa44..6bf88ff 100644
--- a/app.json
+++ b/app.json
@@ -241,6 +241,7 @@
     "navigationBarTextStyle": "black",
     "navigationStyle": "custom"
   },
+  "lazyCodeLoading": "requiredComponents",
   "style": "v2",
   "sitemapLocation": "sitemap.json",
   "tabBar": {
diff --git a/pages/index/index.js b/pages/index/index.js
index 9d9cb7c..3c95918 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -146,10 +146,7 @@ Page({
     isMayDay: new Date().getTime()>new Date('2025/05/01 00:00:00').getTime()
     
 	},
-	onLoad: function(options) {
-		this.getHeight()
-		//全屏广告
-		wx.hideTabBar() //这里隐藏了底部导航栏
+  onLoad: function(options) {
 		commonApi._post("adv/getAdv", {
 			position: 2,
 			type_id: 3
@@ -205,56 +202,22 @@ Page({
 		})
 		if (options.from) {
 			app.globalData.from = options.from;
-    }
-    // 获取今天的日期
+    	}
+		this.getHeight()
+		//全屏广告
+		wx.hideTabBar() //这里隐藏了底部导航栏
+		
+    	// 获取今天的日期
 		let today = new Date();
+		let d = new Date();
+		let month = d.getMonth() + 1,day = d.getDate();
+		month = month > 10 ? month : ("0" + month);
+		day = day > 10 ? day : ("0" + day);
 		this.setData({
 			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-    let d = new Date();
-    let month = d.getMonth() + 1,
-      day = d.getDate();
-    month = month > 10 ? month : ("0" + month);
-    day = day > 10 ? day : ("0" + day);
-    this.setData({
-      today: d.getFullYear() + "-" + month + "-" + day
-    })
-		let systemInfo = wx.getSystemInfoSync(),
-			rect = wx.getMenuButtonBoundingClientRect();
-		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
-		wx.getLocation({
-			type: 'gcj02',
-			success: (res) => {
-				this.setData({
-					lat: res.latitude,
-					lon: res.longitude
-				})
-        this.getList()
-        this.getHdrlList()
-			},
-			fail: (err) => {
-        this.getList()
-        this.getHdrlList()
-			}
-		})
-		this.setData({
-			height: height,
-			padHeight: systemInfo.statusBarHeight,
-			right: (systemInfo.screenWidth - rect.right) + rect.width
+			date: today.getDate(),
+			today: d.getFullYear() + "-" + month + "-" + day
 		})
-
-		commonApi._post("pbservice/Other/getClientConfig", {
-			unique_key: "urltopage"
-		}).then(res => {
-			let data = JSON.parse(res.data)
-			this.setData({
-				urltopage: data
-			})
-		})
-		this.getTwoProduct()
-		this.getBanner()
-    this.getWeather()
   },
   gobdDetail(e) {
     let item = e.currentTarget.dataset.item
@@ -431,14 +394,16 @@ Page({
   // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
-		wx.getSystemInfo({
-			success(res) {
-				console.log(res)
-				that.setData({
-					viewHeight: res.windowHeight + 'px'
-				})
-				console.log(that.data.viewHeight)
-			}
+		let systemInfo = wx.getStorageSync('systemInfo'),rect = wx.getMenuButtonBoundingClientRect();
+		if (!systemInfo) {systemInfo = wx.getSystemInfoSync()}
+		if (!rect) {rect = wx.getMenuButtonBoundingClientRect()}
+		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+
+		that.setData({
+			viewHeight: systemInfo.windowHeight + 'px',
+			height: height,
+			padHeight: systemInfo.statusBarHeight,
+			right: (systemInfo.screenWidth - rect.right) + rect.width
 		})
 	},
 	// getXpthList: function() {
@@ -887,34 +852,7 @@ Page({
 
 		})
 	},
-	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	// getList: function() {
-	// 	if (!this.data.listMore) return;
-	// 	commonApi._post("search/recommend", {
-	// 		offset: this.data.list.length,
-	// 		limit: 16
-	// 	}).then(res => {
-	// 		res.data.map(item => {
-	// 			if (item.ext.display_tags) {
-	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-	// 			} else {
-	// 				item.ext.display_tags = []
-	// 			}
-	// 		})
-	// 		if (res.data.length < 15) {
-	// 			this.setData({
-	// 				listMore: false
-	// 			})
-	// 		}
-	// 		this.setData({
-	// 			list: this.data.list.concat(res.data)
-	// 		})
-	// 	})
-	// },
 	onReachBottom: function() {
-		// if (this.data.list.length < 30) {
-		// 	this.getList()
-		// }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -1042,186 +980,43 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	// bannerClick2: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.action == 'href') {
-	// 		if (item.href.indexOf(",") != -1) {
-	// 			let info = item.href.split(",");
-	// 			wx.navigateToMiniProgram({
-	// 				appId: info[0],
-	// 				path: info[1]
-	// 			})
-	// 		} else if (item.href.indexOf('map/index') != -1) {
-	// 			wx.reLaunch({
-	// 				url: item.href
-	// 			})
-	// 		} else {
-	// 			wx.navigateTo({
-	// 				url: item.href,
-	// 			})
-	// 		}
-	// 	} else if (item.action == "web") {
-	// 		app.globalData.weburl = item.href;
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-	// 		})
-	// 	}
-	// },
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// // 获取短视频大赛是否中奖 中奖详情
-	// getVideoPrize() {
-	// 	let user_id = wx.getStorageSync('jstrip_userid');
-	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-	// 	commonApi.user_post('actonline/video_act/getRaffle', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			videoPrize: res.data
-	// 		})
-	// 	})
-	// },
-	// noMoreTip() {
-	// 	wx.setStorageSync('indexPriceNoTip', true)
-	// 	this.closePrice()
-	// },
-	// closePrice() {
-	// 	this.setData({
-	// 		videoPrize: false,
-	// 		prizeInfo: null
-	// 	})
-	// },
-	// 抽奖
-	// choosePrize() {
-	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			prizeInfo: res.data
-	// 		})
-	// 		if (res.data.type != 'none') {
-	// 			// 抽奖成功的话 弹框
-	// 			wx.showModal({
-	// 				title: "提示",
-	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-	// 				showCancel: false
-	// 			})
-	// 		}
-	// 	})
-	// },
-	// bannerJumpNew(item) {
-	// 	let that = this
-	// 	item = item.currentTarget.dataset.item
-	// 	if (item.tdata == '') return
-	// 	that.pagePoint({
-	// 		event: "banner_click",
-	// 		type: 'banner'
-	// 	}, 1)
-	// 	switch (item.jump_type) {
-	// 		case 0:
-	// 			break;
-	// 		case 1:
-	// 			util.gotoDetail(item.product_model)
-	// 			break;
-	// 		case 2:
-	// 			if (item.front_model && item.front_model.mini) {
-	// 				wx.navigateTo({
-	// 					url: "/" + item.front_model.mini
-	// 				})
-	// 			}
-	// 			break;
-	// 		case 3:
-	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-	// 				// 外部h5
-	// 				console.log(item.tdata)
-	// 				app.globalData.weburl = item.tdata.url;
-	// 				wx.navigateTo({
-	// 					url: "/pages/pbService/web/index"
-	// 				})
-	// 			} else {
-	// 				let page = item.tdata.url.split("/");
-	// 				page = page[page.length - 1].split("?")
-	// 				console.log(page[0])
-	// 				let url = this.data.urltopage[page[0]];
-	// 				if (url && url.indexOf('map') != -1) {
-	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-	// 							'cinema', 'academes'
-	// 						],
-	// 						type = page[1] ? page[1].split("=") : [];
-	// 					wx.reLaunch({
-	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-	// 					})
-	// 				} else if (url) {
-	// 					wx.navigateTo({
-	// 						url: url,
-	// 					})
-	// 				} else {
-	// 					app.globalData.weburl = item.tdata.url;
-	// 					wx.navigateTo({
-	// 						url: "/pages/pbService/web/index"
-	// 					})
-	// 				}
-	// 			}
-	// 			break;
-	// 		case 4:
-	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-	// 				// 如果是苏心游的小程序 直接把authCode带过去
-	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-	// 					let weburl = item.tdata.page
-	// 					if (weburl.indexOf('?') != -1) {
-	// 						weburl += '&authCode=' + res.data;
-	// 					} else {
-	// 						weburl += '?authCode=' + res.data
-	// 					}
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: weburl
-	// 					})
-	// 				}).catch(err => {
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: item.tdata.page
-	// 					})
-	// 				})
-	// 			} else {
-	// 				wx.navigateToMiniProgram({
-	// 					appId: item.tdata.appid,
-	// 					path: item.tdata.page
-	// 				})
-	// 			}
-	// 			break;
-	// 		default:
-	// 			break;
-	// 	}
-	// 	return
-	// },
 	onReady: function() {
+		wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+				this.getList()
+				this.getHdrlList()
+			},
+			fail: (err) => {
+				this.getList()
+				this.getHdrlList()
+			}
+		})
 
+		commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
+			this.setData({
+				urltopage: data
+			})
+		})
+		// this.getTwoProduct()
+		this.getBanner()
+    	this.getWeather()
 
 	},
-	// gotoOther: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.type == 'h5') {
-	// 		app.globalData.weburl = item.url
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-	// 		})
-	// 	} else if (item.type == 'mini') {
-	// 		wx.navigateToMiniProgram({
-	// 			appId: item.appid,
-	// 			path: item.path
-	// 		})
-	// 	} else if (item.type == 'page') {
-	// 		wx.navigateTo({
-	// 			url: item.page,
-	// 		})
-	// 	}
-	// },
+	
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
@@ -1241,7 +1036,6 @@ Page({
 		this.pagePoint({
 			event: 'home_view'
 		}, 1)
-		// this.data.time!=5?wx.showTabBar():1
 	},
 
 	/**
diff --git a/pages/info/guideInfo/index.json b/pages/info/guideInfo/index.json
index 35cf02f..79be446 100644
--- a/pages/info/guideInfo/index.json
+++ b/pages/info/guideInfo/index.json
@@ -1,5 +1,5 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    
   }
 }
\ No newline at end of file
diff --git a/pages/list/six/index.json b/pages/list/six/index.json
index 4cc7ccc..35cf02f 100644
--- a/pages/list/six/index.json
+++ b/pages/list/six/index.json
@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "search":"/pages/component/SearchHeader",
     "title":"/pages/component/TitleHeader"
   }
 }
\ No newline at end of file
diff --git a/pages/map/index.json b/pages/map/index.json
index 074fb77..9639d0a 100644
--- a/pages/map/index.json
+++ b/pages/map/index.json
@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "search":"/pages/component/SearchHeader",
     "title":"/pages/component/TitleHeader"
 
   }
diff --git a/pages/order/WineSceneOrder/index.json b/pages/order/WineSceneOrder/index.json
index 17ea59b..6e93399 100644
--- a/pages/order/WineSceneOrder/index.json
+++ b/pages/order/WineSceneOrder/index.json
@@ -1,10 +1,8 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "date1":"../components/date/index",
     "contact":"../components/contact/index",
     "coupon":"../components/coupon/index",
-    "notice":"/pages/component/notice/notice",
-    "date":"/pages/order/components/date"
+    "notice":"/pages/component/notice/notice"
   }
 }
\ No newline at end of file
diff --git a/pages/order/components/contact/index.json b/pages/order/components/contact/index.json
index da13845..78013bd 100644
--- a/pages/order/components/contact/index.json
+++ b/pages/order/components/contact/index.json
@@ -1,6 +1,5 @@
 {
   "component": true,
   "usingComponents": {
-    "add":"/pages/user/linkman/add"
   }
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.json b/pages/order/scene/index.json
index 17ea59b..19927e7 100644
--- a/pages/order/scene/index.json
+++ b/pages/order/scene/index.json
@@ -1,7 +1,6 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "date1":"../components/date/index",
     "contact":"../components/contact/index",
     "coupon":"../components/coupon/index",
     "notice":"/pages/component/notice/notice",
diff --git a/pages/order/showOrderNew/index.json b/pages/order/showOrderNew/index.json
index 17ea59b..19927e7 100644
--- a/pages/order/showOrderNew/index.json
+++ b/pages/order/showOrderNew/index.json
@@ -1,7 +1,6 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "date1":"../components/date/index",
     "contact":"../components/contact/index",
     "coupon":"../components/coupon/index",
     "notice":"/pages/component/notice/notice",
diff --git a/pages/pbService/feiyi/info/index.json b/pages/pbService/feiyi/info/index.json
index eb3533f..35cf02f 100644
--- a/pages/pbService/feiyi/info/index.json
+++ b/pages/pbService/feiyi/info/index.json
@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader",
-    "common-image":"/pages/component/commonImage/index"
+    "title":"/pages/component/TitleHeader"
   }
 }
\ No newline at end of file
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 689ac4a..0731d7d 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -11,7 +11,8 @@ Page({
   data: {
     webUrl:"",
 	shareTitle: "",
-	shareUrl: ""
+    shareUrl: "",
+    canSetData: true
   },
 
   /**
@@ -51,9 +52,10 @@ Page({
                 weburl += '&token='+res.data.token
             }
         }).finally(()=>{
-            this.setData({
-                webUrl:weburl
-            })
+            // this.setData({
+            //     webUrl:weburl
+            // })
+            this.setUrl(weburl)
         })
     }
     // 遇见昆山
@@ -68,9 +70,10 @@ Page({
                 weburl += '&token='+res.data.token
             }
         }).finally(()=>{
-            this.setData({
-                webUrl:weburl
-            })
+            // this.setData({
+            //     webUrl:weburl
+            // })
+            this.setUrl(weburl)
         })
     }
     // 君到苏州 加token
@@ -83,13 +86,15 @@ Page({
                 weburl += '?token='+token
             }
         } 
-        this.setData({
-            webUrl:weburl
-        })
+        // this.setData({
+        //     webUrl:weburl
+        // })
+        this.setUrl(weburl)
     } else {
-        this.setData({
-            webUrl:weburl
-        })
+        // this.setData({
+        //     webUrl:weburl
+        // })
+        this.setUrl(weburl)
     }
 
   // if(weburl.indexOf('m.cloud.sz-trip.com')!=-1){
@@ -148,6 +153,20 @@ Page({
     }
   },
 
+  setUrl (url) {
+      let that = this
+      if (this.data.canSetData) {
+          this.data.canSetData = false
+          this.setData({
+            webUrl:url
+          })
+          setTimeout(() => {
+            that.data.canSetData = true
+          }, 1000);
+      }
+
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/user/user.js b/pages/user/user.js
index 06182c7..e5497a5 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -79,9 +79,11 @@ Page({
    */
   onShow: function () {
     userApi.user_post("user/getMyInfo").then(res => {
-      this.setData({
-        info: res.data
-      })
+        if (res && res.data) {
+            this.setData({
+                info: res.data
+            })
+        }
     })
     util.pagePoint({
       event:'mine_view'
@@ -103,28 +105,31 @@ Page({
       limit:10,
       keywords:''
     }).then(res=>{
-      console.log(res);
-      let arr = []
-      let trr = []
-      let yrr = []
-      let reslist = res.data.list
-      this.setData({})
-      let nowDateTime = parseInt(new Date().getTime() / 1000)
-      for (let i = 0; i < reslist.length; i++) {
-        let del = nowDateTime - this.strtotime(reslist[i].create_time)
-        if (del < reslist[i].auto_close_time) {
-          trr.push(reslist[i].auto_close_time - del)
-          yrr.push(this.formatSeconds(reslist[i].auto_close_time - del))
-          arr.push(reslist[i].order_product_list[0])
+        console.log(res);
+
+        if (res && res.data && res.data.length>0){
+            let arr = []
+            let trr = []
+            let yrr = []
+            let reslist = res.data.list
+            this.setData({})
+            let nowDateTime = parseInt(new Date().getTime() / 1000)
+            for (let i = 0; i < reslist.length; i++) {
+                let del = nowDateTime - this.strtotime(reslist[i].create_time)
+                if (del < reslist[i].auto_close_time) {
+                trr.push(reslist[i].auto_close_time - del)
+                yrr.push(this.formatSeconds(reslist[i].auto_close_time - del))
+                arr.push(reslist[i].order_product_list[0])
+                }
+            }
+            this.setData({
+                list: arr,
+                orderList: reslist,
+                timeList: trr,
+                formatTime:yrr
+            })
+            this.timer(this.data.timeList)
         }
-      }
-      this.setData({
-        list: arr,
-        orderList: reslist,
-        timeList: trr,
-        formatTime:yrr
-      })
-      this.timer(this.data.timeList)
     })
   },
   strtotime(str) {
diff --git a/subPackages/feiyiNew/index.json b/subPackages/feiyiNew/index.json
index 0861abd..2d9de7a 100644
--- a/subPackages/feiyiNew/index.json
+++ b/subPackages/feiyiNew/index.json
@@ -1,7 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader",
-    "common-image":"/pages/component/commonImage/index",
-    "search":"/pages/component/SearchHeader"
+
+    "common-image":"/pages/component/commonImage/index"
   }
 }
\ No newline at end of file
diff --git a/subPackages/goods/oneCardTour/info/index.json b/subPackages/goods/oneCardTour/info/index.json
index ee48bc8..5d2d101 100644
--- a/subPackages/goods/oneCardTour/info/index.json
+++ b/subPackages/goods/oneCardTour/info/index.json
@@ -1,7 +1,6 @@
 {
     "usingComponents": {
       "title":"/pages/component/TitleHeader",
-          "notice":"/pages/component/notice/notice",
       "code":"/pages/order/components/wxqrCode/index",
       "date":"/pages/order/components/date"
           
diff --git a/subPackages/indexs/index.json b/subPackages/indexs/index.json
index 7c4437e..35cf02f 100644
--- a/subPackages/indexs/index.json
+++ b/subPackages/indexs/index.json
@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "common-image":"/pages/component/commonImage/index",
     "title":"/pages/component/TitleHeader"
   }
 }
\ No newline at end of file
diff --git a/subPackages/techanNew/index.json b/subPackages/techanNew/index.json
index 0861abd..db066e2 100644
--- a/subPackages/techanNew/index.json
+++ b/subPackages/techanNew/index.json
@@ -1,7 +1,5 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader",
-    "common-image":"/pages/component/commonImage/index",
-    "search":"/pages/component/SearchHeader"
+    "common-image":"/pages/component/commonImage/index"
   }
 }
\ No newline at end of file

From 5335d8e68ee811d51ae9a6acb54001933ea2e769 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 22 May 2025 13:05:01 +0800
Subject: [PATCH 317/471] =?UTF-8?q?=E9=9D=9E=E9=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                  |  21 +-
 pages/index/index.wxml                    |   2 +-
 project.private.config.json               |   6 +-
 subPackages/feiyiNew/CGCIndex/index.js    | 291 ++++++++++++++++++++++
 subPackages/feiyiNew/CGCIndex/index.json  |   5 +
 subPackages/feiyiNew/CGCIndex/index.wxml  |  78 ++++++
 subPackages/feiyiNew/CGCIndex/index.wxss  | 154 ++++++++++++
 subPackages/feiyiNew/CGCLetter/index.js   | 114 +++++++++
 subPackages/feiyiNew/CGCLetter/index.json |   5 +
 subPackages/feiyiNew/CGCLetter/index.wxml |  34 +++
 subPackages/feiyiNew/CGCLetter/index.wxss |  67 +++++
 subPackages/feiyiNew/CGCTime/index.js     | 114 +++++++++
 subPackages/feiyiNew/CGCTime/index.json   |   5 +
 subPackages/feiyiNew/CGCTime/index.wxml   |  34 +++
 subPackages/feiyiNew/CGCTime/index.wxss   |  67 +++++
 subPackages/feiyiNew/index.js             |  17 +-
 16 files changed, 997 insertions(+), 17 deletions(-)
 create mode 100644 subPackages/feiyiNew/CGCIndex/index.js
 create mode 100644 subPackages/feiyiNew/CGCIndex/index.json
 create mode 100644 subPackages/feiyiNew/CGCIndex/index.wxml
 create mode 100644 subPackages/feiyiNew/CGCIndex/index.wxss
 create mode 100644 subPackages/feiyiNew/CGCLetter/index.js
 create mode 100644 subPackages/feiyiNew/CGCLetter/index.json
 create mode 100644 subPackages/feiyiNew/CGCLetter/index.wxml
 create mode 100644 subPackages/feiyiNew/CGCLetter/index.wxss
 create mode 100644 subPackages/feiyiNew/CGCTime/index.js
 create mode 100644 subPackages/feiyiNew/CGCTime/index.json
 create mode 100644 subPackages/feiyiNew/CGCTime/index.wxml
 create mode 100644 subPackages/feiyiNew/CGCTime/index.wxss

diff --git a/app.json b/app.json
index 6bf88ff..62d190a 100644
--- a/app.json
+++ b/app.json
@@ -204,18 +204,21 @@
         "transferPage/transferPage",
         "password/overview/overview",
         "password/setting/setting",
-        "goods/oneCardTour/info/index"
+        "goods/oneCardTour/info/index",
+        "feiyiNew/CGCIndex/index",
+        "feiyiNew/CGCLetter/index",
+        "feiyiNew/CGCTime/index"
       ]
     },
     {
-        "root": "subPackageCheckPoint",
-        "pages": [
-            "pages/index/index",
-            "pages/scopemap/index",
-            "pages/detailsmap/index",
-            "pages/content/index",
-            "pages/web/index"
-        ]
+      "root": "subPackageCheckPoint",
+      "pages": [
+        "pages/index/index",
+        "pages/scopemap/index",
+        "pages/detailsmap/index",
+        "pages/content/index",
+        "pages/web/index"
+      ]
     }
   ],
   "plugins": {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4c2ff70..f3b737e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -123,7 +123,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
-          <view bindtap="gotoUrl" data-url="https://test.m.cloud.sz-trip.com/movies" data-event="one_card" data-title="户外游"  class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
diff --git a/project.private.config.json b/project.private.config.json
index 80b38f3..f220fe7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,9 +7,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/order/pay/index",
-          "pathName": "pages/order/pay/index",
-          "query": "id=28182505151348102853",
+          "name": "subPackages/feiyiNew/CGCIndex/index",
+          "pathName": "subPackages/feiyiNew/CGCIndex/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
diff --git a/subPackages/feiyiNew/CGCIndex/index.js b/subPackages/feiyiNew/CGCIndex/index.js
new file mode 100644
index 0000000..45cdd70
--- /dev/null
+++ b/subPackages/feiyiNew/CGCIndex/index.js
@@ -0,0 +1,291 @@
+// subPackages/feiyiNew/CGCIndex/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    banner: [],
+    xiaobanner: [],
+    menuList: [
+        {path: '/subPackages/feiyiNew/index?idIndex=0'},
+        {path: '/subPackages/feiyiNew/index?idIndex=1'},
+        {path: '/subPackages/feiyiNew/index?idIndex=2'},
+        {path: '/subPackages/feiyiNew/index?idIndex=3'},
+        {path: '/subPackages/feiyiNew/index?idIndex=4'},
+        {path: '/subPackages/feiyiNew/index?idIndex=5'}
+    ],
+    handwrittenList: [],
+    SGVideo: {},
+
+    hotType: [
+        {title: '好物推荐',id: '41'},
+        {title: '猜你喜欢',id: '41'}
+    ],
+    hotIndex: -1,
+    hotList: [],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+    this.getBanner()
+    this.getFeiYiSZ()
+    this.getFeiYiSG()
+    this.changeHotType({currentTarget:{dataset:{index:0}}})
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  getBanner: function() {
+    // 大banner 
+    commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
+        this.setData({banner: res.data || []})
+    })
+    // 分类旁的广告
+    commonApi._post("adv/getAdv", { position: 1,type_id: 3}).then(res => {
+        this.setData({xiaobanner: res.data || [] })
+    })
+  },
+   // 轮播图点击
+  bannerClick: function (e) {
+    let item = e.currentTarget.dataset.item;
+    // this.pagePoint({event: "banner_click",type: 'banner'}, 1)
+    switch (item.jump_type) {
+        case 0:
+            break;
+        case 1:
+            util.gotoDetail(item.product_model)
+            break;
+        case 2:
+            if (item.front_model && item.front_model.mini) {
+                wx.navigateTo({
+                    url: "/" + item.front_model.mini
+                })
+            }
+            break;
+        case 3:
+            if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+                item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+                // 外部h5
+                console.log(111, item.tdata)
+                wx.navigateTo({
+                    url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata.url)
+                })
+            } else {
+                let page = item.tdata.url.split("/");
+                page = page[page.length - 1].split("?")
+                console.log(page[0])
+                let url = this.data.urltopage[page[0]];
+                if (url && url.indexOf('map') != -1) {
+                    let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic','cinema', 'academes'],
+                        type = page[1] ? page[1].split("=") : [];
+                    wx.reLaunch({
+                        url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :null)
+                    })
+                } else if (url) {
+                    wx.navigateTo({
+                        url: url,
+                    })
+                } else {
+                    wx.navigateTo({
+                        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata.url)
+                    })
+                }
+            }
+            break;
+        case 4:
+            if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+                // 如果是苏心游的小程序 直接把authCode带过去
+                userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+                    let weburl = item.tdata.page
+                    if (weburl.indexOf('?') != -1) {
+                        weburl += '&authCode=' + res.data;
+                    } else {
+                        weburl += '?authCode=' + res.data
+                    }
+                    wx.navigateToMiniProgram({
+                        appId: item.tdata.appid,
+                        path: weburl
+                    })
+                }).catch(err => {
+                    wx.navigateToMiniProgram({
+                        appId: item.tdata.appid,
+                        path: item.tdata.page
+                    })
+                })
+            } else {
+                wx.navigateToMiniProgram({
+                    appId: item.tdata.appid,
+                    path: item.tdata.page
+                })
+            }
+            break;
+        default:
+            break;
+    }
+    return;
+  },
+  // 金刚区跳转
+  goFeiYiList: function (e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: item.path,
+    })
+  },
+
+  // 非遗手札
+  getFeiYiSZ: function () {
+    commonApi._post("travels/getList", {
+        page_no: 0,
+        page_num: 4,
+        // type_key: 'feiyishouzha',
+        type_key: 'someArt',
+    }).then(res => {
+        if (res) {
+            this.setData({handwrittenList: res.data.rows || [] })
+        }
+    })
+  },
+
+  // 非议时光
+  getFeiYiSG : function () {
+    commonApi._post("multimedia/media_list", {
+        limit: 1,
+        page: 1,
+        class_id: 139,
+        // class_id: 140,
+        type: 1,
+    }).then(res => {
+        if (res) {
+            this.setData({SGVideo: res.data.data[0] || [] })
+        }
+    })
+  },
+  
+  // 视频播放
+  goPlayVideo:function(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+        url: '/pages/pbService/appreciate/info/index?info='+encodeURIComponent(JSON.stringify(item)),
+    })
+  },
+
+
+  // 底部推荐
+  changeHotType:function(e) {
+    let index = e.currentTarget.dataset.index;
+    if (index!=this.data.hotIndex) {
+        this.setData({hotIndex: index})
+        let param = {
+            apiUrl: 'product/get_product_by_tag',
+            limit: 10,offset: 0,tag_id: 363,
+            // tag_id: 642
+        }
+        if (index == 1) {
+            param = {
+                apiUrl: "multimedia/media_list",
+                limit: 100,page: 1,type: 1,
+                class_id: 139,
+                // class_id: 141,
+            }
+        }
+
+        commonApi._post(param.apiUrl, param).then(res => {
+            if (res) {
+                let resData = (res.data.list||res.data.data || []).map(v=>{
+                    return {...v, headimg: v.headimg?v.headimg:v.head_img}
+                })
+                this.setData({hotList: resData })
+            }
+        })
+
+    }
+
+  },
+
+  // 去详情
+  goDetail:function(e) {
+    let item = e.currentTarget.dataset.item;
+    let type = e.currentTarget.dataset.type;
+    console.log(item)
+    if (type == 'travel') {
+        if(item.outside_url) {
+            wx.navigateTo({
+                url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(item.outside_url),
+            })
+        } else {
+            wx.navigateTo({
+                url: '/pages/info/strategyInfo/index?id=' + item.id,
+            })
+        }
+        return
+    }
+    if (type == 'post') {
+        util.gotoDetail(item);
+        return
+    }
+    if (type == 'video') {
+        this.goPlayVideo(e)
+    }
+  },
+
+  goMoreList:function(e) {
+    let url = e.currentTarget.dataset.url;
+    if (url) {
+        wx.navigateTo({
+            url: url,
+        })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCIndex/index.json b/subPackages/feiyiNew/CGCIndex/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/subPackages/feiyiNew/CGCIndex/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCIndex/index.wxml b/subPackages/feiyiNew/CGCIndex/index.wxml
new file mode 100644
index 0000000..d1674c1
--- /dev/null
+++ b/subPackages/feiyiNew/CGCIndex/index.wxml
@@ -0,0 +1,78 @@
+<title title="大美非遗"></title>
+<view class="content">
+    <view class="top-box w-full">
+        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" >
+            <block wx:for="{{banner}}" wx:key="index">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+    </view>
+
+    <!-- 金刚区 -->
+    <view class="menu-box flex-between">
+        <view class="menu-left">
+            <view class="menu-item" wx:for="{{menuList}}" data-item="{{item}}" bindtap="goFeiYiList" wx:key="index">
+                <image src="https://static.ticket.sz-trip.com/cgc/images/index/{{index + 1}}.png" style="height: 108rpx;" mode="heightFix"></image>
+                <image src="https://static.ticket.sz-trip.com/cgc/images/index/{{index + 1}}s.png" style="height: 22rpx;margin-top: 8rpx;" mode="heightFix"></image>
+            </view>
+            
+        </view>
+        <view class="menu-right">
+            <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" >
+                <block wx:for="{{banner}}" wx:key="index">
+                <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <image src="{{item.head_img}}" mode="scaleToFill"></image>
+                </swiper-item>
+                </block>
+            </swiper>
+        </view>
+    </view>
+
+    <!-- 非遗手札 -->
+    <view class="title-image-box flex-between">
+        <image src="https://static.ticket.sz-trip.com/cgc/images/index/title1.png" mode="" style="width: 350rpx;height: 32rpx;"></image>
+        <image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" 
+        mode="" style="width: 59rpx;height: 20rpx;"
+        bind:tap="goMoreList" data-url="{{'/subPackages/feiyiNew/CGCLetter/index'}}"></image>
+    </view>
+    <view class="handwritten-box flex-between">
+        <image src="{{item.headimg}}" mode="aspectFill" data-item="{{item}}" 
+        wx:for="{{handwrittenList}}" wx:key="index"
+        bindtap="goDetail" data-type="travel"></image>
+    </view>
+
+    <!-- 非遗shi光 -->
+    <view class="title-image-box flex-between">
+        <image src="https://static.ticket.sz-trip.com/cgc/images/index/title2.png" mode="" style="width: 350rpx;height: 32rpx;"></image>
+        <image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" 
+        mode="" style="width: 59rpx;height: 20rpx;"
+        bind:tap="goMoreList" data-url="{{'/subPackages/feiyiNew/CGCTime/index'}}"></image>
+    </view>
+    <view class="time-box" style="background-image: url({{SGVideo.head_img}});"
+    bindtap="goPlayVideo" data-item="{{SGVideo}}">
+        <image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+    </view>
+
+    <!-- 底部推荐 -->
+    <view class="hot-type">
+        <view data-index="{{index}}" wx:for="{{hotType}}" wx:key="index" 
+            class="hot-type-item {{index == hotIndex?'active':''}}"
+            bindtap="changeHotType">
+            {{item.title}}
+        </view>
+    </view>
+    <view class="hot-box">
+        <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
+            <view wx:if="{{index%2==number}}" data-item="{{item}}" wx:for="{{hotList}}" wx:key="id" 
+                 class="hot-data" bindtap="goDetail" data-type="{{hotIndex==0?'post':'video'}}">
+                <image class="hot-data-image" src="{{item.headimg}}" mode="widthFix"></image>
+                <view class="hot-data-title textOver">{{item.title}}</view>
+            </view>
+        </view>
+        
+    </view>
+
+
+</view>
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCIndex/index.wxss b/subPackages/feiyiNew/CGCIndex/index.wxss
new file mode 100644
index 0000000..57d088e
--- /dev/null
+++ b/subPackages/feiyiNew/CGCIndex/index.wxss
@@ -0,0 +1,154 @@
+/* subPackages/feiyiNew/CGCIndex/index.wxss */
+page{
+    min-height: 100%;
+    background: #F9F0EA;
+}
+.content{
+    padding: 21rpx 30rpx 40rpx;
+}
+.w-full{
+    width: 100%;
+}
+
+.top-box .swiper,.top-box .swiper image {
+    width: 100%;
+    display: block;
+    height: 451rpx;
+    border-radius: 30rpx;
+}
+
+.menu-box{
+    width: 100%;
+    padding-top: 60rpx;
+    display: flex;
+}
+.menu-box .menu-left{
+    display: flex;
+    flex: 1;
+    flex-wrap: wrap;
+    width: 1rpx;
+    justify-content: space-between;
+}
+.menu-box .menu-left .menu-item{
+    width: 33%;
+	display: flex;
+	flex-direction: column;
+    align-items: center;
+    margin-bottom: 37rpx;
+}
+
+.menu-box .menu-right{
+    width: 254rpx;
+    height: 323rpx;
+    flex-shrink: 0;
+}
+
+.menu-right .swiper,.menu-right .swiper image {
+    width: 100%;
+    height: 100%;
+    display: block;
+    border-radius: 20rpx;
+}
+
+.title-image-box{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+    margin-top: 60rpx;
+}
+
+.handwritten-box{
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    padding-top: 20rpx;
+}
+.handwritten-box image{
+    width: 49%;
+    height: 181rpx;
+    margin-bottom: 13rpx;
+    border-radius: 10rpx;
+}
+
+.time-box {
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    width: 100%;
+    height: 370rpx;
+    border-radius: 30rpx;
+    position: relative;
+    margin-top: 20rpx;
+}
+.time-box .play {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 90rpx;
+    height: 90rpx;
+}
+
+.hot-type{
+    height: 50rpx;
+	font-weight: bold;
+	font-size: 32rpx;
+    color: #B5B5B6;
+    display: flex;
+    justify-content: space-around;
+    margin-top: 40rpx;
+}
+.hot-type-item{
+    position: relative;
+}
+.hot-type-item::after{
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: -10rpx;
+    background-color: #B5B5B6;
+    margin: 0 auto;
+    width: 32rpx;
+    height: 4rpx;
+}
+.hot-type-item.active{
+    color: #000000;
+}
+.hot-type-item.active::after{
+    background-color: #000000;
+}
+
+.hot-box{
+    margin-top: 36rpx;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+
+.hot-list-item{
+    display: flex;
+    flex-direction: column;
+    width: 49%;
+    flex-shrink: 0;
+}
+.hot-data{
+    width: 100%;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    font-weight: bold;
+    font-size: 0;
+    color: #000000;
+    margin-bottom: 29rpx;
+}
+.hot-data-image{
+    width: 100%;
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+}
+.hot-data-title{
+    padding: 20rpx;
+    font-size: 26rpx;
+}
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCLetter/index.js b/subPackages/feiyiNew/CGCLetter/index.js
new file mode 100644
index 0000000..0ef3aa4
--- /dev/null
+++ b/subPackages/feiyiNew/CGCLetter/index.js
@@ -0,0 +1,114 @@
+// pages/list/theatre/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[],
+    page_no: 0,
+    haveMore: true,
+  },
+  
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
+  },
+
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    if(item.outside_url) {
+        wx.navigateTo({
+            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(item.outside_url),
+        })
+    } else {
+        wx.navigateTo({
+            url: '/pages/info/strategyInfo/index?id=' + item.id,
+        })
+    }
+    
+  },
+  getList:function(){
+    if (!this.data.haveMore) return
+    let list = this.data.list
+
+    commonApi._post("travels/getList", {
+        page_no: this.data.page_no,
+        page_num: 10,
+        // type_key: 'feiyishouzha',
+        type_key: 'someArt',
+    }).then(res => {
+        if (res) {
+            this.setData({list:list.concat(res.data.rows||[])})
+            if (res.data.rows.length<10) {
+                this.data.haveMore = false
+            }
+        }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    this.getList()
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-剧场演出',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png'
+    }
+  }
+})
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCLetter/index.json b/subPackages/feiyiNew/CGCLetter/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/subPackages/feiyiNew/CGCLetter/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCLetter/index.wxml b/subPackages/feiyiNew/CGCLetter/index.wxml
new file mode 100644
index 0000000..ba3e540
--- /dev/null
+++ b/subPackages/feiyiNew/CGCLetter/index.wxml
@@ -0,0 +1,34 @@
+<!--pages/list/theatre/index.wxml-->
+<!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
+<title title="非遗手札"></title>
+<view class="my-header-search">
+    <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
+</view>
+
+<view class="content">
+    <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
+        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <view class="info">
+            <view class="textOver2 title">{{item.title}}</view>
+            <view class="textOver subtitle">{{item.subtitle}}</view>
+            <view class="letter-user">
+                <view style="display: flex;align-items: center;">
+                    <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar}}" mode="aspectFill"></image>
+                    <text>{{item.nickname}}</text>
+                </view>
+                <view style="display: flex;align-items: center;color: #848484;">
+                    <text class="iconfont icon-aixin"></text>
+                    <text class="icon-num" style="padding: 0 36rpx 0 8rpx;">{{item.like_number}}</text>
+                    <text class="iconfont icon-eye"></text>
+                    <text class="icon-num" style="padding-left: 8rpx;">{{item.view_number}}</text>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
+        <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+        <view>暂无内容</view>
+    </view>
+
+</view>
+
diff --git a/subPackages/feiyiNew/CGCLetter/index.wxss b/subPackages/feiyiNew/CGCLetter/index.wxss
new file mode 100644
index 0000000..46e9880
--- /dev/null
+++ b/subPackages/feiyiNew/CGCLetter/index.wxss
@@ -0,0 +1,67 @@
+/* pages/list/theatre/index.wxss */
+page{
+    background: white;
+    padding-bottom: 20rpx;
+}
+
+.my-header-search{
+    width: 100%;
+}
+.my-header-search .heaimg{
+    width: 100%;
+    display: block;
+}
+
+.content{
+    margin-top: -15rpx;
+    background: #FFFFFF;
+border-radius: 24rpx 24rpx 24rpx 24rpx;
+padding: 32rpx;
+}
+
+
+
+
+.item {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 36rpx;
+}
+.item image {
+    width: 208rpx;
+    height: 198rpx;
+    border-radius: 24rpx 24rpx 24rpx 24rpx;
+    margin-right: 24rpx;
+    flex-shrink: 0;
+}
+
+
+.info {
+  flex: 1;
+  width: 1rpx;
+  height: 198rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.info .title {
+  font-weight: 500;
+  font-size: 31rpx;
+  color: #000;
+  margin-bottom: 9rpx;
+}
+.info .subtitle {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 9rpx;
+}
+.letter-user{
+    display: flex;
+    justify-content: space-between;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #000000;
+    align-items: center;
+}
diff --git a/subPackages/feiyiNew/CGCTime/index.js b/subPackages/feiyiNew/CGCTime/index.js
new file mode 100644
index 0000000..0ef3aa4
--- /dev/null
+++ b/subPackages/feiyiNew/CGCTime/index.js
@@ -0,0 +1,114 @@
+// pages/list/theatre/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[],
+    page_no: 0,
+    haveMore: true,
+  },
+  
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
+  },
+
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    if(item.outside_url) {
+        wx.navigateTo({
+            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(item.outside_url),
+        })
+    } else {
+        wx.navigateTo({
+            url: '/pages/info/strategyInfo/index?id=' + item.id,
+        })
+    }
+    
+  },
+  getList:function(){
+    if (!this.data.haveMore) return
+    let list = this.data.list
+
+    commonApi._post("travels/getList", {
+        page_no: this.data.page_no,
+        page_num: 10,
+        // type_key: 'feiyishouzha',
+        type_key: 'someArt',
+    }).then(res => {
+        if (res) {
+            this.setData({list:list.concat(res.data.rows||[])})
+            if (res.data.rows.length<10) {
+                this.data.haveMore = false
+            }
+        }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    this.getList()
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-剧场演出',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png'
+    }
+  }
+})
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCTime/index.json b/subPackages/feiyiNew/CGCTime/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/subPackages/feiyiNew/CGCTime/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCTime/index.wxml b/subPackages/feiyiNew/CGCTime/index.wxml
new file mode 100644
index 0000000..ba3e540
--- /dev/null
+++ b/subPackages/feiyiNew/CGCTime/index.wxml
@@ -0,0 +1,34 @@
+<!--pages/list/theatre/index.wxml-->
+<!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
+<title title="非遗手札"></title>
+<view class="my-header-search">
+    <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
+</view>
+
+<view class="content">
+    <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
+        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <view class="info">
+            <view class="textOver2 title">{{item.title}}</view>
+            <view class="textOver subtitle">{{item.subtitle}}</view>
+            <view class="letter-user">
+                <view style="display: flex;align-items: center;">
+                    <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar}}" mode="aspectFill"></image>
+                    <text>{{item.nickname}}</text>
+                </view>
+                <view style="display: flex;align-items: center;color: #848484;">
+                    <text class="iconfont icon-aixin"></text>
+                    <text class="icon-num" style="padding: 0 36rpx 0 8rpx;">{{item.like_number}}</text>
+                    <text class="iconfont icon-eye"></text>
+                    <text class="icon-num" style="padding-left: 8rpx;">{{item.view_number}}</text>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
+        <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+        <view>暂无内容</view>
+    </view>
+
+</view>
+
diff --git a/subPackages/feiyiNew/CGCTime/index.wxss b/subPackages/feiyiNew/CGCTime/index.wxss
new file mode 100644
index 0000000..46e9880
--- /dev/null
+++ b/subPackages/feiyiNew/CGCTime/index.wxss
@@ -0,0 +1,67 @@
+/* pages/list/theatre/index.wxss */
+page{
+    background: white;
+    padding-bottom: 20rpx;
+}
+
+.my-header-search{
+    width: 100%;
+}
+.my-header-search .heaimg{
+    width: 100%;
+    display: block;
+}
+
+.content{
+    margin-top: -15rpx;
+    background: #FFFFFF;
+border-radius: 24rpx 24rpx 24rpx 24rpx;
+padding: 32rpx;
+}
+
+
+
+
+.item {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 36rpx;
+}
+.item image {
+    width: 208rpx;
+    height: 198rpx;
+    border-radius: 24rpx 24rpx 24rpx 24rpx;
+    margin-right: 24rpx;
+    flex-shrink: 0;
+}
+
+
+.info {
+  flex: 1;
+  width: 1rpx;
+  height: 198rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.info .title {
+  font-weight: 500;
+  font-size: 31rpx;
+  color: #000;
+  margin-bottom: 9rpx;
+}
+.info .subtitle {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 9rpx;
+}
+.letter-user{
+    display: flex;
+    justify-content: space-between;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #000000;
+    align-items: center;
+}
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index d7c40cb..25e3d01 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -56,8 +56,14 @@ Page({
         withShareTicket: true,
         menus: ['shareAppMessage', 'shareTimeline']
       })
-    this.getCount()
-    this.getType()
+    if (options.idIndex) {
+        this.setData({
+            typeIndex:options.idIndex
+        })
+    }
+
+    // this.getCount()
+    // this.getType()
   },
   // 清空
   delAll() {
@@ -436,11 +442,11 @@ Page({
       list:[],
       total:1,
       navIndex:0,
-      typeIndex:0,
+      typeIndex:this.data.typeIndex,
       flag:true,
       seachFlag:false
     })
-    this.getList()
+    this.getType()
     this.getCount()
   },
   // 搜索
@@ -536,6 +542,9 @@ Page({
   getList:function(){
     let list = this.data.list;
     if(list.length>=this.data.total) return;
+    if (!this.data.typeList[this.data.typeIndex]) {
+        this.setData({typeIndex: 0})
+    }
     commonApi._post("product/get_product_by_tag",{
       tag_id:this.data.seachFlag? '5':this.data.typeList[this.data.typeIndex].id, //标签的ID
       offset:list.length, //起始查询

From 828b463f048176b1cbf50751da82654d06f99cf0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 22 May 2025 13:57:34 +0800
Subject: [PATCH 318/471] =?UTF-8?q?menuRoute=20=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                    |  1 +
 subPackages/feiyiNew/CGCLetter/index.js   | 12 +++++
 subPackages/feiyiNew/CGCLetter/index.wxml |  4 +-
 subPackages/feiyiNew/CGCTime/index.js     | 40 ++++++++------
 subPackages/feiyiNew/CGCTime/index.wxml   | 32 +++++-------
 subPackages/feiyiNew/CGCTime/index.wxss   | 64 ++++++++++-------------
 6 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/app.js b/app.js
index f354f30..94d308a 100644
--- a/app.js
+++ b/app.js
@@ -175,6 +175,7 @@ App({
   },
   globalData: {
     appLaunchFlag: false, // App onLaunch执行结束
+    menuRoute: '/pages/index/index',
     CategoryIds: {}, //分享出去的页面id
     category_id: "", //分享进来的参数
     from: "", // 是否是从其他小程序跳转过来的 如果是从其他小程序跳转的话 会记录
diff --git a/subPackages/feiyiNew/CGCLetter/index.js b/subPackages/feiyiNew/CGCLetter/index.js
index 0ef3aa4..a12c51d 100644
--- a/subPackages/feiyiNew/CGCLetter/index.js
+++ b/subPackages/feiyiNew/CGCLetter/index.js
@@ -11,6 +11,7 @@ Page({
     list:[],
     page_no: 0,
     haveMore: true,
+    headImg: '',
   },
   
 
@@ -55,12 +56,23 @@ Page({
         }
     })
   },
+  // 获取头图
+  getHeaderImg: function () {
+    commonApi._post("multimedia/detail", {id: 2360}).then(res=>{
+        if (res) {
+            this.setData({headImg: res.data.head_img})
+        }
+    })
+       
+
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
     this.getList()
+    this.getHeaderImg()
   },
 
   /**
diff --git a/subPackages/feiyiNew/CGCLetter/index.wxml b/subPackages/feiyiNew/CGCLetter/index.wxml
index ba3e540..0415012 100644
--- a/subPackages/feiyiNew/CGCLetter/index.wxml
+++ b/subPackages/feiyiNew/CGCLetter/index.wxml
@@ -1,8 +1,8 @@
 <!--pages/list/theatre/index.wxml-->
 <!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
 <title title="非遗手札"></title>
-<view class="my-header-search">
-    <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
+<view class="my-header-search" wx:if="{{headImg}}">
+    <image class="heaimg" src="{{headImg}}" mode="widthFix"></image>
 </view>
 
 <view class="content">
diff --git a/subPackages/feiyiNew/CGCTime/index.js b/subPackages/feiyiNew/CGCTime/index.js
index 0ef3aa4..71e0002 100644
--- a/subPackages/feiyiNew/CGCTime/index.js
+++ b/subPackages/feiyiNew/CGCTime/index.js
@@ -11,6 +11,7 @@ Page({
     list:[],
     page_no: 0,
     haveMore: true,
+    headImg: '',
   },
   
 
@@ -26,34 +27,40 @@ Page({
 
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
-    if(item.outside_url) {
-        wx.navigateTo({
-            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(item.outside_url),
-        })
-    } else {
-        wx.navigateTo({
-            url: '/pages/info/strategyInfo/index?id=' + item.id,
-        })
-    }
+    wx.navigateTo({
+        url: '/pages/pbService/appreciate/info/index?info='+encodeURIComponent(JSON.stringify(item)),
+    })
     
   },
   getList:function(){
     if (!this.data.haveMore) return
     let list = this.data.list
 
-    commonApi._post("travels/getList", {
-        page_no: this.data.page_no,
-        page_num: 10,
-        // type_key: 'feiyishouzha',
-        type_key: 'someArt',
+    commonApi._post("multimedia/media_list", {
+        limit: 10,
+        page: this.data.page_no,
+        class_id: 139,
+        // class_id: 140,
+        type: 1,
     }).then(res => {
         if (res) {
-            this.setData({list:list.concat(res.data.rows||[])})
-            if (res.data.rows.length<10) {
+            this.setData({list:list.concat(res.data.data||[])})
+            if (res.data.data.length<10) {
                 this.data.haveMore = false
             }
         }
     })
+
+  },
+  // 获取头图
+  getHeaderImg: function () {
+    commonApi._post("multimedia/detail", {id: 2361}).then(res=>{
+        if (res) {
+            this.setData({headImg: res.data.head_img})
+        }
+    })
+       
+
   },
 
   /**
@@ -61,6 +68,7 @@ Page({
    */
   onReady: function () {
     this.getList()
+    this.getHeaderImg()
   },
 
   /**
diff --git a/subPackages/feiyiNew/CGCTime/index.wxml b/subPackages/feiyiNew/CGCTime/index.wxml
index ba3e540..d60bb26 100644
--- a/subPackages/feiyiNew/CGCTime/index.wxml
+++ b/subPackages/feiyiNew/CGCTime/index.wxml
@@ -1,29 +1,23 @@
 <!--pages/list/theatre/index.wxml-->
 <!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
-<title title="非遗手札"></title>
-<view class="my-header-search">
-    <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
+<title title="非遗拾光"></title>
+<view class="my-header-search" wx:if="{{headImg}}">
+    <image class="heaimg" src="{{headImg}}" mode="widthFix"></image>
 </view>
 
 <view class="content">
     <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
-        <image src="{{item.headimg}}" mode="aspectFill"></image>
-        <view class="info">
-            <view class="textOver2 title">{{item.title}}</view>
-            <view class="textOver subtitle">{{item.subtitle}}</view>
-            <view class="letter-user">
-                <view style="display: flex;align-items: center;">
-                    <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar}}" mode="aspectFill"></image>
-                    <text>{{item.nickname}}</text>
-                </view>
-                <view style="display: flex;align-items: center;color: #848484;">
-                    <text class="iconfont icon-aixin"></text>
-                    <text class="icon-num" style="padding: 0 36rpx 0 8rpx;">{{item.like_number}}</text>
-                    <text class="iconfont icon-eye"></text>
-                    <text class="icon-num" style="padding-left: 8rpx;">{{item.view_number}}</text>
-                </view>
-            </view>
+       
+        <view style="display: flex;align-items: center;">
+            <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar}}" mode="aspectFill"></image>
+            <text>君到苏州</text>
         </view>
+        <view class="textOver2 title">{{item.title}}</view>
+        <view class="video-image">
+            <image src="{{item.head_img}}" mode="asectFill"></image>
+            <image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+        </view>
+            
     </view>
     <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
         <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
diff --git a/subPackages/feiyiNew/CGCTime/index.wxss b/subPackages/feiyiNew/CGCTime/index.wxss
index 46e9880..d91d741 100644
--- a/subPackages/feiyiNew/CGCTime/index.wxss
+++ b/subPackages/feiyiNew/CGCTime/index.wxss
@@ -24,44 +24,38 @@ padding: 32rpx;
 
 .item {
   width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
   margin-bottom: 36rpx;
-}
-.item image {
-    width: 208rpx;
-    height: 198rpx;
-    border-radius: 24rpx 24rpx 24rpx 24rpx;
-    margin-right: 24rpx;
-    flex-shrink: 0;
-}
-
-
-.info {
-  flex: 1;
-  width: 1rpx;
-  height: 198rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.info .title {
   font-weight: 500;
-  font-size: 31rpx;
-  color: #000;
-  margin-bottom: 9rpx;
+    font-size: 28rpx;
+    color: #000000;
+    padding-bottom: 20rpx;
+    border-bottom: 1rpx solid rgba(0,0,0,0.05);
 }
-.info .subtitle {
-  font-size: 24rpx;
-  color: #999999;
-  margin-bottom: 9rpx;
+.video-image{
+    width: 100%;
+    height: 372rpx;
+    position: relative;
 }
-.letter-user{
-    display: flex;
-    justify-content: space-between;
+.video-image image {
+    width: 100%;
+    height: 372rpx;
+    background: rgba(0,0,0,0.2);
+    border-radius: 32rpx 32rpx 32rpx 32rpx;
+}
+.video-image .play{
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 90rpx;
+    height: 90rpx;
+}
+
+.title{
     font-weight: 400;
-    font-size: 24rpx;
-    color: #000000;
-    align-items: center;
+font-size: 28rpx;
+color: #000000;
+margin:  24rpx 0 20rpx;
 }

From ca3858d8ba35fe40f106b9f6f2a668277094be27 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 22 May 2025 14:01:29 +0800
Subject: [PATCH 319/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 94d308a..b5087a5 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest189? true : false;
+            data.isTest = data.isTest190? true : false;
             this.globalData.configJson = data
         }).then(() => {
             // 获取ui配置文件 在首页调用

From 4a4d44d6fd17961e0600dd85ea523e1c0b4ca7e4 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 23 May 2025 11:46:42 +0800
Subject: [PATCH 320/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js        | 928 +++++++++++++-----------------------
 pages/index/index.wxml      | 118 ++---
 project.private.config.json |  14 +-
 3 files changed, 407 insertions(+), 653 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 3c95918..2a73d54 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -12,14 +12,7 @@ Page({
 		padHeight: 0,
 		right: 0,
 		weather: null,
-		saleProduct: null,
-		roadProduct: null,
-		fourProduct: [],
-		hotIndex: 0,
-		indexHot: [],
-		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
-			"gongyeyuanqu", "gaoxin"
-		],
+
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -46,351 +39,327 @@ Page({
 		opacity: 1,
 		time: 3, //全屏广告剩余时间
 		showTime: false,
-		xpth: {}, // 元旦新增 新品特惠和sqjNew
-		djs: null, // 元旦新增 新品特惠倒计时
-		djsTime: null,
-		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
-		],
+
 		viewHeight: "0px",
 		isMuted: true,
-    videoPlay: false,
-    hdrlNavList:[
-      {
-        type:null,
-        title:'全部'
-      },
-      {
-        type:'scene',
-        title:'景区活动'
-      },
-      {
-        type:'show',
-        title:'演出'
-      },
-      {
-        type:'exhibition',
-        title:'展览'
-      },
-      {
-        type:'movie',
-        title:'电影'
-      },
-      {
-        type:'other',
-        title:'其他'
-      }
-    ], //活动日历板块导航分类
-    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
-    today:null,
-    hdrlList:[],
-    yszNav:['公共服务','旅游助手'],
-    yszIndex:0,
-    bdList:[
+        videoPlay: false,
+        hdrlNavList:[
         {
-            color: '#FFE4BC',
-            bg: 'linear-gradient(172deg, #F08528, #D1201B);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250429/069ab247bb2ab5a08fa7707d671b1ac5.png', //游 景点
-            url:'',
-            path:'/pages/list/scene/index',
-            list: [],
-            
+            type:null,
+            title:'全部'
         },
-        {   
-            color: '#DBD8F6',
-            bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
-            // path:'/pages/list/night/index',
-            url:'https://m.cloud.sz-trip.com/nightTour2025',
-            path: '',
-            list: [],
-            
+        {
+            type:'scene',
+            title:'景区活动'
         },
         {
-            color: '#FFE4BC',
-            bg: 'linear-gradient(172deg, #F08528, #D1201B);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250429/9928f46523fd57233b6ef3371a6ba460.png', //非看不可
-            url:'',
-            path:'/pages/list/theatre/index',
-            list: [],
-            
+            type:'show',
+            title:'演出'
         },
         {
-            color: '#DBD8F6',
-            bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250429/a4f53072aa51a387593a183799b902e6.png', //非买不可
-            path:'/subPackages/techanNew/index',
-            url:'',
-            list: [],
-            
+            type:'exhibition',
+            title:'展览'
         },
-      
-      
-    ],
-    list1:[], //游-景点
-    list2:[], //非晚-夜游
-    list3:[], //非看-剧场演出
-    list4:[], //非买-文创
-    
-    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)],
+        {
+            type:'movie',
+            title:'电影'
+        },
+        {
+            type:'other',
+            title:'其他'
+        }
+        ], //活动日历板块导航分类
+        hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+        today:null,
+        hdrlList:[],
+        yszNav:['公共服务','旅游助手'],
+        yszIndex:0,
+        bdList:[
+            {
+                color: '#FFE4BC',
+                bg: 'linear-gradient(172deg, #F08528, #D1201B);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/069ab247bb2ab5a08fa7707d671b1ac5.png', //游 景点
+                url:'',
+                path:'/pages/list/scene/index',
+                list: [],
+                
+            },
+            {   
+                color: '#DBD8F6',
+                bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
+                // path:'/pages/list/night/index',
+                url:'https://m.cloud.sz-trip.com/nightTour2025',
+                path: '',
+                list: [],
+                
+            },
+            {
+                color: '#FFE4BC',
+                bg: 'linear-gradient(172deg, #F08528, #D1201B);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/9928f46523fd57233b6ef3371a6ba460.png', //非看不可
+                url:'',
+                path:'/pages/list/theatre/index',
+                list: [],
+                
+            },
+            {
+                color: '#DBD8F6',
+                bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/a4f53072aa51a387593a183799b902e6.png', //非买不可
+                path:'/subPackages/techanNew/index',
+                url:'',
+                list: [],
+                
+            },
+        
+        
+        ],
 
-    isMayDay: new Date().getTime()>new Date('2025/05/01 00:00:00').getTime()
+        nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)],
+        isMayDay: new Date().getTime()>new Date('2025/05/01 00:00:00').getTime()
     
 	},
-  onLoad: function(options) {
-		commonApi._post("adv/getAdv", {
-			position: 2,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				let length = res.data.length
-				if (res.data.length > 1) {
-					let num = Math.floor(Math.random() * length);
-					console.log('num', num);
-					this.setData({
-						startList: res.data[num]
-					})
-					console.log(this.data.startList.head_img);
-				} else {
-					this.setData({
-						startList: res.data[0]
-					})
-				}
+    onLoad: function(options) {
+            //全屏广告
+            commonApi._post("adv/getAdv", {
+                position: 2,
+                type_id: 3
+            }).then(res => {
+                if (res.data.length > 0) {
+                    wx.hideTabBar() //这里隐藏了底部导航栏
 
-				// 图片
-				if (this.data.startList.media_type) {
-					this.setData({
-						showTime: true
-					})
-					var timer = setInterval(() => {
-						this.setData({
-							time: this.data.time - 1
-						})
-						if (this.data.time === 0) {
-							var opacityTimer = setInterval(() => {
-								this.setData({
-									opacity: this.data.opacity - 0.3
-								})
-							}, 100)
-						}
-						if (this.data.time == -1) {
-							clearInterval(timer)
-							clearInterval(opacityTimer)
-							wx.showTabBar() //倒计时结束清除定时器显示导航栏
-							this.setData({
-								showFullAdv: false
-							})
-						}
-					}, 1000)
-				} else {
-					// 视频
-				}
-			} else {
-				this.setData({
-					showFullAdv: false
-				})
-			}
-		})
-		if (options.from) {
-			app.globalData.from = options.from;
-    	}
-		this.getHeight()
-		//全屏广告
-		wx.hideTabBar() //这里隐藏了底部导航栏
-		
-    	// 获取今天的日期
-		let today = new Date();
-		let d = new Date();
-		let month = d.getMonth() + 1,day = d.getDate();
-		month = month > 10 ? month : ("0" + month);
-		day = day > 10 ? day : ("0" + day);
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate(),
-			today: d.getFullYear() + "-" + month + "-" + day
-		})
-  },
-  gobdDetail(e) {
-    let item = e.currentTarget.dataset.item
-    // wx.navigateTo({
-    //   url: url
-    // })
-    util.gotoDetail(item)
-  },
-  getList() {
-    let bdList = this.data.bdList
-    // 游--景点
-    commonApi._post("scene/get_scene_by_tag",{
-      tag_id:"4",
-      limit:6,
-      lon:this.data.lon,
-      lat:this.data.lat,
-      offset:0,
-      sort:"weight",
-      title:'',
-      area_id:''
-    }).then(res=>{
-      console.log('景点', res)
-      res.data.list.map(item => {
-        if (item.distance || item.distance == 0) {
-          if (item.distance >= 1000) {
-            item.distance = (item.distance / 1000).toFixed(2) + 'km';
-          } else {
-            item.distance = (item.distance).toFixed(2) + 'm';
-          }
-        }
-      })
-      bdList[0].list = res.data.list
-      this.setData({
-        list1:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非买不可--文创
-    commonApi._post('product/get_product_by_tag_subject',{
-      offset: 0,
-      limit: 6,
-      tag_id: 60,
-    }).then(res=>{
-        bdList[3].list = res.data.list
-      this.setData({
-        list4:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非玩不可--线路一日游
-    commonApi._post('product/get_product_by_tag_subject',{
-      tag_id: "58",
-      offset: 0,
-      limit: 6,
-    }).then(res=>{
-        bdList[1].list = res.data.list
-      this.setData({
-        list2:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非看不可--剧场演出
-    commonApi._post("product/get_product_by_tag_subject",{
-      tag_id:"59",
-      offset:0,
-      limit:6,
-    }).then(res=>{
-        bdList[2].list = res.data.list
-      this.setData({
-        list3:res.data.list,
-        bdList: bdList
-      })
-    })
-  },
-  goDetail(e) {
-    let item = e.currentTarget.dataset.item;
-    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
-    if (type == 'movie') {
-    //   wx.navigateTo({
-    //     // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-    //   })
-        util.goMovieDetail(item.third_id || item.id)
-    }else {
-      wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id=' + item.id,
-      })
-    }
-  },
-  // 分类为电影时调这个接口
-  getMovieList() {
-    let service = "Cinema/getHotMovieList";
-		let data = {
-			page: 1,
-			pageSize: 5
-    };
-    commonApi._post(service, data).then(res => {
-      console.log(res.data);
-			this.setData({
-				hdrlList: res.data
-			})
-    })
-    console.log(this.data.hdrlList);
-  },
-  // 推荐榜单更多跳转
-  moreBtn(e) {
-      console.log(e)
-    let item = e.currentTarget.dataset.item
-    if (item.path!='') {
-      wx.navigateTo({
-        url: item.path,
-      })
-    } else {
-      // if (e.currentTarget.dataset.event) {
-      //   this.pagePoint({
-      //     event: e.currentTarget.dataset.event
-      //   }, 1)
-      // }
-      console.log('error', item)
-      let url = item.url;
-      app.globalData.weburl = url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-      })
-    }
-  },
-  // 活动日历下的列表
-  getHdrlList() {
-    commonApi._post('pbservice/Actcalendar/getActList', {
-      page_no: 1,
-      date: this.data.today,
-      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
-      keywords: '',
-      area_key: '',
-      lat: this.data.lat,
-      lon: this.data.lon,
-      page_num: 5
-    }).then(res => {
-        res.data.rows.forEach(v=>{
-            if (!v.post_url) {
-                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+                    let length = res.data.length
+                    if (res.data.length > 1) {
+                        let num = Math.floor(Math.random() * length);
+                        console.log('num', num);
+                        this.setData({
+                            startList: res.data[num]
+                        })
+                        console.log(this.data.startList.head_img);
+                    } else {
+                        this.setData({
+                            startList: res.data[0]
+                        })
+                    }
+
+                    // 图片
+                    if (this.data.startList.media_type) {
+                        this.setData({
+                            showTime: true
+                        })
+                        var timer = setInterval(() => {
+                            this.setData({
+                                time: this.data.time - 1
+                            })
+                            if (this.data.time === 0) {
+                                var opacityTimer = setInterval(() => {
+                                    this.setData({
+                                        opacity: this.data.opacity - 0.3
+                                    })
+                                }, 100)
+                            }
+                            if (this.data.time == -1) {
+                                clearInterval(timer)
+                                clearInterval(opacityTimer)
+                                wx.showTabBar() //倒计时结束清除定时器显示导航栏
+                                this.setData({
+                                    showFullAdv: false
+                                })
+                            }
+                        }, 1000)
+                    } else {
+                        // 视频
+                    }
+                } else {
+                    this.setData({
+                        showFullAdv: false
+                    })
+                }
+            })
+            if (options.from) {
+                app.globalData.from = options.from;
             }
+            this.getHeight()
+            
+            
+            // 获取今天的日期
+            let today = new Date();
+            let d = new Date();
+            let month = d.getMonth() + 1,day = d.getDate();
+            month = month > 10 ? month : ("0" + month);
+            day = day > 10 ? day : ("0" + day);
+            this.setData({
+                month: (this.data.months[today.getMonth()]).toUpperCase(),
+                date: today.getDate(),
+                today: d.getFullYear() + "-" + month + "-" + day
+            })
+    },
+    gobdDetail(e) {
+        let item = e.currentTarget.dataset.item
+        util.gotoDetail(item)
+    },
+    getList() {
+        let bdList = this.data.bdList
+        // 游--景点
+        commonApi._post("scene/get_scene_by_tag",{
+        tag_id:"4",
+        limit:6,
+        lon:this.data.lon,
+        lat:this.data.lat,
+        offset:0,
+        sort:"weight",
+        title:'',
+        area_id:''
+        }).then(res=>{
+        console.log('景点', res)
+        res.data.list.map(item => {
+            if (item.distance || item.distance == 0) {
+            if (item.distance >= 1000) {
+                item.distance = (item.distance / 1000).toFixed(2) + 'km';
+            } else {
+                item.distance = (item.distance).toFixed(2) + 'm';
+            }
+            }
+        })
+        bdList[0].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+        // 非买不可--文创
+        commonApi._post('product/get_product_by_tag_subject',{
+        offset: 0,
+        limit: 6,
+        tag_id: 60,
+        }).then(res=>{
+            bdList[3].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+        // 非玩不可--线路一日游
+        commonApi._post('product/get_product_by_tag_subject',{
+        tag_id: "58",
+        offset: 0,
+        limit: 6,
+        }).then(res=>{
+            bdList[1].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+        // 非看不可--剧场演出
+        commonApi._post("product/get_product_by_tag_subject",{
+        tag_id:"59",
+        offset:0,
+        limit:6,
+        }).then(res=>{
+            bdList[2].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+    },
+    goDetail(e) {
+        let item = e.currentTarget.dataset.item;
+        let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+        if (type == 'movie') {
+        //   wx.navigateTo({
+        //     // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+        //   })
+            util.goMovieDetail(item.third_id || item.id)
+        }else {
+        wx.navigateTo({
+            url: '/pages/info/activityInfo/index?id=' + item.id,
+        })
+        }
+    },
+    // 分类为电影时调这个接口
+    getMovieList() {
+        let service = "Cinema/getHotMovieList";
+            let data = {
+                page: 1,
+                pageSize: 5
+        };
+        commonApi._post(service, data).then(res => {
+        console.log(res.data);
+                this.setData({
+                    hdrlList: res.data
+                })
+        })
+        console.log(this.data.hdrlList);
+    },
+    // 推荐榜单更多跳转
+    moreBtn(e) {
+        console.log(e)
+        let item = e.currentTarget.dataset.item
+        if (item.path!='') {
+        wx.navigateTo({
+            url: item.path,
+        })
+        } else {
+        // if (e.currentTarget.dataset.event) {
+        //   this.pagePoint({
+        //     event: e.currentTarget.dataset.event
+        //   }, 1)
+        // }
+        console.log('error', item)
+        let url = item.url;
+        app.globalData.weburl = url;
+        wx.navigateTo({
+            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+        })
+        }
+    },
+    // 活动日历下的列表
+    getHdrlList() {
+        commonApi._post('pbservice/Actcalendar/getActList', {
+        page_no: 1,
+        date: this.data.today,
+        category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+        keywords: '',
+        area_key: '',
+        lat: this.data.lat,
+        lon: this.data.lon,
+        page_num: 5
+        }).then(res => {
+            res.data.rows.forEach(v=>{
+                if (!v.post_url) {
+                    v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+                }
+            })
+        this.setData({
+            hdrlList:res.data.rows
+        })
         })
-      this.setData({
-        hdrlList:res.data.rows
-      })
-    })
-  },
-  // 切换活动日历分类
-  changeHdrlNav(e) {
-    console.log(e.currentTarget.dataset);
-    this.setData({
-      hdrlList:[],
-      hdrlNavIndex:e.currentTarget.dataset.index,
-    })
-    if (this.data.hdrlNavIndex == 4) {
-      this.getMovieList()
-    } else {
-      this.getHdrlList() //切换分类重新获取活动日历列表
-    }
-  },
-  // 游苏州下的公共服务和旅游助手切换
-  changeType(e) {
-    this.setData({
-      yszIndex:e.currentTarget.dataset.index,
-    })
-  },
-  xlzs: function (e) {
+    },
+    // 切换活动日历分类
+    changeHdrlNav(e) {
+        console.log(e.currentTarget.dataset);
+        this.setData({
+        hdrlList:[],
+        hdrlNavIndex:e.currentTarget.dataset.index,
+        })
+        if (this.data.hdrlNavIndex == 4) {
+        this.getMovieList()
+        } else {
+        this.getHdrlList() //切换分类重新获取活动日历列表
+        }
+    },
+    // 游苏州下的公共服务和旅游助手切换
+    changeType(e) {
+        this.setData({
+        yszIndex:e.currentTarget.dataset.index,
+        })
+    },
+    xlzs: function (e) {
 
-    wx.navigateToMiniProgram({
-      appId: 'wx757dd1ee184e75e9',
-      page: "pages/tabBar/index/index"
-    })
-  },
+        wx.navigateToMiniProgram({
+        appId: 'wx757dd1ee184e75e9',
+        page: "pages/tabBar/index/index"
+        })
+    },
   // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
@@ -406,105 +375,21 @@ Page({
 			right: (systemInfo.screenWidth - rect.right) + rect.width
 		})
 	},
-	// getXpthList: function() {
-	// 	// 元旦新增 新品特惠
-	// 	commonApi._post("product/get_product_indulgence", {
-	// 		tag_id: 275,
-	// 		typeId: 3,
-	// 	}).then(res => {
-	// 		console.log('data', res.data);
-	// 		this.setData({
-	// 			xpth: res.data,
-	// 			djsTime: res.data.time
-	// 		})
-	// 		let time = setInterval(() => {
-	// 			this.setData({
-	// 				djsTime: this.data.djsTime - 1
-	// 			})
-	// 			this.formatDate(this.data.djsTime)
-	// 		}, 1000)
-	// 		if (this.data.djsTime == 0) {
-	// 			clearInterval(time)
-	// 		}
-	// 	})
-	// },
-	// 元旦新品特惠 倒计时 
-	// formatDate: function(oTime) {
-	// 	let h = parseInt(oTime / 3600)
-	// 	let m = parseInt((oTime % 3600) / 60)
-	// 	let s = parseInt(oTime % 60)
-	// 	h = h < 10 ? "0" + h : h;
-	// 	m = m < 10 ? "0" + m : m;
-	// 	s = s < 10 ? "0" + s : s;
-	// 	this.setData({
-	// 		djs: {
-	// 			h: h,
-	// 			m: m,
-	// 			s: s
-	// 		}
-	// 	})
-	// 	return
-	// },
-  // 非遗跳转
-  // goFeiyi: function() {
-	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-	// 	wx.navigateTo({
-	// 		url: "/pages/pbService/web/index"
-	// 	})
-	// },
-	// onTabItemTap: function(e) {
-	// 	console.log(e, 99999999)
-  // },
-  // 大轮播的监听方法
+
+    // 大轮播的监听方法
 	changeBannerIndex: function(e) {
 		this.setData({
 			activeBannerIndex: e.detail.current
 		})
-  },
-  // 小轮播监听方法
+    },
+    // 小轮播监听方法
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
 	},
-	// 一城百馆
-	city: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx114d514f39cb1fed',
-			path: "pages/entry/index"
-		})
-		commonApi._post("browse/burying_point", {
-			drive: "mini",
-			title: "一城百馆",
-			uuid: app.globalData.uuid
-		}).then(res => {
 
-		})
-	},
-	changeHotIndex: function(e) {
-		this.setData({
-			hotIndex: e.currentTarget.dataset.index,
-			fourProduct: []
-		})
-		this.getFourProduct()
-	},
 	getBanner: function() {
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xcxBanner"
-		// }).then(res=>{
-		//   console.log(res)
-		//   this.setData({
-		//     banner:res.data.content || []
-		//   })
-		// })
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xiaobanner"
-		// }).then(res=>{
-		//   this.setData({
-		//     xiaobanner:res.data.content || []
-		//   })
-		// })
-		// return;
 		commonApi._post("adv/getAdv", {
 			position: 0,
 			type_id: 3
@@ -541,13 +426,27 @@ Page({
 	},
 	//获取季节配置
 	getIndexSeason() {
-		this.setData({
-			indexHot: app.globalData.configJson.indexHot,
-			isTest: app.globalData.configJson.isTest,
-			otherPlat: app.globalData.configJson.otherPlats,
-			indexSeason: app.globalData.configJson.indexSeason
-		})
-		this.getFourProduct()
+        if (app.globalData.configJson.indexSeason) {
+            this.setData({
+                isTest: app.globalData.configJson.isTest,
+                otherPlat: app.globalData.configJson.otherPlats,
+                indexSeason: app.globalData.configJson.indexSeason
+            })
+        } else {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+                let obj = {}
+                res.data.content.forEach(item => {
+                    obj[item.id] = item.image
+                });
+                app.globalData.configJson.indexSeason = obj 
+                app.globalData.loadIndexSeason = true
+                this.setData({
+                    isTest: app.globalData.configJson.isTest,
+                    otherPlat: app.globalData.configJson.otherPlats,
+                    indexSeason: app.globalData.configJson.indexSeason
+                })
+            })
+        }
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
@@ -599,113 +498,9 @@ Page({
 			})
 		})
 	},
-	saleDetail: function() {},
-	getTwoProduct: function() {
-		// 获取首页限时特惠
-		commonApi._post('act/fast_sale_now', {
-			offset: 0,
-			limit: 1
-		}).then(res => {
-			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
-				if (res.data[0].fast_sales_sku.length > 0) {
-					let price = res.data[0].fast_sales_sku[0].price
-					let data = res.data[0].fast_sales_sku[0]
-					for (let item of res.data[0].fast_sales_sku) {
-						if (price > item.price) price = item.price
-					}
-					data.price = price
-					this.setData({
-						saleProduct: data
-					})
-				} else {
-					this.setData({
-						saleProduct: res.data[0].fast_sales_sku[0]
-					})
-				}
-			}
-		})
-		commonApi._post("product/get_product_by_tag", {
-			tag_id: 17,
-			offset: 0,
-			limit: 1,
-			sort: 'price',
-			order: 'asc'
-		}).then(res => {
-			if (res.data.list.length > 0) {
-				let price = res.data.list[0].price
-				for (let item of res.data.list) {
-					if (item.price > price) {
-						price = item.price
-					}
-				}
-				let data = res.data.list[0]
-				data.price = price
-				this.setData({
-					roadProduct: data
-				})
-			} else {
-				this.setData({
-					roadProduct: [111]
-				})
-			}
-		})
-	},
-	getFourProduct: function() {
-		let item = this.data.indexHot[this.data.hotIndex],
-			service = "product/get_product_by_tag",
-			data = {
-				tag_id: item.id,
-				offset: 0,
-				limit: 4,
-				sort: 'weight',
-				order: 'desc'
-			};
-		if (item.type == 'scene') {
-			service = "scene/get_scene_by_tag";
-		} else if (item.type == 'movie') {
-			service = "Cinema/getHotMovieList";
-			data = {
-				page: 1,
-				pageSize: 4
-			};
-		}
-		commonApi._post(service, data).then(res => {
-			this.setData({
-				fourProduct: res.data.list || res.data
-			})
-		})
-	},
-	tagGotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			// wx.navigateTo({
-			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-			// 		item.title,
-            // })
-            util.goMovieDetail(item.third_id || item.id, item.title)
-		} else {
-			util.gotoDetail(item)
-		}
-	},
-	productGotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
-		util.gotoDetail(item)
-	},
 	gotoPath: function(e) {
     console.log(e)
-		// if (e.currentTarget.dataset.event) {
-		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
-		//     wx.navigateToMiniProgram({
-		//       appId: 'wxd323e63a10aa6865',
-		//       path: 'pages/home/index'
-		//     })
-		//     return
-		//   }else{
-		//     this.pagePoint({
-		//       event: e.currentTarget.dataset.event
-		//     }, 1)
-		//   }
-		// }
+		
 		if (e.currentTarget.dataset.title == '书香借阅') {
 			wx.navigateToMiniProgram({
 				appId: 'wx165d4f1727f6bdb0',
@@ -768,15 +563,6 @@ Page({
 			})
 		}
 	},
-	// 元旦  新品特惠部分
-	goBanner: function(e) {
-		console.log('新品特惠', e.currentTarget.dataset.url);
-		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
-		wx.navigateTo({
-			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
-		})
-	},
 	gotoUrl: function(e) {
 		console.log(e)
 		if (e.currentTarget.dataset.event) {
@@ -791,7 +577,7 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
     },
-    	// 实时路况跳转外链
+    // 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -823,22 +609,7 @@ Page({
 			path: path
 		})
 	},
-	garbage: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx13be821f3b1afed3',
-			path: 'pages/home/home'
-		})
-	},
-	gotoSku: function() {
-		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			console.log(res)
-			app.globalData.weburl = res.data.url;
-			wx.navigateTo({
-				url: '/pages/pbService/web/index'
-			})
-			return;
-		})
-	},
+
 	audioGuide: function() {
 		wx.navigateToMiniProgram({
 			appId: 'wx74f380bc721a0379',
@@ -872,12 +643,7 @@ Page({
 			util.gotoDetail(item.ext);
 		}
 	},
-	meituan: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wxde8ac0a21135c07d',
-			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
-		})
-	},
+
 	// 轮播图点击
 	bannerClick: function(e) {
 		if (this.data.isTest) return;
@@ -1006,14 +772,13 @@ Page({
 		commonApi._post("pbservice/Other/getClientConfig", {
 			unique_key: "urltopage"
 		}).then(res => {
-			let data = JSON.parse(res.data)
-			this.setData({
-				urltopage: data
-			})
+            let data = JSON.parse(res.data)
+            this.data.urltopage = data
 		})
-		// this.getTwoProduct()
+
 		this.getBanner()
-    	this.getWeather()
+        this.getWeather()
+		this.getIndexSeason()
 
 	},
 	
@@ -1021,18 +786,7 @@ Page({
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
-		if (app.globalData.loadIndexSeason) {
-			this.getIndexSeason()
-		} else {
-			let t = setInterval(() => {
-				if (app.globalData.loadIndexSeason) {
-					this.getIndexSeason()
-					clearInterval(t)
-					t = null
-				}
-			}, 500)
-		}
-
+		// this.getIndexSeason()
 		this.pagePoint({
 			event: 'home_view'
 		}, 1)
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f3b737e..78bcb3b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,21 +1,21 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
+<image lazy-load class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
-  <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+  <!-- <image lazy-load bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
     mode="aspectFill"></image> -->
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+  <image lazy-load bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
     src="https://static.ticket.sz-trip.com/uploads/20250429/224929eeb4520d0c3ea8f10a657825b4.png" mode="aspectFill"></image>
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
     <!-- <view class="iconfont icon-sousuo"></view> -->
-    <image class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
+    <image lazy-load class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
     <view class="textOver">搜索想要的旅游产品或服务</view>
   </navigator>
 </view>
@@ -23,7 +23,7 @@
   <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
@@ -34,7 +34,7 @@
 <view class="content" wx:if="{{!isTest}}">
   <!-- 活动日历 -->
   <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
+    <image lazy-load mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
     <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
     <view class="nowDate"> 
         <view class="num">{{nowDate[0]}}</view>
@@ -52,7 +52,7 @@
     <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" >
         <view style="background: #fff;display: flex;border-radius: 7rpx;width: 100%;">
-          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+          <!-- <image lazy-load class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
           <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
@@ -66,7 +66,7 @@
     <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
         <view style="background: #fff;width: 100%;display: flex;border-radius: 7rpx;width: 100%;">
-          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+          <!-- <image lazy-load class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
           <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           
           <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
@@ -83,10 +83,10 @@
   <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
+      <image lazy-load bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
         data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj"
         src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
-      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
+      <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
        src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
@@ -98,43 +98,43 @@
             <view class="text">景点门票</view>
           </view>
           <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
             <view class="text">水上游</view>
           </view>
           <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/nightTour2025" data-event="night_sz" data-title="夜游苏州"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
             <view class="text">夜游苏州</view>
           </view>
           
           <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
           <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
             <view class="text">文创特产</view>
           </view>
 
           <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
             <view class="text">场馆预约</view>
           </view>
           <view bindtap="gotoUrl" data-event="card" data-title="一日游" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
           <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
           <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
 
           <view wx:if="{{isMayDay}}" bindtap="gotoMini" data-event="hotel_click" data-title="酒店住宿" 
           data-appid="wx0e6ed4f51db9d078" data-path="pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
             <view class="text">酒店住宿</view>
         </view>
         <!-- 五一前临时跳转专题页 -->
@@ -144,7 +144,7 @@
         </view>
 
         <!-- <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
             <view class="text">研学游</view>
         </view> -->
 
@@ -162,7 +162,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -173,54 +173,54 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
+      <image lazy-load style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
+    <image lazy-load class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
         <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view> -->
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
          class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
         <view bindtap="xlzs"  class="pbservice-item ggfw" >
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
             <view>行李直送</view>
         </view>
         <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
             <view>停车场</view>
         </view>
 
         <!-- <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view> -->
         
         <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
             data-path="/pages/pbService/bike/index?type=1">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
             <view>找厕所</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view> -->
         
@@ -232,28 +232,28 @@
     </view>
     <view wx:else style="margin: 0rpx 14rpx 0;">
       <view class="pic-list"  wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
+        <image lazy-load class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
           src="https://static.ticket.sz-trip.com/uploads/20250429/eacfc180904e8f1e8717afe2aa959c28.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          <image lazy-load class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
           data-path="/pages/list/{{isTest?'road':'food'}}/index"
           src="https://static.ticket.sz-trip.com/uploads/20250429/e86972b98e8fbb5c5983f38124a77cb2.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
           src="https://static.ticket.sz-trip.com/uploads/20250429/62637ab5923016ef9baa573372d2452f.png" mode="aspectFill">
         </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
           src="https://static.ticket.sz-trip.com/uploads/20250429/13060c57ee40d1f92145968a0fbd8378.png" mode="aspectFill"></image>
       </view>
     </view>
   </view>
   <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
+  <image lazy-load class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
   src="https://static.ticket.sz-trip.com/uploads/20250429/179e3d1e09a17149f260c8d51458ed15.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
-    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <!-- <image lazy-load class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
     <view class="bd-top">
-      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <image lazy-load class="bd-type" src="{{bdItem.icon}}" mode=""/>
       <view bindtap="moreBtn" class="bd-more" style="color:{{i%2==1?'#55578E':'#F34017'}}" data-item="{{bdItem}}">更多 ></view>
     </view>
     <view style="position: relative;z-index: 9;">
@@ -261,7 +261,7 @@
         wx:key="id" data-item="{{item}}">
         <view class="bd-index" style="color: {{bdItem.color}};">{{index+1}}</view>
         <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -290,7 +290,7 @@
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
         <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
 
@@ -305,7 +305,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -316,39 +316,39 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <image lazy-load style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+    <image lazy-load style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
         <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view>
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
          class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view> -->
         
@@ -360,14 +360,14 @@
     </view>
     <view wx:else>
       <view class="pic-list" style="margin-top:20rpx" >
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        <image lazy-load class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
           data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
           
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
         </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
       </view>
     </view>
@@ -379,7 +379,7 @@
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+		<image lazy-load src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
 	
 	<!-- 视频 -->
@@ -398,12 +398,12 @@
 			object-fit="fill"
 		></video>
 		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
 	</view>
 </view>
 
diff --git a/project.private.config.json b/project.private.config.json
index f220fe7..0660e02 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,22 +7,22 @@
     "miniprogram": {
       "list": [
         {
-          "name": "subPackages/feiyiNew/CGCIndex/index",
-          "pathName": "subPackages/feiyiNew/CGCIndex/index",
+          "name": "pages/user/order/movieOrderInfo/index",
+          "pathName": "pages/activity/year2020/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/user/order/movieOrderInfo/index",
-          "pathName": "pages/order/payresult/index",
-          "query": "id=28182505151342456109",
+          "name": "subPackages/index/index",
+          "pathName": "subPackages/index/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "subPackages/indexGQ/index",
-          "pathName": "subPackages/index/index",
+          "name": "subPackages/feiyiNew/CGCIndex/index",
+          "pathName": "subPackages/feiyiNew/CGCIndex/index",
           "query": "",
           "launchMode": "default",
           "scene": null

From cab195341adb1590d3a8bd3edc6c9a427fed4cb6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sun, 25 May 2025 12:24:34 +0800
Subject: [PATCH 321/471] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                       |  40 +-
 pages/index/index.wxml                     |   2 +-
 pages/order/pay/index.js                   |   2 +-
 pages/pbService/web/index.js               |  36 +-
 pages/user/order/movieOrderInfo/index.js   |  10 +
 pages/user/order/movieOrderInfo/index.wxml |   6 +-
 project.private.config.json                |  13 +-
 subPackages/index/index.js                 | 869 ++++++++++-----------
 subPackages/index/index.wxml               | 432 +++-------
 subPackages/index/index.wxss               | 123 +--
 utils/https.js                             |   8 +-
 11 files changed, 664 insertions(+), 877 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 2a73d54..104a24f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -6,6 +6,7 @@ import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 Page({
 	data: {
+        fullAdvTimer: null,  // 全屏timer
 		banner: [],
 		xiaobanner: [],
 		height: 0,
@@ -122,6 +123,7 @@ Page({
 	},
     onLoad: function(options) {
             //全屏广告
+            let _this = this
             commonApi._post("adv/getAdv", {
                 position: 2,
                 type_id: 3
@@ -148,26 +150,21 @@ Page({
                         this.setData({
                             showTime: true
                         })
-                        var timer = setInterval(() => {
-                            this.setData({
-                                time: this.data.time - 1
-                            })
-                            if (this.data.time === 0) {
-                                var opacityTimer = setInterval(() => {
-                                    this.setData({
-                                        opacity: this.data.opacity - 0.3
-                                    })
-                                }, 100)
+                        this.data.fullAdvTimer = setInterval(() => {
+                            _this.data.time-=0.5
+                            if (Number.isInteger(_this.data.time)) {
+                                _this.setData({time: _this.data.time})
                             }
-                            if (this.data.time == -1) {
-                                clearInterval(timer)
-                                clearInterval(opacityTimer)
+                            if (_this.data.time <= 0) {
+								// 可以css 优化
+                                _this.setData({opacity: 0})
+                            }
+                            if (_this.data.time <= -1) {
+                                clearInterval(_this.data.fullAdvTimer)
                                 wx.showTabBar() //倒计时结束清除定时器显示导航栏
-                                this.setData({
-                                    showFullAdv: false
-                                })
+                                _this.setData({showFullAdv: false})
                             }
-                        }, 1000)
+                        }, 500)
                     } else {
                         // 视频
                     }
@@ -461,7 +458,8 @@ Page({
 	closeFullAdv: function() {
 		this.setData({
 			showFullAdv: false
-		})
+        })
+        clearInterval(this.data.fullAdvTimer)
 		if (!this.data.alertSwipeList.length > 0) {
 			wx.showTabBar({
 				animation: true,
@@ -759,9 +757,11 @@ Page({
 				this.setData({
 					lat: res.latitude,
 					lon: res.longitude
-				})
+                })
 				this.getList()
-				this.getHdrlList()
+                this.getHdrlList()
+                let tempData = JSON.stringify({lat: res.latitude,lon: res.longitude})
+                wx.setStorageSync('lonAndLat', tempData)
 			},
 			fail: (err) => {
 				this.getList()
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 78bcb3b..f98c8e3 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -123,7 +123,7 @@
             <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
-          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://test.m.cloud.sz-trip.com/movies" data-event="one_card" data-title="户外游"  class="pbservice-item">
             <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index ccf51c9..0492ed4 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -151,7 +151,7 @@ Page({
           info:res.data,
           activePay: Object.keys(res.data.coupon_activity).length === 0 ?false:true,
           SUBWALLET:res.data.coupon_activity.pay_type.includes('SUBWALLET') || !res.data.coupon_activity.pay_type,
-          wxPay:res.data.coupon_activity.pay_type.includes('WEIXIN') || !res.data.coupon_activity.pay_type,
+          wxPay:res.data.coupon_activity.pay_type.includes('ICBC_WECHAT') || !res.data.coupon_activity.pay_type,
           payIndex:Object.keys(res.data.coupon_activity).length === 0 ?-1:0,
         })
         console.log(this.data.wxPay);
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 0731d7d..7b848f7 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -85,11 +85,43 @@ Page({
             } else {
                 weburl += '?token='+token
             }
-        } 
+        }
+        let _this = this
+        try {
+            let lonAndLat = (wx.getStorageSync('lonAndLat'))
+            if (lonAndLat && JSON.parse(lonAndLat)) {
+                lonAndLat = JSON.parse(lonAndLat)
+                if (Object.keys(webParam).length>0 || token) {
+                    weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                } else {
+                    weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                }
+                this.setUrl(weburl)
+                return
+            } else {
+                wx.getLocation({
+                    type: 'gcj02',
+                    success: (res) => {
+                        let lonAndLat = JSON.stringify({lat: res.latitude,lon: res.longitude})
+                        wx.setStorageSync('lonAndLat', lonAndLat)
+                        if (Object.keys(webParam).length>0 || token) {
+                            weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                        } else {
+                            weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                        }
+                        _this.setUrl(weburl)
+                    },
+                    fail: (err) => {
+                        _this.setUrl(weburl)
+                    }
+                })
+            }
+        } catch(e) {
+            this.setUrl(weburl)
+        }
         // this.setData({
         //     webUrl:weburl
         // })
-        this.setUrl(weburl)
     } else {
         // this.setData({
         //     webUrl:weburl
diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js
index 62c78fa..f59e2f6 100644
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@@ -34,6 +34,16 @@ Page({
     })
     
   },
+  gotoLocation:function(){
+    let info = this.data.info;
+    if(info && info.lat && info.lon){
+      wx.openLocation({
+        latitude: Number(info.lat),
+        longitude: Number(info.lon)
+      })
+    }
+  },
+
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
     qrcode.map((item,index)=>{
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 948f2f2..97deb1d 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -110,6 +110,8 @@
   </view>
   <view class="detail-item" style="height:auto">
     <text>商家地址：{{info.order_product_list[0].scene_detail.address}}</text>
+    <!-- <view class="iconfont icon-daohang" style="color: red;" bindtap="gotoLocation"></view> -->
+
   </view>
 </view>
 <view class="box" wx:if="{{info}}">
@@ -123,8 +125,8 @@
   <view class="detail-item" wx:if="{{info.pay_at}}">
     <text>支付时间：{{info.pay_at}}</text>
   </view>
-  <view class="detail-item" wx:if="{{info.pay_method}}">
-    <text>支付方式：{{pay_methods[info.pay_method]}}</text>
+  <view class="detail-item" wx:if="{{info.pay_method_text}}">
+    <text>支付方式：{{info.pay_method_text}}</text>
   </view>
   <!-- <view class="detail-item">
     <text>付款时间：{{info.create_time}}</text>
diff --git a/project.private.config.json b/project.private.config.json
index 0660e02..b200949 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/order/joinOrder/index",
+          "pathName": "pages/order/pay/index",
+          "query": "id=28182505231709189176&token=0b62878b-b30c-41d8-a91f-119f8365d86e",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/user/order/movieOrderInfo/index",
           "pathName": "pages/activity/year2020/index",
@@ -108,12 +115,6 @@
           "query": "",
           "scene": null
         },
-        {
-          "name": "pages/order/joinOrder/index",
-          "pathName": "pages/order/joinOrder/index",
-          "query": "oid=59532109231539023692&id=336&uid=24",
-          "scene": null
-        },
         {
           "name": "",
           "pathName": "pages/order/payresult/index",
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 835e1a0..2265f05 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -10,12 +10,129 @@ import https from "../../utils/https.js"
 
 Page({
 	data: {
-        bannerInterver: 1000*60,
+        
+        // bannerInterver: 5*1000,  // 动态更改banner时间
 		banner: [],
 		xiaobanner: [],
-		height: 0,
-		padHeight: 0,
-		right: 0,
+		activeBannerIndex: 0,
+        smBannerIndex: 0,
+		systemStyle: {
+			height: 0,
+			padHeight: 0,
+			right: 0,
+		},
+		// banner上的金刚区
+		bannerDataList: [
+			{
+				title: "景点门票",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/pages/list/scene/index",
+			},
+			{
+				title: "活动日历",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
+				path: "/pages/list/activitynew/index",
+			},
+			{
+				title: "将意真品",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
+				path: "/subPackages/techanNew/index",
+			},
+			{
+				title: "领券中心",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/pages/list/scene/index",
+			},
+		],
+		// 金刚区
+		mainTypeList: [
+			{
+				title: "非遗专卖",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/subPackages/feiyiNew/index",
+			},
+			{
+				title: "场馆预约",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: "/pages/list/museum/index",
+			},
+			{
+				title: "一日游",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl:"https://m.cloud.sz-trip.com/OneDayTravelNew",
+			},
+			{
+				title: "户外游",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl:"https://m.cloud.sz-trip.com/LearningTravel",
+			},
+			{
+				title: "电影购票",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl:"https://m.cloud.sz-trip.com/movies",
+			},
+			{
+                type: 'hotel', // 特殊标识方便查找 更新weburl
+				title: "酒店住宿",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				weburl: '',
+				path: '/pages/list/hotel/index'
+			},
+			{
+				title: "水上游",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: '/pages/list/night/index'
+			},
+			{
+				title: "剧场演出",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				path: '/pages/list/theatre/index'
+			},
+		],
+
+		xpth: {}, // 新品特惠
+		XPathBannerIndex: 0,
+		// 公共服务
+		publicSerivce: [
+			{
+				title: "高峰预警",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy",
+				eventName: "comfort_click",
+			},
+			{
+				title: "实时路况",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/",
+				eventName: "sslk",
+			},
+			{
+				title: "行李直送",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				appId: 'wx757dd1ee184e75e9',
+          		pagePath: "pages/tabBar/index/index"
+			},
+			{
+				title: "行李寄存",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/",
+				eventName: "xljc",
+			},
+			{
+				title: "找厕所",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				path: "/pages/pbService/bike/index?type=1",
+			},
+			{
+				title: "找厕所",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				weburl: "",
+			},
+			
+        ], 
+        
+        fullAdvTimer: null,  // 全屏timer
+
 		weather: null,
 		saleProduct: null,
 		roadProduct: null,
@@ -36,9 +153,8 @@ Page({
 		videoPrize: false,
 		prizeInfo: null,
 		otherPlat: null,
-		activeBannerIndex: 0,
-        smBannerIndex: 0,
-        XPathBannerIndex: 0,
+		
+        
 		indexSeason: {},
 		// startList: [], // 启动页广告
 		startList: {
@@ -50,9 +166,9 @@ Page({
 		opacity: 1,
 		time: 3, //全屏广告剩余时间
 		showTime: false,
-		xpth: {}, // 元旦新增 新品特惠和sqjNew
-		djs: null, // 元旦新增 新品特惠倒计时
-        djsTime: null,
+		
+
+
         area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
 		sqjNew: [
             'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
@@ -66,24 +182,16 @@ Page({
             'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
 			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
 		],
-		viewHeight: "0px",
+
 		isMuted: true,
         videoPlay: false,
 
         // 页面图片
         imageSourceList:imageSource,
 
-        // 酒店住宿配置链接   /pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/carPurchase
-        hotelUrl: ''
 	},
 	onLoad: function(options) {
-        console.log('onload')
-
-        wx.getLocation({type: 'gcj02'})
-           
-		console.log('options',options)
-		// 相城小程序跳转获取用户信息
-		if(options && options.szxcCode) {
+        if(options && options.szxcCode) {
 			commonApi._post("uservice/user/loginByXC", {
 				code: options.szxcCode
 			}).then(res => {
@@ -91,67 +199,20 @@ Page({
 				  https.set_logininfo(res);
 				}
 			})
-		}
-		this.getHeight()
-		//全屏广告
-		wx.hideTabBar() //这里隐藏了底部导航栏
-		commonApi._post("adv/getAdv", {
-			position: 2,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				let length = res.data.length
-				if (res.data.length > 1) {
-					let num = Math.floor(Math.random() * length);
-					this.setData({
-						startList: res.data[num]
-					})
-				} else {
-					this.setData({
-						startList: res.data[0]
-					})
-				}
-
-				// 图片
-				if (this.data.startList.media_type) {
-					this.setData({
-						showTime: true
-					})
-					var timer = setInterval(() => {
-						this.setData({
-							time: this.data.time - 1
-						})
-						if (this.data.time === 0) {
-							var opacityTimer = setInterval(() => {
-								this.setData({
-									opacity: this.data.opacity - 0.3
-								})
-							}, 100)
-						}
-						if (this.data.time == -1) {
-							clearInterval(timer)
-							clearInterval(opacityTimer)
-							wx.showTabBar() //倒计时结束清除定时器显示导航栏
-							this.setData({
-								showFullAdv: false
-							})
-						}
-					}, 1000)
-				} else {
-					// 视频
-				}
-			} else {
-				this.setData({
-					showFullAdv: false
-				})
-			}
-		})
-		if (options.from) {
+        }
+        if (options.from) {
 			app.globalData.from = options.from;
 		}
-		let systemInfo = wx.getSystemInfoSync(),
-			rect = wx.getMenuButtonBoundingClientRect();
-		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+		return
+
+        wx.getLocation({type: 'gcj02'})
+           
+		console.log('options',options)
+		// 相城小程序跳转获取用户信息
+		
+		
+		
+		
 		wx.getLocation({
 			type: 'gcj02',
 			success: (res) => {
@@ -165,11 +226,7 @@ Page({
 				this.getList()
 			}
 		})
-		this.setData({
-			height: height,
-			padHeight: systemInfo.statusBarHeight,
-			right: (systemInfo.screenWidth - rect.right) + rect.width
-		})
+		
 
 		commonApi._post("pbservice/Other/getClientConfig", {
 			unique_key: "urltopage"
@@ -180,7 +237,7 @@ Page({
 			})
 		})
 		this.getTwoProduct()
-		this.getBanner()
+		
 		this.getWeather()
 		// 获取今天的日期
 		let today = new Date();
@@ -188,92 +245,288 @@ Page({
 			month: (this.data.months[today.getMonth()]).toUpperCase(),
 			date: today.getDate()
         })
-        // 调用接口如果token过期会导致一进入就要登陆
-		// this.getVideoPrize()
-		this.getXpthList()
+
+    },
+
+	onReady: function() {
+		this.getHeight()
+		this.getBanner()
+        // 活动日历
+        // this.getFourProduct()
+
+		this.getXpthList() // 限时特惠
+
+
 	},
+    // 获取系统信息
 	getHeight() {
-		let that = this
-		wx.getSystemInfo({
-			success(res) {
-				that.setData({
-					viewHeight: res.windowHeight + 'px'
+        let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+        let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+        let systemStyle = {
+            height: height, // 导航栏
+            padHeight: systemInfo.statusBarHeight,  // 状态栏
+            right: (systemInfo.screenWidth - rect.right) + rect.width // 右侧胶囊
+        }
+        this.setData({
+			systemStyle: systemStyle,
+		})
+    },
+    //获取季节配置
+	getIndexSeason() {
+        let mainTypeList = this.data.mainTypeList
+        let hotelData = mainTypeList.find(v=>v.type == hotel)
+
+        if (app.globalData.configJson.indexSeason) {
+            hotelData.weburl = app.globalData.configJson.hotelUrl
+            this.setData({
+                indexHot: app.globalData.configJson.indexHot,
+                isTest: app.globalData.configJson.isTest,
+                otherPlat: app.globalData.configJson.otherPlats,
+                // 正式数据
+                indexSeason: app.globalData.configJson.indexSeason,
+                // 开发数据
+                // indexSeason: imageSource.testImgs.indexSeason,
+                mainTypeList: mainTypeList
+            })
+        } else {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+                let obj = {}
+                res.data.content.forEach(item => {
+                    obj[item.id] = item.image
+                });
+                app.globalData.configJson.indexSeason = obj 
+                app.globalData.loadIndexSeason = true
+                hotelData.weburl = app.globalData.configJson.hotelUrl
+                this.setData({
+                    indexHot: app.globalData.configJson.indexHot,
+                    isTest: app.globalData.configJson.isTest,
+                    otherPlat: app.globalData.configJson.otherPlats,
+                    indexSeason: app.globalData.configJson.indexSeason,
+                    mainTypeList: mainTypeList
+                })
+            })
+        }
+        console.log(this.data)
+	},
+    // --------------------banner 相关---------------------------
+    // 获取banner
+    getBanner: function() {
+        let _this = this
+        //全屏广告
+		commonApi._post("adv/getAdv", {position: 2,type_id: 3}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+                let num = Math.floor(Math.random() * length);
+                this.setData({startList: res.data[num]})
+				// 图片
+				if (this.data.startList.media_type) {
+                    wx.hideTabBar() //这里隐藏了底部导航栏
+					this.setData({showTime: true})
+					this.data.fullAdvTimer = setInterval(() => {
+                        _this.data.time-=0.5
+                        if (Number.isInteger(_this.data.time)) {
+                            _this.setData({time: _this.data.time})
+                        }
+						if (_this.data.time <= 0) {
+							_this.setData({opacity: _this.data.opacity - 0.3})
+						}
+						if (_this.data.time <= -1) {
+							clearInterval(_this.data.fullAdvTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							_this.setData({showFullAdv: false})
+						}
+					}, 500)
+				} else {
+					// 视频
+				}
+			} else {
+				this.setData({showFullAdv: false})
+			}
+		})
+
+
+		commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
+			this.setData({banner: res.data || []})
+		})
+		commonApi._post("adv/getAdv", {position: 1,type_id: 3}).then(res => {
+			this.setData({xiaobanner: res.data || []})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {position: 3,type_id: 3}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
 				})
 			}
 		})
 	},
+
+    // 统一的banner change 需要时可以放开
+	changeBannerIndex: function(e) {
+        return
+        let keyname = e.currentTarget.dataset.keyname
+		this.setData({
+            [keyname]: e.detail.current,
+		})
+    },
+
+	// 轮播图点击
+	bannerClick: function(e) {
+		if (this.data.isTest) return;
+		let item = e.currentTarget.dataset.item;
+		this.pagePoint({
+			event: "banner_click",
+			type: 'banner'
+		}, 1)
+		switch (item.jump_type) {
+			case 0:
+				break;
+			case 1:
+				util.gotoDetail(item.product_model)
+				break;
+			case 2:
+				if (item.front_model && item.front_model.mini) {
+					wx.navigateTo({
+						url: "/" + item.front_model.mini
+					})
+				}
+				break;
+			case 3:
+				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
+					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
+					// 外部h5
+					app.globalData.weburl = item.tdata.url;
+					wx.navigateTo({
+						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+							.url)
+					})
+				} else {
+					let page = item.tdata.url.split("/");
+					page = page[page.length - 1].split("?")
+					let url = this.data.urltopage[page[0]];
+					if (url && url.indexOf('map') != -1) {
+						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
+								'cinema', 'academes'
+							],
+							type = page[1] ? page[1].split("=") : [];
+						wx.reLaunch({
+							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
+								null)
+						})
+					} else if (url) {
+						wx.navigateTo({
+							url: url,
+						})
+					} else {
+						app.globalData.weburl = item.tdata.url;
+						wx.navigateTo({
+							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
+								.tdata.url)
+						})
+					}
+				}
+				break;
+			case 4:
+				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+					// 如果是苏心游的小程序 直接把authCode带过去
+					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+						let weburl = item.tdata.page
+						if (weburl.indexOf('?') != -1) {
+							weburl += '&authCode=' + res.data;
+						} else {
+							weburl += '?authCode=' + res.data
+						}
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: weburl
+						})
+					}).catch(err => {
+						wx.navigateToMiniProgram({
+							appId: item.tdata.appid,
+							path: item.tdata.page
+						})
+					})
+				} else {
+					wx.navigateToMiniProgram({
+						appId: item.tdata.appid,
+						path: item.tdata.page
+					})
+				}
+				break;
+			default:
+				break;
+		}
+		return;
+
+	},
+    
+    //------------------------金刚区点击-------------------------------------
+	mainIconClick: function(e) {
+		let item = e.currentTarget.dataset.item
+		// 埋点
+		if (item.eventName) {
+			this.pagePoint({event: item.eventName,}, 1)
+		}else if (item.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: item.title
+			})
+		}
+
+		if (item.appId) {
+			wx.navigateToMiniProgram({
+				appId: item.appId,
+				path: item.pagePath,
+			})
+			return
+		}
+		if (item.path) {
+			wx.navigateTo({
+				url: item.path
+			})
+			return
+		}
+		if (item.weburl) {
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.weburl)
+			})
+			return
+		}
+		
+    },
+
+	// 滚动监听
+	listenScroll(e) {
+		console.log(e.detail.scrollLeft)
+		this.setData({
+			scrollLeft: e.detail.scrollLeft
+		})
+	},
+    
+    // -----------------------------------------------------------------------
+    
+    // 新品特惠
 	getXpthList: function() {
-		// 元旦新增 新品特惠
 		commonApi._post("product/get_product_indulgence", {
 			tag_id: 275,
             typeId: 3,
             type: 1, // 返回数组
 		}).then(res => {
-            // res.data.adv = [res.data.adv]
-			this.setData({
-				xpth: res.data,
-				djsTime: res.data.time
-			})
-			let time = setInterval(() => {
-				this.setData({
-					djsTime: this.data.djsTime - 1
-				})
-				this.formatDate(this.data.djsTime)
-			}, 1000)
-			if (this.data.djsTime == 0) {
-				clearInterval(time)
-			}
-		})
-	},
-	// 元旦新品特惠 倒计时 
-	formatDate: function(oTime) {
-		let h = parseInt(oTime / 3600)
-		let m = parseInt((oTime % 3600) / 60)
-		let s = parseInt(oTime % 60)
-		h = h < 10 ? "0" + h : h;
-		m = m < 10 ? "0" + m : m;
-		s = s < 10 ? "0" + s : s;
-		this.setData({
-			djs: {
-				h: h,
-				m: m,
-				s: s
-			}
+			this.setData({xpth: res.data,})
 		})
-		return
 	},
+
 	goFeiyi: function() {
 		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
 		wx.navigateTo({
 			url: "/pages/pbService/web/index"
 		})
 	},
-	onTabItemTap: function(e) {
-		console.log(e, 99999999)
-	},
-	changeBannerIndex: function(e) {
-		this.setData({
-            activeBannerIndex: e.detail.current,
-            bannerInterver: 5000
-		})
-	},
-	changeSmBannerIndex: function(e) {
-		this.setData({
-			smBannerIndex: e.detail.current
-		})
-    },
-    changeXPathBannerIndex: function(e) {
-		this.setData({
-			XPathBannerIndex: e.detail.current
-		})
-    },
-    xlzs: function (e) {
-
-        wx.navigateToMiniProgram({
-          appId: 'wx757dd1ee184e75e9',
-          page: "pages/tabBar/index/index"
-        })
-      },
+    
+ 
 	// 一城百馆
 	city: function() {
 		wx.navigateToMiniProgram({
@@ -295,71 +548,8 @@ Page({
 		})
 		this.getFourProduct()
 	},
-	getBanner: function() {
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xcxBanner"
-		// }).then(res=>{
-		//   console.log(res)
-		//   this.setData({
-		//     banner:res.data.content || []
-		//   })
-		// })
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xiaobanner"
-		// }).then(res=>{
-		//   this.setData({
-		//     xiaobanner:res.data.content || []
-		//   })
-		// })
-		// return;
-		commonApi._post("adv/getAdv", {
-			position: 0,
-			type_id: 3
-		}).then(res => {
-			this.setData({
-				banner: res.data || []
-			})
-		})
-		commonApi._post("adv/getAdv", {
-			position: 1,
-			type_id: 3
-		}).then(res => {
-			this.setData({
-				xiaobanner: res.data || []
-			})
-		})
-		//弹窗广告
-		commonApi._post("adv/getAdv", {
-			position: 3,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				this.setData({
-					alertSwipeList: res.data || [],
-					showAdv: true
-				})
-			} else if (!this.data.showFullAdv) {
-				wx.showTabBar({
-					animation: true,
-				})
-			}
-		})
+	
 
-	},
-	//获取季节配置
-	getIndexSeason() {
-		this.setData({
-			indexHot: app.globalData.configJson.indexHot,
-			isTest: app.globalData.configJson.isTest,
-            otherPlat: app.globalData.configJson.otherPlats,
-            // 正式数据
-            indexSeason: app.globalData.configJson.indexSeason,
-            // 开发数据
-            // indexSeason: imageSource.testImgs.indexSeason
-		})
-        this.getFourProduct()
-        console.log(this.data)
-	},
 	//关闭弹窗广告
 	closeAdv: function() {
 		this.setData({
@@ -371,13 +561,10 @@ Page({
 	},
 	//关闭全屏广告
 	closeFullAdv: function() {
-		this.setData({
-			showFullAdv: false
-		})
+        this.setData({showFullAdv: false})
+        clearInterval(this.data.fullAdvTimer)
 		if (!this.data.alertSwipeList.length > 0) {
-			wx.showTabBar({
-				animation: true,
-			})
+			wx.showTabBar({animation: true})
 		}
 	},
 	// 是否静音
@@ -502,19 +689,7 @@ Page({
 		util.gotoDetail(item)
 	},
 	gotoPath: function(e) {
-		// if (e.currentTarget.dataset.event) {
-		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
-		//     wx.navigateToMiniProgram({
-		//       appId: 'wxd323e63a10aa6865',
-		//       path: 'pages/home/index'
-		//     })
-		//     return
-		//   }else{
-		//     this.pagePoint({
-		//       event: e.currentTarget.dataset.event
-		//     }, 1)
-		//   }
-		// }
+
 		if (e.currentTarget.dataset.title == '书香借阅') {
 			wx.navigateToMiniProgram({
 				appId: 'wx165d4f1727f6bdb0',
@@ -527,12 +702,6 @@ Page({
 				path: 'pages/index/index'
 			})
 			return;
-		// } else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-		// 	wx.navigateToMiniProgram({
-		// 		appId: 'wxdd39069b9a91dbfe',
-		// 		path: 'pages/index/index'
-		// 	})
-		// 	return;
 		} else if (e.currentTarget.dataset.title == 'e读书') {
 			wx.navigateToMiniProgram({
 				appId: 'wx26e6f4c0baba005b',
@@ -718,95 +887,7 @@ Page({
 			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
 		})
 	},
-	// 轮播图点击
-	bannerClick: function(e) {
-		if (this.data.isTest) return;
-		let item = e.currentTarget.dataset.item;
-		this.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
-							.url)
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
-								null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
-								.tdata.url)
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return;
 
-	},
 	//博物馆跳转  直接跳君到苏州H5
 	goH5: function(e) {
 		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
@@ -816,77 +897,9 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	bannerClick2: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.action == 'href') {
-			if (item.href.indexOf(",") != -1) {
-				let info = item.href.split(",");
-				wx.navigateToMiniProgram({
-					appId: info[0],
-					path: info[1]
-				})
-			} else if (item.href.indexOf('map/index') != -1) {
-				wx.reLaunch({
-					url: item.href
-				})
-			} else {
-				wx.navigateTo({
-					url: item.href,
-				})
-			}
-		} else if (item.action == "web") {
-			app.globalData.weburl = item.href;
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-			})
-		}
-	},
-	// 监听文旅查询的scroll
-	listenScroll(e) {
-		this.setData({
-			scrollLeft: e.detail.scrollLeft
-		})
-	},
-	// 获取短视频大赛是否中奖 中奖详情
-	getVideoPrize() {
-		let user_id = wx.getStorageSync('jstrip_userid');
-        if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-		commonApi.user_post('actonline/video_act/getRaffle', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				videoPrize: res.data
-			})
-		})
-	},
-	noMoreTip() {
-		wx.setStorageSync('indexPriceNoTip', true)
-		this.closePrice()
-	},
-	closePrice() {
-		this.setData({
-			videoPrize: false,
-			prizeInfo: null
-		})
-	},
-	// 抽奖
-	choosePrize() {
-		commonApi.user_post('actonline/video_act/luckyDraw', {
-			act_id: 5
-		}).then(res => {
-			this.setData({
-				prizeInfo: res.data
-			})
-			if (res.data.type != 'none') {
-				// 抽奖成功的话 弹框
-				wx.showModal({
-					title: "提示",
-					content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-					showCancel: false
-				})
-			}
-		})
-	},
+
+
+
 	bannerJumpNew(item) {
 		let that = this
 		item = item.currentTarget.dataset.item
@@ -972,10 +985,7 @@ Page({
 		}
 		return
 	},
-	onReady: function() {
-
-
-	},
+	
 	gotoOther: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (item.type == 'h5') {
@@ -998,47 +1008,20 @@ Page({
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
+		// console.log(app.globalData)
+		// if (app.globalData.loadIndexSeason) {
+		// 	this.getIndexSeason()
+		// } else {
+		// 	let t = setInterval(() => {
+		// 		if (app.globalData.loadIndexSeason) {
+		// 			this.getIndexSeason()
+		// 			clearInterval(t)
+		// 			t = null
+		// 		}
+		// 	}, 500)
+		// }
 
-		if (app.globalData.loadIndexSeason) {
-			this.getIndexSeason()
-		} else {
-			let t = setInterval(() => {
-				if (app.globalData.loadIndexSeason) {
-					this.getIndexSeason()
-					clearInterval(t)
-					t = null
-				}
-			}, 500)
-		}
-
-		this.pagePoint({
-			event: 'home_view'
-        }, 1)
-        
-        if(!this.data.hotelUrl) {
-        commonApi._post("pbservice/Other/getClientConfig", {
-            unique_key: "wechatxcx"
-          }).then(res => {
-              try {
-                let data = JSON.parse(res.data);
-                if (data.hotelUrl) {
-                    this.setData({
-                        hotelUrl: data.hotelUrl
-                    })
-                }
-              } catch(e) {
-                this.setData({
-                    hotelUrl: '/pages/list/hotel/index'
-                })
-              }
-          }).catch(err => {
-              this.setData({
-                  hotelUrl: '/pages/list/hotel/index'
-              })
-          })
-        }
-
-		// this.data.time!=5?wx.showTabBar():1
+		this.pagePoint({event: 'home_view'}, 1)
 	},
 
 	/**
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 3eb48fc..bc09170 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -1,146 +1,60 @@
 <!--index.wxml-->
-<title title="君到苏州（文化旅游总入口）"></title>
-<!-- <view class="old-btn">关怀模式</view> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flowerbg.png" mode="widthFix"></image> -->
-<!-- <image class="top-bg-img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/spring22/flower.gif" mode="widthFix"></image> -->
-<!-- 后台获取的季节动图 -->
+
+
 <view wx:if="{{!isTest}}">
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-    <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-    <view class="weather-num">{{weather.max_temp}}°</view>
-    <view class="weather">{{weather.weather}}</view>
-    <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png" mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index" src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
-    <!-- <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-        data-event="customer_service_click" src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png"
-        mode="aspectFill"></image>
-    <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-        src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image> -->
-    </view>
-    <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-    <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-        <!-- <view class="iconfont icon-sousuo"></view> -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-        <view class="textOver" >搜索想要的旅游产品或服务</view>
-    </navigator>
-    </view>
     <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="index">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
-    </view>
-    </view>
+        <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+            <block wx:for="{{banner}}" wx:key="index">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <!-- <view class="com-flex dot-list">
+            <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+        </view> -->
 
- 
-    <view class="top-icons" wx:if="{{!isTest}}">
-        <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[0]}}" mode="widthFix"></image>
-            <view class="top-icon-text">活动日历</view>
-        </view>
-        <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[1]}}" mode="widthFix"></image>
-            <view class="top-icon-text">场馆预约</view>
-        </view>
-        <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[2]}}" mode="widthFix"></image>
-            <view class="top-icon-text">非遗专卖</view>
+        <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+20}}px">
+            <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+                <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <view class="textOver" >搜索想要的旅游产品或服务</view>
+            </navigator>
         </view>
 
-        <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
-            <view class="top-icon-text">剧场演出</view>
-        </view>
-        <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[4]}}" mode="widthFix"></image>
-            <view class="top-icon-text">文创特产</view>
-        </view>
-        <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[5]}}" mode="widthFix"></image>
-            <view class="top-icon-text">景点门票</view>
-        </view>
-        <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="{{hotelUrl}}" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view>
-        <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[6]}}" mode="widthFix"></image>
-            <view class="top-icon-text">酒店住宿</view>
-        </view> -->
-        <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[7]}}" mode="widthFix"></image>
-            <view class="top-icon-text">水上游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[8]}}" mode="widthFix"></image>
-            <view class="top-icon-text">一日游</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="movie" data-title="户外游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="top-icon-item">
-            <image src="{{imageSourceList.mainFunImgs[9]}}" mode="widthFix"></image>
-            <view class="top-icon-text">户外游</view>
+        <view class="banner-main">
+            <view catchtap="mainIconClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
+                <image src="{{item.img}}" ></image>
+            </view>
         </view>
     </view>
-    <view class="content">
-        <view class="sale-road-boxes" wx:if="{{false}}">
-            <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
-            <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-            <view class="sale-product">
-                <view class="sale-product-bg"></view>
-                <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/sale.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>限时特惠</view>
-                    <view>新品推荐</view>
-                </view>
-                <view class="sale-price" style="color:#F44747" wx:if="{{saleProduct}}">
-                    ￥{{saleProduct.price?saleProduct.price/100:0}}起</view>
-                </view>
-            </view>
-            </view>
-            <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
-            <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
-            <view class="sale-product">
-                <view class="sale-product-bg road-product-bg"></view>
-                <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-                <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/spring22/road.png" mode="aspectFill">
-                </image>
-                <view class="sale-info">
-                <view class="sale-product-title textOver2">
-                    <view>四季苏州</view>
-                    <view>最是江南</view>
-                </view>
-                <view class="sale-price" style="color:rgb(0, 153, 137)" wx:if="{{roadProduct}}">
-                    ￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
+
+   
+   
+    <view class="main-content">
+         <!-- 金刚区 -->
+        <view>
+            <scroll-view scroll-x style="height:200rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft">
+                <view  class="top-icons no-scrollbar">
+                    <view bindtap="mainIconClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
+                        <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
+                        <view class="top-icon-text">{{item.title}}</view>
+                    </view>
                 </view>
-            </view>
-            </view>
-        </view>
-        <!-- ai避高峰 -->
-        <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
-            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-            <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-            <image src="{{indexSeason.ai}}" mode=""/>
-            </view>
-            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-            <image src="{{indexSeason.avoid}}" mode=""/>
+            </scroll-view>
+            <view class="scroll-line">
+                <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
+                <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
             </view>
         </view>
+        
+    </view>
+    
+    <view class="content">
 
-        <!-- 小banner 五一修改 一张banner不滚动 -->
-        <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-            <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%;height: 100%;" src="{{xiaobanner[0].head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="small-swiper-box" wx:else>
-            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
+        <view class="small-swiper-box" >
+            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="smBannerIndex">
             <block wx:for="{{xiaobanner}}" wx:key="index">
                 <swiper-item bindtap="bannerClick" data-item="{{item}}">
                 <!-- 原 圆角77rpx，现改为13rpx -->
@@ -148,92 +62,94 @@
                 </swiper-item>
             </block>
             </swiper>
-            <view class="dot-list com-flex sm-dot-list">
-            <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-            </view>
+            <!-- <view class="dot-list com-flex sm-dot-list">
+                <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+            </view> -->
         </view>
-    
+
         <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{false}}">
+        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" >
             <!-- 上方标题部分 -->
             <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;">
-                倒计时
-                <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.m}}</view>
-                <text>:</text>
-                <view class="xsth-time">{{djs.s}}</view>
-            </view>
-
+                <view class="xsth-left" style="display: flex;">
+                    <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
+                </view>
             </view>
             <!-- 商品部分 -->
             <view class="xpth-product">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left">
-                <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                <image src="{{item.headimg}}" mode="" />
-                <view class="xpth-item-content">
-                    <view class="xpth-item-title textOver2">{{item.title}}</view>
-                    <!-- <view class="xpth-tag">唇齿留香</view> -->
-                    <view class="xpth-item-bottom">
-                    <view class="xpth-item-price">{{item.price/100}}</view>
-                    <!-- <view class="xpth-item-buy">立即抢购</view> -->
+                <!-- 左边的2个产品 -->
+                <view class="xpth-left">
+                    <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                    <image src="{{item.headimg}}" mode="" />
+                    <view class="xpth-item-content">
+                        <view class="xpth-item-title textOver2">{{item.title}}</view>
+                        <view class="xpth-item-bottom">
+                        <view class="xpth-item-price">{{item.price/100}}</view>
+                        </view>
+                    </view>
                     </view>
                 </view>
+                <!-- 右边的banner -->
+                <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                    <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                    bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
+                    <block wx:for="{{xpth.adv}}" wx:key="index">
+                        <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                        <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                        </swiper-item>
+                    </block>
+                    </swiper>
+                    <view class="xpth-banner-dot-list">
+                        <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                    </view>
                 </view>
             </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeXPathBannerIndex">
-                <block wx:for="{{xpth.adv}}" wx:key="index">
-                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                    <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
-                    </swiper-item>
-                </block>
-                </swiper>
-                <view class="xpth-banner-dot-list">
-                    <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
-                </view>
-            </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
-            </view>
         </view>
 
-        <!-- 热门推荐-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{!isTest}}">
-            <!-- 上方标题部分 -->
-            <view class="xsth-title">
-            <view class="xsth-left" style="display: flex;">
-                <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
-            </view>
-            <view class="time-box" style="z-index: 2;flex-shrink: 0;"></view>
-
-            </view>
-            <!-- 商品部分 -->
-            <view class="xpth-product" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-            <!-- 左边的2个产品 -->
-            <view class="xpth-left" >
-                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[0]}}" style="background: none;">
-                    <image src="{{xpth.adv[0].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset;"/>
-                </view>
-                <view class="xpth-item"  bindtap="bannerClick" data-item="{{xpth.adv[1]}}"  style="background: none;">
-                    <image src="{{xpth.adv[1].head_img}}" mode="" style="width: 100%;border-radius: 0;object-fit: unset"/>
+        <!-- 公共服务 -->
+        <view class="sale-road-boxes" style="margin-top:0;">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
+            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
+            </navigator>
+        </view>
+        <view>
+            <!-- 元旦修改 ggfw为新增类名 -->
+            <view class="ggfw-list" style="width:100%;margin-top: 43rpx;">
+                <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
+                    <image src="{{imageSourceList.GGFW[2]}}"></image>
                 </view>
             </view>
-            <!-- 右边的banner -->
-            <view class="xpth-banner" style="background: none;" >
-                <view class="xpth-banner-swiper"  bindtap="bannerClick" data-item="{{xpth.adv[2]}}"  style="border-radius: 0">
-                    <image src="{{xpth.adv[2].head_img}}" style="border-radius: 0;object-fit: unset"></image>
-                </view>
+        </view>
+
+        <!-- 旅游助手 -->
+        <view class="sale-road-boxes" style="margin-top:0">
+            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
+            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
+        </view>
+        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
+            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
+            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
+            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
+            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
+            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
+            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
+            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
+        </view>
 
+        <!-- ai避高峰 -->
+        <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
+            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+                <image src="{{indexSeason.ai}}" mode=""/>
             </view>
-            <!-- <image bindtap="goBanner" class="xpth-banner" data-url="{{xpth.adv.tdata}}" src="{{xpth.adv.head_img}}" mode="aspectFill" /> -->
+            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+                <image src="{{indexSeason.avoid}}" mode=""/>
             </view>
-        </view>
+        </view> -->
 
 
         <!-- 数字文旅-->
@@ -307,63 +223,6 @@
             </view>
         </view>
 
-        <!-- 旅游助手 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
-            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
-            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
-            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
-            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
-        </view>
-
-        <!-- 公共服务 -->
-        <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
-            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
-            </navigator>
-            
-        </view>
-        <view style="overflow-x:auto">
-            <!-- 元旦修改 ggfw为新增类名 -->
-            <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
-                <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-                    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[0]}}" mode="widthFix"></image>
-                <view>高峰预警</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-                <image src="{{imageSourceList.GGFW[1]}}" mode="widthFix"></image>
-                <view>实时路况</view>
-                </view>
-                <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[2]}}" mode="widthFix"></image>
-                <view>行李直送</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="xlqc"
-                data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-                <image src="{{imageSourceList.GGFW[3]}}" mode="widthFix"></image>
-                <view>行李寄存</view>
-                </view>
-                <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-                    data-path="/pages/pbService/bike/index?type=1">
-                    <image src="{{imageSourceList.GGFW[4]}}" mode="widthFix"></image>
-                    <view>找厕所</view>
-                </view>
-            </view>
-        </view>
-
         <!-- 十全十美 -->
         <view class="sale-road-boxes">
             <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
@@ -447,56 +306,7 @@
         <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
     </view>
 
-    <view class="mask prizeMask" wx:if="{{videoPrize}}">
-    <view class="mask-bg"></view>
-    <view class="mask-content" style="width:100%;display:flex;flex-direction:column;background:none;border-radius:0;align-items:center">
-        <!-- 中奖的卡券 -->
-        <view style="position:relative" wx:if="{{prizeInfo && prizeInfo.type=='coupon'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 中奖的产品 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='product'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/congratulation.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">{{prizeInfo.prize_name}}</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <!-- <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <navigator url="/pages/user/videoCoupon/index">前往查看</navigator>
-        </view> -->
-        </view>
-        <!-- 未中奖 -->
-        <view style="position:relative" wx:elif="{{prizeInfo && prizeInfo.type=='none'}}">
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/bg1.png" mode="widthFix"></image>
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/sorrytext.png" mode="widthFix" class="prize-tip-text"></image>
-        <view class="prize-name">您与奖品擦肩而过期待下次参与</view>
-        <view class="prize-img">
-            <image src="{{prizeInfo.head_img}}" mode="aspectFill"></image>
-        </view>
-        <view class="btn-box">
-            <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/btnbg.png" mode="widthFix"></image>
-            <view bindtap="closePrice">我知道了</view>
-        </view>
-        </view>
-        <!-- 未抽奖状态 -->
-        <view style="position:relative" wx:else>
-        <image bindtap="choosePrize" style="display:block;width:533rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allbg.png" mode="widthFix"></image>
-        <view class="nomore-tip-btn" bindtap="noMoreTip"></view>
-        </view>
-        <image bindtap="closePrice" style="width:80rpx;margin-top:40rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/videoprize/allclose.png" mode="widthFix"></image>
-    </view>
-    </view>
+
     <!-- 广告弹窗 -->
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
@@ -528,15 +338,7 @@
         <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
     </view>
     </view>
-    <!-- <view class="topBox">
-        <view class="Qtop" :style="{height:height}">
-        <image style="width: 100%;height:{{height}}" src="{{startList.head_img}}" mode=""/>
-        </view>
-        <view class="jumpBox">
-        <view class="time">{{time}}s</view>
-        <view bind:tap="gotoIndex">跳过</view>
-        </view>
-    </view> -->
+
 </view>
 
 <view wx:else>
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 7b46194..78713d2 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -1,31 +1,22 @@
 /**index.wxss**/
 /* 元旦修改 */
 page {
-  /* background: #9DDCF5; */
   padding-bottom: 36.67rpx;
-  
-  /* background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
-  background-repeat: repeat-y;
-  background-size: 100% 100%; */
-  background: #F3FBFB;
 }
 .swiper,.swiper image {
-  width: 697rpx;
+  width: 100%;
   display: block;
-  height: 335rpx;
-  border-radius: 27rpx;
-}
-.swiper {
-  margin: 0 auto;
+  height: 600rpx;
 }
+
 .top-box {
   display: flex;
   padding: 10rpx 0;
   align-items: center;
-  margin: 0 30rpx;
   justify-content: flex-start;
-  position: relative;
-  z-index: 1;
+  position: absolute;
+  left: 30rpx;
+  z-index: 2;
 }
 .top-box image {
   flex-shrink: 0;
@@ -57,35 +48,35 @@ page {
   margin-right: 20rpx;
   /* color: #72674E; */
 }
-.top-box .weather-num,.top-box .weather {
-  flex-shrink: 0;
-  color: #333;
-  /* color: #72674E; */
+
+.banner-main{
+    position: absolute;
+    z-index: 3;
+    width: 100%;
+    left: 0;
+    bottom: 20rpx;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 30rpx;
+    box-sizing: border-box;
 }
-.top-box .weather-num {
-  font-size: 29rpx;
-  margin-bottom: 10rpx;
-  margin-left: 4rpx;
+.banner-main image{
+    width: 150rpx;
+    height: 100rpx;
 }
-.top-box .weather {
-  font-size: 19rpx;
-  margin-top: 20rpx;
-  margin-left: -4rpx;
-  margin-right: 30rpx;
+
+.main-content{
+    background: white;
+    margin-top: -10rpx;
+    border-radius: 20rpx;
+    position: relative;
+    z-index: 4;
 }
+
 .top-icons {
-  border-radius: 0 0 27rpx 27rpx;
-  width: 697rpx;
-  margin: 0 auto;
-  position: relative;
-  z-index: 0;
   display: flex;
-  padding: 34rpx 0;
-  padding-bottom: 29.33rpx;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  margin-top: -50rpx;
-  padding-top: 84rpx;
+  padding: 20rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -812,40 +803,8 @@ page {
   position: relative;
   flex-direction: column;
 }
-/* 元旦修改新增样式 */
-.time-box {
-  font-size: 27rpx;
-  font-family: DIN;
-  font-weight: 500;
-  /* color: #54504D; */
-  color: #000000;
-  display: flex;
-  align-items: center;
-  height: 37px;
-  margin-left: -50rpx;
-  z-index: 9;
-  flex-wrap: nowrap;
 
-  position: relative;
-  left: -150rpx;
-}
-/* 元旦修改新增样式 */
-.xsth-time {
-  /* width: 43rpx; */
-  height: 43rpx;
-  padding: 0 7rpx;
-  line-height: 43rpx;
-  border-radius: 13rpx;
-  font-size: 27rpx;
-  font-family: DIN;
-  font-weight: 500;
-  color: #D62828;
-  text-align: center;
-}
-.time-box text {
-  width: 18rpx;
-  text-align: center;
-}
+
 /* 元旦修改新增样式 */
 .xpth-left {
   width: 393rpx;
@@ -1030,19 +989,19 @@ page {
 }
 
 .ggfw-list {
-  justify-content: space-around !important;
-}
-.ggfw-list .pbservice-item{
-    margin-right: 0;
-    color: #111111;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
 }
-.ggfw {
-  width: auto;
+
+.ggfw-list .ggfw {
+  width: 30%;
+  height: 70rpx;
+  margin-bottom: 20rpx;
 }
 .ggfw image{
-  margin-bottom: 16.67rpx;
-  width: 93rpx !important;
-  height: 93rpx !important;
+  width: 100%;
+  height: 100%;
 }
 
 .six-box-new {
diff --git a/utils/https.js b/utils/https.js
index fd37f47..67031b4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -172,7 +172,7 @@ function user_post_new(url, data = {}, type) {
   return new Promise((resolved, rejected) => {
     // 判断是否登录
     // 没有登录就跳转到登录页面
-    if (!token || !userId) {
+    if (!token) {
       wx.hideLoading();
       // 去登陆
       console.log("去登陆去登陆去登陆去登陆去登陆去登陆去登陆")
@@ -330,10 +330,8 @@ const checkLogin = () => {
         appData = getApp()
     }
     console.log(appData,page)
-    if(appData.globalData.configJson.isTest) {
-        
-            return
-        
+    if(appData.globalData.configJson&&appData.globalData.configJson.isTest) {
+        return
     }
 
 

From a6282153cb10d7e91ecda2ed5219e1fab88d4f40 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 26 May 2025 17:08:17 +0800
Subject: [PATCH 322/471] =?UTF-8?q?=E6=88=B7=E5=A4=96=E6=B8=B8=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  17 +-
 app.json                                   |   2 +-
 app.wxss                                   |   2 +
 pages/index/index.wxml                     |   4 +-
 pages/user/order/movieOrderInfo/index.wxml |   2 +-
 subPackages/index/imgSource.js             | 108 +--
 subPackages/index/index.js                 | 961 ++++++++++-----------
 subPackages/index/index.wxml               | 651 +++++---------
 subPackages/index/index.wxss               | 338 ++------
 9 files changed, 754 insertions(+), 1331 deletions(-)

diff --git a/app.js b/app.js
index b5087a5..f827a54 100644
--- a/app.js
+++ b/app.js
@@ -39,17 +39,18 @@ App({
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
             data.isTest = data.isTest190? true : false;
+            data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
             // 获取ui配置文件 在首页调用
-            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
-                let obj = {}
-                res.data.content.forEach(item => {
-                obj[item.id] = item.image
-                });
-                this.globalData.configJson.indexSeason = obj 
-                this.globalData.loadIndexSeason = true
-            })
+            // commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+            //     let obj = {}
+            //     res.data.content.forEach(item => {
+            //     obj[item.id] = item.image
+            //     });
+            //     this.globalData.configJson.indexSeason = obj 
+            //     this.globalData.loadIndexSeason = true
+            // })
         })
         this.getShareCategoryId()
   },
diff --git a/app.json b/app.json
index 62d190a..5684680 100644
--- a/app.json
+++ b/app.json
@@ -252,7 +252,7 @@
     "selectedColor": "#D22A1C",
     "borderStyle": "white",
     "list": [
-      {
+      { 
         "pagePath": "pages/index/index",
         "iconPath": "/images/index.png",
         "selectedIconPath": "/images/aindex_seld.png",
diff --git a/app.wxss b/app.wxss
index d45f572..9467548 100644
--- a/app.wxss
+++ b/app.wxss
@@ -155,6 +155,8 @@ page{
 
 .no-scrollbar::-webkit-scrollbar{
     display: none;
+    width: 0;
+    height: 0;
 }
 
 .flex-1{
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f98c8e3..e77b178 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -31,7 +31,7 @@
     <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
   </view>
 </view>
-<view class="content" wx:if="{{!isTest}}">
+<view class="content" wx:if="{{false}}">
   <!-- 活动日历 -->
   <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
     <image lazy-load mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
@@ -123,7 +123,7 @@
             <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
-          <view bindtap="gotoUrl" data-url="https://test.m.cloud.sz-trip.com/movies" data-event="one_card" data-title="户外游"  class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
             <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 97deb1d..b2abe77 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -171,7 +171,7 @@
     <view class="iconfont icon-close" bindtap="showKeFu"></view>
     <view>如有问题</view>
     <view>请联系{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}客服</view>
-    <view style="font-size: 40rpx;color: #0B898E;padding: 41rpx 0;">{{orderDetail.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '4006979968'}}</view>
+    <view style="font-size: 40rpx;color: #0B898E;padding: 41rpx 0;">{{info.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '4006979968'}}</view>
     <view style="font-weight: 500;font-size: 26rpx;color: #000000;padding-bottom: 40rpx;">服务时间（9:00-21:00）</view>
   </view>
 </view>
\ No newline at end of file
diff --git a/subPackages/index/imgSource.js b/subPackages/index/imgSource.js
index 0d29963..871e3de 100644
--- a/subPackages/index/imgSource.js
+++ b/subPackages/index/imgSource.js
@@ -1,108 +1,4 @@
 const imageSource = {
-    // 活动日历、场馆预约等
-    mainFunImgs: [
-        "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/c69cdbafb16ed468fef68eb77865e6ff.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/05dd30d02e74178134242cc64aaa11ac.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/e93e655b524001d25d7d4fd848f5bb3b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
-
-        "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/e2cc47fa5a2d01d436dad0a85948f060.png",
-        "https://static.ticket.sz-trip.com/jundaosuzhou/images/spring2025/ssy.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/a094d635976194782fbdcf2bc596b082.png",
-        "https://static.ticket.sz-trip.com/uploads/20250314/5238f9ee4762266abf0c279501ea4028.png",
-    ],
-    // 数字文旅
-    SZWL: [
-        // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
-        // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
-        "https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/1994615fcbc125da641541ea1f04c364.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/f054ca452f27dac54723255ba6445790.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/590822c40c769cb4f673f460f1a37a0b.png",
-
-        "https://static.ticket.sz-trip.com/uploads/20250312/41c21568ed9c4b15084c9669ca99a6fd.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/1ee056f091a42e51ce8168767704708a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/b418843c04ddfa00be91fb793019cb99.png",
-        
-       
-        "https://static.ticket.sz-trip.com/uploads/20250312/0ad69db116004e735e1bd13cd54fd75c.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/f2400b009c8e92efcdd645080f14b28a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/bbda2dd4e332f457a6aa06a4a15b639b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/06b500881204a4a40c5bc8d126f38a58.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20250312/d188c19334c9170e5c963459b7187f20.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/a25506779b745291cb8d9051abce07c1.png",
-
-    ],
-    // 旅游助手
-    LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20250423/662eb322f8851e04df41fd836c6a88f3.png",
-        // "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png",
-    ],
-    // 公共服务
-    GGFW: [
-        "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/9799b276d76f884fd0130d7378c974fe.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/c40b456687490eafe5414addaaae0c2b.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/a95959dcba2f494b69980d16a895e9c8.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/e16b8e640169e99639cef6ff7897b6a7.png"
-    ],
-    
-    // 十全十美
-    SQSM: [
-        // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-        "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
-        "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
-
-        
-
-    ],
-
-    // 长三角文旅平台
-    CSJWLPT: [
-        {
-            "name":"玉见昆山",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/40319f04a78f25c2741e4ce11b375597.png",
-            "type":"mini",
-            "path":"",
-            "appid":"wx8888a3fd0862b4c8"
-        },
-        {
-            "name":"智游常熟",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250423/619870022ca676c31d2d6395f81dd3d7.png",
-            "type":"mini",
-            "path":"",
-            "appid":"wxdaf3d5edd07dc7af"
-        },
-        {
-            "name":"常享游",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/194a5636ecd849ce1f8b8f42c9d5b08b.png",
-            "type":"h5",
-            "url":"https://tour.wlczy.com/h5/"
-        },
-        {
-            "name":"畅游宿迁",
-            "icon":"https://static.ticket.sz-trip.com/uploads/20250312/ea3bd8e0418d4ff2c07498d2cbef49c1.png",
-            "type":"mini",
-            "path":"/pages/index/index",
-            "appid":"wxcb00a59c4fba136e"
-        },
-
-
-    ],
 
     // 导航标题侧边图片
     CBTP: [
@@ -116,8 +12,8 @@ const imageSource = {
     // 其他后台配置的图片，开发时使用
     testImgs: {
         indexSeason : {
-             // 头图
-             topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
+            // 头图
+            topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
             // ai伴你游
             ai: "https://static.ticket.sz-trip.com/uploads/20250314/3fb020cf3471d3731b4a7efae25e8e64.png",
             // ai避高峰
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 2265f05..77f7a85 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -10,37 +10,55 @@ import https from "../../utils/https.js"
 
 Page({
 	data: {
+		isTest: false,
+
+        startList: {head_img: ''}, // 启动页广告
+        fullAdvTimer: null,  // 全屏timer
+        showFullAdv: true, //全屏广告开关
+        opacity: 1, // 全屏广告透明度
+        time: 3, //全屏广告剩余时间
+        showTime: false, // 全屏广告时间展示
+        alertSwipeList: [], //弹窗广告
+		showAdv: false, //弹窗开关
+		isMuted: true,
+        videoPlay: false,
+
+        systemStyle: {
+			height: 0,
+			padHeight: 0,
+			right: 0,
+        },
+        lat: "",
+        lon: "",
+        
+		indexSeason: {},  // 后台UI配置项
         
         // bannerInterver: 5*1000,  // 动态更改banner时间
 		banner: [],
 		xiaobanner: [],
 		activeBannerIndex: 0,
         smBannerIndex: 0,
-		systemStyle: {
-			height: 0,
-			padHeight: 0,
-			right: 0,
-		},
+		
 		// banner上的金刚区
 		bannerDataList: [
 			{
 				title: "景点门票",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/5934b8b77b058ce1de5943adbaf51739.png",
 				path: "/pages/list/scene/index",
 			},
 			{
 				title: "活动日历",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/2453c4f3e932172905ed883190ef1356.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/d75d7a3924d832912a2633ee29b30b9b.png",
 				path: "/pages/list/activitynew/index",
 			},
 			{
-				title: "将意真品",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/8e675fc57ea4b9e45f2fa7736bc03e7d.png",
+				title: "匠意臻品",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/69722050b638954e0b755a4d6c771d48.png",
 				path: "/subPackages/techanNew/index",
 			},
 			{
 				title: "领券中心",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/4384a93f77d8faba5f504195c77e57c1.png",
 				path: "/pages/list/scene/index",
 			},
 		],
@@ -48,47 +66,48 @@ Page({
 		mainTypeList: [
 			{
 				title: "非遗专卖",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				path: "/subPackages/feiyiNew/index",
 			},
 			{
 				title: "场馆预约",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				path: "/pages/list/museum/index",
 			},
 			{
 				title: "一日游",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				weburl:"https://m.cloud.sz-trip.com/OneDayTravelNew",
 			},
 			{
 				title: "户外游",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				weburl:"https://m.cloud.sz-trip.com/LearningTravel",
 			},
 			{
 				title: "电影购票",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				weburl:"https://m.cloud.sz-trip.com/movies",
 			},
 			{
                 type: 'hotel', // 特殊标识方便查找 更新weburl
 				title: "酒店住宿",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				weburl: '',
 				path: '/pages/list/hotel/index'
 			},
 			{
 				title: "水上游",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				path: '/pages/list/night/index'
 			},
 			{
 				title: "剧场演出",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/db946eebb863adc0bb020338c9edc271.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
 				path: '/pages/list/theatre/index'
 			},
-		],
+        ],
+        mainTypeLeft: 0,
 
 		xpth: {}, // 新品特惠
 		XPathBannerIndex: 0,
@@ -96,101 +115,261 @@ Page({
 		publicSerivce: [
 			{
 				title: "高峰预警",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/c7e28d88bde040c386183d69ae9bb228.png",
 				weburl: "https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy",
 				eventName: "comfort_click",
 			},
 			{
 				title: "实时路况",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a678fdc2127648cd7881e36791b2062a.png",
 				weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/",
 				eventName: "sslk",
 			},
 			{
 				title: "行李直送",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/66c8614112630ed168a27150f15a3234.png",
 				appId: 'wx757dd1ee184e75e9',
           		pagePath: "pages/tabBar/index/index"
 			},
 			{
 				title: "行李寄存",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/3b9886609236df983e6512055662693c.png",
 				weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/",
 				eventName: "xljc",
 			},
 			{
 				title: "找厕所",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/e8e75d8cd8761d4de4336a35e29e5c6d.png",
 				path: "/pages/pbService/bike/index?type=1",
 			},
 			{
-				title: "找厕所",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/65f1dda9a4dc43d426544a0d14eb73de.png",
-				weburl: "",
+				title: "停车场",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/ef3d9cfb4817552288d666d8e5617707.png",
+				weburl: "https://m.cloud.sz-trip.com/ParkingArea",
 			},
 			
         ], 
         
-        fullAdvTimer: null,  // 全屏timer
+        // 旅游助手
+        travelData: [
+            {
+				title: "最美打卡点",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/800a30b94f77c1f7f1bc17f33c0daacd.png",
+				path: "/subPackageCheckPoint/pages/index/index",
+			},
+			{
+				title: "街巷美食",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a4918bd24ff162991ca8db28759ade51.png",
+				path: "/pages/list/food/index",
+			},
+			{
+				title: "语音导览",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/f72a9f174aa66e520cbfe7429dca6635.png",
+				appId: "wx74f380bc721a0379",
+				pagePath: "/pages/listen/listen?title=君到苏州"
+			},
+			{
+				title: "游记攻略",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/e1762ba22ba5d4cc5882de321bc10110.png",
+				path: "/pages/list/strategy/index",
+			},
+        ],
+
+		// 数字文旅
+		travelCulture: [
+			{
+				title: "数字非遗",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/bc747aa7767770dc26e663480ac9150d.png',
+				weburl: "https://m.cloud.sz-trip.com/IntangibleCultural2",
+			},
+			{
+				title: "数字博物馆",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/86c986c2991e968ee143cf5777bb9f08.png',
+				weburl: "https://m.cloud.sz-trip.com/BwsInfo",
+			},
+			{
+				title: "数字名人馆",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/d570a1bb6961b9ddf26b17cc64b733dd.png',
+				weburl: "https://www.szsmrg.com/home",
+			},
+			{
+				title: "云上观展",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/8f96c29f6199b811a757e4e5c5901daa.png',
+				weburl: "https://m.cloud.sz-trip.com/CloudPerform2022",
+			},
+			{
+				title: "云上文博会",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250312.png',
+				weburl: "https://m.cloud.sz-trip.com/CloudExpo",
+			},
+			{
+				title: "精彩回顾",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				path: "/pages/pbService/activity/index",
+			},
+			{
+				title: "文化场馆查询",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				weburl: "https://m.cloud.sz-trip.com/Museum",
+			},
+			{
+				title: "苏影通",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/e60996bf57f35f2dab63c81bc48b609a.png',
+				weburl: "https://m.cloud.sz-trip.com/movies",
+			},
+			{
+				title: "书仓",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/41d87b6d8d78ac497a6654ad293f9329.png',
+				appId: 'wx165d4f1727f6bdb0',
+				pagePath: 'pages/home/home'
+			},
+			{
+				title: "e读书",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/87e9c9e3453492fa1ee65b705565efbb.png',
+				appId: 'wx26e6f4c0baba005b',
+				pagePath: 'pages/index/index'
+			},
+			{
+				title: "数字公共文化",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/c60ed1f766645fa67a749dffa0d347a2.png',
+				weburl: "https://m.cloud.sz-trip.com/PublicCulture2022",
+			},
+			{
+				title: "云游苏州",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				weburl: 'https://speed.web.yunyouyizhan.com/downloadApp/index.html#/',
+			},
+			{
+				title: "美图鉴赏",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				path: "/pages/pbService/appreciate/index",
+				
+			},
+			
+        ],
+		scrollLeft: 0,
+
+        
+        // 十全十美
+        // area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+        SQSM: [
+            {
+                title: "常熟",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
+                appId: 'wx4df5fd9a6a5ea123',
+				pagePath: 'pages/index'
+            },
+            {
+                title: "太仓",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
+                appId: 'wx8853b0d93cbca75e',
+				pagePath: 'pages/home/home'
+            },
+            {
+                title: "昆山",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
+                appId: 'wx8888a3fd0862b4c8',
+				pagePath: 'pages/index/index'
+            },
+            {
+                title: "吴江",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
+                appId: 'wx8eadea4ee2d42d4b',
+				pagePath: 'pages/index/index'
+            },
+            {
+                title: "工业园区",
+				img: "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
+                appId: 'wxd323e63a10aa6865',
+				pagePath: 'pages/home/index'
+            },
+            {
+                title: "张家港",
+                img: "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
+                path: "/pages/list/six/index?area=zhangjiagang"
+            },
+            {
+                title: "吴中",
+                img: "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
+                path: "/pages/list/six/index?area=wuzhong"
+            },
+            {
+                title: "相城",
+                img: "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
+                path: "/pages/list/six/index?area=xiangcheng"
+            },
+            {
+                title: "姑苏",
+                img: "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
+                path: "/pages/list/six/index?area=gusu"
+            },
+            {
+                title: "高新",
+                img: "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
+                path: "/pages/list/six/index?area=gaoxin"
+            },
+
+
+        ],
+
+        // 长三角文旅平台
+        otherPlat: [
+            {
+                "name":"玉见昆山",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/c85dbe1b0f8f58014c05a30b3e6f86b5.png",
+                "type":"mini",
+                "path":"",
+                "appid":"wx8888a3fd0862b4c8"
+            },
+            {
+                "name":"智游常熟",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/98d57e31995b6dc3188f8717201640f1.png",
+                "type":"mini",
+                "path":"",
+                "appid":"wxdaf3d5edd07dc7af"
+            },
+            {
+                "name":"常享游",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/abfe0d4d2b02fcfd9bd791b9468bb4f4.png",
+                "type":"h5",
+                "url":"https://tour.wlczy.com/h5/"
+            },
+            {
+                "name":"畅游宿迁",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/bcfa9789f2d2d52d2da8f11b6a99b002.png",
+                "type":"mini",
+                "path":"/pages/index/index",
+                "appid":"wxcb00a59c4fba136e"
+            },
+    
+        ],
+
+
 
-		weather: null,
 		saleProduct: null,
 		roadProduct: null,
-		fourProduct: [],
-		hotIndex: 0,
-		indexHot: [],
 		
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
 		list: [],
 		listMore: true,
-		isTest: false,
-		lat: "",
-		lon: "",
-		urltopage: {},
-		scrollLeft: 0,
-		videoPrize: false,
-		prizeInfo: null,
-		otherPlat: null,
-		
-        
-		indexSeason: {},
-		// startList: [], // 启动页广告
-		startList: {
-			head_img: ''
-		}, // 启动页广告
-		alertSwipeList: [], //弹窗广告
-		showAdv: false, //弹窗开关
-		showFullAdv: true, //全屏广告开关
-		opacity: 1,
-		time: 3, //全屏广告剩余时间
-		showTime: false,
 		
+		urltopage: {},
 
-
-        area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-		sqjNew: [
-            'https://static.ticket.sz-trip.com/uploads/20241012/df831b80bc445aef8dc439ef8f9761a2.png',// 常熟
-			'https://static.ticket.sz-trip.com/uploads/20241012/9a5dc85879e87cc21f4d10286c84ac5f.png',// 太仓
-            'https://static.ticket.sz-trip.com/uploads/20241012/fceaa177de4ed13e7884ccfafb75c6ae.png',// 昆山
-            'https://static.ticket.sz-trip.com/uploads/20241012/c55a59f86b49af4ae15f1b1015887678.png',// 吴江
-            'https://static.ticket.sz-trip.com/uploads/20241012/a96c42d843dd1cc4a9ec30b189b35a6f.png',// 工业园区
-            'https://static.ticket.sz-trip.com/uploads/20241012/c1f61d9b2a13377c31561e6b50274c04.png',// 张家港
-            'https://static.ticket.sz-trip.com/uploads/20241012/b26ebd1a1ed1d5737cd22cc2da7e1b54.png',// 吴中
-            'https://static.ticket.sz-trip.com/uploads/20241012/eec299ac968f0344e124195155d88ed1.png',// 相城
-            'https://static.ticket.sz-trip.com/uploads/20241012/db5fcb0df2d8d326bd2b8d055b9284d2.png',// 姑苏
-			'https://static.ticket.sz-trip.com/uploads/20241012/279e21d3e876379140bf77d01410b07d.png',// 高新区
-		],
-
-		isMuted: true,
-        videoPlay: false,
-
+		// ---------------2025-5-26改版没用到的------------------
+		fourProduct: [],
+		hotIndex: 0,
+		indexHot: [],
+        weather: null,
+        
         // 页面图片
-        imageSourceList:imageSource,
+        // imageSourceList:imageSource,
+
 
 	},
 	onLoad: function(options) {
+		// 相城小程序跳转获取用户信息
         if(options && options.szxcCode) {
 			commonApi._post("uservice/user/loginByXC", {
 				code: options.szxcCode
@@ -204,41 +383,10 @@ Page({
 			app.globalData.from = options.from;
 		}
 		return
-
-        wx.getLocation({type: 'gcj02'})
-           
 		console.log('options',options)
-		// 相城小程序跳转获取用户信息
-		
-		
-		
-		
-		wx.getLocation({
-			type: 'gcj02',
-			success: (res) => {
-				this.setData({
-					lat: res.latitude,
-					lon: res.longitude
-				})
-				this.getList()
-			},
-			fail: (err) => {
-				this.getList()
-			}
-		})
-		
 
-		commonApi._post("pbservice/Other/getClientConfig", {
-			unique_key: "urltopage"
-		}).then(res => {
-			let data = JSON.parse(res.data)
-			this.setData({
-				urltopage: data
-			})
-		})
-		this.getTwoProduct()
 		
-		this.getWeather()
+		
 		// 获取今天的日期
 		let today = new Date();
 		this.setData({
@@ -249,12 +397,32 @@ Page({
     },
 
 	onReady: function() {
-		this.getHeight()
+        this.getHeight()
+        this.getIndexSeason()
 		this.getBanner()
-        // 活动日历
-        // this.getFourProduct()
+       
+        this.getXpthList() // 限时特惠
+		this.getTwoProduct()
 
-		this.getXpthList() // 限时特惠
+        this.getList()  // 回购榜
+        // this.getWeather()  // 2025-5-26首页改版不需要天气了
+        // this.getFourProduct() // 活动日历
+
+        wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+				// this.getList()  // 2025不需要经纬度了
+			},
+			fail: (err) => {
+				// this.getList()
+			}
+        })
+        
+        this.getUrlToPage()
 
 
 	},
@@ -275,14 +443,15 @@ Page({
     //获取季节配置
 	getIndexSeason() {
         let mainTypeList = this.data.mainTypeList
-        let hotelData = mainTypeList.find(v=>v.type == hotel)
+        let hotelData = mainTypeList.find(v=>v.type == "hotel")
 
-        if (app.globalData.configJson.indexSeason) {
+        if (app.globalData.configJson&&app.globalData.configJson.indexSeason) {
+            console.log('app', app.globalData.configJson)
             hotelData.weburl = app.globalData.configJson.hotelUrl
             this.setData({
                 indexHot: app.globalData.configJson.indexHot,
                 isTest: app.globalData.configJson.isTest,
-                otherPlat: app.globalData.configJson.otherPlats,
+                // otherPlat: app.globalData.configJson.otherPlats,
                 // 正式数据
                 indexSeason: app.globalData.configJson.indexSeason,
                 // 开发数据
@@ -298,19 +467,32 @@ Page({
                 app.globalData.configJson.indexSeason = obj 
                 app.globalData.loadIndexSeason = true
                 hotelData.weburl = app.globalData.configJson.hotelUrl
+                console.log('webData', app.globalData.configJson)
                 this.setData({
                     indexHot: app.globalData.configJson.indexHot,
                     isTest: app.globalData.configJson.isTest,
-                    otherPlat: app.globalData.configJson.otherPlats,
+                    // otherPlat: app.globalData.configJson.otherPlats,
                     indexSeason: app.globalData.configJson.indexSeason,
                     mainTypeList: mainTypeList
                 })
             })
         }
         console.log(this.data)
-	},
+    },
+    // url跳转（不知道什么东西）
+    getUrlToPage () {
+        commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
+			this.setData({
+				urltopage: data
+			})
+		})
+    },
+
     // --------------------banner 相关---------------------------
-    // 获取banner
+    // 获取banner 和开屏广告
     getBanner: function() {
         let _this = this
         //全屏广告
@@ -362,7 +544,6 @@ Page({
 			}
 		})
 	},
-
     // 统一的banner change 需要时可以放开
 	changeBannerIndex: function(e) {
         return
@@ -371,7 +552,6 @@ Page({
             [keyname]: e.detail.current,
 		})
     },
-
 	// 轮播图点击
 	bannerClick: function(e) {
 		if (this.data.isTest) return;
@@ -463,6 +643,7 @@ Page({
 	},
     
     //------------------------金刚区点击-------------------------------------
+    // 自定义数据的跳转
 	mainIconClick: function(e) {
 		let item = e.currentTarget.dataset.item
 		// 埋点
@@ -497,12 +678,31 @@ Page({
 		}
 		
     },
+    // 后台配置数据的跳转
+    gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
+	},
 
 	// 滚动监听
 	listenScroll(e) {
-		console.log(e.detail.scrollLeft)
+        let keyname = e.currentTarget.dataset.keyname
 		this.setData({
-			scrollLeft: e.detail.scrollLeft
+            [keyname]: e.detail.scrollLeft,
 		})
 	},
     
@@ -519,84 +719,8 @@ Page({
 		})
 	},
 
-	goFeiyi: function() {
-		app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-		wx.navigateTo({
-			url: "/pages/pbService/web/index"
-		})
-	},
     
- 
-	// 一城百馆
-	city: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx114d514f39cb1fed',
-			path: "pages/entry/index"
-		})
-		commonApi._post("browse/burying_point", {
-			drive: "mini",
-			title: "一城百馆",
-			uuid: app.globalData.uuid
-		}).then(res => {
-
-		})
-	},
-	changeHotIndex: function(e) {
-		this.setData({
-			hotIndex: e.currentTarget.dataset.index,
-			fourProduct: []
-		})
-		this.getFourProduct()
-	},
 	
-
-	//关闭弹窗广告
-	closeAdv: function() {
-		this.setData({
-			showAdv: false
-		})
-		wx.showTabBar({
-			animation: true,
-		})
-	},
-	//关闭全屏广告
-	closeFullAdv: function() {
-        this.setData({showFullAdv: false})
-        clearInterval(this.data.fullAdvTimer)
-		if (!this.data.alertSwipeList.length > 0) {
-			wx.showTabBar({animation: true})
-		}
-	},
-	// 是否静音
-	closeMuted: function() {
-		this.setData({
-			isMuted: this.data.isMuted = !this.data.isMuted
-		})
-	},
-	// 播放视频
-	videoPlay: function() {
-		let videoplay = wx.createVideoContext('myVideo', this)
-		videoplay.play();
-		this.setData({
-			videoPlay: false
-		})
-	},
-	// 暂停视频
-	videoPause: function() {
-		let videoplay = wx.createVideoContext('myVideo', this)
-		videoplay.pause();
-		this.setData({
-			videoPlay: true
-		})
-	},
-	getWeather: function() {
-		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-			this.setData({
-				weather: res.data
-			})
-		})
-	},
-	saleDetail: function() {},
 	getTwoProduct: function() {
 		// 获取首页限时特惠
 		commonApi._post('act/fast_sale_now', {
@@ -646,194 +770,14 @@ Page({
 				})
 			}
 		})
-	},
-	getFourProduct: function() {
-		let item = this.data.indexHot[this.data.hotIndex],
-			service = "product/get_product_by_tag",
-			data = {
-				tag_id: item.id,
-				offset: 0,
-				limit: 4,
-				sort: 'weight',
-				order: 'desc'
-			};
-		if (item.type == 'scene') {
-			service = "scene/get_scene_by_tag";
-		} else if (item.type == 'movie') {
-			service = "Cinema/getHotMovieList";
-			data = {
-				page: 1,
-				pageSize: 4
-			};
-		}
-		commonApi._post(service, data).then(res => {
-			this.setData({
-				fourProduct: res.data.list || res.data
-			})
-		})
-	},
-	tagGotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			// wx.navigateTo({
-			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-			// 		item.title,
-            // })
-            util.goMovieDetail(item.third_id, item.title)
-		} else {
-			util.gotoDetail(item)
-		}
-	},
+    },
+    
+
 	productGotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
 		util.gotoDetail(item)
 	},
-	gotoPath: function(e) {
 
-		if (e.currentTarget.dataset.title == '书香借阅') {
-			wx.navigateToMiniProgram({
-				appId: 'wx165d4f1727f6bdb0',
-				path: 'pages/home/home'
-			})
-			return;
-		} else if (e.currentTarget.dataset.title == '12348') {
-			wx.navigateToMiniProgram({
-				appId: 'wxcdfd45c001466ba3',
-				path: 'pages/index/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.title == 'e读书') {
-			wx.navigateToMiniProgram({
-				appId: 'wx26e6f4c0baba005b',
-				path: 'pages/index/index'
-			})
-			return;
-		}else if (e.currentTarget.dataset.event == 'kunshan_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx8888a3fd0862b4c8',
-				path: 'pages/index/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'taicang_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx8853b0d93cbca75e',
-				path: 'pages/home/home'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'changshu_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx4df5fd9a6a5ea123',
-				path: 'pages/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wxd323e63a10aa6865',
-				path: 'pages/home/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'wujiang_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx8eadea4ee2d42d4b',
-				path: 'pages/index/index'
-			})
-			return;
-		}
-		wx.navigateTo({
-			url: e.currentTarget.dataset.path,
-		})
-		if (e.currentTarget.dataset.title) {
-			commonApi._post("browse/burying_point", {
-				uuid: app.globalData.uuid,
-				drive: "mini",
-				title: e.currentTarget.dataset.title
-			}).then(res => {
-
-			})
-		}
-	},
-	// 元旦  新品特惠部分
-	goBanner: function(e) {
-		let url = e.currentTarget.dataset.url;
-        app.globalData.weburl = url;
-        console.log(url)
-		wx.navigateTo({
-			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
-		})
-	},
-	gotoUrl: function(e) {
-		if (e.currentTarget.dataset.event) {
-			this.pagePoint({
-				event: e.currentTarget.dataset.event
-			}, 1)
-		}
-		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
-		wx.navigateTo({
-			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
-			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-		})
-	},
-	// 实时路况跳转外链
-	gotoUrls() {
-		// 判断是否登录
-		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
-		if(!token || !userId) {
-			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
-			
-			app.globalData.weburl = url;
-			wx.navigateTo({
-				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-			})
-		}else {
-			commonApi.user_post("uservice/user/userEncry").then(res => {
-				if(res.code == 1) {
-					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
-					
-					app.globalData.weburl = url;
-					wx.navigateTo({
-						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-					})
-				}
-			})
-		}
-	},
-	gotoMini: function(e) {
-		let appid = e.currentTarget.dataset.appid,
-			path = e.currentTarget.dataset.path
-		wx.navigateToMiniProgram({
-			appId: appid,
-			path: path
-		})
-	},
-	garbage: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx13be821f3b1afed3',
-			path: 'pages/home/home'
-		})
-	},
-	gotoSku: function() {
-		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			app.globalData.weburl = res.data.url;
-			wx.navigateTo({
-				url: '/pages/pbService/web/index'
-			})
-			return;
-		})
-	},
-	audioGuide: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx74f380bc721a0379',
-			path: '/pages/listen/listen?title=君到苏州'
-		})
-		commonApi._post("browse/burying_point", {
-			drive: "mini",
-			title: "语音导览",
-			uuid: app.globalData.uuid
-		}).then(res => {
-
-		})
-	},
 	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
 	getList: function() {
 		if (!this.data.listMore) return;
@@ -881,146 +825,57 @@ Page({
 			util.gotoDetail(item.ext);
 		}
 	},
-	meituan: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wxde8ac0a21135c07d',
-			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
-		})
-	},
+	
 
-	//博物馆跳转  直接跳君到苏州H5
-	goH5: function(e) {
-		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
-		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
-		wx.navigateTo({
-			// url: "/pages/pbService/web/index"
-			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
-		})
-	},
 
+	
 
+	pagePoint: function(e, type) {
+		util.pagePoint(e, type)
+    },
 
-	bannerJumpNew(item) {
-		let that = this
-		item = item.currentTarget.dataset.item
-		if (item.tdata == '') return
-		that.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
-		switch (item.jump_type) {
-			case 0:
-				break;
-			case 1:
-				util.gotoDetail(item.product_model)
-				break;
-			case 2:
-				if (item.front_model && item.front_model.mini) {
-					wx.navigateTo({
-						url: "/" + item.front_model.mini
-					})
-				}
-				break;
-			case 3:
-				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-					// 外部h5
-					app.globalData.weburl = item.tdata.url;
-					wx.navigateTo({
-						url: "/pages/pbService/web/index"
-					})
-				} else {
-					let page = item.tdata.url.split("/");
-					page = page[page.length - 1].split("?")
-					let url = this.data.urltopage[page[0]];
-					if (url && url.indexOf('map') != -1) {
-						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-								'cinema', 'academes'
-							],
-							type = page[1] ? page[1].split("=") : [];
-						wx.reLaunch({
-							url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-						})
-					} else if (url) {
-						wx.navigateTo({
-							url: url,
-						})
-					} else {
-						app.globalData.weburl = item.tdata.url;
-						wx.navigateTo({
-							url: "/pages/pbService/web/index"
-						})
-					}
-				}
-				break;
-			case 4:
-				if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-					// 如果是苏心游的小程序 直接把authCode带过去
-					userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-						let weburl = item.tdata.page
-						if (weburl.indexOf('?') != -1) {
-							weburl += '&authCode=' + res.data;
-						} else {
-							weburl += '?authCode=' + res.data
-						}
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: weburl
-						})
-					}).catch(err => {
-						wx.navigateToMiniProgram({
-							appId: item.tdata.appid,
-							path: item.tdata.page
-						})
-					})
-				} else {
-					wx.navigateToMiniProgram({
-						appId: item.tdata.appid,
-						path: item.tdata.page
-					})
-				}
-				break;
-			default:
-				break;
-		}
-		return
+    // --------------------------广告----------------------------
+	//关闭弹窗广告
+	closeAdv: function() {
+		this.setData({
+			showAdv: false
+		})
+		wx.showTabBar({
+			animation: true,
+		})
 	},
-	
-	gotoOther: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (item.type == 'h5') {
-			app.globalData.weburl = item.url
-			wx.navigateTo({
-				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-			})
-		} else if (item.type == 'mini') {
-			wx.navigateToMiniProgram({
-				appId: item.appid,
-				path: item.path
-			})
-		} else if (item.type == 'page') {
-			wx.navigateTo({
-				url: item.page,
-			})
+	//关闭全屏广告
+	closeFullAdv: function() {
+        this.setData({showFullAdv: false})
+        clearInterval(this.data.fullAdvTimer)
+		if (!this.data.alertSwipeList.length > 0) {
+			wx.showTabBar({animation: true})
 		}
 	},
-	pagePoint: function(e, type) {
-		util.pagePoint(e, type)
+	// 是否静音
+	closeMuted: function() {
+		this.setData({
+			isMuted: this.data.isMuted = !this.data.isMuted
+		})
+	},
+	// 播放视频
+	videoPlay: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.play();
+		this.setData({
+			videoPlay: false
+		})
+	},
+	// 暂停视频
+	videoPause: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.pause();
+		this.setData({
+			videoPlay: true
+		})
 	},
-	onShow: function() {
-		// console.log(app.globalData)
-		// if (app.globalData.loadIndexSeason) {
-		// 	this.getIndexSeason()
-		// } else {
-		// 	let t = setInterval(() => {
-		// 		if (app.globalData.loadIndexSeason) {
-		// 			this.getIndexSeason()
-		// 			clearInterval(t)
-		// 			t = null
-		// 		}
-		// 	}, 500)
-		// }
 
+	onShow: function() {
 		this.pagePoint({event: 'home_view'}, 1)
 	},
 
@@ -1036,5 +891,93 @@ Page({
 			query: '',
 			imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
 		}
-	}
+    },
+    
+
+
+    // --------------------以前的东西 暂时用不到仅做保留------------------------
+    // 一城百馆 以前的活动
+	city: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx114d514f39cb1fed',
+			path: "pages/entry/index"
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "一城百馆",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+    },
+    meituan: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wxde8ac0a21135c07d',
+			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
+		})
+    },
+    // 活动日历
+	getFourProduct: function() {
+		let item = this.data.indexHot[this.data.hotIndex],
+			service = "product/get_product_by_tag",
+			data = {
+				tag_id: item.id,
+				offset: 0,
+				limit: 4,
+				sort: 'weight',
+				order: 'desc'
+			};
+		if (item.type == 'scene') {
+			service = "scene/get_scene_by_tag";
+		} else if (item.type == 'movie') {
+			service = "Cinema/getHotMovieList";
+			data = {
+				page: 1,
+				pageSize: 4
+			};
+		}
+		commonApi._post(service, data).then(res => {
+			this.setData({
+				fourProduct: res.data.list || res.data
+			})
+		})
+    },
+    changeHotIndex: function(e) {
+		this.setData({
+			hotIndex: e.currentTarget.dataset.index,
+			fourProduct: []
+		})
+		this.getFourProduct()
+    },
+    getWeather: function() {
+		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			this.setData({
+				weather: res.data
+			})
+		})
+    },
+    	// Ai避高峰
+	gotoUrls() {
+		// 判断是否登录
+		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+		if(!token || !userId) {
+			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+			
+			app.globalData.weburl = url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+			})
+		}else {
+			commonApi.user_post("uservice/user/userEncry").then(res => {
+				if(res.code == 1) {
+					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+					
+					app.globalData.weburl = url;
+					wx.navigateTo({
+						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+					})
+				}
+			})
+		}
+	},
 })
\ No newline at end of file
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index bc09170..67c8287 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -2,6 +2,7 @@
 
 
 <view wx:if="{{!isTest}}">
+    <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
         <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
@@ -17,8 +18,8 @@
 
         <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+20}}px">
             <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-                <image src="https://static.ticket.sz-trip.com/uploads/20250312/656b4dde65f4237b2d7fe0ef65baa850.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-                <view class="textOver" >搜索想要的旅游产品或服务</view>
+                <image src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <view class="textOver" >搜一搜您想要的</view>
             </navigator>
         </view>
 
@@ -29,499 +30,273 @@
         </view>
     </view>
 
-   
-   
     <view class="main-content">
          <!-- 金刚区 -->
-        <view>
-            <scroll-view scroll-x style="height:200rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft">
+        <view class="no-scrollbar">
+            <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
                 <view  class="top-icons no-scrollbar">
                     <view bindtap="mainIconClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
-                        <image src="{{imageSourceList.mainFunImgs[3]}}" mode="widthFix"></image>
+                        <image src="{{item.img}}" mode="aspectFill"></image>
                         <view class="top-icon-text">{{item.title}}</view>
                     </view>
                 </view>
             </scroll-view>
             <view class="scroll-line">
-                <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
-                <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+                <view class="scroll-line-bg" wx:if="{{mainTypeLeft <= 50}}" style="width:17rpx;"></view>
+                <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
             </view>
         </view>
         
-    </view>
-    
-    <view class="content">
 
-        <view class="small-swiper-box" >
-            <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
-            bindchange="changeBannerIndex" data-keyname="smBannerIndex">
-            <block wx:for="{{xiaobanner}}" wx:key="index">
-                <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <!-- 原 圆角77rpx，现改为13rpx -->
-                <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-                </swiper-item>
-            </block>
-            </swiper>
-            <!-- <view class="dot-list com-flex sm-dot-list">
-                <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-            </view> -->
-        </view>
+        <view class="content">
+            <!-- 苏城环游记 todo-->
+            <view class="small-swiper-box" >
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
+                <block wx:for="{{xiaobanner}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <!-- 原 圆角77rpx，现改为13rpx -->
+                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <!-- <view class="dot-list com-flex sm-dot-list">
+                    <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+                </view> -->
+            </view>
 
-        <!-- 限时特惠--新版-->
-        <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" >
-            <!-- 上方标题部分 -->
-            <view class="xsth-title">
-                <view class="xsth-left" style="display: flex;">
-                    <image mode="heightFix" style="height:100rpx" src="{{indexSeason.xpth}}"></image>
+            <!-- 限时特惠--新版-->
+            <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" >
+                <!-- 上方标题部分 -->
+                <view class="xsth-title">
+                    <view class="xsth-left" style="display: flex;">
+                        <image mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
+                        <image mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
+                    </view>
                 </view>
-            </view>
-            <!-- 商品部分 -->
-            <view class="xpth-product">
-                <!-- 左边的2个产品 -->
-                <view class="xpth-left">
-                    <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                    <image src="{{item.headimg}}" mode="" />
-                    <view class="xpth-item-content">
-                        <view class="xpth-item-title textOver2">{{item.title}}</view>
-                        <view class="xpth-item-bottom">
-                        <view class="xpth-item-price">{{item.price/100}}</view>
+                <!-- 商品部分 -->
+                <view class="xpth-product">
+                    <!-- 左边的2个产品 -->
+                    <view class="xpth-left">
+                        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                        <image src="{{item.headimg}}" mode="" />
+                        <view class="xpth-item-content">
+                            <view class="xpth-item-title textOver2">{{item.title}}</view>
+                            <view class="xpth-item-bottom">
+                            <view class="xpth-item-price">{{item.price/100}}</view>
+                            </view>
+                        </view>
                         </view>
                     </view>
-                    </view>
-                </view>
-                <!-- 右边的banner -->
-                <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                    <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
-                    bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
-                    <block wx:for="{{xpth.adv}}" wx:key="index">
-                        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                        <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
-                        </swiper-item>
-                    </block>
-                    </swiper>
-                    <view class="xpth-banner-dot-list">
-                        <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                    <!-- 右边的banner -->
+                    <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                        bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
+                        <block wx:for="{{xpth.adv}}" wx:key="index">
+                            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                            <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                            </swiper-item>
+                        </block>
+                        </swiper>
+                        <view class="xpth-banner-dot-list">
+                            <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                        </view>
                     </view>
                 </view>
             </view>
-        </view>
 
-        <!-- 公共服务 -->
-        <view class="sale-road-boxes" style="margin-top:0;">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.ggfw}}"></image>
-            <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                <image style="width: 20rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20241225/a59cd4103d0ba9a9de7498304bf24544.png" mode="" />
-            </navigator>
-        </view>
-        <view>
-            <!-- 元旦修改 ggfw为新增类名 -->
-            <view class="ggfw-list" style="width:100%;margin-top: 43rpx;">
-                <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
-                    <image src="{{imageSourceList.GGFW[2]}}"></image>
-                </view>
+            <view class="small-swiper-box" >
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
+                <block wx:for="{{xiaobanner}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <!-- 原 圆角77rpx，现改为13rpx -->
+                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <!-- <view class="dot-list com-flex sm-dot-list">
+                    <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+                </view> -->
             </view>
-        </view>
-
-        <!-- 旅游助手 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.lyzs}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-            <!-- <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州" data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1" 
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image> -->
-            <image class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
-            src="{{imageSourceList.LVZS[0]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index" 
-            src="{{imageSourceList.LVZS[1]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="audioGuide" data-event="voice_click" 
-            src="{{imageSourceList.LVZS[2]}}" mode="aspectFill"></image>
-            <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index" 
-            src="{{imageSourceList.LVZS[3]}}" mode="aspectFill"></image>
-        </view>
 
-        <!-- ai避高峰 -->
-        <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
-            <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-                <image src="{{indexSeason.ai}}" mode=""/>
+            <!-- 公共服务 -->
+            <view class="sale-road-boxes" style="margin-top:0;">
+                <image class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
+                <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                    <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                    <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" />
+                </navigator>
             </view>
-            <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-                <image src="{{indexSeason.avoid}}" mode=""/>
+            <view>
+                <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
+                    <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
+                        <image src="{{item.img}}"></image>
+                    </view>
+                </view>
             </view>
-        </view> -->
 
+            <!-- 旅游助手 -->
+            <view class="sale-road-boxes" style="margin-top:36rpx">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="pic-list" style="margin-top:30rpx">
+                <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick"
+                src="{{item.img}}" mode="aspectFill"></image>
+            </view>
 
-        <!-- 数字文旅-->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.wlcx}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="slide-out-box">
-            <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-            <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-            <view class="pbservice" style="margin-bottom:30rpx">
-                <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[0]}}" mode="widthFix"></image>
-                <view class="text">数字非遗</view>
-                </view>
-                <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[1]}}" mode="widthFix"></image>
-                <view class="text">数字博物馆</view>
-                </view>
-                <view bindtap="gotoUrl" data-title="数字名人馆" data-url="https://www.szsmrg.com/home" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[2]}}" mode="widthFix"></image>
-                <view class="text">数字名人馆</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[3]}}" mode="widthFix"></image>
-                <view>云上观展</view>
-                </view>
-                <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[4]}}" mode="widthFix"></image>
-                <view class="text">云上文博会</view>
-                </view>
-                <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[5]}}" mode="widthFix"></image>
-                <view class="text">精彩回顾</view>
-                </view>
-                <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[6]}}" mode="widthFix"></image>
-                <view class="text">文化场馆查询</view>
+            <!-- ai避高峰 -->
+            <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
+                <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+                    <image src="{{indexSeason.ai}}" mode=""/>
                 </view>
-                <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[7]}}" mode="widthFix"></image>
-                <view class="text">苏影通</view>
+                <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+                    <image src="{{indexSeason.avoid}}" mode=""/>
                 </view>
-                <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[8]}}" mode="widthFix"></image>
-                <view class="text">书仓</view>
-                </view>
-                <view bindtap="gotoPath" data-event="e_book" data-title="e读书" data-path="/pages/pbService/library/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[9]}}" mode="widthFix"></image>
-                <view class="text">e读书</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[10]}}" mode="widthFix"></image>
-                <view class="text">数字公共文化</view>
-                </view>
-                <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[11]}}" mode="widthFix"></image>
-                <view class="text">云游苏州</view>
+            </view> -->
+
+
+            <!-- 数字文旅-->
+            <view class="sale-road-boxes" style="margin-top:30rpx">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="slide-out-box">
+                <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+                <scroll-view scroll-x style="height:400rpx" bindscroll="listenScroll" data-keyname="scrollLeft" class="slide-box">
+                <view class="pbservice">
+                    <view class="pbservice-item" wx:for="{{travelCulture}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
+                        <image src="{{item.img}}" mode="widthFix"></image>
+                        <!-- <view class="text">{{item.title}}</view> -->
+                    </view>
+                    
                 </view>
-                <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-                <image src="{{imageSourceList.SZWL[12]}}" mode="widthFix"></image>
-                <view class="text">美图鉴赏</view>
+                </scroll-view>
+                <view class="scroll-line" style="margin: 0 auto;">
+                    <view class="scroll-line-bg" wx:if="{{scrollLeft <= 50}}" style="width:17rpx;"></view>
+                    <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
                 </view>
             </view>
-            </scroll-view>
-            <view class="scroll-line">
-            <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-            <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-            <view class="scroll-line-bg" wx:if="{{scrollLeft <= 5}}" style="width:37rpx;"></view>
-            <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
-            </view>
-        </view>
 
-        <!-- 十全十美 -->
-        <view class="sale-road-boxes">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.sqj}}"></image>
-            <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
-        </view>
-        <view class="six-box-new" wx:if="{{!isTest}}">
-            <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}" wx:for="{{imageSourceList.SQSM}}" src="{{item}}" mode="widthFix" wx:key="index">
-            </image>
-        </view>
-
-        <!-- 长三角文旅平台 -->
-        <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.csjwlpt}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="other-plats" wx:if="{{otherPlat&&!isTest}}">
-            <view class="other-plat" wx:for="{{imageSourceList.CSJWLPT}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-            <image src="{{item.icon}}" mode="heightFix"></image>
-            <view>{{item.name}}</view>
+            <!-- 十全十美 -->
+            <view class="sale-road-boxes">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
+            </view>
+            <view class="six-box-new">
+                <image wx:for="{{SQSM}}" src="{{item.img}}" data-item="{{item}}" bindtap="mainIconClick" mode="widthFix" wx:key="index"></image>
             </view>
-        </view>
 
-        <!-- 热门推荐 -->
-        <view class="sale-road-boxes" style="margin-top:0">
-            <image mode="heightFix" style="height:100rpx" src="{{indexSeason.rmtj}}"></image>
-            <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/>
-        </view>
-        <view class="hot-list" wx:if="{{isTest==false}}">
-            <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
-            <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-                <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-                <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-                <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-                <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-                <view class="today-date">{{date}} {{month}}</view>
-                <view class="today-hot-box">
-                    <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
-                    {{item.ext.display_tags[0]}}</view>
-                    <view class="today-hot-title">{{item.title}}</view>
-                </view>
-                </view>
-                <view class="hot-item" wx:elif="{{item.type=='travels'}}">
-                <view style="position:relative">
-                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                    <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+            <!-- 长三角文旅平台 -->
+            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="other-plats" wx:if="{{otherPlat}}">
+                <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+                <image src="{{item.icon}}" mode="heightFix"></image>
+                <!-- <view>{{item.name}}</view> -->
                 </view>
-                <view class="hot-info">
-                    <view class="hot-title">{{item.title}}</view>
-                    <view class="tags textOver" style="margin-bottom:0">
-                    <view class="icon-box">
-                        <text class="iconfont icon-xin"></text>
-                        <text>{{item.ext.like_number}}</text>
+            </view>
+
+            <!-- 热门推荐 -->
+            <view class="sale-road-boxes" style="margin-top:0">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="hot-list">
+                <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
+                <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                    <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
+                    <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
+                    <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
+                    <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
+                    <view class="today-date">{{date}} {{month}}</view>
+                    <view class="today-hot-box">
+                        <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
+                        {{item.ext.display_tags[0]}}</view>
+                        <view class="today-hot-title">{{item.title}}</view>
                     </view>
-                    <view class="icon-box">
-                        <text class="iconfont icon-eye"></text>
-                        <text>{{item.ext.view_number}}</text>
                     </view>
+                    <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+                    <view style="position:relative">
+                        <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                        <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+                    </view>
+                    <view class="hot-info">
+                        <view class="hot-title">{{item.title}}</view>
+                        <view class="tags textOver" style="margin-bottom:0">
+                        <view class="icon-box">
+                            <text class="iconfont icon-xin"></text>
+                            <text>{{item.ext.like_number}}</text>
+                        </view>
+                        <view class="icon-box">
+                            <text class="iconfont icon-eye"></text>
+                            <text>{{item.ext.view_number}}</text>
+                        </view>
+                        </view>
+                    </view>
+                    </view>
+                    <view wx:else class="hot-item">
+                    <view style="position:relative">
+                        <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
+                        <!-- <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' && item.ext.price}}" class="hot-price">
+                        <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                        </view>
                     </view>
-                </view>
-                </view>
-                <view wx:else class="hot-item">
-                <view style="position:relative">
-                    <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                    <!-- <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' && item.ext.price}}" class="hot-price">
-                    <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
                     </view>
                 </view>
                 </view>
             </view>
-            </view>
+            <view wx:if="{{listMore}}" class="more-btn-text" bindtap="getList">查看更多</view>
+            <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
         </view>
-        <view wx:if="{{listMore && isTest==false}}" class="more-btn-text" bindtap="getList">查看更多</view>
-        <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+
     </view>
+    
+    
+
 
 
     <!-- 广告弹窗 -->
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
-    <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
-        <block wx:for="{{alertSwipeList}}" wx:key="index">
-        <swiper-item data-item="{{item}}" bindtap="bannerJumpNew">
-            <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+            <block wx:for="{{alertSwipeList}}" wx:key="index">
+            <swiper-item data-item="{{item}}" bindtap="bannerClick">
+                <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
     </view>
     <!-- 广告弹窗结束 -->
     <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
-    <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-        <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
-    </view>
-
-    <!-- 视频 -->
-    <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-        <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
-
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-        <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-        <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-    </view>
-    </view>
-
-</view>
-
-<view wx:else>
-    <image class="top-bg-img" src="{{indexSeason.topBac}}" mode="widthFix"></image>
-    <view style="position:relative;z-index: 1;">
-    <swiper class="swiper" autoplay="{{true}}" interval="{{bannerInterver}}" duration="{{300}}" bindchange="changeBannerIndex" circular>
-        <block wx:for="{{banner}}" wx:key="*this">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <image src="{{item.head_img}}" mode="scaleToFill"></image>
-        </swiper-item>
-        </block>
-    </swiper>
-    <view class="com-flex dot-list">
-        <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="this"></view>
-    </view>
-    </view>
-    <view class="top-icons">
-    <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/ebe723260a0d46550c77307472180586.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">活动日历</view>
-    </view>
-    <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/106ed983a3641f27a13c41cc2b977af2.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">场馆预约</view>
-    </view>
-
-  
-    <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="top-icon-item">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/3db989129660f5de29b0f617375f0672.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">剧场演出</view>
-    </view>
-  
-   
-    <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item" wx:if="{{false}}">
-        <!-- 夏季修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240606/1d8d45eab5735103ed2d1342f84b615a.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8New.png" mode="widthFix"></image> -->
-        <view class="top-icon-text">夜游苏州</view>
-    </view>
-    </view>
-    <view class="content">
- 
-    <!-- 五一修改 一张banner不滚动 -->
-    <view class="small-swiper-box" wx:if="{{xiaobanner.length === 1}}">
-        <image bindtap="bannerClick" data-item="{{xiaobanner[0]}}" style="border-radius:13rpx;width: 100%" src="{{xiaobanner[0].head_img}}" mode="widthFix"></image>
-    </view>
-    <view class="small-swiper-box" wx:else>
-        <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeSmBannerIndex">
-        <block wx:for="{{xiaobanner}}" wx:key="*this">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-            <!-- 原 圆角77rpx，现改为13rpx -->
-            <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-            </swiper-item>
-        </block>
-        </swiper>
-        <view class="dot-list com-flex sm-dot-list">
-        <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
+        <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+        <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+            <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
         </view>
-    </view>
-
 
-    <view class="sale-road-boxes" style="margin-top:0">
-        <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
-        <image class="rmtj-right" src="https://static.ticket.sz-trip.com/uploads/20240606/479dad06e6cf67bc45f7cf605d982184.png" mode="" />
-    </view>
-    <!-- 五一修改 .slide-out-box 增加背景色-->
-    <view class="slide-out-box">
-        <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
-        <scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
-        <view class="pbservice" style="margin-bottom:30rpx">
-            <view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/97844beceebd503256bebae5afd6820b.png" mode="widthFix"></image>
-            <view class="text">数字非遗</view>
-            </view>
-            <view bindtap="goH5" data-title="数字博物馆" data-path="BwsInfo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/27acb48002369a8203762acc783c7492.png" mode="widthFix"></image>
-            <view class="text">数字博物馆</view>
-            </view>
-            
-            <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5711260f02772eebaba9dba9dfda2b4f.png" mode="widthFix"></image>
-            <view>云上观展</view>
-            </view>
-            <view bindtap="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/4a3804f24e034e15f19c27a85d0a8ac4.png" mode="widthFix"></image>
-            <view class="text">云上文博会</view>
-            </view>
-            
-            <view bindtap="goH5" data-title="文化场馆查询" data-path="Museum" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/29b2954718fe7b7232fe352eb503fbf0.png" mode="widthFix"></image>
-            <view class="text">文化场馆查询</view>
-            </view>
-            
-            <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view>
-            
+        <!-- 视频 -->
+        <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+            <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
-            <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/0f422cb2026f42c772ab12d384f5b7ef.png" mode="widthFix"></image>
-            <view class="text">数字公共文化</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
-            data-path="/pages/list/culturalUnit/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
-            <view class="text">文旅单位</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
-            <view class="text">书仓</view>
-            </view> -->
-            <view bindtap="gotoUrl" data-event="appreciate_click" data-title="云游苏州" data-url="https://speed.web.yunyouyizhan.com/downloadApp/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240717/fab990ef40d7424c9f4616a229b03777.png" mode="widthFix"></image>
-            <view class="text">云游苏州</view>
-            </view>
-            <view bindtap="gotoPath" data-event="appreciate_click" data-title="美图鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/61aac5403bb54bb4cea6a9587da6863b.png" mode="widthFix"></image>
-            <view class="text">美图鉴赏</view>
-            </view>
-            <!-- <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询"
-            data-path="/pages/pbService/wwcx/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
-            <view>文物查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询"
-            data-path="/pages/pbService/museum/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
-            <view>博物馆查询</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-            <view>云上文博会</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
-            <view class="text">投资导引图</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="数字文物"
-            data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
-            <view>数字文物</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-            <view>团体预约</view>
-            </view> -->
-            <!-- <view bindtap="gotoUrl" data-title="廉洁地图"
-            data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
-            <view>廉洁地图</view>
-            </view> -->
-            <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-            class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-            <view>文化配送</view>
-            </view> -->
-        </view>
-        </scroll-view>
-        <view class="scroll-line">
-        <!-- <view class="scroll-line-bg" style="width:{{4 / 5 * 100}}%;margin-left:{{scrollLeft}}px"></view> -->
-        <!-- 元旦修改 以下两行都是改的 .scroll-line-bg .scroll-line-bg2-->
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:37rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:37rpx;"></view>
+            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
         </view>
     </view>
 
-
-
-
-
-
-  
-    </view>
 </view>
\ No newline at end of file
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 78713d2..ec704bd 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -6,7 +6,7 @@ page {
 .swiper,.swiper image {
   width: 100%;
   display: block;
-  height: 600rpx;
+  height: 908rpx;
 }
 
 .top-box {
@@ -32,15 +32,14 @@ page {
   flex: 1;
   width: 100%;
   height: 64rpx;
-  border-radius: 0rpx;
-  color: #15B593;
+  border-radius: 27rpx;
+  color: #666666;
   display: flex;
   align-items: center;
   font-size: 25rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/6cc354588441d7f89a36a91d7e1edd52.png");
-  background-size: 100% 100%;
   padding: 2rpx 5rpx;
   box-sizing: border-box;
+  background: rgba(255, 255, 255, 0.6);
 }
 .search-box .iconfont {
   font-size: 30rpx;
@@ -54,7 +53,7 @@ page {
     z-index: 3;
     width: 100%;
     left: 0;
-    bottom: 20rpx;
+    bottom: 30rpx;
     right: 0;
     display: flex;
     justify-content: space-between;
@@ -62,21 +61,25 @@ page {
     box-sizing: border-box;
 }
 .banner-main image{
-    width: 150rpx;
-    height: 100rpx;
+    width: 153.33rpx;
+    height: 133.33rpx;
 }
 
 .main-content{
-    background: white;
+    background-color:#E8F9FA;
     margin-top: -10rpx;
     border-radius: 20rpx;
     position: relative;
     z-index: 4;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/150bd1f9312967bd7d9bedc6dbb8dd48.png");
+    background-size: 100% auto;
+    background-repeat: repeat-y;
+    padding-top: 63rpx;
 }
 
 .top-icons {
   display: flex;
-  padding: 20rpx;
+  padding:0 20rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -86,19 +89,27 @@ page {
   text-align: center;
   flex-shrink: 0;
   width: 20%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
 }
 .top-icon-item:nth-child(5n){
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 86rpx;
+  width: 100rpx;
+  height: 100rpx;
   display: block;
-  margin: 0 auto;
-  margin-bottom: 10rpx;
+  /* margin: 0 auto; */
+  /* margin-bottom: 10rpx; */
 }
 .content {
   margin: 0 25rpx;
 }
+.common-header-img{
+    height: 63.33rpx;
+}
 .sale-road-boxes {
   display: flex;
   justify-content: space-between;
@@ -137,9 +148,7 @@ page {
   background: linear-gradient(90deg, #F78C56, #FB6044);
   
 }
-.road-product-bg {
-  background: linear-gradient(90deg, #35CFB4, #00A6A0);
-}
+
 .sale-img {
   position: absolute;
   right: 0;
@@ -195,70 +204,9 @@ page {
   margin-top: 33rpx;
   position: relative;
 }
-.product-tags {
-  display: flex;
-  margin-top: 40rpx;
-  margin-bottom: 50rpx;
-  overflow-x: auto;
-}
-.product-tag {
-  padding: 0 20rpx;
-  height: 43rpx;
-  background: #F4F4F4;
-  border-radius: 21rpx;
-  font-size: 27rpx;
-  color: #666;
-  margin-right: 20rpx;
-  flex-shrink: 0;
-}
-.product-tag.active {
-  background: #0B898E;
-  color: #fff;
-}
-.tag-product-list {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-}
-.tag-product {
-  width: 337rpx;
-  background: #FFFFFF;
-  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
-  border-radius: 13rpx;
-  margin-bottom: 35rpx;
-}
-.tag-product image {
-  display: block;
-  width: 337rpx;
-  height: 213rpx;
-  border-radius: 13rpx 13rpx 0px 0px;
-}
-.tag-product .product-info {
-  padding: 20rpx;
-  padding-bottom: 0;
-}
-.tag-product .tag-product-title {
-  font-size: 33rpx;
-  color: #333333;
-  font-weight: 500;
-  margin-bottom: 10rpx;
-}
-.tag-product .tag-product-address {
-  color: #999;
-  font-size: 22rpx;
-  line-height: 40rpx;
-  padding-bottom: 10rpx;
-}
-.tag-product-price-box {
-  display: flex;
-  height: 70rpx;
-  align-items: center;
-  border-top: 1rpx solid #ccc;
-  justify-content: space-between;
-}
-.tag-product .tag-product-address .iconfont {
-  font-size: 26rpx;
-}
+
+
+
 .price {
   color: #D62828;
   font-size: 24rpx;
@@ -288,63 +236,51 @@ page {
   font-size: 31rpx;
   font-weight: 500;
 }
-/* .pic-list {
-  display: flex;
-  justify-content: space-between;
-  margin: 60rpx 0;
-}
-.pic-list image {
-  width: 155.33rpx;
-  height: 200rpx;
-  display: block;
-} */
-/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
+
 .pic-list {
   width: 100%;
   display: flex;
-  margin-right: 26rpx;
-  display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
 }
+.new-pic {
+    width: 340rpx;
+    height: 140rpx;
+    margin-bottom: 20rpx;
+  }
+
 .title-more {
   font-size: 27rpx;
   font-weight: 500;
-  color: #29305A;
+  color: #1A9BA7;
   z-index: 9;
   width: 173rpx;
-  height: 80rpx;
+  height: 63.33rpx;
   border-radius: 20rpx;
   text-align: center;
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: flex-end;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  margin-top: 20rpx;
+  margin-top: 30rpx;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
   margin-bottom: 40rpx;
 }
 .pbservice {
-  /* width: calc(175rpx * 6); */
-  /* 元旦修改 */
   width: calc(190rpx * 7);
   display: flex;
-  margin-top: 30rpx;
   flex-wrap: wrap;
-  /* margin-bottom: 60rpx; */
-  /* 元旦修改 注释margin-bottom */
 }
 .pbservice-item {
   /* 元旦修改 截止到注释的width*/
-  width: 120rpx;
-  margin-bottom: 33.33rpx;
-  margin-right: 62.33rpx;
-  /* width: 175rpx; */
+  width: 158rpx;
+  margin-bottom: 22rpx;
+  margin-right: 22rpx;
   text-align: center;
   font-size: 25rpx;
   color: #111111;
@@ -358,12 +294,9 @@ page {
   width: 200rpx;
 }
 .pbservice-item image {
-  /* width: 60rpx;
-  margin-bottom: 20rpx;
-  margin-top: 50rpx; */
-  /* 元旦修改 以上都是之前的*/
-  width: 106rpx;
-  margin-bottom: 10rpx;
+  width: 158rpx;
+  height: 152rpx;
+  /* margin-bottom: 10rpx; */
 }
 .six-box {
   margin-top: 43rpx;
@@ -518,42 +451,34 @@ page {
   letter-spacing: 3rpx;
   font-weight: 500;
 }
-.title-header .icon-fanhui1 {
-  display: none;
-}
+
 .more-btn-text {
   text-align: center;
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #169D7E;
+  border: 1px solid #2BB2D2;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
-  color: #169D7E;
+  color: #2BB2D2;
 }
 .scroll-line {
 
-  width: 73rpx !important;
+  width: 34rpx !important;
   height: 7rpx;
-  /* background: #DDCEAC; */
-  background: #97D0EC;
+  background: #87E1EC;
   border-radius: 3rpx;
   margin: 33.33rpx auto;
 }
 .scroll-line-bg {
   height: 7rpx;
-  background: #5184B0;
-  border-radius: 3rpx;
-}
-/* 元旦修改  新增样式 */
-.scroll-line-bg2 {
-  margin-left: 37.33rpx;
-  background: #5184B0;
-  height: 7rpx;
+  background: #30A7CD;
   border-radius: 3rpx;
 }
+
+
 .nomore-tip-btn {
   position: absolute;
   left: 0;
@@ -561,100 +486,12 @@ page {
   height: 78rpx;
   bottom: 0;
 }
-.prize-tip-text {
-  width: 267rpx;
-  display: block;
-  top: 39rpx;
-  left: 134rpx;
-  position: absolute;
-}
-.prize-name {
-  position: absolute;
-  text-align: center;
-  left: 132rpx;
-  right: 132rpx;
-  top: 169rpx;
-  font-size: 31rpx;
-  color: #333333;  
-}
-.prize-img {
-  width: 333rpx;
-  height: 240rpx;
-  border-radius: 13rpx;
-  overflow: hidden;
-  position: absolute;
-  left: 100rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  top: 269rpx;
-}
-.prize-img image {
-  display: block;
-  width: 333rpx;
-  height: 240rpx;
-}
-.btn-box {
-  position: absolute;
-  width: 400rpx;
-  height: 87rpx;
-  left: 67rpx;
-  bottom: 78rpx;
-  text-align: center;
-  line-height: 87rpx;
-}
-.btn-box image {
-  display: block;
-  width: 100%;
-}
-.btn-box navigator,.btn-box view {
-  color: #fff;
-  font-size: 35rpx;
-  font-weight: bold;
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 1;
-  right: 0;
-}
-.prize-coupon {
-  width: 293rpx;
-  height: 227rpx;
-  position: absolute;
-  top: 274rpx;
-  left: 120rpx;
-  color: #fff;
-  font-size: 24rpx;
-  text-align: center;
-}
-.prize-coupon image {
-  display: block;
-  width: 100%;
-}
-.prize-coupon-money {
-  position: absolute;
-  left: 0;
-  right: 0;
-  font-size: 80rpx;
-  font-weight: bold;
-  line-height: 110rpx;
-  top: 12rpx;
-}
-.prize-coupon-money::before{
-  content: "￥";
-  font-size: 32rpx;
-}
-.prize-coupon-tip {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 120rpx;
-}
+
 .other-plats {
   display: flex;
   font-size: 25rpx;
   text-align: center;
-  margin-bottom: 30rpx;
+  margin: 30rpx 0;
   color: #333333;
   line-height: 42rpx;
   flex-wrap: wrap;
@@ -664,44 +501,12 @@ page {
   align-items: center;
 }
 .other-plats image {
-  width: 80rpx;
+  width: 153.33rpx;
   display: block;
-  height: 80rpx;
+  height: 146.67rpx;
   margin-bottom: 15rpx;
 }
-.other-plat {
-  /* 春节新增样式 */
-  color: #111111;
-}
-.other-plat:nth-child(4n){
-  margin-right: 0;
-}
-.old-btn {
-  position: fixed;
-  left: 0;
-  top: 170rpx;
-  writing-mode:tb-rl;
-  margin-top: 142rpx;
-  color: #0B898E;
-  font-size: 29rpx;
-  width: 64rpx;
-  height: 140rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  letter-spacing: 3rpx;
-  background: rgba(255, 255, 255, 0.7);
-  box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3);
-  border-radius: 0 13rpx 13rpx 0;
-  font-weight: 500;
-  z-index: 1;
-}
-.top-bg-img {
-  display: block;
-  width: 100%;
-  position: absolute;
-  left: 0;
-}
+
 .dot-list {
   display: flex;
   position: absolute;
@@ -862,7 +667,7 @@ page {
   border-radius: 0rpx;
   overflow: hidden;
   position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/004153a812042b46ca750146f5259ef7.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png");
   background-size: 100% 100%;
   padding: 3rpx;
 }
@@ -903,7 +708,7 @@ page {
   height: 153rpx;
   display: flex;
   margin-bottom: 13rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250312/a41b881279749fba4c506c164914b601.png");
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png");
   background-size: 100% 100%;
   padding: 1rpx;
 }
@@ -981,12 +786,7 @@ page {
   text-align: center;
   line-height: 36rpx;
 }
-/* 元旦修改新增样式 */
-.new-pic {
-  width: 160rpx !important;
-  height: 220rpx !important;
-  margin-bottom: 26.67rpx;
-}
+
 
 .ggfw-list {
   display: flex;
@@ -995,9 +795,9 @@ page {
 }
 
 .ggfw-list .ggfw {
-  width: 30%;
-  height: 70rpx;
-  margin-bottom: 20rpx;
+  width: 220rpx;
+  height: 72rpx;
+  margin-bottom: 14rpx;
 }
 .ggfw image{
   width: 100%;
@@ -1012,7 +812,7 @@ page {
   justify-content: space-between;
   align-items: center;
   overflow: scroll;
-  margin-bottom: 53.33rpx;
+  margin: 32rpx 0 53.33rpx;
   z-index: 1;
   position: relative;
 }
@@ -1134,4 +934,10 @@ page {
 .xsth-left>image{
     max-width: 100%;
     overflow: hidden;
-}
\ No newline at end of file
+}
+
+::-webkit-scrollbar{
+    width: 0;
+    height: 0;
+    color: transparent;
+}

From 86fe0f140b47272dffaf291c03a1df230c11b185 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 27 May 2025 09:41:08 +0800
Subject: [PATCH 323/471] 1

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e77b178..78bcb3b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -31,7 +31,7 @@
     <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
   </view>
 </view>
-<view class="content" wx:if="{{false}}">
+<view class="content" wx:if="{{!isTest}}">
   <!-- 活动日历 -->
   <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
     <image lazy-load mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>

From 6fc17e77246dddf306d1bb3e9f8478484650cab6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 27 May 2025 11:16:36 +0800
Subject: [PATCH 324/471] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                  |  2 +-
 pages/pbService/sceneComfort/index.wxml | 81 +++++++++++++++----------
 pages/pbService/sceneComfort/index.wxss | 34 +++++++++--
 pages/user/user.wxml                    |  2 +-
 project.private.config.json             |  6 +-
 5 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/app.js b/app.js
index f827a54..16d71a8 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest190? true : false;
+            data.isTest = data.isTest191? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index deb8f2e..04e38f1 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/pbService/sceneComfort/index.wxml-->
-<title title="景区舒适度"></title>
+<title title="AI避高峰"></title>
 <view class="my-top-search">
   <view class="my-search-box">
     <view class="iconfont icon-sousuo"></view>
@@ -26,40 +26,55 @@
       </view>
     </picker>
   </view>
-  <view class="comfort-levels">
+
+</view>
+<view style="height:200rpx"></view>
+
+<view class="comfort-levels">
     <text>舒适度：</text>
     <view wx:if="{{index!=0}}" style="color:{{item.color}}" wx:for="{{comfortLevel}}" class="comfort-level">{{item.desc}}</view>
-  </view>
 </view>
-<view style="height:220rpx"></view>
-<view class="comfort-item" wx:for="{{list}}">
-  <view class="scene-title">{{item.third_scene_name}}</view>
-  <view class="comfort-tip">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort1.png" mode="widthFix"></image>
-    <text style="margin-right:30rpx">{{areaObj[item.area]}}</text>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
-    <text>{{sceneLevelObj[item.scene_level]}}</text>
-  </view>
-  <!-- <view class="progress-item">
-    <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
-    <view class="progress-text">{{comfortObj[item.comfort_level].name}}/{{item.ins_carry_capacity}}人</view>
-  </view> -->
+<view style="padding-top: 25rpx;" class="comfort-levels">更新时间:2025-05-26 10:00:00</view>
 
-	<view class="'info'{{item.comfort_level==5?'shushi':''}}{{item.comfort_level==4?'jiaoshushi':''}}{{item.comfort_level==3?'yiban':''}}{{item.comfort_level==2?'jiaoyongji':''}}{{item.comfort_level==1?'yongji':''}}">
-	<view class="top-info">
-		<view class="comft">
-		<view>
-			当前舒适度:
-		</view>
-		<view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
-	</view>
-	<!-- <view class="num">
-		瞬时承载量:{{item.ins_carry_capacity}}人
-	</view> -->
-	</view>
-	<view class="other-tip">
-    <text>更新时间:{{item.status_time}}</text>
-  </view>
-  </view>
+<view class="comfort-container">
+    <view class="comfort-head">
+        <image style="width: 39.67rpx;height: 39.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/ca10f9d72f8d5f3696dee41081357c82.png"></image>
+        <text style="height: fit-content;padding-left: 20rpx;">景区舒适度</text>
+    </view>
+
+    <view class="comfort-content">
+        <view class="comfort-item" wx:for="{{list}}">
+            <view class="scene-title">{{item.third_scene_name}}</view>
+            <view class="comfort-tip">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort1.png" mode="widthFix"></image>
+                <text style="margin-right:30rpx">{{areaObj[item.area]}}</text>
+                <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
+                <text>{{sceneLevelObj[item.scene_level]}}</text>
+            </view>
+            <!-- <view class="progress-item">
+                <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
+                <view class="progress-text">{{comfortObj[item.comfort_level].name}}/{{item.ins_carry_capacity}}人</view>
+            </view> -->
+
+                <view class="'info'{{item.comfort_level==5?'shushi':''}}{{item.comfort_level==4?'jiaoshushi':''}}{{item.comfort_level==3?'yiban':''}}{{item.comfort_level==2?'jiaoyongji':''}}{{item.comfort_level==1?'yongji':''}}">
+                <view class="top-info">
+                    <view class="comft">
+                    <view>
+                        当前舒适度:
+                    </view>
+                    <view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
+                </view>
+                <!-- <view class="num">
+                    瞬时承载量:{{item.ins_carry_capacity}}人
+                </view> -->
+                </view>
+                <view class="other-tip">
+                <text>更新时间:{{item.status_time}}</text>
+            </view>
+            </view>
+
+            </view>
+    </view>
+
+</view>
 
-</view>
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index b699e0b..a9b3637 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -53,7 +53,7 @@ page {
   position: fixed;
   left: 0;
   right: 0;
-  padding: 20rpx 30rpx;
+  padding: 20rpx 30rpx 30rpx;
   background: #fff;
   z-index: 1;
   font-size: 26rpx;
@@ -65,8 +65,9 @@ page {
   justify-content: space-between;
   align-items: center;
   padding-left: 20rpx;
-  background: #EDEDED;
+  /* background: #EDEDED; */
   border-radius: 30rpx;
+  border: 1px solid #848484;
 }
 .my-search-box .iconfont {
   color: #999999;
@@ -98,8 +99,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 30rpx;
-  margin-bottom: 20rpx;
+  padding: 30rpx 30rpx 0;
 }
 .picker .iconfont {
   font-size: 16rpx;
@@ -107,17 +107,22 @@ page {
   margin-left: 10rpx;
 }
 .comfort-levels {
+    width: 691rpx;
+    margin: 0 auto;
   display: flex;
   align-items: center;
   margin-top: 10rpx;
   white-space: nowrap;
+  font-weight: 500;
+font-size: 26rpx;
 }
 .comfort-level {
   padding: 0 16rpx;
   border-radius: 20rpx;
   line-height: 38rpx;
-  border: 1rpx solid;
+  border: none;
   margin-right: 20rpx;
+  background: #FFFFFF;
 }
 .two {
 	padding: 0 12rpx;
@@ -178,4 +183,23 @@ font-size: 26rpx;
 font-family: PingFang SC;
 font-weight: 500;
 color: #333333;
+}
+
+.comfort-container{
+    padding: 0 30rpx;
+    width: 100%;
+    margin-top: 30rpx;
+}
+.comfort-container .comfort-head{
+    width: 690rpx;
+    height: 132rpx;
+    background: linear-gradient(91deg, #5AB2D6 0%, #6BCEAF 100%);
+    border-radius: 20rpx;
+    display: flex;
+    padding: 0rpx 30rpx 68.33rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    align-items: flex-end;
 }
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 06731c6..caca19b 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -122,7 +122,7 @@
     <navigator url="userPrivacy/index?id=14" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       第三方共享信息清单
     </navigator>
-    <navigator url="/pages/pbService/web/index?weburl=https://m.supplier.cloud.sz-trip.com/login" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
+    <navigator url="/pages/pbService/web/index?weburl=https://m.supplier.cloud.sz-trip.com" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       商户核销
     </navigator>
   </view>
diff --git a/project.private.config.json b/project.private.config.json
index b200949..88e6abb 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,9 +7,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/order/joinOrder/index",
-          "pathName": "pages/order/pay/index",
-          "query": "id=28182505231709189176&token=0b62878b-b30c-41d8-a91f-119f8365d86e",
+          "name": "pages/pbService/sceneComfort/index",
+          "pathName": "pages/pbService/sceneComfort/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },

From 913363f0d1a5db3118f1579359ce87b37c8f0595 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 27 May 2025 14:56:43 +0800
Subject: [PATCH 325/471] =?UTF-8?q?=E9=81=BF=E9=AB=98=E5=B3=B0=C2=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml                  |   4 +-
 pages/pbService/sceneComfort/index.js   |  11 ++-
 pages/pbService/sceneComfort/index.wxml |  73 ++++++++------
 pages/pbService/sceneComfort/index.wxss | 126 +++++++++++++++++-------
 4 files changed, 151 insertions(+), 63 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 78bcb3b..5200043 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -86,7 +86,9 @@
       <image lazy-load bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
         data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj"
         src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
-      <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
+      <!-- <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/> -->
+       <image lazy-load  class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index"
        src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index db8e5d5..f026153 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -43,6 +43,7 @@ Page({
         comfortLevel:res.data,
         comfortObj:comfortObj
       })
+      this.getList();
     })
     commonApi._post('pbservice/Other/getSuzhouAreas').then(res=>{
       let areaObj = {}
@@ -62,7 +63,6 @@ Page({
         areas:res.data,
         areaObj:areaObj
       })
-      this.getList();
     })
     commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
       console.log(res)
@@ -117,6 +117,15 @@ Page({
       page_num:10,
       scene_level:this.data.sceneLevelIndex>0?this.data.sceneLevel[this.data.sceneLevelIndex].level:null
     }).then(res=>{
+        let resData = res.data.rows
+        // 处理舒适度
+        resData.forEach(v=>{
+            v.comforLevel = this.data.comfortLevel.find(x=>x.level == v.comfort_level)
+            // v.comfort_level_str = comforLevel.desc
+            v.hourflowLeve = this.data.comfortLevel.find(x=>x.level == v.hour_flow_level)
+            // v.hour_flow_level_str = hourflowLeve.desc
+        })
+
       this.setData({
         list:this.data.list.concat(res.data.rows),
         total:res.data.total
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 04e38f1..bf7d5bd 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -34,7 +34,7 @@
     <text>舒适度：</text>
     <view wx:if="{{index!=0}}" style="color:{{item.color}}" wx:for="{{comfortLevel}}" class="comfort-level">{{item.desc}}</view>
 </view>
-<view style="padding-top: 25rpx;" class="comfort-levels">更新时间:2025-05-26 10:00:00</view>
+<view style="padding-top: 25rpx;" class="comfort-levels" wx:if="{{list[0]}}">更新时间:{{list[0].status_time}}</view>
 
 <view class="comfort-container">
     <view class="comfort-head">
@@ -43,37 +43,54 @@
     </view>
 
     <view class="comfort-content">
-        <view class="comfort-item" wx:for="{{list}}">
-            <view class="scene-title">{{item.third_scene_name}}</view>
-            <view class="comfort-tip">
-                <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort1.png" mode="widthFix"></image>
-                <text style="margin-right:30rpx">{{areaObj[item.area]}}</text>
-                <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
-                <text>{{sceneLevelObj[item.scene_level]}}</text>
-            </view>
-            <!-- <view class="progress-item">
-                <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
-                <view class="progress-text">{{comfortObj[item.comfort_level].name}}/{{item.ins_carry_capacity}}人</view>
-            </view> -->
-
-                <view class="'info'{{item.comfort_level==5?'shushi':''}}{{item.comfort_level==4?'jiaoshushi':''}}{{item.comfort_level==3?'yiban':''}}{{item.comfort_level==2?'jiaoyongji':''}}{{item.comfort_level==1?'yongji':''}}">
-                <view class="top-info">
-                    <view class="comft">
-                    <view>
-                        当前舒适度:
+        <view class="ai-tip">
+            <image style="width: 27.67rpx;height: 27.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/c3513e7eb0c43ece5f47a8f044063b64.png"></image>
+            <text style="padding-left: 12rpx;">本预测趋势图由AI生成，内容仅供参考。</text>
+        </view>
+        
+        <view class="item-container">
+            <view class="comfort-item" wx:for="{{list}}" wx:key="index">
+                <image class="comfort-item-img" src="{{item.img_url}}" mode="aspectFill"></image>
+                <view class="comfort-item-content">
+                    <view class="scene-title">
+                        <view class="textOver">{{item.third_scene_name}}</view>
+                        <view class="area-tag" wx:if="{{item.area}}">{{item.area}}</view>
+                        <view class="slevel-tag" wx:if="{{(sceneLevelObj[item.scene_level])}}">{{sceneLevelObj[item.scene_level]}}</view>
                     </view>
-                    <view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
-                </view>
-                <!-- <view class="num">
-                    瞬时承载量:{{item.ins_carry_capacity}}人
-                </view> -->
+                    
+                        <view class="top-info">
+                            <view style="flex: 1;flex-shrink: 0;">
+                                <view class="comft">
+                                    <view>当前:</view>
+                                    <view class="two" style="color: {{item.comforLevel.color}};">{{item.comforLevel.desc}}</view>
+                                </view>
+                                <view class="progress-item">
+                                    <progress percent="{{item.ins_carry_capacity/item.max_carry_capacity * 100}}" color="{{item.comforLevel.color}}" stroke-width="{{20 * radio}}" border-radius="{{10 * radio}}"></progress>
+                                </view>
+                            </view>
+                            <view style="flex: 1;flex-shrink: 0;">
+                                <view class="comft">
+                                    <view>未来一小时:</view>
+                                    <view class="two" style="color: {{item.comforLevel.color}};">{{item.comforLevel.desc}}</view>
+                                </view>
+                                <view class="progress-item">
+                                    <progress percent="{{item.hour_flow/item.max_carry_capacity * 100}}" color="{{item.comforLevel.color}}" stroke-width="{{20 * radio}}" border-radius="{{10 * radio}}"></progress>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="other-tip">
+                            <text>更新时间:{{item.status_time}}</text>
+                        </view>
+                    
+
+ 
+                
+
+
                 </view>
-                <view class="other-tip">
-                <text>更新时间:{{item.status_time}}</text>
-            </view>
-            </view>
 
             </view>
+        </view>
     </view>
 
 </view>
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index a9b3637..3939af1 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -1,33 +1,77 @@
 /* pages/pbService/sceneComfort/index.wxss */
 page {
-  background: #f6f6f6;
+  background: #EDEDED;
 }
 .comfort-item {
-  margin: 30rpx;
-  background: white;
-  padding: 30rpx;
-  padding-top: 10rpx;
-  color: #333;
-  border-radius: 20rpx;
+  display: flex;
+  width: 100%;
+  padding-bottom: 24rpx;
+}
+.item-container{
+    width: 100%;
+    background: white;
+    padding: 24rpx 10rpx 24rpx 24rpx;
+    box-sizing: border-box;
+    border-radius: 20rpx;
+}
+.comfort-item-img{
+    width: 172rpx;
+    height: 224rpx;
+    flex-shrink: 0;
+    border-radius: 16rpx;
+    object-fit: cover;
+}
+.comfort-item-content{
+    width: 1rpx;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    padding:0rpx 0rpx 15rpx 15rpx;
 }
+
 .scene-title {
   font-size: 30rpx;
   line-height: 48rpx;
-}
-.comfort-tip {
   display: flex;
   align-items: center;
-  font-size: 26rpx;
-  margin-top: 10rpx;
-  margin-bottom: 27rpx;
+  font-weight: 500;
+    font-size: 32rpx;
+    color: #000000;
+}
+.area-tag{
+    padding: 0 10rpx;
+    height: 31rpx;
+    background: rgba(204,168,25,0.4);
+    border-radius: 4rpx;
+    line-height: 31rpx;
+    font-weight: 400;
+    font-size: 22rpx;
+    color: #7D5B00;
+    margin-left: 15rpx;
+    flex-shrink: 0;
+    word-break: keep-all;
+    word-wrap: none;
 }
-.comfort-tip image {
-  width: 30rpx;
-  margin-right: 7rpx;
+.slevel-tag{
+    padding: 0 10rpx;
+    height: 31rpx;
+    background: rgba(204,97,25,0.4);
+    border-radius: 4rpx;
+    line-height: 31rpx;
+    font-weight: 400;
+    font-size: 22rpx;
+    color: #CC6119;
+    margin-left: 15rpx;
+    flex-shrink: 0;
+    word-break: keep-all;
+    word-wrap: none;
 }
+
 .progress-item {
   position: relative;
-  
+  margin-top: 14rpx;
+  width: 176rpx;
 }
 .progress-text {
   position: absolute;
@@ -44,7 +88,6 @@ page {
 .other-tip {
   font-size: 24rpx;
   color: #888;
-  margin-top: 33rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -125,17 +168,10 @@ font-size: 26rpx;
   background: #FFFFFF;
 }
 .two {
-	padding: 0 12rpx;
-  border-radius: 20rpx;
-  line-height: 38rpx;
-  border: 1rpx solid;
-	margin-left: 10rpx;
-	
-
+	padding-left: 8rpx;
 font-size: 24rpx;
 font-family: PingFang SC;
 font-weight: 500;
-color: #83D851;
 }
 .info{
 	width: 630rpx;
@@ -166,13 +202,12 @@ background: rgba(252, 133, 58, .08);
 }
 .comft{
 	display: flex;
-
-
-font-size: 26rpx;
-font-family: PingFang SC;
-font-weight: 500;
-color: #333333;
-align-items: center;
+    font-size: 24rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    align-items: center;
+    word-break: keep-all;
 }
 .num{
 	border-left: 1rpx solid #D8D8D8;
@@ -189,6 +224,7 @@ color: #333333;
     padding: 0 30rpx;
     width: 100%;
     margin-top: 30rpx;
+    box-sizing: border-box;
 }
 .comfort-container .comfort-head{
     width: 690rpx;
@@ -202,4 +238,28 @@ color: #333333;
     font-size: 32rpx;
     color: #FFFFFF;
     align-items: flex-end;
-}
\ No newline at end of file
+}
+.comfort-content{
+    width: 100%;
+    background:#EFFAF4;
+    border-radius: 20rpx;
+    padding: 24rpx;
+    box-sizing: border-box;
+    position: relative;
+    top: -46rpx;
+}
+.ai-tip{
+    height: 67rpx;
+    background: rgba(255, 150, 0, 0.08);
+    border-radius: 10rpx;
+    line-height: 67rpx;
+    padding: 0 20rpx;
+    font-weight: 500;
+font-size: 25rpx;
+color: #FF9900;
+width: fit-content;
+display: flex;
+align-items: center;
+margin-bottom: 30rpx;
+}
+

From c93b64cdb162593d37c0660b428bcb4f4321e22f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 27 May 2025 15:58:41 +0800
Subject: [PATCH 326/471] =?UTF-8?q?=E6=99=AF=E5=8C=BA=E8=88=92=E9=80=82?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                |   3 +-
 pages/activity/year2020/index.js        |   2 +-
 pages/component/TitleHeader.js          |   4 +-
 pages/kj/info/index.js                  |   2 +-
 pages/login/index.js                    |  10 +-
 pages/pbService/aiHelpYou/index.js      | 129 ++++++++++++++++++++++++
 pages/pbService/aiHelpYou/index.json    |   3 +
 pages/pbService/aiHelpYou/index.wxml    |   4 +
 pages/pbService/aiHelpYou/index.wxss    |   1 +
 pages/pbService/sceneComfort/index.js   |   2 +-
 pages/pbService/sceneComfort/index.wxml |  14 +--
 pages/user/bindtel/index.js             |   2 +-
 utils/https.js                          |   4 +-
 13 files changed, 156 insertions(+), 24 deletions(-)
 create mode 100644 pages/pbService/aiHelpYou/index.js
 create mode 100644 pages/pbService/aiHelpYou/index.json
 create mode 100644 pages/pbService/aiHelpYou/index.wxml
 create mode 100644 pages/pbService/aiHelpYou/index.wxss

diff --git a/app.json b/app.json
index 5684680..cc141f1 100644
--- a/app.json
+++ b/app.json
@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/map/index",
+    "pages/pbService/aiHelpYou/index",
     "pages/search/index",
     "pages/search/list/index",
     "pages/login/index",
@@ -252,7 +253,7 @@
     "selectedColor": "#D22A1C",
     "borderStyle": "white",
     "list": [
-      { 
+      {
         "pagePath": "pages/index/index",
         "iconPath": "/images/index.png",
         "selectedIconPath": "/images/aindex_seld.png",
diff --git a/pages/activity/year2020/index.js b/pages/activity/year2020/index.js
index f911e1d..277634c 100644
--- a/pages/activity/year2020/index.js
+++ b/pages/activity/year2020/index.js
@@ -98,7 +98,7 @@ Page({
     util.gotoDetail(item)
   },
   home:function(){
-    wx.reLaunch({
+    wx.switchTab({
       url: '/pages/index/index',
     })
   },
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 9da6b3a..1fc9b5a 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -65,7 +65,7 @@ Component({
           })
         }
         else {
-          wx.reLaunch({
+          wx.switchTab({
             url: "/pages/index/index"
           })
         }
@@ -108,7 +108,7 @@ Component({
         })
       }
       else {
-        wx.reLaunch({
+        wx.switchTab({
           url: "/pages/index/index"
         })
       }
diff --git a/pages/kj/info/index.js b/pages/kj/info/index.js
index 1d8d83f..1cca5b8 100644
--- a/pages/kj/info/index.js
+++ b/pages/kj/info/index.js
@@ -105,7 +105,7 @@ Page({
                     })
                   }
                   else {
-                    wx.reLaunch({
+                    wx.switchTab({
                       url: '/pages/index/index',
                     })
                   }
diff --git a/pages/login/index.js b/pages/login/index.js
index d6166db..8e629e8 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -42,7 +42,7 @@ Page({
   },
   cancel:function(){
     util.pagePoint({event:this.data.event+'cancel'},1)
-    wx.reLaunch({
+    wx.switchTab({
       url: '/pages/index/index',
     })
   },
@@ -74,7 +74,7 @@ Page({
 
     let that = this;
     if (e.detail && (!e.detail.userInfo)){
-      wx.reLaunch({
+      wx.switchTab({
         url: '/pages/index/index',
       })
       return;
@@ -110,18 +110,18 @@ Page({
           }
           else {
             console.log('看这里看这里看这里')
-            wx.reLaunch({
+            wx.switchTab({
               url:"/pages/index/index"
             })
           }
         }).catch(err=>{
-          wx.reLaunch({
+          wx.switchTab({
             url:"/pages/index/index"
           })
         })
       },
       fail:function(){
-        wx.reLaunch({
+        wx.switchTab({
           url:"/pages/index/index"
         })
       }
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
new file mode 100644
index 0000000..cb6c043
--- /dev/null
+++ b/pages/pbService/aiHelpYou/index.js
@@ -0,0 +1,129 @@
+// pages/pbService/web/index.js
+let app = getApp()
+import commonApi from "../../../utils/https/common"
+import userApi from "../../../utils/https/user"
+import https from "../../../utils/https.js"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    webUrl:"",
+	shareTitle: "",
+    shareUrl: "",
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let weburl = 'https://test.m.cloud.sz-trip.com/aiPlay'
+    let token = wx.getStorageSync('jstrip_token')
+    if (token) {
+        weburl += '?token='+token
+    }
+    let _this = this
+    try {
+        let lonAndLat = (wx.getStorageSync('lonAndLat'))
+        if (lonAndLat && JSON.parse(lonAndLat)) {
+            lonAndLat = JSON.parse(lonAndLat)
+            if (Object.keys(webParam).length>0 || token) {
+                weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+            } else {
+                weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+            }
+            this.setUrl(weburl)
+            return
+        } else {
+            wx.getLocation({
+                type: 'gcj02',
+                success: (res) => {
+                    let lonAndLat = JSON.stringify({lat: res.latitude,lon: res.longitude})
+                    wx.setStorageSync('lonAndLat', lonAndLat)
+                    if (Object.keys(webParam).length>0 || token) {
+                        weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                    } else {
+                        weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+                    }
+                    _this.setUrl(weburl)
+                },
+                fail: (err) => {
+                    _this.setUrl(weburl)
+                }
+            })
+        }
+    } catch(e) {
+        this.setUrl(weburl)
+    }
+
+  },
+  handleMessage(data) {
+	console.log('打印22222',data);
+  },
+
+  setUrl (url) {
+        this.setData({
+            webUrl:url
+        })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+  
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+	return {
+	  title: this.data.shareTitle,
+	  path: `/pages/pbService/web/index?weburl=${encodeURIComponent(this.data.webUrl)}`,
+	}
+  },
+  
+  onShareTimeline: function() {
+    return {
+      title: this.data.shareTitle,
+      path: `/pages/pbService/web/index?weburl=${encodeURIComponent(this.data.webUrl)}`,
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/pbService/aiHelpYou/index.json b/pages/pbService/aiHelpYou/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/pbService/aiHelpYou/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/pbService/aiHelpYou/index.wxml b/pages/pbService/aiHelpYou/index.wxml
new file mode 100644
index 0000000..f6c048b
--- /dev/null
+++ b/pages/pbService/aiHelpYou/index.wxml
@@ -0,0 +1,4 @@
+<!--pages/pbService/web/index.wxml-->
+<view wx:if="{{webUrl}}">
+  <web-view src="{{webUrl}}" bindmessage="handleMessage"></web-view>
+</view>
diff --git a/pages/pbService/aiHelpYou/index.wxss b/pages/pbService/aiHelpYou/index.wxss
new file mode 100644
index 0000000..3d9e18a
--- /dev/null
+++ b/pages/pbService/aiHelpYou/index.wxss
@@ -0,0 +1 @@
+/* pages/pbService/web/index.wxss */
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index f026153..7415b96 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -112,7 +112,7 @@ Page({
     commonApi._post("pbservice/Comfort/getComfort",{
       scene_name:this.data.keywords,
       comfort_level:this.data.comfortIndex>0?this.data.comfortLevel[this.data.comfortIndex].level:null,
-      area_key:this.data.areaIndex>0?this.data.areas[this.data.areaIndex].area_code:null,
+      area_key:this.data.areaIndex>0?this.data.areas[this.data.areaIndex].area_name:null,
       page_no:this.data.pageNo,
       page_num:10,
       scene_level:this.data.sceneLevelIndex>0?this.data.sceneLevel[this.data.sceneLevelIndex].level:null
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index bf7d5bd..3fb22bf 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -31,7 +31,7 @@
 <view style="height:200rpx"></view>
 
 <view class="comfort-levels">
-    <text>舒适度：</text>
+    <text style="color: #0B898E;">舒适度：</text>
     <view wx:if="{{index!=0}}" style="color:{{item.color}}" wx:for="{{comfortLevel}}" class="comfort-level">{{item.desc}}</view>
 </view>
 <view style="padding-top: 25rpx;" class="comfort-levels" wx:if="{{list[0]}}">更新时间:{{list[0].status_time}}</view>
@@ -42,7 +42,7 @@
         <text style="height: fit-content;padding-left: 20rpx;">景区舒适度</text>
     </view>
 
-    <view class="comfort-content">
+    <view class="comfort-content" wx:if="{{list.length>0}}">
         <view class="ai-tip">
             <image style="width: 27.67rpx;height: 27.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/c3513e7eb0c43ece5f47a8f044063b64.png"></image>
             <text style="padding-left: 12rpx;">本预测趋势图由AI生成，内容仅供参考。</text>
@@ -71,22 +71,16 @@
                             <view style="flex: 1;flex-shrink: 0;">
                                 <view class="comft">
                                     <view>未来一小时:</view>
-                                    <view class="two" style="color: {{item.comforLevel.color}};">{{item.comforLevel.desc}}</view>
+                                    <view class="two" style="color: {{item.hourflowLeve.color}};">{{item.hourflowLeve.desc}}</view>
                                 </view>
                                 <view class="progress-item">
-                                    <progress percent="{{item.hour_flow/item.max_carry_capacity * 100}}" color="{{item.comforLevel.color}}" stroke-width="{{20 * radio}}" border-radius="{{10 * radio}}"></progress>
+                                    <progress percent="{{item.hour_flow/item.max_carry_capacity * 100}}" color="{{item.hourflowLeve.color}}" stroke-width="{{20 * radio}}" border-radius="{{10 * radio}}"></progress>
                                 </view>
                             </view>
                         </view>
                         <view class="other-tip">
                             <text>更新时间:{{item.status_time}}</text>
                         </view>
-                    
-
- 
-                
-
-
                 </view>
 
             </view>
diff --git a/pages/user/bindtel/index.js b/pages/user/bindtel/index.js
index ce73a3f..82055f8 100644
--- a/pages/user/bindtel/index.js
+++ b/pages/user/bindtel/index.js
@@ -31,7 +31,7 @@ Page({
     })
   },
   cancel:function(){
-    wx.reLaunch({
+    wx.switchTab({
       url: '/pages/index/index',
     })
   },
diff --git a/utils/https.js b/utils/https.js
index 67031b4..1a81b17 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From f747d3bf9ec5e43bbe08a769f17d783ff7d5bdeb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 27 May 2025 17:42:34 +0800
Subject: [PATCH 327/471] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js     | 59 +++++++++++++++++++++++++-----------
 subPackages/index/index.js   | 11 +++++--
 subPackages/index/index.wxml |  7 +++--
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 0492ed4..36892b5 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -357,27 +357,52 @@ Page({
 
   // 数币密码确认
   showPassword () {
+      let _this =this
       // 请求是否设置密码
       commonApi.user_post("pay_password/checkUsedPassword",{}).then(res=>{
           // 设置过密码
-        if (res.data) {
-            this.setData({
-                SBMask: true,
-                haveSBPassword: true,
-                vcode: '',
-                isFoucs: true
-            })
-        } else {
-            let userinfo = wx.getStorageSync('jstrip_userInfo')
-            let inputData =  {phone: '',code: '',password: '',confirmPassword: ''}
-            if (userinfo && userinfo.mobile) {
-                inputData.phone = userinfo.mobile
+        if (res.data && res.data.data) {
+            let resCode = res.data.data
+            // 密码过期
+            if (resCode == 0) {
+                let userinfo = wx.getStorageSync('jstrip_userInfo')
+                let inputData =  {phone: '',code: '',password: '',confirmPassword: ''}
+                if (userinfo && userinfo.mobile) {
+                    inputData.phone = userinfo.mobile
+                }
+                this.setData({
+                    SBMask: true,
+                    inputData: inputData,
+                    haveSBPassword: false,
+                })
+            } else if (resCode == 1) {
+                // 密码正常
+                this.setData({
+                    SBMask: true,
+                    haveSBPassword: true,
+                    vcode: '',
+                    isFoucs: true
+                })
+            } else  {
+                wx.showModal({
+                    title: '您的支付密码已过期',
+                    content: resCode,
+                    cancelText: '修改密码',
+                    confirmText:'忘记密码',
+                    confirmColor:"#0E8790",
+                    success(res){
+                        if (res.confirm) {
+                            console.log('忘记密码')
+                            _this.goReset()
+                          } else if (res.cancel) {
+                            console.log('修改密码')
+                            wx.navigateTo({
+                                url: '/subPackages/password/setting/setting?type=edit'
+                            })
+                          }
+                    },
+                })
             }
-            this.setData({
-                SBMask: true,
-                inputData: inputData,
-                haveSBPassword: false,
-            })
         }
       })
   },
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 77f7a85..0acdb32 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -110,7 +110,8 @@ Page({
         mainTypeLeft: 0,
 
 		xpth: {}, // 新品特惠
-		XPathBannerIndex: 0,
+        XPathBannerIndex: 0,
+        xpthIndex: 0,
 		// 公共服务
 		publicSerivce: [
 			{
@@ -717,7 +718,13 @@ Page({
 		}).then(res => {
 			this.setData({xpth: res.data,})
 		})
-	},
+    },
+    
+    // 更换新品特惠 当即热门
+    changeXpthIndex:function (e) {
+        let value = e.currentTarget.dataset.value
+        this.setData({xpthIndex:value})
+    },
 
     
 	
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 67c8287..b106949 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -70,8 +70,11 @@
                 <!-- 上方标题部分 -->
                 <view class="xsth-title">
                     <view class="xsth-left" style="display: flex;">
-                        <image mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
-                        <image mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
+                        <image wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/f2dc42edee46a79a6ba375ae1a1c24b7.png"></image>
+                        <image wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
+                        
+                        <image wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/1d1117bf6120fb75159eb8657b15c640.png"></image>
+                        <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
                     </view>
                 </view>
                 <!-- 商品部分 -->

From 66eefcadab1d89070e777db9ea4a3d8a4d2753b8 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 30 May 2025 10:09:33 +0800
Subject: [PATCH 328/471] =?UTF-8?q?=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                    |   2 +-
 pages/index/index.js                      |   2 +-
 pages/index/index.wxml                    |   8 +-
 pages/list/activitynew/index.js           |   2 +-
 pages/list/activitynew/index.wxml         |   6 +-
 pages/order/pay/index.js                  |  78 ++--
 pages/pbService/aiHelpYou/index.js        |   2 +-
 pages/pbService/index.wxml                |   4 +-
 pages/pbService/sceneComfort/index.js     |  13 +-
 pages/pbService/sceneComfort/index.wxml   |   2 +-
 pages/pbService/sceneComfort/index.wxss   |   8 +-
 project.private.config.json               |   7 +
 subPackages/index/index.js                | 363 +++++++---------
 subPackages/index/index.wxml              |  95 ++--
 subPackages/index/index.wxss              | 502 ++++++++++------------
 subPackages/password/overview/overview.js |   2 +-
 utils/https.js                            |   4 +-
 utils/util.js                             |   4 +-
 18 files changed, 499 insertions(+), 605 deletions(-)

diff --git a/app.js b/app.js
index 16d71a8..5271762 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest191? true : false;
+            data.isTest = data.isTest192? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 104a24f..940c872 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -274,7 +274,7 @@ Page({
     },
     // 分类为电影时调这个接口
     getMovieList() {
-        let service = "Cinema/getHotMovieList";
+        let service = "Cinema/getHotChannelMovieList";
             let data = {
                 page: 1,
                 pageSize: 5
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5200043..cd0a010 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -44,7 +44,7 @@
     </view>
   </view>
   <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
       {{item.title}}
     </view>
   </view>
@@ -88,7 +88,7 @@
         src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
       <!-- <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
        src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/> -->
-       <image lazy-load  class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index"
+       <image lazy-load  class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=AI避高峰"
        src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
@@ -189,8 +189,8 @@
           <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view> -->
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+        <view  data-event="comfort_click" data-title="高峰预警"
+            bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=高峰预警"
          class="pbservice-item ggfw" >
           <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
           <view>高峰预警</view>
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 91e64e3..61a8f2f 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -260,7 +260,7 @@ Page({
   getMovie: function (e) {
     if (!this.data.moreFlag) return;
     let service = {
-      1: "getHotMovieList",
+      1: "getHotChannelMovieList",
       2: "getCinemaList",
       3: 'getSoonShowsList'
     };
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 440df97..9112822 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -24,7 +24,7 @@
     <view class="{{type==3?'types-item-active':'types-item'}}" bindtap="changeType" data-type="3">景区活动</view>
     <view class="{{type==1?'types-item-active':'types-item'}}" bindtap="changeType" data-type="1">演出</view>
     <view class="{{type==2?'types-item-active':'types-item'}}" bindtap="changeType" data-type="2">展览</view>
-    <view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4" style="display: none;">电影</view>
+    <view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4" >电影</view>
     <view class="{{type==7?'types-item-active':'types-item'}}" bindtap="changeType" data-type="7">文化惠民</view>
     <view class="{{type==6?'types-item-active':'types-item'}}" bindtap="changeType" data-type="6">其他</view>
   </view>
@@ -85,8 +85,8 @@
     </picker>
   </view> -->
 </view>
-<view class="activity-list activity-list1">
-  <view class="movie-types" wx:if="{{type==4}}">
+<view class="activity-list activity-list1" style="padding-top: 27rpx;">
+  <view class="movie-types" wx:if="{{type==4&&false}}">
     <view bindtap="changeMovieType" data-type='1' class="movie-type {{movieType==1?'active':''}}">热映</view>
     <view bindtap="changeMovieType" data-type='2' class="movie-type {{movieType==2?'active':''}}">影院</view>
     <!-- <view bindtap="changeMovieType" data-type='3' class="movie-type {{movieType==3?'active':''}}">即将上映</view> -->
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 36892b5..68ab854 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -360,11 +360,11 @@ Page({
       let _this =this
       // 请求是否设置密码
       commonApi.user_post("pay_password/checkUsedPassword",{}).then(res=>{
-          // 设置过密码
-        if (res.data && res.data.data) {
+          
+        if (res.data && (res.data.data || res.data.data===0)) {
             let resCode = res.data.data
-            // 密码过期
-            if (resCode == 0) {
+            // 密码未设置
+            if (resCode === 0) {
                 let userinfo = wx.getStorageSync('jstrip_userInfo')
                 let inputData =  {phone: '',code: '',password: '',confirmPassword: ''}
                 if (userinfo && userinfo.mobile) {
@@ -375,34 +375,41 @@ Page({
                     inputData: inputData,
                     haveSBPassword: false,
                 })
-            } else if (resCode == 1) {
-                // 密码正常
-                this.setData({
-                    SBMask: true,
-                    haveSBPassword: true,
-                    vcode: '',
-                    isFoucs: true
-                })
-            } else  {
-                wx.showModal({
-                    title: '您的支付密码已过期',
-                    content: resCode,
-                    cancelText: '修改密码',
-                    confirmText:'忘记密码',
-                    confirmColor:"#0E8790",
-                    success(res){
-                        if (res.confirm) {
-                            console.log('忘记密码')
-                            _this.goReset()
-                          } else if (res.cancel) {
-                            console.log('修改密码')
-                            wx.navigateTo({
-                                url: '/subPackages/password/setting/setting?type=edit'
+            } else {
+                commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+                    if (res.code!=1) {
+                        return
+                    } else {
+                        if (resCode == 1) {
+                            // 密码正常
+                            this.setData({
+                                SBMask: true,
+                                haveSBPassword: true,
+                                vcode: '',
+                                isFoucs: true
                             })
-                          }
-                    },
+                        } else  {
+                            wx.showModal({
+                                title: '您的支付密码已过期',
+                                content: resCode,
+                                cancelText: '修改密码',
+                                confirmText:'忘记密码',
+                                confirmColor:"#0E8790",
+                                success(res){
+                                    if (res.confirm) {
+                                        console.log('忘记密码')
+                                        _this.goReset()
+                                      } else if (res.cancel) {
+                                        console.log('修改密码')
+                                        _this.goEdit()
+                                      }
+                                },
+                            })
+                        }
+                    }
                 })
-            }
+
+            } 
         }
       })
   },
@@ -584,6 +591,17 @@ Page({
         }
       })
   },
+  goEdit: function () {
+    commonApi.user_post("pay_password/checkLocked",{}).then(res=>{
+        if (res.code!=1) {
+            return
+        } else {
+            wx.navigateTo({
+                url: '/subPackages/password/setting/setting?type=edit'
+            })
+        }
+      })
+  },
 
   /**
    * 生命周期函数--监听页面隐藏
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index cb6c043..cfca763 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -18,7 +18,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let weburl = 'https://test.m.cloud.sz-trip.com/aiPlay'
+    let weburl = 'https://m.cloud.sz-trip.com/aiPlay'
     let token = wx.getStorageSync('jstrip_token')
     if (token) {
         weburl += '?token='+token
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index b8d74ef..d1137ca 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -9,8 +9,8 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
-    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoUrl"
-    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy">
+    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoPath"
+    data-path="/pages/pbService/sceneComfort/index?title=高峰预警">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>高峰预警</view>
     </view>
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index 7415b96..67bd108 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -7,6 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+      title: 'AI避高峰',
     radio:radio,
     comfortLevel:[],
     comfortIndex:0,
@@ -28,6 +29,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if (options.title) {
+        this.setData({title: options.title})
+    }
+
     commonApi._post("pbservice/Comfort/getComfortLevel").then(res=>{
       let comfortObj = {}
       res.data.map(item=>{
@@ -45,10 +50,12 @@ Page({
       })
       this.getList();
     })
-    commonApi._post('pbservice/Other/getSuzhouAreas').then(res=>{
+    commonApi._post('pbservice/Comfort/getComfortAreaList').then(res=>{
       let areaObj = {}
-      res.data.map(item=>{
-        areaObj[item.area_code] = item.area_name;
+      res.data.forEach(item=>{
+        item.area_code = item.area
+        item.area_name = item.area
+        areaObj[item.area_code] = item.area;
       })
       res.data.unshift({
         area_name:"不选择"
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 3fb22bf..803068c 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/pbService/sceneComfort/index.wxml-->
-<title title="AI避高峰"></title>
+<title title="{{title}}"></title>
 <view class="my-top-search">
   <view class="my-search-box">
     <view class="iconfont icon-sousuo"></view>
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index 3939af1..1ba84df 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -5,12 +5,16 @@ page {
 .comfort-item {
   display: flex;
   width: 100%;
-  padding-bottom: 24rpx;
+  padding: 24rpx 0;
+  border-bottom: 1px solid rgba(0,0,0,0.1);
 }
+.comfort-item:last-child {
+    border-bottom: none;
+  }
 .item-container{
     width: 100%;
     background: white;
-    padding: 24rpx 10rpx 24rpx 24rpx;
+    padding: 0rpx 10rpx 24rpx 24rpx;
     box-sizing: border-box;
     border-radius: 20rpx;
 }
diff --git a/project.private.config.json b/project.private.config.json
index 88e6abb..33ab55d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subPackages/password/setting/setting",
+          "pathName": "subPackages/password/setting/setting",
+          "query": "type=edit",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/sceneComfort/index",
           "pathName": "pages/pbService/sceneComfort/index",
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 0acdb32..36fb35e 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -41,83 +41,85 @@ Page({
 		
 		// banner上的金刚区
 		bannerDataList: [
-			{
-				title: "景点门票",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/5934b8b77b058ce1de5943adbaf51739.png",
-				path: "/pages/list/scene/index",
-			},
-			{
-				title: "活动日历",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/d75d7a3924d832912a2633ee29b30b9b.png",
-				path: "/pages/list/activitynew/index",
-			},
-			{
-				title: "匠意臻品",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/69722050b638954e0b755a4d6c771d48.png",
-				path: "/subPackages/techanNew/index",
-			},
-			{
-				title: "领券中心",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/4384a93f77d8faba5f504195c77e57c1.png",
-				path: "/pages/list/scene/index",
-			},
+			// {
+			// 	title: "景点门票",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/5934b8b77b058ce1de5943adbaf51739.png",
+			// 	path: "/pages/list/scene/index",
+			// },
+			// {
+			// 	title: "活动日历",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/d75d7a3924d832912a2633ee29b30b9b.png",
+			// 	path: "/pages/list/activitynew/index",
+			// },
+			// {
+			// 	title: "匠意臻品",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/69722050b638954e0b755a4d6c771d48.png",
+			// 	path: "/subPackages/techanNew/index",
+			// },
+			// {
+			// 	title: "领券中心",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/4384a93f77d8faba5f504195c77e57c1.png",
+			// 	path: "/pages/list/scene/index",
+			// },
 		],
 		// 金刚区
 		mainTypeList: [
-			{
-				title: "非遗专卖",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				path: "/subPackages/feiyiNew/index",
-			},
-			{
-				title: "场馆预约",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				path: "/pages/list/museum/index",
-			},
-			{
-				title: "一日游",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				weburl:"https://m.cloud.sz-trip.com/OneDayTravelNew",
-			},
-			{
-				title: "户外游",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				weburl:"https://m.cloud.sz-trip.com/LearningTravel",
-			},
-			{
-				title: "电影购票",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				weburl:"https://m.cloud.sz-trip.com/movies",
-			},
-			{
-                type: 'hotel', // 特殊标识方便查找 更新weburl
-				title: "酒店住宿",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				weburl: '',
-				path: '/pages/list/hotel/index'
-			},
-			{
-				title: "水上游",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				path: '/pages/list/night/index'
-			},
-			{
-				title: "剧场演出",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
-				path: '/pages/list/theatre/index'
-			},
+			// {
+			// 	title: "非遗专卖",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: "/subPackages/feiyiNew/index",
+			// },
+			// {
+			// 	title: "场馆预约",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: "/pages/list/museum/index",
+			// },
+			// {
+			// 	title: "一日游",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl:"https://m.cloud.sz-trip.com/OneDayTravelNew",
+			// },
+			// {
+			// 	title: "户外游",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl:"https://m.cloud.sz-trip.com/LearningTravel",
+			// },
+			// {
+			// 	title: "电影购票",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl:"https://m.cloud.sz-trip.com/movies",
+			// },
+			// {
+            //     type: 'hotel', // 特殊标识方便查找 更新weburl
+			// 	title: "酒店住宿",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl: '',
+			// 	path: '/pages/list/hotel/index'
+			// },
+			// {
+			// 	title: "水上游",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: '/pages/list/night/index'
+			// },
+			// {
+			// 	title: "剧场演出",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: '/pages/list/theatre/index'
+			// },
         ],
         mainTypeLeft: 0,
 
 		xpth: {}, // 新品特惠
         XPathBannerIndex: 0,
         xpthIndex: 0,
+        list: [], // 热门推荐
+
 		// 公共服务
 		publicSerivce: [
 			{
 				title: "高峰预警",
 				img: "https://static.ticket.sz-trip.com/uploads/20250526/c7e28d88bde040c386183d69ae9bb228.png",
-				weburl: "https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy",
+				path: "/pages/pbService/sceneComfort/index?title=高峰预警",
 				eventName: "comfort_click",
 			},
 			{
@@ -200,17 +202,17 @@ Page({
 			},
 			{
 				title: "云上文博会",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250312.png',
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/f45acb752680d1b4cce7d25da02c96f5.png',
 				weburl: "https://m.cloud.sz-trip.com/CloudExpo",
 			},
 			{
 				title: "精彩回顾",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/74bd8e6b027797a24fbfccaef5c836ad.png',
 				path: "/pages/pbService/activity/index",
 			},
 			{
 				title: "文化场馆查询",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/ff56544a00fb1cc78e0b307f16daa821.png',
 				weburl: "https://m.cloud.sz-trip.com/Museum",
 			},
 			{
@@ -237,12 +239,12 @@ Page({
 			},
 			{
 				title: "云游苏州",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/f3b1ec60b5f069182faadf263ec9dfee.png',
 				weburl: 'https://speed.web.yunyouyizhan.com/downloadApp/index.html#/',
 			},
 			{
 				title: "美图鉴赏",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250312/58d0fd32ea7521b0b1ea12bf5b593fe2.png',
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/820de8c4353bde80379f46e474104c04.png',
 				path: "/pages/pbService/appreciate/index",
 				
 			},
@@ -256,57 +258,57 @@ Page({
         SQSM: [
             {
                 title: "常熟",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/3e4b8f20f9468cb4fd3f0c92d604db09.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/ed641bf31558381e8d1c372e5cbbd155.png",
                 appId: 'wx4df5fd9a6a5ea123',
 				pagePath: 'pages/index'
             },
             {
                 title: "太仓",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/24fc48715691714988d5e0cf78e5a657.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/f359551295197eff9c0966324659f037.png",
                 appId: 'wx8853b0d93cbca75e',
 				pagePath: 'pages/home/home'
             },
             {
                 title: "昆山",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/55b86da028a00326994ac8ebf10447b5.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/35f498dbb43e14cdf3c6bbdf83e613db.png",
                 appId: 'wx8888a3fd0862b4c8',
 				pagePath: 'pages/index/index'
             },
             {
                 title: "吴江",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/aa60aec108158b47e0210b8b33c72fe5.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/2288c75b3797363015bfe633ea9abc0e.png",
                 appId: 'wx8eadea4ee2d42d4b',
 				pagePath: 'pages/index/index'
             },
             {
                 title: "工业园区",
-				img: "https://static.ticket.sz-trip.com/uploads/20250312/4fdd5f3e9f63421d4394f2c3b3a0c7a4.png",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/9e947f0ef8addbe5c52b5bd4de205788.png",
                 appId: 'wxd323e63a10aa6865',
 				pagePath: 'pages/home/index'
             },
             {
                 title: "张家港",
-                img: "https://static.ticket.sz-trip.com/uploads/20250312/bb32450e448ec520c90241556a68c092.png",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/6162e0a86ec7e7b12e568fd5f81b5c9b.png",
                 path: "/pages/list/six/index?area=zhangjiagang"
             },
             {
                 title: "吴中",
-                img: "https://static.ticket.sz-trip.com/uploads/20250312/cea52b2c0f3c18762d7feea2ba987e63.png",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/36fc77bf5d6879e6ce06ae349187c2ad.png",
                 path: "/pages/list/six/index?area=wuzhong"
             },
             {
                 title: "相城",
-                img: "https://static.ticket.sz-trip.com/uploads/20250312/ef29b1cbdd9b33919891732750f72f2a.png",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/ec54fba906166c7512d26ca8a4fa5a9f.png",
                 path: "/pages/list/six/index?area=xiangcheng"
             },
             {
                 title: "姑苏",
-                img: "https://static.ticket.sz-trip.com/uploads/20250312/8de375c2fc322cb44d7e0cdb84c97cfe.png",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/cbb939c4ddfa187489b59adcbe72f7a9.png",
                 path: "/pages/list/six/index?area=gusu"
             },
             {
                 title: "高新",
-                img: "https://static.ticket.sz-trip.com/uploads/20250312/96a0c3631a0b3a9d5836943663a2f5c5.png",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/f2aa7328af4afaa9d1d4ecac1778300a.png",
                 path: "/pages/list/six/index?area=gaoxin"
             },
 
@@ -345,17 +347,10 @@ Page({
     
         ],
 
+        // 回购榜
+        repurchaseList: [],
+        canGetrepurchase: true,
 
-
-		saleProduct: null,
-		roadProduct: null,
-		
-		month: "",
-		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
-		date: "",
-		list: [],
-		listMore: true,
-		
 		urltopage: {},
 
 		// ---------------2025-5-26改版没用到的------------------
@@ -386,15 +381,6 @@ Page({
 		return
 		console.log('options',options)
 
-		
-		
-		// 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-        })
-
     },
 
 	onReady: function() {
@@ -403,7 +389,6 @@ Page({
 		this.getBanner()
        
         this.getXpthList() // 限时特惠
-		this.getTwoProduct()
 
         this.getList()  // 回购榜
         // this.getWeather()  // 2025-5-26首页改版不需要天气了
@@ -416,17 +401,26 @@ Page({
 					lat: res.latitude,
 					lon: res.longitude
 				})
-				// this.getList()  // 2025不需要经纬度了
 			},
 			fail: (err) => {
-				// this.getList()
 			}
         })
         
         this.getUrlToPage()
 
 
-	},
+    },
+    
+    showImg (img) {
+        if (!img) { return img }
+        if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
+            return img;
+        } else {
+            // return "https://test.api.cloud.sz-trip.com"+img
+            return "https://static.ticket.sz-trip.com" + img;
+        }
+    },
+
     // 获取系统信息
 	getHeight() {
         let systemInfo = wx.getSystemInfoSync(),
@@ -443,12 +437,8 @@ Page({
     },
     //获取季节配置
 	getIndexSeason() {
-        let mainTypeList = this.data.mainTypeList
-        let hotelData = mainTypeList.find(v=>v.type == "hotel")
-
         if (app.globalData.configJson&&app.globalData.configJson.indexSeason) {
             console.log('app', app.globalData.configJson)
-            hotelData.weburl = app.globalData.configJson.hotelUrl
             this.setData({
                 indexHot: app.globalData.configJson.indexHot,
                 isTest: app.globalData.configJson.isTest,
@@ -457,24 +447,32 @@ Page({
                 indexSeason: app.globalData.configJson.indexSeason,
                 // 开发数据
                 // indexSeason: imageSource.testImgs.indexSeason,
-                mainTypeList: mainTypeList
+                bannerDataList: (app.globalData.configJson.nav_menu || []),
+                mainTypeList: (app.globalData.configJson.menu_button || []),
             })
         } else {
             commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
-                let obj = {}
-                res.data.content.forEach(item => {
+                let obj = {};
+                (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
                 });
                 app.globalData.configJson.indexSeason = obj 
                 app.globalData.loadIndexSeason = true
-                hotelData.weburl = app.globalData.configJson.hotelUrl
+                app.globalData.configJson.nav_menu = (res.data.nav_menu || []).map(v=>{
+                    return {...v, icon:this.showImg(v.icon)}
+                })
+                app.globalData.configJson.menu_button = (res.data.menu_button || []).map(v=>{
+                    return {...v, icon:this.showImg(v.icon)}
+                })
+               
                 console.log('webData', app.globalData.configJson)
                 this.setData({
                     indexHot: app.globalData.configJson.indexHot,
                     isTest: app.globalData.configJson.isTest,
                     // otherPlat: app.globalData.configJson.otherPlats,
                     indexSeason: app.globalData.configJson.indexSeason,
-                    mainTypeList: mainTypeList
+                    bannerDataList: (app.globalData.configJson.nav_menu || []),
+                    mainTypeList: (app.globalData.configJson.menu_button || []),
                 })
             })
         }
@@ -679,7 +677,25 @@ Page({
 		}
 		
     },
-    // 后台配置数据的跳转
+    // 后台配置数据跳转
+    mainNavClick:function (e) {
+        let item = e.currentTarget.dataset.item
+        console.log(item)
+        if (item.jump_type == "page") {
+            wx.navigateTo({
+              url: item.page.mini,
+            })
+            return
+        }
+        if (item.jump_type == "link") {
+            wx.navigateTo({
+              url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url),
+            })
+            return
+        }
+    },
+
+    // 其他平台配置数据的跳转
     gotoOther: function(e) {
 		let item = e.currentTarget.dataset.item;
 		if (item.type == 'h5') {
@@ -725,117 +741,42 @@ Page({
         let value = e.currentTarget.dataset.value
         this.setData({xpthIndex:value})
     },
-
-    
-	
-	getTwoProduct: function() {
-		// 获取首页限时特惠
-		commonApi._post('act/fast_sale_now', {
-			offset: 0,
-			limit: 1
-		}).then(res => {
-			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
-				if (res.data[0].fast_sales_sku.length > 0) {
-					let price = res.data[0].fast_sales_sku[0].price
-					let data = res.data[0].fast_sales_sku[0]
-					for (let item of res.data[0].fast_sales_sku) {
-						if (price > item.price) price = item.price
-					}
-					data.price = price
-					this.setData({
-						saleProduct: data
-					})
-				} else {
-					this.setData({
-						saleProduct: res.data[0].fast_sales_sku[0]
-					})
-				}
-			}
-		})
-		commonApi._post("product/get_product_by_tag", {
-			tag_id: 17,
-			offset: 0,
-			limit: 1,
-			sort: 'price',
-			order: 'asc'
-		}).then(res => {
-			if (res.data.list.length > 0) {
-				let price = res.data.list[0].price
-				for (let item of res.data.list) {
-					if (item.price > price) {
-						price = item.price
-					}
-				}
-				let data = res.data.list[0]
-				data.price = price
-				this.setData({
-					roadProduct: data
-				})
-			} else {
-				this.setData({
-					roadProduct: [111]
-				})
-			}
-		})
-    },
-    
-
 	productGotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
 		util.gotoDetail(item)
 	},
 
-	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
+	// 热门推荐
 	getList: function() {
-		if (!this.data.listMore) return;
-		commonApi._post("search/recommend", {
-			offset: this.data.list.length,
-			limit: 16
-		}).then(res => {
-			res.data.map(item => {
-				if (item.ext.display_tags) {
-					item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-				} else {
-					item.ext.display_tags = []
-				}
-			})
-			if (res.data.length < 15) {
-				this.setData({
-					listMore: false
-				})
-			}
-			this.setData({
-				list: this.data.list.concat(res.data)
-			})
-		})
-	},
+        commonApi._post("product/get_product_by_tag_subject", {
+            tag_id: 85,offset: 0,limit: 5,
+        }).then(res=>{
+            this.setData({ list: res.data.list || []})
+        })
+    },
+    // 回购
+    getRepurchaseList:function () {
+        commonApi._post("repurchase/repurchase/getRepurchaseList", {}).then(res=>{
+            (res.data || []).forEach(v=>v.headimg = this.showImg(v.headimg))
+            this.setData({ repurchaseList: res.data || []})
+        })
+    },
 	onReachBottom: function() {
-		if (this.data.list.length < 30) {
-			this.getList()
-		}
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+        // }
+        if (this.data.canGetrepurchase) {
+            this.data.canGetrepurchase = false
+            this.getRepurchaseList()
+        }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
-		util.pagePoint({
-			event: 'recommend_click',
-			param: {
-				id: item.id,
-				type: item.type
-			}
-		}, 1)
-		if (item.type == 'travels') {
-			// 游记做特殊处理 其他都按照原来的来
-			wx.navigateTo({
-				url: '/pages/info/strategyInfo/index?id=' + item.s_id,
-			})
-		} else {
-			util.gotoDetail(item.ext);
-		}
+		commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
+		item.id = item.type=='post'?item.product_id:item.scene_id
+		util.gotoDetail(item);
+		
 	},
-	
-
-
-	
 
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index b106949..1ae631c 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -24,19 +24,19 @@
         </view>
 
         <view class="banner-main">
-            <view catchtap="mainIconClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
-                <image src="{{item.img}}" ></image>
+            <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
+                <image src="{{item.icon}}" ></image>
             </view>
         </view>
     </view>
 
-    <view class="main-content">
+    <view class="main-content" >
          <!-- 金刚区 -->
-        <view class="no-scrollbar">
+        <view class="no-scrollbar" wx:if="{{mainTypeList.length>0}}">
             <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
                 <view  class="top-icons no-scrollbar">
-                    <view bindtap="mainIconClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
-                        <image src="{{item.img}}" mode="aspectFill"></image>
+                    <view bindtap="mainNavClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
+                        <image src="{{item.icon}}" mode="aspectFill"></image>
                         <view class="top-icon-text">{{item.title}}</view>
                     </view>
                 </view>
@@ -48,9 +48,9 @@
         </view>
         
 
-        <view class="content">
+        <view class="content-box">
             <!-- 苏城环游记 todo-->
-            <view class="small-swiper-box" >
+            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0}}">
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
@@ -77,8 +77,26 @@
                         <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
                     </view>
                 </view>
-                <!-- 商品部分 -->
-                <view class="xpth-product">
+                <!-- 热门 -->
+                <view style="width: 100%;" wx:if="{{xpthIndex==0}}">
+                    <scroll-view scroll-x style="height:372rpx">
+                        <view class="season-hot">
+                            <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
+                                <image src="{{item.headimg}}"></image>
+                                <view class="season-content" style="padding:6rpx 12rpx 0;">
+                                    <view style="height: 70rpx;" class="textOver2">{{item.title}}</view>
+                                    <view class="price" >
+                                        <text>￥</text><text>{{item.price/100}}</text><text>起</text>
+                                    </view>
+                                </view>
+                                <image class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image>
+                            </view>
+                        </view>
+                    </scroll-view>
+                </view>
+
+                <!-- 显示特惠 -->
+                <view class="xpth-product" wx:else="">
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
@@ -108,7 +126,7 @@
                 </view>
             </view>
 
-            <view class="small-swiper-box" >
+            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0}}">
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
@@ -204,64 +222,33 @@
             </view>
 
             <!-- 热门推荐 -->
-            <view class="sale-road-boxes" style="margin-top:0">
+            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0}}">
                 <image mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="hot-list">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
-                <view wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
-                    <view wx:if="{{number==0 && index==0}}" class="hot-item today-hot">
-                    <common-image class="today-main-img" width="100%" height="615rpx" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-                    <view style="position:absolute;left:0;right:0;top:0;bottom:0;background:rgba(0,0,0,0.14)"></view>
-                    <image class="today-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/today.png" mode="widthFix"></image>
-                    <view class="today-date">{{date}} {{month}}</view>
-                    <view class="today-hot-box">
-                        <view class="today-hot-tag textOver" wx:for="{{item.ext.display_tags && ext.display_tags.length>0}}" wx:key="index">
-                        {{item.ext.display_tags[0]}}</view>
-                        <view class="today-hot-title">{{item.title}}</view>
-                    </view>
-                    </view>
-                    <view class="hot-item" wx:elif="{{item.type=='travels'}}">
+                <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                    <view class="hot-item">
                     <view style="position:relative">
-                        <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                        <view class="hot-location textOver">{{item.ext.subtitle}}</view>
+                        <common-image width="100%" src="{{item.headimg}}" mode="widthFix"></common-image>
                     </view>
                     <view class="hot-info">
                         <view class="hot-title">{{item.title}}</view>
-                        <view class="tags textOver" style="margin-bottom:0">
-                        <view class="icon-box">
-                            <text class="iconfont icon-xin"></text>
-                            <text>{{item.ext.like_number}}</text>
-                        </view>
-                        <view class="icon-box">
-                            <text class="iconfont icon-eye"></text>
-                            <text>{{item.ext.view_number}}</text>
-                        </view>
-                        </view>
-                    </view>
-                    </view>
-                    <view wx:else class="hot-item">
-                    <view style="position:relative">
-                        <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-                        <!-- <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' && item.ext.price}}" class="hot-price">
-                        <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text>
+                        <view class="com-flex" style="justify-content: space-between;margin-top: 26rpx;">
+                            <view  class="hot-price">
+                                <text>￥</text><text>{{item.price/100}}</text><text>起</text>
+                            </view>
+                            <view style="font-weight: 500;font-size: 23rpx;color: #999999;">已售{{item.sales_number}}</view>
                         </view>
+                        
                     </view>
                     </view>
                 </view>
                 </view>
             </view>
-            <view wx:if="{{listMore}}" class="more-btn-text" bindtap="getList">查看更多</view>
-            <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view>
+            <!-- <view wx:if="{{listMore}}" class="more-btn-text" bindtap="getList">查看更多</view>
+            <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view> -->
         </view>
 
     </view>
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index ec704bd..b8441ef 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -104,12 +104,33 @@ page {
   /* margin: 0 auto; */
   /* margin-bottom: 10rpx; */
 }
-.content {
+
+.content-box {
   margin: 0 25rpx;
 }
 .common-header-img{
     height: 63.33rpx;
 }
+
+.small-swiper {
+    height: 154rpx;
+}
+.small-swiper image {
+    display: block;
+    width: 100%;
+    height: 154rpx;
+}
+.small-swiper-box {
+    margin: 50rpx 0;
+    width: 100%;
+    height: 154rpx;
+    border-radius: 20rpx;
+    /* border-radius: 77rpx; */
+    overflow: hidden;
+    margin-top: 33rpx;
+    position: relative;
+}
+
 .sale-road-boxes {
   display: flex;
   justify-content: space-between;
@@ -117,93 +138,194 @@ page {
   position: relative;
   align-items: flex-end;
 }
-.sale-box {
-  flex-shrink: 0;
-  width: 337rpx;
-}
-.sale-title {
-  color: #999999;
-  font-size: 20rpx;
-  margin-bottom: 20rpx;
-}
-.sale-title text {
-  color: #000000;
-  font-size: 32rpx;
-  font-weight: 500;
-  margin-right: 8rpx;
-}
-.sale-product {
-  width: 337rpx;
-  position: relative;
-  height: 165rpx;
-  overflow: hidden;
-  border-radius: 8rpx;
-}
-.sale-product-bg {
-  width: 197rpx;
-  height: 165rpx;
-  position: absolute;
-  left: 0;
-  top: 0;
-  background: linear-gradient(90deg, #F78C56, #FB6044);
+
+/* 元旦修改新增样式 */
+.xpth {
+    border-radius: 20rpx;
+    padding: 22.67rpx 0 15.33rpx 0;
+    position: relative;
+    flex-direction: column;
+    align-items: flex-start;
+  }
   
-}
+  
+/* 热门推荐 限时特惠 */
+.xsth-title {
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    align-items: flex-end;
+    margin-bottom: 20rpx;
+  }
+  .xpth-left {
+    width: 393rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  .season-hot{
+      display: flex;
+  }
+  .season-hot .season-item{
+      width: 266rpx;
+      height: 332rpx;
+      margin-right: 14rpx;
+      flex-shrink: 0;
+      font-weight: bold;
+        font-size: 25rpx;
+        color: #000000;
+      position: relative;
+      background: white;
+  }
+ 
+  .season-hot .season-item image{
+      width: 100%;
+      height: 200rpx;
+  }
+  .season-hot .season-item .hot-cover-img{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+  }
+
+  .xsth-more {
+    margin-top: 19.33rpx;
+    font-size: 27rpx;
+    font-family: HYZhongYuan;
+    font-weight: normal;
+    color: #FFE7C0;
+  }
+  .xsth-more image {
+    margin-left: 14.67rpx;
+    width: 12.67rpx;
+    height: 22.67rpx;
+    vertical-align: middle;
+  }
+
+  /* 元旦修改新增样式 */
+  .xpth-product {
+    width: 700rpx;
+    height: 373rpx;
+    border-radius: 27rpx;
+    padding: 25rpx 13rpx;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between; 
+  }
+  /* 元旦修改新增样式 */
+  .xpth-banner {
+    flex: 1;
+    margin-left: 15rpx;
+    height: 322rpx;
+    width: 100%;
+    border-radius: 0rpx;
+    overflow: hidden;
+    position: relative;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png");
+    background-size: 100% 100%;
+    padding: 3rpx;
+  }
+  .xpth-banner-swiper{
+      height: 100%;
+      border-radius: 20rpx;
+      overflow: hidden;
+  }
+  .xpth-banner image {
+    flex: 1;
+    height: 100%;
+    width: 100%;
+    border-radius: 20rpx;
+  }
+  .xpth-banner-dot-list{
+      position: absolute;
+      right: 0;
+      bottom: 10rpx;
+      padding: 10rpx;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+  }
+  .xpth-banner-dot-list .xpth-dot{
+      width: 9rpx;
+      height: 9rpx;
+      background: #FFFFFF;
+      border-radius: 50%;
+      opacity: 0.6;
+      margin: 0 4rpx;
+  }
+  .xpth-banner-dot-list .xpth-dot.active{
+      opacity: 1;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item {
+    border-radius: 20rpx;
+    height: 153rpx;
+    display: flex;
+    margin-bottom: 13rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png");
+    background-size: 100% 100%;
+    padding: 1rpx;
+  }
+  .xpth-item:last-child {
+    margin-bottom: 0;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item image {
+    /* width: 160rpx;
+    height: 160rpx;
+    background: #FFE7C0;
+    border-radius: 15rpx 0 0 15rpx; */
+    width: 157rpx;
+    height: 154rpx;
+    /* background: #72707D; */
+    border-radius: 20rpx;
+    /* margin-right: 15.33rpx; */
+    flex-shrink: 0;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-content {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    /* background: #FBECDE; */
+    padding-left: 15.33rpx;
+    border-radius: 0 15rpx 15rpx 0;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-title {
+    width: 210rpx;
+    font-size: 27rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    margin-right: 18rpx;
+    /* height: 80rpx; */
+  }
+
+  /* 元旦修改新增样式 */
+  .xpth-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-right: 13.33rpx;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-price {
+    font-size: 31rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ED1C19;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-price::before {
+    content: "￥";
+    font-size: 23rpx;
+  }
+
 
-.sale-img {
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 173rpx;
-  height: 165rpx;
-}
-.sale-info {
-  position: absolute;
-  left: 20rpx;
-  top: 20rpx;
-  bottom: 20rpx;
-  width: 140rpx;
-}
-.sale-product-title {
-  font-size: 28rpx;
-  color: #fff;
-  font-weight: 500;
-  line-height: 36rpx;
-}
-.sale-price {
-  padding: 0 10rpx;
-  color: #F44747;
-  font-size: 25rpx;
-  line-height: 39rpx;
-  background: #FFFFFF;
-  border-radius: 5rpx;
-  margin-top: 15rpx;
-  display: inline-block;
-}
-.sale-tip-img {
-  position: absolute;
-  width: 200rpx;
-  height: 165rpx;
-  left: 0;
-  top: 0;
-}
-.small-swiper {
-  height: 154rpx;
-}
-.small-swiper image {
-  display: block;
-  width: 100%;
-  height: 154rpx;
-}
-.small-swiper-box {
-  margin: 50rpx 0;
-  width: 100%;
-  height: 154rpx;
-  border-radius: 20rpx;
-  /* border-radius: 77rpx; */
-  overflow: hidden;
-  margin-top: 33rpx;
-  position: relative;
-}
 
 
 
@@ -272,7 +394,7 @@ page {
   margin-bottom: 40rpx;
 }
 .pbservice {
-  width: calc(190rpx * 7);
+  width: calc(186rpx * 7);
   display: flex;
   flex-wrap: wrap;
 }
@@ -320,9 +442,9 @@ page {
 }
 .hot-item {
   background: white;
-  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  /* box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); */
   border-radius: 15rpx;
-  margin-bottom: 35rpx;
+  margin-bottom: 15rpx;
 }
 .hot-item image:nth-child(1) {
   display: block;
@@ -330,12 +452,12 @@ page {
   border-radius: 15rpx 15rpx 0 0;
 }
 .hot-item .hot-info {
-  padding: 20rpx 25rpx;
+  padding: 12rpx;
 }
 .hot-item .hot-title {
-  font-size: 32rpx;
-  color: #333;
-  font-weight: 500;
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #000000;
 }
 .hot-info .tags {
   display: flex;
@@ -359,8 +481,6 @@ page {
 .hot-price {
   color: #D62828;
   font-size: 24rpx;
-  margin-top:28rpx;
-
 }
 .hot-price text:nth-child(2){
   font-size: 33rpx;
@@ -580,10 +700,7 @@ page {
   transition: all 1s;
   
 }
-.fullsp{
-  width: 100%;
-  height: 100%;
-}
+
 .time{
   width: 150rpx;
   height: 60rpx;
@@ -598,194 +715,7 @@ page {
   z-index: 1002;
 }
 
-/* 元旦修改新增样式 */
-.xpth {
-  /* width: 697rpx; */
-  /* height: 462rpx; */
-  /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
-  border-radius: 20rpx;
-  padding: 22.67rpx 0 15.33rpx 0;
-  position: relative;
-  flex-direction: column;
-}
-
 
-/* 元旦修改新增样式 */
-.xpth-left {
-  width: 393rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-/* 元旦修改新增样式 */
-.xsth-title {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  align-items: flex-end;
-  margin-bottom: 20rpx;
-}
-/* 元旦修改新增样式 */
-.xsth-more {
-  margin-top: 19.33rpx;
-  font-size: 27rpx;
-  font-family: HYZhongYuan;
-  font-weight: normal;
-  color: #FFE7C0;
-}
-/* 元旦修改新增样式 */
-.xsth-more image {
-  margin-left: 14.67rpx;
-  width: 12.67rpx;
-  height: 22.67rpx;
-  vertical-align: middle;
-}
-/* 元旦修改新增样式 */
-.yanhua {
-  height: 104rpx;
-  width: 104rpx;
-  position: absolute;
-  right: 120rpx;
-  z-index: 999;
-}
-/* 元旦修改新增样式 */
-.xpth-product {
-  width: 700rpx;
-  height: 373rpx;
-  border-radius: 27rpx;
-  padding: 25rpx 13rpx;
-  box-sizing: border-box;
-  display: flex;
-  justify-content: space-between; 
-}
-/* 元旦修改新增样式 */
-.xpth-banner {
-  flex: 1;
-  margin-left: 15rpx;
-  height: 322rpx;
-  width: 100%;
-  border-radius: 0rpx;
-  overflow: hidden;
-  position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png");
-  background-size: 100% 100%;
-  padding: 3rpx;
-}
-.xpth-banner-swiper{
-    height: 100%;
-    border-radius: 20rpx;
-    overflow: hidden;
-}
-.xpth-banner image {
-  flex: 1;
-  height: 100%;
-  width: 100%;
-  border-radius: 20rpx;
-}
-.xpth-banner-dot-list{
-    position: absolute;
-    right: 0;
-    bottom: 10rpx;
-    padding: 10rpx;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-.xpth-banner-dot-list .xpth-dot{
-    width: 9rpx;
-    height: 9rpx;
-    background: #FFFFFF;
-    border-radius: 50%;
-    opacity: 0.6;
-    margin: 0 4rpx;
-}
-.xpth-banner-dot-list .xpth-dot.active{
-    opacity: 1;
-}
-/* 元旦修改新增样式 */
-.xpth-item {
-  border-radius: 20rpx;
-  height: 153rpx;
-  display: flex;
-  margin-bottom: 13rpx;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png");
-  background-size: 100% 100%;
-  padding: 1rpx;
-}
-.xpth-item:last-child {
-  margin-bottom: 0;
-}
-/* 元旦修改新增样式 */
-.xpth-item image {
-  /* width: 160rpx;
-  height: 160rpx;
-  background: #FFE7C0;
-  border-radius: 15rpx 0 0 15rpx; */
-  width: 157rpx;
-  height: 154rpx;
-  /* background: #72707D; */
-  border-radius: 20rpx;
-  /* margin-right: 15.33rpx; */
-  flex-shrink: 0;
-}
-/* 元旦修改新增样式 */
-.xpth-item-content {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-  /* background: #FBECDE; */
-  padding-left: 15.33rpx;
-  border-radius: 0 15rpx 15rpx 0;
-}
-/* 元旦修改新增样式 */
-.xpth-item-title {
-  width: 210rpx;
-  font-size: 27rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #333333;
-  margin-right: 18rpx;
-  /* height: 80rpx; */
-}
-.xpth-tag {
-  font-size: 24rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #E5A54A;
-}
-/* 元旦修改新增样式 */
-.xpth-item-bottom {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding-right: 13.33rpx;
-}
-/* 元旦修改新增样式 */
-.xpth-item-price {
-  font-size: 31rpx;
-  font-family: PingFang SC;
-  font-weight: bold;
-  color: #ED1C19;
-}
-/* 元旦修改新增样式 */
-.xpth-item-price::before {
-  content: "￥";
-  font-size: 23rpx;
-}
-/* 元旦修改新增样式 */
-.xpth-item-buy {
-  width: 111rpx;
-  height: 36rpx;
-  background: linear-gradient(180deg, #FF9B6A, #E63100);
-  border-radius: 18rpx;
-  font-size: 21rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #FFE7C0;
-  text-align: center;
-  line-height: 36rpx;
-}
 
 
 .ggfw-list {
diff --git a/subPackages/password/overview/overview.js b/subPackages/password/overview/overview.js
index 7b4667e..8ad8f50 100644
--- a/subPackages/password/overview/overview.js
+++ b/subPackages/password/overview/overview.js
@@ -67,7 +67,7 @@ Page({
   onShow: function () {
     commonApi.user_post("pay_password/checkUsedPassword",{}).then(res=>{
       this.setData({
-        havePassword:res.data,
+        havePassword:res.data.data,
       })
 
       if (res.data) {
diff --git a/utils/https.js b/utils/https.js
index 1a81b17..67031b4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"
diff --git a/utils/util.js b/utils/util.js
index 54e4387..f81ff7e 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -480,7 +480,7 @@ const pagePoint = function(data,type) {
 }
 
 const goMovieDetail= function(id, title, needReturn) {
-    let tempUrl = 'https://test.m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
+    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
     if (title) {
         tempUrl += +'&title='+item.title
     }
@@ -495,7 +495,7 @@ const goMovieDetail= function(id, title, needReturn) {
 }
 
 const goMovieList= function(needReturn) {
-    let tempUrl = 'https://test.m.cloud.sz-trip.com/movies'
+    let tempUrl = 'https://m.cloud.sz-trip.com/movies'
     let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
     if (needReturn) {
         return url

From e10c0b04d46c5dd28e818907abfe581928613e85 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 3 Jun 2025 09:32:53 +0800
Subject: [PATCH 329/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88=20?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |   2 +-
 images/ai.png                              | Bin 0 -> 5049 bytes
 images/ai_seld.png                         | Bin 0 -> 5572 bytes
 images/aindex.png                          | Bin 4169 -> 0 bytes
 images/amap.png                            | Bin 5939 -> 0 bytes
 images/auser.png                           | Bin 4396 -> 0 bytes
 images/index_seld.png                      | Bin 0 -> 4956 bytes
 images/index_seld_1.png                    | Bin 3734 -> 0 bytes
 images/index_seld_2.png                    | Bin 3786 -> 0 bytes
 images/map_seld.png                        | Bin 0 -> 8215 bytes
 images/map_seld_1.png                      | Bin 6376 -> 0 bytes
 images/map_seld_2.png                      | Bin 6360 -> 0 bytes
 images/user_seld.png                       | Bin 0 -> 5894 bytes
 images/user_seld_1.png                     | Bin 4576 -> 0 bytes
 images/user_seld_2.png                     | Bin 4547 -> 0 bytes
 images/video.png                           | Bin 4544 -> 0 bytes
 images/videoSeld.png                       | Bin 4676 -> 0 bytes
 pages/index/index.wxml                     |   2 +-
 pages/list/activitynew/index.wxml          |   2 +-
 pages/user/order/list.wxml                 |   2 +-
 pages/user/order/movieOrderInfo/index.wxml |   4 ++--
 21 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 images/ai.png
 create mode 100644 images/ai_seld.png
 delete mode 100644 images/aindex.png
 delete mode 100644 images/amap.png
 delete mode 100644 images/auser.png
 create mode 100644 images/index_seld.png
 delete mode 100644 images/index_seld_1.png
 delete mode 100644 images/index_seld_2.png
 create mode 100644 images/map_seld.png
 delete mode 100644 images/map_seld_1.png
 delete mode 100644 images/map_seld_2.png
 create mode 100644 images/user_seld.png
 delete mode 100644 images/user_seld_1.png
 delete mode 100644 images/user_seld_2.png
 delete mode 100755 images/video.png
 delete mode 100755 images/videoSeld.png

diff --git a/app.js b/app.js
index 5271762..a914d3a 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest192? true : false;
+            data.isTest = data.isTest101? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/images/ai.png b/images/ai.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ed8e01c8d5a2f85ef0f77d898d47a8fbabe5fb6
GIT binary patch
literal 5049
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
P00000NkvXXu0mjfzn{u(

literal 0
HcmV?d00001

diff --git a/images/ai_seld.png b/images/ai_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e00ec9d1f9447cb2deb85f88199f556c3598a87
GIT binary patch
literal 5572
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
S$?fd`0000<MNUMnLSTZGinzxB

literal 0
HcmV?d00001

diff --git a/images/aindex.png b/images/aindex.png
deleted file mode 100644
index 456edd2b0072c2de8b08ac572193a603d2871999..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4169
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
TMfRBO00000NkvXXu0mjfTi6uK

diff --git a/images/amap.png b/images/amap.png
deleted file mode 100644
index 4cb3a16181e927d3d25e1d5f26f133d44c611891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5939
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
V`{F6RXGj15002ovPDHLkV1k0aYu5k(

diff --git a/images/auser.png b/images/auser.png
deleted file mode 100644
index f26c0412fc7b6b52e5caca2d68f78390201063d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4396
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

diff --git a/images/index_seld.png b/images/index_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..97f97e079284ab079f4d2beea9a1aa303efaa600
GIT binary patch
literal 4956
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
aoBcl->i;bvrW+Cf0000<MNUMnLSTYCgQV5~

literal 0
HcmV?d00001

diff --git a/images/index_seld_1.png b/images/index_seld_1.png
deleted file mode 100644
index 07ce11b5ac71441d199a6048f07ba4fe05b86b5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3734
zcmV;H4r%d;P)<h;3K|Lk000e1NJLTq003G5003GD1^@s6IH*Aa00001b5ch_0Itp)
z=>Px@P)S5VRCr$PoqKdt)xF2RzkSXmK?HduGssKZ)!thBSoU$(ZC&fO_o~%C6uk7x
zLkl4@38@4TsajqkI}aWTVp|I|=5?X1UDB>)tJk~K(%ajIMOu8LP!T~&Au}0#lt*GR
zXa8>YB$J#837IozG7MR>|H{hQ&(Hat-~R32{_Q=4Y)T6ON=qx*Mvw)aCLzdz&Vo)8
zfiyLfmFO(!cmf4G<i+9?yb&vsYXWV^Z3_kGZ9JVOPOh7|ASBvXTmC6F#JwQChJgYA
z%>;g;BO>m5x3uzzYYJ(oAmc%M>sEXkWNriDsy;j-0Cu;UdDBl8t~ikfR<4@JXwU`q
z@*{#&Jp*4p$0&D^Qnv+*YYv0Ju4oKl;fw`6zE)mgn!K68*VxA24#oixK4JTxMZ{0T
z%2^aFDL*uXtXx%{k)R8jR(+I|_%VQgi37^C4T9D%tBnBu!~P7w9zh*9HT&1KxFRw{
zg)<KH#BCK*BN6^lr~dt#ZOn=pPkJojKUONkleVoL-w|o619%!hMo&J*pGk;0!6JDm
z)6_^tfgV%8@-h#M%|ubiq8p%|^d1$|ahF|MeU0+N4Bi0d8S#=$zlLEg3eB%MI7Gsk
zRJ9ocdTedQRMX_`1bhkT@xdqt?I6{$Bvi6C*ms1Jwk;pu9x;DJp#QYPX2J^~F|DOY
zHYY`82nuBc==|ChmkQH-2+-0=-F;#P=zkT&yl_As8))p4>*ct1!L?w%8Gsqf$G{%2
zn9~xF2Qxv9oOjR~GMS$55%`+`V)|AA_*F!S#qX5Jqk{?9geG~pQq~68C7Yq^_zfGX
ztfi>tz+iO@_4D%z+P7VLxkLRIfE#Q&nE`&nGIJN6C|vdTL;*x4o74{h%&||RAiSu!
zZCW^R|A1dbqHVazciuoxd_?9)TGb{1x7i?rL4OoPg+af3%jv*0><+TFGDuI5J!%A?
z7nDVF!X*_4Ky+RfHRlC%7Z9~k0pB9P(+!kCcm_h1xv>~7tzUVWB6B^1XU9o4<F|@b
zSvXMhSEny975UQ+dg_*CW7~2(^&pyV)5+S<*h$J-5G<*2y}FCGk(={<0CW4Okyj#?
zxG536p9;A4I?@VyOp_dwqpWoR6~}$rjOPtjbB~wQ>`T=EFWIteY;JDOW&pRus}a1c
z;F%TnuX-b$Y9wu-^Be9RB}CpjC@uylw+ATU4?^(m&GV~YOBLi;J>wczPBE2O529P+
zR++%>JVGoyRwVbQy3K*=OAF|N&GKT(<IP~c6=a{J@T@Y0KU^r^7^(qBzaq<e5JdCi
z)CjQGjL=QT(&Wz`a?nvp#s~?hI{=DJe0t1#6^X*IU%oI@kYn|B!+r=vdV;iBBmAnN
zc-Haa>it8lMursh<V|;tXdg3Lf_V{ui+WdWw8ya2!sZ3le;I1XJ!+&*PBw*F+joLw
z;17nyWz7pxue#DQ8D8Eb^Uhdm69@qSIX#UsULu3%1&gX*O&8=i$yVxq0406Y$m^uk
zv{YC;Y1PpaYvn}|Q!N8<FM!^O4|sz?ftEn!AJYvv*5241>o4(~I`e%f+!i-q5MCoC
zW(NZmuMLG7NxkZ*UEuM0e9Hm)4j7|*fzs>Dk=t8}*Zlr`L5{UMe(TCfhR3V{aohyS
zjAsSJ!eFu7o9aHM7POS6camBQfja=?#X3vCehb#zaA3`zR1YB8`o`9N_Y#kpw;tec
z_faGJ5mD1ZrK$C2rwp{#$)}aIgn-omjj(n8FrZ39ftqKMg)&s-H0&Ht-X><&E65&;
zh=6?%JS#ZAYHzC4NNPZ{6yC<jU4U2tV4MxiTg;-YrC2@<WabWa{*PB&YP6fxjOe7@
zotVM&C$Lx;Dv__G;zhd$%~JRptQAbO+-|}FIBc3U_gG=&vzZFH$MpM&9PMf6HQZ%}
z_QD3e!7OfUDVA@#h3yWslsN^Htp!B14#34dogw_4fU;mw)#I74yO9W_aX*lw&5_aF
zbv;4a7gm1-%vqtosaGMT-b_d;B@dcG-p2CM&aJ0P0A4#}kXRgg8^3hZv7|=hvQR;j
zoIpxd0nkn_`<B{s%v{z|T>WCQO(YH4*R=W$R#*dIl&$gO5GV}IuiTlcNhH~UC0kBQ
zwlR_`34CW9Y^DR2A*P>5(h=nx^lznEaL}4ZL=OUXI~gG&ED0VFk6vh!-1nvAH{3T$
z@aYX8_Q(5Y_<$l~cK8ThaymxGpuP30=YpVp29s?a41=*WbX5EdQtCL23qE=4R`?)1
z65!G}$tJN|fy$gZ!yJM3Hk8i;Nbg*Xv5`DMgh23!c*5yh9;&yYZTeFxa=l=>0u*P{
z$1IAIog2ctLjLOK&NW$gc^>mB04(jJvkyi{On=8OUr%%liGh~VESO@=Akfx0JDG8c
z2up*b_BCSW&#goo9jbg9aI1wG40RtU?u#3sN%|9r?g?Fd<!;QJ*>C@K06d-K`-r%h
zInFtDP?<a{eAsv~5dljGw6|fk4k&y8z=!(u_^pT%Up^muaQ%?eR?t1Hu#AYtI(V6H
z5{cV`ez|j?GQO?S%Q<Q_fQ7awDjneS7XwswJRk>kEes0U*C3}ctVV#wpVbk@5jNCy
znGm4jtCQETP*3z(G$qEHaFAQYRV`)m)IbIFE|D0aRx#tA_!tx%A{NsJb3_dcddDqB
z{y#qcRY7P%*KvlkQ>K8{&aBDmDG;trjBJ131K$(!SL+4KfGG+)Pa6WNl<hut;4Q&o
zPV-Uh8Ay!`2-@3FaXr940Prze%V**wCPP5$SPqMf{{wJ&(x5>*LxIY#3|4+Z<MIM#
zPdPKnKs^z!I#BR=LA)sFuio8X9sPoyP$&OQ3H37o6M6~}T8VKd0}uE7FGE1**Oh-x
z2zngA#KAxf_?+-ssH6EaD1EqNusXD4BafF8^D;YZ?cZS`X0#N^m-^Nb4_Znw;WB(l
zDgG(I_D-K>a81D|V^jE~`XJ*#H^|QmC=L43!5|IvoPqr<r{BE_iy!J8-#IGtZQn3b
zMNY0EhW2OMcaaW9gW=!CpY3WS4s=0N`M;7P9VqzeSQ`YiGf=~A;z2!GcpFyt#;#?G
zM4t!Hn$N^qnIAEfb`9UzBiRII#)|}A6be-DvT^MCQ-6LW=rPjvr;dW_vSak&oMofV
z<ZpR%@#5&4&Vr5?bKmy6M{>tS-vwi(9X1$8l;UrOORAsmW(oM}<tG`|;~=uz$!*Md
zV5A{x4j0L`SoK-ZXX}%$&1kL$xU7#FIV4Ej*zA|DM<v(SP`-qL`)v-C2oWCmfW-Ru
zisXCtsxuOFqx`Jks15CIGCU%#O4e61x?YaUqo^8LVhi5vAc%W|0r|Zs=q^VQZv|*1
zqLK2V(zLMgSgF+JTwKaT(A_7ww0YNe<?3K=q-R2bN*xe?R_Z=qqgRF>5sU|dqxbz!
ze=dipWP5No*wXu^2Eh8P`od74TA$4UqCNtSd<SgY%-|h4qsIL3=**?9{WY42p!Ia(
zZ7Ba`XTbS12V`woqkDw6hl;Ce`<9Oe0;%ZEOKkc5roq;A$BWmz-CtYLO=`A^NzqIq
zerkj;Hfhy6=o0)wkZ9e<2@jY5vnBAfLqA7sc)JwZZU_hN*IvE2H1((J#<sSd*-oGv
zyB{b);!|4hI(ezX1~iz-+gNcc5LJQpU7vIEU|=7C=Y#^)FZY*GpHBFIl>YR;5qmBy
z{-o1bz2O5|Q`m8f;XC!QuYrvU245C+7xXTZdpRmtAe?04=Y_JC2aDGZ7@3p>eGWO*
z(f)aPd7n{iO(nAVkhL<89u^X(3D$w;k;coIDcjE_@>$SM6r_v1S<o)vIVqY2?Sz(#
zyjjpL;5jLp1?_~Ei@d`Jw3McA3ck*4{S(_SIdK6eR+I=4us9g9jy;)(Lw{J?(FOJ8
zej#XMr>9UaG926WgRDlh!}nCDK_`R7RXQHUaT+!f?QN|1HJGn+Ou$)zU7<kL)y|4^
z<sLqu8&*Hp=aQ;qcnn;Ip_q7OOQ3pvG8GSB&_urgb4rdY6LF;T&ZSq3h`F;rmv18A
zhb?F(%x>{lJ(>uFbmYl`P6y@TtfR9M-7P_>-eK|fnGCa_v!E|*$A4C$2bgTKssp$n
zx3V%_qPs4fZG8lw>$_zy{hPC$$9n&!l)B-Bi%X|69rQSTp$b_~fhcxob(mRv(dlVg
z$4(q?L&b4`W8u6yipd`eR6UlgS)1vgeRZp@VIiKfou=K*Lfq{1g4rZMmu~}TUhFdh
zq0a0OOOsvVW-{pL?FVM=V+{Oz*Lb5B({8y)h`a6ah=~YU5}>0e0sh<ehTkK?{Gh+;
zSBW&(H&3R5){*^+J=(Q8%XVhv9Yv}z?61+|ca$81?&?6!BOtyu7T(K@2mv~HeJ?0_
z%dLY%ivj2uj4qjR>Fc<1hs<gDhxG|CT}^`R0pbbviHHePh;b8u58Ded@MP}$CvQ2r
z^ud0^<<8ZBW6+RNc&8|R-DMqsvrlRzIGlm9xdmNNzv`<bL=)I{EW~A>q5`1rqZaDc
zWKW<u2i+MEq@^bOK4wEGeV!!=sX6D!XSkVMeT}PEGDF``5WBkG9cKNLBaCMar53ok
z(laU0v7UPy<<-P$Edy6}-*TX@T}yI+Yyotr)y(^Xn;)>rZ(MaFvDiYuq~!V%o$%U;
zaE2N0g6S8gMH}>wIJkLZu0ZRC$NfZ(&iO!nP7$tP=CP!x_l`R!Jrg($Q#>6iba}N-
z?E+7MG4WbK)@M11zL0?qrTBdTdOPCDdBMqL;i=WpPT*zp_7HF_(OH&>5y*m0jFanJ
zS<tQ#CRRZfbYh%b=gNY1jWDqavY->=<T}^?1N=U7#5lUhaR2}S07*qoM6N<$f&wfX
AZvX%Q

diff --git a/images/index_seld_2.png b/images/index_seld_2.png
deleted file mode 100644
index 768c5d907de5251a45852bf7c4942fed42f21353..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3786
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
A4*&oF

diff --git a/images/map_seld.png b/images/map_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..60b9cb5e8be7a481492f6439d2383f1893e4affe
GIT binary patch
literal 8215
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
JPDHLkV1l2G5hnlu

literal 0
HcmV?d00001

diff --git a/images/map_seld_1.png b/images/map_seld_1.png
deleted file mode 100644
index 516c0ebdc53bda92b939929a643ac22b9fa18360..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6376
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

diff --git a/images/map_seld_2.png b/images/map_seld_2.png
deleted file mode 100644
index 3ce5d86242159018299f4818d87a3c42b061555e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6360
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
a^nU=H)iv?<_((ti0000<MNUMnLSTZZbudl<

diff --git a/images/user_seld.png b/images/user_seld.png
new file mode 100644
index 0000000000000000000000000000000000000000..8996d2add9c5583e5024a98706b5f30dd0a8c0da
GIT binary patch
literal 5894
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

literal 0
HcmV?d00001

diff --git a/images/user_seld_1.png b/images/user_seld_1.png
deleted file mode 100644
index 6d08c4e3a3d4aa290af0f52215c92791c32a8c86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4576
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
KMNUMnLSTZesjZ*@

diff --git a/images/user_seld_2.png b/images/user_seld_2.png
deleted file mode 100644
index 29078ccf08a0d5ba65240bed71398bc3dc3456bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4547
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

diff --git a/images/video.png b/images/video.png
deleted file mode 100755
index 95db4b21f3f54b1f25b12f25d673e934dba1570c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4544
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

diff --git a/images/videoSeld.png b/images/videoSeld.png
deleted file mode 100755
index ac80d82476b5e798adb28a0c2fca6feaad5273bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4676
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
GLSTY!&-o<)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index cd0a010..a5e5282 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -44,7 +44,7 @@
     </view>
   </view>
   <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
+    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
       {{item.title}}
     </view>
   </view>
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 9112822..d1cf870 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -24,7 +24,7 @@
     <view class="{{type==3?'types-item-active':'types-item'}}" bindtap="changeType" data-type="3">景区活动</view>
     <view class="{{type==1?'types-item-active':'types-item'}}" bindtap="changeType" data-type="1">演出</view>
     <view class="{{type==2?'types-item-active':'types-item'}}" bindtap="changeType" data-type="2">展览</view>
-    <view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4" >电影</view>
+    <view class="{{type==4?'types-item-active':'types-item'}} hidden" bindtap="changeType" data-type="4" style="display:none">电影</view>
     <view class="{{type==7?'types-item-active':'types-item'}}" bindtap="changeType" data-type="7">文化惠民</view>
     <view class="{{type==6?'types-item-active':'types-item'}}" bindtap="changeType" data-type="6">其他</view>
   </view>
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 172840c..3ecccf1 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -43,7 +43,7 @@
     <view class="btn" wx:if="{{item.order_product_list.length==1}}" catchtap="order" data-item="{{item}}">再次购买</view>
     <!-- <view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view> -->
     <view catchtap="cancel" data-index="{{index}}" class="btn" wx:if="{{item.state=='UNPAID'}}">取消预订</view>
-    <view catchtap="refund" data-index="{{index}}" class="btn" wx:if="{{item.state=='PAID'}}">取消预订</view>
+    <view catchtap="refund" data-index="{{index}}" class="btn" wx:if="{{item.state=='PAID' && item.order_product_list[0].product_model!='movie'}}">取消预订</view>
     <view catchtap="refundInfo" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_REFUND' || item.state=='REFUND' || item.state=='NEED_REFUND' || item.state=='REFUNDING'}}">退款详情</view>
     <view catchtap="pay" data-id="{{item.order_id}}" class="btn active" wx:if="{{item.state=='UNPAID'}}">立即支付</view>
   </view>
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index b2abe77..810f99b 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -57,7 +57,7 @@
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
     <!-- <navigator url="/pages/list/movieticket/index" class="btn">再次购买</navigator> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
-    <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
+    <view class="btn" wx:if="{{info.state=='PAID' && info.order_product_list[0].product_model!='movie'}}" bindtap="refund">取消订单</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
     <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
     <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
@@ -171,7 +171,7 @@
     <view class="iconfont icon-close" bindtap="showKeFu"></view>
     <view>如有问题</view>
     <view>请联系{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}客服</view>
-    <view style="font-size: 40rpx;color: #0B898E;padding: 41rpx 0;">{{info.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '4006979968'}}</view>
+    <view style="font-size: 40rpx;color: #0B898E;padding: 41rpx 0;">{{info.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '0512-4006979968'}}</view>
     <view style="font-weight: 500;font-size: 26rpx;color: #000000;padding-bottom: 40rpx;">服务时间（9:00-21:00）</view>
   </view>
 </view>
\ No newline at end of file

From cf3b57dbe03feec5d25dd3ee633d5e1111f9bf59 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 3 Jun 2025 14:07:29 +0800
Subject: [PATCH 330/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                       |  550 ++++++-------
 pages/index/imgSource.js       |  104 +--
 pages/index/index.js           | 1383 +++++++++++++++++--------------
 pages/index/index.wxml         |  653 ++++++---------
 pages/index/index.wxss         | 1402 +++++++++-----------------------
 subPackages/index/index.js     |    4 +-
 subPackages/indexGQ/index.js   | 1196 +++++++++------------------
 subPackages/indexGQ/index.wxml |  215 ++---
 subPackages/indexGQ/index.wxss |  122 +--
 utils/https.js                 |    4 +-
 10 files changed, 2249 insertions(+), 3384 deletions(-)

diff --git a/app.json b/app.json
index cc141f1..a23c41d 100644
--- a/app.json
+++ b/app.json
@@ -1,277 +1,283 @@
 {
-  "pages": [
-    "pages/index/index",
-    "pages/map/index",
-    "pages/pbService/aiHelpYou/index",
-    "pages/search/index",
-    "pages/search/list/index",
-    "pages/login/index",
-    "pages/old/index",
-    "pages/old/user/index",
-    "pages/old/profile/index",
-    "pages/old/nickname/index",
-    "pages/old/linkman/index",
-    "pages/old/linkman/add/index",
-    "pages/order/comment/index",
-    "pages/order/coupon/index",
-    "pages/order/pay/index",
-    "pages/order/payresult/index",
-    "pages/order/showSeat/index",
-    "pages/order/show/index",
-    "pages/order/road/index",
-    "pages/order/roadOrder/index",
-    "pages/order/movie/index",
-    "pages/order/food/index",
-    "pages/order/scene/index",
-    "pages/order/sceneCart/index",
-    "pages/order/hotel/index",
-    "pages/order/card/index",
-    "pages/order/joinOrder/index",
-    "pages/order/joinOrder/success/index",
-    "pages/order/joinOrder/history/index",
-    "pages/order/postOrder/index",
-    "pages/order/showOrder/index",
-    "pages/info/newsInfo/index",
-    "pages/info/hotelProductInfo/index",
-    "pages/info/museumInfo/index",
-    "pages/info/sceneProductInfo/index",
-    "pages/info/sceneProductInfoNew/index",
-    "pages/info/foodInfo/index",
-    "pages/info/roadInfo/index",
-    "pages/info/cardInfo/index",
-    "pages/info/foodProductInfo/index",
-    "pages/info/postProductInfo/index",
-    "pages/info/sceneInfo/index",
-    "pages/info/hotelInfo/index",
-    "pages/info/activityInfo/index",
-    "pages/info/showInfo/index",
-    "pages/info/strategyInfo/index",
-    "pages/info/guideInfo/index",
-    "pages/info/groupOrderInfo/index",
-    "pages/info/culturalUnitInfo/index",
-    "pages/info/redmapInfo/index",
-    "pages/user/user",
-    "pages/user/retail/index",
-    "pages/user/retail/apply/index",
-    "pages/user/retail/goods/index",
-    "pages/user/retail/list/index",
-    "pages/user/retail/order/index",
-    "pages/user/coupon/index",
-    "pages/user/videoCoupon/index",
-    "pages/user/verify/index",
-    "pages/user/cartlist/list",
-    "pages/user/couponCenter/index",
-    "pages/user/order/list",
-    "pages/user/order/team/list",
-    "pages/user/order/sceneOrderInfo/index",
-    "pages/user/order/foodOrderInfo/index",
-    "pages/user/order/lineOrderInfo/index",
-    "pages/user/order/couponOrderInfo/index",
-    "pages/user/order/hotelOrderInfo/index",
-    "pages/user/order/postOrderInfo/index",
-    "pages/user/order/expressInfo/index",
-    "pages/user/order/movieOrderInfo/index",
-    "pages/user/order/activityOrderInfo/index",
-    "pages/user/order/museumOrderInfo/index",
-    "pages/user/order/refundInfo/index",
-    "pages/user/service/index",
-    "pages/user/service/list/index",
-    "pages/user/service/info/index",
-    "pages/user/address/index",
-    "pages/user/profile/index",
-    "pages/user/bindtel/index",
-    "pages/user/nickname/index",
-    "pages/user/likes/index",
-    "pages/user/email/index",
-    "pages/supplier/index",
-    "pages/supplier/apply/index",
-    "pages/supplier/good/index",
-    "pages/list/mayday/index",
-    "pages/list/feiyi/index",
-    "pages/list/haoxing/index",
-    "pages/list/culturalUnit/index",
-    "pages/list/food/index",
-    "pages/list/techan/index",
-    "pages/list/museum/index",
-    "pages/list/store/index",
-    "pages/list/activity/index",
-    "pages/list/activitynew/index",
-    "pages/list/road/index",
-    "pages/list/hotel/index",
-    "pages/list/strategy/index",
-    "pages/list/night/index",
-    "pages/list/sale/index",
-    "pages/list/movieticket/index",
-    "pages/list/movieticket/list/seats/index",
-    "pages/list/movieticket/list/cinema/index",
-    "pages/list/movieticket/list/ticket/index",
-    "pages/list/movieticket/list/web/index",
-    "pages/list/movieticket/list/info/index",
-    "pages/list/theatre/index",
-    "pages/list/card/index",
-    "pages/list/six/index",
-    "pages/list/scene/index",
-    "pages/list/comments/index",
-    "pages/list/message/index",
-    "pages/list/minitrip/index",
-    "pages/list/oneday/index",
-    "pages/list/daysu/index",
-    "pages/list/daysu/detail/index",
-    "pages/pbService/index",
-    "pages/pbService/activity/index",
-    "pages/pbService/museum/index",
-    "pages/pbService/museum/info/index",
-    "pages/pbService/PRpark/index",
-    "pages/pbService/sceneComfort/index",
-    "pages/pbService/gym/index",
-    "pages/pbService/gym/info/index",
-    "pages/pbService/bus/index",
-    "pages/pbService/bus/search/index",
-    "pages/pbService/bus/lineinfo/index",
-    "pages/pbService/security/index",
-    "pages/pbService/web/index",
-    "pages/pbService/feiyi/index",
-    "pages/pbService/bike/index",
-    "pages/pbService/feiyi/info/index",
-    "pages/pbService/appreciate/index",
-    "pages/pbService/appreciate/info/index",
-    "pages/pbService/library/index",
-    "pages/pbService/library/bookinfo/index",
-    "pages/pbService/library/getpoint/index",
-    "pages/pbService/library/mybook/index",
-    "pages/pbService/wbdw/index",
-    "pages/pbService/wbdw/info/index",
-    "pages/pbService/wwcx/index",
-    "pages/pbService/wwcx/info/index",
-    "pages/pbService/wwcx/search/index",
-    "pages/pbService/group/index",
-    "pages/ask/index",
-    "pages/ask/info/index",
-    "pages/ask/my/index",
-    "pages/activity/graduate/index",
-    "pages/activity/year2020/index",
-    "pages/activity/suyear/index",
-    "pages/activity/spring2021/index",
-    "pages/activity/springten/list/index",
-    "pages/activity/autumnten/list/index",
-    "pages/activity/springten/index",
-    "pages/activity/autumnten/index",
-    "pages/activity/newarrival/index",
-    "pages/activity/artfestival/index",
-    "pages/activity/redlist/index",
-    "pages/activity/subway/index",
-    "pages/activity/tenscenic/index",
-    "pages/activity/huawei/index",
-    "pages/activity/huawei/form/index",
-    "pages/activity/huawei/result/index",
-    "pages/activity/huawei/upload/index",
-    "pages/activity/huawei/uploadres/index",
-    "pages/activity/huawei/list/index",
-    "pages/kj/index",
-    "pages/kj/his/index",
-    "pages/kj/info/index",
-    "pages/kj/mine/index",
-    "pages/group/index",
-    "pages/group/apply/index",
-    "pages/group/mine/index",
-    "pages/group/info/index",
-    "pages/culture/index",
-    "pages/culture/info/index",
-    "pages/user/logout/index",
-    "pages/order/orderList/index",
-    "pages/user/linkman/add/index",
-    "pages/user/address/add/index",
-    "pages/user/linkman/index",
-    "pages/user/userPrivacy/index",
-    "pages/user/personalInfo/index",
-    "pages/info/luggageInfo/index",
-    "pages/order/WineSceneOrder/index",
-    "pages/order/showOrderNew/index",
-    "pages/user/order/showOrderInfo/index",
-    "pages/user/suggest/suggest"
-  ],
-  "subpackages": [
-    {
-      "root": "subPackages",
-      "pages": [
-        "indexs/index",
-        "index/index",
-        "techanNew/index",
-        "techanCart/index",
-        "feiyiNew/index",
-        "postSearch/index",
-        "gwcOrder/index",
-        "indexGQ/index",
-        "transferPage/transferPage",
-        "password/overview/overview",
-        "password/setting/setting",
-        "goods/oneCardTour/info/index",
-        "feiyiNew/CGCIndex/index",
-        "feiyiNew/CGCLetter/index",
-        "feiyiNew/CGCTime/index"
-      ]
-    },
-    {
-      "root": "subPackageCheckPoint",
-      "pages": [
-        "pages/index/index",
-        "pages/scopemap/index",
-        "pages/detailsmap/index",
-        "pages/content/index",
-        "pages/web/index"
-      ]
-    }
-  ],
-  "plugins": {
-    "live-player-plugin": {
-      "version": "1.3.5",
-      "provider": "wx2b03c6e691cd7370"
-    }
-  },
-  "requiredPrivateInfos": [
-    "getLocation",
-    "choosePoi",
-    "chooseAddress"
-  ],
-  "permission": {
-    "scope.userLocation": {
-      "desc": "你的位置信息将用于小程序位置接口的效果展示"
-    }
-  },
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "君到苏州（文化旅游总入口）",
-    "navigationBarTextStyle": "black",
-    "navigationStyle": "custom"
-  },
-  "lazyCodeLoading": "requiredComponents",
-  "style": "v2",
-  "sitemapLocation": "sitemap.json",
-  "tabBar": {
-    "color": "#999999",
-    "selectedColor": "#D22A1C",
-    "borderStyle": "white",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "/images/index.png",
-        "selectedIconPath": "/images/aindex_seld.png",
-        "text": "首页",
-        "shareTimeline": true
-      },
+    "pages": [
+      "pages/index/index",
+      "pages/map/index",
+      "pages/pbService/aiHelpYou/index",
+      "pages/search/index",
+      "pages/search/list/index",
+      "pages/login/index",
+      "pages/old/index",
+      "pages/old/user/index",
+      "pages/old/profile/index",
+      "pages/old/nickname/index",
+      "pages/old/linkman/index",
+      "pages/old/linkman/add/index",
+      "pages/order/comment/index",
+      "pages/order/coupon/index",
+      "pages/order/pay/index",
+      "pages/order/payresult/index",
+      "pages/order/showSeat/index",
+      "pages/order/show/index",
+      "pages/order/road/index",
+      "pages/order/roadOrder/index",
+      "pages/order/movie/index",
+      "pages/order/food/index",
+      "pages/order/scene/index",
+      "pages/order/sceneCart/index",
+      "pages/order/hotel/index",
+      "pages/order/card/index",
+      "pages/order/joinOrder/index",
+      "pages/order/joinOrder/success/index",
+      "pages/order/joinOrder/history/index",
+      "pages/order/postOrder/index",
+      "pages/order/showOrder/index",
+      "pages/info/newsInfo/index",
+      "pages/info/hotelProductInfo/index",
+      "pages/info/museumInfo/index",
+      "pages/info/sceneProductInfo/index",
+      "pages/info/sceneProductInfoNew/index",
+      "pages/info/foodInfo/index",
+      "pages/info/roadInfo/index",
+      "pages/info/cardInfo/index",
+      "pages/info/foodProductInfo/index",
+      "pages/info/postProductInfo/index",
+      "pages/info/sceneInfo/index",
+      "pages/info/hotelInfo/index",
+      "pages/info/activityInfo/index",
+      "pages/info/showInfo/index",
+      "pages/info/strategyInfo/index",
+      "pages/info/guideInfo/index",
+      "pages/info/groupOrderInfo/index",
+      "pages/info/culturalUnitInfo/index",
+      "pages/info/redmapInfo/index",
+      "pages/user/user",
+      "pages/user/retail/index",
+      "pages/user/retail/apply/index",
+      "pages/user/retail/goods/index",
+      "pages/user/retail/list/index",
+      "pages/user/retail/order/index",
+      "pages/user/coupon/index",
+      "pages/user/videoCoupon/index",
+      "pages/user/verify/index",
+      "pages/user/cartlist/list",
+      "pages/user/couponCenter/index",
+      "pages/user/order/list",
+      "pages/user/order/team/list",
+      "pages/user/order/sceneOrderInfo/index",
+      "pages/user/order/foodOrderInfo/index",
+      "pages/user/order/lineOrderInfo/index",
+      "pages/user/order/couponOrderInfo/index",
+      "pages/user/order/hotelOrderInfo/index",
+      "pages/user/order/postOrderInfo/index",
+      "pages/user/order/expressInfo/index",
+      "pages/user/order/movieOrderInfo/index",
+      "pages/user/order/activityOrderInfo/index",
+      "pages/user/order/museumOrderInfo/index",
+      "pages/user/order/refundInfo/index",
+      "pages/user/service/index",
+      "pages/user/service/list/index",
+      "pages/user/service/info/index",
+      "pages/user/address/index",
+      "pages/user/profile/index",
+      "pages/user/bindtel/index",
+      "pages/user/nickname/index",
+      "pages/user/likes/index",
+      "pages/user/email/index",
+      "pages/supplier/index",
+      "pages/supplier/apply/index",
+      "pages/supplier/good/index",
+      "pages/list/mayday/index",
+      "pages/list/feiyi/index",
+      "pages/list/haoxing/index",
+      "pages/list/culturalUnit/index",
+      "pages/list/food/index",
+      "pages/list/techan/index",
+      "pages/list/museum/index",
+      "pages/list/store/index",
+      "pages/list/activity/index",
+      "pages/list/activitynew/index",
+      "pages/list/road/index",
+      "pages/list/hotel/index",
+      "pages/list/strategy/index",
+      "pages/list/night/index",
+      "pages/list/sale/index",
+      "pages/list/movieticket/index",
+      "pages/list/movieticket/list/seats/index",
+      "pages/list/movieticket/list/cinema/index",
+      "pages/list/movieticket/list/ticket/index",
+      "pages/list/movieticket/list/web/index",
+      "pages/list/movieticket/list/info/index",
+      "pages/list/theatre/index",
+      "pages/list/card/index",
+      "pages/list/six/index",
+      "pages/list/scene/index",
+      "pages/list/comments/index",
+      "pages/list/message/index",
+      "pages/list/minitrip/index",
+      "pages/list/oneday/index",
+      "pages/list/daysu/index",
+      "pages/list/daysu/detail/index",
+      "pages/pbService/index",
+      "pages/pbService/activity/index",
+      "pages/pbService/museum/index",
+      "pages/pbService/museum/info/index",
+      "pages/pbService/PRpark/index",
+      "pages/pbService/sceneComfort/index",
+      "pages/pbService/gym/index",
+      "pages/pbService/gym/info/index",
+      "pages/pbService/bus/index",
+      "pages/pbService/bus/search/index",
+      "pages/pbService/bus/lineinfo/index",
+      "pages/pbService/security/index",
+      "pages/pbService/web/index",
+      "pages/pbService/feiyi/index",
+      "pages/pbService/bike/index",
+      "pages/pbService/feiyi/info/index",
+      "pages/pbService/appreciate/index",
+      "pages/pbService/appreciate/info/index",
+      "pages/pbService/library/index",
+      "pages/pbService/library/bookinfo/index",
+      "pages/pbService/library/getpoint/index",
+      "pages/pbService/library/mybook/index",
+      "pages/pbService/wbdw/index",
+      "pages/pbService/wbdw/info/index",
+      "pages/pbService/wwcx/index",
+      "pages/pbService/wwcx/info/index",
+      "pages/pbService/wwcx/search/index",
+      "pages/pbService/group/index",
+      "pages/ask/index",
+      "pages/ask/info/index",
+      "pages/ask/my/index",
+      "pages/activity/graduate/index",
+      "pages/activity/year2020/index",
+      "pages/activity/suyear/index",
+      "pages/activity/spring2021/index",
+      "pages/activity/springten/list/index",
+      "pages/activity/autumnten/list/index",
+      "pages/activity/springten/index",
+      "pages/activity/autumnten/index",
+      "pages/activity/newarrival/index",
+      "pages/activity/artfestival/index",
+      "pages/activity/redlist/index",
+      "pages/activity/subway/index",
+      "pages/activity/tenscenic/index",
+      "pages/activity/huawei/index",
+      "pages/activity/huawei/form/index",
+      "pages/activity/huawei/result/index",
+      "pages/activity/huawei/upload/index",
+      "pages/activity/huawei/uploadres/index",
+      "pages/activity/huawei/list/index",
+      "pages/kj/index",
+      "pages/kj/his/index",
+      "pages/kj/info/index",
+      "pages/kj/mine/index",
+      "pages/group/index",
+      "pages/group/apply/index",
+      "pages/group/mine/index",
+      "pages/group/info/index",
+      "pages/culture/index",
+      "pages/culture/info/index",
+      "pages/user/logout/index",
+      "pages/order/orderList/index",
+      "pages/user/linkman/add/index",
+      "pages/user/address/add/index",
+      "pages/user/linkman/index",
+      "pages/user/userPrivacy/index",
+      "pages/user/personalInfo/index",
+      "pages/info/luggageInfo/index",
+      "pages/order/WineSceneOrder/index",
+      "pages/order/showOrderNew/index",
+      "pages/user/order/showOrderInfo/index",
+      "pages/user/suggest/suggest"
+    ],
+    "subpackages": [
       {
-        "pagePath": "pages/map/index",
-        "iconPath": "/images/map.png",
-        "selectedIconPath": "/images/amap_seld.png",
-        "text": "图游"
+        "root": "subPackages",
+        "pages": [
+          "indexs/index",
+          "index/index",
+          "techanNew/index",
+          "techanCart/index",
+          "feiyiNew/index",
+          "postSearch/index",
+          "gwcOrder/index",
+          "indexGQ/index",
+          "transferPage/transferPage",
+          "password/overview/overview",
+          "password/setting/setting",
+          "goods/oneCardTour/info/index",
+          "feiyiNew/CGCIndex/index",
+          "feiyiNew/CGCLetter/index",
+          "feiyiNew/CGCTime/index"
+        ]
       },
       {
-        "pagePath": "pages/user/user",
-        "iconPath": "/images/user.png",
-        "selectedIconPath": "/images/auser_seld.png",
-        "text": "我的"
+        "root": "subPackageCheckPoint",
+        "pages": [
+          "pages/index/index",
+          "pages/scopemap/index",
+          "pages/detailsmap/index",
+          "pages/content/index",
+          "pages/web/index"
+        ]
       }
-    ]
-  }
-}
\ No newline at end of file
+    ],
+    "plugins": {
+      "live-player-plugin": {
+        "version": "1.3.5",
+        "provider": "wx2b03c6e691cd7370"
+      }
+    },
+    "requiredPrivateInfos": [
+      "getLocation",
+      "choosePoi",
+      "chooseAddress"
+    ],
+    "permission": {
+      "scope.userLocation": {
+        "desc": "你的位置信息将用于小程序位置接口的效果展示"
+      }
+    },
+    "window": {
+      "backgroundTextStyle": "light",
+      "navigationBarBackgroundColor": "#fff",
+      "navigationBarTitleText": "君到苏州（文化旅游总入口）",
+      "navigationBarTextStyle": "black",
+      "navigationStyle": "custom"
+    },
+    "lazyCodeLoading": "requiredComponents",
+    "style": "v2",
+    "sitemapLocation": "sitemap.json",
+    "tabBar": {
+      "color": "#999999",
+      "selectedColor": "#22A3CD",
+      "borderStyle": "white",
+      "list": [
+        {
+          "pagePath": "pages/index/index",
+          "iconPath": "/images/index.png",
+          "selectedIconPath": "/images/index_seld.png",
+          "text": "首页",
+          "shareTimeline": true
+        },
+        {
+          "pagePath": "pages/pbService/aiHelpYou/index",
+          "iconPath": "/images/ai.png",
+          "selectedIconPath": "/images/ai_seld.png",
+          "text": "AI"
+        },
+        {
+          "pagePath": "pages/map/index",
+          "iconPath": "/images/map.png",
+          "selectedIconPath": "/images/map_seld.png",
+          "text": "图游"
+        },
+        {
+          "pagePath": "pages/user/user",
+          "iconPath": "/images/user.png",
+          "selectedIconPath": "/images/user_seld.png",
+          "text": "我的"
+        }
+      ]
+    }
+  }
\ No newline at end of file
diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js
index 588f666..871e3de 100644
--- a/pages/index/imgSource.js
+++ b/pages/index/imgSource.js
@@ -1,109 +1,37 @@
 const imageSource = {
-    // 活动日历、场馆预约等
-    mainFunImgs: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/9a472382adcb3793e6c61ad3ea2fbb05.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ba19e78aaa629e3ece995d599526d08c.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9fc20afb60e1e647b511d9973e96bd4b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7030de3a317567442f5141d833e5f752.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/fb7ce8cc732bb34bf881dd7129f1e708.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1faaa62c2d0bd9b912950e742347b0b6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/661fcc7e02d2c5d734a43d5dbbe79363.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f0e901bc9ab4c988295e4a2f88cb3ffe.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/ebb4be1738d227f6deb3f895db663eed.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1c847b7edcee6fec2928da4280ef19ca.png",
-    ],
-    // 数字文旅
-    SZWL: [
-        // 非遗，博物馆，名人馆，云上，云上文博，精彩回顾，文化场馆
-        // 苏影通 书仓 e读书 数字公共文化 云游苏州  美图鉴赏
-        "https://static.ticket.sz-trip.com/uploads/20241225/70e78a734c5f1ec7f9461c071ce05a6b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/a4a7e0487b417c5ed2140d5e2341da43.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f7a2d28af1be501b0c104e8f831f3c36.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/003cb24afb80aeef891d73bfeeab4359.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20241225/8f4ab6d79b0b2851cd4f7ceff92155f6.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/845592de452a60ad5d9a51cb8cf73d99.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/71e21d53580b8c1dcd1ec6b8f2c1f959.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd691cdd5cf61f4172a9ee179bab8bc2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/eae7eed9a19bc1f0c5296da5c3a8c6e2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73ce0d4057cca77dbcaaa6b858d84e33.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1efa141c778d55b471ad950fa886119b.png",
-        
-        "https://static.ticket.sz-trip.com/uploads/20241225/02be10405480f0139b75fe355f9a8df8.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2d7514ce60a3843ae04b98660ed2d622.png",
-
-    ],
-    // 旅游助手
-    LVZS: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/73567ffad3e927a0ce5a5dab8c13963e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/96d36ec8e1794d9873ba0687beed9288.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/973b2cc8b0614b28400b6cc04c3c8495.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/200277a64244c067e260da28511a6420.png",
-    ],
-    // 公共服务
-    GGFW: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/dd917bfef53fa2fd54d733dad8e435b5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d9551507d901dff803b0f06ab545c74f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/c44aadc6e054f3a2ac9cfcefdad048ea.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/826c8084cde314a4f8b46e91bcd77acc.png",
-    ],
-    
-    // 十全十美
-    SQSM: [
-        // ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
-        "https://static.ticket.sz-trip.com/uploads/20241225/1a963a3b3a6cf9a4dca822cce6574e3f.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/21fba8904ce6ae5fe7d6a64a2794d93b.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/98b19eb35e6621818b1ba78def011778.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/24f59b0e143a249fec891b2ef22800ef.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/73f11fcdf9e7a3236815a5935ab70253.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/f48f42f53e2a53f0b978684bcbd1b8c5.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/de5ae5de54a255a72f404d688c2ceb3e.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/9be62fc5347411ada17ec9f4b3ea8c28.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/2fcea197a5d9ac98d29cb194d9ab45db.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/d4d91992a844af511498af07e39cab45.png",
-
-    ],
-
-    // 长三角文旅平台
-    CSJWLPT: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/ef61d89d6d0f5ca84f56917920a162f2.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/8368833b47ccfe9bc34a395eea74efb4.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7cc0f4a931bb969f7a063ea6e00325e6.png",
-    ],
 
     // 导航标题侧边图片
     CBTP: [
-        "https://static.ticket.sz-trip.com/uploads/20241225/4e4d8c6b8fad6afb7fd3fc2e04dd3fda.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/caeb000298ff47c053574a60f87ced6e.png",
-        "https://static.ticket.sz-trip.com/uploads/20240428/6955225b950d5bbe5168f5d9994a6098.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/1d9433deead99749beacc38be93a79a0.png",
-        "https://static.ticket.sz-trip.com/uploads/20241225/7df57b4bd1bb784e6c085c89e9ef883a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/5d051d37148757eb5daa6e51439e711a.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/d47ce5d4f2a780f46192afeb715d873d.png",
+        "",
+        "https://static.ticket.sz-trip.com/uploads/20250314/03413a9bd8a0b7a99141903e04cbc05f.png",
+        "https://static.ticket.sz-trip.com/uploads/20250314/1075c176fb20563a48945fce020db57f.png",
     ],
 
     // 其他后台配置的图片，开发时使用
     testImgs: {
         indexSeason : {
-             // 头图
-             topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
+            // 头图
+            topBac: "https://static.ticket.sz-trip.com/uploads/20241225/f039e6b753c4c7fbd3ba78aa89f0b0fe.png",
             // ai伴你游
-            ai: "https://static.ticket.sz-trip.com/uploads/20241225/164406bfa707e66e6aa5d2e2dd5364d1.png",
+            ai: "https://static.ticket.sz-trip.com/uploads/20250314/3fb020cf3471d3731b4a7efae25e8e64.png",
             // ai避高峰
-            avoid: "https://static.ticket.sz-trip.com/uploads/20241225/2f7600e95027686eb71ac499abfe14cc.png",
+            avoid: "https://static.ticket.sz-trip.com/uploads/20250314/8c0f1c421b1de36265948d52c249dc57.png",
             // 新品特惠
-            xpth: "https://static.ticket.sz-trip.com/uploads/20241225/4df3cd8bda55d743d597706efa5fd50a.png",
+            xpth: "https://static.ticket.sz-trip.com/uploads/20250314/349596880742665ac7249b5f4218263f.png",
             // 文旅鉴赏
-            wlcx: "https://static.ticket.sz-trip.com/uploads/20241225/6cee0a7fce7873444824bc56dc452085.png",
+            wlcx: "https://static.ticket.sz-trip.com/uploads/20250314/073759b9fcd3e217de9ecea774451364.png",
             // 出行助手
-            lyzs: "https://static.ticket.sz-trip.com/uploads/20241225/6b3ed3f6533470b45bffe44447ed8f86.png",
+            lyzs: "https://static.ticket.sz-trip.com/uploads/20250314/7f5d199286e62ba6c9d43fdfd6f55de3.png",
             // 公共服务
-            ggfw: "https://static.ticket.sz-trip.com/uploads/20241225/6a9d7e1d968961cbe1aaf9bef994518a.png",
+            ggfw: "https://static.ticket.sz-trip.com/uploads/20250314/271ffedb33dcfacf170ff78c1425f9cf.png",
             // 十全十美
-            sqj: "https://static.ticket.sz-trip.com/uploads/20241225/c7ce89fec139ff7a530a5d68ef2f56c8.png",
+            sqj: "https://static.ticket.sz-trip.com/uploads/20250314/edceba87f00e37ef50cf6a9fafb8a29f.png",
             // 长三角文旅平台
-            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20241225/a38194b30ce9a956aa9701a65dc68aea.png",
+            csjwlpt: "https://static.ticket.sz-trip.com/uploads/20250314/c88a44d385e0bf36370475ace8e5669e.png",
             // 热门推荐
-            rmtj: "https://static.ticket.sz-trip.com/uploads/20241225/b31bfd4ff8cca2071928a1edeab4e818.png",
+            rmtj: "https://static.ticket.sz-trip.com/uploads/20250314/dcc02bb22b721e281037cecf22e74728.png",
             
         }
     },
diff --git a/pages/index/index.js b/pages/index/index.js
index 940c872..e70b0ff 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,647 +1,556 @@
 //index.js
 //获取应用实例
 let app = getApp()
+import imageSource from "./imgSource"
+
 import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
+import https from "../../utils/https.js"
+
 Page({
 	data: {
-        fullAdvTimer: null,  // 全屏timer
-		banner: [],
-		xiaobanner: [],
-		height: 0,
-		padHeight: 0,
-		right: 0,
-		weather: null,
-
-		month: "",
-		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
-		date: "",
-		list: [],
-		listMore: true,
 		isTest: false,
-		lat: "",
-		lon: "",
-		urltopage: {},
-		scrollLeft: 0,
-		videoPrize: false,
-		prizeInfo: null,
-		otherPlat: null,
-		activeBannerIndex: 5,
-		smBannerIndex: 0,
-		indexSeason: {},
-		// startList: [], // 启动页广告
-		startList: {
-			head_img: ''
-		}, // 启动页广告
-		alertSwipeList: [], //弹窗广告
-		showAdv: false, //弹窗开关
-		showFullAdv: true, //全屏广告开关
-		opacity: 1,
-		time: 3, //全屏广告剩余时间
-		showTime: false,
 
-		viewHeight: "0px",
+        startList: {head_img: ''}, // 启动页广告
+        fullAdvTimer: null,  // 全屏timer
+        showFullAdv: true, //全屏广告开关
+        opacity: 1, // 全屏广告透明度
+        time: 3, //全屏广告剩余时间
+        showTime: false, // 全屏广告时间展示
+        alertSwipeList: [], //弹窗广告
+		showAdv: false, //弹窗开关
 		isMuted: true,
         videoPlay: false,
-        hdrlNavList:[
-        {
-            type:null,
-            title:'全部'
-        },
-        {
-            type:'scene',
-            title:'景区活动'
-        },
-        {
-            type:'show',
-            title:'演出'
-        },
-        {
-            type:'exhibition',
-            title:'展览'
-        },
-        {
-            type:'movie',
-            title:'电影'
+
+        systemStyle: {
+			height: 0,
+			padHeight: 0,
+			right: 0,
         },
-        {
-            type:'other',
-            title:'其他'
-        }
-        ], //活动日历板块导航分类
-        hdrlNavIndex:0,//活动日历默认选中第一个全部分类
-        today:null,
-        hdrlList:[],
-        yszNav:['公共服务','旅游助手'],
-        yszIndex:0,
-        bdList:[
+        lat: "",
+        lon: "",
+        
+		indexSeason: {},  // 后台UI配置项
+        
+        // bannerInterver: 5*1000,  // 动态更改banner时间
+		banner: [],
+		xiaobanner: [],
+		activeBannerIndex: 0,
+        smBannerIndex: 0,
+		
+		// banner上的金刚区
+		bannerDataList: [
+			// {
+			// 	title: "景点门票",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/5934b8b77b058ce1de5943adbaf51739.png",
+			// 	path: "/pages/list/scene/index",
+			// },
+			// {
+			// 	title: "活动日历",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/d75d7a3924d832912a2633ee29b30b9b.png",
+			// 	path: "/pages/list/activitynew/index",
+			// },
+			// {
+			// 	title: "匠意臻品",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/69722050b638954e0b755a4d6c771d48.png",
+			// 	path: "/subPackages/techanNew/index",
+			// },
+			// {
+			// 	title: "领券中心",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/4384a93f77d8faba5f504195c77e57c1.png",
+			// 	path: "/pages/list/scene/index",
+			// },
+		],
+		// 金刚区
+		mainTypeList: [
+			// {
+			// 	title: "非遗专卖",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: "/subPackages/feiyiNew/index",
+			// },
+			// {
+			// 	title: "场馆预约",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: "/pages/list/museum/index",
+			// },
+			// {
+			// 	title: "一日游",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl:"https://m.cloud.sz-trip.com/OneDayTravelNew",
+			// },
+			// {
+			// 	title: "户外游",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl:"https://m.cloud.sz-trip.com/LearningTravel",
+			// },
+			// {
+			// 	title: "电影购票",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl:"https://m.cloud.sz-trip.com/movies",
+			// },
+			// {
+            //     type: 'hotel', // 特殊标识方便查找 更新weburl
+			// 	title: "酒店住宿",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	weburl: '',
+			// 	path: '/pages/list/hotel/index'
+			// },
+			// {
+			// 	title: "水上游",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: '/pages/list/night/index'
+			// },
+			// {
+			// 	title: "剧场演出",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a901ad572bda409e769f92760b812d71.png",
+			// 	path: '/pages/list/theatre/index'
+			// },
+        ],
+        mainTypeLeft: 0,
+
+		xpth: {}, // 新品特惠
+        XPathBannerIndex: 0,
+        xpthIndex: 0,
+        list: [], // 热门推荐
+
+		// 公共服务
+		publicSerivce: [
+			{
+				title: "高峰预警",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/c7e28d88bde040c386183d69ae9bb228.png",
+				path: "/pages/pbService/sceneComfort/index?title=高峰预警",
+				eventName: "comfort_click",
+			},
+			{
+				title: "实时路况",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a678fdc2127648cd7881e36791b2062a.png",
+				weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/",
+				eventName: "sslk",
+			},
+			{
+				title: "行李直送",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/66c8614112630ed168a27150f15a3234.png",
+				appId: 'wx757dd1ee184e75e9',
+          		pagePath: "pages/tabBar/index/index"
+			},
+			{
+				title: "行李寄存",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/3b9886609236df983e6512055662693c.png",
+				weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/",
+				eventName: "xljc",
+			},
+			{
+				title: "找厕所",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/e8e75d8cd8761d4de4336a35e29e5c6d.png",
+				path: "/pages/pbService/bike/index?type=1",
+			},
+			{
+				title: "停车场",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/ef3d9cfb4817552288d666d8e5617707.png",
+				weburl: "https://m.cloud.sz-trip.com/ParkingArea",
+			},
+			
+        ], 
+        
+        // 旅游助手
+        travelData: [
             {
-                color: '#FFE4BC',
-                bg: 'linear-gradient(172deg, #F08528, #D1201B);',
-                icon:'https://static.ticket.sz-trip.com/uploads/20250429/069ab247bb2ab5a08fa7707d671b1ac5.png', //游 景点
-                url:'',
-                path:'/pages/list/scene/index',
-                list: [],
-                
+				title: "最美打卡点",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/800a30b94f77c1f7f1bc17f33c0daacd.png",
+				path: "/subPackageCheckPoint/pages/index/index",
+			},
+			{
+				title: "街巷美食",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/a4918bd24ff162991ca8db28759ade51.png",
+				path: "/pages/list/food/index",
+			},
+			{
+				title: "语音导览",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/f72a9f174aa66e520cbfe7429dca6635.png",
+				appId: "wx74f380bc721a0379",
+				pagePath: "/pages/listen/listen?title=君到苏州"
+			},
+			{
+				title: "游记攻略",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/e1762ba22ba5d4cc5882de321bc10110.png",
+				path: "/pages/list/strategy/index",
+			},
+        ],
+
+		// 数字文旅
+		travelCulture: [
+			{
+				title: "数字非遗",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/bc747aa7767770dc26e663480ac9150d.png',
+				weburl: "https://m.cloud.sz-trip.com/IntangibleCultural2",
+			},
+			{
+				title: "数字博物馆",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/86c986c2991e968ee143cf5777bb9f08.png',
+				weburl: "https://m.cloud.sz-trip.com/BwsInfo",
+			},
+			{
+				title: "数字名人馆",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/d570a1bb6961b9ddf26b17cc64b733dd.png',
+				weburl: "https://www.szsmrg.com/home",
+			},
+			{
+				title: "云上观展",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/8f96c29f6199b811a757e4e5c5901daa.png',
+				weburl: "https://m.cloud.sz-trip.com/CloudPerform2022",
+			},
+			{
+				title: "云上文博会",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/f45acb752680d1b4cce7d25da02c96f5.png',
+				weburl: "https://m.cloud.sz-trip.com/CloudExpo",
+			},
+			{
+				title: "精彩回顾",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/74bd8e6b027797a24fbfccaef5c836ad.png',
+				path: "/pages/pbService/activity/index",
+			},
+			{
+				title: "文化场馆查询",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/ff56544a00fb1cc78e0b307f16daa821.png',
+				weburl: "https://m.cloud.sz-trip.com/Museum",
+			},
+			{
+				title: "苏影通",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/e60996bf57f35f2dab63c81bc48b609a.png',
+				weburl: "https://m.cloud.sz-trip.com/movies",
+			},
+			{
+				title: "书仓",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/41d87b6d8d78ac497a6654ad293f9329.png',
+				appId: 'wx165d4f1727f6bdb0',
+				pagePath: 'pages/home/home'
+			},
+			{
+				title: "e读书",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/87e9c9e3453492fa1ee65b705565efbb.png',
+				appId: 'wx26e6f4c0baba005b',
+				pagePath: 'pages/index/index'
+			},
+			{
+				title: "数字公共文化",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250526/c60ed1f766645fa67a749dffa0d347a2.png',
+				weburl: "https://m.cloud.sz-trip.com/PublicCulture2022",
+			},
+			{
+				title: "云游苏州",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/f3b1ec60b5f069182faadf263ec9dfee.png',
+				weburl: 'https://speed.web.yunyouyizhan.com/downloadApp/index.html#/',
+			},
+			{
+				title: "美图鉴赏",
+				img: 'https://static.ticket.sz-trip.com/uploads/20250529/820de8c4353bde80379f46e474104c04.png',
+				path: "/pages/pbService/appreciate/index",
+				
+			},
+			
+        ],
+		scrollLeft: 0,
+
+        
+        // 十全十美
+        // area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
+        SQSM: [
+            {
+                title: "常熟",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/ed641bf31558381e8d1c372e5cbbd155.png",
+                appId: 'wx4df5fd9a6a5ea123',
+				pagePath: 'pages/index'
             },
-            {   
-                color: '#DBD8F6',
-                bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
-                icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
-                // path:'/pages/list/night/index',
-                url:'https://m.cloud.sz-trip.com/nightTour2025',
-                path: '',
-                list: [],
-                
+            {
+                title: "太仓",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/f359551295197eff9c0966324659f037.png",
+                appId: 'wx8853b0d93cbca75e',
+				pagePath: 'pages/home/home'
             },
             {
-                color: '#FFE4BC',
-                bg: 'linear-gradient(172deg, #F08528, #D1201B);',
-                icon:'https://static.ticket.sz-trip.com/uploads/20250429/9928f46523fd57233b6ef3371a6ba460.png', //非看不可
-                url:'',
-                path:'/pages/list/theatre/index',
-                list: [],
-                
+                title: "昆山",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/35f498dbb43e14cdf3c6bbdf83e613db.png",
+                appId: 'wx8888a3fd0862b4c8',
+				pagePath: 'pages/index/index'
             },
             {
-                color: '#DBD8F6',
-                bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
-                icon:'https://static.ticket.sz-trip.com/uploads/20250429/a4f53072aa51a387593a183799b902e6.png', //非买不可
-                path:'/subPackages/techanNew/index',
-                url:'',
-                list: [],
-                
+                title: "吴江",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/2288c75b3797363015bfe633ea9abc0e.png",
+                appId: 'wx8eadea4ee2d42d4b',
+				pagePath: 'pages/index/index'
             },
-        
-        
+            {
+                title: "工业园区",
+				img: "https://static.ticket.sz-trip.com/uploads/20250529/9e947f0ef8addbe5c52b5bd4de205788.png",
+                appId: 'wxd323e63a10aa6865',
+				pagePath: 'pages/home/index'
+            },
+            {
+                title: "张家港",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/6162e0a86ec7e7b12e568fd5f81b5c9b.png",
+                path: "/pages/list/six/index?area=zhangjiagang"
+            },
+            {
+                title: "吴中",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/36fc77bf5d6879e6ce06ae349187c2ad.png",
+                path: "/pages/list/six/index?area=wuzhong"
+            },
+            {
+                title: "相城",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/ec54fba906166c7512d26ca8a4fa5a9f.png",
+                path: "/pages/list/six/index?area=xiangcheng"
+            },
+            {
+                title: "姑苏",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/cbb939c4ddfa187489b59adcbe72f7a9.png",
+                path: "/pages/list/six/index?area=gusu"
+            },
+            {
+                title: "高新",
+                img: "https://static.ticket.sz-trip.com/uploads/20250529/f2aa7328af4afaa9d1d4ecac1778300a.png",
+                path: "/pages/list/six/index?area=gaoxin"
+            },
+
+
         ],
 
-        nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)],
-        isMayDay: new Date().getTime()>new Date('2025/05/01 00:00:00').getTime()
+        // 长三角文旅平台
+        otherPlat: [
+            {
+                "name":"玉见昆山",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/c85dbe1b0f8f58014c05a30b3e6f86b5.png",
+                "type":"mini",
+                "path":"",
+                "appid":"wx8888a3fd0862b4c8"
+            },
+            {
+                "name":"智游常熟",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/98d57e31995b6dc3188f8717201640f1.png",
+                "type":"mini",
+                "path":"",
+                "appid":"wxdaf3d5edd07dc7af"
+            },
+            {
+                "name":"常享游",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/abfe0d4d2b02fcfd9bd791b9468bb4f4.png",
+                "type":"h5",
+                "url":"https://tour.wlczy.com/h5/"
+            },
+            {
+                "name":"畅游宿迁",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/bcfa9789f2d2d52d2da8f11b6a99b002.png",
+                "type":"mini",
+                "path":"/pages/index/index",
+                "appid":"wxcb00a59c4fba136e"
+            },
     
-	},
-    onLoad: function(options) {
-            //全屏广告
-            let _this = this
-            commonApi._post("adv/getAdv", {
-                position: 2,
-                type_id: 3
-            }).then(res => {
-                if (res.data.length > 0) {
-                    wx.hideTabBar() //这里隐藏了底部导航栏
+        ],
 
-                    let length = res.data.length
-                    if (res.data.length > 1) {
-                        let num = Math.floor(Math.random() * length);
-                        console.log('num', num);
-                        this.setData({
-                            startList: res.data[num]
-                        })
-                        console.log(this.data.startList.head_img);
-                    } else {
-                        this.setData({
-                            startList: res.data[0]
-                        })
-                    }
-
-                    // 图片
-                    if (this.data.startList.media_type) {
-                        this.setData({
-                            showTime: true
-                        })
-                        this.data.fullAdvTimer = setInterval(() => {
-                            _this.data.time-=0.5
-                            if (Number.isInteger(_this.data.time)) {
-                                _this.setData({time: _this.data.time})
-                            }
-                            if (_this.data.time <= 0) {
-								// 可以css 优化
-                                _this.setData({opacity: 0})
-                            }
-                            if (_this.data.time <= -1) {
-                                clearInterval(_this.data.fullAdvTimer)
-                                wx.showTabBar() //倒计时结束清除定时器显示导航栏
-                                _this.setData({showFullAdv: false})
-                            }
-                        }, 500)
-                    } else {
-                        // 视频
-                    }
-                } else {
-                    this.setData({
-                        showFullAdv: false
-                    })
-                }
-            })
-            if (options.from) {
-                app.globalData.from = options.from;
-            }
-            this.getHeight()
-            
-            
-            // 获取今天的日期
-            let today = new Date();
-            let d = new Date();
-            let month = d.getMonth() + 1,day = d.getDate();
-            month = month > 10 ? month : ("0" + month);
-            day = day > 10 ? day : ("0" + day);
-            this.setData({
-                month: (this.data.months[today.getMonth()]).toUpperCase(),
-                date: today.getDate(),
-                today: d.getFullYear() + "-" + month + "-" + day
-            })
-    },
-    gobdDetail(e) {
-        let item = e.currentTarget.dataset.item
-        util.gotoDetail(item)
-    },
-    getList() {
-        let bdList = this.data.bdList
-        // 游--景点
-        commonApi._post("scene/get_scene_by_tag",{
-        tag_id:"4",
-        limit:6,
-        lon:this.data.lon,
-        lat:this.data.lat,
-        offset:0,
-        sort:"weight",
-        title:'',
-        area_id:''
-        }).then(res=>{
-        console.log('景点', res)
-        res.data.list.map(item => {
-            if (item.distance || item.distance == 0) {
-            if (item.distance >= 1000) {
-                item.distance = (item.distance / 1000).toFixed(2) + 'km';
-            } else {
-                item.distance = (item.distance).toFixed(2) + 'm';
-            }
-            }
-        })
-        bdList[0].list = res.data.list
-        this.setData({
-            bdList: bdList
-        })
-        })
-        // 非买不可--文创
-        commonApi._post('product/get_product_by_tag_subject',{
-        offset: 0,
-        limit: 6,
-        tag_id: 60,
-        }).then(res=>{
-            bdList[3].list = res.data.list
-        this.setData({
-            bdList: bdList
-        })
-        })
-        // 非玩不可--线路一日游
-        commonApi._post('product/get_product_by_tag_subject',{
-        tag_id: "58",
-        offset: 0,
-        limit: 6,
-        }).then(res=>{
-            bdList[1].list = res.data.list
-        this.setData({
-            bdList: bdList
-        })
-        })
-        // 非看不可--剧场演出
-        commonApi._post("product/get_product_by_tag_subject",{
-        tag_id:"59",
-        offset:0,
-        limit:6,
-        }).then(res=>{
-            bdList[2].list = res.data.list
-        this.setData({
-            bdList: bdList
-        })
-        })
-    },
-    goDetail(e) {
-        let item = e.currentTarget.dataset.item;
-        let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
-        if (type == 'movie') {
-        //   wx.navigateTo({
-        //     // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-        //   })
-            util.goMovieDetail(item.third_id || item.id)
-        }else {
-        wx.navigateTo({
-            url: '/pages/info/activityInfo/index?id=' + item.id,
-        })
-        }
-    },
-    // 分类为电影时调这个接口
-    getMovieList() {
-        let service = "Cinema/getHotChannelMovieList";
-            let data = {
-                page: 1,
-                pageSize: 5
-        };
-        commonApi._post(service, data).then(res => {
-        console.log(res.data);
-                this.setData({
-                    hdrlList: res.data
-                })
-        })
-        console.log(this.data.hdrlList);
-    },
-    // 推荐榜单更多跳转
-    moreBtn(e) {
-        console.log(e)
-        let item = e.currentTarget.dataset.item
-        if (item.path!='') {
-        wx.navigateTo({
-            url: item.path,
-        })
-        } else {
-        // if (e.currentTarget.dataset.event) {
-        //   this.pagePoint({
-        //     event: e.currentTarget.dataset.event
-        //   }, 1)
-        // }
-        console.log('error', item)
-        let url = item.url;
-        app.globalData.weburl = url;
-        wx.navigateTo({
-            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-        })
+        // 回购榜
+        repurchaseList: [],
+        canGetrepurchase: true,
+
+		urltopage: {},
+
+		// ---------------2025-5-26改版没用到的------------------
+		fourProduct: [],
+		hotIndex: 0,
+		indexHot: [],
+        weather: null,
+        
+        // 页面图片
+        // imageSourceList:imageSource,
+
+
+	},
+	onLoad: function(options) {
+		// 相城小程序跳转获取用户信息
+        if(options && options.szxcCode) {
+			commonApi._post("uservice/user/loginByXC", {
+				code: options.szxcCode
+			}).then(res => {
+				if(res.data && res.data.id && res.data.token) {
+				  https.set_logininfo(res);
+				}
+			})
         }
+        if (options.from) {
+			app.globalData.from = options.from;
+		}
+		return
+		console.log('options',options)
+
     },
-    // 活动日历下的列表
-    getHdrlList() {
-        commonApi._post('pbservice/Actcalendar/getActList', {
-        page_no: 1,
-        date: this.data.today,
-        category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
-        keywords: '',
-        area_key: '',
-        lat: this.data.lat,
-        lon: this.data.lon,
-        page_num: 5
-        }).then(res => {
-            res.data.rows.forEach(v=>{
-                if (!v.post_url) {
-                    v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
-                }
-            })
-        this.setData({
-            hdrlList:res.data.rows
-        })
+
+	onReady: function() {
+        this.getHeight()
+        this.getIndexSeason()
+		this.getBanner()
+       
+        this.getXpthList() // 限时特惠
+
+        this.getList()  // 回购榜
+        // this.getWeather()  // 2025-5-26首页改版不需要天气了
+        // this.getFourProduct() // 活动日历
+
+        wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+				})
+			},
+			fail: (err) => {
+			}
         })
+        
+        this.getUrlToPage()
+
+
     },
-    // 切换活动日历分类
-    changeHdrlNav(e) {
-        console.log(e.currentTarget.dataset);
-        this.setData({
-        hdrlList:[],
-        hdrlNavIndex:e.currentTarget.dataset.index,
-        })
-        if (this.data.hdrlNavIndex == 4) {
-        this.getMovieList()
+    
+    showImg (img) {
+        if (!img) { return img }
+        if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
+            return img;
         } else {
-        this.getHdrlList() //切换分类重新获取活动日历列表
+            return "https://test.api.cloud.sz-trip.com"+img
+            // return "https://static.ticket.sz-trip.com" + img;
         }
     },
-    // 游苏州下的公共服务和旅游助手切换
-    changeType(e) {
-        this.setData({
-        yszIndex:e.currentTarget.dataset.index,
-        })
-    },
-    xlzs: function (e) {
 
-        wx.navigateToMiniProgram({
-        appId: 'wx757dd1ee184e75e9',
-        page: "pages/tabBar/index/index"
-        })
-    },
-  // 获取导航栏项目标题高度
+    // 获取系统信息
 	getHeight() {
-		let that = this
-		let systemInfo = wx.getStorageSync('systemInfo'),rect = wx.getMenuButtonBoundingClientRect();
-		if (!systemInfo) {systemInfo = wx.getSystemInfoSync()}
-		if (!rect) {rect = wx.getMenuButtonBoundingClientRect()}
-		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
-
-		that.setData({
-			viewHeight: systemInfo.windowHeight + 'px',
-			height: height,
-			padHeight: systemInfo.statusBarHeight,
-			right: (systemInfo.screenWidth - rect.right) + rect.width
-		})
-	},
-
-    // 大轮播的监听方法
-	changeBannerIndex: function(e) {
-		this.setData({
-			activeBannerIndex: e.detail.current
+        let systemInfo = wx.getSystemInfoSync(),
+			rect = wx.getMenuButtonBoundingClientRect();
+        let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+        let systemStyle = {
+            height: height, // 导航栏
+            padHeight: systemInfo.statusBarHeight,  // 状态栏
+            right: (systemInfo.screenWidth - rect.right) + rect.width // 右侧胶囊
+        }
+        this.setData({
+			systemStyle: systemStyle,
 		})
     },
-    // 小轮播监听方法
-	changeSmBannerIndex: function(e) {
-		this.setData({
-			smBannerIndex: e.detail.current
-		})
-	},
-
-	getBanner: function() {
-		commonApi._post("adv/getAdv", {
-			position: 0,
-			type_id: 3
-		}).then(res => {
-			this.setData({
-				banner: res.data || []
-			})
-		})
-		commonApi._post("adv/getAdv", {
-			position: 1,
-			type_id: 3
-		}).then(res => {
-			this.setData({
-				xiaobanner: res.data || []
-			})
-		})
-		//弹窗广告
-		commonApi._post("adv/getAdv", {
-			position: 3,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				this.setData({
-					alertSwipeList: res.data || [],
-					showAdv: true
-				})
-			} else if (!this.data.showFullAdv) {
-				wx.showTabBar({
-					animation: true,
-				})
-			}
-		})
-
-	},
-	//获取季节配置
+    //获取季节配置
 	getIndexSeason() {
-        if (app.globalData.configJson.indexSeason) {
+        if (app.globalData.configJson&&app.globalData.configJson.indexSeason) {
+            console.log('app', app.globalData.configJson)
             this.setData({
+                indexHot: app.globalData.configJson.indexHot,
                 isTest: app.globalData.configJson.isTest,
-                otherPlat: app.globalData.configJson.otherPlats,
-                indexSeason: app.globalData.configJson.indexSeason
+                // otherPlat: app.globalData.configJson.otherPlats,
+                // 正式数据
+                indexSeason: app.globalData.configJson.indexSeason,
+                // 开发数据
+                // indexSeason: imageSource.testImgs.indexSeason,
+                bannerDataList: (app.globalData.configJson.nav_menu || []),
+                mainTypeList: (app.globalData.configJson.menu_button || []),
             })
         } else {
             commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
-                let obj = {}
-                res.data.content.forEach(item => {
+                let obj = {};
+                (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
                 });
                 app.globalData.configJson.indexSeason = obj 
                 app.globalData.loadIndexSeason = true
+                app.globalData.configJson.nav_menu = (res.data.nav_menu || []).map(v=>{
+                    return {...v, icon:this.showImg(v.icon)}
+                })
+                app.globalData.configJson.menu_button = (res.data.menu_button || []).map(v=>{
+                    return {...v, icon:this.showImg(v.icon)}
+                })
+               
+                console.log('webData', app.globalData.configJson)
                 this.setData({
+                    indexHot: app.globalData.configJson.indexHot,
                     isTest: app.globalData.configJson.isTest,
-                    otherPlat: app.globalData.configJson.otherPlats,
-                    indexSeason: app.globalData.configJson.indexSeason
+                    // otherPlat: app.globalData.configJson.otherPlats,
+                    indexSeason: app.globalData.configJson.indexSeason,
+                    bannerDataList: (app.globalData.configJson.nav_menu || []),
+                    mainTypeList: (app.globalData.configJson.menu_button || []),
                 })
             })
         }
-	},
-	//关闭弹窗广告
-	closeAdv: function() {
-		this.setData({
-			showAdv: false
-		})
-		wx.showTabBar({
-			animation: true,
-		})
-	},
-	//关闭全屏广告
-	closeFullAdv: function() {
-		this.setData({
-			showFullAdv: false
-        })
-        clearInterval(this.data.fullAdvTimer)
-		if (!this.data.alertSwipeList.length > 0) {
-			wx.showTabBar({
-				animation: true,
-			})
-		}
-	},
-	// 是否静音
-	closeMuted: function() {
-		this.setData({
-			isMuted: this.data.isMuted = !this.data.isMuted
-		})
-	},
-	// 播放视频
-	videoPlay: function() {
-		let videoplay = wx.createVideoContext('myVideo', this)
-		videoplay.play();
-		this.setData({
-			videoPlay: false
-		})
-	},
-	// 暂停视频
-	videoPause: function() {
-		let videoplay = wx.createVideoContext('myVideo', this)
-		videoplay.pause();
-		this.setData({
-			videoPlay: true
-		})
-	},
-	getWeather: function() {
-		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
-			console.log(res)
+        console.log(this.data)
+    },
+    // url跳转（不知道什么东西）
+    getUrlToPage () {
+        commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+			let data = JSON.parse(res.data)
 			this.setData({
-				weather: res.data
+				urltopage: data
 			})
 		})
-	},
-	gotoPath: function(e) {
-    console.log(e)
-		
-		if (e.currentTarget.dataset.title == '书香借阅') {
-			wx.navigateToMiniProgram({
-				appId: 'wx165d4f1727f6bdb0',
-				path: 'pages/home/home'
-			})
-			return;
-		} else if (e.currentTarget.dataset.title == '12348') {
-			wx.navigateToMiniProgram({
-				appId: 'wxcdfd45c001466ba3',
-				path: 'pages/index/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'wuzhong_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wxdd39069b9a91dbfe',
-				path: 'pages/index/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'kunshan_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx8888a3fd0862b4c8',
-				path: 'pages/index/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'taicang_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx8853b0d93cbca75e',
-				path: 'pages/home/home'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'changshu_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx4df5fd9a6a5ea123',
-				path: 'pages/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wxd323e63a10aa6865',
-				path: 'pages/home/index'
-			})
-			return;
-		} else if (e.currentTarget.dataset.event == 'wujiang_click') {
-			wx.navigateToMiniProgram({
-				appId: 'wx8eadea4ee2d42d4b',
-				path: 'pages/index/index'
-			})
-			return;
-		}
-		wx.navigateTo({
-			url: e.currentTarget.dataset.path,
-		})
-		if (e.currentTarget.dataset.title) {
-			commonApi._post("browse/burying_point", {
-				uuid: app.globalData.uuid,
-				drive: "mini",
-				title: e.currentTarget.dataset.title
-			}).then(res => {
-
-			})
-		}
-	},
-	gotoUrl: function(e) {
-		console.log(e)
-		if (e.currentTarget.dataset.event) {
-			this.pagePoint({
-				event: e.currentTarget.dataset.event
-			}, 1)
-		}
-		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
-		wx.navigateTo({
-			// url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
-			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-		})
     },
-    // 实时路况跳转外链
-	gotoUrls() {
-		// 判断是否登录
-		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
-		if(!token || !userId) {
-			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
-			
-			app.globalData.weburl = url;
-			wx.navigateTo({
-				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-			})
-		}else {
-			commonApi.user_post("uservice/user/userEncry").then(res => {
-				if(res.code == 1) {
-					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
-					
-					app.globalData.weburl = url;
-					wx.navigateTo({
-						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-					})
+
+    // --------------------banner 相关---------------------------
+    // 获取banner 和开屏广告
+    getBanner: function() {
+        let _this = this
+        //全屏广告
+		commonApi._post("adv/getAdv", {position: 2,type_id: 3}).then(res => {
+			if (res.data.length > 0) {
+				let length = res.data.length
+                let num = Math.floor(Math.random() * length);
+                this.setData({startList: res.data[num]})
+				// 图片
+				if (this.data.startList.media_type) {
+                    wx.hideTabBar() //这里隐藏了底部导航栏
+					this.setData({showTime: true})
+					this.data.fullAdvTimer = setInterval(() => {
+                        _this.data.time-=0.5
+                        if (Number.isInteger(_this.data.time)) {
+                            _this.setData({time: _this.data.time})
+                        }
+						if (_this.data.time <= 0) {
+							_this.setData({opacity: _this.data.opacity - 0.3})
+						}
+						if (_this.data.time <= -1) {
+							clearInterval(_this.data.fullAdvTimer)
+							wx.showTabBar() //倒计时结束清除定时器显示导航栏
+							_this.setData({showFullAdv: false})
+						}
+					}, 500)
+				} else {
+					// 视频
 				}
-			})
-		}
-	},
-	gotoMini: function(e) {
-		let appid = e.currentTarget.dataset.appid,
-			path = e.currentTarget.dataset.path
-		wx.navigateToMiniProgram({
-			appId: appid,
-			path: path
+			} else {
+				this.setData({showFullAdv: false})
+			}
 		})
-	},
 
-	audioGuide: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx74f380bc721a0379',
-			path: '/pages/listen/listen?title=君到苏州'
-		})
-		commonApi._post("browse/burying_point", {
-			drive: "mini",
-			title: "语音导览",
-			uuid: app.globalData.uuid
-		}).then(res => {
 
+		commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
+			this.setData({banner: res.data || []})
 		})
-	},
-	onReachBottom: function() {
-	},
-	gotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
-		util.pagePoint({
-			event: 'recommend_click',
-			param: {
-				id: item.id,
-				type: item.type
+		commonApi._post("adv/getAdv", {position: 1,type_id: 3}).then(res => {
+			this.setData({xiaobanner: res.data || []})
+		})
+		//弹窗广告
+		commonApi._post("adv/getAdv", {position: 3,type_id: 3}).then(res => {
+			if (res.data.length > 0) {
+				this.setData({
+					alertSwipeList: res.data || [],
+					showAdv: true
+				})
 			}
-		}, 1)
-		if (item.type == 'travels') {
-			// 游记做特殊处理 其他都按照原来的来
-			wx.navigateTo({
-				url: '/pages/info/strategyInfo/index?id=' + item.s_id,
-			})
-		} else {
-			util.gotoDetail(item.ext);
-		}
+		})
 	},
-
+    // 统一的banner change 需要时可以放开
+	changeBannerIndex: function(e) {
+        return
+        let keyname = e.currentTarget.dataset.keyname
+		this.setData({
+            [keyname]: e.detail.current,
+		})
+    },
 	// 轮播图点击
 	bannerClick: function(e) {
 		if (this.data.isTest) return;
@@ -667,7 +576,6 @@ Page({
 				if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
 					item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
 					// 外部h5
-					console.log(111, item.tdata)
 					app.globalData.weburl = item.tdata.url;
 					wx.navigateTo({
 						url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
@@ -676,7 +584,6 @@ Page({
 				} else {
 					let page = item.tdata.url.split("/");
 					page = page[page.length - 1].split("?")
-					console.log(page[0])
 					let url = this.data.urltopage[page[0]];
 					if (url && url.indexOf('map') != -1) {
 						let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
@@ -693,7 +600,6 @@ Page({
 						})
 					} else {
 						app.globalData.weburl = item.tdata.url;
-						console.log(2222, item.tdata.url, app.globalData.weburl)
 						wx.navigateTo({
 							url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
 								.tdata.url)
@@ -734,62 +640,191 @@ Page({
 		return;
 
 	},
-	//博物馆跳转  直接跳君到苏州H5
-	goH5: function(e) {
-		console.log(e.currentTarget.dataset.path);
-		let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
-		// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
-		wx.navigateTo({
-			// url: "/pages/pbService/web/index"
-			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
-		})
+    
+    //------------------------金刚区点击-------------------------------------
+    // 自定义数据的跳转
+	mainIconClick: function(e) {
+		let item = e.currentTarget.dataset.item
+		// 埋点
+		if (item.eventName) {
+			this.pagePoint({event: item.eventName,}, 1)
+		}else if (item.title) {
+			commonApi._post("browse/burying_point", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				title: item.title
+			})
+		}
+
+		if (item.appId) {
+			wx.navigateToMiniProgram({
+				appId: item.appId,
+				path: item.pagePath,
+			})
+			return
+		}
+		if (item.path) {
+			wx.navigateTo({
+				url: item.path
+			})
+			return
+		}
+		if (item.weburl) {
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.weburl)
+			})
+			return
+		}
+		
+    },
+    // 后台配置数据跳转
+    mainNavClick:function (e) {
+        let item = e.currentTarget.dataset.item
+        console.log(item)
+        if (item.jump_type == "page") {
+            wx.navigateTo({
+              url: "/"+item.page.mini,
+            })
+            return
+        }
+        if (item.jump_type == "link") {
+            wx.navigateTo({
+              url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url),
+            })
+            return
+        }
+    },
+
+    // 其他平台配置数据的跳转
+    gotoOther: function(e) {
+		let item = e.currentTarget.dataset.item;
+		if (item.type == 'h5') {
+			app.globalData.weburl = item.url
+			wx.navigateTo({
+				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
+			})
+		} else if (item.type == 'mini') {
+			wx.navigateToMiniProgram({
+				appId: item.appid,
+				path: item.path
+			})
+		} else if (item.type == 'page') {
+			wx.navigateTo({
+				url: item.page,
+			})
+		}
 	},
-	// 监听文旅查询的scroll
+
+	// 滚动监听
 	listenScroll(e) {
+        let keyname = e.currentTarget.dataset.keyname
 		this.setData({
-			scrollLeft: e.detail.scrollLeft
+            [keyname]: e.detail.scrollLeft,
 		})
 	},
-	onReady: function() {
-		wx.getLocation({
-			type: 'gcj02',
-			success: (res) => {
-				this.setData({
-					lat: res.latitude,
-					lon: res.longitude
-                })
-				this.getList()
-                this.getHdrlList()
-                let tempData = JSON.stringify({lat: res.latitude,lon: res.longitude})
-                wx.setStorageSync('lonAndLat', tempData)
-			},
-			fail: (err) => {
-				this.getList()
-				this.getHdrlList()
-			}
-		})
-
-		commonApi._post("pbservice/Other/getClientConfig", {
-			unique_key: "urltopage"
+    
+    // -----------------------------------------------------------------------
+    
+    // 新品特惠
+	getXpthList: function() {
+		commonApi._post("product/get_product_indulgence", {
+			tag_id: 275,
+            typeId: 3,
+            type: 1, // 返回数组
 		}).then(res => {
-            let data = JSON.parse(res.data)
-            this.data.urltopage = data
+			this.setData({xpth: res.data,})
 		})
+    },
+    
+    // 更换新品特惠 当即热门
+    changeXpthIndex:function (e) {
+        let value = e.currentTarget.dataset.value
+        this.setData({xpthIndex:value})
+    },
+	productGotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		util.gotoDetail(item)
+	},
 
-		this.getBanner()
-        this.getWeather()
-		this.getIndexSeason()
-
+	// 热门推荐
+	getList: function() {
+        commonApi._post("product/get_product_by_tag_subject", {
+            tag_id: 85,offset: 0,limit: 5,
+        }).then(res=>{
+            this.setData({ list: res.data.list || []})
+        })
+    },
+    // 回购
+    getRepurchaseList:function () {
+        commonApi._post("repurchase/repurchase/getRepurchaseList", {}).then(res=>{
+            (res.data || []).forEach(v=>v.headimg = this.showImg(v.headimg))
+            this.setData({ repurchaseList: res.data || []})
+        })
+    },
+	onReachBottom: function() {
+		// if (this.data.list.length < 30) {
+		// 	this.getList()
+        // }
+        if (this.data.canGetrepurchase) {
+            this.data.canGetrepurchase = false
+            this.getRepurchaseList()
+        }
 	},
-	
+	gotoDetail: function(e) {
+		let item = e.currentTarget.dataset.item;
+		commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
+		item.id = item.type=='post'?item.product_id:item.scene_id
+		util.gotoDetail(item);
+		
+	},
+
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
+    },
+
+    // --------------------------广告----------------------------
+	//关闭弹窗广告
+	closeAdv: function() {
+		this.setData({
+			showAdv: false
+		})
+		wx.showTabBar({
+			animation: true,
+		})
 	},
+	//关闭全屏广告
+	closeFullAdv: function() {
+        this.setData({showFullAdv: false})
+        clearInterval(this.data.fullAdvTimer)
+		if (!this.data.alertSwipeList.length > 0) {
+			wx.showTabBar({animation: true})
+		}
+	},
+	// 是否静音
+	closeMuted: function() {
+		this.setData({
+			isMuted: this.data.isMuted = !this.data.isMuted
+		})
+	},
+	// 播放视频
+	videoPlay: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.play();
+		this.setData({
+			videoPlay: false
+		})
+	},
+	// 暂停视频
+	videoPause: function() {
+		let videoplay = wx.createVideoContext('myVideo', this)
+		videoplay.pause();
+		this.setData({
+			videoPlay: true
+		})
+	},
+
 	onShow: function() {
-		// this.getIndexSeason()
-		this.pagePoint({
-			event: 'home_view'
-		}, 1)
+		this.pagePoint({event: 'home_view'}, 1)
 	},
 
 	/**
@@ -804,5 +839,93 @@ Page({
 			query: '',
 			imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png'
 		}
-	}
+    },
+    
+
+
+    // --------------------以前的东西 暂时用不到仅做保留------------------------
+    // 一城百馆 以前的活动
+	city: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wx114d514f39cb1fed',
+			path: "pages/entry/index"
+		})
+		commonApi._post("browse/burying_point", {
+			drive: "mini",
+			title: "一城百馆",
+			uuid: app.globalData.uuid
+		}).then(res => {
+
+		})
+    },
+    meituan: function() {
+		wx.navigateToMiniProgram({
+			appId: 'wxde8ac0a21135c07d',
+			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
+		})
+    },
+    // 活动日历
+	getFourProduct: function() {
+		let item = this.data.indexHot[this.data.hotIndex],
+			service = "product/get_product_by_tag",
+			data = {
+				tag_id: item.id,
+				offset: 0,
+				limit: 4,
+				sort: 'weight',
+				order: 'desc'
+			};
+		if (item.type == 'scene') {
+			service = "scene/get_scene_by_tag";
+		} else if (item.type == 'movie') {
+			service = "Cinema/getHotMovieList";
+			data = {
+				page: 1,
+				pageSize: 4
+			};
+		}
+		commonApi._post(service, data).then(res => {
+			this.setData({
+				fourProduct: res.data.list || res.data
+			})
+		})
+    },
+    changeHotIndex: function(e) {
+		this.setData({
+			hotIndex: e.currentTarget.dataset.index,
+			fourProduct: []
+		})
+		this.getFourProduct()
+    },
+    getWeather: function() {
+		commonApi._post('pbservice/Ztfw/getWeather').then(res => {
+			this.setData({
+				weather: res.data
+			})
+		})
+    },
+    	// Ai避高峰
+	gotoUrls() {
+		// 判断是否登录
+		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+		if(!token || !userId) {
+			let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+			
+			app.globalData.weburl = url;
+			wx.navigateTo({
+				url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+			})
+		}else {
+			commonApi.user_post("uservice/user/userEncry").then(res => {
+				if(res.code == 1) {
+					let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+					
+					app.globalData.weburl = url;
+					wx.navigateTo({
+						url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+					})
+				}
+			})
+		}
+	},
 })
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index a5e5282..8edc8e6 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,411 +1,292 @@
-<!--pages/indexs/index.wxml-->
-<title title="君到苏州（文化旅游总入口）"></title>
-<!-- 后台获取的季节动图 -->
-<image lazy-load class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
-<view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-  <view class="weather-num">{{weather.max_temp}}°</view>
-  <view class="weather">{{weather.weather}}</view>
-  <!-- <image lazy-load bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
-    data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
-    mode="aspectFill"></image> -->
-  <image lazy-load bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20250429/224929eeb4520d0c3ea8f10a657825b4.png" mode="aspectFill"></image>
-</view>
-<view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
-  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-    <!-- <view class="iconfont icon-sousuo"></view> -->
-    <image lazy-load class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
-    <view class="textOver">搜索想要的旅游产品或服务</view>
-  </navigator>
-</view>
-<view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
-    <block wx:for="{{banner}}" wx:key="index">
-      <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
-      </swiper-item>
-    </block>
-  </swiper>
-  <view class="com-flex dot-list">
-    <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
-  </view>
-</view>
-<view class="content" wx:if="{{!isTest}}">
-  <!-- 活动日历 -->
-  <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
-    <image lazy-load mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
-    <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
-    <view class="nowDate"> 
-        <view class="num">{{nowDate[0]}}</view>
-        <view>月</view>
-        <view class="num">{{nowDate[1]}}</view>
-        <view>日</view>
-    </view>
-  </view>
-  <view class="hdrlNavList">
-    <view class="hdrlNav{{index==hdrlNavIndex?' hdrlNavActive':''}} {{index==4?'hidden':''}}" wx:for="{{hdrlNavList}}" data-index="{{index}}" bindtap="changeHdrlNav" wx:key="id">
-      {{item.title}}
-    </view>
-  </view>
-  <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" >
-        <view style="background: #fff;display: flex;border-radius: 7rpx;width: 100%;">
-          <!-- <image lazy-load class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
-          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-          <view class="hdrlItem-content">
-            <view class="hdrlItem-title textOver3">{{item.name}}</view>
-            <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
-          </view>
+<!--index.wxml-->
+
+
+<view wx:if="{{!isTest}}">
+    <!-- 顶部banner -->
+    <view style="position:relative;z-index: 1;">
+        <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+            <block wx:for="{{banner}}" wx:key="index">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <!-- <view class="com-flex dot-list">
+            <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+        </view> -->
+
+        <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+20}}px">
+            <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
+                <image src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <view class="textOver" >搜一搜您想要的</view>
+            </navigator>
         </view>
-      </view>
-    </view>
-  </view>
-  <view wx:else>
-    <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
-        <view style="background: #fff;width: 100%;display: flex;border-radius: 7rpx;width: 100%;">
-          <!-- <image lazy-load class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
-          <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-          
-          <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
-            <view>{{item.title}}</view>
-            <view style="display: flex;justify-content: flex-end;">
-              <view class="buyMovie">去购票 ></view>
+
+        <view class="banner-main">
+            <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
+                <image src="{{item.icon}}" ></image>
             </view>
-          </view>
         </view>
-      </view>
-    </view>
-  </view>
-  <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" wx:if="{{!isTest}}">
-    <!-- 上面的高峰预警、实时路况 -->
-    <view class="main-box-top">
-      <image lazy-load bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj"
-        src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
-      <!-- <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/> -->
-       <image lazy-load  class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=AI避高峰"
-       src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;padding-left: 16rpx;">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6fcd03c4b5adc17b714186825e1f5da6.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
-          <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
-            <view class="text">水上游</view>
-          </view>
-          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/nightTour2025" data-event="night_sz" data-title="夜游苏州"  class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
-          </view>
-          
-          <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
-            <view class="text">剧场演出</view>
-          </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
-            <view class="text">文创特产</view>
-          </view>
 
-          <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
-            <view class="text">场馆预约</view>
-          </view>
-          <view bindtap="gotoUrl" data-event="card" data-title="一日游" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
-            <view class="text">一日游</view>
-          </view>
-          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
-            <view class="text">户外游</view>
-          </view>
-          <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
-            <view class="text">非遗专卖</view>
-          </view>
-
-          <view wx:if="{{isMayDay}}" bindtap="gotoMini" data-event="hotel_click" data-title="酒店住宿" 
-          data-appid="wx0e6ed4f51db9d078" data-path="pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
-            <view class="text">酒店住宿</view>
-        </view>
-        <!-- 五一前临时跳转专题页 -->
-        <view wx:else bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/nightMooring"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
-            <view class="text">酒店住宿</view>
+    <view class="main-content" >
+         <!-- 金刚区 -->
+        <view class="no-scrollbar" wx:if="{{mainTypeList.length>0}}">
+            <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
+                <view  class="top-icons no-scrollbar">
+                    <view bindtap="mainNavClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
+                        <image src="{{item.icon}}" mode="aspectFill"></image>
+                        <view class="top-icon-text">{{item.title}}</view>
+                    </view>
+                </view>
+            </scroll-view>
+            <view class="scroll-line">
+                <view class="scroll-line-bg" wx:if="{{mainTypeLeft <= 50}}" style="width:17rpx;"></view>
+                <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
+            </view>
         </view>
+        
 
-        <!-- <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
-            <view class="text">研学游</view>
-        </view> -->
+        <view class="content-box">
+            <!-- 苏城环游记 todo-->
+            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0}}">
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
+                <block wx:for="{{xiaobanner}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <!-- 原 圆角77rpx，现改为13rpx -->
+                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <!-- <view class="dot-list com-flex sm-dot-list">
+                    <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+                </view> -->
+            </view>
 
-        </view>
-      </scroll-view>
-      <view class="scroll-line">
-        <view class="scroll-line-bg" wx:if="{{scrollLeft == 0}}" style="width:25rpx;"></view>
-        <view class="scroll-line-bg2" wx:else style="width:25rpx;"></view>
-      </view>
-    </view>
-  </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="index">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-        </swiper-item>
-      </block>
-    </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-    </view>
-  </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image lazy-load style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
-      </view>
-    </view>
-    <image lazy-load class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
-  </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
-        <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
-          <view>电子社保卡</view>
-        </view> -->
-        <view  data-event="comfort_click" data-title="高峰预警"
-            bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=高峰预警"
-         class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
-          <view>高峰预警</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
-          <view>实时路况</view>
-        </view>
-        <view bindtap="xlzs"  class="pbservice-item ggfw" >
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
-            <view>行李直送</view>
-        </view>
-        <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
-            <view>停车场</view>
-        </view>
+            <!-- 限时特惠--新版-->
+            <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" >
+                <!-- 上方标题部分 -->
+                <view class="xsth-title">
+                    <view class="xsth-left" style="display: flex;">
+                        <image wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/f2dc42edee46a79a6ba375ae1a1c24b7.png"></image>
+                        <image wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
+                        
+                        <image wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/1d1117bf6120fb75159eb8657b15c640.png"></image>
+                        <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
+                    </view>
+                </view>
+                <!-- 热门 -->
+                <view style="width: 100%;" wx:if="{{xpthIndex==0}}">
+                    <scroll-view scroll-x style="height:372rpx">
+                        <view class="season-hot">
+                            <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
+                                <image src="{{item.headimg}}"></image>
+                                <view class="season-content" style="padding:6rpx 12rpx 0;">
+                                    <view style="height: 70rpx;" class="textOver2">{{item.title}}</view>
+                                    <view class="price" >
+                                        <text>￥</text><text>{{item.price/100}}</text><text>起</text>
+                                    </view>
+                                </view>
+                                <image class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image>
+                            </view>
+                        </view>
+                    </scroll-view>
+                </view>
 
-        <!-- <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
-          <view>行李寄存</view>
-        </view> -->
-        
-        <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-            data-path="/pages/pbService/bike/index?type=1">
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
-            <view>找厕所</view>
-        </view>
+                <!-- 显示特惠 -->
+                <view class="xpth-product" wx:else="">
+                    <!-- 左边的2个产品 -->
+                    <view class="xpth-left">
+                        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                        <image src="{{item.headimg}}" mode="" />
+                        <view class="xpth-item-content">
+                            <view class="xpth-item-title textOver2">{{item.title}}</view>
+                            <view class="xpth-item-bottom">
+                            <view class="xpth-item-price">{{item.price/100}}</view>
+                            </view>
+                        </view>
+                        </view>
+                    </view>
+                    <!-- 右边的banner -->
+                    <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
+                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                        bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
+                        <block wx:for="{{xpth.adv}}" wx:key="index">
+                            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                            <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                            </swiper-item>
+                        </block>
+                        </swiper>
+                        <view class="xpth-banner-dot-list">
+                            <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
+                        </view>
+                    </view>
+                </view>
+            </view>
 
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
-          <view>安全服务</view>
-        </view> -->
-        
-        
-      </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
-    </view>
-    <view wx:else style="margin: 0rpx 14rpx 0;">
-      <view class="pic-list"  wx:if="{{!isTest}}">
-        <image lazy-load class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
-          src="https://static.ticket.sz-trip.com/uploads/20250429/eacfc180904e8f1e8717afe2aa959c28.png" mode="aspectFill"></image>
-          <image lazy-load class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
-          data-path="/pages/list/{{isTest?'road':'food'}}/index"
-          src="https://static.ticket.sz-trip.com/uploads/20250429/e86972b98e8fbb5c5983f38124a77cb2.png" mode="aspectFill"></image>
-          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/uploads/20250429/62637ab5923016ef9baa573372d2452f.png" mode="aspectFill">
-        </image>
-        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/uploads/20250429/13060c57ee40d1f92145968a0fbd8378.png" mode="aspectFill"></image>
-      </view>
-    </view>
-  </view>
-  <!-- 推荐榜单 -->
-  <image lazy-load class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
-  src="https://static.ticket.sz-trip.com/uploads/20250429/179e3d1e09a17149f260c8d51458ed15.png" mode=""/>
-  <!-- 4个产品榜单 -->
- <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
-  <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
-    <!-- <image lazy-load class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
-    <view class="bd-top">
-      <image lazy-load class="bd-type" src="{{bdItem.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" style="color:{{i%2==1?'#55578E':'#F34017'}}" data-item="{{bdItem}}">更多 ></view>
-    </view>
-    <view style="position: relative;z-index: 9;">
-      <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
-        wx:key="id" data-item="{{item}}">
-        <view class="bd-index" style="color: {{bdItem.color}};">{{index+1}}</view>
-        <view class="bd-item">
-          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
-          <view class="bd-item-content">
-            <view class="bd-item-title textOver2">
-              {{item.title}}
+            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0}}">
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
+                <block wx:for="{{xiaobanner}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <!-- 原 圆角77rpx，现改为13rpx -->
+                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+                <!-- <view class="dot-list com-flex sm-dot-list">
+                    <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
+                </view> -->
             </view>
-            <view class="bd-item-bottom">
-              <view class="bd-price">{{item.price/100}}</view>
-              <!-- <view class="bd-distance" wx:if="{{item.distance}}">{{item.distance}}</view> -->
+
+            <!-- 公共服务 -->
+            <view class="sale-road-boxes" style="margin-top:0;">
+                <image class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
+                <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                    <view style="height: 40rpx;line-height: 40rpx;">更多</view>
+                    <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" />
+                </navigator>
+            </view>
+            <view>
+                <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
+                    <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
+                        <image src="{{item.img}}"></image>
+                    </view>
+                </view>
             </view>
-          </view>
-        </view>
-      </view>
-    </view>
 
-  </view>
- </view>
+            <!-- 旅游助手 -->
+            <view class="sale-road-boxes" style="margin-top:36rpx">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="pic-list" style="margin-top:30rpx">
+                <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick"
+                src="{{item.img}}" mode="aspectFill"></image>
+            </view>
 
-</view>
+            <!-- ai避高峰 -->
+            <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
+                <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
+                    <image src="{{indexSeason.ai}}" mode=""/>
+                </view>
+                <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
+                    <image src="{{indexSeason.avoid}}" mode=""/>
+                </view>
+            </view> -->
 
-<view class="content" wx:else>
-    <!-- 高峰预警、实时路况及几个板块 -->
-  <view class="main-box" >
-    <!-- 上面的高峰预警、实时路况 -->
 
-    <!-- 下面几大板块 -->
-    <view class="slide-out-box">
-      <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
-          <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
-            <view class="text">景点门票</view>
-          </view>
+            <!-- 数字文旅-->
+            <view class="sale-road-boxes" style="margin-top:30rpx">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="slide-out-box">
+                <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
+                <scroll-view scroll-x style="height:400rpx" bindscroll="listenScroll" data-keyname="scrollLeft" class="slide-box">
+                <view class="pbservice">
+                    <view class="pbservice-item" wx:for="{{travelCulture}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
+                        <image src="{{item.img}}" mode="widthFix"></image>
+                        <!-- <view class="text">{{item.title}}</view> -->
+                    </view>
+                    
+                </view>
+                </scroll-view>
+                <view class="scroll-line" style="margin: 0 auto;">
+                    <view class="scroll-line-bg" wx:if="{{scrollLeft <= 50}}" style="width:17rpx;"></view>
+                    <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
+                </view>
+            </view>
 
-        </view>
-      </scroll-view>
-      
-    </view>
-  </view>
-  <!-- 小轮播 -->
-  <view class="small-swiper-box">
-    <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}"
-      bindchange="changeSmBannerIndex">
-      <block wx:for="{{xiaobanner}}" wx:key="index">
-        <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
-        </swiper-item>
-      </block>
-    </swiper>
-    <view class="dot-list com-flex sm-dot-list">
-      <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="index"></view>
-    </view>
-  </view>
-  <!-- 游苏州 -->
-  <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <view style="margin-bottom:6rpx;">
-      <image lazy-load style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
-      <view>
-        <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
-      </view>
-    </view>
-    <image lazy-load style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
-  </view>
-  <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
-    <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
-      <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
-        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
-          <view>电子社保卡</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
-         class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
-          <view>高峰预警</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-        data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
-          <view>行李寄存</view>
-        </view>
-        <view bindtap="gotoUrl" data-event="xlqc"
-          data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
-          <view>实时路况</view>
+            <!-- 十全十美 -->
+            <view class="sale-road-boxes">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
+            </view>
+            <view class="six-box-new">
+                <image wx:for="{{SQSM}}" src="{{item.img}}" data-item="{{item}}" bindtap="mainIconClick" mode="widthFix" wx:key="index"></image>
+            </view>
+
+            <!-- 长三角文旅平台 -->
+            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="other-plats" wx:if="{{otherPlat}}">
+                <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
+                <image src="{{item.icon}}" mode="heightFix"></image>
+                <!-- <view>{{item.name}}</view> -->
+                </view>
+            </view>
+
+            <!-- 热门推荐 -->
+            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0}}">
+                <image mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
+                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+            </view>
+            <view class="hot-list">
+                <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
+                <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                    <view class="hot-item">
+                    <view style="position:relative">
+                        <common-image width="100%" src="{{item.headimg}}" mode="widthFix"></common-image>
+                    </view>
+                    <view class="hot-info">
+                        <view class="hot-title">{{item.title}}</view>
+                        <view class="com-flex" style="justify-content: space-between;margin-top: 26rpx;">
+                            <view  class="hot-price">
+                                <text>￥</text><text>{{item.price/100}}</text><text>起</text>
+                            </view>
+                            <view style="font-weight: 500;font-size: 23rpx;color: #999999;">已售{{item.sales_number}}</view>
+                        </view>
+                        
+                    </view>
+                    </view>
+                </view>
+                </view>
+            </view>
+            <!-- <view wx:if="{{listMore}}" class="more-btn-text" bindtap="getList">查看更多</view>
+            <view wx:else class="more-btn-text" bindtap="getList">暂无更多推荐</view> -->
         </view>
 
-        <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
-          <view>安全服务</view>
-        </view> -->
-        
-        
-      </view>
-      <navigator class="ysz-more" url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view">
-        查看更多 >
-      </navigator>
     </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" >
-        <image lazy-load class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          
-          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
-        </image>
-        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
-      </view>
+    
+    
+
+
+
+    <!-- 广告弹窗 -->
+    <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
+    <view class="alertavd" wx:if="{{showAdv}}">
+        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+            <block wx:for="{{alertSwipeList}}" wx:key="index">
+            <swiper-item data-item="{{item}}" bindtap="bannerClick">
+                <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
     </view>
-  </view>
-</view>
+    <!-- 广告弹窗结束 -->
+    <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
+        <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
+        <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
+            <image src="{{startList.head_img}}"  style="width: 100%;height: 100vh;"></image>
+        </view>
 
+        <!-- 视频 -->
+        <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
+            <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
-<!-- 开屏页 -->
-<view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
-	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
-    <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image lazy-load src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+        </view>
     </view>
-	
-	<!-- 视频 -->
-	<view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
-		<video
-			style="width:100vw;height:100vh;display:block;"
-			id="myVideo" 
-			src="{{startList.head_img}}" 
-			show-center-play-btn="{{false}}"
-			show-play-btn="{{true}}" 
-			autoplay
-			controls="{{false}}"
-			bindended="videoend"
-			loop="{{true}}"
-			muted="{{isMuted}}"
-			object-fit="fill"
-		></video>
-		
-		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
-	</view>
-</view>
 
+</view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 9272311..b8441ef 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,30 +1,22 @@
-/* pages/indexs/index.wxss */
+/**index.wxss**/
 /* 元旦修改 */
 page {
-  height: fit-content;
   padding-bottom: 36.67rpx;
-  background: #F5C564;
-  background-size: 100% auto;
-  /* background-repeat: round; */
-  background-repeat: no-repeat;
 }
 .swiper,.swiper image {
-  width: 697rpx;
+  width: 100%;
   display: block;
-  height: 335rpx;
-  border-radius: 27rpx;
-}
-.swiper {
-  margin: 0 auto;
+  height: 908rpx;
 }
+
 .top-box {
   display: flex;
   padding: 10rpx 0;
   align-items: center;
-  margin: 0 30rpx;
   justify-content: flex-start;
-  position: relative;
-  z-index: 1;
+  position: absolute;
+  left: 30rpx;
+  z-index: 2;
 }
 .top-box image {
   flex-shrink: 0;
@@ -40,51 +32,54 @@ page {
   flex: 1;
   width: 100%;
   height: 64rpx;
-  background: rgba(255,248,235,0.7);
-  border-radius: 13rpx;
-  color: #000;
+  border-radius: 27rpx;
+  color: #666666;
   display: flex;
   align-items: center;
   font-size: 25rpx;
+  padding: 2rpx 5rpx;
+  box-sizing: border-box;
+  background: rgba(255, 255, 255, 0.6);
 }
 .search-box .iconfont {
   font-size: 30rpx;
   margin-left: 20rpx;
-  margin-right: 10rpx;
-  color: #000;
-}
-.top-box .weather-num,.top-box .weather {
-  flex-shrink: 0;
-  color: #333;
+  margin-right: 20rpx;
   /* color: #72674E; */
 }
-.top-box .weather-num {
-  font-size: 29rpx;
-  margin-bottom: 10rpx;
-  margin-left: 4rpx;
+
+.banner-main{
+    position: absolute;
+    z-index: 3;
+    width: 100%;
+    left: 0;
+    bottom: 30rpx;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 30rpx;
+    box-sizing: border-box;
 }
-.top-box .weather {
-  font-size: 19rpx;
-  margin-top: 20rpx;
-  margin-left: -4rpx;
-  margin-right: 30rpx;
+.banner-main image{
+    width: 153.33rpx;
+    height: 133.33rpx;
+}
+
+.main-content{
+    background-color:#E8F9FA;
+    margin-top: -10rpx;
+    border-radius: 20rpx;
+    position: relative;
+    z-index: 4;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/150bd1f9312967bd7d9bedc6dbb8dd48.png");
+    background-size: 100% auto;
+    background-repeat: repeat-y;
+    padding-top: 63rpx;
 }
+
 .top-icons {
-  /* background: #FFFFFF; */
-  /* box-shadow: 0px 3rpx 26rpx 0px rgba(6, 0, 1, 0.13); */
-  border-radius: 0 0 27rpx 27rpx;
-  width: 697rpx;
-  margin: 0 auto;
-  position: relative;
-  z-index: 0;
   display: flex;
-  padding: 34rpx 0;
-  padding-bottom: 7rpx;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  background: #FFFED6;
-  margin-top: -20rpx;
-  padding-top: 54rpx;
+  padding:0 20rpx;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -94,179 +89,246 @@ page {
   text-align: center;
   flex-shrink: 0;
   width: 20%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
 }
 .top-icon-item:nth-child(5n){
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 113rpx;
+  width: 100rpx;
+  height: 100rpx;
   display: block;
-  margin: 0 auto;
-  margin-bottom: 10rpx;
-}
-.content {
-  /* margin: 0 25rpx; */
-  margin-top: 37.67rpx;
-}
-.sale-road-boxes {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 40rpx;
-  position: relative;
-  align-items: flex-end;
-  margin-bottom: 28rpx;
-}
-.sale-box {
-  flex-shrink: 0;
-  width: 337rpx;
-}
-.sale-title {
-  color: #999999;
-  font-size: 20rpx;
-  margin-bottom: 20rpx;
-}
-.sale-title text {
-  color: #000000;
-  font-size: 32rpx;
-  font-weight: 500;
-  margin-right: 8rpx;
-}
-.sale-product {
-  width: 337rpx;
-  position: relative;
-  height: 165rpx;
-  overflow: hidden;
-  border-radius: 8rpx;
-}
-.sale-product-bg {
-  width: 197rpx;
-  height: 165rpx;
-  position: absolute;
-  left: 0;
-  top: 0;
-  background: linear-gradient(90deg, #F78C56, #FB6044);
-  
-}
-.road-product-bg {
-  background: linear-gradient(90deg, #35CFB4, #00A6A0);
-}
-.sale-img {
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 173rpx;
-  height: 165rpx;
-}
-.sale-info {
-  position: absolute;
-  left: 20rpx;
-  top: 20rpx;
-  bottom: 20rpx;
-  width: 140rpx;
-}
-.sale-product-title {
-  font-size: 28rpx;
-  color: #fff;
-  font-weight: 500;
-  line-height: 36rpx;
+  /* margin: 0 auto; */
+  /* margin-bottom: 10rpx; */
 }
-.sale-price {
-  padding: 0 10rpx;
-  color: #F44747;
-  font-size: 25rpx;
-  line-height: 39rpx;
-  background: #FFFFFF;
-  border-radius: 5rpx;
-  margin-top: 15rpx;
-  display: inline-block;
+
+.content-box {
+  margin: 0 25rpx;
 }
-.sale-tip-img {
-  position: absolute;
-  width: 200rpx;
-  height: 165rpx;
-  left: 0;
-  top: 0;
+.common-header-img{
+    height: 63.33rpx;
 }
+
 .small-swiper {
-  height: 154rpx;
+    height: 154rpx;
 }
 .small-swiper image {
-  display: block;
-  width: 100%;
-  height: 154rpx;
+    display: block;
+    width: 100%;
+    height: 154rpx;
 }
 .small-swiper-box {
-  margin: 24rpx 26.67rpx 26.67rpx;
-  /* width: 100%; */
-  height: 154rpx;
-  border-radius: 20rpx;
-  overflow: hidden;
-  position: relative;
-}
-.product-tags {
-  display: flex;
-  margin-top: 40rpx;
-  margin-bottom: 50rpx;
-  overflow-x: auto;
-}
-.product-tag {
-  padding: 0 20rpx;
-  height: 43rpx;
-  background: #F4F4F4;
-  border-radius: 21rpx;
-  font-size: 27rpx;
-  color: #666;
-  margin-right: 20rpx;
-  flex-shrink: 0;
-}
-.product-tag.active {
-  background: #0B898E;
-  color: #fff;
-}
-.tag-product-list {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-}
-.tag-product {
-  width: 337rpx;
-  background: #FFFFFF;
-  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
-  border-radius: 13rpx;
-  margin-bottom: 35rpx;
-}
-.tag-product image {
-  display: block;
-  width: 337rpx;
-  height: 213rpx;
-  border-radius: 13rpx 13rpx 0px 0px;
-}
-.tag-product .product-info {
-  padding: 20rpx;
-  padding-bottom: 0;
-}
-.tag-product .tag-product-title {
-  font-size: 33rpx;
-  color: #333333;
-  font-weight: 500;
-  margin-bottom: 10rpx;
-}
-.tag-product .tag-product-address {
-  color: #999;
-  font-size: 22rpx;
-  line-height: 40rpx;
-  padding-bottom: 10rpx;
+    margin: 50rpx 0;
+    width: 100%;
+    height: 154rpx;
+    border-radius: 20rpx;
+    /* border-radius: 77rpx; */
+    overflow: hidden;
+    margin-top: 33rpx;
+    position: relative;
 }
-.tag-product-price-box {
+
+.sale-road-boxes {
   display: flex;
-  height: 70rpx;
-  align-items: center;
-  border-top: 1rpx solid #ccc;
   justify-content: space-between;
+  margin-top: 40rpx;
+  position: relative;
+  align-items: flex-end;
 }
-.tag-product .tag-product-address .iconfont {
-  font-size: 26rpx;
-}
+
+/* 元旦修改新增样式 */
+.xpth {
+    border-radius: 20rpx;
+    padding: 22.67rpx 0 15.33rpx 0;
+    position: relative;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  
+  
+/* 热门推荐 限时特惠 */
+.xsth-title {
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    align-items: flex-end;
+    margin-bottom: 20rpx;
+  }
+  .xpth-left {
+    width: 393rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  .season-hot{
+      display: flex;
+  }
+  .season-hot .season-item{
+      width: 266rpx;
+      height: 332rpx;
+      margin-right: 14rpx;
+      flex-shrink: 0;
+      font-weight: bold;
+        font-size: 25rpx;
+        color: #000000;
+      position: relative;
+      background: white;
+  }
+ 
+  .season-hot .season-item image{
+      width: 100%;
+      height: 200rpx;
+  }
+  .season-hot .season-item .hot-cover-img{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+  }
+
+  .xsth-more {
+    margin-top: 19.33rpx;
+    font-size: 27rpx;
+    font-family: HYZhongYuan;
+    font-weight: normal;
+    color: #FFE7C0;
+  }
+  .xsth-more image {
+    margin-left: 14.67rpx;
+    width: 12.67rpx;
+    height: 22.67rpx;
+    vertical-align: middle;
+  }
+
+  /* 元旦修改新增样式 */
+  .xpth-product {
+    width: 700rpx;
+    height: 373rpx;
+    border-radius: 27rpx;
+    padding: 25rpx 13rpx;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between; 
+  }
+  /* 元旦修改新增样式 */
+  .xpth-banner {
+    flex: 1;
+    margin-left: 15rpx;
+    height: 322rpx;
+    width: 100%;
+    border-radius: 0rpx;
+    overflow: hidden;
+    position: relative;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png");
+    background-size: 100% 100%;
+    padding: 3rpx;
+  }
+  .xpth-banner-swiper{
+      height: 100%;
+      border-radius: 20rpx;
+      overflow: hidden;
+  }
+  .xpth-banner image {
+    flex: 1;
+    height: 100%;
+    width: 100%;
+    border-radius: 20rpx;
+  }
+  .xpth-banner-dot-list{
+      position: absolute;
+      right: 0;
+      bottom: 10rpx;
+      padding: 10rpx;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+  }
+  .xpth-banner-dot-list .xpth-dot{
+      width: 9rpx;
+      height: 9rpx;
+      background: #FFFFFF;
+      border-radius: 50%;
+      opacity: 0.6;
+      margin: 0 4rpx;
+  }
+  .xpth-banner-dot-list .xpth-dot.active{
+      opacity: 1;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item {
+    border-radius: 20rpx;
+    height: 153rpx;
+    display: flex;
+    margin-bottom: 13rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png");
+    background-size: 100% 100%;
+    padding: 1rpx;
+  }
+  .xpth-item:last-child {
+    margin-bottom: 0;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item image {
+    /* width: 160rpx;
+    height: 160rpx;
+    background: #FFE7C0;
+    border-radius: 15rpx 0 0 15rpx; */
+    width: 157rpx;
+    height: 154rpx;
+    /* background: #72707D; */
+    border-radius: 20rpx;
+    /* margin-right: 15.33rpx; */
+    flex-shrink: 0;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-content {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    /* background: #FBECDE; */
+    padding-left: 15.33rpx;
+    border-radius: 0 15rpx 15rpx 0;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-title {
+    width: 210rpx;
+    font-size: 27rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    margin-right: 18rpx;
+    /* height: 80rpx; */
+  }
+
+  /* 元旦修改新增样式 */
+  .xpth-item-bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-right: 13.33rpx;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-price {
+    font-size: 31rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ED1C19;
+  }
+  /* 元旦修改新增样式 */
+  .xpth-item-price::before {
+    content: "￥";
+    font-size: 23rpx;
+  }
+
+
+
+
+
 .price {
   color: #D62828;
   font-size: 24rpx;
@@ -296,68 +358,54 @@ page {
   font-size: 31rpx;
   font-weight: 500;
 }
-/* .pic-list {
-  display: flex;
-  justify-content: space-between;
-  margin: 60rpx 0;
-}
-.pic-list image {
-  width: 155.33rpx;
-  height: 200rpx;
-  display: block;
-} */
-/* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */
+
 .pic-list {
-  /* width: 100%;
-  display: flex;
-  margin-right: 26rpx;
+  width: 100%;
   display: flex;
   justify-content: space-between;
-  flex-wrap: wrap; */
-    display: flex;
-    justify-content: space-around;
-    /* margin: 0 28rpx; */
+  flex-wrap: wrap;
 }
+.new-pic {
+    width: 340rpx;
+    height: 140rpx;
+    margin-bottom: 20rpx;
+  }
+
 .title-more {
-  font-size: 24rpx;
-  /* color: #0B898E; */
-  /* 元旦修改 */
-  color: #54504D;
+  font-size: 27rpx;
+  font-weight: 500;
+  color: #1A9BA7;
   z-index: 9;
   width: 173rpx;
-  height: 40rpx;
-  line-height: 40rpx;
-  background: rgba(255, 255, 255, 0.5);
+  height: 63.33rpx;
   border-radius: 20rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
 }
 .title-more .iconfont {
   font-size: 22rpx;
 }
 .slide-out-box {
-  /* margin-top: 20rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2); */
+  margin-top: 30rpx;
   border-radius: 27rpx;
   padding-bottom: 1rpx;
-  /* margin-bottom: 40rpx; */
+  margin-bottom: 40rpx;
 }
 .pbservice {
-  width: calc(160rpx * 8);
+  width: calc(186rpx * 7);
   display: flex;
-  margin-top: 5rpx;
-  /* flex-wrap: wrap; */
-  flex-wrap: nowrap;
-  /* padding-left: 12rpx; */
-  /* overflow-x: scroll; */
+  flex-wrap: wrap;
 }
 .pbservice-item {
-  width: 106rpx;
-  margin-bottom: 25rpx;
-  margin-right: 32.33rpx;
+  /* 元旦修改 截止到注释的width*/
+  width: 158rpx;
+  margin-bottom: 22rpx;
+  margin-right: 22rpx;
   text-align: center;
-  font-size: 27rpx;
-  color: #000;
+  font-size: 25rpx;
+  color: #111111;
   line-height: 24rpx;
   display: flex;
   align-items: center;
@@ -368,12 +416,9 @@ page {
   width: 200rpx;
 }
 .pbservice-item image {
-  /* width: 60rpx;
-  margin-bottom: 20rpx;
-  margin-top: 50rpx; */
-  /* 元旦修改 以上都是之前的*/
-  width: 80rpx;
-  margin-bottom: 10rpx;
+  width: 158rpx;
+  height: 152rpx;
+  /* margin-bottom: 10rpx; */
 }
 .six-box {
   margin-top: 43rpx;
@@ -397,9 +442,9 @@ page {
 }
 .hot-item {
   background: white;
-  box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+  /* box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); */
   border-radius: 15rpx;
-  margin-bottom: 35rpx;
+  margin-bottom: 15rpx;
 }
 .hot-item image:nth-child(1) {
   display: block;
@@ -407,12 +452,12 @@ page {
   border-radius: 15rpx 15rpx 0 0;
 }
 .hot-item .hot-info {
-  padding: 20rpx 25rpx;
+  padding: 12rpx;
 }
 .hot-item .hot-title {
-  font-size: 32rpx;
-  color: #333;
-  font-weight: 500;
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #000000;
 }
 .hot-info .tags {
   display: flex;
@@ -436,8 +481,6 @@ page {
 .hot-price {
   color: #D62828;
   font-size: 24rpx;
-  margin-top:28rpx;
-
 }
 .hot-price text:nth-child(2){
   font-size: 33rpx;
@@ -528,53 +571,34 @@ page {
   letter-spacing: 3rpx;
   font-weight: 500;
 }
-.title-header .icon-fanhui1 {
-  display: none;
-}
+
 .more-btn-text {
   text-align: center;
-  /* color: #0b898e;
-  font-size: 27rpx;
-  width: 200rpx;
-  line-height: 65rpx;
-  border: 1px solid #0b898e;
-  border-radius: 33rpx; */
   margin: 20rpx auto;
   width: 200rpx;
   height: 67rpx;
   line-height: 67rpx;
-  border: 1px solid #111;
-  border-radius: 35rpx;
+  border: 1px solid #2BB2D2;
   font-size: 27rpx;
   font-family: PingFang SC;
   font-weight: 500;
+  color: #2BB2D2;
 }
 .scroll-line {
-  /* height: 6rpx;
+
+  width: 34rpx !important;
+  height: 7rpx;
+  background: #87E1EC;
   border-radius: 3rpx;
-  background: #ccc;
-  overflow: hidden;
-  margin: 30rpx auto; */
-  /* 元旦修改 以上为注释部分 下面为新内容*/
-  width: 48rpx !important;
-  height: 8rpx;
-  /* background: #DDCEAC; */
-  background: #fff;
-  border-radius: 4rpx;
-  margin: 15rpx auto 10rpx;
+  margin: 33.33rpx auto;
 }
 .scroll-line-bg {
-  height: 8rpx;
-  background: #FF4848;
-  border-radius: 4rpx;
-}
-/* 元旦修改  新增样式 */
-.scroll-line-bg2 {
-  margin-left: 24rpx;
-  background: #FF4848;
-  height: 8rpx;
-  border-radius: 4rpx;
+  height: 7rpx;
+  background: #30A7CD;
+  border-radius: 3rpx;
 }
+
+
 .nomore-tip-btn {
   position: absolute;
   left: 0;
@@ -582,162 +606,40 @@ page {
   height: 78rpx;
   bottom: 0;
 }
-.prize-tip-text {
-  width: 267rpx;
-  display: block;
-  top: 39rpx;
-  left: 134rpx;
-  position: absolute;
-}
-.prize-name {
-  position: absolute;
-  text-align: center;
-  left: 132rpx;
-  right: 132rpx;
-  top: 169rpx;
-  font-size: 31rpx;
-  color: #333333;  
-}
-.prize-img {
-  width: 333rpx;
-  height: 240rpx;
-  border-radius: 13rpx;
-  overflow: hidden;
-  position: absolute;
-  left: 100rpx;
+
+.other-plats {
   display: flex;
+  font-size: 25rpx;
+  text-align: center;
+  margin: 30rpx 0;
+  color: #333333;
+  line-height: 42rpx;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  height: 187rpx;
+  border-radius: 27rpx;
   align-items: center;
-  justify-content: center;
-  top: 269rpx;
 }
-.prize-img image {
+.other-plats image {
+  width: 153.33rpx;
   display: block;
-  width: 333rpx;
-  height: 240rpx;
+  height: 146.67rpx;
+  margin-bottom: 15rpx;
 }
-.btn-box {
+
+.dot-list {
+  display: flex;
   position: absolute;
-  width: 400rpx;
-  height: 87rpx;
-  left: 67rpx;
-  bottom: 78rpx;
-  text-align: center;
-  line-height: 87rpx;
+  right: 43rpx;
+  bottom: 15rpx;
 }
-.btn-box image {
-  display: block;
-  width: 100%;
-}
-.btn-box navigator,.btn-box view {
-  color: #fff;
-  font-size: 35rpx;
-  font-weight: bold;
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 1;
-  right: 0;
-}
-.prize-coupon {
-  width: 293rpx;
-  height: 227rpx;
-  position: absolute;
-  top: 274rpx;
-  left: 120rpx;
-  color: #fff;
-  font-size: 24rpx;
-  text-align: center;
-}
-.prize-coupon image {
-  display: block;
-  width: 100%;
-}
-.prize-coupon-money {
-  position: absolute;
-  left: 0;
-  right: 0;
-  font-size: 80rpx;
-  font-weight: bold;
-  line-height: 110rpx;
-  top: 12rpx;
-}
-.prize-coupon-money::before{
-  content: "￥";
-  font-size: 32rpx;
-}
-.prize-coupon-tip {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 120rpx;
-}
-.other-plats {
-  display: flex;
-  font-size: 25rpx;
-  text-align: center;
-  margin-bottom: 30rpx;
-  color: #333333;
-  line-height: 42rpx;
-  flex-wrap: wrap;
-  background: #FFFED6;
-  justify-content: space-around;
-  height: 187rpx;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
-  border-radius: 27rpx;
-  align-items: center;
-}
-.other-plats image {
-  width: 80rpx;
-  display: block;
-  height: 80rpx;
-  margin-bottom: 15rpx;
-}
-.other-plat {
-  /* 春节新增样式 */
-  color: #54504D;
-}
-.other-plat:nth-child(4n){
-  margin-right: 0;
-}
-.old-btn {
-  position: fixed;
-  left: 0;
-  top: 170rpx;
-  writing-mode:tb-rl;
-  margin-top: 142rpx;
-  color: #0B898E;
-  font-size: 29rpx;
-  width: 64rpx;
-  height: 140rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  letter-spacing: 3rpx;
-  background: rgba(255, 255, 255, 0.7);
-  box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3);
-  border-radius: 0 13rpx 13rpx 0;
-  font-weight: 500;
-  z-index: 1;
-}
-.top-bg-img {
-  display: block;
-  width: 100%;
-  position: absolute;
-  left: 0;
-}
-.dot-list {
-  display: flex;
-  position: absolute;
-  right: 43rpx;
-  bottom: 15rpx;
-}
-.dot {
-  width: 11rpx;
-  height: 11rpx;
-  background: #FFFFFF;
-  opacity: 0.4;
-  border-radius: 50%;
-  margin-left: 8rpx;
+.dot {
+  width: 11rpx;
+  height: 11rpx;
+  background: #FFFFFF;
+  opacity: 0.4;
+  border-radius: 50%;
+  margin-left: 8rpx;
 }
 .dot.active {
   opacity: 1;
@@ -798,10 +700,7 @@ page {
   transition: all 1s;
   
 }
-.fullsp{
-  width: 100%;
-  height: 100%;
-}
+
 .time{
   width: 150rpx;
   height: 60rpx;
@@ -816,242 +715,23 @@ page {
   z-index: 1002;
 }
 
-/* 元旦修改新增样式 */
-.xpth {
-  /* width: 697rpx; */
-  /* height: 462rpx; */
-  /* background: linear-gradient(-90deg,  #FF9B6A, #D02E25);  */
-  border-radius: 20rpx;
-  padding: 22.67rpx 0 15.33rpx 0;
-  position: relative;
-  flex-direction: column;
-}
-/* 元旦修改新增样式 */
-.time-box {
-  font-size: 25rpx;
-  font-family: DIN;
-  font-weight: 500;
-  /* color: #54504D; */
-  color: #000000;
-  display: flex;
-  align-items: center;
-  height: 37px;
-  margin-left: -50rpx;
-  z-index: 9;
-  flex-wrap: nowrap;
-}
-/* 元旦修改新增样式 */
-.xsth-time {
-  /* margin: 0 5rpx; */
-  /* width: 50rpx; */
-  /* height: 33rpx; */
-  width: 43rpx;
-  height: 43rpx;
-  line-height: 43rpx;
-  background: #4AB648;
-  /* background: #F9F1DB; */
-  /* border-radius: 5rpx; */
-  border-radius: 13rpx;
-  font-size: 25rpx;
-  font-family: DIN;
-  font-weight: 500;
-  /* color: #D62828; */
-  color: white;
-  text-align: center;
-  /* line-height: 33rpx; */
-}
-.time-box text {
-  width: 18rpx;
-  text-align: center;
-}
-/* 元旦修改新增样式 */
-.xpth-left {
-  width: 393rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-/* 元旦修改新增样式 */
-.xsth-title {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-  align-items: flex-end;
-  margin-bottom: 20rpx;
-}
-/* 元旦修改新增样式 */
-.xsth-more {
-  margin-top: 19.33rpx;
-  font-size: 27rpx;
-  font-family: HYZhongYuan;
-  font-weight: normal;
-  color: #FFE7C0;
-}
-/* 元旦修改新增样式 */
-.xsth-more image {
-  margin-left: 14.67rpx;
-  width: 12.67rpx;
-  height: 22.67rpx;
-  vertical-align: middle;
-}
-/* 元旦修改新增样式 */
-.yanhua {
-  height: 104rpx;
-  width: 104rpx;
-  position: absolute;
-  right: 120rpx;
-  z-index: 999;
-}
-/* 元旦修改新增样式 */
-.xpth-product {
-  /* position: absolute; */
-  width: 697rpx;
-  height: 373rpx;
-  background: #FFFED6;
-  box-shadow: 0rpx 0rpx 3rpx 0rpx rgba(103,103,103,0.2);
-  border-radius: 27rpx;
-  padding: 25rpx 15rpx;
-  box-sizing: border-box;
-  /* left: 0;
-  bottom: 15.33rpx;
-  /* width: 710rpx; */
-  display: flex;
-  justify-content: space-between; 
-}
-/* 元旦修改新增样式 */
-.xpth-banner {
-  /* width: 270rpx; */
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); */
-  /* background-size: 100% 100%; */
-  border-radius: 20rpx;
-  flex: 1;
-  margin-left: 15rpx;
-  /* padding: 4rpx;
-  background: #72674e;
-  clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  height: 319rpx;
-}
-.xpth-banner image {
-  /* width: 270rpx; */
-  flex: 1;
-  height: 319rpx;
-  border-radius: 20rpx;
-  /* height: 333rpx; */
-  /* height: 340rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 5%, 100% 95%, 95% 100%, 5% 100%, 0 95%, 0 5%); */
-  /* border-radius: 20rpx; */
-}
-/* 元旦修改新增样式 */
-.xpth-item {
-  /* width: 413rpx;
-  height: 160rpx; */
-  /* background: #FFFFFF; */
-  /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
-  background-size: 100% 100%; */
-  border-radius: 20rpx;
-  height: 153rpx;
-  background: #FFFFFF;
-  display: flex;
-  margin-bottom: 13rpx;
-  /* margin-bottom: 10rpx; */
-  /* clip-path: polygon(5% 0, 95% 0, 100% 10%, 100% 90%, 95% 100%, 5% 100%, 0 90%, 0 10%); */
-  /* padding: 5rpx; */
-}
-.xpth-item:last-child {
-  margin-bottom: 0;
-}
-/* 元旦修改新增样式 */
-.xpth-item image {
-  /* width: 160rpx;
-  height: 160rpx;
-  background: #FFE7C0;
-  border-radius: 15rpx 0 0 15rpx; */
-  width: 157rpx;
-  height: 154rpx;
-  background: #72707D;
-  border-radius: 20rpx;
-  /* margin-right: 15.33rpx; */
-  flex-shrink: 0;
-}
-/* 元旦修改新增样式 */
-.xpth-item-content {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-  /* background: #FBECDE; */
-  padding-left: 15.33rpx;
-  border-radius: 0 15rpx 15rpx 0;
-}
-/* 元旦修改新增样式 */
-.xpth-item-title {
-  width: 230rpx;
-  font-size: 27rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #333333;
-  margin-right: 18rpx;
-  /* height: 80rpx; */
-}
-.xpth-tag {
-  font-size: 24rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #E5A54A;
-}
-/* 元旦修改新增样式 */
-.xpth-item-bottom {
+
+
+
+.ggfw-list {
   display: flex;
+  flex-wrap: wrap;
   justify-content: space-between;
-  align-items: center;
-  padding-right: 13.33rpx;
-}
-/* 元旦修改新增样式 */
-.xpth-item-price {
-  font-size: 32rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #D62828;
-}
-/* 元旦修改新增样式 */
-.xpth-item-price::before {
-  content: "￥";
-  font-size: 20rpx;
-}
-/* 元旦修改新增样式 */
-.xpth-item-buy {
-  width: 111rpx;
-  height: 36rpx;
-  background: linear-gradient(180deg, #FF9B6A, #E63100);
-  border-radius: 18rpx;
-  font-size: 21rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #FFE7C0;
-  text-align: center;
-  line-height: 36rpx;
-}
-/* 元旦修改新增样式 */
-.new-pic {
-  width: 155rpx !important;
-  height: 255rpx !important;
-  /* margin-bottom: 26.67rpx; */
 }
 
-.ggfw-list{
-    display: flex;
-    justify-content: space-around;
-}
-.ggfw {
-  width: auto;
-  margin:0;
+.ggfw-list .ggfw {
+  width: 220rpx;
+  height: 72rpx;
+  margin-bottom: 14rpx;
 }
 .ggfw image{
-  margin-bottom: 16.67rpx;
-  width: 113.33rpx !important;
-  height: 113.33rpx !important;
+  width: 100%;
+  height: 100%;
 }
 
 .six-box-new {
@@ -1061,16 +741,15 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-left: 13.33rpx;
   overflow: scroll;
-  margin-bottom: 53.33rpx;
+  margin: 32rpx 0 53.33rpx;
   z-index: 1;
   position: relative;
 }
 
 .six-box-new image {
-  width: 440rpx;
-  height: 213.33rpx !important;
+  width: 334rpx;
+  height: 193.33rpx !important;
   /* background: #FFE7C0; */
   border-radius: 20rpx;
   flex-shrink: 0;
@@ -1078,7 +757,7 @@ page {
 }
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #54504D;
+  color: #111111;
 }
 
 .rmtj-right {
@@ -1159,363 +838,36 @@ page {
 	left: 56.67rpx;
 	bottom: 64rpx;
 }
-
-.right-more {
-  width: 120rpx;
-  height: 47rpx;
-  border-radius: 7rpx;
-  border: 1px solid #111111;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #111111;
-  text-align: center;
-  line-height: 47rpx;
-}
-
-.hdrlNavList {
-  display: flex;
-  margin: 28rpx 26.67rpx 26rpx;
-  overflow-x: scroll;
-  flex-wrap: nowrap;
-}
-.hdrlNav {
-  flex-shrink: 0;
-  /* width: 160rpx; */
-  padding: 0 20rpx;
-  height: 53rpx;
-  background: #FCE7BF;
-  border-radius: 7rpx;
-  /* border: 1px solid #FFFFFF; */
-  min-width: 133rpx;
-
-  font-size: 32rpx;
-  color: #111111;
-  text-align: center;
-  line-height: 53rpx;
-  margin-right: 14rpx;
-  box-sizing: border-box;
-}
-.hdrlNavActive {
-  background: linear-gradient(180deg, #E2802B, #D1201B);
-  font-size: 32rpx;
-  color: #FFFFFF;
-  border: none;
-}
-.hdrlItem {
-  flex-shrink: 0;
-  padding: 10rpx;
-  /* width: 593.33rpx; */
-  display: flex;
-  background-size: 100% 100%;
-  background: linear-gradient(90deg, #EC2026, #3A3D83);
-  border-radius: 13rpx;
-  margin-right: 20rpx;
-  width: 573rpx;
-}
-.hdrlItem-img {
-  width: 240rpx;
-  height: 213rpx;
-  background: #8C8C8C;
-  border-radius: 7rpx;
+.jqssd {
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240606/20c06c5bf8d5e498667ebd954a1d95f8.png");
+  background-size: 100% 100%; */
+  width: 344.33rpx;
+  height: 160rpx;
   flex-shrink: 0;
-  margin-right: 12rpx;
-  overflow: hidden;
-}
-.hdrlItem-content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 213rpx;
-}
-.hdrlItem-title {
-  font-weight: bold;
-  font-size: 28rpx;
-  color: #000000;
-  margin-top: 15.33rpx;
 }
-.hdrlItem-date {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #000000;
-  margin-bottom: 19.33rpx;
-}
-
-.main-box {
-    width: 697rpx;
-    /* height: 273rpx; */
-    background: linear-gradient(180deg, #FFEED6, #FFDCA3);
-    border-radius: 13rpx;
-    margin: 110rpx auto 43rpx;
-    position: relative;
-    padding-top: 93rpx;
-    padding-bottom: 20rpx;
-    /* box-sizing: border-box; */
-}
-.main-box-top {
-  display: flex;
-  justify-content: space-between;
+.jqssd image, .sslk image{
   width: 100%;
-  padding: 16rpx;
-  box-sizing: border-box;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: -72rpx;
+  height: 100%;
 }
-.gfyj,.sslk {
-  width: 324.33rpx;
-  height: 131rpx;
+.sslk {
+  /* background: url("https://static.ticket.sz-trip.com/uploads/20240729/c1554fdd645a0d3a47c8e683186e1a73.png");
+  background-size: 100% 100%; */
+  width: 344rpx;
+  height: 160rpx;
   flex-shrink: 0;
 }
 
-
-.movieItem {
-  padding: 26.67rpx 26rpx 26.67rpx 20rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-  flex-shrink: 0;
-  height: 206.67rpx;
+.xsth-left{
+    /* flex: 1;
+    width: 1rpx; */
 }
-.movieItem-img {
-  width: 213rpx;
-  height: 213rpx;
-  border-radius: 18rpx;
-  margin-right: 18rpx;
-  flex-shrink: 0;
+.xsth-left>image{
+    max-width: 100%;
+    overflow: hidden;
 }
-.ysz-box {
-    margin: 26rpx auto 15.33rpx;
-    width: 697rpx;
-    height: 293rpx;
-    background: linear-gradient(180deg, #FFEED6, #FFDCA3);
-    border-radius: 13rpx;
 
-    padding-top: 3.33rpx;
-    position: relative;
-    z-index: 1;
-    box-sizing: border-box;
+::-webkit-scrollbar{
+    width: 0;
+    height: 0;
+    color: transparent;
 }
-.ysz-more {
-    width: 183rpx;
-    height: 53rpx;
-    border-radius: 7rpx;
-    border: 1px solid #000000;
-
-    margin: 38rpx auto 0;
-    text-align: center;
-    line-height: 53rpx;
-    font-weight: 500;
-    font-size: 25rpx;
-
-}
-.ysz-box2 {
-  /* padding: 20rpx 35rpx; */
-  padding-top: 23.33rpx;
-}
-.tjbd-title {
-  width: 286.67rpx;
-  height: 80rpx;
-}
-
-.bd-box {
-  position: relative;
-  padding: 36rpx 30.67rpx 44.67rpx 28.67rpx;
-  margin-left: 26.67rpx;
-  width: 582rpx;
-  /* height: 1133rpx; */
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-  /* box-shadow: 0rpx 7rpx 20rpx 0rpx rgba(224,61,60,0.26); */
-  border-radius: 20rpx 80rpx 20rpx 20rpx;
-}
-.bd-top {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 30rpx;
-  position: relative;
-}
-.zz {
-    width: 236.67rpx;
-    height: 206.67rpx;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 2;
-}
-.bd-type {
-  width: 125.33rpx;
-  height: 38.67rpx;
-}
-.bd-more {
-  width: 120rpx;
-  height: 47rpx;
-  background: rgba(255,255,255,.7);
-  border-radius: 23rpx;
-  font-weight: 500;
-  font-size: 27rpx;
-  color: #F34017;
-  z-index: 9;
-  text-align: center;
-  line-height: 47rpx;
-}
-.bd-index {
-  font-weight: bold;
-  font-size: 40rpx;
-  color: black;
-}
-.bd-item {
-  margin-left: 45.33rpx;
-  width: 453rpx;
-  height: 147rpx;
-  background: #FFFFFF;
-  border-radius: 13rpx;
-  display: flex;
-}
-.bd-item-img {
-    width: 147rpx;
-    height: 147rpx;
-    background: #D9D9D9;
-    border-radius: 13rpx;
-    flex-shrink: 0;
-    margin-right: 12.67rpx;
-}
-.bd-item-content {
-    padding: 14rpx 29.33rpx 13.33rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-.bd-item-title {
-    font-weight: bold;
-    font-size: 27rpx;
-    color: #333333;
-}
-.bd-item-bottom {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    width: 260rpx;
-}
-.bd-price {
-    font-size: 29.33rpx;
-    color: #F93434;
-    font-weight: bold;
-}
-.bd-price:after {
-  content:'起';
-  color: #999999;
-  font-size: 23rpx;
-  font-weight: 700;
-}
-.bd-price::before {
-  content:'￥';
-  font-size: 23rpx;
-}
-.bd-distance {
-  font-weight: 500;
-  font-size: 23rpx;
-  color: #999999;
-}
-
-.buyMovie {
-    width: 160rpx;
-    height: 56rpx;
-    background: #FF4848;
-    color: #fff;
-    border-radius: 20rpx;
-    text-align: center;
-    line-height: 56rpx;
-}
-
-.bg1 {
-  background: linear-gradient(-8deg, #F4F9FF, #B9E1F0);
-}
-.bg2 {
-  background: linear-gradient(-8deg, #F9FFE3, #F3FFC4);
-}
-.bg3 {
-  background: linear-gradient(180deg, #E0F7DC, #A0F292);
-}
-.bg4 {
-  background: linear-gradient(-8deg, #F6F2FF, #E3D9FF);
-}
-
-.hdrlNavList::-webkit-scrollbar{
-  display:none;
-}
-.hdrlList::-webkit-scrollbar{
-  display:none;
-}
-.bottom-box::-webkit-scrollbar{
-  display:none;
-}
-.slide-box::-webkit-scrollbar{
-  display:none;
-}
-.pbservice::-webkit-scrollbar{
-  display:none;
-}
-.textOver3 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
-.public-box {
-  width: 593.33rpx;
-  height: 266.67rpx;
-  background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png");
-  background-size: 100% 100%;
-}
-.one::-webkit-scrollbar{
-  display:none;
-}
-
-
-.date-container{
-    position: relative;
-}
-.nowDate{
-    display: flex;
-    position: absolute;
-    left: 200.77rpx;
-    bottom: 7.33rpx;
-}
-
-.nowDate>view{
-
-    width: 44rpx;
-    height: 44rpx;
-    border-radius: 7rpx;
-    text-align: center;
-    line-height: 44rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    font-size: 29rpx;
-    color: #111111;
-}
-.nowDate .num{
-    background: #FCE7BF;
-    color: #C11A20;
-    font-family: PingFang SC;
-    font-weight: bold;
-    font-size: 29rpx;
-    border-radius: 50%;
-}
-
-.ysz-right-img{
-    width: 213.33rpx;
-    height: 259.33rpx;
-    position: absolute;
-    right: -26rpx;
-    top: 44rpx;
-    z-index:1;
-}
-.hidden{
-  display: none;
-}
-
-.top-box image.search-icon{
-    width: 26.67rpx;
-    height: 26.67rpx;
-    margin-right: 20rpx;
-}
\ No newline at end of file
diff --git a/subPackages/index/index.js b/subPackages/index/index.js
index 36fb35e..d2f1380 100644
--- a/subPackages/index/index.js
+++ b/subPackages/index/index.js
@@ -416,8 +416,8 @@ Page({
         if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
             return img;
         } else {
-            // return "https://test.api.cloud.sz-trip.com"+img
-            return "https://static.ticket.sz-trip.com" + img;
+            return "https://test.api.cloud.sz-trip.com"+img
+            // return "https://static.ticket.sz-trip.com" + img;
         }
     },
 
diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js
index 36eb873..940c872 100644
--- a/subPackages/indexGQ/index.js
+++ b/subPackages/indexGQ/index.js
@@ -6,20 +6,14 @@ import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 Page({
 	data: {
+        fullAdvTimer: null,  // 全屏timer
 		banner: [],
 		xiaobanner: [],
 		height: 0,
 		padHeight: 0,
 		right: 0,
 		weather: null,
-		saleProduct: null,
-		roadProduct: null,
-		fourProduct: [],
-		hotIndex: 0,
-		indexHot: [],
-		area_ids: ["zhangjiagang", "changshu", "taicang", "kunshan", "wujiang", "wuzhong", "xiangcheng", "gusu",
-			"gongyeyuanqu", "gaoxin"
-		],
+
 		month: "",
 		months: ['JAN', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'oct', 'nov', 'dec'],
 		date: "",
@@ -46,500 +40,353 @@ Page({
 		opacity: 1,
 		time: 3, //全屏广告剩余时间
 		showTime: false,
-		xpth: {}, // 元旦新增 新品特惠和sqjNew
-		djs: null, // 元旦新增 新品特惠倒计时
-		djsTime: null,
-		sqjNew: [
-			'https://static.ticket.sz-trip.com/uploads/20240428/faede304469bb3e7b9bbf7001008d09a.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/77c3bd6c3f44ee0e3cc483557c1c7462.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/ad2324005ba1ed0cabe990ec62bfec76.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/a90f3ce4519a585cc5cebfe62d8d4043.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/e6fa6cdef2971c8abdb670be1f36d1ca.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/9c8186b8249bf81a2ef4fe4a4194cf2b.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/755ee01ac248aeda8812b025f483a869.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/2d29f0d14e634b0a78d4ef91b28d5999.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/71f7b558c7ca6d42728d48508d01819c.png',
-			'https://static.ticket.sz-trip.com/uploads/20240428/23e07551be831036116c2fedbbf7aea5.png',
-		],
+
 		viewHeight: "0px",
 		isMuted: true,
-    videoPlay: false,
-    hdrlNavList:[
-      {
-        type:null,
-        title:'全部'
-      },
-      {
-        type:'scene',
-        title:'景区活动'
-      },
-      {
-        type:'show',
-        title:'演出'
-      },
-      {
-        type:'exhibition',
-        title:'展览'
-      },
-      {
-        type:'movie',
-        title:'电影'
-      },
-      {
-        type:'other',
-        title:'其他'
-      }
-    ], //活动日历板块导航分类
-    hdrlNavIndex:0,//活动日历默认选中第一个全部分类
-    today:null,
-    hdrlList:[],
-    yszNav:['公共服务','旅游助手'],
-    yszIndex:0,
-    bdList:[
+        videoPlay: false,
+        hdrlNavList:[
         {
-            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/4b46ddaa6f9b66fd33c85b4cd34aa2e3.png', //游 景点
-            url:'',
-            path:'/pages/list/scene/index',
-            list: [],
-            
+            type:null,
+            title:'全部'
         },
         {
-            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/218d224b27b6363e11a5e2ec25990ff2.png', //非玩不可 景点产品
-            path:'/pages/list/night/index',
-            url:'',
-            list: [],
-            
+            type:'scene',
+            title:'景区活动'
         },
         {
-            bg: 'linear-gradient(172deg, #FDFADC, #FCD6AA);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/b53c5039299b3152f72eae11a88b7eae.png', //非看不可
-            url:'',
-            path:'/pages/list/theatre/index',
-            list: [],
-            
+            type:'show',
+            title:'演出'
         },
         {
-            bg: 'linear-gradient(172deg, #FFCBA3, #FF9166);',
-            icon:'https://static.ticket.sz-trip.com/uploads/20250120/307d96f6b88be850eb5cd67ef7942f32.png', //非买不可
-            path:'/subPackages/techanNew/index',
-            url:'',
-            list: [],
-            
+            type:'exhibition',
+            title:'展览'
         },
-      
-      
-    ],
-    list1:[], //游-景点
-    list2:[], //非晚-夜游
-    list3:[], //非看-剧场演出
-    list4:[], //非买-文创
-    
-    nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)]
+        {
+            type:'movie',
+            title:'电影'
+        },
+        {
+            type:'other',
+            title:'其他'
+        }
+        ], //活动日历板块导航分类
+        hdrlNavIndex:0,//活动日历默认选中第一个全部分类
+        today:null,
+        hdrlList:[],
+        yszNav:['公共服务','旅游助手'],
+        yszIndex:0,
+        bdList:[
+            {
+                color: '#FFE4BC',
+                bg: 'linear-gradient(172deg, #F08528, #D1201B);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/069ab247bb2ab5a08fa7707d671b1ac5.png', //游 景点
+                url:'',
+                path:'/pages/list/scene/index',
+                list: [],
+                
+            },
+            {   
+                color: '#DBD8F6',
+                bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/8c023b9c626d3821b64d105ae6e65f2d.png', //非玩不可 景点产品
+                // path:'/pages/list/night/index',
+                url:'https://m.cloud.sz-trip.com/nightTour2025',
+                path: '',
+                list: [],
+                
+            },
+            {
+                color: '#FFE4BC',
+                bg: 'linear-gradient(172deg, #F08528, #D1201B);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/9928f46523fd57233b6ef3371a6ba460.png', //非看不可
+                url:'',
+                path:'/pages/list/theatre/index',
+                list: [],
+                
+            },
+            {
+                color: '#DBD8F6',
+                bg: 'linear-gradient(172deg, #A49CE9, #353A68);',
+                icon:'https://static.ticket.sz-trip.com/uploads/20250429/a4f53072aa51a387593a183799b902e6.png', //非买不可
+                path:'/subPackages/techanNew/index',
+                url:'',
+                list: [],
+                
+            },
+        
+        
+        ],
+
+        nowDate: [('0' + (new Date().getMonth() + 1)).slice(-2) , ('0' + new Date().getDate()).slice(-2)],
+        isMayDay: new Date().getTime()>new Date('2025/05/01 00:00:00').getTime()
     
 	},
-	onLoad: function(options) {
-		this.getHeight()
-		//全屏广告
-		wx.hideTabBar() //这里隐藏了底部导航栏
-		commonApi._post("adv/getAdv", {
-			position: 2,
-			type_id: 3
-		}).then(res => {
-			if (res.data.length > 0) {
-				let length = res.data.length
-				if (res.data.length > 1) {
-					let num = Math.floor(Math.random() * length);
-					console.log('num', num);
-					this.setData({
-						startList: res.data[num]
-					})
-					console.log(this.data.startList.head_img);
-				} else {
-					this.setData({
-						startList: res.data[0]
-					})
-				}
+    onLoad: function(options) {
+            //全屏广告
+            let _this = this
+            commonApi._post("adv/getAdv", {
+                position: 2,
+                type_id: 3
+            }).then(res => {
+                if (res.data.length > 0) {
+                    wx.hideTabBar() //这里隐藏了底部导航栏
 
-				// 图片
-				if (this.data.startList.media_type) {
-					this.setData({
-						showTime: true
-					})
-					var timer = setInterval(() => {
-						this.setData({
-							time: this.data.time - 1
-						})
-						if (this.data.time === 0) {
-							var opacityTimer = setInterval(() => {
-								this.setData({
-									opacity: this.data.opacity - 0.3
-								})
-							}, 100)
-						}
-						if (this.data.time == -1) {
-							clearInterval(timer)
-							clearInterval(opacityTimer)
-							wx.showTabBar() //倒计时结束清除定时器显示导航栏
-							this.setData({
-								showFullAdv: false
-							})
-						}
-					}, 1000)
-				} else {
-					// 视频
-				}
-			} else {
-				this.setData({
-					showFullAdv: false
-				})
-			}
-		})
-		if (options.from) {
-			app.globalData.from = options.from;
-    }
-    // 获取今天的日期
-		let today = new Date();
-		this.setData({
-			month: (this.data.months[today.getMonth()]).toUpperCase(),
-			date: today.getDate()
-		})
-    let d = new Date();
-    let month = d.getMonth() + 1,
-      day = d.getDate();
-    month = month > 10 ? month : ("0" + month);
-    day = day > 10 ? day : ("0" + day);
-    this.setData({
-      today: d.getFullYear() + "-" + month + "-" + day
-    })
-		let systemInfo = wx.getSystemInfoSync(),
-			rect = wx.getMenuButtonBoundingClientRect();
-		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
-		wx.getLocation({
-			type: 'gcj02',
-			success: (res) => {
-				this.setData({
-					lat: res.latitude,
-					lon: res.longitude
-				})
-        this.getList()
-        this.getHdrlList()
-			},
-			fail: (err) => {
-        this.getList()
-        this.getHdrlList()
-			}
-		})
-		this.setData({
-			height: height,
-			padHeight: systemInfo.statusBarHeight,
-			right: (systemInfo.screenWidth - rect.right) + rect.width
-		})
+                    let length = res.data.length
+                    if (res.data.length > 1) {
+                        let num = Math.floor(Math.random() * length);
+                        console.log('num', num);
+                        this.setData({
+                            startList: res.data[num]
+                        })
+                        console.log(this.data.startList.head_img);
+                    } else {
+                        this.setData({
+                            startList: res.data[0]
+                        })
+                    }
 
-		commonApi._post("pbservice/Other/getClientConfig", {
-			unique_key: "urltopage"
-		}).then(res => {
-			let data = JSON.parse(res.data)
-			this.setData({
-				urltopage: data
-			})
-		})
-		this.getTwoProduct()
-		this.getBanner()
-    this.getWeather()
-  },
-  gobdDetail(e) {
-    let item = e.currentTarget.dataset.item
-    // wx.navigateTo({
-    //   url: url
-    // })
-    util.gotoDetail(item)
-  },
-  getList() {
-    let bdList = this.data.bdList
-    // 游--景点
-    commonApi._post("scene/get_scene_by_tag",{
-      tag_id:"4",
-      limit:6,
-      lon:this.data.lon,
-      lat:this.data.lat,
-      offset:0,
-      sort:"weight",
-      title:'',
-      area_id:''
-    }).then(res=>{
-      console.log('景点', res)
-      res.data.list.map(item => {
-        if (item.distance || item.distance == 0) {
-          if (item.distance >= 1000) {
-            item.distance = (item.distance / 1000).toFixed(2) + 'km';
-          } else {
-            item.distance = (item.distance).toFixed(2) + 'm';
-          }
-        }
-      })
-      bdList[0].list = res.data.list
-      this.setData({
-        list1:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非买不可--文创
-    commonApi._post('product/get_product_by_tag',{
-        product_model: 'post',
-      offset: 0,
-      limit: 6,
-      sort:'sales_number',
-      order:'desc',
-    }).then(res=>{
-        bdList[3].list = res.data.list
-      this.setData({
-        list4:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非游不可--线路一日游
-    commonApi._post('product/get_product_by_tag',{
-    //   type_id: 23,
-      tag_id: "10,11,12",
-      offset: 0,
-      limit: 6,
-      sort: 'weight'
-    }).then(res=>{
-        bdList[1].list = res.data.list
-      this.setData({
-        list2:res.data.list,
-        bdList: bdList
-      })
-    })
-    // 非看不可--剧场演出
-    commonApi._post("product/get_product_by_tag",{
-      tag_id:"477",
-      offset:0,
-      limit:6,
-      sort:'',
-      order:'',
-      lat:this.data.lat,
-      lon:this.data.lon,
-      title:''
-    }).then(res=>{
-        bdList[2].list = res.data.list
-      this.setData({
-        list3:res.data.list,
-        bdList: bdList
-      })
-    })
-  },
-  goDetail(e) {
-    let item = e.currentTarget.dataset.item;
-    let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
-    if (type == 'movie') {
-    //   wx.navigateTo({
-    //     url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
-    //   })
-        util.goMovieDetail(item.third_id)
-    }else {
-      wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id=' + item.id,
-      })
-    }
-  },
-  // 分类为电影时调这个接口
-  getMovieList() {
-    let service = "Cinema/getHotMovieList";
-		let data = {
-			page: 1,
-			pageSize: 5
-    };
-    commonApi._post(service, data).then(res => {
-      console.log(res.data);
-			this.setData({
-				hdrlList: res.data
-			})
-    })
-    console.log(this.data.hdrlList);
-  },
-  // 推荐榜单更多跳转
-  moreBtn(e) {
-    let item = e.currentTarget.dataset.item
-    if (item.path!='') {
-      wx.navigateTo({
-        url: item.path,
-      })
-    } else {
-      // if (e.currentTarget.dataset.event) {
-      //   this.pagePoint({
-      //     event: e.currentTarget.dataset.event
-      //   }, 1)
-      // }
-      let url = item.url;
-      app.globalData.weburl = url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
-      })
-    }
-  },
-  // 活动日历下的列表
-  getHdrlList() {
-    commonApi._post('pbservice/Actcalendar/getActList', {
-      page_no: 1,
-      date: this.data.today,
-      category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
-      keywords: '',
-      area_key: '',
-      lat: this.data.lat,
-      lon: this.data.lon,
-      page_num: 5
-    }).then(res => {
-        res.data.rows.forEach(v=>{
-            if (!v.post_url) {
-                v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+                    // 图片
+                    if (this.data.startList.media_type) {
+                        this.setData({
+                            showTime: true
+                        })
+                        this.data.fullAdvTimer = setInterval(() => {
+                            _this.data.time-=0.5
+                            if (Number.isInteger(_this.data.time)) {
+                                _this.setData({time: _this.data.time})
+                            }
+                            if (_this.data.time <= 0) {
+								// 可以css 优化
+                                _this.setData({opacity: 0})
+                            }
+                            if (_this.data.time <= -1) {
+                                clearInterval(_this.data.fullAdvTimer)
+                                wx.showTabBar() //倒计时结束清除定时器显示导航栏
+                                _this.setData({showFullAdv: false})
+                            }
+                        }, 500)
+                    } else {
+                        // 视频
+                    }
+                } else {
+                    this.setData({
+                        showFullAdv: false
+                    })
+                }
+            })
+            if (options.from) {
+                app.globalData.from = options.from;
             }
+            this.getHeight()
+            
+            
+            // 获取今天的日期
+            let today = new Date();
+            let d = new Date();
+            let month = d.getMonth() + 1,day = d.getDate();
+            month = month > 10 ? month : ("0" + month);
+            day = day > 10 ? day : ("0" + day);
+            this.setData({
+                month: (this.data.months[today.getMonth()]).toUpperCase(),
+                date: today.getDate(),
+                today: d.getFullYear() + "-" + month + "-" + day
+            })
+    },
+    gobdDetail(e) {
+        let item = e.currentTarget.dataset.item
+        util.gotoDetail(item)
+    },
+    getList() {
+        let bdList = this.data.bdList
+        // 游--景点
+        commonApi._post("scene/get_scene_by_tag",{
+        tag_id:"4",
+        limit:6,
+        lon:this.data.lon,
+        lat:this.data.lat,
+        offset:0,
+        sort:"weight",
+        title:'',
+        area_id:''
+        }).then(res=>{
+        console.log('景点', res)
+        res.data.list.map(item => {
+            if (item.distance || item.distance == 0) {
+            if (item.distance >= 1000) {
+                item.distance = (item.distance / 1000).toFixed(2) + 'km';
+            } else {
+                item.distance = (item.distance).toFixed(2) + 'm';
+            }
+            }
+        })
+        bdList[0].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+        // 非买不可--文创
+        commonApi._post('product/get_product_by_tag_subject',{
+        offset: 0,
+        limit: 6,
+        tag_id: 60,
+        }).then(res=>{
+            bdList[3].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+        // 非玩不可--线路一日游
+        commonApi._post('product/get_product_by_tag_subject',{
+        tag_id: "58",
+        offset: 0,
+        limit: 6,
+        }).then(res=>{
+            bdList[1].list = res.data.list
+        this.setData({
+            bdList: bdList
         })
-      this.setData({
-        hdrlList:res.data.rows
-      })
-    })
-  },
-  // 切换活动日历分类
-  changeHdrlNav(e) {
-    console.log(e.currentTarget.dataset);
-    this.setData({
-      hdrlList:[],
-      hdrlNavIndex:e.currentTarget.dataset.index,
-    })
-    if (this.data.hdrlNavIndex == 4) {
-      this.getMovieList()
-    } else {
-      this.getHdrlList() //切换分类重新获取活动日历列表
-    }
-  },
-  // 游苏州下的公共服务和旅游助手切换
-  changeType(e) {
-    this.setData({
-      yszIndex:e.currentTarget.dataset.index,
-    })
-  },
-  xlzs: function (e) {
+        })
+        // 非看不可--剧场演出
+        commonApi._post("product/get_product_by_tag_subject",{
+        tag_id:"59",
+        offset:0,
+        limit:6,
+        }).then(res=>{
+            bdList[2].list = res.data.list
+        this.setData({
+            bdList: bdList
+        })
+        })
+    },
+    goDetail(e) {
+        let item = e.currentTarget.dataset.item;
+        let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type
+        if (type == 'movie') {
+        //   wx.navigateTo({
+        //     // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
+        //   })
+            util.goMovieDetail(item.third_id || item.id)
+        }else {
+        wx.navigateTo({
+            url: '/pages/info/activityInfo/index?id=' + item.id,
+        })
+        }
+    },
+    // 分类为电影时调这个接口
+    getMovieList() {
+        let service = "Cinema/getHotChannelMovieList";
+            let data = {
+                page: 1,
+                pageSize: 5
+        };
+        commonApi._post(service, data).then(res => {
+        console.log(res.data);
+                this.setData({
+                    hdrlList: res.data
+                })
+        })
+        console.log(this.data.hdrlList);
+    },
+    // 推荐榜单更多跳转
+    moreBtn(e) {
+        console.log(e)
+        let item = e.currentTarget.dataset.item
+        if (item.path!='') {
+        wx.navigateTo({
+            url: item.path,
+        })
+        } else {
+        // if (e.currentTarget.dataset.event) {
+        //   this.pagePoint({
+        //     event: e.currentTarget.dataset.event
+        //   }, 1)
+        // }
+        console.log('error', item)
+        let url = item.url;
+        app.globalData.weburl = url;
+        wx.navigateTo({
+            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+        })
+        }
+    },
+    // 活动日历下的列表
+    getHdrlList() {
+        commonApi._post('pbservice/Actcalendar/getActList', {
+        page_no: 1,
+        date: this.data.today,
+        category: this.data.hdrlNavList[this.data.hdrlNavIndex].type,
+        keywords: '',
+        area_key: '',
+        lat: this.data.lat,
+        lon: this.data.lon,
+        page_num: 5
+        }).then(res => {
+            res.data.rows.forEach(v=>{
+                if (!v.post_url) {
+                    v.post_url = "https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg"
+                }
+            })
+        this.setData({
+            hdrlList:res.data.rows
+        })
+        })
+    },
+    // 切换活动日历分类
+    changeHdrlNav(e) {
+        console.log(e.currentTarget.dataset);
+        this.setData({
+        hdrlList:[],
+        hdrlNavIndex:e.currentTarget.dataset.index,
+        })
+        if (this.data.hdrlNavIndex == 4) {
+        this.getMovieList()
+        } else {
+        this.getHdrlList() //切换分类重新获取活动日历列表
+        }
+    },
+    // 游苏州下的公共服务和旅游助手切换
+    changeType(e) {
+        this.setData({
+        yszIndex:e.currentTarget.dataset.index,
+        })
+    },
+    xlzs: function (e) {
 
-    wx.navigateToMiniProgram({
-      appId: 'wx757dd1ee184e75e9',
-      page: "pages/tabBar/index/index"
-    })
-  },
+        wx.navigateToMiniProgram({
+        appId: 'wx757dd1ee184e75e9',
+        page: "pages/tabBar/index/index"
+        })
+    },
   // 获取导航栏项目标题高度
 	getHeight() {
 		let that = this
-		wx.getSystemInfo({
-			success(res) {
-				console.log(res)
-				that.setData({
-					viewHeight: res.windowHeight + 'px'
-				})
-				console.log(that.data.viewHeight)
-			}
+		let systemInfo = wx.getStorageSync('systemInfo'),rect = wx.getMenuButtonBoundingClientRect();
+		if (!systemInfo) {systemInfo = wx.getSystemInfoSync()}
+		if (!rect) {rect = wx.getMenuButtonBoundingClientRect()}
+		let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+
+		that.setData({
+			viewHeight: systemInfo.windowHeight + 'px',
+			height: height,
+			padHeight: systemInfo.statusBarHeight,
+			right: (systemInfo.screenWidth - rect.right) + rect.width
 		})
 	},
-	// getXpthList: function() {
-	// 	// 元旦新增 新品特惠
-	// 	commonApi._post("product/get_product_indulgence", {
-	// 		tag_id: 275,
-	// 		typeId: 3,
-	// 	}).then(res => {
-	// 		console.log('data', res.data);
-	// 		this.setData({
-	// 			xpth: res.data,
-	// 			djsTime: res.data.time
-	// 		})
-	// 		let time = setInterval(() => {
-	// 			this.setData({
-	// 				djsTime: this.data.djsTime - 1
-	// 			})
-	// 			this.formatDate(this.data.djsTime)
-	// 		}, 1000)
-	// 		if (this.data.djsTime == 0) {
-	// 			clearInterval(time)
-	// 		}
-	// 	})
-	// },
-	// 元旦新品特惠 倒计时 
-	// formatDate: function(oTime) {
-	// 	let h = parseInt(oTime / 3600)
-	// 	let m = parseInt((oTime % 3600) / 60)
-	// 	let s = parseInt(oTime % 60)
-	// 	h = h < 10 ? "0" + h : h;
-	// 	m = m < 10 ? "0" + m : m;
-	// 	s = s < 10 ? "0" + s : s;
-	// 	this.setData({
-	// 		djs: {
-	// 			h: h,
-	// 			m: m,
-	// 			s: s
-	// 		}
-	// 	})
-	// 	return
-	// },
-  // 非遗跳转
-  // goFeiyi: function() {
-	// 	app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons'
-	// 	wx.navigateTo({
-	// 		url: "/pages/pbService/web/index"
-	// 	})
-	// },
-	// onTabItemTap: function(e) {
-	// 	console.log(e, 99999999)
-  // },
-  // 大轮播的监听方法
+
+    // 大轮播的监听方法
 	changeBannerIndex: function(e) {
 		this.setData({
 			activeBannerIndex: e.detail.current
 		})
-  },
-  // 小轮播监听方法
+    },
+    // 小轮播监听方法
 	changeSmBannerIndex: function(e) {
 		this.setData({
 			smBannerIndex: e.detail.current
 		})
 	},
-	// 一城百馆
-	city: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx114d514f39cb1fed',
-			path: "pages/entry/index"
-		})
-		commonApi._post("browse/burying_point", {
-			drive: "mini",
-			title: "一城百馆",
-			uuid: app.globalData.uuid
-		}).then(res => {
 
-		})
-	},
-	changeHotIndex: function(e) {
-		this.setData({
-			hotIndex: e.currentTarget.dataset.index,
-			fourProduct: []
-		})
-		this.getFourProduct()
-	},
 	getBanner: function() {
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xcxBanner"
-		// }).then(res=>{
-		//   console.log(res)
-		//   this.setData({
-		//     banner:res.data.content || []
-		//   })
-		// })
-		// commonApi._post("adv/getAdvByKey",{
-		//   key:"xiaobanner"
-		// }).then(res=>{
-		//   this.setData({
-		//     xiaobanner:res.data.content || []
-		//   })
-		// })
-		// return;
 		commonApi._post("adv/getAdv", {
 			position: 0,
 			type_id: 3
@@ -576,13 +423,27 @@ Page({
 	},
 	//获取季节配置
 	getIndexSeason() {
-		this.setData({
-			indexHot: app.globalData.configJson.indexHot,
-			isTest: app.globalData.configJson.isTest,
-			otherPlat: app.globalData.configJson.otherPlats,
-			indexSeason: app.globalData.configJson.indexSeason
-		})
-		this.getFourProduct()
+        if (app.globalData.configJson.indexSeason) {
+            this.setData({
+                isTest: app.globalData.configJson.isTest,
+                otherPlat: app.globalData.configJson.otherPlats,
+                indexSeason: app.globalData.configJson.indexSeason
+            })
+        } else {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+                let obj = {}
+                res.data.content.forEach(item => {
+                    obj[item.id] = item.image
+                });
+                app.globalData.configJson.indexSeason = obj 
+                app.globalData.loadIndexSeason = true
+                this.setData({
+                    isTest: app.globalData.configJson.isTest,
+                    otherPlat: app.globalData.configJson.otherPlats,
+                    indexSeason: app.globalData.configJson.indexSeason
+                })
+            })
+        }
 	},
 	//关闭弹窗广告
 	closeAdv: function() {
@@ -597,7 +458,8 @@ Page({
 	closeFullAdv: function() {
 		this.setData({
 			showFullAdv: false
-		})
+        })
+        clearInterval(this.data.fullAdvTimer)
 		if (!this.data.alertSwipeList.length > 0) {
 			wx.showTabBar({
 				animation: true,
@@ -634,113 +496,9 @@ Page({
 			})
 		})
 	},
-	saleDetail: function() {},
-	getTwoProduct: function() {
-		// 获取首页限时特惠
-		commonApi._post('act/fast_sale_now', {
-			offset: 0,
-			limit: 1
-		}).then(res => {
-			if (res.data[0] && res.data[0].fast_sales_sku[0]) {
-				if (res.data[0].fast_sales_sku.length > 0) {
-					let price = res.data[0].fast_sales_sku[0].price
-					let data = res.data[0].fast_sales_sku[0]
-					for (let item of res.data[0].fast_sales_sku) {
-						if (price > item.price) price = item.price
-					}
-					data.price = price
-					this.setData({
-						saleProduct: data
-					})
-				} else {
-					this.setData({
-						saleProduct: res.data[0].fast_sales_sku[0]
-					})
-				}
-			}
-		})
-		commonApi._post("product/get_product_by_tag", {
-			tag_id: 17,
-			offset: 0,
-			limit: 1,
-			sort: 'price',
-			order: 'asc'
-		}).then(res => {
-			if (res.data.list.length > 0) {
-				let price = res.data.list[0].price
-				for (let item of res.data.list) {
-					if (item.price > price) {
-						price = item.price
-					}
-				}
-				let data = res.data.list[0]
-				data.price = price
-				this.setData({
-					roadProduct: data
-				})
-			} else {
-				this.setData({
-					roadProduct: [111]
-				})
-			}
-		})
-	},
-	getFourProduct: function() {
-		let item = this.data.indexHot[this.data.hotIndex],
-			service = "product/get_product_by_tag",
-			data = {
-				tag_id: item.id,
-				offset: 0,
-				limit: 4,
-				sort: 'weight',
-				order: 'desc'
-			};
-		if (item.type == 'scene') {
-			service = "scene/get_scene_by_tag";
-		} else if (item.type == 'movie') {
-			service = "Cinema/getHotMovieList";
-			data = {
-				page: 1,
-				pageSize: 4
-			};
-		}
-		commonApi._post(service, data).then(res => {
-			this.setData({
-				fourProduct: res.data.list || res.data
-			})
-		})
-	},
-	tagGotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
-		if (this.data.indexHot[this.data.hotIndex].type == 'movie') {
-			// wx.navigateTo({
-			// 	url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' +
-			// 		item.title,
-            // })
-            util.goMovieDetail(item.third_id,item.title)
-		} else {
-			util.gotoDetail(item)
-		}
-	},
-	productGotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
-		util.gotoDetail(item)
-	},
 	gotoPath: function(e) {
     console.log(e)
-		// if (e.currentTarget.dataset.event) {
-		//   if (e.currentTarget.dataset.event=='gongyeyuanqu_click') {
-		//     wx.navigateToMiniProgram({
-		//       appId: 'wxd323e63a10aa6865',
-		//       path: 'pages/home/index'
-		//     })
-		//     return
-		//   }else{
-		//     this.pagePoint({
-		//       event: e.currentTarget.dataset.event
-		//     }, 1)
-		//   }
-		// }
+		
 		if (e.currentTarget.dataset.title == '书香借阅') {
 			wx.navigateToMiniProgram({
 				appId: 'wx165d4f1727f6bdb0',
@@ -803,15 +561,6 @@ Page({
 			})
 		}
 	},
-	// 元旦  新品特惠部分
-	goBanner: function(e) {
-		console.log('新品特惠', e.currentTarget.dataset.url);
-		let url = e.currentTarget.dataset.url;
-		app.globalData.weburl = url;
-		wx.navigateTo({
-			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
-		})
-	},
 	gotoUrl: function(e) {
 		console.log(e)
 		if (e.currentTarget.dataset.event) {
@@ -826,7 +575,7 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
 		})
     },
-    	// 实时路况跳转外链
+    // 实时路况跳转外链
 	gotoUrls() {
 		// 判断是否登录
 		var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
@@ -858,22 +607,7 @@ Page({
 			path: path
 		})
 	},
-	garbage: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wx13be821f3b1afed3',
-			path: 'pages/home/home'
-		})
-	},
-	gotoSku: function() {
-		commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-			console.log(res)
-			app.globalData.weburl = res.data.url;
-			wx.navigateTo({
-				url: '/pages/pbService/web/index'
-			})
-			return;
-		})
-	},
+
 	audioGuide: function() {
 		wx.navigateToMiniProgram({
 			appId: 'wx74f380bc721a0379',
@@ -887,34 +621,7 @@ Page({
 
 		})
 	},
-	// 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
-	// getList: function() {
-	// 	if (!this.data.listMore) return;
-	// 	commonApi._post("search/recommend", {
-	// 		offset: this.data.list.length,
-	// 		limit: 16
-	// 	}).then(res => {
-	// 		res.data.map(item => {
-	// 			if (item.ext.display_tags) {
-	// 				item.ext.display_tags = item.ext.display_tags.split(",").splice(0, 2)
-	// 			} else {
-	// 				item.ext.display_tags = []
-	// 			}
-	// 		})
-	// 		if (res.data.length < 15) {
-	// 			this.setData({
-	// 				listMore: false
-	// 			})
-	// 		}
-	// 		this.setData({
-	// 			list: this.data.list.concat(res.data)
-	// 		})
-	// 	})
-	// },
 	onReachBottom: function() {
-		// if (this.data.list.length < 30) {
-		// 	this.getList()
-		// }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
@@ -934,12 +641,7 @@ Page({
 			util.gotoDetail(item.ext);
 		}
 	},
-	meituan: function() {
-		wx.navigateToMiniProgram({
-			appId: 'wxde8ac0a21135c07d',
-			path: "hotel/pages/h5/index?q=https%3A%2F%2Ffenxiao.meituan.com%2Fopdtor%2Fh5%2Fhotel%2Fsearch%3FpartnerId%3D16829"
-		})
-	},
+
 	// 轮播图点击
 	bannerClick: function(e) {
 		if (this.data.isTest) return;
@@ -1042,206 +744,52 @@ Page({
 			url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(weburl),
 		})
 	},
-	// bannerClick2: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.action == 'href') {
-	// 		if (item.href.indexOf(",") != -1) {
-	// 			let info = item.href.split(",");
-	// 			wx.navigateToMiniProgram({
-	// 				appId: info[0],
-	// 				path: info[1]
-	// 			})
-	// 		} else if (item.href.indexOf('map/index') != -1) {
-	// 			wx.reLaunch({
-	// 				url: item.href
-	// 			})
-	// 		} else {
-	// 			wx.navigateTo({
-	// 				url: item.href,
-	// 			})
-	// 		}
-	// 	} else if (item.action == "web") {
-	// 		app.globalData.weburl = item.href;
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.href),
-	// 		})
-	// 	}
-	// },
 	// 监听文旅查询的scroll
 	listenScroll(e) {
 		this.setData({
 			scrollLeft: e.detail.scrollLeft
 		})
 	},
-	// // 获取短视频大赛是否中奖 中奖详情
-	// getVideoPrize() {
-	// 	let user_id = wx.getStorageSync('jstrip_userid');
-	// 	if (!user_id || wx.getStorageSync('indexPriceNoTip')) return;
-	// 	commonApi.user_post('actonline/video_act/getRaffle', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			videoPrize: res.data
-	// 		})
-	// 	})
-	// },
-	// noMoreTip() {
-	// 	wx.setStorageSync('indexPriceNoTip', true)
-	// 	this.closePrice()
-	// },
-	// closePrice() {
-	// 	this.setData({
-	// 		videoPrize: false,
-	// 		prizeInfo: null
-	// 	})
-	// },
-	// 抽奖
-	// choosePrize() {
-	// 	commonApi.user_post('actonline/video_act/luckyDraw', {
-	// 		act_id: 5
-	// 	}).then(res => {
-	// 		this.setData({
-	// 			prizeInfo: res.data
-	// 		})
-	// 		if (res.data.type != 'none') {
-	// 			// 抽奖成功的话 弹框
-	// 			wx.showModal({
-	// 				title: "提示",
-	// 				content: "中奖人员请联系君到苏州客服，领奖方式以客服通知为准",
-	// 				showCancel: false
-	// 			})
-	// 		}
-	// 	})
-	// },
-	// bannerJumpNew(item) {
-	// 	let that = this
-	// 	item = item.currentTarget.dataset.item
-	// 	if (item.tdata == '') return
-	// 	that.pagePoint({
-	// 		event: "banner_click",
-	// 		type: 'banner'
-	// 	}, 1)
-	// 	switch (item.jump_type) {
-	// 		case 0:
-	// 			break;
-	// 		case 1:
-	// 			util.gotoDetail(item.product_model)
-	// 			break;
-	// 		case 2:
-	// 			if (item.front_model && item.front_model.mini) {
-	// 				wx.navigateTo({
-	// 					url: "/" + item.front_model.mini
-	// 				})
-	// 			}
-	// 			break;
-	// 		case 3:
-	// 			if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
-	// 				item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
-	// 				// 外部h5
-	// 				console.log(item.tdata)
-	// 				app.globalData.weburl = item.tdata.url;
-	// 				wx.navigateTo({
-	// 					url: "/pages/pbService/web/index"
-	// 				})
-	// 			} else {
-	// 				let page = item.tdata.url.split("/");
-	// 				page = page[page.length - 1].split("?")
-	// 				console.log(page[0])
-	// 				let url = this.data.urltopage[page[0]];
-	// 				if (url && url.indexOf('map') != -1) {
-	// 					let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
-	// 							'cinema', 'academes'
-	// 						],
-	// 						type = page[1] ? page[1].split("=") : [];
-	// 					wx.reLaunch({
-	// 						url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) : null)
-	// 					})
-	// 				} else if (url) {
-	// 					wx.navigateTo({
-	// 						url: url,
-	// 					})
-	// 				} else {
-	// 					app.globalData.weburl = item.tdata.url;
-	// 					wx.navigateTo({
-	// 						url: "/pages/pbService/web/index"
-	// 					})
-	// 				}
-	// 			}
-	// 			break;
-	// 		case 4:
-	// 			if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
-	// 				// 如果是苏心游的小程序 直接把authCode带过去
-	// 				userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
-	// 					let weburl = item.tdata.page
-	// 					if (weburl.indexOf('?') != -1) {
-	// 						weburl += '&authCode=' + res.data;
-	// 					} else {
-	// 						weburl += '?authCode=' + res.data
-	// 					}
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: weburl
-	// 					})
-	// 				}).catch(err => {
-	// 					wx.navigateToMiniProgram({
-	// 						appId: item.tdata.appid,
-	// 						path: item.tdata.page
-	// 					})
-	// 				})
-	// 			} else {
-	// 				wx.navigateToMiniProgram({
-	// 					appId: item.tdata.appid,
-	// 					path: item.tdata.page
-	// 				})
-	// 			}
-	// 			break;
-	// 		default:
-	// 			break;
-	// 	}
-	// 	return
-	// },
 	onReady: function() {
+		wx.getLocation({
+			type: 'gcj02',
+			success: (res) => {
+				this.setData({
+					lat: res.latitude,
+					lon: res.longitude
+                })
+				this.getList()
+                this.getHdrlList()
+                let tempData = JSON.stringify({lat: res.latitude,lon: res.longitude})
+                wx.setStorageSync('lonAndLat', tempData)
+			},
+			fail: (err) => {
+				this.getList()
+				this.getHdrlList()
+			}
+		})
 
+		commonApi._post("pbservice/Other/getClientConfig", {
+			unique_key: "urltopage"
+		}).then(res => {
+            let data = JSON.parse(res.data)
+            this.data.urltopage = data
+		})
+
+		this.getBanner()
+        this.getWeather()
+		this.getIndexSeason()
 
 	},
-	// gotoOther: function(e) {
-	// 	let item = e.currentTarget.dataset.item;
-	// 	if (item.type == 'h5') {
-	// 		app.globalData.weburl = item.url
-	// 		wx.navigateTo({
-	// 			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
-	// 		})
-	// 	} else if (item.type == 'mini') {
-	// 		wx.navigateToMiniProgram({
-	// 			appId: item.appid,
-	// 			path: item.path
-	// 		})
-	// 	} else if (item.type == 'page') {
-	// 		wx.navigateTo({
-	// 			url: item.page,
-	// 		})
-	// 	}
-	// },
+	
 	pagePoint: function(e, type) {
 		util.pagePoint(e, type)
 	},
 	onShow: function() {
-		if (app.globalData.loadIndexSeason) {
-			this.getIndexSeason()
-		} else {
-			let t = setInterval(() => {
-				if (app.globalData.loadIndexSeason) {
-					this.getIndexSeason()
-					clearInterval(t)
-					t = null
-				}
-			}, 500)
-		}
-
+		// this.getIndexSeason()
 		this.pagePoint({
 			event: 'home_view'
 		}, 1)
-		// this.data.time!=5?wx.showTabBar():1
 	},
 
 	/**
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index 1551e47..a5e5282 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -1,20 +1,21 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/uploads/20250121/540fa46b838ea3166cd8701bd611ca9d.gif" mode="widthFix"></image>
+<image lazy-load class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+  <!-- <image lazy-load bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
-    mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
-    src="https://static.ticket.sz-trip.com/uploads/20250120/213c1a6ae49848fa54047d6f9059fec2.png" mode="aspectFill"></image>
+    mode="aspectFill"></image> -->
+  <image lazy-load bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+    src="https://static.ticket.sz-trip.com/uploads/20250429/224929eeb4520d0c3ea8f10a657825b4.png" mode="aspectFill"></image>
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-    <view class="iconfont icon-sousuo"></view>
+    <!-- <view class="iconfont icon-sousuo"></view> -->
+    <image lazy-load class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
     <view class="textOver">搜索想要的旅游产品或服务</view>
   </navigator>
 </view>
@@ -22,7 +23,7 @@
   <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
@@ -33,7 +34,7 @@
 <view class="content" wx:if="{{!isTest}}">
   <!-- 活动日历 -->
   <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20240925/9d10d5ff4a5314573328dd6cdab67b82.png"></image>
+    <image lazy-load mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
     <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
     <view class="nowDate"> 
         <view class="num">{{nowDate[0]}}</view>
@@ -48,10 +49,10 @@
     </view>
   </view>
   <view wx:if="{{hdrlNavIndex!=4}}">
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
-      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" style="width: 593.33rpx;">
-        <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <!-- <image class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+    <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
+      <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" >
+        <view style="background: #fff;display: flex;border-radius: 7rpx;width: 100%;">
+          <!-- <image lazy-load class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
           <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
@@ -62,10 +63,10 @@
     </view>
   </view>
   <view wx:else>
-    <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
+    <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
-        <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <!-- <image class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+        <view style="background: #fff;width: 100%;display: flex;border-radius: 7rpx;width: 100%;">
+          <!-- <image lazy-load class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
           <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           
           <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
@@ -82,64 +83,73 @@
   <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
-        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj" src="https://static.ticket.sz-trip.com/uploads/20250117/a480fadd053c80bc2efb3239fd956ceb.png" mode=""/>
-      <image bindtap="gotoUrls" data-event="xlqc" class="sslk"
-       src="https://static.ticket.sz-trip.com/uploads/20250117/57373a69fac19bc39cb91d44c233257d.png" mode=""/>
+      <image lazy-load bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
+        data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj"
+        src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
+      <!-- <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
+       src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/> -->
+       <image lazy-load  class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=AI避高峰"
+       src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
-        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;">
+        <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;padding-left: 16rpx;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6fcd03c4b5adc17b714186825e1f5da6.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
           <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
-            <view class="text">夜游苏州</view>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <view class="text">水上游</view>
           </view>
-          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
-            <view class="text">文创特产</view>
+          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/nightTour2025" data-event="night_sz" data-title="夜游苏州"  class="pbservice-item">
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <view class="text">夜游苏州</view>
           </view>
+          
           <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
-          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
-            <view class="text">酒店住宿</view>
-        </view>
-        <!-- 临时跳转专题页 -->
-        <!-- <view bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/carPurchase"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
-            <view class="text">酒店住宿</view>
-        </view> -->
-
-          <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
-            <view class="text">一日游</view>
+          <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
+            <view class="text">文创特产</view>
           </view>
+
           <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
             <view class="text">场馆预约</view>
           </view>
-          
-          <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
-            <view class="text">一卡游</view>
+          <view bindtap="gotoUrl" data-event="card" data-title="一日游" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
+            <view class="text">一日游</view>
+          </view>
+          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
+            <view class="text">户外游</view>
           </view>
           <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
 
-          <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
-            <view class="text">研学游</view>
+          <view wx:if="{{isMayDay}}" bindtap="gotoMini" data-event="hotel_click" data-title="酒店住宿" 
+          data-appid="wx0e6ed4f51db9d078" data-path="pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063" class="pbservice-item">
+            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
+        </view>
+        <!-- 五一前临时跳转专题页 -->
+        <view wx:else bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/nightMooring"  class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
         </view>
 
+        <!-- <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <view class="text">研学游</view>
+        </view> -->
+
         </view>
       </scroll-view>
       <view class="scroll-line">
@@ -154,7 +164,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -165,55 +175,54 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <image lazy-load style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250117/e0d0cf611cfa9f63259de578a6065b50.png" mode=""/>
+    <image lazy-load class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
         <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view> -->
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
-        data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
+        <view  data-event="comfort_click" data-title="高峰预警"
+            bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=高峰预警"
          class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/857299fcd14ee5c7a1621598e0e05bae.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/9a1611d20a32fc4b18438dabffaaacf9.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
         <view bindtap="xlzs"  class="pbservice-item ggfw" >
-                <image src="https://static.ticket.sz-trip.com/uploads/20250120/cdd4faf804f1cd494b6a7cccdc7f7f23.png" mode="widthFix"></image>
-                <view>行李直送</view>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
+            <view>行李直送</view>
         </view>
-
         <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
-      <image src="https://static.ticket.sz-trip.com/uploads/20250126/083b1053137c4e0350eb92b8144f018c.png" mode="widthFix"></image>
-      <view>停车场</view>
-    </view>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
+            <view>停车场</view>
+        </view>
 
         <!-- <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view> -->
         
         <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
             data-path="/pages/pbService/bike/index?type=1">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250117/1565d2b5a46180d53b5b3c225ce91068.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
             <view>找厕所</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view> -->
         
@@ -223,38 +232,38 @@
         查看更多 >
       </navigator>
     </view>
-    <view wx:else>
-      <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-          data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+    <view wx:else style="margin: 0rpx 14rpx 0;">
+      <view class="pic-list"  wx:if="{{!isTest}}">
+        <image lazy-load class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/eacfc180904e8f1e8717afe2aa959c28.png" mode="aspectFill"></image>
+          <image lazy-load class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
           data-path="/pages/list/{{isTest?'road':'food'}}/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
+          src="https://static.ticket.sz-trip.com/uploads/20250429/e86972b98e8fbb5c5983f38124a77cb2.png" mode="aspectFill"></image>
+          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/62637ab5923016ef9baa573372d2452f.png" mode="aspectFill">
         </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-          src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
+        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+          src="https://static.ticket.sz-trip.com/uploads/20250429/13060c57ee40d1f92145968a0fbd8378.png" mode="aspectFill"></image>
       </view>
     </view>
   </view>
   <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 333rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/uploads/20250117/c91744bedb5bf427faf21b2802f7194b.png" mode=""/>
+  <image lazy-load class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
+  src="https://static.ticket.sz-trip.com/uploads/20250429/179e3d1e09a17149f260c8d51458ed15.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
-    <!-- <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <!-- <image lazy-load class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
     <view class="bd-top">
-      <image class="bd-type" src="{{bdItem.icon}}" mode=""/>
-      <view bindtap="moreBtn" class="bd-more" data-item="{{bdItem}}">更多 ></view>
+      <image lazy-load class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <view bindtap="moreBtn" class="bd-more" style="color:{{i%2==1?'#55578E':'#F34017'}}" data-item="{{bdItem}}">更多 ></view>
     </view>
     <view style="position: relative;z-index: 9;">
       <view bindtap="gobdDetail" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{bdItem.list}}" 
         wx:key="id" data-item="{{item}}">
-        <view class="bd-index">{{index+1}}</view>
+        <view class="bd-index" style="color: {{bdItem.color}};">{{index+1}}</view>
         <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -283,7 +292,7 @@
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
         <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
 
@@ -298,7 +307,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -309,39 +318,39 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <image lazy-load style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+    <image lazy-load style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
         <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view>
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
          class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view> -->
         
@@ -353,14 +362,14 @@
     </view>
     <view wx:else>
       <view class="pic-list" style="margin-top:20rpx" >
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        <image lazy-load class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
           data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
           
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
         </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
       </view>
     </view>
@@ -372,7 +381,7 @@
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+		<image lazy-load src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
 	
 	<!-- 视频 -->
@@ -391,12 +400,12 @@
 			object-fit="fill"
 		></video>
 		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
 	</view>
 </view>
 
diff --git a/subPackages/indexGQ/index.wxss b/subPackages/indexGQ/index.wxss
index 11f779a..9272311 100644
--- a/subPackages/indexGQ/index.wxss
+++ b/subPackages/indexGQ/index.wxss
@@ -3,7 +3,7 @@
 page {
   height: fit-content;
   padding-bottom: 36.67rpx;
-  background: url("https://static.ticket.sz-trip.com/uploads/20250120/b42c1ac742bee3ddff35151ecd860f81.jpg");
+  background: #F5C564;
   background-size: 100% auto;
   /* background-repeat: round; */
   background-repeat: no-repeat;
@@ -40,8 +40,8 @@ page {
   flex: 1;
   width: 100%;
   height: 64rpx;
-  background: rgba(255,255,255,0.7);
-  border-radius: 32rpx;
+  background: rgba(255,248,235,0.7);
+  border-radius: 13rpx;
   color: #000;
   display: flex;
   align-items: center;
@@ -62,14 +62,12 @@ page {
   font-size: 29rpx;
   margin-bottom: 10rpx;
   margin-left: 4rpx;
-  color: white;
 }
 .top-box .weather {
   font-size: 19rpx;
   margin-top: 20rpx;
   margin-left: -4rpx;
   margin-right: 30rpx;
-  color: white;
 }
 .top-icons {
   /* background: #FFFFFF; */
@@ -108,7 +106,7 @@ page {
 }
 .content {
   /* margin: 0 25rpx; */
-  margin-top: 20.67rpx;
+  margin-top: 37.67rpx;
 }
 .sale-road-boxes {
   display: flex;
@@ -317,8 +315,8 @@ page {
   justify-content: space-between;
   flex-wrap: wrap; */
     display: flex;
-    justify-content: space-between;
-    margin: 0 28rpx;
+    justify-content: space-around;
+    /* margin: 0 28rpx; */
 }
 .title-more {
   font-size: 24rpx;
@@ -1037,7 +1035,7 @@ page {
 }
 /* 元旦修改新增样式 */
 .new-pic {
-  width: 160rpx !important;
+  width: 155rpx !important;
   height: 255rpx !important;
   /* margin-bottom: 26.67rpx; */
 }
@@ -1165,18 +1163,18 @@ page {
 .right-more {
   width: 120rpx;
   height: 47rpx;
-  background: rgba(255,208,165,0.4);
-  border-radius: 23rpx;
+  border-radius: 7rpx;
+  border: 1px solid #111111;
   font-weight: 500;
   font-size: 27rpx;
-  color: #FFFFFF;
+  color: #111111;
   text-align: center;
   line-height: 47rpx;
 }
 
 .hdrlNavList {
   display: flex;
-  margin: 28rpx 26.67rpx 10rpx;
+  margin: 28rpx 26.67rpx 26rpx;
   overflow-x: scroll;
   flex-wrap: nowrap;
 }
@@ -1185,37 +1183,40 @@ page {
   /* width: 160rpx; */
   padding: 0 20rpx;
   height: 53rpx;
-  background: rgba(255,208,165,0.4);
-  border-radius: 13rpx;
+  background: #FCE7BF;
+  border-radius: 7rpx;
   /* border: 1px solid #FFFFFF; */
   min-width: 133rpx;
 
   font-size: 32rpx;
-  color: #FFFFFF;
+  color: #111111;
   text-align: center;
   line-height: 53rpx;
   margin-right: 14rpx;
   box-sizing: border-box;
 }
 .hdrlNavActive {
-  background: linear-gradient(180deg, #FFECD9, #FFBD7A);
+  background: linear-gradient(180deg, #E2802B, #D1201B);
   font-size: 32rpx;
-  color: #E6201C;
+  color: #FFFFFF;
   border: none;
 }
 .hdrlItem {
   flex-shrink: 0;
-  padding: 26.67rpx 22rpx 26.67rpx 20rpx;
+  padding: 10rpx;
   /* width: 593.33rpx; */
   display: flex;
-  background: url("https://static.ticket.sz-trip.com/uploads/20250117/8d7f5ce0ecafbc2f836342e4226ec364.png");
   background-size: 100% 100%;
+  background: linear-gradient(90deg, #EC2026, #3A3D83);
+  border-radius: 13rpx;
+  margin-right: 20rpx;
+  width: 573rpx;
 }
 .hdrlItem-img {
   width: 240rpx;
   height: 213rpx;
   background: #8C8C8C;
-  border-radius: 13rpx;
+  border-radius: 7rpx;
   flex-shrink: 0;
   margin-right: 12rpx;
   overflow: hidden;
@@ -1240,23 +1241,33 @@ page {
 }
 
 .main-box {
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/98ca9dfa8253e50d624ce64d24295570.png");
-  background-size: 100% 100%;
-  padding: 27.67rpx 20.67rpx 40rpx 20rpx;
-  margin: 0 8rpx;
+    width: 697rpx;
+    /* height: 273rpx; */
+    background: linear-gradient(180deg, #FFEED6, #FFDCA3);
+    border-radius: 13rpx;
+    margin: 110rpx auto 43rpx;
+    position: relative;
+    padding-top: 93rpx;
+    padding-bottom: 20rpx;
+    /* box-sizing: border-box; */
 }
 .main-box-top {
   display: flex;
-  margin-bottom: 5.33rpx;
+  justify-content: space-between;
+  width: 100%;
+  padding: 16rpx;
+  box-sizing: border-box;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: -72rpx;
 }
 .gfyj,.sslk {
-  width: 369.33rpx;
-  height: 146rpx;
+  width: 324.33rpx;
+  height: 131rpx;
   flex-shrink: 0;
 }
-.sslk {
-  margin-left: -48rpx;
-}
+
 
 .movieItem {
   padding: 26.67rpx 26rpx 26.67rpx 20rpx;
@@ -1273,27 +1284,29 @@ page {
   flex-shrink: 0;
 }
 .ysz-box {
-    margin: 0 8rpx 15.33rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250117/8efd4c072b3c95fe7c31d1e7b79759d3.png");
-    /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */
-    background-size: 100% 100%;
-    width: 733.33rpx;
-    height: 320rpx;
-    padding-top: 33.33rpx;
+    margin: 26rpx auto 15.33rpx;
+    width: 697rpx;
+    height: 293rpx;
+    background: linear-gradient(180deg, #FFEED6, #FFDCA3);
+    border-radius: 13rpx;
+
+    padding-top: 3.33rpx;
     position: relative;
     z-index: 1;
+    box-sizing: border-box;
 }
 .ysz-more {
-    width: 267rpx;
+    width: 183rpx;
     height: 53rpx;
-    background: #FFFFFF;
-    border-radius: 27rpx;
+    border-radius: 7rpx;
+    border: 1px solid #000000;
+
     margin: 38rpx auto 0;
     text-align: center;
     line-height: 53rpx;
     font-weight: 500;
     font-size: 25rpx;
-    color: #FF4D48;
+
 }
 .ysz-box2 {
   /* padding: 20rpx 35rpx; */
@@ -1347,7 +1360,7 @@ page {
 .bd-index {
   font-weight: bold;
   font-size: 40rpx;
-  color: #000000;
+  color: black;
 }
 .bd-item {
   margin-left: 45.33rpx;
@@ -1464,7 +1477,7 @@ page {
 .nowDate{
     display: flex;
     position: absolute;
-    left: 228.77rpx;
+    left: 200.77rpx;
     bottom: 7.33rpx;
 }
 
@@ -1478,26 +1491,31 @@ page {
     font-family: PingFang SC;
     font-weight: 500;
     font-size: 29rpx;
-    color: #FFFFFF;
+    color: #111111;
 }
 .nowDate .num{
-    background: #FFD0A5;
-    color: #111111;
-
+    background: #FCE7BF;
+    color: #C11A20;
     font-family: PingFang SC;
     font-weight: bold;
     font-size: 29rpx;
-    color: #111111;
+    border-radius: 50%;
 }
 
 .ysz-right-img{
-    width: 200.8rpx;
-    height: 207.33rpx;
+    width: 213.33rpx;
+    height: 259.33rpx;
     position: absolute;
     right: -26rpx;
-    top: 0;
+    top: 44rpx;
     z-index:1;
 }
 .hidden{
   display: none;
+}
+
+.top-box image.search-icon{
+    width: 26.67rpx;
+    height: 26.67rpx;
+    margin-right: 20rpx;
 }
\ No newline at end of file
diff --git a/utils/https.js b/utils/https.js
index 67031b4..1a81b17 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From ab05db535d3f484bc4801046b65acef32e3c6033 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 3 Jun 2025 14:15:22 +0800
Subject: [PATCH 331/471] =?UTF-8?q?=E6=88=91=E7=9A=84-=E4=B8=BB=E5=8A=9E?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/user.wxml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index caca19b..7f294a4 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -128,8 +128,9 @@
   </view>
 
   <view class="bottom-intro">
-    <view>主办方:苏州市文旅融合发展中心</view>
-    <view>备案号:苏ICP备19064944号-3X@君到苏州</view>
+    <view>主办方：苏州市文化广电和旅游局</view>
+    <view>承办方：苏州市文旅融合发展中心</view>
+    <view>备案号：苏ICP备19064944号-3X@君到苏州</view>
   </view>
 </view>
 <view class="mask" wx:if="{{showModel}}"> 

From 8fd17d65c7ec8304d0fa164baa27f707f010d48a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Jun 2025 15:17:33 +0800
Subject: [PATCH 332/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                      | 68 ++++++++++-------
 pages/index/index.wxml                    | 93 +++++++++++++----------
 pages/index/index.wxss                    | 74 +++++++++++++-----
 pages/list/activitynew/index.wxml         |  2 +-
 pages/order/components/contact/index.js   |  1 +
 pages/order/scene/index.js                |  1 +
 pages/pbService/aiHelpYou/index.js        |  1 +
 project.private.config.json               | 28 +++----
 subPackages/feiyiNew/CGCIndex/index.js    | 21 ++---
 subPackages/feiyiNew/CGCIndex/index.wxml  | 12 ++-
 subPackages/feiyiNew/CGCIndex/index.wxss  |  2 +-
 subPackages/feiyiNew/CGCLetter/index.js   |  8 +-
 subPackages/feiyiNew/CGCLetter/index.wxml |  4 +-
 subPackages/feiyiNew/CGCTime/index.js     |  5 +-
 subPackages/feiyiNew/CGCTime/index.wxml   |  8 +-
 subPackages/feiyiNew/index.js             |  3 +-
 subPackages/postSearch/index.js           |  1 +
 17 files changed, 203 insertions(+), 129 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index e70b0ff..8996e2b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -31,13 +31,16 @@ Page({
         lat: "",
         lon: "",
         
-		indexSeason: {},  // 后台UI配置项
+        indexSeason: {},  // 后台UI配置项
+        func_data: {},
         
         // bannerInterver: 5*1000,  // 动态更改banner时间
 		banner: [],
-		xiaobanner: [],
+        xiaobanner: [],
+        ztbanner: [], //苏城环游记banner
 		activeBannerIndex: 0,
         smBannerIndex: 0,
+        ztBannerIndex: 0,
 		
 		// banner上的金刚区
 		bannerDataList: [
@@ -108,6 +111,7 @@ Page({
 			// },
         ],
         mainTypeLeft: 0,
+        mainNavIndex: 0,
 
 		xpth: {}, // 新品特惠
         XPathBannerIndex: 0,
@@ -317,29 +321,29 @@ Page({
 
         // 长三角文旅平台
         otherPlat: [
-            {
-                "name":"玉见昆山",
-                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/c85dbe1b0f8f58014c05a30b3e6f86b5.png",
-                "type":"mini",
-                "path":"",
-                "appid":"wx8888a3fd0862b4c8"
-            },
-            {
-                "name":"智游常熟",
-                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/98d57e31995b6dc3188f8717201640f1.png",
-                "type":"mini",
-                "path":"",
-                "appid":"wxdaf3d5edd07dc7af"
-            },
+            // {
+            //     "name":"玉见昆山",
+            //     "icon":"https://static.ticket.sz-trip.com/uploads/20250526/c85dbe1b0f8f58014c05a30b3e6f86b5.png",
+            //     "type":"mini",
+            //     "path":"",
+            //     "appid":"wx8888a3fd0862b4c8"
+            // },
+            // {
+            //     "name":"智游常熟",
+            //     "icon":"https://static.ticket.sz-trip.com/uploads/20250526/98d57e31995b6dc3188f8717201640f1.png",
+            //     "type":"mini",
+            //     "path":"",
+            //     "appid":"wxdaf3d5edd07dc7af"
+            // },
             {
                 "name":"常享游",
-                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/abfe0d4d2b02fcfd9bd791b9468bb4f4.png",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250604/5112dd50e7c175bf58416ba9d4e4b846.png",
                 "type":"h5",
                 "url":"https://tour.wlczy.com/h5/"
             },
             {
                 "name":"畅游宿迁",
-                "icon":"https://static.ticket.sz-trip.com/uploads/20250526/bcfa9789f2d2d52d2da8f11b6a99b002.png",
+                "icon":"https://static.ticket.sz-trip.com/uploads/20250604/962f331b2319b9759363c3787ca8d088.png",
                 "type":"mini",
                 "path":"/pages/index/index",
                 "appid":"wxcb00a59c4fba136e"
@@ -416,8 +420,8 @@ Page({
         if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
             return img;
         } else {
-            return "https://test.api.cloud.sz-trip.com"+img
-            // return "https://static.ticket.sz-trip.com" + img;
+            // return "https://test.api.cloud.sz-trip.com"+img
+            return "https://static.ticket.sz-trip.com" + img;
         }
     },
 
@@ -449,6 +453,7 @@ Page({
                 // indexSeason: imageSource.testImgs.indexSeason,
                 bannerDataList: (app.globalData.configJson.nav_menu || []),
                 mainTypeList: (app.globalData.configJson.menu_button || []),
+                func_data: (app.globalData.configJson.func_data || {}),
             })
         } else {
             commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
@@ -458,13 +463,16 @@ Page({
                 });
                 app.globalData.configJson.indexSeason = obj 
                 app.globalData.loadIndexSeason = true
-                app.globalData.configJson.nav_menu = (res.data.nav_menu || []).map(v=>{
-                    return {...v, icon:this.showImg(v.icon)}
-                })
-                app.globalData.configJson.menu_button = (res.data.menu_button || []).map(v=>{
-                    return {...v, icon:this.showImg(v.icon)}
-                })
-               
+                app.globalData.configJson.nav_menu = (res.data.nav_menu || [])
+                app.globalData.configJson.menu_button = (res.data.menu_button || [])
+
+                let func_data = {}
+                for(let item of (res.data.func_data || [])) {
+                    func_data[item.jump_type] = true
+                }
+                app.globalData.configJson.func_data = func_data
+                
+
                 console.log('webData', app.globalData.configJson)
                 this.setData({
                     indexHot: app.globalData.configJson.indexHot,
@@ -473,6 +481,7 @@ Page({
                     indexSeason: app.globalData.configJson.indexSeason,
                     bannerDataList: (app.globalData.configJson.nav_menu || []),
                     mainTypeList: (app.globalData.configJson.menu_button || []),
+                    func_data: (app.globalData.configJson.func_data||{})
                 })
             })
         }
@@ -529,6 +538,9 @@ Page({
 
 		commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
 			this.setData({banner: res.data || []})
+        })
+        commonApi._post("adv/getAdv", {position: 6,type_id: 3}).then(res => {
+			this.setData({ztbanner: res.data || []})
 		})
 		commonApi._post("adv/getAdv", {position: 1,type_id: 3}).then(res => {
 			this.setData({xiaobanner: res.data || []})
@@ -545,7 +557,7 @@ Page({
 	},
     // 统一的banner change 需要时可以放开
 	changeBannerIndex: function(e) {
-        return
+        // return
         let keyname = e.currentTarget.dataset.keyname
 		this.setData({
             [keyname]: e.detail.current,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8edc8e6..b67b8b1 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -33,27 +33,38 @@
     <view class="main-content" >
          <!-- 金刚区 -->
         <view class="no-scrollbar" wx:if="{{mainTypeList.length>0}}">
-            <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
+            <!-- <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
                 <view  class="top-icons no-scrollbar">
                     <view bindtap="mainNavClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
                         <image src="{{item.icon}}" mode="aspectFill"></image>
-                        <view class="top-icon-text">{{item.title}}</view>
+                        <view class="top-icon-text">{{item.menu_name}}</view>
                     </view>
                 </view>
-            </scroll-view>
-            <view class="scroll-line">
-                <view class="scroll-line-bg" wx:if="{{mainTypeLeft <= 50}}" style="width:17rpx;"></view>
-                <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
+            </scroll-view> -->
+            <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:160rpx" 
+                bindchange="changeBannerIndex" data-keyname="mainNavIndex" 
+                display-multiple-items="5" circular
+                current="0">
+                <block wx:for="{{mainTypeList}}" wx:key="index">
+                <swiper-item  bindtap="mainNavClick" class="top-icon-item {{(mainNavIndex+2)==index || (index==0&&mainNavIndex==6)||(index==1&&mainNavIndex==7)?'active':''}}"  data-item="{{item}}">
+                    <image src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
+                    <view class="top-icon-text">{{item.menu_name}}</view>
+                </swiper-item>
+                </block>
+            </swiper>
+            <view class="scroll-line" style="width: 0 !important;">
+                <!-- <view class="scroll-line-bg" wx:if="{{(mainNavIndex+2) < (mainTypeList.length/2)}}" style="width:17rpx;"></view>
+                <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view> -->
             </view>
         </view>
         
 
         <view class="content-box">
             <!-- 苏城环游记 todo-->
-            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0}}">
+            <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
-                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
-                <block wx:for="{{xiaobanner}}" wx:key="index">
+                bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
+                <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
                     <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
@@ -66,26 +77,26 @@
             </view>
 
             <!-- 限时特惠--新版-->
-            <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" >
+            <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{func_data.hot_deals}}">
                 <!-- 上方标题部分 -->
                 <view class="xsth-title">
                     <view class="xsth-left" style="display: flex;">
-                        <image wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/f2dc42edee46a79a6ba375ae1a1c24b7.png"></image>
+                        <image wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250604/9bd8c914b1e47d1856729357da00a7b1.png"></image>
                         <image wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
                         
                         <image wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/1d1117bf6120fb75159eb8657b15c640.png"></image>
-                        <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
+                        <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250604/13c6feaebe2e2a575a64627502608153.png"></image>
                     </view>
                 </view>
                 <!-- 热门 -->
                 <view style="width: 100%;" wx:if="{{xpthIndex==0}}">
-                    <scroll-view scroll-x style="height:372rpx">
+                    <scroll-view scroll-x style="height:372rpx;padding-top: 25rpx;">
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
                                 <image src="{{item.headimg}}"></image>
                                 <view class="season-content" style="padding:6rpx 12rpx 0;">
-                                    <view style="height: 70rpx;" class="textOver2">{{item.title}}</view>
-                                    <view class="price" >
+                                    <view style="height: 60rpx;" class="textOver2">{{item.title}}</view>
+                                    <view class="price" style="padding-top: 8rpx;">
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
                                 </view>
@@ -100,13 +111,14 @@
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                        <image src="{{item.headimg}}" mode="" />
-                        <view class="xpth-item-content">
-                            <view class="xpth-item-title textOver2">{{item.title}}</view>
-                            <view class="xpth-item-bottom">
-                            <view class="xpth-item-price">{{item.price/100}}</view>
+                            <image class="prod-img" src="{{item.headimg}}" mode="" />
+                            <view class="xpth-item-content">
+                                <view class="xpth-item-title textOver2">{{item.title}}</view>
+                                <view class="xpth-item-bottom">
+                                <view class="xpth-item-price">{{item.price/100}}</view>
+                                </view>
                             </view>
-                        </view>
+                            <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"></image>
                         </view>
                     </view>
                     <!-- 右边的banner -->
@@ -115,23 +127,26 @@
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                            <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                                <image  src="{{item.head_img}}"></image>
+                                <!-- <view class="xpth-cover textOver2">{{item.title}}</view> -->
+                                <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"></image>
                             </swiper-item>
                         </block>
                         </swiper>
-                        <view class="xpth-banner-dot-list">
+                        <!-- <view class="xpth-banner-dot-list">
                             <view class="dot{{XPathBannerIndex==index?' active':''}}" wx:for="{{xpth.adv}}" wx:key="index"></view>
-                        </view>
+                        </view> -->
                     </view>
                 </view>
             </view>
 
-            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0}}">
+            <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
-                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
                     <!-- 原 圆角77rpx，现改为13rpx -->
+                    <image style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index2025/smallBg.png"></image>
                     <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
@@ -142,14 +157,14 @@
             </view>
 
             <!-- 公共服务 -->
-            <view class="sale-road-boxes" style="margin-top:0;">
+            <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
                 <image class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
                 <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
                     <view style="height: 40rpx;line-height: 40rpx;">更多</view>
                     <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" />
                 </navigator>
             </view>
-            <view>
+            <view wx:if="{{func_data.service_public}}">
                 <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
                     <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
                         <image src="{{item.img}}"></image>
@@ -158,11 +173,11 @@
             </view>
 
             <!-- 旅游助手 -->
-            <view class="sale-road-boxes" style="margin-top:36rpx">
+            <view class="sale-road-boxes" style="margin-top:36rpx" wx:if="{{func_data.helper_travel}}">
                 <image mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="pic-list" style="margin-top:30rpx">
+            <view class="pic-list" style="margin-top:30rpx" wx:if="{{func_data.helper_travel}}">
                 <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick"
                 src="{{item.img}}" mode="aspectFill"></image>
             </view>
@@ -179,11 +194,11 @@
 
 
             <!-- 数字文旅-->
-            <view class="sale-road-boxes" style="margin-top:30rpx">
+            <view class="sale-road-boxes" style="margin-top:30rpx" wx:if="{{func_data.culture_digital}}">
                 <image mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="slide-out-box">
+            <view class="slide-out-box" wx:if="{{func_data.culture_digital}}">
                 <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
                 <scroll-view scroll-x style="height:400rpx" bindscroll="listenScroll" data-keyname="scrollLeft" class="slide-box">
                 <view class="pbservice">
@@ -201,20 +216,20 @@
             </view>
 
             <!-- 十全十美 -->
-            <view class="sale-road-boxes">
+            <view class="sale-road-boxes" wx:if="{{func_data.scenery_ten}}">
                 <image mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
             </view>
-            <view class="six-box-new">
+            <view class="six-box-new" wx:if="{{func_data.scenery_ten}}">
                 <image wx:for="{{SQSM}}" src="{{item.img}}" data-item="{{item}}" bindtap="mainIconClick" mode="widthFix" wx:key="index"></image>
             </view>
 
-            <!-- 长三角文旅平台 -->
-            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
+            <!-- 长三角文旅平台 --> 
+            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat &&func_data.platform_nearby}}">
                 <image mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="other-plats" wx:if="{{otherPlat}}">
+            <view class="other-plats" wx:if="{{otherPlat &&func_data.platform_nearby}}">
                 <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
                 <image src="{{item.icon}}" mode="heightFix"></image>
                 <!-- <view>{{item.name}}</view> -->
@@ -222,11 +237,11 @@
             </view>
 
             <!-- 热门推荐 -->
-            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0}}">
+            <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0 &&func_data.repurchase }}">
                 <image mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="hot-list">
+            <view class="hot-list" wx:if="{{func_data.repurchase}}">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
                 <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
                     <view class="hot-item">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index b8441ef..d572713 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -80,6 +80,7 @@ page {
 .top-icons {
   display: flex;
   padding:0 20rpx;
+  align-items: center;
 }
 .top-icon-item {
   margin-bottom: 20rpx;
@@ -101,9 +102,19 @@ page {
   width: 100rpx;
   height: 100rpx;
   display: block;
+  transition: all 0.2s;
   /* margin: 0 auto; */
   /* margin-bottom: 10rpx; */
 }
+/* 金刚区滚动效果 */
+.top-icon-item.active{
+   height: 160rpx !important;
+   margin-bottom: 0;
+}
+.top-icon-item.active image{
+    height: 130rpx;
+    width: 130rpx;
+}
 
 .content-box {
   margin: 0 25rpx;
@@ -181,6 +192,7 @@ page {
   .season-hot .season-item image{
       width: 100%;
       height: 200rpx;
+      border-top-right-radius: 14rpx;
   }
   .season-hot .season-item .hot-cover-img{
       position: absolute;
@@ -188,6 +200,7 @@ page {
       left: 0;
       width: 100%;
       height: 100%;
+      border-radius: 0;
   }
 
   .xsth-more {
@@ -223,20 +236,20 @@ page {
     border-radius: 0rpx;
     overflow: hidden;
     position: relative;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png");
-    background-size: 100% 100%;
-    padding: 3rpx;
+    /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png");
+    background-size: 100% 100%; */
+    /* padding: 3rpx; */
   }
   .xpth-banner-swiper{
       height: 100%;
-      border-radius: 20rpx;
+      /* border-radius: 20rpx; */
       overflow: hidden;
   }
   .xpth-banner image {
     flex: 1;
     height: 100%;
     width: 100%;
-    border-radius: 20rpx;
+    /* border-radius: 20rpx; */
   }
   .xpth-banner-dot-list{
       position: absolute;
@@ -262,37 +275,42 @@ page {
   .xpth-item {
     border-radius: 20rpx;
     height: 153rpx;
+    width: 100%;
     display: flex;
     margin-bottom: 13rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png");
-    background-size: 100% 100%;
-    padding: 1rpx;
+    /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"); */
+    background: white;
+    position: relative;
+  }
+  .xpth-product .cover-image{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
   }
   .xpth-item:last-child {
     margin-bottom: 0;
   }
   /* 元旦修改新增样式 */
-  .xpth-item image {
-    /* width: 160rpx;
-    height: 160rpx;
-    background: #FFE7C0;
-    border-radius: 15rpx 0 0 15rpx; */
+  .xpth-item .prod-img {
     width: 157rpx;
-    height: 154rpx;
-    /* background: #72707D; */
+    height: 100%;
     border-radius: 20rpx;
-    /* margin-right: 15.33rpx; */
     flex-shrink: 0;
   }
   /* 元旦修改新增样式 */
   .xpth-item-content {
-    width: 100%;
+    width: 220rpx;
+    flex: 1;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
     /* background: #FBECDE; */
-    padding-left: 15.33rpx;
+    padding:0 14rpx;
     border-radius: 0 15rpx 15rpx 0;
+    background: white;
+    box-sizing: border-box;
   }
   /* 元旦修改新增样式 */
   .xpth-item-title {
@@ -301,7 +319,6 @@ page {
     font-family: PingFang SC;
     font-weight: 500;
     color: #333333;
-    margin-right: 18rpx;
     /* height: 80rpx; */
   }
 
@@ -310,7 +327,6 @@ page {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding-right: 13.33rpx;
   }
   /* 元旦修改新增样式 */
   .xpth-item-price {
@@ -623,7 +639,7 @@ page {
 .other-plats image {
   width: 153.33rpx;
   display: block;
-  height: 146.67rpx;
+  height: 111.33rpx;
   margin-bottom: 15rpx;
 }
 
@@ -871,3 +887,19 @@ page {
     height: 0;
     color: transparent;
 }
+
+.xpth-cover{
+    width: 255rpx;
+    height: 95rpx;
+    background: rgba(255, 255, 255, 0.8);
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #333333;
+    position: absolute;
+    bottom: 8rpx;
+    left: 9rpx;
+    right: 9rpx;
+    border-radius: 13rpx;
+    padding: 15rpx 10rpx;
+    box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index d1cf870..99e2af9 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -85,7 +85,7 @@
     </picker>
   </view> -->
 </view>
-<view class="activity-list activity-list1" style="padding-top: 27rpx;">
+<view class="activity-list activity-list1">
   <view class="movie-types" wx:if="{{type==4&&false}}">
     <view bindtap="changeMovieType" data-type='1' class="movie-type {{movieType==1?'active':''}}">热映</view>
     <view bindtap="changeMovieType" data-type='2' class="movie-type {{movieType==2?'active':''}}">影院</view>
diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js
index 5871ac1..27a8afe 100644
--- a/pages/order/components/contact/index.js
+++ b/pages/order/components/contact/index.js
@@ -97,6 +97,7 @@ Component({
             this.setData({
               phone:res.data.mobile
             })
+            console.log('setLinkman',this.properties.is_authentication)
             this.triggerEvent("setLinkman",{phone:this.data.phone})
           }
         })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 67b9896..04c5c89 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -226,6 +226,7 @@ Page({
       this.setData({
         phone:e.detail.phone
       })
+      console.log('setphone', e.detail.phone)
     }else {
       console.log(e);
       let linkmanList = e.detail;
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index cfca763..0937865 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -63,6 +63,7 @@ Page({
   },
 
   setUrl (url) {
+      console.log(url)
         this.setData({
             webUrl:url
         })
diff --git a/project.private.config.json b/project.private.config.json
index 33ab55d..f0e8b11 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subPackages/feiyiNew/CGCIndex/index",
+          "pathName": "subPackages/feiyiNew/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "subPackages/index/index",
+          "pathName": "subPackages/indexGQ/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/password/setting/setting",
           "pathName": "subPackages/password/setting/setting",
@@ -34,13 +48,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "subPackages/feiyiNew/CGCIndex/index",
-          "pathName": "subPackages/feiyiNew/CGCIndex/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "subPackageCheckPoint/pages/index/index",
           "pathName": "subPackageCheckPoint/pages/index/index",
@@ -62,13 +69,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "subPackages/index/index",
-          "pathName": "subPackages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "首页",
           "pathName": "subPackages/indexGQ/index",
diff --git a/subPackages/feiyiNew/CGCIndex/index.js b/subPackages/feiyiNew/CGCIndex/index.js
index 45cdd70..7b669cc 100644
--- a/subPackages/feiyiNew/CGCIndex/index.js
+++ b/subPackages/feiyiNew/CGCIndex/index.js
@@ -54,11 +54,11 @@ Page({
 
   getBanner: function() {
     // 大banner 
-    commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
+    commonApi._post("adv/getAdv", {position: 7,type_id: 3}).then(res => {
         this.setData({banner: res.data || []})
     })
     // 分类旁的广告
-    commonApi._post("adv/getAdv", { position: 1,type_id: 3}).then(res => {
+    commonApi._post("adv/getAdv", { position: 8,type_id: 3}).then(res => {
         this.setData({xiaobanner: res.data || [] })
     })
   },
@@ -154,8 +154,8 @@ Page({
     commonApi._post("travels/getList", {
         page_no: 0,
         page_num: 4,
-        // type_key: 'feiyishouzha',
-        type_key: 'someArt',
+        type_key: 'feiyishouzha',
+        // type_key: 'someArt',
     }).then(res => {
         if (res) {
             this.setData({handwrittenList: res.data.rows || [] })
@@ -168,8 +168,8 @@ Page({
     commonApi._post("multimedia/media_list", {
         limit: 1,
         page: 1,
-        class_id: 139,
-        // class_id: 140,
+        // class_id: 139,
+        class_id: 140,
         type: 1,
     }).then(res => {
         if (res) {
@@ -194,15 +194,16 @@ Page({
         this.setData({hotIndex: index})
         let param = {
             apiUrl: 'product/get_product_by_tag',
-            limit: 10,offset: 0,tag_id: 363,
-            // tag_id: 642
+            limit: 100,offset: 0,
+            // tag_id: 363,
+            tag_id: 642
         }
         if (index == 1) {
             param = {
                 apiUrl: "multimedia/media_list",
                 limit: 100,page: 1,type: 1,
-                class_id: 139,
-                // class_id: 141,
+                // class_id: 139,
+                class_id: 141,
             }
         }
 
diff --git a/subPackages/feiyiNew/CGCIndex/index.wxml b/subPackages/feiyiNew/CGCIndex/index.wxml
index d1674c1..e115fe9 100644
--- a/subPackages/feiyiNew/CGCIndex/index.wxml
+++ b/subPackages/feiyiNew/CGCIndex/index.wxml
@@ -21,7 +21,7 @@
         </view>
         <view class="menu-right">
             <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" >
-                <block wx:for="{{banner}}" wx:key="index">
+                <block wx:for="{{xiaobanner}}" wx:key="index">
                 <swiper-item bindtap="bannerClick" data-item="{{item}}">
                     <image src="{{item.head_img}}" mode="scaleToFill"></image>
                 </swiper-item>
@@ -50,7 +50,7 @@
         mode="" style="width: 59rpx;height: 20rpx;"
         bind:tap="goMoreList" data-url="{{'/subPackages/feiyiNew/CGCTime/index'}}"></image>
     </view>
-    <view class="time-box" style="background-image: url({{SGVideo.head_img}});"
+    <view class="time-box" wx:if="{{SGVideo&&SGVideo.head_img}}" style="background-image: url({{SGVideo.head_img}});"
     bindtap="goPlayVideo" data-item="{{SGVideo}}">
         <image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
     </view>
@@ -67,8 +67,14 @@
         <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
             <view wx:if="{{index%2==number}}" data-item="{{item}}" wx:for="{{hotList}}" wx:key="id" 
                  class="hot-data" bindtap="goDetail" data-type="{{hotIndex==0?'post':'video'}}">
-                <image class="hot-data-image" src="{{item.headimg}}" mode="widthFix"></image>
+                 <view style="position: relative;height: fit-content;">
+                    <image class="hot-data-image" src="{{item.headimg}}" mode="widthFix"></image>
+                    <image wx:if="{{hotIndex==1}}" src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+                 </view>
+                
                 <view class="hot-data-title textOver">{{item.title}}</view>
+
+
             </view>
         </view>
         
diff --git a/subPackages/feiyiNew/CGCIndex/index.wxss b/subPackages/feiyiNew/CGCIndex/index.wxss
index 57d088e..b51fa78 100644
--- a/subPackages/feiyiNew/CGCIndex/index.wxss
+++ b/subPackages/feiyiNew/CGCIndex/index.wxss
@@ -81,7 +81,7 @@ page{
     position: relative;
     margin-top: 20rpx;
 }
-.time-box .play {
+.play {
     position: absolute;
     top: 0;
     bottom: 0;
diff --git a/subPackages/feiyiNew/CGCLetter/index.js b/subPackages/feiyiNew/CGCLetter/index.js
index a12c51d..0674e48 100644
--- a/subPackages/feiyiNew/CGCLetter/index.js
+++ b/subPackages/feiyiNew/CGCLetter/index.js
@@ -45,10 +45,12 @@ Page({
     commonApi._post("travels/getList", {
         page_no: this.data.page_no,
         page_num: 10,
-        // type_key: 'feiyishouzha',
-        type_key: 'someArt',
+        type_key: 'feiyishouzha',
+        // type_key: 'someArt',
     }).then(res => {
+        
         if (res) {
+            this.data.page_no++
             this.setData({list:list.concat(res.data.rows||[])})
             if (res.data.rows.length<10) {
                 this.data.haveMore = false
@@ -59,7 +61,7 @@ Page({
   // 获取头图
   getHeaderImg: function () {
     commonApi._post("multimedia/detail", {id: 2360}).then(res=>{
-        if (res) {
+        if (res &&res.data &&res.data.head_img) {
             this.setData({headImg: res.data.head_img})
         }
     })
diff --git a/subPackages/feiyiNew/CGCLetter/index.wxml b/subPackages/feiyiNew/CGCLetter/index.wxml
index 0415012..d60b25e 100644
--- a/subPackages/feiyiNew/CGCLetter/index.wxml
+++ b/subPackages/feiyiNew/CGCLetter/index.wxml
@@ -13,8 +13,8 @@
             <view class="textOver subtitle">{{item.subtitle}}</view>
             <view class="letter-user">
                 <view style="display: flex;align-items: center;">
-                    <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar}}" mode="aspectFill"></image>
-                    <text>{{item.nickname}}</text>
+                    <!-- <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar || 'https://static.ticket.sz-trip.com/tongli/images/index/user.png'}}" mode="aspectFill"></image>
+                    <text>{{item.nickname}}</text> -->
                 </view>
                 <view style="display: flex;align-items: center;color: #848484;">
                     <text class="iconfont icon-aixin"></text>
diff --git a/subPackages/feiyiNew/CGCTime/index.js b/subPackages/feiyiNew/CGCTime/index.js
index 71e0002..3f2269b 100644
--- a/subPackages/feiyiNew/CGCTime/index.js
+++ b/subPackages/feiyiNew/CGCTime/index.js
@@ -39,11 +39,12 @@ Page({
     commonApi._post("multimedia/media_list", {
         limit: 10,
         page: this.data.page_no,
-        class_id: 139,
-        // class_id: 140,
+        // class_id: 139,
+        class_id: 140,
         type: 1,
     }).then(res => {
         if (res) {
+            this.data.page_no++
             this.setData({list:list.concat(res.data.data||[])})
             if (res.data.data.length<10) {
                 this.data.haveMore = false
diff --git a/subPackages/feiyiNew/CGCTime/index.wxml b/subPackages/feiyiNew/CGCTime/index.wxml
index d60bb26..875140f 100644
--- a/subPackages/feiyiNew/CGCTime/index.wxml
+++ b/subPackages/feiyiNew/CGCTime/index.wxml
@@ -6,12 +6,12 @@
 </view>
 
 <view class="content">
-    <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
+    <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}" wx:key="index">
        
-        <view style="display: flex;align-items: center;">
-            <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar}}" mode="aspectFill"></image>
+        <!-- <view style="display: flex;align-items: center;">
+            <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="https://static.ticket.sz-trip.com/tongli/images/index/user.png" mode="aspectFill"></image>
             <text>君到苏州</text>
-        </view>
+        </view> -->
         <view class="textOver2 title">{{item.title}}</view>
         <view class="video-image">
             <image src="{{item.head_img}}" mode="asectFill"></image>
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index 25e3d01..8402dc5 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -393,7 +393,8 @@ Page({
   // 获取左侧二级分类
   getType() {
     commonApi._post("product/tag_list",{
-      pid:5, //父标签的ID
+    //   pid:645, //父标签的ID
+    pid: 5,
     }).then(res=>{
       this.setData({
         typeList:res.data
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
index 55ce67b..2f9224d 100644
--- a/subPackages/postSearch/index.js
+++ b/subPackages/postSearch/index.js
@@ -40,6 +40,7 @@ Page({
       type='1'
     } else {
       id = '5'
+    //   id = '645'
       type='2'
     } 
     this.setData({

From eb59b4fdcb0bfe517eeecdc1d6e172fc5b043b1f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Jun 2025 15:49:21 +0800
Subject: [PATCH 333/471] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/address/add/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/user/address/add/index.js b/pages/user/address/add/index.js
index 73b4b2f..18ff9ca 100644
--- a/pages/user/address/add/index.js
+++ b/pages/user/address/add/index.js
@@ -167,6 +167,8 @@ Page({
         return item.pid == city[e.detail.value].id;
       })
     } else {
+        //区级滚动时不用重置数据
+        return
       const cityName = data.multiArray[1][data.multiIndex[1]];
       let cityId = '';
       try {
@@ -181,6 +183,7 @@ Page({
         return item.pid == cityId;
       })
     }
+    console.log(this.data.multiArray, area)
     provinceList = province.map(item => {
       return item.name
     })

From b0329ff8938e168e3f28732e11406617941d2c00 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Jun 2025 16:22:12 +0800
Subject: [PATCH 334/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml             | 8 ++++----
 pages/index/index.wxss             | 8 ++++----
 pages/pbService/aiHelpYou/index.js | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b67b8b1..7670cae 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -41,7 +41,7 @@
                     </view>
                 </view>
             </scroll-view> -->
-            <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:160rpx" 
+            <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:180rpx;padding-top: 43rpx;" 
                 bindchange="changeBannerIndex" data-keyname="mainNavIndex" 
                 display-multiple-items="5" circular
                 current="0">
@@ -52,9 +52,9 @@
                 </swiper-item>
                 </block>
             </swiper>
-            <view class="scroll-line" style="width: 0 !important;">
-                <!-- <view class="scroll-line-bg" wx:if="{{(mainNavIndex+2) < (mainTypeList.length/2)}}" style="width:17rpx;"></view>
-                <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view> -->
+            <view class="scroll-line" >
+                <view class="scroll-line-bg" wx:if="{{(mainNavIndex+2) < (mainTypeList.length/2)}}" style="width:17rpx;"></view>
+                <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
             </view>
         </view>
         
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d572713..b33327d 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -74,7 +74,7 @@ page {
     background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/150bd1f9312967bd7d9bedc6dbb8dd48.png");
     background-size: 100% auto;
     background-repeat: repeat-y;
-    padding-top: 63rpx;
+    /* padding-top: 63rpx; */
 }
 
 .top-icons {
@@ -99,8 +99,8 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 100rpx;
-  height: 100rpx;
+  width: 80rpx;
+  height: 80rpx;
   display: block;
   transition: all 0.2s;
   /* margin: 0 auto; */
@@ -108,7 +108,7 @@ page {
 }
 /* 金刚区滚动效果 */
 .top-icon-item.active{
-   height: 160rpx !important;
+   height: 170rpx !important;
    margin-bottom: 0;
 }
 .top-icon-item.active image{
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index 0937865..3626d93 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -18,17 +18,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let weburl = 'https://m.cloud.sz-trip.com/aiPlay'
+    let weburl = 'https://test.m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
     let token = wx.getStorageSync('jstrip_token')
     if (token) {
-        weburl += '?token='+token
+        weburl += '&token='+token
     }
     let _this = this
     try {
         let lonAndLat = (wx.getStorageSync('lonAndLat'))
         if (lonAndLat && JSON.parse(lonAndLat)) {
             lonAndLat = JSON.parse(lonAndLat)
-            if (Object.keys(webParam).length>0 || token) {
+            if (token) {
                 weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
             } else {
                 weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
@@ -41,7 +41,7 @@ Page({
                 success: (res) => {
                     let lonAndLat = JSON.stringify({lat: res.latitude,lon: res.longitude})
                     wx.setStorageSync('lonAndLat', lonAndLat)
-                    if (Object.keys(webParam).length>0 || token) {
+                    if (token) {
                         weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
                     } else {
                         weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`

From 8fa8887fa4637972ce2149d549404627f6821938 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Jun 2025 17:49:05 +0800
Subject: [PATCH 335/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index a914d3a..1552c87 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest101? true : false;
+            data.isTest = data.isTest110? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From 1b5046b2d50e2ba4a2bb363e580881d23bec78cd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 6 Jun 2025 10:40:02 +0800
Subject: [PATCH 336/471] =?UTF-8?q?=E5=8D=81=E5=85=A8=E5=8D=81=E7=BE=8E?=
 =?UTF-8?q?=E5=B8=B8=E7=86=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 8996e2b..7ffea9f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -263,8 +263,8 @@ Page({
             {
                 title: "常熟",
 				img: "https://static.ticket.sz-trip.com/uploads/20250529/ed641bf31558381e8d1c372e5cbbd155.png",
-                appId: 'wx4df5fd9a6a5ea123',
-				pagePath: 'pages/index'
+                appId: 'wxdaf3d5edd07dc7af',
+				pagePath: 'pages/index/index'
             },
             {
                 title: "太仓",

From 4afda0d90e6ac256bc9685ce808500bcd676f784 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 10 Jun 2025 09:35:14 +0800
Subject: [PATCH 337/471] 1

---
 pages/index/index.wxss         |  5 +++--
 project.private.config.json    | 14 +++++++-------
 subPackages/indexGQ/index.wxml |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index b33327d..71dbf6c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -53,12 +53,13 @@ page {
     z-index: 3;
     width: 100%;
     left: 0;
-    bottom: 30rpx;
+    bottom: 0rpx;
     right: 0;
     display: flex;
     justify-content: space-between;
-    padding: 0 30rpx;
+    padding: 187rpx 30rpx 30rpx;
     box-sizing: border-box;
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2))
 }
 .banner-main image{
     width: 153.33rpx;
diff --git a/project.private.config.json b/project.private.config.json
index f0e8b11..89dc0d2 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subPackages/index/index",
+          "pathName": "subPackages/indexGQ/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/feiyiNew/CGCIndex/index",
           "pathName": "subPackages/feiyiNew/index",
@@ -41,13 +48,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "subPackages/index/index",
-          "pathName": "subPackages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "subPackageCheckPoint/pages/index/index",
           "pathName": "subPackageCheckPoint/pages/index/index",
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index a5e5282..184d94e 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -20,7 +20,7 @@
   </navigator>
 </view>
 <view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" current="5" circular>
+  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex"  circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>

From 7221785386c7a4eee90efbf6c3c8ae73510e0ae0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 17 Jun 2025 15:52:30 +0800
Subject: [PATCH 338/471] =?UTF-8?q?=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7670cae..eab72b7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,7 @@
 <!--index.wxml-->
 
 
-<view wx:if="{{!isTest}}">
+<view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
         <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 

From 2bf637bf3567f90519eafe0f0a89fcd4a43aa8af Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 17 Jun 2025 15:52:33 +0800
Subject: [PATCH 339/471] 1

---
 pages/index/index.js   | 548 ++++++++++++++++++++++++-----------------
 pages/index/index.wxml |  92 +++++--
 pages/index/index.wxss |  59 +++--
 project.config.json    |   2 +-
 4 files changed, 430 insertions(+), 271 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 7ffea9f..4a6910b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -120,138 +120,160 @@ Page({
 
 		// 公共服务
 		publicSerivce: [
-			{
-				title: "高峰预警",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/c7e28d88bde040c386183d69ae9bb228.png",
-				path: "/pages/pbService/sceneComfort/index?title=高峰预警",
-				eventName: "comfort_click",
-			},
-			{
-				title: "实时路况",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a678fdc2127648cd7881e36791b2062a.png",
-				weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/",
-				eventName: "sslk",
-			},
-			{
-				title: "行李直送",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/66c8614112630ed168a27150f15a3234.png",
-				appId: 'wx757dd1ee184e75e9',
-          		pagePath: "pages/tabBar/index/index"
-			},
-			{
-				title: "行李寄存",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/3b9886609236df983e6512055662693c.png",
-				weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/",
-				eventName: "xljc",
-			},
-			{
-				title: "找厕所",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/e8e75d8cd8761d4de4336a35e29e5c6d.png",
-				path: "/pages/pbService/bike/index?type=1",
-			},
-			{
-				title: "停车场",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/ef3d9cfb4817552288d666d8e5617707.png",
-				weburl: "https://m.cloud.sz-trip.com/ParkingArea",
-			},
+			// {
+			// 	title: "高峰预警",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/c7e28d88bde040c386183d69ae9bb228.png",
+			// 	path: "/pages/pbService/sceneComfort/index?title=高峰预警",
+            //     eventName: "comfort_click",
+            //     keyname: 'gg_gfyj',
+			// },
+			// {
+			// 	title: "实时路况",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a678fdc2127648cd7881e36791b2062a.png",
+			// 	weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/",
+            //     eventName: "sslk",
+            //     keyname: 'gg_sslk',
+			// },
+			// {
+			// 	title: "行李直送",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/66c8614112630ed168a27150f15a3234.png",
+			// 	appId: 'wx757dd1ee184e75e9',
+            //     pagePath: "pages/tabBar/index/index",
+            //     keyname: 'gg_xlzs',
+			// },
+			// {
+			// 	title: "行李寄存",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/3b9886609236df983e6512055662693c.png",
+			// 	weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/",
+			// 	eventName: "xljc",
+			// 	keyname: 'gg_xljc',
+			// },
+			// {
+			// 	title: "找厕所",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/e8e75d8cd8761d4de4336a35e29e5c6d.png",
+			// 	path: "/pages/pbService/bike/index?type=1",
+			// 	keyname: 'gg_zcs',
+			// },
+			// {
+			// 	title: "停车场",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/ef3d9cfb4817552288d666d8e5617707.png",
+			// 	weburl: "https://m.cloud.sz-trip.com/ParkingArea",
+			// 	keyname: 'gg_tcc',
+			// },
 			
         ], 
         
         // 旅游助手
         travelData: [
-            {
-				title: "最美打卡点",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/800a30b94f77c1f7f1bc17f33c0daacd.png",
-				path: "/subPackageCheckPoint/pages/index/index",
-			},
-			{
-				title: "街巷美食",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/a4918bd24ff162991ca8db28759ade51.png",
-				path: "/pages/list/food/index",
-			},
-			{
-				title: "语音导览",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/f72a9f174aa66e520cbfe7429dca6635.png",
-				appId: "wx74f380bc721a0379",
-				pagePath: "/pages/listen/listen?title=君到苏州"
-			},
-			{
-				title: "游记攻略",
-				img: "https://static.ticket.sz-trip.com/uploads/20250526/e1762ba22ba5d4cc5882de321bc10110.png",
-				path: "/pages/list/strategy/index",
-			},
+            // {
+			// 	title: "最美打卡点",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/800a30b94f77c1f7f1bc17f33c0daacd.png",
+			// 	path: "/subPackageCheckPoint/pages/index/index",
+			// 	keyname: 'ly_zmdkd',
+			// },
+			// {
+			// 	title: "街巷美食",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/a4918bd24ff162991ca8db28759ade51.png",
+			// 	path: "/pages/list/food/index",
+			// 	keyname: 'ly_jxms',
+			// },
+			// {
+			// 	title: "语音导览",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/f72a9f174aa66e520cbfe7429dca6635.png",
+			// 	appId: "wx74f380bc721a0379",
+			// 	pagePath: "/pages/listen/listen?title=君到苏州",
+			// 	keyname: 'ly_yydl',
+			// },
+			// {
+			// 	title: "游记攻略",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250526/e1762ba22ba5d4cc5882de321bc10110.png",
+			// 	path: "/pages/list/strategy/index",
+			// 	keyname: 'ly_yjgl',
+			// },
         ],
 
 		// 数字文旅
 		travelCulture: [
-			{
-				title: "数字非遗",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/bc747aa7767770dc26e663480ac9150d.png',
-				weburl: "https://m.cloud.sz-trip.com/IntangibleCultural2",
-			},
-			{
-				title: "数字博物馆",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/86c986c2991e968ee143cf5777bb9f08.png',
-				weburl: "https://m.cloud.sz-trip.com/BwsInfo",
-			},
-			{
-				title: "数字名人馆",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/d570a1bb6961b9ddf26b17cc64b733dd.png',
-				weburl: "https://www.szsmrg.com/home",
-			},
-			{
-				title: "云上观展",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/8f96c29f6199b811a757e4e5c5901daa.png',
-				weburl: "https://m.cloud.sz-trip.com/CloudPerform2022",
-			},
-			{
-				title: "云上文博会",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250529/f45acb752680d1b4cce7d25da02c96f5.png',
-				weburl: "https://m.cloud.sz-trip.com/CloudExpo",
-			},
-			{
-				title: "精彩回顾",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250529/74bd8e6b027797a24fbfccaef5c836ad.png',
-				path: "/pages/pbService/activity/index",
-			},
-			{
-				title: "文化场馆查询",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250529/ff56544a00fb1cc78e0b307f16daa821.png',
-				weburl: "https://m.cloud.sz-trip.com/Museum",
-			},
-			{
-				title: "苏影通",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/e60996bf57f35f2dab63c81bc48b609a.png',
-				weburl: "https://m.cloud.sz-trip.com/movies",
-			},
-			{
-				title: "书仓",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/41d87b6d8d78ac497a6654ad293f9329.png',
-				appId: 'wx165d4f1727f6bdb0',
-				pagePath: 'pages/home/home'
-			},
-			{
-				title: "e读书",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/87e9c9e3453492fa1ee65b705565efbb.png',
-				appId: 'wx26e6f4c0baba005b',
-				pagePath: 'pages/index/index'
-			},
-			{
-				title: "数字公共文化",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250526/c60ed1f766645fa67a749dffa0d347a2.png',
-				weburl: "https://m.cloud.sz-trip.com/PublicCulture2022",
-			},
-			{
-				title: "云游苏州",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250529/f3b1ec60b5f069182faadf263ec9dfee.png',
-				weburl: 'https://speed.web.yunyouyizhan.com/downloadApp/index.html#/',
-			},
-			{
-				title: "美图鉴赏",
-				img: 'https://static.ticket.sz-trip.com/uploads/20250529/820de8c4353bde80379f46e474104c04.png',
-				path: "/pages/pbService/appreciate/index",
-				
-			},
+			// {
+			// 	title: "数字非遗",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/bc747aa7767770dc26e663480ac9150d.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/IntangibleCultural2",
+			// 	keyname: 'sz_szfy',
+			// },
+			// {
+			// 	title: "数字博物馆",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/86c986c2991e968ee143cf5777bb9f08.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/BwsInfo",
+			// 	keyname: 'sz_szbwg',
+			// },
+			// {
+			// 	title: "数字名人馆",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/d570a1bb6961b9ddf26b17cc64b733dd.png',
+			// 	weburl: "https://www.szsmrg.com/home",
+			// 	keyname: 'sz_szmrg',
+			// },
+			// {
+			// 	title: "云上观展",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/8f96c29f6199b811a757e4e5c5901daa.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/CloudPerform2022",
+			// 	keyname: 'sz_ysgz',
+			// },
+			// {
+			// 	title: "云上文博会",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250529/f45acb752680d1b4cce7d25da02c96f5.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/CloudExpo",
+			// 	keyname: 'sz_yswbh',
+			// },
+			// {
+			// 	title: "精彩回顾",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250529/74bd8e6b027797a24fbfccaef5c836ad.png',
+			// 	path: "/pages/pbService/activity/index",
+			// 	keyname: 'sz_jchg',
+			// },
+			// {
+			// 	title: "文化场馆查询",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250529/ff56544a00fb1cc78e0b307f16daa821.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/Museum",
+			// 	keyname: 'sz_whcgcx',
+			// },
+			// {
+			// 	title: "苏影通",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/e60996bf57f35f2dab63c81bc48b609a.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/movies",
+			// 	keyname: 'sz_syt',
+			// },
+			// {
+			// 	title: "书仓",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/41d87b6d8d78ac497a6654ad293f9329.png',
+			// 	appId: 'wx165d4f1727f6bdb0',
+			// 	pagePath: 'pages/home/home',
+			// 	keyname: 'sz_sc',
+			// },
+			// {
+			// 	title: "e读书",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/87e9c9e3453492fa1ee65b705565efbb.png',
+			// 	appId: 'wx26e6f4c0baba005b',
+			// 	pagePath: 'pages/index/index',
+			// 	keyname: 'sz_eds',
+			// },
+			// {
+			// 	title: "数字公共文化",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250526/c60ed1f766645fa67a749dffa0d347a2.png',
+			// 	weburl: "https://m.cloud.sz-trip.com/PublicCulture2022",
+			// 	keyname: 'sz_szggwh',
+			// },
+			// {
+			// 	title: "云游苏州",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250529/f3b1ec60b5f069182faadf263ec9dfee.png',
+			// 	weburl: 'https://speed.web.yunyouyizhan.com/downloadApp/index.html#/',
+			// 	keyname: 'sz_yysz',
+			// },
+			// {
+			// 	title: "美图鉴赏",
+			// 	img: 'https://static.ticket.sz-trip.com/uploads/20250529/820de8c4353bde80379f46e474104c04.png',
+			// 	path: "/pages/pbService/appreciate/index",
+			// 	keyname: 'sz_mtjs',
+			// },
 			
         ],
 		scrollLeft: 0,
@@ -260,61 +282,80 @@ Page({
         // 十全十美
         // area_ids: ["changshu","taicang", "kunshan","wujiang","gongyeyuanqu","zhangjiagang","wuzhong","xiangcheng","gusu","gaoxin"],
         SQSM: [
-            {
-                title: "常熟",
-				img: "https://static.ticket.sz-trip.com/uploads/20250529/ed641bf31558381e8d1c372e5cbbd155.png",
-                appId: 'wxdaf3d5edd07dc7af',
-				pagePath: 'pages/index/index'
-            },
-            {
-                title: "太仓",
-				img: "https://static.ticket.sz-trip.com/uploads/20250529/f359551295197eff9c0966324659f037.png",
-                appId: 'wx8853b0d93cbca75e',
-				pagePath: 'pages/home/home'
-            },
-            {
-                title: "昆山",
-				img: "https://static.ticket.sz-trip.com/uploads/20250529/35f498dbb43e14cdf3c6bbdf83e613db.png",
-                appId: 'wx8888a3fd0862b4c8',
-				pagePath: 'pages/index/index'
-            },
-            {
-                title: "吴江",
-				img: "https://static.ticket.sz-trip.com/uploads/20250529/2288c75b3797363015bfe633ea9abc0e.png",
-                appId: 'wx8eadea4ee2d42d4b',
-				pagePath: 'pages/index/index'
-            },
-            {
-                title: "工业园区",
-				img: "https://static.ticket.sz-trip.com/uploads/20250529/9e947f0ef8addbe5c52b5bd4de205788.png",
-                appId: 'wxd323e63a10aa6865',
-				pagePath: 'pages/home/index'
-            },
-            {
-                title: "张家港",
-                img: "https://static.ticket.sz-trip.com/uploads/20250529/6162e0a86ec7e7b12e568fd5f81b5c9b.png",
-                path: "/pages/list/six/index?area=zhangjiagang"
-            },
-            {
-                title: "吴中",
-                img: "https://static.ticket.sz-trip.com/uploads/20250529/36fc77bf5d6879e6ce06ae349187c2ad.png",
-                path: "/pages/list/six/index?area=wuzhong"
-            },
-            {
-                title: "相城",
-                img: "https://static.ticket.sz-trip.com/uploads/20250529/ec54fba906166c7512d26ca8a4fa5a9f.png",
-                path: "/pages/list/six/index?area=xiangcheng"
-            },
-            {
-                title: "姑苏",
-                img: "https://static.ticket.sz-trip.com/uploads/20250529/cbb939c4ddfa187489b59adcbe72f7a9.png",
-                path: "/pages/list/six/index?area=gusu"
-            },
-            {
-                title: "高新",
-                img: "https://static.ticket.sz-trip.com/uploads/20250529/f2aa7328af4afaa9d1d4ecac1778300a.png",
-                path: "/pages/list/six/index?area=gaoxin"
-            },
+            // {
+            //     title: "常熟",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250529/ed641bf31558381e8d1c372e5cbbd155.png",
+            //     appId: 'wxdaf3d5edd07dc7af',
+			// 	pagePath: 'pages/index/index',
+			// 	keyname: 'changshu',
+            // },
+            // {
+            //     title: "太仓",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250529/f359551295197eff9c0966324659f037.png",
+            //     appId: 'wx8853b0d93cbca75e',
+			// 	pagePath: 'pages/home/home',
+			// 	keyname: 'taicang',
+            // },
+            // {
+            //     title: "昆山",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250529/35f498dbb43e14cdf3c6bbdf83e613db.png",
+            //     appId: 'wx8888a3fd0862b4c8',
+			// 	pagePath: 'pages/index/index',
+			// 	keyname: 'kunshan',
+
+            // },
+            // {
+            //     title: "吴江",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250529/2288c75b3797363015bfe633ea9abc0e.png",
+            //     appId: 'wx8eadea4ee2d42d4b',
+			// 	pagePath: 'pages/index/index',
+			// 	keyname: 'wujiang',
+
+            // },
+            // {
+            //     title: "工业园区",
+			// 	img: "https://static.ticket.sz-trip.com/uploads/20250529/9e947f0ef8addbe5c52b5bd4de205788.png",
+            //     appId: 'wxd323e63a10aa6865',
+			// 	pagePath: 'pages/home/index',
+			// 	keyname: 'yuanqu',
+
+            // },
+            // {
+            //     title: "张家港",
+            //     img: "https://static.ticket.sz-trip.com/uploads/20250529/6162e0a86ec7e7b12e568fd5f81b5c9b.png",
+            //     path: "/pages/list/six/index?area=zhangjiagang",
+			// 	keyname: 'zhangjiagang',
+
+
+            // },
+            // {
+            //     title: "吴中",
+            //     img: "https://static.ticket.sz-trip.com/uploads/20250529/36fc77bf5d6879e6ce06ae349187c2ad.png",
+            //     path: "/pages/list/six/index?area=wuzhong",
+			// 	keyname: 'wuzhong',
+            // },
+            // {
+            //     title: "相城",
+            //     img: "https://static.ticket.sz-trip.com/uploads/20250529/ec54fba906166c7512d26ca8a4fa5a9f.png",
+            //     path: "/pages/list/six/index?area=xiangcheng",
+			// 	keyname: 'xiangcheng',
+
+            // },
+            // {
+            //     title: "姑苏",
+            //     img: "https://static.ticket.sz-trip.com/uploads/20250529/cbb939c4ddfa187489b59adcbe72f7a9.png",
+            //     path: "/pages/list/six/index?area=gusu",
+			// 	keyname: 'gusu',
+
+
+            // },
+            // {
+            //     title: "高新",
+            //     img: "https://static.ticket.sz-trip.com/uploads/20250529/f2aa7328af4afaa9d1d4ecac1778300a.png",
+            //     path: "/pages/list/six/index?area=gaoxin",
+			// 	keyname: 'gaoxin',
+
+            // },
 
 
         ],
@@ -395,6 +436,8 @@ Page({
         this.getXpthList() // 限时特惠
 
         this.getList()  // 回购榜
+
+        this.getRepurchaseList()
         // this.getWeather()  // 2025-5-26首页改版不需要天气了
         // this.getFourProduct() // 活动日历
 
@@ -446,14 +489,15 @@ Page({
             this.setData({
                 indexHot: app.globalData.configJson.indexHot,
                 isTest: app.globalData.configJson.isTest,
-                // otherPlat: app.globalData.configJson.otherPlats,
-                // 正式数据
                 indexSeason: app.globalData.configJson.indexSeason,
-                // 开发数据
-                // indexSeason: imageSource.testImgs.indexSeason,
                 bannerDataList: (app.globalData.configJson.nav_menu || []),
                 mainTypeList: (app.globalData.configJson.menu_button || []),
-                func_data: (app.globalData.configJson.func_data || {}),
+                publicSerivce: (app.globalData.configJson.service_data || []),
+                travelData:(app.globalData.configJson.travel_data||[]),
+                travelCulture:(app.globalData.configJson.number_data||[]),
+                SQSM:(app.globalData.configJson.city_data||[]),
+                otherPlat: app.globalData.configJson.platform_data,
+                func_data: (app.globalData.configJson.func_data||{})
             })
         } else {
             commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
@@ -463,24 +507,51 @@ Page({
                 });
                 app.globalData.configJson.indexSeason = obj 
                 app.globalData.loadIndexSeason = true
-                app.globalData.configJson.nav_menu = (res.data.nav_menu || [])
-                app.globalData.configJson.menu_button = (res.data.menu_button || [])
+                app.globalData.configJson.nav_menu = (res.data.nav_menu || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'nav_menu', key_number: index}}
+                })
+                app.globalData.configJson.menu_button = (res.data.menu_button || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'menu_button', key_number: index}}
+                })
+                // 公共服务 publicSerivce
+                app.globalData.configJson.service_data = (res.data.service_data || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'service_data', key_number: index}}
+                })
+                // 旅游助手 travelData
+                app.globalData.configJson.travel_data = (res.data.travel_data || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'travel_data', key_number: index}}
+                })
+                // 数字文旅 travelCulture
+                app.globalData.configJson.number_data = (res.data.number_data || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'number_data', key_number: index}}
+                })
+                // 十全十美 SQSM
+                app.globalData.configJson.city_data = (res.data.city_data || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'city_data', key_number: index}}
+                })
+                // 其他平台otherPlat
+                app.globalData.configJson.platform_data = (res.data.platform_data || []).map((v,index)=>{
+                    return {...v, pagePoint: {classification: 'platform_data', key_number: index}}
+                })
 
+                
                 let func_data = {}
                 for(let item of (res.data.func_data || [])) {
                     func_data[item.jump_type] = true
                 }
                 app.globalData.configJson.func_data = func_data
-                
-
                 console.log('webData', app.globalData.configJson)
                 this.setData({
                     indexHot: app.globalData.configJson.indexHot,
                     isTest: app.globalData.configJson.isTest,
-                    // otherPlat: app.globalData.configJson.otherPlats,
+                    otherPlat: app.globalData.configJson.platform_data,
                     indexSeason: app.globalData.configJson.indexSeason,
                     bannerDataList: (app.globalData.configJson.nav_menu || []),
                     mainTypeList: (app.globalData.configJson.menu_button || []),
+                    publicSerivce: (app.globalData.configJson.service_data || []),
+                    travelData:(app.globalData.configJson.travel_data||[]),
+                    travelCulture:(app.globalData.configJson.number_data||[]),
+                    SQSM:(app.globalData.configJson.city_data||[]),
                     func_data: (app.globalData.configJson.func_data||{})
                 })
             })
@@ -535,15 +606,26 @@ Page({
 			}
 		})
 
-
+        // 顶部banner
 		commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => {
-			this.setData({banner: res.data || []})
+            let resData =  (res.data || []).map((v,index)=>{
+                return {...v, pagePoint: {classification: 'bigBanner', key_number: v.id}}
+            })
+			this.setData({banner: resData})
         })
+        // 专题banner
         commonApi._post("adv/getAdv", {position: 6,type_id: 3}).then(res => {
-			this.setData({ztbanner: res.data || []})
-		})
+            let resData =  (res.data || []).map((v,index)=>{
+                return {...v, pagePoint: {classification: 'specialBanner', key_number: v.id}}
+            })
+			this.setData({ztbanner:resData})
+        })
+        // 小banner
 		commonApi._post("adv/getAdv", {position: 1,type_id: 3}).then(res => {
-			this.setData({xiaobanner: res.data || []})
+            let resData =  (res.data || []).map((v,index)=>{
+                return {...v, pagePoint: {classification: 'smallBanner', key_number: v.id}}
+            })
+			this.setData({xiaobanner: resData})
 		})
 		//弹窗广告
 		commonApi._post("adv/getAdv", {position: 3,type_id: 3}).then(res => {
@@ -567,10 +649,9 @@ Page({
 	bannerClick: function(e) {
 		if (this.data.isTest) return;
 		let item = e.currentTarget.dataset.item;
-		this.pagePoint({
-			event: "banner_click",
-			type: 'banner'
-		}, 1)
+		console.log(item)
+		if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
+		
 		switch (item.jump_type) {
 			case 0:
 				break;
@@ -652,21 +733,18 @@ Page({
 		return;
 
 	},
+	newPagePoint (param) {
+		commonApi._post("browse/newBuryingPoint", {
+				uuid: app.globalData.uuid,
+				drive: "mini",
+				...param,
+		})
+	},
     
     //------------------------金刚区点击-------------------------------------
     // 自定义数据的跳转
 	mainIconClick: function(e) {
 		let item = e.currentTarget.dataset.item
-		// 埋点
-		if (item.eventName) {
-			this.pagePoint({event: item.eventName,}, 1)
-		}else if (item.title) {
-			commonApi._post("browse/burying_point", {
-				uuid: app.globalData.uuid,
-				drive: "mini",
-				title: item.title
-			})
-		}
 
 		if (item.appId) {
 			wx.navigateToMiniProgram({
@@ -693,11 +771,28 @@ Page({
     mainNavClick:function (e) {
         let item = e.currentTarget.dataset.item
         console.log(item)
+        if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
         if (item.jump_type == "page") {
-            wx.navigateTo({
-              url: "/"+item.page.mini,
-            })
-            return
+            if (item.page.mini) {
+                wx.navigateTo({
+                    url: "/"+item.page.mini,
+                  })
+                  return
+            }
+            if (item.page.tdata) {
+                if (item.page.tdata.ghid == "gh_b55e177a4069" || item.page.tdata.appid == 'wx4bb7b6050831f585') {
+                    wx.navigateTo({
+                        url: "/"+item.page.tdata.page,
+                    })
+                      
+                } else {
+                    wx.navigateToMiniProgram({
+                        appId: item.page.tdata.appid,
+                        path: item.page.tdata.page
+                    })
+                }
+            }
+            
         }
         if (item.jump_type == "link") {
             wx.navigateTo({
@@ -744,7 +839,11 @@ Page({
             typeId: 3,
             type: 1, // 返回数组
 		}).then(res => {
-			this.setData({xpth: res.data,})
+           console.log("resData",res.data.adv);
+           (res.data.adv || []).forEach(v=>{ v.pagePoint = {classification: 'flashSales', key_number: v.id} });
+            (res.data.list || []).forEach(v=>{ v.pagePoint = {classification: 'flashSales', key_number: v.id} });
+
+            this.setData({xpth: res.data})
 		})
     },
     
@@ -754,7 +853,8 @@ Page({
         this.setData({xpthIndex:value})
     },
 	productGotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
+        let item = e.currentTarget.dataset.item;
+        if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
 		util.gotoDetail(item)
 	},
 
@@ -763,13 +863,18 @@ Page({
         commonApi._post("product/get_product_by_tag_subject", {
             tag_id: 85,offset: 0,limit: 5,
         }).then(res=>{
-            this.setData({ list: res.data.list || []})
+            let resData = res.data.list || []
+            (resData).forEach(v=>{ v.pagePoint = {classification: 'hot', key_number: v.id} })
+            this.setData({ list: resData})
         })
     },
     // 回购
     getRepurchaseList:function () {
         commonApi._post("repurchase/repurchase/getRepurchaseList", {}).then(res=>{
-            (res.data || []).forEach(v=>v.headimg = this.showImg(v.headimg))
+            (res.data || []).forEach(v=>{
+                v.headimg = this.showImg(v.headimg)
+                v.pagePoint={classification: 'repurchase', key_number: v.product_id}
+            })
             this.setData({ repurchaseList: res.data || []})
         })
     },
@@ -777,15 +882,16 @@ Page({
 		// if (this.data.list.length < 30) {
 		// 	this.getList()
         // }
-        if (this.data.canGetrepurchase) {
-            this.data.canGetrepurchase = false
-            this.getRepurchaseList()
-        }
+        // if (this.data.canGetrepurchase) {
+        //     this.data.canGetrepurchase = false
+        //     this.getRepurchaseList()
+        // }
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
-		commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
-		item.id = item.type=='post'?item.product_id:item.scene_id
+		// commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
+        item.id = item.type=='post'?item.product_id:item.scene_id
+        if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
 		util.gotoDetail(item);
 		
 	},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index eab72b7..468f1b3 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -25,7 +25,7 @@
 
         <view class="banner-main">
             <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
-                <image src="{{item.icon}}" ></image>
+                <image src="{{item.icon}}" mode="aspectFill"></image>
             </view>
         </view>
     </view>
@@ -46,7 +46,7 @@
                 display-multiple-items="5" circular
                 current="0">
                 <block wx:for="{{mainTypeList}}" wx:key="index">
-                <swiper-item  bindtap="mainNavClick" class="top-icon-item {{(mainNavIndex+2)==index || (index==0&&mainNavIndex==6)||(index==1&&mainNavIndex==7)?'active':''}}"  data-item="{{item}}">
+                <swiper-item  bindtap="mainNavClick" class="top-icon-item {{(mainNavIndex+2)==index || (index==0&&mainNavIndex==mainTypeList.length-2)||(index==1&&mainNavIndex==mainTypeList.length-1)?'active':''}}"  data-item="{{item}}">
                     <image src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
                     <view class="top-icon-text">{{item.menu_name}}</view>
                 </swiper-item>
@@ -81,11 +81,11 @@
                 <!-- 上方标题部分 -->
                 <view class="xsth-title">
                     <view class="xsth-left" style="display: flex;">
-                        <image wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250604/9bd8c914b1e47d1856729357da00a7b1.png"></image>
-                        <image wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
+                        <image style="width: 253.33rpx;" wx:if="{{xpthIndex==0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
+                        <image style="width: 253.33rpx;"  wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
                         
-                        <image wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/1d1117bf6120fb75159eb8657b15c640.png"></image>
-                        <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250604/13c6feaebe2e2a575a64627502608153.png"></image>
+                        <image style="width: 253.33rpx;"  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
+                        <image style="width: 253.33rpx;"  wx:else  mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
                     </view>
                 </view>
                 <!-- 热门 -->
@@ -100,7 +100,7 @@
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
                                 </view>
-                                <image class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image>
+                                <!-- <image class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image> -->
                             </view>
                         </view>
                     </scroll-view>
@@ -111,14 +111,14 @@
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                            <image class="prod-img" src="{{item.headimg}}" mode="" />
+                            <image class="prod-img" src="{{item.headimg}}" mode="aspectFill" />
                             <view class="xpth-item-content">
                                 <view class="xpth-item-title textOver2">{{item.title}}</view>
                                 <view class="xpth-item-bottom">
                                 <view class="xpth-item-price">{{item.price/100}}</view>
                                 </view>
                             </view>
-                            <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"></image>
+                            <!-- <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"></image> -->
                         </view>
                     </view>
                     <!-- 右边的banner -->
@@ -127,9 +127,9 @@
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                                <image  src="{{item.head_img}}"></image>
+                                <image  src="{{item.head_img}}" mode="aspectFill"></image>
                                 <!-- <view class="xpth-cover textOver2">{{item.title}}</view> -->
-                                <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"></image>
+                                <!-- <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"></image> -->
                             </swiper-item>
                         </block>
                         </swiper>
@@ -146,7 +146,7 @@
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
                     <!-- 原 圆角77rpx，现改为13rpx -->
-                    <image style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index2025/smallBg.png"></image>
+                    <!-- <image style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index2025/smallBg.png"></image> -->
                     <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
@@ -160,14 +160,14 @@
             <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
                 <image class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
                 <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                    <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                    <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" />
+                    <view style="height: 40rpx;line-height: 40rpx;">更多 ></view>
+                    <!-- <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
                 </navigator>
             </view>
             <view wx:if="{{func_data.service_public}}">
                 <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
-                    <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
-                        <image src="{{item.img}}"></image>
+                    <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick">
+                        <image src="{{item.icon}}" mode="aspectFill"></image>
                     </view>
                 </view>
             </view>
@@ -178,8 +178,8 @@
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="pic-list" style="margin-top:30rpx" wx:if="{{func_data.helper_travel}}">
-                <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick"
-                src="{{item.img}}" mode="aspectFill"></image>
+                <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick"
+                src="{{item.icon}}" mode="aspectFill"></image>
             </view>
 
             <!-- ai避高峰 -->
@@ -202,8 +202,8 @@
                 <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
                 <scroll-view scroll-x style="height:400rpx" bindscroll="listenScroll" data-keyname="scrollLeft" class="slide-box">
                 <view class="pbservice">
-                    <view class="pbservice-item" wx:for="{{travelCulture}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
-                        <image src="{{item.img}}" mode="widthFix"></image>
+                    <view class="pbservice-item" wx:for="{{travelCulture}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick">
+                        <image src="{{item.icon}}" mode="aspectFill"></image>
                         <!-- <view class="text">{{item.title}}</view> -->
                     </view>
                     
@@ -221,7 +221,7 @@
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
             </view>
             <view class="six-box-new" wx:if="{{func_data.scenery_ten}}">
-                <image wx:for="{{SQSM}}" src="{{item.img}}" data-item="{{item}}" bindtap="mainIconClick" mode="widthFix" wx:key="index"></image>
+                <image wx:for="{{SQSM}}" src="{{item.icon}}" data-item="{{item}}" bindtap="mainNavClick" mode="aspectFill" wx:key="index"></image>
             </view>
 
             <!-- 长三角文旅平台 --> 
@@ -230,8 +230,8 @@
                 <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="other-plats" wx:if="{{otherPlat &&func_data.platform_nearby}}">
-                <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-                <image src="{{item.icon}}" mode="heightFix"></image>
+                <view class="other-plat" wx:for="{{otherPlat}}" bindtap="mainNavClick" data-item="{{item}}" wx:key="index">
+                <image src="{{item.icon}}" mode="aspectFill"></image>
                 <!-- <view>{{item.name}}</view> -->
                 </view>
             </view>
@@ -304,4 +304,50 @@
         </view>
     </view>
 
+</view>
+
+
+<view class="bg" wx:else style="background-image: url({{indexSeason.background}});">
+    <!-- 顶部banner -->
+    <view style="position:relative;z-index: 1;">
+        <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+            <block wx:for="{{banner}}" wx:key="index">
+            <swiper-item data-item="{{item}}">
+                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <!-- <view class="com-flex dot-list">
+            <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+        </view> -->
+
+        
+
+        <view class="banner-main">
+            <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{[bannerDataList[0]]}}" wx:key="index" data-item="{{item}}">
+                <image src="{{item.icon}}" ></image>
+            </view>
+        </view>
+    </view>
+
+    <view class="main-content" >
+ 
+        <view class="content-box">
+            <!-- 苏城环游记 todo-->
+            <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
+                <block wx:for="{{ztbanner}}" wx:key="index">
+                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <!-- 原 圆角77rpx，现改为13rpx -->
+                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+            </view>
+        </view>
+    </view>
+
+
 </view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 71dbf6c..81c5d68 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,7 +1,13 @@
 /**index.wxss**/
 /* 元旦修改 */
-page {
-  padding-bottom: 36.67rpx;
+
+.bg{
+    height: 100vh;
+    overflow-x: hidden;
+    overflow-y: auto;
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    /* background-color:#E8F9FA; */
 }
 .swiper,.swiper image {
   width: 100%;
@@ -57,22 +63,22 @@ page {
     right: 0;
     display: flex;
     justify-content: space-between;
-    padding: 187rpx 30rpx 30rpx;
+    padding: 187rpx 20rpx 30rpx;
     box-sizing: border-box;
     background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2))
 }
 .banner-main image{
-    width: 153.33rpx;
-    height: 133.33rpx;
+    width: 173.33rpx;
+    height: 173.33rpx;
 }
 
 .main-content{
-    background-color:#E8F9FA;
+    /* background-color:#E8F9FA; */
     margin-top: -10rpx;
     border-radius: 20rpx;
     position: relative;
     z-index: 4;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/150bd1f9312967bd7d9bedc6dbb8dd48.png");
+    /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/150bd1f9312967bd7d9bedc6dbb8dd48.png"); */
     background-size: 100% auto;
     background-repeat: repeat-y;
     /* padding-top: 63rpx; */
@@ -100,8 +106,8 @@ page {
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 80rpx;
-  height: 80rpx;
+  width: 93.33rpx;
+  height: 93.33rpx;
   display: block;
   transition: all 0.2s;
   /* margin: 0 auto; */
@@ -113,15 +119,15 @@ page {
    margin-bottom: 0;
 }
 .top-icon-item.active image{
-    height: 130rpx;
-    width: 130rpx;
+    height: 133rpx;
+    width: 133rpx;
 }
 
 .content-box {
   margin: 0 25rpx;
 }
 .common-header-img{
-    height: 63.33rpx;
+    height: 106.67rpx;
 }
 
 .small-swiper {
@@ -188,12 +194,13 @@ page {
         color: #000000;
       position: relative;
       background: white;
+      border-radius: 20rpx;
   }
  
   .season-hot .season-item image{
       width: 100%;
       height: 200rpx;
-      border-top-right-radius: 14rpx;
+      border-radius: 20rpx 20rpx  0 0;
   }
   .season-hot .season-item .hot-cover-img{
       position: absolute;
@@ -250,7 +257,7 @@ page {
     flex: 1;
     height: 100%;
     width: 100%;
-    /* border-radius: 20rpx; */
+    border-radius: 20rpx;
   }
   .xpth-banner-dot-list{
       position: absolute;
@@ -384,14 +391,14 @@ page {
 }
 .new-pic {
     width: 340rpx;
-    height: 140rpx;
+    height: 146.67rpx;
     margin-bottom: 20rpx;
   }
 
 .title-more {
   font-size: 27rpx;
   font-weight: 500;
-  color: #1A9BA7;
+  color: #000;
   z-index: 9;
   width: 173rpx;
   height: 63.33rpx;
@@ -433,8 +440,8 @@ page {
   width: 200rpx;
 }
 .pbservice-item image {
-  width: 158rpx;
-  height: 152rpx;
+  width: 166.67rpx;
+  height: 146.67rpx;
   /* margin-bottom: 10rpx; */
 }
 .six-box {
@@ -605,13 +612,13 @@ page {
 
   width: 34rpx !important;
   height: 7rpx;
-  background: #87E1EC;
+  background: white;
   border-radius: 3rpx;
   margin: 33.33rpx auto;
 }
 .scroll-line-bg {
   height: 7rpx;
-  background: #30A7CD;
+  background: #b2b2b2;
   border-radius: 3rpx;
 }
 
@@ -638,9 +645,9 @@ page {
   align-items: center;
 }
 .other-plats image {
-  width: 153.33rpx;
+  width: 340rpx;
   display: block;
-  height: 111.33rpx;
+  height: 146.67rpx;
   margin-bottom: 15rpx;
 }
 
@@ -743,8 +750,8 @@ page {
 
 .ggfw-list .ggfw {
   width: 220rpx;
-  height: 72rpx;
-  margin-bottom: 14rpx;
+  height: 106.67rpx;
+  margin-bottom: 20rpx;
 }
 .ggfw image{
   width: 100%;
@@ -765,8 +772,8 @@ page {
 }
 
 .six-box-new image {
-  width: 334rpx;
-  height: 193.33rpx !important;
+  width: 333.33rpx;
+  height: 200rpx !important;
   /* background: #FFE7C0; */
   border-radius: 20rpx;
   flex-shrink: 0;
diff --git a/project.config.json b/project.config.json
index fab7ecc..1241058 100644
--- a/project.config.json
+++ b/project.config.json
@@ -7,7 +7,7 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
-    "enhance": false,
+    "enhance": true,
     "postcss": true,
     "preloadBackgroundData": false,
     "minified": true,

From d6429b71371d737d0e94bb50110ba5f9c4d596f5 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 17 Jun 2025 18:50:58 +0800
Subject: [PATCH 340/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             |  2 +-
 pages/index/index.js               |  7 +++++++
 pages/index/index.wxml             | 24 +++++++++++++++++++-----
 pages/pbService/aiHelpYou/index.js |  6 +++++-
 utils/https.js                     |  4 ++--
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 1552c87..8f07bc1 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest110? true : false;
+            data.isTest = data.isTest115? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 4a6910b..ee475ca 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -41,6 +41,13 @@ Page({
 		activeBannerIndex: 0,
         smBannerIndex: 0,
         ztBannerIndex: 0,
+        bannerDataListFake: [
+			{
+				title: "景点门票",
+				img: "https://static.ticket.sz-trip.com/uploads/20250526/5934b8b77b058ce1de5943adbaf51739.png",
+				path: "/pages/list/scene/index",
+			},
+		],
 		
 		// banner上的金刚区
 		bannerDataList: [
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 468f1b3..dbf5f65 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -94,8 +94,8 @@
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
                                 <image src="{{item.headimg}}"></image>
-                                <view class="season-content" style="padding:6rpx 12rpx 0;">
-                                    <view style="height: 60rpx;" class="textOver2">{{item.title}}</view>
+                                <view class="season-content" style="padding:6rpx 12rpx 0;height: 120rpx;">
+                                    <view class="textOver2">{{item.title}}</view>
                                     <view class="price" style="padding-top: 8rpx;">
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
@@ -325,8 +325,8 @@
         
 
         <view class="banner-main">
-            <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{[bannerDataList[0]]}}" wx:key="index" data-item="{{item}}">
-                <image src="{{item.icon}}" ></image>
+            <view catchtap="mainIconClick" class="banner-main-item" wx:for="{{bannerDataListFake}}" wx:key="index" data-item="{{item}}">
+                <image src="{{item.img}}" ></image>
             </view>
         </view>
     </view>
@@ -339,7 +339,7 @@
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
-                    <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                    <swiper-item data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
                     <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
@@ -347,6 +347,20 @@
                 </swiper>
             </view>
         </view>
+
+
+        <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
+                <block wx:for="{{xiaobanner}}" wx:key="index">
+                    <swiper-item  data-item="{{item}}" style="position: relative;">
+             
+                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </block>
+                </swiper>
+               
+            </view>
     </view>
 
 
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index 3626d93..9ad6fbd 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -18,7 +18,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let weburl = 'https://test.m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
+    let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
+    if (app.globalData.configJson.isTest) {
+        weburl = "https://m.cloud.sz-trip.com/ScenicComfort"
+    }
+
     let token = wx.getStorageSync('jstrip_token')
     if (token) {
         weburl += '&token='+token
diff --git a/utils/https.js b/utils/https.js
index 1a81b17..67031b4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 205f118afe9c2eda6dd2f906dec1d12fcfb8fb02 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 17 Jun 2025 18:52:01 +0800
Subject: [PATCH 341/471] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/autumnten/index.wxml           |  8 ++---
 pages/activity/autumnten/list/index.wxml      |  2 +-
 pages/activity/graduate/index.wxml            | 10 +++---
 pages/activity/graduate/index.wxss            |  2 +-
 pages/activity/huawei/form/index.wxml         |  4 +--
 pages/activity/huawei/index.wxml              |  6 ++--
 pages/activity/huawei/index.wxss              |  2 +-
 pages/activity/huawei/list/index.wxml         |  6 ++--
 pages/activity/huawei/result/index.wxml       |  6 ++--
 pages/activity/huawei/upload/index.wxml       |  6 ++--
 pages/activity/huawei/uploadres/index.wxml    |  6 ++--
 pages/activity/redlist/index.wxml             |  2 +-
 pages/activity/subway/index.wxml              | 16 ++++-----
 pages/activity/tenscenic/index.wxml           |  8 ++---
 pages/activity/tenscenic/index.wxss           |  8 ++---
 pages/group/info/index.wxml                   | 10 +++---
 pages/info/activityInfo/index.wxml            | 10 +++---
 pages/info/cardInfo/index.wxml                | 10 +++---
 pages/info/culturalUnitInfo/index.wxml        | 18 +++++-----
 pages/info/culturalUnitInfo/index.wxss        |  2 +-
 pages/info/hotelProductInfo/index.wxml        | 10 +++---
 pages/info/museumInfo/index.wxml              | 10 +++---
 pages/info/postProductInfo/index.wxml         | 12 +++----
 pages/info/postProductInfo/index.wxss         |  2 +-
 pages/info/redmapInfo/index.wxml              | 18 +++++-----
 pages/info/redmapInfo/index.wxss              |  2 +-
 pages/info/roadInfo/index.wxml                | 10 +++---
 pages/info/sceneProductInfo/index.wxml        | 12 +++----
 pages/info/sceneProductInfo/index.wxss        |  2 +-
 pages/info/sceneProductInfoNew/index.wxml     | 12 +++----
 pages/info/sceneProductInfoNew/index.wxss     |  2 +-
 pages/info/showInfo/index.wxml                | 12 +++----
 pages/info/showInfo/index.wxss                |  2 +-
 pages/kj/info/index.wxml                      | 10 +++---
 pages/list/daysu/detail/index.wxml            |  2 +-
 pages/list/daysu/index.wxml                   |  2 +-
 pages/list/mayday/index.wxml                  | 34 +++++++++----------
 pages/list/mayday/index.wxss                  |  2 +-
 pages/list/six/index.wxml                     | 18 +++++-----
 pages/list/strategy/index.wxml                |  4 +--
 pages/map/index.wxml                          | 10 +++---
 pages/order/postOrder/index.wxml              |  2 +-
 pages/order/scene/index.wxml                  |  2 +-
 pages/order/sceneCart/index.wxml              |  2 +-
 pages/order/show/index.wxml                   |  2 +-
 pages/pbService/activity/index.wxml           |  2 +-
 pages/pbService/feiyi/info/index.wxml         | 10 +++---
 pages/pbService/gym/info/index.wxml           | 24 ++++++-------
 pages/pbService/gym/info/index.wxss           |  2 +-
 pages/pbService/museum/info/index.wxml        | 26 +++++++-------
 pages/pbService/museum/info/index.wxss        |  2 +-
 pages/pbService/wwcx/info/index.wxml          | 10 +++---
 pages/supplier/good/index.wxml                | 16 ++++-----
 pages/supplier/index.wxml                     | 14 ++++----
 subPackages/goods/oneCardTour/info/index.wxml | 12 +++----
 subPackages/gwcOrder/index.wxml               |  2 +-
 56 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/pages/activity/autumnten/index.wxml b/pages/activity/autumnten/index.wxml
index fd70eec..2b78fa5 100644
--- a/pages/activity/autumnten/index.wxml
+++ b/pages/activity/autumnten/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/springten/index.wxml-->
 <title title="苏州游必选榜"></title>
-<image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/autumnten/top.png" mode="widthFix" class="top-img"></image>
+<image src="https://static.ticket.sz-trip.com/xcxImages/autumnten/top.png" mode="widthFix" class="top-img"></image>
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">
   <view class="picker">
     <view class="areatext">{{areas[areaIndex].area_title}}</view>
@@ -9,7 +9,7 @@
 </picker>
 <view class="type-icons">
   <view wx:for="{{types}}" bindtap="changeType" data-type="{{index}}" class="type-icon {{type==index?'type-icon-active':''}}">
-    <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/autumnten/bg{{type==index?'1':''}}.png"></image>
+    <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/bg{{type==index?'1':''}}.png"></image>
     <view class="icon-text">{{item}}</view>
   </view>
 </view>
@@ -17,8 +17,8 @@
 <view class="list" style="padding-bottom:30rpx">
   <view class="item-box" wx:for="{{list}}">
     <view class="item-bg"></view>
-    <image mode="widthFix" class="lefticon" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/autumnten/lefticon.png"></image>
-    <image mode="widthFix" class="righticon" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/autumnten/righticon.png"></image>
+    <image mode="widthFix" class="lefticon" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/lefticon.png"></image>
+    <image mode="widthFix" class="righticon" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/righticon.png"></image>
     <view class="item">
       <view class="item-in">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
diff --git a/pages/activity/autumnten/list/index.wxml b/pages/activity/autumnten/list/index.wxml
index e5e70fa..7a83e50 100644
--- a/pages/activity/autumnten/list/index.wxml
+++ b/pages/activity/autumnten/list/index.wxml
@@ -7,6 +7,6 @@
       <view class="title textOver">{{item.title}}</view>
       <view class="address textOver"><text class="iconfont icon-location"></text>{{item.address}}</view>
     </view>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/autumnten/btn.png" mode="aspectFill"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/autumnten/btn.png" mode="aspectFill"></image>
   </view>
 </view>
diff --git a/pages/activity/graduate/index.wxml b/pages/activity/graduate/index.wxml
index 25806d5..7e09944 100644
--- a/pages/activity/graduate/index.wxml
+++ b/pages/activity/graduate/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/graduate/index.wxml-->
 <view style="position:relative;min-height:100vh">
-  <image style="position:absolute;top:0;left:0" class="mainimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/activity/graduate/top.png" mode="widthFix"></image>
+  <image style="position:absolute;top:0;left:0" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/top.png" mode="widthFix"></image>
   <view class="top-menus">
     <view class="top-menu" bindtap="scrollToBox" data-index="1">好玩景点</view>
     <view class="top-menu" bindtap="scrollToBox" data-index="2">一日游</view>
@@ -9,7 +9,7 @@
   </view>
   <view style="height:650rpx"></view>
   <view class="list" wx:for="{{list}}" id="box{{index+1}}">
-    <image class="titleimg" mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/activity/graduate/title{{index+1}}.png"></image>
+    <image class="titleimg" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/title{{index+1}}.png"></image>
     <view class="list-box">
       <view class="item" wx:for="{{item}}" bindtap="gotoDetail" data-item="{{item}}">
         <image class="mainimg" src="{{item.headimg}}" mode="aspectFill"></image>
@@ -19,12 +19,12 @@
         </view>
         <view class="product-bottom">
           <view class="price">￥<text>{{item.price/100}}</text></view>
-          <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/activity/graduate/btn.png"></image>
+          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/btn.png"></image>
         </view>
       </view>
     </view>
   </view>
   <view style="height:80rpx"></view>
-  <image class="bottomtext" mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/activity/graduate/bottom.png"></image>
-  <image class="bottombg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/activity/graduate/bottombg.png" mode="widthFix"></image>
+  <image class="bottomtext" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bottom.png"></image>
+  <image class="bottombg" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bottombg.png" mode="widthFix"></image>
 </view>
\ No newline at end of file
diff --git a/pages/activity/graduate/index.wxss b/pages/activity/graduate/index.wxss
index b88e397..3fbdc44 100644
--- a/pages/activity/graduate/index.wxss
+++ b/pages/activity/graduate/index.wxss
@@ -4,7 +4,7 @@
   width: 100%;
 }
 page {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/activity/graduate/bg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bg.png);
   background-size: 100%;
   background-repeat: repeat-y;
 }
diff --git a/pages/activity/huawei/form/index.wxml b/pages/activity/huawei/form/index.wxml
index 314aa69..b881647 100644
--- a/pages/activity/huawei/form/index.wxml
+++ b/pages/activity/huawei/form/index.wxml
@@ -2,7 +2,7 @@
 <title title="信息填写"></title>
 <image src="{{info.head_img}}" mode="widthFix" class="topimg"></image>
 <view class="input-box">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/regtip.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/huawei/regtip.png" mode="widthFix"></image>
   <view class="input-item">
     <view>姓名</view>
     <input bindinput="changeName" type="text" />
@@ -24,6 +24,6 @@
       </view>
     </picker>
   </view>
-  <image bindtap="submit" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/regsubmit.png" class="submit-btn" mode="widthFix"></image>
+  <image bindtap="submit" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsubmit.png" class="submit-btn" mode="widthFix"></image>
 </view>
 <view style="height:30rpx"></view>
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxml b/pages/activity/huawei/index.wxml
index 3d0a1ba..774ee39 100644
--- a/pages/activity/huawei/index.wxml
+++ b/pages/activity/huawei/index.wxml
@@ -5,9 +5,9 @@
     <view bindtap="showRule" class="rule-btn">规则</view>
     <view wx:if="{{!isReg}}" class="tiptext">线上报名时间：{{info.sign_begin_time}} - {{info.sign_end_time}} </view>
     <view wx:if="{{!isReg}}" class="tiptext">线上投票时间：{{info.begin_time}} - {{info.end_time}} </view>
-    <image bindtap="gotoPath" style="margin-top:40rpx" data-path="form/index?id={{id}}" wx:if="{{!isReg}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/regbtn.png" mode="widthFix" class="btnimg"></image>
-    <image bindtap="gotoPath" data-path="upload/index?id={{id}}" wx:if="{{isReg}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadbtn.png" mode="widthFix" class="btnimg"></image>
-    <image bindtap="gotoPath" data-path="list/index?id={{id}}" wx:if="{{isReg}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/mybtn.png" mode="widthFix" class="btnimg"></image>
+    <image bindtap="gotoPath" style="margin-top:40rpx" data-path="form/index?id={{id}}" wx:if="{{!isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regbtn.png" mode="widthFix" class="btnimg"></image>
+    <image bindtap="gotoPath" data-path="upload/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix" class="btnimg"></image>
+    <image bindtap="gotoPath" data-path="list/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix" class="btnimg"></image>
     <view class="bottomtext">{{info.sub_title}}</view>
   </view>
 </view>
diff --git a/pages/activity/huawei/index.wxss b/pages/activity/huawei/index.wxss
index 9ca2b36..54b74f3 100644
--- a/pages/activity/huawei/index.wxss
+++ b/pages/activity/huawei/index.wxss
@@ -4,7 +4,7 @@
   left: 0;
   right: 0;
   bottom: 0;
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/bg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/huawei/bg.png);
   background-size: 100% 100%;
   background-repeat: no-repeat;
   display: flex;
diff --git a/pages/activity/huawei/list/index.wxml b/pages/activity/huawei/list/index.wxml
index e0829b4..3b18059 100644
--- a/pages/activity/huawei/list/index.wxml
+++ b/pages/activity/huawei/list/index.wxml
@@ -25,13 +25,13 @@
     {{list[0].desc}}
   </view>
   <view wx:if="{{!user_id}}" class="rule-btn" bindtap="showRule">规则</view>
-  <!-- <image wx:if="{{!user_id}}" style="width:646rpx" bindtap="reUpload" class="btnimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/reupload.png" mode="widthFix"></image> -->
+  <!-- <image wx:if="{{!user_id}}" style="width:646rpx" bindtap="reUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/reupload.png" mode="widthFix"></image> -->
   <view wx:if="{{!user_id}}" style="height:50rpx"></view>
 </view>
 <view wx:else>
-  <image class="emptyimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/emptyimg.png" mode="widthFix"></image>
+  <image class="emptyimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/emptyimg.png" mode="widthFix"></image>
   <view class="tip1">投票已开始，无法上传作品！</view>
-  <!-- <image bindtap="gotoUpload" class="btnimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image> -->
+  <!-- <image bindtap="gotoUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image> -->
 </view>
 <view class="mask" wx:if="{{detail && showRuleFlag}}">
   <view bindtap="showRule" class="mask-bg"></view>
diff --git a/pages/activity/huawei/result/index.wxml b/pages/activity/huawei/result/index.wxml
index 513b922..3f7b432 100644
--- a/pages/activity/huawei/result/index.wxml
+++ b/pages/activity/huawei/result/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/activity/huawei/result/index.wxml-->
 <title title="报名成功"></title>
-<image class="logo" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/regsuccess.png" mode="widthFix"></image>
+<image class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsuccess.png" mode="widthFix"></image>
 <view class="text">恭喜您已报名成功！</view>
 <view>点击下方按钮开始进行作品上传</view>
-<image class="arrowimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/resarrow.png" mode="widthFix"></image>
-<image bindtap="upload" class="uploadimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadbtn.png"></image>
+<image class="arrowimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/resarrow.png" mode="widthFix"></image>
+<image bindtap="upload" class="uploadimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png"></image>
diff --git a/pages/activity/huawei/upload/index.wxml b/pages/activity/huawei/upload/index.wxml
index 634134f..49aa817 100644
--- a/pages/activity/huawei/upload/index.wxml
+++ b/pages/activity/huawei/upload/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/huawei/upload/index.wxml-->
 <title title="作品上传"></title>
-<image class="topimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadtop.png" mode="widthFix"></image>
+<image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadtop.png" mode="widthFix"></image>
 <view class="input-box">
   <view class="input-item">
     <text>作品标题</text>
@@ -31,8 +31,8 @@
 </view>
 <view class="tip1">上传图片</view>
 <image wx:if="{{img}}" class="uploadimg" bindtap="uploadImg" src="{{img}}" mode="aspectFill"></image>
-<image wx:else class="uploadimg" bindtap="uploadImg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadimg.png" mode="widthFix"></image>
+<image wx:else class="uploadimg" bindtap="uploadImg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadimg.png" mode="widthFix"></image>
 <view class="tip1">作品描述</view>
 <textarea bindinput="changeContent" placeholder="请添加您作品的描述（最多300字）" class="textarea"></textarea>
-<image bindtap="submit" class="uploadbtn" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image>
+<image bindtap="submit" class="uploadbtn" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image>
 <view class="tip2">一个分类的作品多次提交，平台只保留最近上传的作品</view>
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxml b/pages/activity/huawei/uploadres/index.wxml
index e9f1645..14e0cd8 100644
--- a/pages/activity/huawei/uploadres/index.wxml
+++ b/pages/activity/huawei/uploadres/index.wxml
@@ -1,8 +1,8 @@
 <!--pages/activity/huawei/uploadres/index.wxml-->
 <title title="上传成功"></title>
-<image class="logo" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/uploadres.png" mode="widthFix"></image>
+<image class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadres.png" mode="widthFix"></image>
 <view class="tip1">恭喜您的作品已上传完成！</view>
-<image class="btnimg" bindtap="backhome" data-path="/pages/index/index" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/gobtn.png" mode="widthFix"></image>
-<image class="btnimg" bindtap="gotoPath" data-path="../list/index?id={{id}}" style="margin-bottom:92rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/huawei/mybtn.png" mode="widthFix"></image>
+<image class="btnimg" bindtap="backhome" data-path="/pages/index/index" src="https://static.ticket.sz-trip.com/xcxImages/huawei/gobtn.png" mode="widthFix"></image>
+<image class="btnimg" bindtap="gotoPath" data-path="../list/index?id={{id}}" style="margin-bottom:92rpx" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix"></image>
 <view class="tip2">通过第一轮评审的摄影作品将在9月1号后</view>
 <view class="tip2">进行线上展示，请注意查看平台通知</view>
\ No newline at end of file
diff --git a/pages/activity/redlist/index.wxml b/pages/activity/redlist/index.wxml
index 05ae382..c5c99de 100644
--- a/pages/activity/redlist/index.wxml
+++ b/pages/activity/redlist/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/activity/redlist/index.wxml-->
-<image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/listtop/redlist.png" mode="widthFix" class="mainimg"></image>
+<image src="https://static.ticket.sz-trip.com/xcxImages/listtop/redlist.png" mode="widthFix" class="mainimg"></image>
 <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
   <image src="{{item.headimg}}" mode="aspectFill" class="mainimg"></image>
   <view class="item-info">
diff --git a/pages/activity/subway/index.wxml b/pages/activity/subway/index.wxml
index bc0e227..d1208cb 100644
--- a/pages/activity/subway/index.wxml
+++ b/pages/activity/subway/index.wxml
@@ -1,19 +1,19 @@
 <!--pages/activity/subway/index.wxml-->
 <title title="坐着地铁游苏州"></title>
-<image style="position:absolute;left:0;height:994rpx" class="mainimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/top.png" mode="aspectFill"></image>
+<image style="position:absolute;left:0;height:994rpx" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/top.png" mode="aspectFill"></image>
 <view style="height:949rpx"></view>
 <view class="lines{{isFixed?' fixed-lines':''}}">
   <view bindtap="changeLine" data-index="{{index}}" class="line{{index==line?' active':''}}" wx:for="{{5}}">{{index+1}}号线</view>
 </view>
 <view wx:if="{{isFixed}}" style="height:110rpx"></view>
 <view class="content" id="content" style="background:{{colors[line]}}">
-  <image mode="widthFix" class="mainimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/title{{line+1}}.png"></image>
-  <image bindtap="showMap" data-src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/map{{line+1}}-1.png" class="mapimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/map{{line+1}}.png"></image>
+  <image mode="widthFix" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/title{{line+1}}.png"></image>
+  <image bindtap="showMap" data-src="https://static.ticket.sz-trip.com/xcxImages/subway/map{{line+1}}-1.png" class="mapimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/map{{line+1}}.png"></image>
   <view class="tags">
-    <view bindtap="changeTag" style="color:{{colors[line]}}" data-index="{{index}}" class="tag{{tagIndex==index?' active':''}}" wx:for="{{tags[line]}}"><view class="tagtext">{{item.name}}</view><image wx:if="{{tagIndex==index}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/arrow.png"></image></view>
+    <view bindtap="changeTag" style="color:{{colors[line]}}" data-index="{{index}}" class="tag{{tagIndex==index?' active':''}}" wx:for="{{tags[line]}}"><view class="tagtext">{{item.name}}</view><image wx:if="{{tagIndex==index}}" src="https://static.ticket.sz-trip.com/xcxImages/subway/arrow.png"></image></view>
     <view style="width:1rpx;height:1rpx;flex-shrink:0"></view>
   </view>
-  <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" style="background-image:url('https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/bg{{line+1}}.png');background-size:100% 100%;">
+  <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" style="background-image:url('https://static.ticket.sz-trip.com/xcxImages/subway/bg{{line+1}}.png');background-size:100% 100%;">
     <image src="{{item.headimg}}" class="headimg" mode="aspectFill"></image>
     <view class="right-info">
       <view class="title textOver">{{item.title}}</view>
@@ -24,10 +24,10 @@
   <view wx:if="{{list.length<total}}" class="morebtn" bindtap="getList">点击查看更多 <text>>></text></view>
   <view style="height:1rpx"></view>
 </view>
-<image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/text.png" mode="widthFix" class="textimg"></image>
+<image src="https://static.ticket.sz-trip.com/xcxImages/subway/text.png" mode="widthFix" class="textimg"></image>
 <view style="height:53rpx"></view>
-<image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/bottom.png" mode="widthFix" class="mainimg bottomimg"></image>
+<image src="https://static.ticket.sz-trip.com/xcxImages/subway/bottom.png" mode="widthFix" class="mainimg bottomimg"></image>
 <view class="topbtn" bindtap="toTop">
-  <image mode="wdithFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/subway/totop.png"></image>
+  <image mode="wdithFix" src="https://static.ticket.sz-trip.com/xcxImages/subway/totop.png"></image>
   <view>顶部</view>
 </view>
\ No newline at end of file
diff --git a/pages/activity/tenscenic/index.wxml b/pages/activity/tenscenic/index.wxml
index 4bcb493..2fa8c10 100644
--- a/pages/activity/tenscenic/index.wxml
+++ b/pages/activity/tenscenic/index.wxml
@@ -6,9 +6,9 @@
     <view class="iconfont icon-xia"></view>
   </view>
 </picker>
-<image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/top.png" mode="widthFix" class="topimg"></image>
+<image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/top.png" mode="widthFix" class="topimg"></image>
 <view class="video-box" wx:if="{{playFlag==false}}" bindtap="play">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/play.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/play.png" mode="widthFix"></image>
 </view>
 <view class="video-box1" wx:else>
   <video autoplay="{{true}}" bindended="playEnd" src="https://static.ticket.sz-trip.com/uploads/20210803/9acc76d92267c923044c8a335301e13e.mp4"></video>
@@ -21,7 +21,7 @@
     <view bindtap="changeTag" data-tag="3" class="tag{{tag1==3?' active':''}}">横塘驿站</view>
     <view bindtap="changeTag" data-tag="4" class="tag{{tag1==4?' active':''}}">宝带桥</view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/bridge.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/bridge.png" mode="widthFix"></image>
   <view class="tags" style="position:static;margin-top:20rpx">
     <view bindtap="changeTag" data-tag="5" class="tag{{tag1==5?' active':''}}">浒墅关</view>
     <view bindtap="changeTag" data-tag="6" class="tag{{tag1==6?' active':''}}">枫桥夜泊</view>
@@ -54,6 +54,6 @@
 <view wx:if="{{list.length==total}}" class="nomore">没有更多了</view>
 <view style="height:50rpx"></view>
 <view class="fixed-top" bindtap="goTop">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/arrow.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/arrow.png" mode="widthFix"></image>
   <view>顶部</view>
 </view>
\ No newline at end of file
diff --git a/pages/activity/tenscenic/index.wxss b/pages/activity/tenscenic/index.wxss
index 149a48c..9cffd3b 100644
--- a/pages/activity/tenscenic/index.wxss
+++ b/pages/activity/tenscenic/index.wxss
@@ -32,7 +32,7 @@ page {
   width: 677rpx;
   height: 375rpx;
   margin: 0 auto;
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/video.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/tenscenic/video.png);
   background-size: 100% 100%;
   margin-top: -235rpx;
   position: relative;
@@ -132,7 +132,7 @@ page {
 .new-tag {
   width: 158rpx;
   height: 67rpx;
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/noselect.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/tenscenic/noselect.png);
   background-size: 100% 100%;
   color: #27899E;
   font-size: 28rpx;
@@ -141,7 +141,7 @@ page {
   margin-bottom: 11rpx;
 }
 .new-tag.active {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/select.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/tenscenic/select.png);
   background-size: 100% 100%;
 }
 .item {
@@ -150,7 +150,7 @@ page {
   justify-content: space-between;
   padding: 21rpx;
   border-radius: 20rpx;
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/tenscenic/bg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/tenscenic/bg.png);
   background-size: 100% 100%;
   height: 135rpx;
 }
diff --git a/pages/group/info/index.wxml b/pages/group/info/index.wxml
index 7ca00c5..174a6f5 100644
--- a/pages/group/info/index.wxml
+++ b/pages/group/info/index.wxml
@@ -116,15 +116,15 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 88057ff..938db6c 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -59,21 +59,21 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png"
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
         mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/cardInfo/index.wxml b/pages/info/cardInfo/index.wxml
index a4036b1..8957aa8 100644
--- a/pages/info/cardInfo/index.wxml
+++ b/pages/info/cardInfo/index.wxml
@@ -65,15 +65,15 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/info/culturalUnitInfo/index.wxml b/pages/info/culturalUnitInfo/index.wxml
index 91dd366..076edc7 100644
--- a/pages/info/culturalUnitInfo/index.wxml
+++ b/pages/info/culturalUnitInfo/index.wxml
@@ -6,11 +6,11 @@
     <swiper-item>
       <view class="title">{{info.company_name}}</view>
       <view class="address">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infolocation.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infotel.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.mobile}}</text></view>
       </view>
       <swiper wx:if="{{info.list_img.length>0}}" style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
@@ -19,19 +19,19 @@
         </swiper-item>
       </swiper>
       <!-- <image wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image> -->
-      <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>
+      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </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>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.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>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </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>
+  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
 </view>
 <!-- <view wx:if="{{info}}">
   <title title="{{info.company_name}}"></title>
diff --git a/pages/info/culturalUnitInfo/index.wxss b/pages/info/culturalUnitInfo/index.wxss
index 675868e..4213511 100644
--- a/pages/info/culturalUnitInfo/index.wxss
+++ b/pages/info/culturalUnitInfo/index.wxss
@@ -1,6 +1,6 @@
 /* pages/pbService/museum/info/index.wxss */
 .bg {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
   left: 0;
diff --git a/pages/info/hotelProductInfo/index.wxml b/pages/info/hotelProductInfo/index.wxml
index 5c77760..bfe3e6c 100644
--- a/pages/info/hotelProductInfo/index.wxml
+++ b/pages/info/hotelProductInfo/index.wxml
@@ -204,15 +204,15 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml
index b021181..939e585 100644
--- a/pages/info/museumInfo/index.wxml
+++ b/pages/info/museumInfo/index.wxml
@@ -79,21 +79,21 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png"
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
         mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index d6742cc..a777f95 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -181,7 +181,7 @@
 </view>
 <!-- 购物车悬浮框 -->
 <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
 <view class="mask" wx:if="{{skuFlag}}">
@@ -226,20 +226,20 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 7e97fa7..0748daf 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -774,7 +774,7 @@ page {
 
 .allowance-box {
   height: 113rpx;
-  background: url("https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
   background-size: 100% auto;
   background-repeat: no-repeat;
   padding: 30rpx 30rpx 10rpx;
diff --git a/pages/info/redmapInfo/index.wxml b/pages/info/redmapInfo/index.wxml
index 145f6c0..6693ea8 100644
--- a/pages/info/redmapInfo/index.wxml
+++ b/pages/info/redmapInfo/index.wxml
@@ -6,11 +6,11 @@
     <swiper-item>
       <view class="title">{{info.title}}</view>
       <view class="address" wx:if="{{info.address}}">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infolocation.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address" wx:if="{{info.mobile}}">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infotel.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.mobile}}</text></view>
       </view>
       <swiper wx:if="{{info.list_img.length>0}}" style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
@@ -19,9 +19,9 @@
         </swiper-item>
       </swiper>
       <!-- <image wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image> -->
-      <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>
+      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
       <view class="tips">
         <view>中共苏州市委党史工作办公室</view>
         <view>苏州市文化广电和旅游局</view>
@@ -29,10 +29,10 @@
       </view>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.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>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
       <view class="tips">
         <view>中共苏州市委党史工作办公室</view>
         <view>苏州市文化广电和旅游局</view>
@@ -40,5 +40,5 @@
       </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>
+  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
 </view>
\ No newline at end of file
diff --git a/pages/info/redmapInfo/index.wxss b/pages/info/redmapInfo/index.wxss
index 29cea5d..643ec7c 100644
--- a/pages/info/redmapInfo/index.wxss
+++ b/pages/info/redmapInfo/index.wxss
@@ -1,6 +1,6 @@
 /* pages/pbService/museum/info/index.wxss */
 .bg {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
   left: 0;
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index cb33ef6..bfc2df6 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -105,15 +105,15 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 52cbacb..edec2ec 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -91,7 +91,7 @@
   </view>
   <!-- 购物车悬浮框 -->
   <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
     <view class="cart-num">{{cartCount}}</view>
   </navigator>
   <!-- <view class="mask" wx:if="{{skuFlag}}">
@@ -262,20 +262,20 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index beb7c40..111d23f 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -517,7 +517,7 @@ page {
 
 .allowance-box {
   height: 113rpx;
-  background: url("https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220606/0b2895725088c04fb182e09ec186f895.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20220606/0b2895725088c04fb182e09ec186f895.png");
   background-size: 100% auto;
   background-repeat: no-repeat;
   padding: 30rpx 30rpx 10rpx;
diff --git a/pages/info/sceneProductInfoNew/index.wxml b/pages/info/sceneProductInfoNew/index.wxml
index d364fe1..a5ceaf5 100644
--- a/pages/info/sceneProductInfoNew/index.wxml
+++ b/pages/info/sceneProductInfoNew/index.wxml
@@ -139,7 +139,7 @@
 <!-- 购物车悬浮框 -->
 <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box"
   id="cart">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
 <view class="mask" wx:if="{{skuFlag}}">
@@ -187,21 +187,21 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png"
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
         mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/sceneProductInfoNew/index.wxss b/pages/info/sceneProductInfoNew/index.wxss
index 0a83fdf..eb5045f 100644
--- a/pages/info/sceneProductInfoNew/index.wxss
+++ b/pages/info/sceneProductInfoNew/index.wxss
@@ -696,7 +696,7 @@ page {
 
 .allowance-box {
   height: 113rpx;
-  background: url("https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220606/0b2895725088c04fb182e09ec186f895.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20220606/0b2895725088c04fb182e09ec186f895.png");
   background-size: 100% auto;
   background-repeat: no-repeat;
   padding: 30rpx 30rpx 10rpx;
diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml
index 7cd98ef..e23c9ef 100644
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@@ -134,7 +134,7 @@
 </view>
 <!-- 购物车悬浮框 -->
 <!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator> -->
 
@@ -185,20 +185,20 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss
index 8007d4d..5688147 100644
--- a/pages/info/showInfo/index.wxss
+++ b/pages/info/showInfo/index.wxss
@@ -654,7 +654,7 @@ margin-right: 29rpx;
 
 .allowance-box {
   height: 113rpx;
-  background: url("https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
+  background: url("https://static.ticket.sz-trip.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
   background-size: 100% auto;
   background-repeat: no-repeat;
   padding: 30rpx 30rpx 10rpx;
diff --git a/pages/kj/info/index.wxml b/pages/kj/info/index.wxml
index bdfba66..3f9446d 100644
--- a/pages/kj/info/index.wxml
+++ b/pages/kj/info/index.wxml
@@ -118,15 +118,15 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/list/daysu/detail/index.wxml b/pages/list/daysu/detail/index.wxml
index 0d72969..e837858 100644
--- a/pages/list/daysu/detail/index.wxml
+++ b/pages/list/daysu/detail/index.wxml
@@ -1,2 +1,2 @@
 <title title="天工苏作"></title>
-<image style="display:block;width:100%" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/other/daysudetail.jpg" mode="widthFix"></image>
\ No newline at end of file
+<image style="display:block;width:100%" src="https://static.ticket.sz-trip.com/xcxImages/other/daysudetail.jpg" mode="widthFix"></image>
\ No newline at end of file
diff --git a/pages/list/daysu/index.wxml b/pages/list/daysu/index.wxml
index 17fd6b1..c4323a6 100644
--- a/pages/list/daysu/index.wxml
+++ b/pages/list/daysu/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/list/daysu/index.wxml-->
 <title title="天工苏作"></title>
 <view style="position:relative">
-  <image style="display:block;width:100%" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/other/DaySu.jpg" mode="widthFix"></image>
+  <image style="display:block;width:100%" src="https://static.ticket.sz-trip.com/xcxImages/other/DaySu.jpg" mode="widthFix"></image>
   <navigator url="detail/index" class="intro-box"></navigator>
   <view class="video-box" wx:if="{{showVideo}}">
     <video 
diff --git a/pages/list/mayday/index.wxml b/pages/list/mayday/index.wxml
index c99af69..8ff9f4c 100644
--- a/pages/list/mayday/index.wxml
+++ b/pages/list/mayday/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/list/mayday/index.wxml-->
 <view style="position:relative">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/top.png" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/top.png" mode="widthFix" class="main-img"></image>
   <view class="btns">
     <view bindtap="scrollPage" data-index="1" class="btn" style="width:122rpx"></view>
     <view bindtap="scrollPage" data-index="2" class="btn" style="width:189rpx"></view>
@@ -13,7 +13,7 @@
   </view>
 </view>
 <view class="content">
-  <image style="margin-top:0" id="box1" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/1.png" mode="widthFix" class="main-img"></image>
+  <image style="margin-top:0" id="box1" src="https://static.ticket.sz-trip.com/xcxImages/mayday/1.png" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list1}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
@@ -28,19 +28,19 @@
       </view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/2.png" id="box2" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/2.png" id="box2" mode="widthFix" class="main-img"></image>
   <view class="new-item" wx:for="{{list2}}" bindtap="gotoDetail" data-item="{{item}}">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1"></image>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1" style="right:60rpx;left:auto;width:54rpx"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1" style="right:60rpx;left:auto;width:54rpx"></image>
     <view class="new-item-bg">
       <view class="new-item-bg-in"></view>
     </view>
     <view class="new-item-bg new-item-bg1">
       <view class="new-item-info">
         <view class="topbg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/topbg.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/topbg.png" mode="widthFix"></image>
           <view class="topbg-text">TOP{{index+1}}</view>
         </view>
         <image src="{{item.headimg}}" class="new-headimg" mode="aspectFill"></image>
@@ -53,7 +53,7 @@
       </view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/3.png" id="box3" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/3.png" id="box3" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list3}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
@@ -68,7 +68,7 @@
       </view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/4.png" id="box4" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/4.png" id="box4" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list4}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
@@ -83,7 +83,7 @@
       </view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/5.png" id="box5" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/5.png" id="box5" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list5}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
@@ -98,7 +98,7 @@
       </view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/6.png" id="box6" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/6.png" id="box6" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list6}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
@@ -113,17 +113,17 @@
       </view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/7.png" id="box7" mode="widthFix" class="main-img"></image>
-  <image bindtap="clickBanner" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/banner.png" mode="widthFix" class="main-img" style="width:713rpx;margin-top:0"></image>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/8.png" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/7.png" id="box7" mode="widthFix" class="main-img"></image>
+  <image bindtap="clickBanner" src="https://static.ticket.sz-trip.com/xcxImages/mayday/banner.png" mode="widthFix" class="main-img" style="width:713rpx;margin-top:0"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/8.png" mode="widthFix" class="main-img"></image>
 </view>
 <view style="position:relative">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/bottom.png" mode="widthFix" class="main-img"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/bottom.png" mode="widthFix" class="main-img"></image>
   <view class="bottom-btns">
     <navigator url="/pages/list/{{bottoms[index]}}/index" class="bottom-btn" wx:for="{{6}}"></navigator>
   </view>
 </view>
-<image style="width:300rpx;margin:40rpx auto;" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/text.png" mode="widthFix" class="main-img"></image>
+<image style="width:300rpx;margin:40rpx auto;" src="https://static.ticket.sz-trip.com/xcxImages/mayday/text.png" mode="widthFix" class="main-img"></image>
 <view></view>
 <view class="totop-box" bindtap="gototop">
   <view class="iconfont icon-ziyuan"></view>
diff --git a/pages/list/mayday/index.wxss b/pages/list/mayday/index.wxss
index f96d0fa..3159446 100644
--- a/pages/list/mayday/index.wxss
+++ b/pages/list/mayday/index.wxss
@@ -21,7 +21,7 @@ page {
   font-family: "MicrosoftYaHei";
 }
 .content {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/mayday/bg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/mayday/bg.png);
   background-size: 100%;
   background-repeat: repeat-y;
   padding-top: 72rpx;
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 9c16788..0eac753 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -21,42 +21,42 @@
 <view class="new-title">文旅服务</view>
 <view class="new-icons">
   <navigator url="../activitynew/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon1.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/six/icon1.png" mode="widthFix"></image>
     <view>活动日历</view>
   </navigator>
   <navigator url="../scene/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
-    <image class="green-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon2.png" mode="widthFix"></image>
+    <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon2.png" mode="widthFix"></image>
     <view>景点门票</view>
   </navigator>
   <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
-    <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon3.png" mode="widthFix"></image>
+    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
   </navigator>
   <!-- <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
-    <image class="purple-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon4.png" mode="widthFix"></image>
+    <image class="purple-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon4.png" mode="widthFix"></image>
     <view>电影购票</view>
   </navigator> -->
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
   <view data-event="comfort_click" data-title="景区舒适度" bindtap="gotoUrl" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="new-icon">
-    <image class="green-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon5.png" mode="widthFix"></image>
+    <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon5.png" mode="widthFix"></image>
     <view>景区舒适度</view>
   </view>
   <navigator url="/pages/pbService/bike/index?type=2&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
-    <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon6.png" mode="widthFix"></image>
+    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon6.png" mode="widthFix"></image>
     <view>停车场</view>
   </navigator>
   <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon" wx:if="{{areaIndex != 0 && areaIndex != 1 && areaIndex != 2 && areaIndex != 3}}">
-    <image class="red-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon7.png" mode="widthFix"></image>
+    <image class="red-shadow" src="https://static.ticket.sz-trip.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">
-    <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
+    <image class="yellow-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
   </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>
+    <image class="yellow-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
   </view> -->
 </view>
diff --git a/pages/list/strategy/index.wxml b/pages/list/strategy/index.wxml
index 1ca2425..33e3f1b 100644
--- a/pages/list/strategy/index.wxml
+++ b/pages/list/strategy/index.wxml
@@ -11,13 +11,13 @@
   <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>
+    <image class="iconimg" src="https://static.ticket.sz-trip.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>
+    <image class="iconimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/sc{{type==1?'0':'new1'}}.png" mode="aspectFill"></image>
     <view>官方手册</view>
   </view>
 </view>
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 9935dac..d871342 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -252,7 +252,7 @@
           <view>{{item.like_number}}</view>
         </view>
         <view class="video-play-mask">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/videoplay.png" mode="aspectFill"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/map/videoplay.png" mode="aspectFill"></image>
         </view>
       </view>
       <view wx:elif="{{menus[menuIndex]=='讲解'}}" class="audio-item">
@@ -263,13 +263,13 @@
             <view class="audio-time">{{timeList['audio'+item.id] && timeList['audio'+item.id].time?timeList['audio'+item.id].time:"00:00"}} / {{timeList['audio'+item.id]?timeList['audio'+item.id].all_time:"00:00"}}</view>
             <view class="audio-new-bg">
               <view style="left:{{timeList['audio'+item.id]?timeList['audio'+item.id].width:0}}%" class="audio-line"></view>
-              <image style="left:{{timeList['audio'+item.id]?timeList['audio'+item.id].width:0}}%" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/audiobtn.png" mode="aspectFill"></image>
+              <image style="left:{{timeList['audio'+item.id]?timeList['audio'+item.id].width:0}}%" src="https://static.ticket.sz-trip.com/xcxImages/map/audiobtn.png" mode="aspectFill"></image>
             </view>
             <!-- <audio src="{{item.multimedia_url}}" id="audio{{item.id}}" loop></audio> -->
           </view>
         </view>
-        <image bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:if="{{!item.play}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/audioplay.png" mode="aspectFill" class="playimg"></image>
-        <image bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:else src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/audiostop.png" mode="aspectFill" class="playimg"></image>
+        <image bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:if="{{!item.play}}" src="https://static.ticket.sz-trip.com/xcxImages/map/audioplay.png" mode="aspectFill" class="playimg"></image>
+        <image bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:else src="https://static.ticket.sz-trip.com/xcxImages/map/audiostop.png" mode="aspectFill" class="playimg"></image>
       </view>
       <view wx:elif="{{menus[menuIndex]!='攻略'}}" class="item">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
@@ -308,7 +308,7 @@
   </view>
 </view>
 <view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask" catchtouchmove="preventTouchMove">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
 </view>
 
 </view>
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 0dedbe3..9641fb3 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -41,7 +41,7 @@
     <view bindtap="changeAllowance">惠民补贴</view>
     <view class="com-flex-tao" bindtap="selectAllowance">
       -￥{{allowance_price / 100}}
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+      <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
         alt="" wx:if="{{select_allowance}}"></image>
       <view class="border" wx:else></view>
     </view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 06c34fe..bf3bd5d 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -63,7 +63,7 @@
       <view bindtap="changeAllowance">惠民补贴</view>
       <view class="com-flex-tao" bindtap="selectAllowance">
         -￥{{allowance_price / 100}}
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+        <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
           alt="" wx:if="{{select_allowance}}"></image>
         <view class="border" wx:else></view>
       </view>
diff --git a/pages/order/sceneCart/index.wxml b/pages/order/sceneCart/index.wxml
index 393ea3d..ba74161 100644
--- a/pages/order/sceneCart/index.wxml
+++ b/pages/order/sceneCart/index.wxml
@@ -28,7 +28,7 @@
       <view bindtap="changeAllowance">惠民补贴</view>
       <view class="com-flex-tao" bindtap="selectAllowance">
         -￥{{allowance_price / 100}}
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+        <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
           alt="" wx:if="{{select_allowance}}"></image>
         <view class="border" wx:else></view>
       </view>
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index dd5b7cc..119a2f1 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -77,7 +77,7 @@
 
 <!-- 购物车悬浮框 -->
 <!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator> -->
 
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index 74bb0a7..5e3fbf3 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -11,7 +11,7 @@
 </view>
 <view class="list">
   <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 mode="aspectFill" class="bgimg" src="https://static.ticket.sz-trip.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>
diff --git a/pages/pbService/feiyi/info/index.wxml b/pages/pbService/feiyi/info/index.wxml
index 49681ad..92c7901 100644
--- a/pages/pbService/feiyi/info/index.wxml
+++ b/pages/pbService/feiyi/info/index.wxml
@@ -5,14 +5,14 @@
   <image class="main-img" wx:if="{{info}}" src="{{info.default_pic_url}}" mode="widthFix"></image>
   <view class="top-info" wx:if="{{info}}">
     <view class="title">{{info.title}}</view>
-    <!-- <view class="subtitle"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view> -->
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/feiyilogo.png" mode="widthFix" class="logo"></image>
-    <view class="subtitle"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.protect_office || "暂无"}}</view>
+    <!-- <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view> -->
+    <image src="https://static.ticket.sz-trip.com/xcxImages/info/feiyilogo.png" mode="widthFix" class="logo"></image>
+    <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.protect_office || "暂无"}}</view>
   </view>
   <view class="content" wx:if="{{info}}">
     <view class="tip">非遗介绍:</view>
     <rich-text  class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
 </view>
\ No newline at end of file
diff --git a/pages/pbService/gym/info/index.wxml b/pages/pbService/gym/info/index.wxml
index 5edf245..ba6b0af 100644
--- a/pages/pbService/gym/info/index.wxml
+++ b/pages/pbService/gym/info/index.wxml
@@ -22,11 +22,11 @@
     <swiper-item>
       <view class="title">{{info.name}}</view>
       <view class="address">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infolocation.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infotel.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.telephone}}</text></view>
       </view>
       <swiper style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
@@ -34,24 +34,24 @@
           <image style="width:690rpx;height:560rpx;display:block;" src="{{item.pic_address}}" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
-      <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>
+      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
       <view class="title title2">{{info.name}}</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.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>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item>
       <view class="title title2" style="height:125rpx">开放时间</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(info.open_time)}}"></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>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
   </swiper>
-  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
+  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
 </view> -->
\ No newline at end of file
diff --git a/pages/pbService/gym/info/index.wxss b/pages/pbService/gym/info/index.wxss
index 37ae6c2..aaccc04 100644
--- a/pages/pbService/gym/info/index.wxss
+++ b/pages/pbService/gym/info/index.wxss
@@ -24,7 +24,7 @@
   flex-shrink: 0;
 }
 /* .bg {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
   left: 0;
diff --git a/pages/pbService/museum/info/index.wxml b/pages/pbService/museum/info/index.wxml
index c9836f2..5bf7c7e 100644
--- a/pages/pbService/museum/info/index.wxml
+++ b/pages/pbService/museum/info/index.wxml
@@ -30,11 +30,11 @@
     <swiper-item>
       <view class="title">{{info.name}}</view>
       <view class="address">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infolocation.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address">
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infotel.png"></image>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.phone}}</text></view>
       </view>
       <swiper wx:if="{{info.listimg.length>0}}" style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
@@ -43,28 +43,28 @@
         </swiper-item>
       </swiper>
       <image wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image>
-      <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>
+      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
       <view class="title title2">{{info.name}}</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.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>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item>
       <view class="title title2" style="height:125rpx">接待时间</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(info.open_time)}}"></rich-text>
       <view class="title title2" style="height:125rpx">交通线路</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
+      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(info.route)}}"></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>
+      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
   </swiper>
-  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
+  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
 </view> -->
\ No newline at end of file
diff --git a/pages/pbService/museum/info/index.wxss b/pages/pbService/museum/info/index.wxss
index 1d07d20..d05c301 100644
--- a/pages/pbService/museum/info/index.wxss
+++ b/pages/pbService/museum/info/index.wxss
@@ -47,7 +47,7 @@ page {
 }
   
 /* .bg {
-  background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
+  background: url(https://static.ticket.sz-trip.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
   left: 0;
diff --git a/pages/pbService/wwcx/info/index.wxml b/pages/pbService/wwcx/info/index.wxml
index 5cb2e54..febcdf3 100644
--- a/pages/pbService/wwcx/info/index.wxml
+++ b/pages/pbService/wwcx/info/index.wxml
@@ -5,14 +5,14 @@
   <image class="main-img" wx:if="{{info}}" src="{{info.logo}}" mode="widthFix"></image>
   <view class="top-info" wx:if="{{info}}">
     <view class="title">{{info.name}}</view>
-    <view class="subtitle"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/wenwulogo.png" mode="widthFix" class="logo"></image>
-    <view class="subtitle"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.collection_name || "暂无"}}</view>
+    <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/info/wenwulogo.png" mode="widthFix" class="logo"></image>
+    <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.collection_name || "暂无"}}</view>
   </view>
   <view class="content" wx:if="{{info}}">
     <view class="tip">文物介绍:</view>
     <view class="detail">{{info.introduction}}</view>
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
 </view>
\ No newline at end of file
diff --git a/pages/supplier/good/index.wxml b/pages/supplier/good/index.wxml
index 7e7c8ba..05f45dc 100644
--- a/pages/supplier/good/index.wxml
+++ b/pages/supplier/good/index.wxml
@@ -24,7 +24,7 @@
     </view>
     <view style="flex:1"></view>
     <view class="com-flex" bindtap="delSku" data-index="{{index}}" wx:if="{{item.audit && item.audit.value==2 || !item.audit}}">
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/delicon.png" mode="widthFix"></image>
+      <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/delicon.png" mode="widthFix"></image>
       <view>删除</view>
     </view>
   </view>
@@ -52,7 +52,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>线路详情</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="1" data-text="线路详情">
-          <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/sl.png"></image>
+          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height disabled="{{item.audit && item.audit.value<2}}" value="{{item.line_desc.value}}" bindblur="blur" data-name="line_desc" data-index="{{index}}" bindinput="changeInfo" maxlength="-1" placeholder="请输入线路详情描述"></textarea>
@@ -63,7 +63,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>使用说明</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="2" data-text="使用说明">
-          <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/sl.png"></image>
+          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height disabled="{{item.audit && item.audit.value<2}}" value="{{item.use_desc.value}}" data-name="use_desc" bindblur="blur" data-index="{{index}}" bindinput="changeInfo" maxlength="-1" placeholder="请输入使用说明描述"></textarea>
@@ -74,7 +74,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>费用说明</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="3" data-text="费用说明">
-          <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/sl.png"></image>
+          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height disabled="{{item.audit && item.audit.value<2}}" value="{{item.cost_desc.value}}" data-name="cost_desc" bindblur="blur" data-index="{{index}}" bindinput="changeInfo" maxlength="-1" placeholder="请输入费用说明"></textarea>
@@ -106,7 +106,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>预定须知</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="4" data-text="预定须知">
-          <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/sl.png"></image>
+          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height value="{{item.reserve_desc.value}}" disabled="{{item.audit && item.audit.value<2}}" data-name="reserve_desc" data-index="{{index}}" bindblur="blur" bindinput="changeInfo" maxlength="-1" placeholder="请输入预定须知"></textarea>
@@ -138,7 +138,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>退款规则</text>
         <view class="com-flex sl-box" style="opacity:0">
-          <image mode="widthFix" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/sl.png"></image>
+          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height value="{{item.refund_desc.value}}" disabled="{{item.audit && item.audit.value<2}}" data-name="refund_desc" bindinput="changeInfo" bindblur="blur" data-index="{{index}}" maxlength="-1" placeholder="请输入退款规则"></textarea>
@@ -148,11 +148,11 @@
   </view>
   <view class="com-flex sku-bottom" bindtap="arrow" data-index="{{index}}">
     <text>{{item.show?'收起':'展开'}}</text>
-    <image class="{{item.show?'':'rotate'}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/arrowicon.png" mode="widthFix"></image>
+    <image class="{{item.show?'':'rotate'}}" src="https://static.ticket.sz-trip.com/xcxImages/supplier/arrowicon.png" mode="widthFix"></image>
   </view>
 </view>
 <view class="com-flex add-sku-btn" bindtap="addSku">
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/iconadd.png" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/iconadd.png" mode="widthFix"></image>
   <text>点击添加规格</text>
 </view>
 <view class="error-tip" style="text-align:center" wx:if="{{skuerror}}">请添加规格</view>
diff --git a/pages/supplier/index.wxml b/pages/supplier/index.wxml
index 3e1b809..0397708 100644
--- a/pages/supplier/index.wxml
+++ b/pages/supplier/index.wxml
@@ -1,13 +1,13 @@
 <!--pages/supplier/index.wxml-->
 <view class="content">
-  <image class="topimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/indexbg1.png" mode="widthFix"></image>
+  <image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/supplier/indexbg1.png" mode="widthFix"></image>
   <view class="btn" bindtap="supplierpage" wx:if="{{passFlag===null}}">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/user.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/user.png" mode="widthFix"></image>
     <view>点击填写商户信息</view>
   </view>
   <view class="btn line-btn btnbg{{passFlag.audit}}" bindtap="supplierpage" wx:else="{{passFlag}}">
     <view class="com-flex">
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/icon{{passFlag.audit}}.png" mode="widthFix"></image>
+      <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/icon{{passFlag.audit}}.png" mode="widthFix"></image>
       <view>{{supplier_text[passFlag.audit]}}</view>
     </view>
     <view class="right-btn">
@@ -16,16 +16,16 @@
     </view>
   </view>
   <view class="btn disable" wx:if="{{passFlag===null || passFlag && passFlag.audit==0 || passFlag && passFlag.audit==2}}">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
     <view>点击填写商品信息</view>
   </view>
   <view class="btn" wx:elif="{{passFlag && passFlag.audit==1 && sku.length==0}}" bindtap="gotoGood">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
     <view>点击填写商品信息</view>
   </view>
   <view class="btn line-btn btnbg{{audit}}" bindtap="supplierpage"  wx:else bindtap="gotoGood">
     <view class="com-flex">
-      <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/icon{{audit}}.png" mode="widthFix"></image>
+      <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/icon{{audit}}.png" mode="widthFix"></image>
       <view>{{goods_text[audit]}}</view>
     </view>
     <view class="right-btn" wx:if="{{audit==2}}">
@@ -37,5 +37,5 @@
       <view>查看</view>
     </view>
   </view>
-  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/supplier/indexbg2.png" class="bottomimg" mode="widthFix"></image>
+  <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/indexbg2.png" class="bottomimg" mode="widthFix"></image>
 </view>
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
index 25b2774..8ee35cc 100644
--- a/subPackages/goods/oneCardTour/info/index.wxml
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -103,7 +103,7 @@
   </view>
   <!-- 购物车悬浮框 -->
   <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
+    <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
     <view class="cart-num">{{cartCount}}</view>
   </navigator>
  <!-- 日期弹框 -->
@@ -175,20 +175,20 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 9a5a78d..977d332 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -28,7 +28,7 @@
       <view bindtap="changeAllowance">惠民补贴</view>
       <view class="com-flex-tao" bindtap="selectAllowance">
         -￥{{allowance_price / 100}}
-        <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+        <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
           alt="" wx:if="{{select_allowance}}"></image>
         <view class="border" wx:else></view>
       </view>

From 598cc9a3aabb08c21b866aa07f29bd84ac02edbd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 19 Jun 2025 11:37:16 +0800
Subject: [PATCH 342/471] 1

---
 app.js                      |  2 +-
 pages/index/index.wxml      | 18 +++++++++---------
 pages/index/index.wxss      |  8 ++++++--
 pages/list/six/index.wxml   |  4 ++--
 pages/map/index.wxml        |  1 +
 project.private.config.json |  7 +++++++
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index 8f07bc1..2d5ffd9 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest115? true : false;
+            data.isTest = data.isTest118? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index dbf5f65..20bf1cd 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -4,7 +4,7 @@
 <view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -62,7 +62,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -94,9 +94,9 @@
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
                                 <image src="{{item.headimg}}"></image>
-                                <view class="season-content" style="padding:6rpx 12rpx 0;height: 120rpx;">
+                                <view class="season-content" style="padding:6rpx 12rpx;min-height: 130rpx;">
                                     <view class="textOver2">{{item.title}}</view>
-                                    <view class="price" style="padding-top: 8rpx;">
+                                    <view class="price">
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
                                 </view>
@@ -123,7 +123,7 @@
                     </view>
                     <!-- 右边的banner -->
                     <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -141,7 +141,7 @@
             </view>
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
@@ -310,7 +310,7 @@
 <view class="bg" wx:else style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item data-item="{{item}}">
@@ -336,7 +336,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item data-item="{{item}}">
@@ -350,7 +350,7 @@
 
 
         <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item  data-item="{{item}}" style="position: relative;">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 81c5d68..20c4489 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -63,7 +63,7 @@
     right: 0;
     display: flex;
     justify-content: space-between;
-    padding: 187rpx 20rpx 30rpx;
+    padding: 0rpx 20rpx 30rpx;
     box-sizing: border-box;
     background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2))
 }
@@ -186,7 +186,6 @@
   }
   .season-hot .season-item{
       width: 266rpx;
-      height: 332rpx;
       margin-right: 14rpx;
       flex-shrink: 0;
       font-weight: bold;
@@ -196,6 +195,11 @@
       background: white;
       border-radius: 20rpx;
   }
+  .season-hot .season-content{
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+  }
  
   .season-hot .season-item image{
       width: 100%;
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 0eac753..a33d90b 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -39,10 +39,10 @@
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
-  <view data-event="comfort_click" data-title="景区舒适度" bindtap="gotoUrl" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="new-icon">
+  <navigator  data-title="景区舒适度" url="/pages/pbService/sceneComfort/index" class="new-icon">
     <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon5.png" mode="widthFix"></image>
     <view>景区舒适度</view>
-  </view>
+  </navigator>
   <navigator url="/pages/pbService/bike/index?type=2&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
     <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon6.png" mode="widthFix"></image>
     <view>停车场</view>
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index d871342..ccfb077 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -322,6 +322,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
             <view>电子社保卡</view>
         </view>
+        <!-- 这个不用改 假数据 -->
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
             <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
             <view>景区舒适度</view>
diff --git a/project.private.config.json b/project.private.config.json
index 89dc0d2..765bd8e 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/login/index",
+          "pathName": "pages/login/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/index/index",
           "pathName": "subPackages/indexGQ/index",

From 70695b87b7963a273165d508c3eebdfc973e7feb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 26 Jun 2025 10:39:33 +0800
Subject: [PATCH 343/471] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8Ffix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js     |  5 ++++-
 pages/order/components/date/index.js     | 16 ++++++++++++----
 pages/order/components/date/index.wxml   | 22 ++++++++++++----------
 pages/order/components/date/index.wxss   |  9 +++++++--
 subPackages/transferPage/transferPage.js | 20 ++++++++++++++++++--
 5 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 67be917..53b5501 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -793,7 +793,10 @@ Page({
     product.productNum = 1
     app.globalData.product = {
       ...sku,
-      ...product
+      ...product,
+
+    //     changeFlag: true,
+    //   date: {date: "2025-06-24"},
     }
     console.log(app.globalData.product);
     console.log(ticket_type);
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 0a26eb7..4e8ad5e 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -46,7 +46,8 @@ Component({
     tomorrow:util.formatMing(new Date()),
     afterTom:util.formatHou(new Date()),
     skuName:'',
-    monthList:[]
+    monthList:[],
+    scrollLeft: 0
   },
   lifetimes: {
     attached: function () {
@@ -122,14 +123,21 @@ Component({
               item.week = this.getDay(item.date)
             })
             let seldDate = ''
+            let leftIndex = 0;
             if (app.globalData.product.changeFlag) {
                 if( app.globalData.product.date) {
-                    res.data.forEach(item=> {
+                    
+                    res.data.forEach((item,index)=> {
                         if (item.date == app.globalData.product.date.date) {
-                        seldDate = item
+                            seldDate = item
+                            leftIndex = index
                         }
                     })
                 }
+
+                this.setData({
+                    scrollLeft: 70*leftIndex
+                })
                 setTimeout(() => {
                     this.changeDate(seldDate)
                 })
@@ -239,7 +247,7 @@ Component({
         for (let i = 0; i < res.data.length; i++) {
           
           if (res.data[i].stock_number > 0) {
-            if (app.globalData.product.changeFlag) { 
+            if (app.globalData.product.changeFlag && app.globalData.product.time) { 
                  if (res.data[i].start_time == app.globalData.product.time.start_time) {
                   timeIndex = i;
                   break;
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index f94ab02..db88887 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -28,17 +28,19 @@
       使用日期
     </view>
     <view class="dates-boxes">
-      <view style="width: 580rpx;display: flex;overflow-x: scroll;">
+      <scroll-view scroll-x enable-flex scroll-left="{{scrollLeft}}"
+        style="height: 133rpx;width: 580rpx;display: flex;overflow-x: scroll;flex-direction: row;">
         <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
-        <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
-        <view>{{item.week}}</view>
-        <view class="short-date">{{item.short_date}}</view>
-        <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
-        <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
-        <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
-        <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
-      </view>
-      </view>
+            <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
+            <view>{{item.week}}</view>
+            <view class="short-date">{{item.short_date}}</view>
+            <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
+            <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
+            <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
+            <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
+        </view>
+        <view style="width: 2rpx;height: 1rpx;flex-shrink: 0;"></view>
+      </scroll-view>
       <view  class="more-item" bindtap="showMoreDate">
       <!-- <view wx:if="{{moreFlag || !activeDate}}" class="date-item more-item" bindtap="showMoreDate"> -->
         <view style="width:58rpx;margin-right:12rpx;">
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index 9d7444b..b954718 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -18,6 +18,7 @@
   align-items: center;
   padding: 0 0 31rpx;
   border:none;
+  position: relative;
   /* padding: 31rpx 0; */
   /* padding: 31rpx 21rpx; */
   /* border-top: 1rpx solid #ccc; */
@@ -66,15 +67,19 @@
 .more-item {
   /* width: 125rpx; */
   /* margin-right: 0; */
-  position: absolute;
+    position: absolute;
     right: 0;
+    top: 0;
     text-align: center;
-    padding: 0 26rpx 0 24rpx;
+    padding: 0 0rpx 0 16rpx;
     display: flex;
     font-weight: 400;
     font-size: 27rpx;
     color: #0B898E;
     align-items: center;
+    height: 133rpx;
+    background: white;
+    border-radius: 10rpx;
 }
 .date-times {
   display: flex;
diff --git a/subPackages/transferPage/transferPage.js b/subPackages/transferPage/transferPage.js
index 2cbb6e6..2f71980 100644
--- a/subPackages/transferPage/transferPage.js
+++ b/subPackages/transferPage/transferPage.js
@@ -39,8 +39,24 @@ Page({
             })
         },
         fail: (e)=>{
-            console.log(e)
-            wx.navigateBack()
+            try {
+                let errMsg = e.errMsg
+                if (errMsg.indexOf("TAP")>=0) {
+                    wx.showModal({
+                        title: "确认跳转",
+                        showCancel: false,
+                        success: ()=>{
+                            this.goOtherMiniProgrogram(data)
+                        }
+                    })
+                } else {
+                    wx.navigateBack()
+                }
+
+            } catch (e) {
+                wx.navigateBack()
+            }
+            console.log("aaa",e)
         }
     })
   },

From 5edddeb02826d03e83dd415ce8613f400f5414b2 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 30 Jun 2025 10:36:16 +0800
Subject: [PATCH 344/471] 1

---
 app.js                                 |  2 +-
 pages/index/index.wxml                 |  5 +++--
 pages/index/index.wxss                 |  4 ++++
 pages/info/sceneProductInfo/index.js   | 12 ++++++++++--
 pages/info/sceneProductInfo/index.wxml |  8 ++++----
 pages/user/suggest/suggest.js          |  2 +-
 project.private.config.json            |  7 +++++++
 7 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 2d5ffd9..3a8efc4 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest118? true : false;
+            data.isTest = data.isTest122? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 20bf1cd..8e70eab 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -5,7 +5,8 @@
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
         <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
-            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular
+            indicator-dots 	indicator-active-color="#fff">
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item bindtap="bannerClick" data-item="{{item}}">
                 <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -254,7 +255,7 @@
                             <view  class="hot-price">
                                 <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                             </view>
-                            <view style="font-weight: 500;font-size: 23rpx;color: #999999;">已售{{item.sales_number}}</view>
+                            <view style="font-weight: 500;font-size: 23rpx;color: #999999;">已售{{item.sales_number + (item.virtual_sales_number ||0)}}</view>
                         </view>
                         
                     </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 20c4489..4e3ef2f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -72,6 +72,10 @@
     height: 173.33rpx;
 }
 
+.swiper .wx-swiper-dots.wx-swiper-dots-horizontal {
+    margin-bottom: -10rpx;
+  }
+
 .main-content{
     /* background-color:#E8F9FA; */
     margin-top: -10rpx;
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 53b5501..ad3822d 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -10,6 +10,9 @@ Page({
    * 页面的初始数据
    */
   data: {
+    id: null,
+    isBook: false,
+
     info: null,
     bookingInfo: null,
     bookingInfoTitle: "",
@@ -65,8 +68,10 @@ Page({
     }
     if (options.ZTPoint) {this.setData({ZTPoint: options.ZTPoint})}
 
+    // 是否书展产品 标题产品详情 开园为活动 去掉政策
     this.setData({
-      id: options.id
+      id: options.id,
+      isBook: [962712,"962712"].includes(options.id),
     })
     commonApi._post("scene/detail", {
       id: options.id
@@ -215,7 +220,7 @@ Page({
         item.rate = Number(item.rate)
       })
       this.setData({
-        comment: res.data.list.splice(0, 2),
+        comment: res.data.list.splice(0, 5),
         commentTotal: res.data.total
       })
       let arr = this.data.comment
@@ -232,6 +237,9 @@ Page({
         comment: arr
       })
     })
+
+    
+
   },
   // 获取日期
   changeDate: function (e) {
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index edec2ec..3712229 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/info/sceneProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<title title="景点详情"></title>
+<title title="{{isBook?'产品详情':'景点详情'}}"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
 <image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
@@ -17,8 +17,8 @@
     </view>
   </view>
   <view class="tags-box address-box" style="height:auto">
-    <view class="info-address">开园时间：{{info.open_time}}</view>
-    <navigator url="/pages/info/sceneInfo/index?id={{info.id}}" catchtap="pagePoint" data-event="scene_detail" class="iconfont" style="font-size:27rpx;flex-shrink:0">优待政策 | 景点介绍 <text class="iconfont icon-you" style="font-size:24rpx"></text></navigator>
+    <view class="info-address">{{isBook?"活动":"开园"}}时间：{{info.open_time}}</view>
+    <navigator wx:if="{{!isBook}}" url="/pages/info/sceneInfo/index?id={{info.id}}" catchtap="pagePoint" data-event="scene_detail" class="iconfont" style="font-size:27rpx;flex-shrink:0">优待政策 | 景点介绍 <text class="iconfont icon-you" style="font-size:24rpx"></text></navigator>
   </view>
   <view class="tags-box textOver address-box" bindtap="gotolocation">
     <view class="info-address">地址：{{info.address}}</view>
@@ -248,7 +248,7 @@
   <navigator url="/pages/list/comments/index?sceneid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">
     查看全部点评<text class="iconfont icon-you"></text></navigator>
 </view>
-<view style="height:{{safeBottom}}px"></view>
+<view style="height:140rpx"></view>
 <notice bookingInfo="{{bookingInfo}}" skuName="{{bookingInfoTitle}}" wx:if="{{bookingInfo}}" bind:close="closeMask">
 </notice>
 <view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
diff --git a/pages/user/suggest/suggest.js b/pages/user/suggest/suggest.js
index d445941..27cdf34 100644
--- a/pages/user/suggest/suggest.js
+++ b/pages/user/suggest/suggest.js
@@ -13,7 +13,7 @@ Page({
     formData:{
         username: "",
         mobile: null,
-        content:""
+        content:"",
     },
 
     safeBottom:app.globalData.safeBottom,
diff --git a/project.private.config.json b/project.private.config.json
index 765bd8e..12064dd 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2Fwangzhe",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/login/index",
           "pathName": "pages/login/index",

From 8c952c85c2f4bad260ae1acafc3372b0574c9b49 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 2 Jul 2025 09:31:18 +0800
Subject: [PATCH 345/471] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=AF=84=E8=AE=BA5?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=9B=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/hotelProductInfo/index.js      |  2 +-
 pages/info/postProductInfo/index.js       |  2 +-
 pages/info/roadInfo/index.js              |  2 +-
 pages/info/sceneProductInfoNew/index.js   |  2 +-
 pages/order/comment/index.js              |  2 +-
 pages/user/order/postOrderInfo/index.js   | 56 +++++++++++++++++++++++
 pages/user/order/postOrderInfo/index.wxml |  2 +-
 7 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/pages/info/hotelProductInfo/index.js b/pages/info/hotelProductInfo/index.js
index d5942c6..bab1448 100644
--- a/pages/info/hotelProductInfo/index.js
+++ b/pages/info/hotelProductInfo/index.js
@@ -245,7 +245,7 @@ Page({
         item.rate = Number(item.rate)
       })
       this.setData({
-        comment:  res.data.list.splice(0, 2),
+        comment:  res.data.list.splice(0, 5),
         commentTotal: res.data.total
       })
       let arr = this.data.comment
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 260946b..9ce4482 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -128,7 +128,7 @@ Page({
 
             })
             this.setData({
-                comment: res.data.list.splice(0, 2),
+                comment: res.data.list.splice(0, 5),
                 commentTotal: res.data.total
             })
             let arr = this.data.comment
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index bda6477..212fa51 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -69,7 +69,7 @@ Page({
         commonApi._post("product/product_comment_list", {
             product_id: options.id,
             offset: 0,
-            limit: 3
+            limit: 5
         }).then(res => {
             res.data.list.map(item => {
                 item.rate = Number(item.rate)
diff --git a/pages/info/sceneProductInfoNew/index.js b/pages/info/sceneProductInfoNew/index.js
index 8b41122..91e1e51 100644
--- a/pages/info/sceneProductInfoNew/index.js
+++ b/pages/info/sceneProductInfoNew/index.js
@@ -184,7 +184,7 @@ Page({
         item.rate = Number(item.rate)
       })
       this.setData({
-        comment: res.data.list.splice(0, 3),
+        comment: res.data.list.splice(0, 5),
         commentTotal: res.data.total
       })
       console.log(res)
diff --git a/pages/order/comment/index.js b/pages/order/comment/index.js
index 2508d57..be31d8d 100644
--- a/pages/order/comment/index.js
+++ b/pages/order/comment/index.js
@@ -166,7 +166,7 @@ Page({
 
         for (let i = 0; i < tempFilePaths.length; i++) {
           wx.uploadFile({
-            url: 'https://test.api.cloud.sz-trip.com/api/pbservice.other/upload', //这里是上传的服务器地址
+            url: 'https://api.cloud.sz-trip.com/api/pbservice.other/upload', //这里是上传的服务器地址
             filePath: tempFilePaths[i],
             name: 'file',
             header: {
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 5ad6b07..7a5ac84 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -211,6 +211,62 @@ Page({
       this.daojishi(time);
     },1000)
   },
+  // 确认收货
+  toConfirmPost() {
+      let _this =this;
+    wx.showModal({
+      title:'提示',
+      content:"确定收货吗",
+      success:function(res){
+        if(res.confirm){
+          commonApi.user_post("order/confirm_post",{
+            order_id:_this.data.info.order_id
+          }).then(res=>{
+            wx.showToast({
+                title: '操作成功',
+                icon:'success'
+            })
+            _this.getInfo()
+          })
+        }
+      }
+    })
+},
+
+getInfo () {
+    commonApi.user_post("order/query",{
+        order_id:this.data.id
+      }).then(res=>{
+        if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
+          let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
+          this.daojishi(time);
+        }
+        let proId = []
+        res.data.order_product_list.forEach(item => {
+          proId.push(item.product_id)
+        })
+        let state = "";
+        res.data.stateNums = {}
+        res.data.order_product_list.map(order=>{
+          if(res.data.stateNums[order.state]){
+            res.data.stateNums[order.state]++;
+          }
+          else {
+            res.data.stateNums[order.state] = 1;
+          }
+          order.consignee_info = order.consignee_info?JSON.parse(order.consignee_info):null;
+          state = state + order.state;
+          order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
+        })
+        this.setData({
+          isRefund:state.indexOf("REFUND")!=-1,
+          info:res.data,
+          product_model:res.data.order_product_list[0].product_model,
+          ids: proId.join(",")
+        })
+        this.getCodeImg()
+      })
+},
 
   gotoDetail: function (e) {
     let item = e.currentTarget.dataset.item;
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 607af56..4d3f676 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -49,7 +49,7 @@
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
-    <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}">确认收货</view>
+    <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}" bind:tap="toConfirmPost">确认收货</view>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
     <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>

From d76959ea723dd401c3c1a78cee9036a86cd700c1 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 2 Jul 2025 21:01:30 +0800
Subject: [PATCH 346/471] 1

---
 pages/info/sceneProductInfo/index.js     | 19 ++++++++++---
 pages/order/components/wxqrCode/index.js |  2 +-
 pages/order/scene/index.js               | 18 ++++++++++--
 subPackages/gwcOrder/index.js            | 27 +++++++++++++++---
 subPackages/gwcOrder/index.wxss          | 35 +++++++++++++++++++++++-
 utils/https.js                           |  4 +--
 6 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index ad3822d..8519d1a 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -49,6 +49,8 @@ Page({
     activeIndex: 0, // sku 侧边栏
     scrollHeight: 0,
     ZTPoint:'',
+
+    sku_id: null,
     
   },
 
@@ -243,12 +245,22 @@ Page({
   },
   // 获取日期
   changeDate: function (e) {
-    console.log(e);
+      // 2025-7-2 合并票日期变更 需要获取sku并重新赋值 
+    console.log("日期变更",e);
+    let sku_id = e.detail.sku_id;
     this.setData({
       date: e.detail,
-      showPrice:e.detail.price
+      showPrice:e.detail.price,
+      sku_id: sku_id,
     })
     console.log(this.data.date);
+
+    //  获取sku信息
+    commonApi._post("product/get_sku_detail_id", {
+        sku_id: sku_id
+      }).then(res => {
+        app.globalData.product.sku = res.data
+      })
   },
   // 获取分时
   changeTime: function (e) {
@@ -366,7 +378,7 @@ Page({
     console.log(this.data.skuList)
 
     commonApi.user_post("/product/checkStock", {
-      sku_id: this.data.skuList[this.data.skuIndex].id,
+      sku_id: this.data.sku_id || this.data.skuList[this.data.skuIndex].id,
     }).then(res => {
       if (res && res.code != 1) {
         wx.showModal({
@@ -993,7 +1005,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log(11111);
     commonApi.user_post('cart/get_list', {}).then(res => {
       this.setData({
         cartCount: res.data.length //1
diff --git a/pages/order/components/wxqrCode/index.js b/pages/order/components/wxqrCode/index.js
index 7cfee1b..26a3bc0 100644
--- a/pages/order/components/wxqrCode/index.js
+++ b/pages/order/components/wxqrCode/index.js
@@ -24,7 +24,7 @@ Component({
   },
   pageLifetimes: {
     show: function() {
-			console.log(123123);
+			console.log("wxqCode component show");
     }
   },
 
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 04c5c89..bee3cc0 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -60,7 +60,7 @@ Page({
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
       date:null,
-			ticket_type:app.globalData.product.sku.ticket_type || 1,
+	  ticket_type:app.globalData.product.sku.ticket_type || 1,
       isCar:options.isCar,
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
       is_authentication:app.globalData.product.sku.sku_model.is_authentication,
@@ -342,6 +342,7 @@ Page({
   },
   changeDate: function (e) {
     console.log('打印',e);
+    let sku_id = e.detail.sku_id;
     this.setData({
       showDate:true
     })
@@ -365,10 +366,23 @@ Page({
     app.globalData.product.changeFlag = true
     this.setData({
       date: e.detail,
-      singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
       showDate2:true
     })
     // this.changePrice()
+
+    //  获取sku信息
+    commonApi._post("product/get_sku_detail_id", {
+        sku_id: sku_id
+    }).then(res => {
+        this.data.product.sku = res.data
+        app.globalData.product.sku = res.data
+        this.setData({
+            singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
+            product: this.data.product
+        })
+
+    })
+
   },
   changeTime: function (e) {
     this.setData({
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 0e67cba..485496a 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -270,7 +270,8 @@ Page({
       allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
      }
     } else {
-      allPrice = this.data.singlePrice * this.data.productNum
+    //   allPrice = this.data.singlePrice * this.data.productNum
+    allPrice = price * this.data.productNum
     }
       
     // allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
@@ -289,9 +290,10 @@ Page({
   },
   changeDate: function (e) {
     console.log('打印',e);
+    let sku_id = e.detail.sku_id;
     // debugger
     // this.showAllPrice()
-    this.totalPrice(e.detail.price)
+    
     if (e.detail.price != this.data.singlePrice && this.data.coupon) {
       wx.showToast({
         title: '订单价格发生变化，请重新选择优惠券',
@@ -299,7 +301,7 @@ Page({
       })
       this.setData({
         coupon: null,
-        singlePrice:e.detail.price
+        // singlePrice:e.detail.price
       })
       if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
         this.couponCom.setNullCoupon()
@@ -308,8 +310,25 @@ Page({
     }
     this.setData({
       date: e.detail,
-      singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price
     })
+
+    //  获取sku信息
+    commonApi._post("product/get_sku_detail_id", {
+        sku_id: sku_id
+    }).then(res => {
+        this.data.product.sku = res.data
+        app.globalData.product.sku = res.data
+        this.setData({
+            singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
+            product: this.data.product
+        })
+        console.log('获取skuId',app.globalData.list,app.globalData.index)
+        // this.totalPrice(e.detail.price)
+        this.totalPrice(this.data.singlePrice)
+    })
+
+
+
     // this.changePrice()
   },
   changeTime: function (e) {
diff --git a/subPackages/gwcOrder/index.wxss b/subPackages/gwcOrder/index.wxss
index 945fd9b..04cb740 100644
--- a/subPackages/gwcOrder/index.wxss
+++ b/subPackages/gwcOrder/index.wxss
@@ -340,4 +340,37 @@ page {
   /* margin-bottom: 45%; */
   overflow-y: auto;
   margin: auto;
-}
\ No newline at end of file
+}
+
+.input-box {
+    background: white;
+    margin: 20rpx;
+    font-size: 28rpx;
+    padding: 0 25rpx;
+    border-radius: 10rpx;
+  }
+  .input-item {
+    display: flex;
+    align-items: center;
+    height: 106rpx;
+    justify-content: space-between;
+    border-bottom: 1rpx solid #EEE;
+  }
+  .input-label {
+    width: 140rpx;
+  }
+  .input-item .weui-input {
+    flex: 1;
+  }
+  .btn {
+    margin: 0 20rpx;
+    margin-top: 100rpx;
+    width: 700rpx;
+    margin-bottom: 30rpx;
+    line-height: 72rpx;
+    border-radius: 35rpx;
+    text-align: center;
+    color: white;
+    font-size: 36rpx;
+    background: #D62828;
+  }
\ No newline at end of file
diff --git a/utils/https.js b/utils/https.js
index 67031b4..1a81b17 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From d0e743ad9e45b96635090eb384d1af9924525835 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 3 Jul 2025 09:13:43 +0800
Subject: [PATCH 347/471] 1

---
 app.js                             | 2 +-
 pages/pbService/aiHelpYou/index.js | 2 +-
 utils/https.js                     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 3a8efc4..20a8a96 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest122? true : false;
+            data.isTest = data.isTest123? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index 9ad6fbd..7d6e0ae 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -20,7 +20,7 @@ Page({
   onLoad: function (options) {
     let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
     if (app.globalData.configJson.isTest) {
-        weburl = "https://m.cloud.sz-trip.com/ScenicComfort"
+        weburl = "https://m.cloud.sz-trip.com/ScenicComfort?a=1"
     }
 
     let token = wx.getStorageSync('jstrip_token')
diff --git a/utils/https.js b/utils/https.js
index 67031b4..e01baf2 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -322,20 +322,20 @@ let canToLogin = true
 let appData = getApp()
 const checkLogin = () => {
   // 判断是否已经授权过
-  let page = getCurrentPages();
+  let page = getCurrentPages()[getCurrentPages().length - 1];;
 
     // 审核不强制登录
     if (!appData) {
         console.log("获取app")
         appData = getApp()
     }
-    console.log(appData,page)
-    if(appData.globalData.configJson&&appData.globalData.configJson.isTest) {
+    console.log(appData,page.route)
+    if(page.route !="pages/user/user"&& appData.globalData.configJson&&appData.globalData.configJson.isTest) {
         return
     }
 
 
-  if ('pages/login/index' && canToLogin) {
+  if (page.route!='pages/login/index' && canToLogin) {
       canToLogin = false
     wx.navigateTo({
       url: '/pages/login/index',

From c65446594ae39dc158f406bc8b5453ee19ab9863 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 8 Jul 2025 14:18:27 +0800
Subject: [PATCH 348/471] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=EF=BC=8C=E9=99=90=E6=97=B6=E7=89=B9=E6=83=A0=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |   2 +-
 pages/index/index.js                  |   7 +-
 pages/index/index.wxml                |   7 +-
 pages/info/postProductInfo/index.js   |  10 ++
 pages/info/postProductInfo/index.wxml | 150 ++++++++++++++------------
 pages/info/postProductInfo/index.wxss |  74 ++++++++++---
 pages/info/sceneProductInfo/index.js  |   2 +-
 pages/order/components/date/index.js  |   2 +-
 pages/search/list/index.wxml          |   2 +-
 utils/https.js                        |  10 +-
 10 files changed, 169 insertions(+), 97 deletions(-)

diff --git a/app.js b/app.js
index 20a8a96..5cf47f2 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest123? true : false;
+            data.isTest = data.isTest126? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index ee475ca..d3b5d42 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -896,10 +896,11 @@ Page({
 	},
 	gotoDetail: function(e) {
 		let item = e.currentTarget.dataset.item;
-		// commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
-        item.id = item.type=='post'?item.product_id:item.scene_id
+		commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
+        // item.id = item.type=='post'?item.product_id:item.scene_id
         if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
-		util.gotoDetail(item);
+        // util.gotoDetail(item);
+        util.gotoDetail(item.goods);
 		
 	},
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8e70eab..a303546 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -85,8 +85,11 @@
                         <image style="width: 253.33rpx;" wx:if="{{xpthIndex==0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
                         <image style="width: 253.33rpx;"  wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
                         
-                        <image style="width: 253.33rpx;"  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
-                        <image style="width: 253.33rpx;"  wx:else  mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
+                        <view style="font-size: 0;" wx:if="{{indexSeason.xpthBac && indexSeason.xpthBacImg}}">
+                            <image style="width: 253.33rpx;"  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
+                            <image style="width: 253.33rpx;"  wx:else  mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
+                        </view>
+                        
                     </view>
                 </view>
                 <!-- 热门 -->
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 9ce4482..f320a6e 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -722,6 +722,16 @@ Page({
             address:info.scene_address
         })
       },
+
+    viewImg:function(e){
+        let item = e.currentTarget.dataset.item;
+        if (item.img_list.length>0) {
+            wx.previewImage({
+                urls: item.img_list
+            })
+        }
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index a777f95..7f02116 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -75,82 +75,96 @@
     </view>
 </view>
 
+<!-- 买家评价 -->
+<view class="comment-box">
+    <view class="box-top" style="border-bottom: {{commentTotal>0?'1rpx':'0rpx'}} solid #d9d9d9;">
+        <!-- <text class="iconfont icon-tiwen"></text> -->
+        <text style="font-weight: bold;">买家评价</text>
+        <text class="score" wx:if="{{info && info.rate && commentTotal>0}}">{{info.rate}}分</text>
+        <text wx:else class="no-comment">暂无评价</text>
 
-<view class="scroll-all-box" id="menus" wx:if="{{info}}">
-  <view class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px">
-    <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">产品特色</view>
-    <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">费用说明</view>
-    <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">预定须知</view>
-    <view class="scroll-menu-item{{type==4?' active':''}}" bindtap="changeMenu" data-index="4">产品推荐</view>
-  </view>
-  <view style="height:85rpx" wx:if="{{fixed}}"></view>
-  <view class="info-box" id="box1">
-    <view class="info-title">产品特色</view>
-    <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
-  </view>
-  <view class="info-box" id="box2">
-    <view class="info-title">费用说明</view>
-    <rich-text class="details" nodes="{{tool.formateRichText(info.expense_info)}}"></rich-text>
-  </view>
-  <view class="info-box" id="box3">
-    <view class="info-title">预订须知</view>
-    <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
-  </view>
-  <view class="box">
-  <view class="box-top">
-    <text class="iconfont icon-tiwen"></text><text>游客点评</text><text class="score" wx:if="{{info && info.rate && commentTotal>0}}">{{info.rate}}分</text>
-    <navigator url="/pages/list/comments/index?productid={{id}}" style="display: inline;"> <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong; font-weight: bold;color: #000;">></text></text>
-    </navigator>
-  </view>
-  <view class="empty-box" wx:if="{{!comment || comment.length==0}}">
-    <view>这里空空如也，快去点评吧!</view>
-    <!-- <navigator url="/pages/ask/index?id={{id}}" class="empty-btn">去点评</navigator> -->
-  </view>
-  <navigator wx:for="{{comment}}" wx:for-index="index" url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
-    <view class="product-comment-top">
-      <image src="{{item.user.avatar}}" mode="aspectFill"></image>
-      <view class="comment-info">
-        <view class="nickname">{{item.nickname}}</view>
-        <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
-      </view>
-      <!-- <view class="comment-date">{{item.create_time}}</view> -->
+        <navigator url="/pages/list/comments/index?productid={{id}}" style="display: inline;"> 
+            <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong;color: #000;">></text></text>
+        </navigator>
     </view>
-    <view class="comment-content">{{item.content}}</view>
-    <view wx:if="{{item.img_list}}">
-      <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
-        <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
-        </image>
-        <view class="all" wx:if="{{index==5}}">
-          <view>共{{item.img_list.length}}张</view>
-          <view>查看全部</view>
+    <!-- <view class="empty-box" wx:if="{{!comment || comment.length==0}}">
+        <view>这里空空如也，快去点评吧!</view>
+       <navigator url="/pages/ask/index?id={{id}}" class="empty-btn">去点评</navigator>
+    </view> -->
+    <navigator wx:for="{{comment}}" wx:key="index" wx:for-index="index" url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
+        <view class="product-comment-top">
+            <image class="avator-img" src="{{item.user.avatar}}" mode="aspectFill"></image>
+            <!-- <image class="avator-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/commentUser.png" mode="aspectFill"></image> -->
+            <view class="comment-container">
+                <view class="comment-info">
+                    <view class="nickname" style="padding-right:20rpx ;">{{item.nickname}}</view>
+                    <!-- <view class="nickname" style="padding-right:20rpx ;">张三</view> -->
+                    <view class="iconfont"><text wx:for="{{item.rate}}" wx:key="index" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
+                </view>
+                <view class="comment-content textOver2">{{item.content}}</view>
+            </view>
+            <view class="img-box" wx:if="{{item.img_list.length>0}}">
+                <image class="imgs" data-item="{{item}}" mode="aspectFill" src="{{item.img_list[0]}}" catch:tap="viewImg"></image>
+                <!-- <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
+                    <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc"></image>
+                    <view class="all" wx:if="{{index==5}}">
+                    <view>共{{item.img_list.length}}张</view>
+                    <view>查看全部</view>
+                    </view>
+                </view> -->
+                <view wx:if="{{item.img_list.length>1}}" class="more-img">+{{item.img_list.length}}</view>
+            </view>
+            
+        <!-- <view class="comment-date">{{item.create_time}}</view> -->
         </view>
-      </view>
-    </view>
-    <view class="sku" wx:if="{{item.sku_name}}">{{item.sku_name}}</view>
-  </navigator>
-  <navigator url="/pages/list/comments/index?productid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">
-    查看全部点评<text class="iconfont icon-you"></text></navigator>
+        
+        <!-- <view class="sku" wx:if="{{item.sku_name}}">{{item.sku_name}}</view> -->
+    </navigator>
+    <!-- <navigator url="/pages/list/comments/index?productid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">
+        查看全部点评<text class="iconfont icon-you"></text></navigator> -->
 
 </view>
-<view class="proad" id="box4">
-  <view class="proad-title">
-    <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
-  </view>
-  <view class="pro-list">
-    <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
-    <view class="item-hd">
-      <image src="{{item.headimg}}"></image>
+
+<view class="scroll-all-box" id="menus" wx:if="{{info}}">
+    <view class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px">
+        <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">产品特色</view>
+        <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">费用说明</view>
+        <view class="scroll-menu-item{{type==3?' active':''}}" bindtap="changeMenu" data-index="3">预定须知</view>
+        <view class="scroll-menu-item{{type==4?' active':''}}" bindtap="changeMenu" data-index="4">产品推荐</view>
     </view>
-    <view class="item-bm">
-      <view class="protitle textOver">{{item.title}}</view>
-      <view class="pro-price">
-        {{item.price/100}}
-      </view>
+    <view style="height:85rpx" wx:if="{{fixed}}"></view>
+    <view class="info-box" id="box1">
+        <view class="info-title">产品特色</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
+    </view>
+    <view class="info-box" id="box2">
+        <view class="info-title">费用说明</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.expense_info)}}"></rich-text>
+    </view>
+    <view class="info-box" id="box3">
+        <view class="info-title">预订须知</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
     </view>
-  </view>
-  </view>
 
-</view>
+    <view class="proad" id="box4">
+    <view class="proad-title">
+        <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
+    </view>
+    <view class="pro-list">
+        <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+        <view class="item-hd">
+        <image src="{{item.headimg}}"></image>
+        </view>
+        <view class="item-bm">
+        <view class="protitle textOver">{{item.title}}</view>
+        <view class="pro-price">
+            {{item.price/100}}
+        </view>
+        </view>
+    </view>
+    </view>
+
+    </view>
 </view>
 
 <view style="height:140rpx"></view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 0748daf..ff73fe6 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -234,6 +234,19 @@ page {
   background: #f2f2f2;
   padding: 20rpx;
 }
+.comment-box{
+    background: #fff;
+    padding: 0 20rpx;
+    margin: 20rpx 0;
+    width: 100%;
+    box-sizing: border-box;
+}
+.comment-box .no-comment{
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #999999;
+    padding-left: 18rpx;
+}
 
 .box-top {
   line-height: 95rpx;
@@ -284,30 +297,40 @@ page {
   /* margin: 0 20rpx; */
   border-bottom: 1rpx solid #ccc;
   /* padding: 33rpx 0; */
-  padding: 33rpx 20rpx;
+  padding: 28rpx 20rpx;
   background: #fff;
 }
+.product-comment:last-of-type{
+    border-bottom: none;
+}
 
 .product-comment-top {
   display: flex;
   justify-content: space-between;
   color: #999999;
-  align-items: center;
+  align-items: flex-start;
   font-size: 24rpx;
 }
 
-.product-comment-top image {
+.product-comment-top .avator-img {
   flex-shrink: 0;
   width: 57rpx;
   height: 57rpx;
   border-radius: 50%;
 }
-
+.product-comment-top .comment-container{
+    flex: 1;
+    width: 10rpx;
+    padding: 0 45rpx 0 15rpx;
+}
 .product-comment-top .comment-info {
-  flex: 1;
-  margin: 0 15rpx;
-  color: #666;
-  font-size: 21rpx;
+  width: 100%;
+  height: 57rpx;
+  font-weight: bold;
+    font-size: 24rpx;
+    color: #666666;
+  display: flex;
+  align-items: center;
 }
 
 .product-comment-top .comment-info .iconfont {
@@ -320,10 +343,11 @@ page {
 }
 
 .comment-content {
-  margin-left: 13rpx;
-  margin-top: 36rpx;
-  font-size: 28rpx;
-  color: #000;
+    width: 100%;
+    padding-top: 12rpx;
+    font-size: 28rpx;
+    color: #000;
+    font-weight: 500;
 }
 
 .more-comment-btn {
@@ -824,14 +848,30 @@ page {
   margin-bottom: 20rpx;
 }
 .imgs{
-  width: 200rpx;
-  height: 200rpx;
-  margin: 10rpx;
-  border-radius: 8rpx;
+  width: 133rpx;
+  height: 133rpx;
+  border-radius: 13rpx;
 }
 .img-box{
-  display: inline-block;
+    width: 133rpx;
+height: 133rpx;
   position: relative;
+  overflow: hidden;
+}
+.img-box .more-img{
+    height: 37rpx;
+    line-height: 37rpx;
+    background: #000;
+    border-radius: 13rpx 0rpx 13rpx 0rpx;
+    box-sizing: border-box;
+    padding: 0 5rpx;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    opacity: 0.8;
 }
 .all{
   color: #fff;
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index ad3822d..3841d77 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -422,7 +422,7 @@ Page({
             num: this.data.productNum
           }).then(res => {
             if (res.code == 1) {
-              commonApi.user_post('cart/get_list', {}).then(res => {
+              commonApi.user_post('cart/get_list', {noLogin: true}).then(res => {
                 this.setData({
                   cartCount: res.data.length //5
                 })
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 4e8ad5e..24ad21b 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -67,7 +67,7 @@ Component({
       }
       let todayTimes = new Date(today.replace(/-/g,'/')).getTime()
       commonApi.user_post("token/check").then(res => {
-        if (res.code == 1) {
+        if (res&&res.code == 1) {
           // 获取价格日历
           commonApi.user_post("product/product_date_price", {
             start_date: today,
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 5c718ec..16daf9a 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -32,7 +32,7 @@
     <common-image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
     <!-- <image></image> -->
     <view class="product-info">
-      <view class="product-title">{{item.title}}</view>
+      <view class="product-title textOver2">{{item.title}}</view>
       <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>
diff --git a/utils/https.js b/utils/https.js
index e01baf2..4ecfe51 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -173,6 +173,10 @@ function user_post_new(url, data = {}, type) {
     // 判断是否登录
     // 没有登录就跳转到登录页面
     if (!token) {
+        if (data.noLogin) {
+            resolved();
+            return false;
+        }
       wx.hideLoading();
       // 去登陆
       console.log("去登陆去登陆去登陆去登陆去登陆去登陆去登陆")
@@ -330,9 +334,9 @@ const checkLogin = () => {
         appData = getApp()
     }
     console.log(appData,page.route)
-    if(page.route !="pages/user/user"&& appData.globalData.configJson&&appData.globalData.configJson.isTest) {
-        return
-    }
+    // if(page.route !="pages/user/user"&& appData.globalData.configJson&&appData.globalData.configJson.isTest) {
+    //     return
+    // }
 
 
   if (page.route!='pages/login/index' && canToLogin) {

From 4dce700f3842d24dda5c0a65bef496b2134e2519 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 8 Jul 2025 14:37:40 +0800
Subject: [PATCH 349/471] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.wxml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index e6f6023..8129fcb 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -111,7 +111,8 @@
               <!-- <text>￥168</text> -->
             </view>
             <view class="detail-item">
-              <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text>
+              <!-- <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text> -->
+              <text>{{item.title}}：{{item.id_number}}</text>
               <!-- <text>-￥10</te、xt> -->
             </view>
             <view class="detail-item">

From 118554be68d3879d841ee07d8b02e4aeeb2eaed5 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 8 Jul 2025 14:53:51 +0800
Subject: [PATCH 350/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 5cf47f2..d1c771c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest126? true : false;
+            data.isTest = data.isTest127? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From da63c57bd3855171770d148ce4fc680f239b7b68 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 9 Jul 2025 09:29:17 +0800
Subject: [PATCH 351/471] fix

---
 pages/index/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index d3b5d42..ffb6fd7 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -871,7 +871,7 @@ Page({
             tag_id: 85,offset: 0,limit: 5,
         }).then(res=>{
             let resData = res.data.list || []
-            (resData).forEach(v=>{ v.pagePoint = {classification: 'hot', key_number: v.id} })
+            resData.forEach(v=>{ v.pagePoint = {classification: 'hot', key_number: v.id} })
             this.setData({ list: resData})
         })
     },

From 09be50975a17d291e0642a6f855f78073ed885f7 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 9 Jul 2025 10:41:22 +0800
Subject: [PATCH 352/471] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml                    |  6 ++--
 pages/index/index.wxss                    |  7 +++++
 pages/order/components/contact/index.js   |  3 +-
 pages/order/components/contact/index.wxss | 34 ++++++++++++++++++++++-
 pages/user/address/index.js               |  2 +-
 pages/user/linkman/index.js               |  3 +-
 pages/user/profile/index.js               |  2 +-
 utils/https.js                            |  4 +--
 8 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index a303546..daf77b6 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -249,11 +249,11 @@
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
                 <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
                     <view class="hot-item">
-                    <view style="position:relative">
-                        <common-image width="100%" src="{{item.headimg}}" mode="widthFix"></common-image>
+                    <view style="position:relative;flex-shrink: 0;">
+                        <common-image width="100%" src="{{item.headimg}}" mode="aspectFill"></common-image>
                     </view>
                     <view class="hot-info">
-                        <view class="hot-title">{{item.title}}</view>
+                        <view class="hot-title textOver2">{{item.title}}</view>
                         <view class="com-flex" style="justify-content: space-between;margin-top: 26rpx;">
                             <view  class="hot-price">
                                 <text>￥</text><text>{{item.price/100}}</text><text>起</text>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 4e3ef2f..d59b467 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -477,14 +477,21 @@
   /* box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); */
   border-radius: 15rpx;
   margin-bottom: 15rpx;
+  height: 498rpx;
 }
 .hot-item image:nth-child(1) {
   display: block;
   width: 100%;
+  height: 327rpx;
   border-radius: 15rpx 15rpx 0 0;
 }
 .hot-item .hot-info {
   padding: 12rpx;
+  height: 170rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  box-sizing: border-box;
 }
 .hot-item .hot-title {
     font-weight: bold;
diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js
index 27a8afe..8a12e4d 100644
--- a/pages/order/components/contact/index.js
+++ b/pages/order/components/contact/index.js
@@ -433,7 +433,8 @@ Component({
       userApi.user_post("user/getContactOrConsignee",{
         contactType:"CONTACT",
         offset:0,
-        limit:1000
+        limit:1000,
+        tm_flag: true,
       }).then(res=>{
         let list = res.data;
         // list.map(item=>{
diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index 8ac2731..46f557f 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -277,4 +277,36 @@
   font-size: 29rpx;
   color: #000000;
   flex-shrink: 0;
-}
\ No newline at end of file
+}
+.input-box {
+    background: white;
+    margin: 20rpx;
+    font-size: 28rpx;
+    padding: 0 25rpx;
+    border-radius: 10rpx;
+  }
+  .input-item {
+    display: flex;
+    align-items: center;
+    height: 106rpx;
+    justify-content: space-between;
+    border-bottom: 1rpx solid #EEE;
+  }
+  .input-label {
+    width: 140rpx;
+  }
+  .input-item .weui-input {
+    flex: 1;
+  }
+  .btn {
+    margin: 0 20rpx;
+    margin-top: 100rpx;
+    width: 700rpx;
+    margin-bottom: 30rpx;
+    line-height: 72rpx;
+    border-radius: 35rpx;
+    text-align: center;
+    color: white;
+    font-size: 36rpx;
+    background: #D62828;
+  }
\ No newline at end of file
diff --git a/pages/user/address/index.js b/pages/user/address/index.js
index dfc92c0..333927b 100644
--- a/pages/user/address/index.js
+++ b/pages/user/address/index.js
@@ -48,7 +48,7 @@ Page({
     user.user_post("user/getContactOrConsignee",{
       contactType:"CONSIGNEE",
       offset: this.data.list.length,
-      limit:10
+      limit:10,
     }).then(res=>{
       let list = this.data.list.concat(res.data), isMore = true;
       if(res.data.length<10){
diff --git a/pages/user/linkman/index.js b/pages/user/linkman/index.js
index f5389e2..1428193 100644
--- a/pages/user/linkman/index.js
+++ b/pages/user/linkman/index.js
@@ -55,7 +55,8 @@ Page({
     user.user_post("user/getContactOrConsignee", {
       contactType:"CONTACT",
       offset: this.data.list.length,
-      limit: 10
+      limit: 10,
+      tm_flag: true,
     }).then(res => {
       let list = this.data.list.concat(res.data),isMore = true;
       if(res.data.length<10){
diff --git a/pages/user/profile/index.js b/pages/user/profile/index.js
index ffd5591..027e653 100644
--- a/pages/user/profile/index.js
+++ b/pages/user/profile/index.js
@@ -183,7 +183,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    userApi.user_post("user/getMyInfo",{}).then(res=>{
+    userApi.user_post("user/getMyInfo",{tm_flag: true}).then(res=>{
       this.setData({
         info:res.data,
         avatar:res.data.avatar,
diff --git a/utils/https.js b/utils/https.js
index 4ecfe51..9dbc3ee 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From f7732884fb5148b480651a7542d434d43ee27dfd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 9 Jul 2025 11:22:43 +0800
Subject: [PATCH 353/471] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/old/linkman/index.js              | 3 ++-
 pages/order/components/address/index.js | 9 ++++++---
 pages/order/hotel/index.js              | 6 ++++--
 pages/order/roadOrder/index.js          | 3 ++-
 pages/user/address/index.js             | 1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pages/old/linkman/index.js b/pages/old/linkman/index.js
index f5389e2..1428193 100644
--- a/pages/old/linkman/index.js
+++ b/pages/old/linkman/index.js
@@ -55,7 +55,8 @@ Page({
     user.user_post("user/getContactOrConsignee", {
       contactType:"CONTACT",
       offset: this.data.list.length,
-      limit: 10
+      limit: 10,
+      tm_flag: true,
     }).then(res => {
       let list = this.data.list.concat(res.data),isMore = true;
       if(res.data.length<10){
diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js
index 98e5ad6..b105bf0 100644
--- a/pages/order/components/address/index.js
+++ b/pages/order/components/address/index.js
@@ -34,7 +34,8 @@ Component({
             this.getLinkmanList()
           } else {
             userApi.user_post("user/getDefaultContact", {
-              contactType: "CONSIGNEE"
+              contactType: "CONSIGNEE",
+              tm_flag: true,
             }).then(res => {
               this.setData({
                 selectLinkman: res.data
@@ -162,7 +163,8 @@ Component({
       userApi.user_post("user/getContactOrConsignee", {
         contactType: "CONSIGNEE",
         offset: 0,
-        limit: 1000
+        limit: 1000,
+        tm_flag: true,
       }).then(res => {
         let list = res.data;
         this.setData({
@@ -251,7 +253,8 @@ Component({
       commonApi.user_post("token/check").then(res => {
         if (res.code == 1) {
           userApi.user_post("user/getDefaultContact", {
-            contactType: "CONSIGNEE"
+            contactType: "CONSIGNEE",
+            tm_flag: true,
           }).then(res => {
             console.log(res)
             this.setData({
diff --git a/pages/order/hotel/index.js b/pages/order/hotel/index.js
index 131c265..057a25b 100644
--- a/pages/order/hotel/index.js
+++ b/pages/order/hotel/index.js
@@ -44,7 +44,8 @@ Page({
       let CtripHotelCart = app.globalData.product;
       // 获取默认联系人
       userApi.user_post("user/getDefaultContact",{
-        contactType:"CONTACT"
+        contactType:"CONTACT",
+        tm_flag: true,
       }).then(res=>{
         if(res.data){
           this.setData({
@@ -193,7 +194,8 @@ Page({
       userApi.user_post("user/getContactOrConsignee",{
         contactType:"CONTACT",
         offset:0,
-        limit:1000
+        limit:1000,
+        tm_flag: true,
       }).then(res=>{
         let list = res.data;
         list.map(item=>{
diff --git a/pages/order/roadOrder/index.js b/pages/order/roadOrder/index.js
index 333ef3a..ed17b65 100644
--- a/pages/order/roadOrder/index.js
+++ b/pages/order/roadOrder/index.js
@@ -103,7 +103,8 @@ Page({
         userApi.user_post("user/getContactOrConsignee",{
           contactType:"CONTACT",
           offset:0,
-          limit:1000
+          limit:1000,
+          tm_flag: true,
         }).then(res=>{
           let list = res.data;
           this.setData({
diff --git a/pages/user/address/index.js b/pages/user/address/index.js
index 333927b..be0012c 100644
--- a/pages/user/address/index.js
+++ b/pages/user/address/index.js
@@ -49,6 +49,7 @@ Page({
       contactType:"CONSIGNEE",
       offset: this.data.list.length,
       limit:10,
+      tm_flag: true,
     }).then(res=>{
       let list = this.data.list.concat(res.data), isMore = true;
       if(res.data.length<10){

From 23e3d0efcb7e0c55d93234473d2ad56159177072 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 11 Jul 2025 17:12:25 +0800
Subject: [PATCH 354/471] 1

---
 app.js         | 2 +-
 utils/https.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index d1c771c..6573851 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest127? true : false;
+            data.isTest = data.isTest129? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/utils/https.js b/utils/https.js
index 9dbc3ee..4ecfe51 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 085865a69b2d8e954033c788a28124e4f92799da Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 14 Jul 2025 11:56:21 +0800
Subject: [PATCH 355/471] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/scene/index.js  | 14 +++++++++++++-
 project.private.config.json |  7 +++++++
 utils/https.js              |  4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index bee3cc0..48ffd9a 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -104,6 +104,15 @@ Page({
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
   },
+
+  initPage () {
+    this.setData({
+        is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
+        is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+        is_real_name:app.globalData.product.sku.sku_model.is_real_name,
+      })
+  },
+
   // next: function () {
   //   this.setData({
   //     showMask:true
@@ -414,11 +423,14 @@ Page({
 	
   },
   changed() {
-      console.log('time---',this.data.date,this.data.time)
+    console.log('time---',this.data.date,this.data.time)
     app.globalData.product.date = this.data.date
     app.globalData.product.time = this.data.time
     app.globalData.product.changeFlag = true
     this.hideDate()
+
+    // this.initPage()
+
   },
   order:function() {
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
diff --git a/project.private.config.json b/project.private.config.json
index 12064dd..be8ee63 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/sceneProductInfo/index",
+          "pathName": "pages/info/sceneProductInfo/index",
+          "query": "id=54182",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
diff --git a/utils/https.js b/utils/https.js
index 4ecfe51..9dbc3ee 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 6fbd39d453bb419af3332ab4f4c8fdcc601432f1 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 15 Jul 2025 09:37:04 +0800
Subject: [PATCH 356/471] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 15 ++++++++++++++-
 pages/index/index.wxml | 11 +++++++++--
 pages/index/index.wxss | 20 ++++++++++++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index ffb6fd7..0d7ca12 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -445,7 +445,7 @@ Page({
         this.getList()  // 回购榜
 
         this.getRepurchaseList()
-        // this.getWeather()  // 2025-5-26首页改版不需要天气了
+        this.getWeather()  // 2025-5-26首页改版不需要天气了
         // this.getFourProduct() // 活动日历
 
         wx.getLocation({
@@ -475,6 +475,17 @@ Page({
         }
     },
 
+    gotoPath(e) {
+        if (e.currentTarget.dataset.path){
+            wx.navigateTo({
+                url: e.currentTarget.dataset.path,
+            })
+            return
+        }
+        
+    },
+
+
     // 获取系统信息
 	getHeight() {
         let systemInfo = wx.getSystemInfoSync(),
@@ -577,6 +588,8 @@ Page({
 		})
     },
 
+
+
     // --------------------banner 相关---------------------------
     // 获取banner 和开屏广告
     getBanner: function() {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index daf77b6..903cac2 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -17,10 +17,17 @@
             <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
         </view> -->
 
-        <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+20}}px">
+        <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+10}}px">
+            <view wx:if="{{weather}}" style="display: flex;flex-shrink: 0;">
+                <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+                <view class="weather-num">{{weather.max_temp}}°</view>
+                <view class="weather">{{weather.weather}}</view>
+                <image style="margin: 0 30rpx;" lazy-load bindtap="gotoPath"  data-path="/pages/user/service/index"
+                    src="https://static.ticket.sz-trip.com/uploads/20250714/1f3ac6a7144c6e6849edad89289061cc.png" mode="aspectFill"></image>
+            </view>
             <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
                 <image src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
-                <view class="textOver" >搜一搜您想要的</view>
+                <view class="textOver" style="color:#000000">搜索您想要的</view>
             </navigator>
         </view>
 
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d59b467..1921768 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -38,7 +38,7 @@
   flex: 1;
   width: 100%;
   height: 64rpx;
-  border-radius: 27rpx;
+  border-radius: 36rpx;
   color: #666666;
   display: flex;
   align-items: center;
@@ -925,4 +925,20 @@
     border-radius: 13rpx;
     padding: 15rpx 10rpx;
     box-sizing: border-box;
-}
\ No newline at end of file
+}
+
+.top-box .weather-num,.top-box .weather {
+    flex-shrink: 0;
+    color: #333;
+  }
+  .top-box .weather-num {
+    font-size: 29rpx;
+    margin-bottom: 10rpx;
+    margin-left: 4rpx;
+  }
+  .top-box .weather {
+    font-size: 19rpx;
+    margin-top: 20rpx;
+    margin-left: -6rpx;
+    margin-right: 0rpx;
+  }
\ No newline at end of file

From 03419a6f8388ee2ea95ec4221f81f07e8abcedb2 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 16 Jul 2025 15:00:50 +0800
Subject: [PATCH 357/471] =?UTF-8?q?=E5=A4=A9=E6=B0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 2 +-
 pages/index/index.js   | 3 ++-
 pages/index/index.wxss | 2 +-
 utils/https.js         | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index d1c771c..6573851 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest127? true : false;
+            data.isTest = data.isTest129? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 0d7ca12..df7cf23 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -437,6 +437,7 @@ Page({
 
 	onReady: function() {
         this.getHeight()
+        this.getWeather()  // 天气
         this.getIndexSeason()
 		this.getBanner()
        
@@ -445,7 +446,7 @@ Page({
         this.getList()  // 回购榜
 
         this.getRepurchaseList()
-        this.getWeather()  // 2025-5-26首页改版不需要天气了
+        
         // this.getFourProduct() // 活动日历
 
         wx.getLocation({
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1921768..ecd979b 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -65,7 +65,7 @@
     justify-content: space-between;
     padding: 0rpx 20rpx 30rpx;
     box-sizing: border-box;
-    background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2))
+    /* background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2)) */
 }
 .banner-main image{
     width: 173.33rpx;
diff --git a/utils/https.js b/utils/https.js
index 9dbc3ee..4ecfe51 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 4604d1b70eeab442f336bff6407d0a3a13b91d0a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 17 Jul 2025 11:52:17 +0800
Subject: [PATCH 358/471] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=A5=A8=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.wxml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 3712229..40c9023 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -59,7 +59,11 @@
                     <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
                 </view>
                 <view class="product-right">
-                    <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text></view>
+                    <view class="price">
+                        <text>￥</text>
+                        <text>{{sku.price?sku.price/100:0}}</text>
+                        <text wx:if="{{sku.is_merged}}">起</text>
+                    </view>
                     <!-- showOrder    selectDate  -->
                     <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
                     data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"

From 81c66a702f074dd3c10a6bd79ae1dd52fa48cb7d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 17 Jul 2025 16:25:19 +0800
Subject: [PATCH 359/471] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/contact/index.wxss |   5 +
 pages/order/scene/index.js                |   8 +-
 pages/order/scene/index.wxml              |   4 +-
 project.private.config.json               | 117 +---------------------
 4 files changed, 17 insertions(+), 117 deletions(-)

diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss
index 46f557f..ea4b77c 100644
--- a/pages/order/components/contact/index.wxss
+++ b/pages/order/components/contact/index.wxss
@@ -277,6 +277,11 @@
   font-size: 29rpx;
   color: #000000;
   flex-shrink: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 0 10rpx;
+  box-sizing: border-box;
 }
 .input-box {
     background: white;
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 48ffd9a..fbb75cc 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -69,7 +69,7 @@ Page({
       time: app.globalData.product.time || {},
       showYhq:app.globalData.listName?false:true
     })
-    console.log('-------',this.data.showYhq,this.data.time);
+    console.log('-------',this.data.product,this.data.time);
     // debugger
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
@@ -90,7 +90,11 @@ Page({
 		this.setData({
 		  productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num
 		})
-  }
+    }
+
+    if (app.globalData.product && app.globalData.product.sku && app.globalData.product.sku.display_tags) {
+        app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | ");
+    }
     this.setData({
       product: app.globalData.product,
       singlePrice: app.globalData.product.date?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index bf3bd5d..06a8275 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -47,8 +47,8 @@
       <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
     </view>
     <view class="text1">
-      <text wx:for="{{product.sku.display_tags}}" wx:if="{{index<=1}}">
-        {{item}}<text style="margin:0 8rpx;" wx:if="{{index+1<=product.sku.display_tags.length}}">|</text> 
+      <text wx:if="{{product.sku.display_tags_str}}">
+        {{product.sku.display_tags_str}}<text style="margin:0 8rpx;">|</text> 
       </text>
       <text bindtap="showBookingInfo">预订须知 ></text>
     </view>
diff --git a/project.private.config.json b/project.private.config.json
index be8ee63..ed33811 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,16 +7,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/info/sceneProductInfo/index",
-          "pathName": "pages/info/sceneProductInfo/index",
-          "query": "id=54182",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2Fwangzhe",
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=457634",
           "launchMode": "default",
           "scene": null
         },
@@ -28,82 +21,12 @@
           "scene": null
         },
         {
-          "name": "subPackages/index/index",
+          "name": "活动首页",
           "pathName": "subPackages/indexGQ/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "subPackages/feiyiNew/CGCIndex/index",
-          "pathName": "subPackages/feiyiNew/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "subPackages/index/index",
-          "pathName": "subPackages/indexGQ/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "subPackages/password/setting/setting",
-          "pathName": "subPackages/password/setting/setting",
-          "query": "type=edit",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/pbService/sceneComfort/index",
-          "pathName": "pages/pbService/sceneComfort/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/user/order/movieOrderInfo/index",
-          "pathName": "pages/activity/year2020/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "subPackageCheckPoint/pages/index/index",
-          "pathName": "subPackageCheckPoint/pages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https://m.cloud.sz-trip.com/nightMooring",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "pages/info/postProductInfo/index",
-          "query": "id=437254&ZTPoint=yjksSpecial",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "首页",
-          "pathName": "subPackages/indexGQ/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "https%3A%2F%2Fm.cloud.sz-trip.com%2FpetYou2024%3FcnylCode%3D123456",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
@@ -124,38 +47,6 @@
           "query": "",
           "launchMode": "default",
           "scene": null
-        },
-        {
-          "name": "景点购物车5447",
-          "pathName": "pages/info/sceneProductInfoNew/index",
-          "query": "id=5447",
-          "scene": null
-        },
-        {
-          "name": "pages/group/info/index",
-          "pathName": "pages/group/info/index",
-          "query": "team_id=32&id=26",
-          "scene": null
-        },
-        {
-          "name": "pages/list/haoxing/index",
-          "pathName": "pages/list/haoxing/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/order/payresult/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/order/comment/index",
-          "query": "id=82342309051435565877",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }

From f6f481968a286b8a306a45abbb81d0780784e8a9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 21 Jul 2025 14:47:01 +0800
Subject: [PATCH 360/471] =?UTF-8?q?=E5=88=86=E6=89=B9=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.wxml           |  78 ++---
 pages/order/orderList/index.wxss           |  43 ++-
 pages/order/postOrder/index.js             |  28 +-
 pages/order/postOrder/index.wxml           |  32 +-
 pages/order/postOrder/index.wxss           |  29 ++
 pages/user/order/postOrderInfo/index.js    |  58 ++++
 pages/user/order/postOrderInfo/index.wxml  | 227 +++++++++-----
 pages/user/order/postOrderInfo/index.wxss  |  40 ++-
 pages/user/order/sceneOrderInfo/index.js   |  25 +-
 pages/user/order/sceneOrderInfo/index.wxml | 329 +++++++++++++++------
 pages/user/order/sceneOrderInfo/index.wxss | 118 +++++---
 11 files changed, 743 insertions(+), 264 deletions(-)

diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index a488969..c0c25bb 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,64 +1,48 @@
 <title title="订单列表"></title>
 <view class="box" wx:if="{{goodsList.length != 0}}">
-	<view wx:for="{{goodsList}}" wx:key="index">
-		<view class="item-box">
-			<view>
-				{{item.product.title}}
-			</view>
-			<view class="price">
-				￥{{item.sku.price/100}}
-			</view>
+	<view class="goods-item" wx:for="{{goodsList}}" wx:key="index">
+		<view class="item-box item-title">
+			<view>{{item.product.title}}</view>
+			<view class="price">￥{{item.sku.price/100}}</view>
 		</view>
 		<view class="item-box">
-			<view>
-				{{item.sku.sku_name}}
-			</view>
-			<view>
-				X{{item.productNum}}
-			</view>
+			<view>{{item.sku.sku_name}}</view>
+			<view>X{{item.productNum}}</view>
 		</view>
 		<view class="item-box">
-			<view>
-				运费
-			</view>
-			<view class="price">
-				￥{{item.postFee/100 || 0}}
-			</view>
+			<view>运费</view>
+			<view class="price">￥{{item.postFee/100 || 0}}</view>
 		</view>
+        <view  wx:if="{{item.sku.is_batch_shipment==1}}">
+            <view class="item-box item-title">物流信息</view>
+            <view class="item-box">分批收货 (共{{item.sku.batch_count}}次)</view>
+            <view class="item-box">物流备注：{{item.sku.batch_remark}}</view>
+        </view>
 	</view>
 </view>
 <view class="box" wx:if="{{ticketList.length != 0}}">
-	<view wx:for="{{ticketList}}" wx:key="index">
-		<view class="item-box">
-			<view>
-				{{item.product.title}}
-			</view>
-			<view class="price">
-				￥{{item.sku.price/100}}
-			</view>
+	<view class="goods-item" wx:for="{{ticketList}}" wx:key="index">
+		<view class="item-box item-title">
+			<view>{{item.product.title}}</view>
+			<view class="price">￥{{item.sku.price/100}}</view>
 		</view>
 		<view class="item-box">
-			<view>
-				{{item.sku.sku_name}}
-			</view>
-			<view>
-				X{{item.num}}
-				<!-- X{{item.linkmanList.length}} -->
-			</view>
+			<view>{{item.sku.sku_name}}</view>
+			<view>X{{item.num}}</view>
 		</view>
-    <view style="padding-left: 10rpx;margin: 30rpx 0 22.67rpx;">出行人信息</view>
-    <view wx:if="{{item.sku.sku_model.is_authentication != 0}}">
-      <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
-        <view>
-          <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
-          <view class="text"><view class="text-left">证件号：</view>{{items.id_number}}</view>
-          <view class="text"><view class="text-left">手机号：</view>{{items.tel}}</view>
+        <view class="item-box item-title" style="padding-top: 27rpx;">出行人信息</view>
+        <view wx:if="{{item.sku.sku_model.is_authentication != 0}}">
+            <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
+                <view>
+                    <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
+                    <view class="text"><view class="text-left">证件号：</view>{{items.id_number}}</view>
+                    <view class="text"><view class="text-left">手机号：</view>{{items.tel}}</view>
+                </view>
+            </view>
+        </view>
+        <view wx:else>
+            <view class="text"><view class="text-left">手机号：</view>{{item.phone}}</view>
         </view>
-      </view>
-    </view>
-    <view wx:else>
-      <view class="text"><view class="text-left">手机号：</view>{{item.phone}}</view>
-    </view>
 	</view>
 </view>
 
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 3f7a203..fdf5877 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -7,11 +7,7 @@ page{
 	background: white;
 	padding: 20rpx;
 }
-.item-box{
-	display: flex;
-	justify-content: space-between;
-	padding: 10rpx;
-}
+
 .price{
 	color: #D62828;
 }
@@ -64,13 +60,38 @@ page{
 }
 
 .text {
-  margin-bottom: 22.67rpx;
-  color: #333;
-  font-size: 28rpx;
-  font-weight: 500;
+  margin-bottom: 20rpx;
   display: flex;
+  font-weight: 500;
+font-size: 27rpx;
+color: #666666;
 }
 
-.text-left {
-  color: #999;
+
+.goods-item{
+    border-bottom: 1px solid #D8D8D8;
+    padding-bottom: 17rpx;
+    margin-bottom: 17rpx;
+}
+.goods-item:last-of-type{
+    border-bottom: none;
+    margin-bottom:0;
+    padding-bottom: 0;
+}
+.item-box{
+	display: flex;
+	justify-content: space-between;
+    padding: 10rpx;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+}
+.item-box.item-title{
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #333333;
+}
+.item-box.item-title .price{
+    color: #D62828;
+    font-weight: bold;
 }
\ No newline at end of file
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 922fd0f..2f9c76c 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -47,6 +47,7 @@ Page({
       else if (this.data.gp_id) {
         price = price + item.sku.event_price * item.productNum;
       }
+      item.sku.batch_shipment = item.sku.batch_shipment?item.sku.batch_shipment:0;
       sku_id.push(item.sku.id)
     })
     this.setData({
@@ -154,7 +155,8 @@ Page({
         sku_id: item.sku.id,
         post: this.data.address.id,
         product_num: item.productNum,
-        remark: item.remark
+        remark: item.remark,
+        is_batch_shipment: item.sku.batch_shipment,
       }
       product_list.push(productItem)
     })
@@ -232,8 +234,15 @@ Page({
       let postFee = 0, flag = true;
       res.map((item, index) => {
         if (item.data.price < 0) flag = false;
-        postFee = postFee + Number(item.data.price);
         product[index].postFee = item.data.price;
+
+        // 累计总邮费
+        let postPrice = Number(item.data.price)
+        if(product[index].sku.batch_shipment == 1) {
+            postPrice = product[index].sku.batch_count * postPrice
+        }
+        postFee = postFee + postPrice;
+
       })
       if (!flag) {
         wx.showToast({
@@ -265,6 +274,21 @@ Page({
     })
   },
 
+  changeBatchShip (e) {
+    let product = this.data.product;
+    let value = e.currentTarget.dataset.value;
+    let index = e.currentTarget.dataset.index;
+
+    product[index].sku.batch_shipment = value;
+    console.log(index)
+    this.setData({
+        product: product
+    })
+
+    this.getPostFee()
+    this.changePrice()
+  },
+
   /**
    * 选择补贴
    */
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 9641fb3..6affe90 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -25,16 +25,44 @@
     <view class="number-box">{{item.productNum}}</view>
     <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
   </view>
+  <view class="box-title" style="height:auto;min-height:126rpx;position: relative;">
+    <view style="flex:1;white-space:nowrap;margin-right:20rpx;">收货方式</view>
+    <view class="batch-view">
+        <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">
+            <view class="no-select" wx:if="{{item.sku.batch_shipment==1}}"></view>
+            <image class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
+            <text>一次性收货</text>
+        </view>
+        <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{1}}" data-index="{{index}}"
+             style="margin-left: 30rpx;" wx:if="{{item.sku.is_batch_shipment}}">
+            <view class="no-select" wx:if="{{item.sku.batch_shipment==0}}"></view>
+            <image class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
+            <text>分批收货<text style="font-size: 24rpx;">(共{{item.sku.batch_count}}次)</text></text>
+        </view>
+
+        <view class="batch-info-tip">{{item.sku.batch_remark}}</view>
+    </view>
+  </view>
+
   <view class="box-title" style="height:auto;min-height:113rpx;">
     <view style="flex:1;white-space:nowrap;margin-right:20rpx;">运费</view>
-    <text>{{item.postFee?(item.postFee==0?'包邮':(item.postFee/100)):item.sku.sku_model.post_template_name}}</text>
+    <view style="display: flex;">
+        <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text>
+        <view wx:if="{{item.postFee>0 && item.sku.batch_shipment==1}}">
+            <text style="padding-left: 10rpx;">x{{item.sku.batch_count}}</text>
+            <text style="padding-left: 40rpx;">￥{{(item.postFee/100)*item.sku.batch_count}}</text>
+        </view>
+    </view>
   </view>
   <view class="box-title" wx:if="{{flag!='mix'}}">
     <view  style="flex-shrink:0" >订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view>
   <view class="all-money-box" wx:if="{{from=='cart'}}">
-    小计：<text class="unit">￥</text><text class="s-price">{{(item.sku.price * item.productNum + item.postFee || 0) /100}}</text>
+    小计：<text class="unit">￥</text>
+    <text class="s-price" wx:if="{{item.sku.batch_shipment==1}}">{{(item.sku.price * item.productNum + item.postFee*item.sku.batch_count || 0) /100}}</text>
+    <text class="s-price" wx:else>{{(item.sku.price * item.productNum + item.postFee || 0) /100}}</text>
+    
   </view>
   <!-- 补贴 -->
   <view class="box-title allowance" wx:if="{{allowance_price}}">
diff --git a/pages/order/postOrder/index.wxss b/pages/order/postOrder/index.wxss
index fde5a52..b85f0ea 100644
--- a/pages/order/postOrder/index.wxss
+++ b/pages/order/postOrder/index.wxss
@@ -222,4 +222,33 @@ page {
 .mask-allowance .mask-content .rule-title {
   text-align: center;
   margin-bottom: 20rpx;
+}
+
+.batch-view{
+    display: flex;
+}
+.batch-view .flex{
+    display: flex;
+    align-items: center;
+}
+.batch-view .no-select{
+    width: 30rpx;
+    height: 30rpx;
+    background: #FFFFFF;
+    border-radius: 50%;
+    border: 1px solid #999999;
+    margin-right: 10rpx;
+}
+.batch-view .select-img{
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 10rpx;
+}
+.batch-view .batch-info-tip{
+    position: absolute;
+    right: 0;
+    bottom: 6rpx;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #D62828;
 }
\ No newline at end of file
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 7a5ac84..a607d73 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -188,6 +188,51 @@ Page({
       url: '/pages/order/comment/index?id='+id,
     })
   },
+  goDetail(e){
+    console.log(e.currentTarget.dataset);
+    let item = e.currentTarget.dataset.set
+    if (item.is_package == 1) {
+        wx.navigateTo({
+            url:"/pages/info/postProductInfo/index?id="+item.product_id
+        })
+        return
+    } else if (item.is_package==2) {
+        wx.navigateTo({
+            url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
+          });
+          return
+    }
+
+    if (item.product_model=='ticket') {
+      wx.navigateTo({
+        url:"/pages/info/sceneProductInfo/index?id="+item.scene_id
+      })
+    }else if (item.product_model=='post') {
+      wx.navigateTo({
+        url:"/pages/info/postProductInfo/index?id="+item.product_id
+      })
+    }
+  },
+
+  expandPost:function (e) {
+      let index = e.currentTarget.dataset.index
+      let productList = this.data.info.order_product_list
+      let item = productList[index]
+      item.showMore = !item.showMore
+      this.setData({
+          info: this.data.info
+      })
+  },
+  expandMsg: function(e) {
+    let index = e.currentTarget.dataset.index
+    let productList = this.data.info.order_product_list
+    let item = productList[index]
+    item.showMsg = !item.showMsg
+    this.setData({
+        info: this.data.info
+    })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -314,6 +359,19 @@ getInfo () {
         state = state + order.state;
         order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
       })
+
+      // 2025-7-21能否确认收货
+      res.data.is_all_confirm = true;
+      if (res.data.state=='PAID' && res.data.stateNums.WAIT_DELIVERY==res.data.order_product_list.length) {
+        res.data.order_product_list.forEach(v=>{
+            if (v.shipped_batch_count < v.batch_count ) {
+                res.data.is_all_confirm = false
+            }
+        })
+      } else {
+           res.data.is_all_confirm = true;
+      }
+
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 4d3f676..d000b62 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -12,81 +12,176 @@
   <view class="box-title" style="margin-top:15rpx"><text style="margin-right:20rpx">{{info.order_product_list[0].consignee_info.name}}</text><text>{{info.order_product_list[0].consignee_info.tel}}</text></view>
   <view style="font-size:26rpx;color:#333;line-height:50rpx"><text style="color:#0B898E;margin-right:10rpx" class="iconfont icon-location"></text>{{info.order_product_list[0].consignee_info.address}}</view>
 </view>
-<sptj ids="{{ ids }}"></sptj>
-<view class="box" wx:if="{{info}}" style="padding-bottom:0">
-  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
-    <view class="product-info-top">
-      <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
-      <view class="title-box textOver2">
-        <view class="title textOver2">{{item.product_title}}</view>
-        <view class="subtitle textOver2">{{item.sku_name}}</view>
-      </view>
-      <view class="price-box-tip">
-        <view style="margin-bottom:10rpx">￥ {{item.product_price/100}}</view>
-        <view>x{{item.product_num}}</view>
-      </view>
+
+<view class="box" wx:if="{{info && info.order_product_list && info.order_product_list.length>0}}" 
+    wx:for="{{info.order_product_list}}">
+    <view>
+        <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
+            <view class="product-info-top">
+                <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+                <view class="title-box textOver2">
+                    <view class="title textOver2">{{item.product_title}}</view>
+                    <view class="subtitle textOver2">{{item.sku_name}}</view>
+                </view>
+                <view class="price-box-tip">
+                    <view style="margin-bottom:10rpx">￥ {{item.product_price/100}}</view>
+                    <view>x{{item.product_num}}</view>
+                </view>
+            </view>
+            <view class="product-state">{{item.state_text}}</view>
+        </view>
+        <view class="detail-item">
+            <text>收货方式：</text>
+            <text wx:if="{{item.is_batch_shipment==1}}">分批收货 (共{{item.batch_count}}次)</text>
+            <text wx:else>一次性收货</text>
+        </view>
+        <view class="detail-item">
+            <text>运费：</text>
+            <view>
+                <text style="padding-right: 56rpx;" wx:if="{{item.post_fee&&item.is_batch_shipment==1}}">￥{{item.post_fee/item.batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
+                <text>{{item.post_fee?("￥"+item.post_fee/100):"包邮"}}</text>
+            </view>
+        </view>
+        <view class="detail-item">
+            <text>小计：</text>
+            <text>￥{{item.paid_money/100}}</text>
+        </view>
+
+        <!-- <view wx:if="{{item.post_detail_list.length>0}}"> -->
+        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" 
+            wx:if="{{item.is_batch_shipment==1 || (item.is_batch_shipment==0&&item.post_detail_list.length>=1)}}">
+            <view class="box-title" style="position: relative;">
+                物流信息
+                <text bind:tap="expandPost" data-index="{{index}}" class="expand-tip" wx:if="{{item.is_batch_shipment==1}}">
+                {{item.showMore?"收起":"展开"}}
+                </text>
+            </view>
+            <!-- 多批次发货 -->
+            <view wx:if="{{item.is_batch_shipment==1}}">
+                <view class="detail-item post-line-info">
+                    <text>当前已发：{{item.shipped_batch_count}}</text>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>当前待发：{{item.batch_count - item.shipped_batch_count}}</text>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>物流备注：{{item.batch_remark}}</text>
+                </view>
+
+                <view class="post-child" style="padding-top: 12rpx;" wx:if="{{item.showMore}}">
+                    <view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
+                        <view class="detail-item">快递{{shipIndex+1}}</view>
+                        <view class="detail-item post-line-info">
+                            <text>快递公司：{{shipment.express_name}}</text>
+                        </view>
+                        <view class="detail-item post-line-info">
+                            <text>快递单号：</text>
+                            <view style="flex:1;width: 1rpx;">
+                                {{shipment.courier_number}} <text data-num="{{shipment.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                            </view>
+                        </view>
+                        <view class="detail-item post-line-info">
+                            <text>发货时间：{{shipment.post_time}}</text>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- <view class="post-child-btn" bind:tap="expandPost" data-index="{{index}}">{{item.showMore?"收起":"展开"}}</view> -->
+
+
+            </view>
+            
+            <!-- 一次性发货 -->
+            <view wx:elif="{{item.post_detail_list.length>=1}}">
+                <view class="detail-item post-line-info">
+                    <text>快递公司：{{item.post_detail_list[0].express_name}}</text>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>快递单号：</text>
+                    <view style="flex:1;width: 1rpx;">
+                        {{item.post_detail_list[0].courier_number}} <text data-num="{{item.post_detail_list[0].courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                    </view>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>发货时间：{{item.post_detail_list[0].post_time}} </text>
+                </view>
+            </view>
+        </view>
+
+        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;">
+            <view class="box-title" style="position: relative;">
+                使用说明
+                <text bind:tap="expandMsg" data-index="{{index}}" class="expand-tip">
+                {{item.showMsg?"收起":"展开"}}
+                </text>
+            </view>
+            <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+        </view>
     </view>
-    <view class="product-price">邮费：{{item.post_fee==0?'包邮':('￥'+item.post_fee/100)}} 实付：￥{{item.paid_money/100}}</view>
-    <view class="product-state">{{item.state_text}}</view>
-  </view>
-  <view class="detail-item">
-    <text>商品总价</text>
-    <text>￥{{info.total_money/100}}</text>
-  </view>
-  <view class="detail-item">
-    <text>运费</text>
-    <text>{{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}}</text>
-  </view>
-  <view class="detail-item" wx:if="{{info.preference_money}}">
-    <text>优惠券抵扣</text>
-    <text>-￥{{info.preference_money/100}}</text>
-  </view>
-  <view class="detail-item all-total-item" style="border-bottom:none">
-    <text>需付款</text>
-    <view class="price">{{info.paid_money/100}}</view>
-  </view>
-  <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
-    <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
-    <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
-    <view class="btn" wx:elif="{{info.stateNums.WAIT_DELIVERY==info.order_product_list.length}}" bind:tap="toConfirmPost">确认收货</view>
-    <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
-    <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
-    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
-    <navigator url="../expressInfo/index?id={{info.order_id}}" class="btn" wx:if="{{info.post_detail_list.length>0}}">查询快递</navigator>
-  </view>
 </view>
+
 <view class="box" wx:if="{{info}}">
-  <view class="box-title">订单信息</view>
-  <view class="detail-item">
-    <text>订单编号：{{info.order_id}}</text>
-  </view>
-  <view class="detail-item">
-    <text>下单时间：{{info.create_time}}</text>
-  </view>
-  <view class="detail-item" wx:if="{{info.pay_at}}">
-    <text>支付时间：{{info.pay_at}}</text>
-  </view>
-  <view class="detail-item" wx:if="{{info.pay_method}}">
-    <text>支付方式：{{pay_methods[info.pay_method]}}</text>
-  </view>
-  <view wx:if="{{info.post_detail_list.length>0}}" class="detail-item" style="height:auto;align-items:flex-start;line-height:45rpx;">
-    <text>快递公司：</text>
-    <view style="flex:1">
-      <view wx:for="{{info.post_detail_list}}">{{item.express_name}}</view>
+    <view class="box-title">订单信息</view>
+    <view class="detail-item">
+        <text>商品总价：</text>
+        <text>￥{{info.total_money/100}}</text>
     </view>
-  </view>
-  <view wx:if="{{info.post_detail_list.length>0}}" class="detail-item" style="height:auto;align-items:flex-start;line-height:45rpx;">
-    <text>快递单号：</text>
-    <view style="flex:1">
-      <view wx:for="{{info.post_detail_list}}">{{item.courier_number}}<text data-num="{{item.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text></view>
+    <view class="detail-item">
+        <text>运费：</text>
+        <view>
+            <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">
+            ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}}
+            </text>
+            <text>{{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}}</text>
+        </view>
+    </view>
+    <view class="detail-item" wx:if="{{info.preference_money}}" >
+        <text>优惠券：</text>
+        <text>-￥{{info.preference_money/100}}</text>
+    </view>
+    <view class="detail-item">
+        <text>实付款</text>
+        <view class="price">￥{{info.paid_money/100}}</view>
+    </view>
+
+    <view style="border-top:1rpx solid #ccc;margin: 12rpx 0;"></view>
+
+    <view class="detail-item">
+        <text>订单编号：</text>
+        <view>{{info.order_id}}  <text data-num="{{info.order_id}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text></view>
+    </view>
+    <view class="detail-item">
+        <text>下单时间：</text>
+        <text>{{info.create_time}}</text>
+    </view>
+    <view class="detail-item" wx:if="{{info.pay_at}}">
+        <text>支付时间：</text>
+        <text>{{info.pay_at}}</text>
+    </view>
+    <view class="detail-item" wx:if="{{info.pay_method}}">
+        <text>支付方式：</text>
+        <text>{{pay_methods[info.pay_method]}}</text>
+    </view>
+
+    <view class="btns" style="border-top:1rpx solid #ccc;margin-top: 12rpx;" wx:if="{{info.state!='CLOSED'}}">
+        <!-- <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view> -->
+        <!-- <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator> -->
+        <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
+        <view class="btn" wx:if="{{info.is_all_confirm}}" bind:tap="toConfirmPost">确认收货</view>
+        <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
+        <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
+        <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+        <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
+        <!-- <navigator url="../expressInfo/index?id={{info.order_id}}" class="btn" wx:if="{{info.post_detail_list.length>0}}">查询快递</navigator> -->
     </view>
-  </view>
 </view>
+
+<sptj ids="{{ ids }}"></sptj>
+
 <navigator url="/pages/user/service/index" class="bottom-btn">
   <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
+<view style="height: 40rpx;"></view>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss
index eeab2be..6d3e75b 100644
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@@ -38,7 +38,6 @@ page {
   color: #666;
 }
 .product-state {
-  margin-top: 10rpx;
   color: #0B898E;
 }
 .product-info image {
@@ -67,8 +66,8 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: 45rpx;
-  color: #333;
+  height: 50rpx;
+  color: #666;
   font-size: 26rpx;
 }
 .all-total-item {
@@ -344,4 +343,39 @@ color: #333333;
   content:'起';
   color: #999999;
   font-size: 10px;
+}
+.post-line-info{
+    height: auto;
+    min-height: 48rpx;
+}
+
+.post-child-item{
+    background: #F5F5F5;
+    border-radius: 20rpx;
+    padding:10rpx 20rpx;
+    width: 100%;
+    box-sizing: border-box;
+    margin-bottom: 20rpx;
+}
+.post-child-item .detail-item{
+    color: #333;
+}
+.post-child-btn{
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #0B898E;
+    background: #FFFFFF;
+    border-radius: 50rpx;
+    border: 1px solid #0B898E;
+    padding:4rpx 40rpx;
+    width: fit-content;
+    margin: 0 auto;
+    box-sizing: border-box;
+    margin-top: 20rpx;
+}
+.expand-tip{
+    position: absolute;
+    color: #0B898E;
+    right: 0;
+    bottom: 0;
 }
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 93faa07..f65c46d 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -49,9 +49,10 @@ Page({
       })
     })
   },
-  copy:function(){
+  copy:function(e){
+      let code = e.currentTarget.dataset.num;
     wx.setClipboardData({
-      data: this.data.codeImgs[this.data.codeIndex].code,
+      data: code,
       success: function (res) {
         wx.showToast({
           title: '复制成功',
@@ -351,6 +352,26 @@ Page({
     })
   },
 
+  expandPost:function (e) {
+    let index = e.currentTarget.dataset.index
+    let productList = this.data.info.order_product_list
+    let item = productList[index]
+    item.showMore = !item.showMore
+    this.setData({
+        info: this.data.info
+    })
+  },
+
+  expandMsg: function(e) {
+    let index = e.currentTarget.dataset.index
+    let productList = this.data.info.order_product_list
+    let item = productList[index]
+    item.showMsg = !item.showMsg
+    this.setData({
+        info: this.data.info
+    })
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 8129fcb..53b8c57 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -34,10 +34,10 @@
 	<advBox ids="{{ ids }}"></advBox>
 </view>
 
-<sptj ids="{{ ids }}"></sptj>
+
 
 <!-- 景点订单详情需要这个 -->
-<view class="box" wx:if='{{product_model=="ticket"}}'>
+<!-- <view class="box" wx:if='{{product_model=="ticket"}}'>
   <view class="scene-box">
     <view class="scene-box-left">
       <view wx:if="{{info.state=='UNPAID'}}">库存有限，请尽快完成付款</view>
@@ -52,106 +52,267 @@
       <view bindtap="showFeeInfo">费用明细</view>
     </view>
   </view>
-  <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
-    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
-    <view wx:if="{{info.state!='UNPAID'}}">
-        <navigator wx:if="{{info.order_product_list[0].is_package==1}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
-        <navigator wx:elif="{{info.order_product_list[0].is_package==2}}" url="/subPackages/goods/oneCardTour/info/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
+</view> -->
+<!--景点订单详情需要这个  -->
+<view class="box" wx:for="{{info.order_product_list}}" wx:for-index='index'>
+    <view wx:if="{{item.product_model!='post'}}">
+        
+        <view class="box-title" bindtap="goDetail" data-set='{{item}}'>
+            <view style="display:flex;flex: 1;width: 1rpx;padding-right: 20rpx;align-items: center;">
+                <view class="title-content textOver" style="padding-right: 14rpx;">{{item.product_title}}</view>
+                <view class="iconfont icon-you" style="flex-shrink: 0;font-size: 13px;font-weight: normal;"></view>
+            </view>
+            <view class="child-status" style="flex-shrink: 0;">{{ item.state_text }}</view>
+        </view>
+        <view class="detail-item" wx:if="{{!item.order_advance.id}}">
+            <view style="display:flex;width: 100%;">
+                <text>出行日期：</text>
+                <view>
+                {{item.use_date}}<text style="padding-left: 20rpx;" wx:if="{{item.start_time && item.end_time}}">{{ item.start_time }}-{{ item.end_time }}</text> 
+                </view>
+            </view>
+        </view>
+        <view class="detail-item" wx:else>
+            <view>使用日期：</view>
+            <view>{{ item.order_advance.start_time }}-{{ item.order_advance.end_time }}</view>
+        </view>
+        <view class="goods-line"></view>
+        <view class="detail-item">
+            <text>{{item.sku_name}}</text>
+            <view style="display: flex;">
+                <view style="padding-right: 40rpx;">￥ {{item.product_price/100}}</view>
+                <view >x{{item.product_num}}</view>
+            </view>
+        </view>
+        <view class="detail-item">
+            <text>小计：</text>
+            <text style="color: #DC2525;">￥{{item.paid_money/100}}</text>
+        </view>
+        <view class="goods-line"></view>
+
+        <view>
+            <view class="box-title" style="position: relative;">
+                出行人
+                <text wx:if="{{item.contacts_info.length>1}}" bind:tap="expandPost" data-index="{{index}}" class="expand-tip">
+                {{item.showMore?"收起":"展开"}}
+                </text>
+            </view>
+            <view class="post-child" style="padding-top: 12rpx;">
+                <view wx:if="{{item.sku_model.is_authentication == 0}}">
+                    <view class="detail-item">
+                        <text>手机号： {{item.phone}}</text>
+                    </view>
+                </view>
+                <view wx:else style="overflow: hidden; max-height:{{item.showMore?'100vh':'180rpx'}};">
+                    <view class="post-child-item" wx:for="{{item.contacts_info}}">
+                        <view class="detail-item">
+                            <text>姓名： {{item.name}}</text>
+                        </view>
+                        <view class="detail-item">
+                            <text>手机号：{{item.tel}}</text>
+                        </view>
+                        <view class="detail-item">
+                            <text>{{item.title}}：{{item.id_number}}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <view class="goods-line"></view>
+
+        <view>
+            <view class="box-title" style="position: relative;">
+                使用说明
+                <text bind:tap="expandMsg" data-index="{{index}}" class="expand-tip">
+                {{item.showMsg?"收起":"展开"}}
+                </text>
+            </view>
+            <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
+        </view>
+
+        
 
-        <navigator wx:else  url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
     </view>
-    
-    <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view> -->
-    <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
-    <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
-    <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
-    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
-  </view>
-</view>
-<!--景点订单详情需要这个  -->
-<view url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" class="box" wx:if='{{product_model=="ticket"}}' wx:for="{{info.order_product_list}}" wx:for-index='index'>
-  <view class="scene-box" style="align-items:center">
-    <view class="scene-box-left" style="width:630rpx">
-      <view class="box-title" bindtap="goDetail" data-set='{{item}}'>
-        <view class="title-content">{{item.product_title}}</view>
-        <view class="iconfont icon-you"></view>
-      </view>
-      <view class="detail-item">
-        <text>{{item.sku_name}}</text>
-        <text>x{{item.product_num}}</text>
-      </view>
-      <view class="childStatus" style="text-align: left;font-size: 30rpx; font-weight:bold;padding-bottom: 30rpx;color: #0b898e">
-        {{ item.state_text }}
-      </view>
-      <view class="row" wx:if="{{item.product_model == 'ticket' && !item.order_advance.id}}">
-        <view>出行日期：</view>
-        <view>{{item.use_date}}<text style="padding-left: 20rpx;" wx:if="{{item.start_time && item.end_time}}">{{ item.start_time }}-{{ item.end_time }}</text> </view>
-      </view>
 
-      <view class="row" wx:if="{{item.product_model == 'ticket' && item.order_advance.id}}">
-        <view>使用日期：</view>
-        <view>{{ item.order_advance.start_time }}-{{ item.order_advance.end_time }}</view>
-      </view>
-      <view wx:if="{{item.product_model == 'ticket'}}">
-        <view class="box-title tflex">
-          <view>出行人信息</view>
-          <view bindtap="showMsg" data-msg="cxr1" style="color: rgb(49, 154, 158);">{{cxr1Text}}</view>
+    <view wx:else>
+        <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
+            <view class="product-info-top">
+                <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+                <view class="title-box textOver2">
+                    <view class="title textOver2">{{item.product_title}}</view>
+                    <view class="subtitle textOver2">{{item.sku_name}}</view>
+                </view>
+                <view class="price-box-tip">
+                    <view style="margin-bottom:10rpx">￥ {{item.product_price/100}}</view>
+                    <view>x{{item.product_num}}</view>
+                </view>
+            </view>
+            <view class="product-state">{{item.state_text}}</view>
+        </view>
+        <view class="detail-item">
+            <text>收货方式：</text>
+            <text wx:if="{{item.is_batch_shipment==1}}">分批收货 (共{{item.batch_count}}次)</text>
+            <text wx:else>一次性收货</text>
         </view>
-        <view wx:if="{{item.sku_model.is_authentication == 0}}">
-          <view class="detail-item">
-              <text>手机号： {{item.phone}}</text>
+        <view class="detail-item">
+            <text>运费：</text>
+            <view>
+                <text style="padding-right: 56rpx;" wx:if="{{item.post_fee&&item.is_batch_shipment==1}}">￥{{item.post_fee/item.batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
+                <text>{{item.post_fee?("￥"+item.post_fee/100):"包邮"}}</text>
             </view>
         </view>
-        <view wx:else>
-          <view wx:if="{{cxr1}}" wx:for="{{item.contacts_info}}">
-          <view class="line" wx:if="{{index!=0}}"></view>
-            <view class="detail-item">
-              <text>姓名： {{item.name}}</text>
-              <!-- <text>￥168</text> -->
+        <view class="detail-item">
+            <text>小计：</text>
+            <text>￥{{item.paid_money/100}}</text>
+        </view>
+
+        <!-- <view wx:if="{{item.post_detail_list.length>0}}"> -->
+        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;">
+            <!-- <view class="box-title">物流信息</view> -->
+            <view class="box-title" style="position: relative;">
+                物流信息
+                <text bind:tap="expandPost" data-index="{{index}}" class="expand-tip" wx:if="{{item.is_batch_shipment==1}}">
+                {{item.showMore?"收起":"展开"}}
+                </text>
             </view>
-            <view class="detail-item">
-              <!-- <text>{{cardTypes[item.idcard_type]}}：{{item.id_number}}</text> -->
-              <text>{{item.title}}：{{item.id_number}}</text>
-              <!-- <text>-￥10</te、xt> -->
+            <!-- 多批次发货 -->
+            <view wx:if="{{item.is_batch_shipment==1}}">
+                <view class="detail-item post-line-info">
+                    <text>当前已发：{{item.shipped_batch_count}}</text>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>当前待发：{{item.batch_count - item.shipped_batch_count}}</text>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>物流备注：{{item.batch_remark}}</text>
+                </view>
+
+                <view class="post-child" style="padding-top: 12rpx;" wx:if="{{item.showMore}}">
+                    <view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
+                        <view class="detail-item">快递{{shipIndex+1}}</view>
+                        <view class="detail-item post-line-info">
+                            <text>快递公司：{{shipment.express_name}}</text>
+                        </view>
+                        <view class="detail-item post-line-info">
+                            <text>快递单号：</text>
+                            <view style="flex:1;width: 1rpx;">
+                                {{shipment.courier_number}} <text data-num="{{shipment.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                            </view>
+                        </view>
+                        <view class="detail-item post-line-info">
+                            <text>发货时间：{{shipment.post_time}}</text>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- <view class="post-child-btn" bind:tap="expandPost" data-index="{{index}}">{{item.showMore?"收起":"展开"}}</view> -->
             </view>
-            <view class="detail-item">
-              <text>手机号： {{item.tel}}</text>
-              <!-- <text>-￥10</text> -->
+            
+            <!-- 一次性发货 -->
+            <view wx:elif="{{item.post_detail_list.length>=1}}">
+                <view class="detail-item post-line-info">
+                    <text>快递公司：{{item.post_detail_list[0].express_name}}</text>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>快递单号：</text>
+                    <view style="flex:1;width: 1rpx;">
+                        {{item.post_detail_list[0].courier_number}} <text data-num="{{item.post_detail_list[0].courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                    </view>
+                </view>
+                <view class="detail-item post-line-info">
+                    <text>发货时间：{{item.post_detail_list[0].post_time}} </text>
+                </view>
             </view>
         </view>
+
+        <view class="goods-line"></view>
+        <view>
+            <view class="box-title" style="position: relative;">
+                使用说明
+                <text bind:tap="expandMsg" data-index="{{index}}" class="expand-tip">
+                {{item.showMsg?"收起":"展开"}}
+                </text>
+            </view>
+            <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
         </view>
-      </view>
-      <view wx:if="{{item.product_model=='ticket'}}">
-        <view class="box-title tflex">
-          <view>使用说明</view>
-          <view bindtap="showMsg" data-msg="sysm1" style="color: rgb(49, 154, 158);">{{sysmText}}</view>
+    </view>
+
+</view>
+
+<view class="box" wx:if="{{info}}">
+    <view class="box-title">订单信息</view>
+    <view class="detail-item">
+        <text>商品总价：</text>
+        <text>￥{{info.total_money/100}}</text>
+    </view>
+    <view class="detail-item">
+        <text>运费：</text>
+        <view>
+            <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">
+            ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}}
+            </text>
+            <text>{{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}}</text>
         </view>
-        <rich-text class="detail-item {{sysm?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
-      </view>
-      <view wx:if="{{item.product_model=='post'}}">
-        <view class="box-title tflex">
-          <view>使用说明</view>
-          <view bindtap="showMsg" data-msg="sysm2" style="color: rgb(49, 154, 158);">{{sysm2Text}}</view>
+    </view>
+    <view class="detail-item" wx:if="{{info.preference_money}}" >
+        <text>优惠券：</text>
+        <text>-￥{{info.preference_money/100}}</text>
+    </view>
+    <view class="detail-item">
+        <text>实付款</text>
+        <view class="price">￥{{info.paid_money/100}}</view>
+    </view>
+
+    <view style="border-top:1rpx solid #ccc;margin: 12rpx 0;"></view>
+
+    <view class="detail-item">
+        <text>订单编号：</text>
+        <view>{{info.order_id}}  <text data-num="{{info.order_id}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text></view>
+    </view>
+    <view class="detail-item">
+        <text>下单时间：</text>
+        <text>{{info.create_time}}</text>
+    </view>
+    <view class="detail-item" wx:if="{{info.pay_at}}">
+        <text>支付时间：</text>
+        <text>{{info.pay_at}}</text>
+    </view>
+    <view class="detail-item" wx:if="{{info.pay_method}}">
+        <text>支付方式：</text>
+        <text>{{pay_methods[info.pay_method]}}</text>
+    </view>
+
+    <view class="btns" style="border-top:1rpx solid #ccc;margin-top: 12rpx;" wx:if="{{info.state!='CLOSED'}}">
+        <view class="scene-btns" >
+            <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
+            <!-- <view wx:if="{{info.state!='UNPAID'}}">
+                <navigator wx:if="{{info.order_product_list[0].is_package==1}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+                <navigator wx:elif="{{info.order_product_list[0].is_package==2}}" url="/subPackages/goods/oneCardTour/info/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
+
+                <navigator wx:else  url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
+            </view> -->
+            
+            <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view> -->
+            <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
+            <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
+            <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
+            <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="scene-btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+            <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
         </view>
-        <rich-text class="detail-item {{sysm2?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
-      </view>
-      <!-- <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view> -->
     </view>
-  </view>
 </view>
-<!-- <view class="box" wx:if="{{product_model=='ticket'}}">
-  <view class="box-title">使用说明</view>
-  <rich-text class="detail-item" style="display:block" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.bookinfo)}}"></rich-text>
-   <view class="line"></view>
-  <view class="box-title">退款说明</view>
-  <view class="detail-item">
-    <text>退款条件：{{info.order_product_list[0].sku_model.refund_policy_text}}</text>
-  </view>
-</view> -->
+
+
+<sptj ids="{{ ids }}"></sptj>
+
 <navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
   <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
+
+<view style="height: 40rpx;"></view>
+
+
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 1f34eac..69d4dcd 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -23,14 +23,23 @@ page {
   margin: 20rpx 30rpx;
 }
 .product-info {
-  display: flex;
-  justify-content: space-between;
-  color: #333;
-  font-size: 24rpx;
-  padding-bottom: 20rpx;
-  border-bottom: 1rpx solid #d8d8d8;
-  margin-bottom: 10rpx;
-}
+    color: #333;
+    font-size: 24rpx;
+    padding-bottom: 20rpx;
+    border-bottom: 1rpx solid #d8d8d8;
+    margin-bottom: 20rpx;
+  }
+  .product-info-top {
+    display: flex;
+    justify-content: space-between;
+  }
+  .product-price,.product-state {
+    text-align: right;
+    color: #666;
+  }
+  .product-state {
+    color: #0B898E;
+  }
 .product-info image {
   width: 140rpx;
   height: 140rpx;
@@ -54,13 +63,12 @@ page {
   text-align: right;
 }
 .detail-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  min-height: 45rpx;
-  color: #000;
-  font-size: 30rpx;
-  padding-bottom:30rpx ;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 50rpx;
+    color: #666;
+    font-size: 26rpx;
 }
 .all-total-item {
   font-weight: bold;
@@ -106,37 +114,13 @@ page {
   text-align: center;
   justify-content: space-between;
 }
-.box-title.tflex{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
+
 .title-content{
   overflow-x: hidden;
   overflow-y: inherit;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.scene-box {
-  display: flex;
-  justify-content: space-between;
-}
-.scene-box-left {
-  width: 400rpx;
-  font-size: 26rpx;
-  color: #333;
-}
-.scene-box-right {
-  flex-shrink: 0;
-  font-size: 24rpx;
-  color: #999;
-  text-align: right;
-}
-.scene-box-right .price {
-  color: #D62828;
-  font-size: 36rpx;
-  font-weight: bold;
-}
 .scene-btns {
   display: flex;
   justify-content: flex-end;
@@ -144,7 +128,7 @@ page {
   font-size: 26rpx;
   color: #333;
   text-align: center;
-  margin-top: 50rpx;
+  margin-top: 20rpx;
 }
 .scene-btn {
   width: 160rpx;
@@ -304,12 +288,7 @@ page {
   color: #999;
   margin-top: 30rpx;
 }
-.row{
-  display: flex;
-  align-items: center;
-  justify-content:space-between;
-  padding-bottom: 30rpx;
-}
+
 .showmsg{
   display: none;
 }
@@ -351,4 +330,49 @@ page {
 	font-weight: 500;
 	font-size: 23rpx;
 	color: #0E8790;
+}
+
+.goods-line{
+    border-top: 1px solid #ccc;
+    margin: 12rpx 0;
+}
+.child-status{
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #0B898E;
+}
+.post-line-info{
+    height: auto;
+    min-height: 48rpx;
+}
+
+.post-child-item{
+    background: #F5F5F5;
+    border-radius: 20rpx;
+    padding:10rpx 20rpx;
+    width: 100%;
+    box-sizing: border-box;
+    margin-bottom: 20rpx;
+}
+.post-child-item .detail-item{
+    color: #333;
+}
+.post-child-btn{
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #0B898E;
+    background: #FFFFFF;
+    border-radius: 50rpx;
+    border: 1px solid #0B898E;
+    padding:4rpx 40rpx;
+    width: fit-content;
+    margin: 0 auto;
+    box-sizing: border-box;
+    margin-top: 20rpx;
+}
+.expand-tip{
+    position: absolute;
+    color: #0B898E;
+    right: 0;
+    bottom: 0;
 }
\ No newline at end of file

From 691e356a136c475c54bf292a394301d0c8355155 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 22 Jul 2025 18:36:48 +0800
Subject: [PATCH 361/471] =?UTF-8?q?=E5=88=86=E6=89=B9=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/postOrderInfo/index.js    | 2 +-
 pages/user/order/postOrderInfo/index.wxml  | 6 ++----
 pages/user/order/sceneOrderInfo/index.wxml | 2 +-
 project.private.config.json                | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index a607d73..0d6a56a 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -369,7 +369,7 @@ getInfo () {
             }
         })
       } else {
-           res.data.is_all_confirm = true;
+           res.data.is_all_confirm = false;
       }
 
       this.setData({
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index d000b62..f0d8ffc 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -129,9 +129,7 @@
     <view class="detail-item">
         <text>运费：</text>
         <view>
-            <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">
-            ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}}
-            </text>
+            <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
             <text>{{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}}</text>
         </view>
     </view>
@@ -160,7 +158,7 @@
     </view>
     <view class="detail-item" wx:if="{{info.pay_method}}">
         <text>支付方式：</text>
-        <text>{{pay_methods[info.pay_method]}}</text>
+        <text>{{info.pay_method_text}}</text>
     </view>
 
     <view class="btns" style="border-top:1rpx solid #ccc;margin-top: 12rpx;" wx:if="{{info.state!='CLOSED'}}">
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 53b8c57..118ce54 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -280,7 +280,7 @@
     </view>
     <view class="detail-item" wx:if="{{info.pay_method}}">
         <text>支付方式：</text>
-        <text>{{pay_methods[info.pay_method]}}</text>
+        <text>{{info.pay_method_text}}</text>
     </view>
 
     <view class="btns" style="border-top:1rpx solid #ccc;margin-top: 12rpx;" wx:if="{{info.state!='CLOSED'}}">
diff --git a/project.private.config.json b/project.private.config.json
index ed33811..6275b78 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -9,7 +9,7 @@
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",
-          "query": "id=457634",
+          "query": "id=457632",
           "launchMode": "default",
           "scene": null
         },

From ce65574d093cab89525fb29ee3e085ef78de7434 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 24 Jul 2025 09:51:22 +0800
Subject: [PATCH 362/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8D=B0=E8=B1=A1?=
 =?UTF-8?q?=E8=8B=8F=E5=B7=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js | 24 ++++++++++++++++++++++--
 utils/https.js       |  2 --
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index df7cf23..27cef00 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -519,7 +519,8 @@ Page({
                 func_data: (app.globalData.configJson.func_data||{})
             })
         } else {
-            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+            // 小程序是3
+            commonApi._post("adv/get_home_ui", {type_id: 2}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
@@ -792,7 +793,11 @@ Page({
     mainNavClick:function (e) {
         let item = e.currentTarget.dataset.item
         console.log(item)
-        if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
+        if (item.pagePoint) { 
+            this.newPagePoint(item.pagePoint) 
+        }
+
+
         if (item.jump_type == "page") {
             if (item.page.mini) {
                 wx.navigateTo({
@@ -801,6 +806,21 @@ Page({
                   return
             }
             if (item.page.tdata) {
+                //sph 视频号
+                if (item.page.tdata.appid&&item.page.tdata.appid.indexOf("sph")>=0) {
+                    wx.openChannelsActivity({
+                        finderUserName: item.page.tdata.appid, // 视频号的原始ID
+                        feedId: item.page.tdata.page, // 视频号的视频ID
+                        success(res) {
+                        console.log('拉起视频号成功', res);
+                        },
+                        fail(res) {
+                        console.log('拉起视频号失败', res);
+                        }
+                    })
+                    return
+                }
+
                 if (item.page.tdata.ghid == "gh_b55e177a4069" || item.page.tdata.appid == 'wx4bb7b6050831f585') {
                     wx.navigateTo({
                         url: "/"+item.page.tdata.page,
diff --git a/utils/https.js b/utils/https.js
index 4ecfe51..66e3ef5 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -150,7 +150,6 @@ function user_post(url, data = {}, type) {
   }
 }
 function user_post_new(url, data = {}, type) {
-  console.log(type)
   var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
   //为了用户体验，加一个loading效果
   wx.showLoading({ title: '加载中', mask: true });
@@ -192,7 +191,6 @@ function user_post_new(url, data = {}, type) {
         header: header,
         success: (res) => {
           wx.hideLoading();
-          console.log(url, url.indexOf('team_order/apply_post') != -1)
           if (url.indexOf('user/getJumpThirdAppCode') != -1) {
 
           }

From 2888067b0aabf5663d287eddcf5dfbe2b584f3b6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 24 Jul 2025 14:38:00 +0800
Subject: [PATCH 363/471] =?UTF-8?q?=E8=8B=8F=E5=B7=9E=E6=98=A0=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js               | 2 +-
 pages/index/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 6573851..a914d3a 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest129? true : false;
+            data.isTest = data.isTest101? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 27cef00..93ceba0 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -520,7 +520,7 @@ Page({
             })
         } else {
             // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 2}).then(res => {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image

From 4fe717644c8dac37508d9dd61857c50b39deb875 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 25 Jul 2025 13:22:05 +0800
Subject: [PATCH 364/471] =?UTF-8?q?=E8=8B=8F=E5=B7=9E=E6=98=A0=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js               |  2 +-
 pages/index/index.js | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app.js b/app.js
index a914d3a..bf51395 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest101? true : false;
+            data.isTest = data.isTest102? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 93ceba0..47a3612 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -462,8 +462,6 @@ Page({
         })
         
         this.getUrlToPage()
-
-
     },
     
     showImg (img) {
@@ -797,7 +795,6 @@ Page({
             this.newPagePoint(item.pagePoint) 
         }
 
-
         if (item.jump_type == "page") {
             if (item.page.mini) {
                 wx.navigateTo({
@@ -808,15 +805,24 @@ Page({
             if (item.page.tdata) {
                 //sph 视频号
                 if (item.page.tdata.appid&&item.page.tdata.appid.indexOf("sph")>=0) {
-                    wx.openChannelsActivity({
+                    // if (item.page.tdata.page) {
+                    //     wx.openChannelsActivity({
+                    //         finderUserName: item.page.tdata.appid, // 视频号的原始ID
+                    //         feedId: item.page.tdata.page, // 视频号的视频ID
+                    //         success(res) {
+                    //         console.log('拉起视频号成功', res);
+                    //         },
+                    //         fail(res) {
+                    //         console.log('拉起视频号失败', res);
+                    //         }
+                    //     })
+                    // } else {
+                    //     wx.openChannelsUserProfile({
+                    //         finderUserName: item.page.tdata.appid, // 视频号的原始ID
+                    //     })
+                    // }
+                    wx.openChannelsUserProfile({
                         finderUserName: item.page.tdata.appid, // 视频号的原始ID
-                        feedId: item.page.tdata.page, // 视频号的视频ID
-                        success(res) {
-                        console.log('拉起视频号成功', res);
-                        },
-                        fail(res) {
-                        console.log('拉起视频号失败', res);
-                        }
                     })
                     return
                 }

From 7b6c8a461a465cb734cce2caf2478122aff1b439 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 26 Jul 2025 18:40:04 +0800
Subject: [PATCH 365/471] =?UTF-8?q?=E9=97=A8=E7=A5=A8=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=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/order/scene/index.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index bf51395..38e723c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest102? true : false;
+            data.isTest = data.isTest103? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index fbb75cc..3cbd68f 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -93,7 +93,14 @@ Page({
     }
 
     if (app.globalData.product && app.globalData.product.sku && app.globalData.product.sku.display_tags) {
-        app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | ");
+        try {
+            if (Array.isArray(app.globalData.product.sku.display_tags)) {
+                app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.splice(0, 2).join(" | ");
+            } else {
+                app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | ");
+            }
+        } catch(e) {}
+        // app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | ");
     }
     this.setData({
       product: app.globalData.product,

From 667b941afbc8922c0fcaabf272d9f147d2688734 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 29 Jul 2025 15:00:33 +0800
Subject: [PATCH 366/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A?=
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 | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 38e723c..776f4e4 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest103? true : false;
+            data.isTest = data.isTest104? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 47a3612..2efadbe 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -990,7 +990,11 @@ Page({
 	},
 
 	onShow: function() {
-		this.pagePoint({event: 'home_view'}, 1)
+        this.pagePoint({event: 'home_view'}, 1)
+        // 修复 首页广告点击后返回首页 tabbar不显示
+        if (this.data.showTime && !this.data.showFullAdv) {
+            wx.showTabBar()
+        }
 	},
 
 	/**
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 903cac2..f965d99 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -299,7 +299,7 @@
     <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
         <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
         <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-            <image src="{{startList.head_img}}"  style="width: 100%;height: 100vh;"></image>
+            <image src="{{startList.head_img}}"  style="width: 100%;height: 100vh;" bindtap="bannerClick" data-item="{{startList}}"></image>
         </view>
 
         <!-- 视频 -->

From cb2e9e7292869c8d76bbce1af76c2cc272503644 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 4 Aug 2025 14:28:13 +0800
Subject: [PATCH 367/471] =?UTF-8?q?=E5=88=86=E6=89=B9=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.js   | 4 ++--
 pages/order/orderList/index.wxml | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 5ffd963..48b3f7a 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -52,8 +52,8 @@ Page({
         }
 
       if (!app.globalData.kjId && !this.data.gp_id) {
-        price = price + item.sku.price * item.productNum;
-        postFee += item.postFee
+        price = price + item.sku.price * item.productNum ;
+        postFee += item.sku.batch_shipment?item.postFee*(item.sku.batch_count || 0):item.postFee;
       }
       else if (this.data.gp_id) {
         price = price + item.sku.event_price * item.productNum;
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index c0c25bb..d5c8c9c 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -11,7 +11,13 @@
 		</view>
 		<view class="item-box">
 			<view>运费</view>
-			<view class="price">￥{{item.postFee/100 || 0}}</view>
+            <view style="display: flex;text-align: right;">
+            <view class="price">￥{{item.postFee/100 || 0}}</view>
+            <view wx:if="{{item.postFee>0 && item.sku.batch_shipment==1}}">
+                <text style="padding-left: 10rpx;">x{{item.sku.batch_count}}</text>
+                <text style="padding-left: 40rpx;">￥{{(item.postFee/100)*item.sku.batch_count}}</text>
+            </view>
+            </view>
 		</view>
         <view  wx:if="{{item.sku.is_batch_shipment==1}}">
             <view class="item-box item-title">物流信息</view>

From 59d94200f5d9c132cf638540980ca5c56e4ceb1f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 5 Aug 2025 09:29:58 +0800
Subject: [PATCH 368/471] =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app.js b/app.js
index 776f4e4..9f3fb65 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest104? true : false;
+            data.isTest = data.isTest105? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 16daf9a..12cee6b 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -40,7 +40,7 @@
       <view class="price-box">
         <view class="textOver" wx:if="{{item.ext.distance}}">距您直线距离{{item.ext.distance}}km</view>
         <view wx:else></view>
-        <view wx:if="{{item.ext.type!='tenscenic'}}" class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+        <view wx:if="{{item.ext.type!='tenscenic'&&item.ext.price}}" class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
       </view>
     </view>
   </view>
@@ -56,7 +56,7 @@
       <view class="price-box">
         <image src="https://static.ticket.sz-trip.com/xcxImages/other/tag.png" mode="widthFix"></image>
         <view class="textOver" style="color:#A3A3A3">{{item.supplier_name}}</view>
-        <view class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+        <view class="price" wx:if="{{item.ext.price}}"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
       </view>
     </view>
   </view>
@@ -91,7 +91,7 @@
         <view class="scene-tags textOver">
           <view class="show-tag textOver" wx:for="{{item.ext.display_tags}}">{{item}}</view>
           <view style="flex:1"></view>
-          <view class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+          <view class="price" wx:if="{{item.ext.price}}"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
         </view>
       </view>
     </view>
@@ -117,7 +117,7 @@
         <view class="scene-tags textOver">
           <view class="show-tag textOver" wx:for="{{item.ext.display_tags}}">{{item}}</view>
           <view style="flex:1"></view>
-          <view class="price" style="line-height:50rpx"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+          <view class="price" style="line-height:50rpx" wx:if="{{item.ext.price}}"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
         </view>
       </view>
     </view>

From b1c6215e0f4538f194e187f26441b9e524ab8d76 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 11 Aug 2025 16:52:59 +0800
Subject: [PATCH 369/471] =?UTF-8?q?=E5=9F=8B=E7=82=B9=E5=92=8C=E5=88=86?=
 =?UTF-8?q?=E6=89=B9=E5=8F=91=E8=B4=A7fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js             | 14 +++++--
 pages/index/index.wxml           |  8 ++--
 pages/order/pay/index.js         | 12 ++++--
 pages/order/postOrder/index.wxml |  2 +-
 utils/https.js                   | 23 +++--------
 utils/https/common.js            | 15 +++++++-
 utils/util.js                    | 65 ++++++++++++++++++++++++++++++--
 7 files changed, 106 insertions(+), 33 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 2efadbe..34ff738 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -668,7 +668,9 @@ Page({
 	// 轮播图点击
 	bannerClick: function(e) {
 		if (this.data.isTest) return;
-		let item = e.currentTarget.dataset.item;
+        let item = e.currentTarget.dataset.item;
+        let source = e.currentTarget.dataset.source;
+        if (source) { util.setGlobalPagePoint(source); }
 		console.log(item)
 		if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
 		
@@ -794,6 +796,7 @@ Page({
         if (item.pagePoint) { 
             this.newPagePoint(item.pagePoint) 
         }
+        util.setGlobalPagePoint(item.menu_name || "首页")
 
         if (item.jump_type == "page") {
             if (item.page.mini) {
@@ -901,6 +904,8 @@ Page({
     },
 	productGotoDetail: function(e) {
         let item = e.currentTarget.dataset.item;
+        let source = e.currentTarget.dataset.source;
+        if (source) { util.setGlobalPagePoint(source); }
         if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
 		util.gotoDetail(item)
 	},
@@ -935,13 +940,15 @@ Page({
         // }
 	},
 	gotoDetail: function(e) {
-		let item = e.currentTarget.dataset.item;
+        let item = e.currentTarget.dataset.item;
+        let source = e.currentTarget.dataset.source;
+        if (source) { util.setGlobalPagePoint(source); }
+ 
 		commonApi._post("repurchase/repurchase/recordClick", {product_id:item.product_id})
         // item.id = item.type=='post'?item.product_id:item.scene_id
         if (item.pagePoint) { this.newPagePoint(item.pagePoint) }
         // util.gotoDetail(item);
         util.gotoDetail(item.goods);
-		
 	},
 
 	pagePoint: function(e, type) {
@@ -995,6 +1002,7 @@ Page({
         if (this.data.showTime && !this.data.showFullAdv) {
             wx.showTabBar()
         }
+        util.clearGlobalPagePoint()
 	},
 
 	/**
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f965d99..546ed64 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -103,7 +103,7 @@
                 <view style="width: 100%;" wx:if="{{xpthIndex==0}}">
                     <scroll-view scroll-x style="height:372rpx;padding-top: 25rpx;">
                         <view class="season-hot">
-                            <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
+                            <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}" data-source="当季热门">
                                 <image src="{{item.headimg}}"></image>
                                 <view class="season-content" style="padding:6rpx 12rpx;min-height: 130rpx;">
                                     <view class="textOver2">{{item.title}}</view>
@@ -121,7 +121,7 @@
                 <view class="xpth-product" wx:else="">
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
-                        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
+                        <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id" data-source="限时特惠">
                             <image class="prod-img" src="{{item.headimg}}" mode="aspectFill" />
                             <view class="xpth-item-content">
                                 <view class="xpth-item-title textOver2">{{item.title}}</view>
@@ -137,7 +137,7 @@
                         <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
-                            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                            <swiper-item bindtap="bannerClick" data-item="{{item}}" data-source="限时特惠">
                                 <image  src="{{item.head_img}}" mode="aspectFill"></image>
                                 <!-- <view class="xpth-cover textOver2">{{item.title}}</view> -->
                                 <!-- <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"></image> -->
@@ -254,7 +254,7 @@
             </view>
             <view class="hot-list" wx:if="{{func_data.repurchase}}">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
-                <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
+                <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" data-source="回购榜" wx:key="id">
                     <view class="hot-item">
                     <view style="position:relative;flex-shrink: 0;">
                         <common-image width="100%" src="{{item.headimg}}" mode="aspectFill"></common-image>
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 68ab854..a278f65 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -133,10 +133,16 @@ Page({
 
       
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166 || res.data.order_product_list[0].product_id == 437248){
+      if(res.data.order_product_list[0].product_id == 75012 || 
+        res.data.order_product_list[0].product_id == 75013 || 
+        res.data.order_product_list[0].product_id == 420265|| 
+        res.data.order_product_list[0].product_id == 421929 || 
+        res.data.order_product_list[0].product_id == 437166 || 
+        res.data.order_product_list[0].product_id == 437248 ||
+        res.data.order_product_list[0].product_id == 460429 ){
 		  this.setData({
-        isBook:true,
-        payIndex:1
+            isBook:true,
+            payIndex:1
 		  })
 	  }
       if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 6affe90..769e0a5 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -40,7 +40,7 @@
             <text>分批收货<text style="font-size: 24rpx;">(共{{item.sku.batch_count}}次)</text></text>
         </view>
 
-        <view class="batch-info-tip">{{item.sku.batch_remark}}</view>
+        <view class="batch-info-tip" wx:if="{{item.sku.is_batch_shipment && item.sku.batch_remark}}">{{item.sku.batch_remark}}</view>
     </view>
   </view>
 
diff --git a/utils/https.js b/utils/https.js
index 66e3ef5..ac1e739 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -11,6 +11,7 @@ if (env == 'develop1') {
   // baseUrl = "https://test.api.cloud.sz-trip.com/api/"
 }
 const orders = ['', 'weight', 'distance', 'sale_number', 'sale_price', 'price'];
+
 //封装GET请求
 function _get(url, data) {
   //为了用户体验，加一个loading效果
@@ -38,6 +39,7 @@ function _get(url, data) {
             })
           }
           resolved(res.data);
+          util.detailPagePoint(url, res.data)
         }
         else {
           rejected(res.data)
@@ -88,23 +90,9 @@ function _post(url, data = {}) {
           //     icon: "none",
           //   })
           // }
-          if (url.indexOf('product/get_product_detail') != -1) {
-            // 如果是产品详情的话 需要加埋点
-            _post('browse/ProductStatistics', {
-              uuid: wx.getStorageSync('uuid'),
-              product_id: res.data.data.id,
-              product_name: res.data.data.title,
-              type: res.data.data.type
-            })
-            util.pagePoint({
-              event: 'product_view',
-              param: {
-                type: res.data.data.type,
-                id: res.data.data.id
-              }
-            }, 1)
-          }
-          resolved(res.data);
+        resolved(res.data);
+        //   if (url.indexOf('product/get_product_detail') != -1 ||) {
+            util.detailPagePoint(url, res.data)
         }
         else {
           rejected(res.data);
@@ -131,6 +119,7 @@ function user_post(url, data = {}, type) {
         }
         user_post_new(url, data, type).then(res => {
           resolved(res)
+          util.detailPagePoint(url, res)
         }).catch(err => {
           rejected(err)
         })
diff --git a/utils/https/common.js b/utils/https/common.js
index 87c398e..ff3a02c 100644
--- a/utils/https/common.js
+++ b/utils/https/common.js
@@ -2,6 +2,7 @@ const baseUrl = "/";
 const app = getApp();
 import baseHttp from "../https.js";
 import encodeData from "./myCropto.js"
+import util from "../util.js"
 const _get = (url, data) => {
   return new Promise((resolved, rejected) => {
     baseHttp._get(baseUrl + url, data).then(res => {
@@ -34,13 +35,23 @@ const user_post = (url, data) => {
   return new Promise((resolved, rejected) => {
     if (url=='order/create' && data && data.data) {
         console.log(data.data)
-
+        // 下单专题参数
+        try {
+            let orderData = JSON.parse(data.data);
+            let source_scene = util.getGlobalPagePoint() || "";
+            orderData.source_port = "mini";
+            // todo  从h5跳转要好好改
+            if (orderData.channel) { source_scene = orderData.channel } 
+            orderData.source_scene = source_scene;
+            data.data = JSON.stringify(orderData)
+        } catch (e) {}
         data = encodeData(data.data)
     }
     
-
     baseHttp.user_post(baseUrl + url, data).then(res => {
       resolved(res)
+      util.detailPagePoint(url, res.data)
+      if (url=='order/create') {util.clearGlobalPagePoint()}
     }).catch((err) => {
       rejected(err)
     })
diff --git a/utils/util.js b/utils/util.js
index f81ff7e..80d287f 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -470,11 +470,13 @@ const pagePoint = function(data,type) {
     data = data.currentTarget.dataset
   }
   commonApi._post('browse/page_point',{
+      ...data,
     event: data.event,
-    param: data.param,
+    param: {...data.param, platform: 'mini'},
     id: data.id,
     userid: wx.getStorageSync('jstrip_userid'),
-    type: data.type
+    type: data.type,
+    
   }).then(res=>{
   })
 }
@@ -506,6 +508,59 @@ const goMovieList= function(needReturn) {
     //   return  '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
 }
 
+const setGlobalPagePoint = function (val) {
+    wx.setStorageSync("globalPagPoint", val)
+}
+const getGlobalPagePoint = function () {
+    return wx.getStorageSync('globalPagPoint')
+}
+const clearGlobalPagePoint = function () {
+    wx.removeStorageSync("globalPagPoint")
+}
+
+// 详情埋点接口 方便后续处理
+const pagePointPostUrl = [
+    {url:"product/get_product_detail",event:"product_view", needBrowswe: true},
+    {url:"scene/detail",event:"scene_view", needBrowswe: false},
+    // {url: "Actcalendar/getActDetail", event:"activity_view", needBrowswe: false},
+    // {url: "travels/getDetail", event:"travel_view", needBrowswe: false},
+]
+
+const detailPagePoint = function (url, res) {
+    try {
+        console.log(res)
+        let pagePointRoute = pagePointPostUrl.find(v=>url.indexOf(v.url)>=0)
+            if (pagePointRoute) {
+            // 如果是产品详情的话 需要加埋点
+            // if (pagePointRoute.needBrowswe) {
+            //     _post('browse/ProductStatistics', {
+            //     uuid: wx.getStorageSync('uuid'),
+            //     product_id: res.data.id,
+            //     product_name: res.data.title,
+            //     type: res.data.type
+            //     })
+            // }
+            let pages = getCurrentPages(), view = pages[pages.length - 1], options= {};
+            // 如果游别的需求 把sourceFrom 换成id
+            if (view && view.options && view.options.sourceFrom) {
+                console.log(view.options)
+                options = view.options
+                setGlobalPagePoint(view.options.sourceFrom)
+            }
+            console.log(view.options)
+            pagePoint({
+                event: pagePointRoute.event,
+                param: {
+                    ...options,
+                    type: res.type || res.data.type,
+                    id: res.id|| res.data.id,
+                }
+            }, 1)
+        }
+    } catch(e) {console.log("error", e)}
+
+}
+
 
 module.exports = {
   formatTime: formatTime,
@@ -526,5 +581,9 @@ module.exports = {
   formatMing:formatMing,
   formatHou:formatHou,
   goMovieDetail: goMovieDetail,
-  goMovieList: goMovieList
+  goMovieList: goMovieList,
+  setGlobalPagePoint: setGlobalPagePoint,
+  getGlobalPagePoint: getGlobalPagePoint,
+  clearGlobalPagePoint: clearGlobalPagePoint,
+  detailPagePoint: detailPagePoint,
 }

From 033073b8f7d037f22de9a582b23b245eb5ab55e0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 11 Aug 2025 16:53:50 +0800
Subject: [PATCH 370/471] =?UTF-8?q?=E6=99=AF=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |   2 +-
 pages/info/sceneProductInfo/index.js   |  61 ++++++--
 pages/info/sceneProductInfo/index.wxml | 141 ++++++++++++------
 pages/info/sceneProductInfo/index.wxss | 172 +++++++++++++++-------
 pages/list/scene/index.wxml            |  10 +-
 pages/list/scene/index.wxss            |  11 +-
 pages/order/components/date/index.js   | 196 +++++++++++++------------
 7 files changed, 390 insertions(+), 203 deletions(-)

diff --git a/app.js b/app.js
index 9f3fb65..099f6be 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest105? true : false;
+            data.isTest = data.isTest108? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 0bedfef..087b0bb 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -51,6 +51,12 @@ Page({
     ZTPoint:'',
 
     sku_id: null,
+    showTabIndex: 0,
+    menuType: 0,
+    orderSku: null, // 预订的sku
+    orderProduct: null,
+    noticeIndex: 0,
+    skuPriceDate: [],
     
   },
 
@@ -821,15 +827,28 @@ Page({
     console.log(app.globalData.product);
     console.log(ticket_type);
     if (ticket_type != 2) {
-      this.setData({
-        showDate: true,
-      })
-      this.setData({
-        product: product,
-        showDate2: true,
-        skuFlag: 'order',
-        showPrice:e.currentTarget.dataset.sku.price
-      })
+        let today = util.formatDate(new Date()), 
+        end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000));
+        commonApi.user_post("product/product_date_price", {
+            start_date: today,
+            end_date: end_date,
+            sku_id: sku.sku.id
+        }).then(res => {
+            if (res && res.code == 1) {
+                this.setData({
+                    showDate: true,
+                    product: product,
+                    showDate2: true,
+                    skuFlag: 'order',
+                    showPrice:e.currentTarget.dataset.sku.price,
+                    orderSku: e.currentTarget.dataset.sku,
+                    orderProduct: e.currentTarget.dataset.product,
+                    noticeIndex: 0,
+                    skuPriceDate: res.data
+                })
+            }
+        })
+        
     }else {
         let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id)
 
@@ -985,6 +1004,30 @@ Page({
     }
   },
 
+  changeTabIndex: function (e) {
+    let value = e.currentTarget.dataset.value
+    this.setData({
+        showTabIndex:value
+    })
+  },
+  changeMenu: function (e) {
+    let value = e.currentTarget.dataset.index
+    this.setData({
+        menuType:value
+    })
+  },
+  viewOPenTime: function (e) {
+    this.setData({
+        showTabIndex:2,
+        menuType: 1
+    })
+  },
+  changeNoticeIndex: function (e) {
+    let value = e.currentTarget.dataset.index
+    this.setData({
+        noticeIndex:value
+    })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 40c9023..bbe5b07 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -13,22 +13,40 @@
 <view class="top-info" wx:if="{{info}}" style="position:relative">
   <view class="title">{{info.title}}</view>
   <view class="tags-box textOver">
-    <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
-    </view>
+    <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
   </view>
-  <view class="tags-box address-box" style="height:auto">
-    <view class="info-address">{{isBook?"活动":"开园"}}时间：{{info.open_time}}</view>
-    <navigator wx:if="{{!isBook}}" url="/pages/info/sceneInfo/index?id={{info.id}}" catchtap="pagePoint" data-event="scene_detail" class="iconfont" style="font-size:27rpx;flex-shrink:0">优待政策 | 景点介绍 <text class="iconfont icon-you" style="font-size:24rpx"></text></navigator>
+
+  <view class="address-box" bind:tap="viewOPenTime">
+    <view class="address-text">
+        <view class="info-address">{{isBook?"活动":"开园"}}时间</view>
+        <view class="sub-info-address textOver">{{info.open_time}}</view>
+    </view>
+    <view class="iconfont">
+        <image src="https://static.ticket.sz-trip.com/uploads/20250808/b64e49752fc3e0831db700331db766dd.png"></image>
+        <view>详情</view>
+    </view>
   </view>
-  <view class="tags-box textOver address-box" bindtap="gotolocation">
-    <view class="info-address">地址：{{info.address}}</view>
-    <view class="iconfont icon-daohang"></view>
+  <view class="address-box true-address" bindtap="gotolocation">
+    <view class="address-text">
+        <view class="info-address">地址</view>
+        <view class="sub-info-address textOver">{{info.address}}</view>
+    </view>
+    <view class="iconfont">
+        <image src="https://static.ticket.sz-trip.com/uploads/20250808/0faddf87d40d7bd782a6aab047f2046e.png"></image>
+        <view>导航</view>
+    </view>
+    
   </view>
   <view class="status-text{{info.garden_flag==0?' disable':''}}" wx:if="{{info.garden_flag_text && info.garden_flag!=1}}">{{info.garden_flag_text}}</view>
 </view>
 
+<view class="tab-info-container" wx:if="{{info}}">
+    <view class="tab-item {{showTabIndex==0?'active':''}}" bind:tap="changeTabIndex" data-value="0">预订</view>
+    <view class="tab-item {{showTabIndex==1?'active':''}}" bind:tap="changeTabIndex" data-value="1">评价/问答</view>
+    <view class="tab-item {{showTabIndex==2?'active':''}}" bind:tap="changeTabIndex" data-value="2">详情/政策</view>
+</view>
 
-<view class="sku-type-container" wx:if="{{info}}">
+<view class="sku-type-container" wx:if="{{info&&showTabIndex==0}}">
     <view class="left-type-container">
         <view class="sku-type {{activeIndex==index?'active':''}}" wx:for="{{info.product}}" 
             data-index="{{index}}" bindtap="changeMenu">
@@ -56,13 +74,13 @@
                     <view class="product-tag textOver" >{{sku.display_tags_str}}</view>
 
                     </view>
-                    <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
+                    <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">ⓘ预订须知></view>
                 </view>
                 <view class="product-right">
                     <view class="price">
                         <text>￥</text>
                         <text>{{sku.price?sku.price/100:0}}</text>
-                        <text wx:if="{{sku.is_merged}}">起</text>
+                        <!-- <text wx:if="{{sku.is_merged}}">起</text> -->
                     </view>
                     <!-- showOrder    selectDate  -->
                     <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
@@ -135,7 +153,22 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{30}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+      product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
+      
+      <view class="orderNotice" wx:if="{{orderSku}}">
+        <view style="font-weight: 500;font-size: 15px;color: #000000;">预订须知</view>
+        <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.content}}">
+            <view class="scroll-menu-item{{noticeIndex==0?' active':''}}"
+            bindtap="changeNoticeIndex" data-index="0" style="width: 276rpx;">预订须知</view>
+            <view class="scroll-menu-item{{noticeIndex==1?' active':''}}"
+            bindtap="changeNoticeIndex" data-index="1" style="width: 276rpx;">产品详情</view>
+        </view>
+        <rich-text wx:if="{{noticeIndex==0}}" class="detail" nodes="{{tool.formateRichText(orderSku.sku_model.bookinfo)}}"></rich-text>
+        <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.content)}}"></rich-text>
+        
+      </view>
+      <view style="height: 180rpx;"></view>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{showPrice/100}}</text>
@@ -185,39 +218,8 @@
     <view class="empty-btn">去提问</view>
   </view> -->
 
-
-
-<view class="box box-gb-20241216" wx:if="{{isTest==false}}">
-  <view class="box-top" style="border-bottom:1px solid #D9D9D9;">
-    <text class="iconfont icon-tiwen1"></text><text>问大家</text>
-  </view>
-  <view class="empty-box" wx:if="{{!ask || ask.length==0}}">
-    <view>这里空空如也，快去向大家提问吧!</view>
-    <navigator url="/pages/ask/index?id={{id}}" catchtap="pagePoint" data-event="scene_question" class="empty-btn">去提问
-    </navigator>
-  </view>
-  <view class="ask-list" wx:else>
-    <navigator url="/pages/ask/info/index?id={{item.id}}" catchtap="pagePoint" data-event="scene_comment" class="ask-item" wx:for="{{ask}}">
-      <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
-        <view class="ques">{{item.question_name}}</view>
-        <view class="ques-num" wx:if="{{item.answer.total!=0}}">{{item.answer.total}}个回答</view>
-        <view class="ques-num" wx:if="{{item.answer.total==0}}">暂无回答</view>
-      </view>
-      <!-- <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
-        <view class="ans">{{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}}</view>
-      </view>
-      <view class="ques-tip">
-        <view class="ques-time">{{item.created_time}}提问</view> -->
-      <!-- <view class="ans-number">全部{{item.answer && item.answer.total ? item.answer.total : 0}}个回答 <text class="iconfont icon-you"></text> </view> -->
-      <!-- </view> -->
-    </navigator>
-    <navigator style="border-top:1rpx solid #ccc" url="/pages/ask/index?id={{info.id}}" class="more-comment-btn">
-      查看全部问答<text class="iconfont icon-you"></text></navigator>
-  </view>
-</view>
-<view class="box box-gb-20241216">
+<view wx:if="{{showTabIndex==1}}">
+<view class="box box-gb-20241216" style="margin: 0;">
   <view class="box-top">
     <text class="iconfont icon-tiwen"></text><text>游客点评</text><text class="score" wx:if="{{info && commentTotal>0}}">{{info.rate}}分</text>
      <navigator url="/pages/list/comments/index?sceneid={{id}}"  style="display: inline;">  <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong; font-weight: bold;color: #000;">></text></text>
@@ -252,7 +254,54 @@
   <navigator url="/pages/list/comments/index?sceneid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">
     查看全部点评<text class="iconfont icon-you"></text></navigator>
 </view>
-<view style="height:140rpx"></view>
+<view class="box box-gb-20241216">
+  <view class="box-top" style="border-bottom:1px solid #D9D9D9;">
+    <text class="iconfont icon-tiwen1"></text><text>问大家</text>
+  </view>
+  <view class="empty-box" wx:if="{{!ask || ask.length==0}}">
+    <view>这里空空如也，快去向大家提问吧!</view>
+    <navigator url="/pages/ask/index?id={{id}}" catchtap="pagePoint" data-event="scene_question" class="empty-btn">去提问
+    </navigator>
+  </view>
+  <view class="ask-list" wx:else>
+    <navigator url="/pages/ask/info/index?id={{item.id}}" catchtap="pagePoint" data-event="scene_comment" class="ask-item" wx:for="{{ask}}">
+      <view class="item-ques">
+        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+        <view class="ques">{{item.question_name}}</view>
+        <view class="ques-num" wx:if="{{item.answer.total!=0}}">{{item.answer.total}}个回答</view>
+        <view class="ques-num" wx:if="{{item.answer.total==0}}">暂无回答</view>
+      </view>
+      <!-- <view class="item-ques">
+        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+        <view class="ans">{{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}}</view>
+      </view>
+      <view class="ques-tip">
+        <view class="ques-time">{{item.created_time}}提问</view> -->
+      <!-- <view class="ans-number">全部{{item.answer && item.answer.total ? item.answer.total : 0}}个回答 <text class="iconfont icon-you"></text> </view> -->
+      <!-- </view> -->
+    </navigator>
+    <navigator style="border-top:1rpx solid #ccc" url="/pages/ask/index?id={{info.id}}" class="more-comment-btn">
+      查看全部问答<text class="iconfont icon-you"></text></navigator>
+  </view>
+</view>
+</view>
+
+<view style="background:white" wx:if="{{showTabIndex==2}}">
+    <view class="scroll-menus">
+        <view class="scroll-menu-item{{menuType==0?' active':''}}" bindtap="changeMenu" data-index="0">景点介绍</view>
+        <view class="scroll-menu-item{{menuType==1?' active':''}}" bindtap="changeMenu" data-index="1">开放时间</view>
+        <view class="scroll-menu-item{{menuType==2?' active':''}}" bindtap="changeMenu" data-index="2">优待政策</view>
+    </view>
+    <view class="scroll-content" style="padding: 20rpx 33rpx;">
+        <view class="info-title">{{menuType==0?"景点介绍":menuType==1?"开放时间":"优待政策"}}</view>
+        <rich-text wx:if="{{menuType==0}}" class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
+		<rich-text wx:if="{{menuType==1}}" class="detail" nodes="{{tool.formateRichText(info.time_info)}}"></rich-text>
+		<rich-text wx:if="{{menuType==2}}" class="detail" nodes="{{tool.formateRichText(info.extra_info)}}"></rich-text>
+    </view>
+</view>
+
+
+<view style="height:160rpx"></view>
 <notice bookingInfo="{{bookingInfo}}" skuName="{{bookingInfoTitle}}" wx:if="{{bookingInfo}}" bind:close="closeMask">
 </notice>
 <view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 111d23f..24e6be0 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -24,8 +24,8 @@ page {
 }
 
 .top-info .title {
-  font-size: 32rpx;
-  font-weight: 500;
+  font-size: 37rpx;
+  font-weight: bold;
   color: #000;
 }
 
@@ -41,50 +41,61 @@ page {
 
 .tags-box .tag {
   position: relative;
-  line-height: 20rpx;
-  font-size: 20rpx;
-  font-weight: 500;
-  line-height: 50rpx;
+  font-weight: bold;
+  font-size: 21rpx;
+  color: #0B898E;
   margin-right: 10rpx;
+  padding: 6rpx 7rpx;
+  border-radius: 10rpx;
+border: 1px solid #0B898E;
 }
 
-.tags-box .tag .line {
-  content: "1";
-  display: block;
-  font-size: 0;
-  position: absolute;
-  left: 0;
-  right: 0;
-  background: #DAF3E9;
-  height: 8rpx;
-  top: 30rpx;
-  z-index: -1;
-}
-
-.tags-text {
-  flex: 1;
-  text-align: right;
-}
+.address-box {
+ display: flex;
+  margin-top: 20rpx;
+  height: 100rpx;
+  background: rgba(11, 137, 142, 0.06);
+  border-radius: 13rpx;
+  padding: 15rpx 13rpx;
+  box-sizing: border-box;
 
-.tags-box .iconfont {
-  margin-left: 4rpx;
-  font-size: 24rpx;
 }
-
-.address-box {
-  justify-content: space-between;
-  margin-top: 0;
+.address-text{
+    flex: 1;
+    width: 1rpx;
+    padding-right: 26rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
 }
-
 .info-address {
-  color: #666;
-  font-size: 27rpx;
-  margin-bottom: 0rpx;
-  line-height: 40rpx;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #000000;
 }
-
-.address-box .iconfont {
-  font-size: 34rpx;
+.sub-info-address{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+}
+.address-box .iconfont{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #0B898E;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
+}
+.address-box .iconfont image{
+    width: 33rpx;
+    height: 33rpx;
+}
+.address-box.true-address{
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250808/2f37b2d618091c22ed5d6a330fd742e4.png");
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
 }
 
 .box {
@@ -154,13 +165,17 @@ page {
 }
 
 .order-tip-text {
-  /* margin-top: 33rpx;
-  font-size: 24rpx;
-  color: #666; */
-  font-weight: 400;
-  font-size: 23rpx;
-  color: #0B898E;
+  font-weight: 500;
+font-size: 23rpx;
+color: #FFFFFF;
   margin-top: 18rpx;
+
+  width: 152rpx;
+height: 40rpx;
+border-radius: 4rpx;
+background: #0B898E;
+text-align: center;
+line-height: 40rpx;
 }
 
 .product-right {
@@ -198,7 +213,7 @@ page {
   width: 176rpx; */
   width: 93rpx;
   height: 80rpx;
-  background: #0B898E;
+  background: #D62828;
   border-radius: 13rpx;
   font-weight: 500;
   font-size: 31rpx;
@@ -299,7 +314,6 @@ page {
   color: #999;
   font-size: 27rpx;
   font-weight: 500;
-  margin-bottom:60rpx ;
 }
 
 .more-comment-btn .iconfont {
@@ -888,7 +902,7 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  position: absolute;
+  position: fixed;
     left: 0;
     right: 0;
     bottom: 0;
@@ -914,7 +928,7 @@ page {
     background: white;
     border-radius: 12rpx;
     overflow-y: auto;
-    height: 1100rpx;
+    height: 85vh;
 }
 .icon-close {
   position: absolute;
@@ -925,7 +939,7 @@ page {
 
 .sku-type-container{
     display: flex;
-    margin-top: 20rpx;
+    
 }
 .left-type-container{
     width: 147rpx;
@@ -958,4 +972,64 @@ page {
     background: #FFF;
     margin: 20rpx 0;
     padding:0 20rpx;
+}
+
+.tab-info-container{
+height: 100%;
+height: 93rpx;
+background: #ECF4F4;
+border-radius: 13rpx 13rpx 0rpx 0rpx;
+display: flex;
+margin-top: 20rpx;
+}
+.tab-info-container .tab-item{
+    flex: 1;
+    flex-shrink: 0;
+height: 93rpx;
+/* background: #FFFFFF; */
+border-radius: 13rpx 13rpx 0rpx 0rpx;
+font-weight: 500;
+font-size: 31rpx;
+color: #000000;
+text-align: center;
+line-height: 93rpx;
+}
+.tab-info-container .tab-item.active{
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #0B898E;
+    background: #FFFFFF;
+}
+
+
+.scroll-menus{
+    padding: 26rpx 33rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    
+}
+.scroll-menus .scroll-menu-item{
+    width: 200rpx;
+    height: 53rpx;
+    border-radius: 27rpx;
+    border: 1px solid #999999;
+    line-height: 53rpx;
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #666666;
+    text-align: center;
+}
+.scroll-menus .scroll-menu-item.active{
+    border: 1px solid #0B898E;
+    color: #0B898E;
+}
+.info-title {
+    font-size: 35rpx;
+    font-weight: bold;
+    color: #000;
+    margin-bottom: 30rpx;
+  }
+.orderNotice{
+    padding: 0 25rpx 0 35rpx;
 }
\ No newline at end of file
diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml
index 18b337e..d54e890 100644
--- a/pages/list/scene/index.wxml
+++ b/pages/list/scene/index.wxml
@@ -21,18 +21,18 @@
   <!-- <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view> -->
   <view class="right-info">
     <view class="title textOver2">{{item.title}}</view>
-    <view class="tags">
+    <view class="tags" style="width: 100%;">
       <view class="tag" wx:for="{{item.tags}}">{{item}}</view>
     </view>
     <!-- <view class="location textOver" style="width:432rpx"><text class="iconfont icon-location"></text>{{item.address}}</view> -->
     <view class="price-box">
-      <view style="width: 280rpx;display: flex;align-items: center;font-weight: 400;font-size: 24rpx;color: #999999;" class="textOver">
+      <view style="display: flex;align-items: center;font-weight: 400;font-size: 24rpx;color: #999999;" class="textOver">
         <text wx:if="{{item.distance}}">{{item.distance}}</text>
         <text wx:else></text>
-        <view style="width: 1rpx;height: 21rpx;background: #999999;flex-shrink: 0;margin: 0 12rpx;"></view>
-        <view class="location">{{item.address}}</view>
+        <view wx:if="{{item.distance}}" style="width: 1rpx;height: 21rpx;background: #999999;flex-shrink: 0;margin: 0 12rpx;"></view>
+        <view class="location textOver">{{item.address}}</view>
       </view>
-      <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
+      <!-- <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view> -->
     </view>
   </view>
 </view>
diff --git a/pages/list/scene/index.wxss b/pages/list/scene/index.wxss
index d645bf1..162a594 100644
--- a/pages/list/scene/index.wxss
+++ b/pages/list/scene/index.wxss
@@ -72,9 +72,7 @@
 }
 .tags {
   display: flex;
-  margin-top: 16rpx;
   align-items: center;
-  margin-bottom: 30rpx;
   width: 430rpx;
 }
 .tag {
@@ -179,7 +177,14 @@
 }
 
 .right-info {
-  padding: 10.67rpx 0 7.33rpx;
+  height: 186rpx;
+  padding: 0;
+  flex:1;
+  width: 100rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
 }
 
 .title-box,.title-header{
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 24ad21b..423c986 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -24,7 +24,11 @@ Component({
     endDays: {
         type: Number,
         value: 60
-    }
+    },
+    datePrice: {
+        type: Array,
+        value: []
+    },
   },
 
   /**
@@ -65,99 +69,23 @@ Component({
           isSzMuseum: true
         })
       }
-      let todayTimes = new Date(today.replace(/-/g,'/')).getTime()
+      let todayTimes = new Date(today.replace(/-/g,'/')).getTime();
       commonApi.user_post("token/check").then(res => {
         if (res&&res.code == 1) {
           // 获取价格日历
-          commonApi.user_post("product/product_date_price", {
-            start_date: today,
-            end_date: end_date,
-            sku_id: product.sku.id
-          }).then(res => {
-            for (let i = 0; i < res.data.length; i++) {
-              if(new Date(res.data[i].date.replace(/-/g,'/')).getTime()==todayTimes && (this.properties.isTeam || this.properties.product && this.properties.product.isTeam==1)){
-                // 如果是团队预约的场馆 并且是今天的话 不能预定
-                res.data[i].stock=0;
-                // res.data.price=100;
-                res.data[i].tipText = '不可定'
-              }
-            }
-            // 如果之前已经在详情页面选择了日期的话 默认日期不能是第一个有库存的日期了
-            if (app.globalData.product.infoDate) {
-              let dateIndex = res.data.slice(0, 3).findIndex(item => item.date == app.globalData.product.infoDate.date)
-              // if(!app.globalData.product.infoDate.short_date){
-              //   app.globalData.product.infoDate.short_date = app.globalData.product.infoDate.date.split("-").splice(1,2).join("-")
-              // }
-              this.setData({
-                activeDate: app.globalData.product.infoDate,
-                moreFlag: dateIndex != -1
-              })
-              this.getTimeStock()
-              this.triggerEvent("onChangeDate", app.globalData.product.infoDate)
-            }
-            else {
-              for (let i = 0; i < res.data.length; i++) {
-                if (res.data[i].stock > 0) {
-                  res.data[i].short_date = res.data[i].date.split("-").splice(1, 2).join("-")
-                  this.setData({
-                    activeDate: res.data[i]
-                  })
-                  this.getTimeStock()
-                  this.triggerEvent("onChangeDate", this.data.activeDate)
-                  break;
-                }
-              }
-            }
-            if (this.data.gpIdCom) {
-              // 拼团的话 价格日历无效 所有价格都是sku里面的event_price
-              res.data.map(item => {
-                item.price = product.sku.event_price
+          if (Array.isArray(this.properties.datePrice) && this.properties.datePrice.length>0) {
+              let param = {code: 1, data: this.properties.datePrice}
+            this.handleDatePrice(param, {todayTimes})
+          } else {
+            commonApi.user_post("product/product_date_price", {
+                start_date: today,
+                end_date: end_date,
+                sku_id: product.sku.id
+              }).then(res => {
+                this.handleDatePrice(res, {todayTimes})
               })
-            }
-
-            this.setData({
-              datelist: res.data
-            })
-            res.data.forEach(item=> {
-              item.short_date = item.date.split("-").splice(1, 2).join("-")
-              item.week = this.getDay(item.date)
-            })
-            let seldDate = ''
-            let leftIndex = 0;
-            if (app.globalData.product.changeFlag) {
-                if( app.globalData.product.date) {
-                    
-                    res.data.forEach((item,index)=> {
-                        if (item.date == app.globalData.product.date.date) {
-                            seldDate = item
-                            leftIndex = index
-                        }
-                    })
-                }
-
-                this.setData({
-                    scrollLeft: 70*leftIndex
-                })
-                setTimeout(() => {
-                    this.changeDate(seldDate)
-                })
-              // this.setData({
-              //   activeDate:seldDate
-              // })
-              // this.getTimeStock()
-            }
-            this.setData({
-              threeDays: res.data.slice(0, 3),
-              monthList: res.data, 
-              // monthList: res.data.slice(0, 30), 
-            })
-            console.log(this.data.monthList);
-            let index = this.data.threeDays.findIndex(item => item.date == this.data.activeDate.date)
-            console.log(this.data.activeDate);
-            this.setData({
-              moreFlag: index != -1
-            })
-          })
+          }
+          
         }
       })
 
@@ -178,6 +106,94 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    handleDatePrice:function (res, otherParam) {
+        let {todayTimes} = otherParam
+        for (let i = 0; i < res.data.length; i++) {
+            if(new Date(res.data[i].date.replace(/-/g,'/')).getTime()==todayTimes && 
+            (this.properties.isTeam || this.properties.product && this.properties.product.isTeam==1)){
+              // 如果是团队预约的场馆 并且是今天的话 不能预定
+              res.data[i].stock=0;
+              // res.data.price=100;
+              res.data[i].tipText = '不可定'
+            }
+          }
+          // 如果之前已经在详情页面选择了日期的话 默认日期不能是第一个有库存的日期了
+          if (app.globalData.product.infoDate) {
+            let dateIndex = res.data.slice(0, 3).findIndex(item => item.date == app.globalData.product.infoDate.date)
+            // if(!app.globalData.product.infoDate.short_date){
+            //   app.globalData.product.infoDate.short_date = app.globalData.product.infoDate.date.split("-").splice(1,2).join("-")
+            // }
+            this.setData({
+              activeDate: app.globalData.product.infoDate,
+              moreFlag: dateIndex != -1
+            })
+            this.getTimeStock()
+            this.triggerEvent("onChangeDate", app.globalData.product.infoDate)
+          }
+          else {
+            for (let i = 0; i < res.data.length; i++) {
+              if (res.data[i].stock > 0) {
+                res.data[i].short_date = res.data[i].date.split("-").splice(1, 2).join("-")
+                this.setData({
+                  activeDate: res.data[i]
+                })
+                this.getTimeStock()
+                this.triggerEvent("onChangeDate", this.data.activeDate)
+                break;
+              }
+            }
+          }
+          if (this.data.gpIdCom) {
+            // 拼团的话 价格日历无效 所有价格都是sku里面的event_price
+            res.data.map(item => {
+              item.price = product.sku.event_price
+            })
+          }
+
+          this.setData({
+            datelist: res.data
+          })
+          res.data.forEach(item=> {
+            item.short_date = item.date.split("-").splice(1, 2).join("-")
+            item.week = this.getDay(item.date)
+          })
+          let seldDate = ''
+          let leftIndex = 0;
+          if (app.globalData.product.changeFlag) {
+              if( app.globalData.product.date) {
+                  
+                  res.data.forEach((item,index)=> {
+                      if (item.date == app.globalData.product.date.date) {
+                          seldDate = item
+                          leftIndex = index
+                      }
+                  })
+              }
+
+              this.setData({
+                  scrollLeft: 70*leftIndex
+              })
+              setTimeout(() => {
+                  this.changeDate(seldDate)
+              })
+            // this.setData({
+            //   activeDate:seldDate
+            // })
+            // this.getTimeStock()
+          }
+          this.setData({
+            threeDays: res.data.slice(0, 3),
+            monthList: res.data, 
+            // monthList: res.data.slice(0, 30), 
+          })
+          console.log(this.data.monthList);
+          let index = this.data.threeDays.findIndex(item => item.date == this.data.activeDate.date)
+          console.log(this.data.activeDate);
+          this.setData({
+            moreFlag: index != -1
+          })
+    },
+
     getDay: function (date) {
       let d = new Date(date.replace(/-/g, '/')).getDay();
       let days = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];

From 77e12e4667687f18dbdd8c60073be871ec2bfcc2 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 12 Aug 2025 14:25:30 +0800
Subject: [PATCH 371/471] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/newCalendar/index.wxss |  6 ++++--
 pages/list/activitynew/index.wxss      | 15 +++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app.js b/app.js
index 9f3fb65..86f90fb 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest105? true : false;
+            data.isTest = data.isTest109? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index 65cdd95..204501b 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -1,6 +1,7 @@
 /* components/xx-calendar/xx-calendar.wxss */
 page{
-    background: #F0B643;
+    /* background: #F0B643; */
+    background: #F2F2F2;
 }
 /* 头部样式start */
 .title-wrap{
@@ -21,7 +22,7 @@ page{
     width: 100%;
     /* height: 65.67rpx; */
     height: 256.67rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/58fee5695a0b676a14e8157b809ba1d6.png");
+    /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/58fee5695a0b676a14e8157b809ba1d6.png"); */
     box-sizing: border-box;
 }
 .change-date{
@@ -205,4 +206,5 @@ page{
     right: 0;
     width: 290.13rpx;
     height: 146rpx;
+    display: none;
 }
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 1b79993..3aa9a67 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -128,7 +128,7 @@ background: rgba(11, 137, 142, .1);
   border-radius: 20rpx 20rpx 0 0;
   margin-top: 20rpx;
   position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/63b9ec7a1192790eed3e5dcf915212c0.png");
+  /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/63b9ec7a1192790eed3e5dcf915212c0.png"); */
   background-size: 100% 100%;
 }
 .activity-list {
@@ -327,7 +327,6 @@ background: rgba(11, 137, 142, .1);
   color: #0B898E;
   /* 节假日花样 */
   /* color: #DE4126; */
-  color: #DE4126;
 }
 .new-top-search-box {
   display: flex;
@@ -356,7 +355,7 @@ flex-shrink: 0;
     
 }
 .types-item {
-    /* border: 1px solid #999999; */
+    border: 1px solid #999999;
     border-radius: 27rpx;
     height: 53rpx;
     padding: 0 25rpx;
@@ -364,7 +363,7 @@ flex-shrink: 0;
     line-height: 53rpx;
     margin-right: 13rpx;
     flex-shrink: 0;
-    border: 1px solid #FFC987;
+    /* border: 1px solid #FFC987; */
 }
 .types-item-active {
   /* padding: 0 79rpx; */
@@ -374,7 +373,7 @@ flex-shrink: 0;
   /* height: 91.33rpx; */
   line-height: 57rpx;
   display: inline-block;
-  /* background: #0B898E; */
+  background: #0B898E;
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
@@ -384,15 +383,15 @@ flex-shrink: 0;
   background-size: 100% 100%;
   /* margin-top: -15rpx; */
     text-align: center;
-    min-width: 177.33rpx;
+    /* min-width: 177.33rpx; */
     box-sizing: border-box;
-    color: #DA4939;
+    /* color: #DA4939;
     text-shadow: 
                 -1px -1px 0 white,  
                 1px -1px 0 white,
                 -1px 1px 0 white,
                 1px 1px 0 white;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/48ce52adb4044d6b91bbce05047695a5.png");
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/48ce52adb4044d6b91bbce05047695a5.png"); */
 }
 /* 不显示滚动条 */
 .types-box::-webkit-scrollbar {

From c5e2c9864b9500e9bd0fe41e96baedcb88a87c34 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 15 Aug 2025 10:24:21 +0800
Subject: [PATCH 372/471] =?UTF-8?q?webview=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                               |  2 +-
 pages/index/index.wxss               |  4 +++-
 pages/info/sceneProductInfo/index.js |  2 +-
 pages/pbService/index.wxml           |  6 ++++++
 pages/pbService/web/index.js         | 21 ++++++++++++++++++---
 project.private.config.json          |  7 +++++++
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 86f90fb..2bb51bc 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest109? true : false;
+            data.isTest = data.isTest111? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index ecd979b..018081a 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -426,9 +426,11 @@
   margin-bottom: 40rpx;
 }
 .pbservice {
-  width: calc(186rpx * 7);
+  /* width: calc(186rpx * 7); */
   display: flex;
   flex-wrap: wrap;
+  flex-direction: column;
+  height: 350rpx;
 }
 .pbservice-item {
   /* 元旦修改 截止到注释的width*/
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 0bedfef..b3a1027 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -1005,7 +1005,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post('cart/get_list', {}).then(res => {
+    commonApi.user_post('cart/get_list', {noLogin: true}).then(res => {
       this.setData({
         cartCount: res.data.length //1
       })
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index d1137ca..34a9eb6 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -60,6 +60,12 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
       <view>12348</view>
     </view>
+    <view bindtap="gotoUrl"  data-title="文化场馆查询" data-url="https://m.cloud.sz-trip.com/Museum" class="pb-item">
+      <image src="https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png" mode="widthFix"></image>
+      <view>文化场馆查询</view>
+    </view>
+
+    
   </view>
 </view>
 <image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 7b848f7..64848c4 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -24,7 +24,9 @@ Page({
     console.log('weburl',weburl)
     // 获取路径参数
     let webParam = {}
+    let baseUrl = ""
     try {
+        baseUrl = weburl.split('?')[0]
         let paramStr = weburl.split('?')[1]
         if (paramStr) {
             paramStr.split('&').forEach((param) => {
@@ -37,6 +39,7 @@ Page({
         console.log(e)
     }
     console.log(webParam)
+ 
     let lowerUrl = weburl.toLowerCase()
     // 宠你有礼 市民卡授权
     if (lowerUrl.indexOf('petyou2024') && webParam.cnylCode) {
@@ -78,6 +81,19 @@ Page({
     }
     // 君到苏州 加token
     else if(lowerUrl.indexOf('m.cloud.sz-trip.com')!=-1) {
+        delete webParam.token
+        delete webParam.lon
+        delete webParam.lat
+        weburl = baseUrl
+
+        if(Object.keys(webParam).length>0) {
+            const newParamsArray = [];
+            for (let key in webParam) {
+                newParamsArray.push(`${key}=${(webParam[key])}`);
+            }
+            weburl = `${baseUrl}?${newParamsArray.join('&')}`;
+        }
+
         let token = wx.getStorageSync('jstrip_token')
         if (token) {
             if (Object.keys(webParam).length>0) {
@@ -119,9 +135,7 @@ Page({
         } catch(e) {
             this.setUrl(weburl)
         }
-        // this.setData({
-        //     webUrl:weburl
-        // })
+        // this.setUrl(weburl)
     } else {
         // this.setData({
         //     webUrl:weburl
@@ -186,6 +200,7 @@ Page({
   },
 
   setUrl (url) {
+      console.log(url)
       let that = this
       if (this.data.canSetData) {
           this.data.canSetData = false
diff --git a/project.private.config.json b/project.private.config.json
index 6275b78..3034e43 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FmeetingLotus2025%253Ftoken%253D180c8775-e37f-4f91-a638-1d7f90069c52%2526lon%253D120.63327853732639%2526lat%253D31.26709312760416",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",

From 3b5ee7c0967d087e54c4529c0ae84decc24755f3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 18 Aug 2025 11:28:10 +0800
Subject: [PATCH 373/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 2bb51bc..aecfde0 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest111? true : false;
+            data.isTest = data.isTest112? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From 8b025eb6d58fc9a6cd25ceb90ab80a2a4df232cf Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 21 Aug 2025 15:26:12 +0800
Subject: [PATCH 374/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js   |  2 +-
 pages/info/postProductInfo/index.wxml |  5 +-
 pages/info/postProductInfo/index.wxss |  5 +-
 pages/info/sceneProductInfo/index.js  | 17 ++++++
 project.private.config.json           |  7 +++
 utils/util.js                         | 74 +++++++++++++++++++++++++++
 6 files changed, 104 insertions(+), 6 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index f320a6e..b7d518b 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -11,7 +11,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        autoPlay: true,
+        autoPlay: false,
         fixed: false,
         type: 1,
         top: 0,
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7f02116..c852edb 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -3,10 +3,11 @@
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
 <image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
-<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
+<swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
   <block wx:if="{{info.videourl}}" wx:key="*this">
     <swiper-item>
-      <video bindplay="playVideo" src="{{info.videourl}}" controls></video>
+      <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+       	 play-btn-position="center" enable-play-gesture="{{true}}"></video>
       <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
     </swiper-item>
   </block>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index ff73fe6..89f1a60 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -5,12 +5,12 @@ page {
 
 .swiper {
   width: 100%;
-  height: 420rpx;
+  height: 750rpx;
 }
 
 .swiper image,
 .swiper video {
-  height: 420rpx;
+  height: 750rpx;
   display: block;
   width: 100%;
 }
@@ -20,7 +20,6 @@ page {
   background: white;
   position: relative;
   z-index: 1;
-  margin-top: -20rpx;
   padding: 20rpx 40rpx;
 }
 
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 38c3acb..b82804d 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -826,6 +826,12 @@ Page({
     }
     console.log(app.globalData.product);
     console.log(ticket_type);
+
+    // todo 判断是否组合产品
+    // this.getComposeSku()
+    // return
+
+
     if (ticket_type != 2) {
         let today = util.formatDate(new Date()), 
         end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000));
@@ -1029,6 +1035,17 @@ Page({
     })
   },
 
+  // 组合产品获取购买的sku
+  getComposeSku () {
+    commonApi.user_post("product/get_sku_compose_list", {
+        sku_id: "190720"
+    }).then(res => {
+        if (res&&Array.isArray(res.data)&&res.data.length>0) {
+            util.orderByShoppingCart(res.data,app)
+        }
+    })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/project.private.config.json b/project.private.config.json
index 3034e43..b247163 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=108419",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
diff --git a/utils/util.js b/utils/util.js
index 80d287f..1609034 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -561,6 +561,79 @@ const detailPagePoint = function (url, res) {
 
 }
 
+// app 要传进来 util 获取不到
+const orderByShoppingCart = function (listData, app) {
+    let productType,flag,isCar;
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/user/cartlist/list',
+        title: '购物车',
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            app.globalData.couponInfo = null;
+            let list = listData, product = [], product1 = []
+            list.map(item => {
+                // item.product.type="post";
+                if (item.product.type == 'post') {
+                    product.push({
+                        product: item.product,
+                        sku: item.sku,
+                        productNum: item.num
+                    })
+                } else {
+                    product1.push(item)
+                    app.globalData.list = product1
+                }
+                if (item.product.type.includes('post')) {
+                    productType = 'post'
+                }
+            })
+            if (product.length == 0 && product1.length == 0) {
+                wx.showToast({
+                    title: '请先选择产品',
+                    icon: 'none'
+                })
+                return;
+            }
+            if (product.length > 0 && product1.length > 0) {
+                flag = "mix";
+                isCar = "multiple"
+            }
+            if (product1.length > 1) {
+                isCar = "multiple"
+            } else {
+                isCar = "single"
+            }
+            console.log(product1,'product1');
+
+            app.globalData.listName = null
+            if (product1.length>0) {
+                app.globalData.listName = 'car'
+            }
+
+            app.globalData.postProduct = product;
+            if (app.globalData.list) {
+                app.globalData.index = 0
+                app.globalData.product = app.globalData.list[app.globalData.index]
+            }
+            if (productType == 'post') {
+                wx.navigateTo({
+                    url: '/pages/order/postOrder/index?from=cart&flag=' + flag,
+                })
+            } else {
+                wx.navigateTo({
+                    url: '/subPackages/gwcOrder/index?isCar=' + isCar,
+                })
+            }
+        }
+    })
+}
+
 
 module.exports = {
   formatTime: formatTime,
@@ -586,4 +659,5 @@ module.exports = {
   getGlobalPagePoint: getGlobalPagePoint,
   clearGlobalPagePoint: clearGlobalPagePoint,
   detailPagePoint: detailPagePoint,
+  orderByShoppingCart: orderByShoppingCart,
 }

From 0122c6e08c957899ccad67dbb7ead8aa02f865ec Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 21 Aug 2025 16:10:10 +0800
Subject: [PATCH 375/471] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ask/index.wxml             | 2 +-
 pages/ask/my/index.wxml          | 4 ++++
 pages/order/postOrder/index.wxml | 5 +++--
 pages/user/profile/index.wxml    | 4 ++--
 pages/user/user.js               | 4 ++--
 pages/user/user.wxml             | 8 +++-----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pages/ask/index.wxml b/pages/ask/index.wxml
index f9256e6..51950ae 100644
--- a/pages/ask/index.wxml
+++ b/pages/ask/index.wxml
@@ -21,6 +21,6 @@
 </navigator>
 <view class="fixed-bottom-blank"></view>
 <view class="fixed-bottom">
-  <input type="text" bindinput="inputQues" placeholder="请输入5-50字的问题"></input>
+  <input value="{{ques}}" type="text" bindinput="inputQues" placeholder="请输入5-50字的问题"></input>
   <view class="btn" bindtap="question">提问</view>
 </view>
diff --git a/pages/ask/my/index.wxml b/pages/ask/my/index.wxml
index f21c886..b64c779 100644
--- a/pages/ask/my/index.wxml
+++ b/pages/ask/my/index.wxml
@@ -23,4 +23,8 @@
       <!-- <view class="ans-number">全部{{item.answers.total}}个回答 <text class="iconfont icon-you"></text> </view> -->
     </view>
   </navigator>
+</view>
+
+<view style="text-align: center;padding-top: 40rpx;" wx:if="{{list.length<=0}}">
+    暂无数据
 </view>
\ No newline at end of file
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 769e0a5..d6949c5 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -25,7 +25,7 @@
     <view class="number-box">{{item.productNum}}</view>
     <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
   </view>
-  <view class="box-title" style="height:auto;min-height:126rpx;position: relative;">
+  <view class="box-title" style="height:auto;min-height:126rpx;position: relative;" wx:if="{{item.sku.is_batch_shipment}}">
     <view style="flex:1;white-space:nowrap;margin-right:20rpx;">收货方式</view>
     <view class="batch-view">
         <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">
@@ -47,7 +47,8 @@
   <view class="box-title" style="height:auto;min-height:113rpx;">
     <view style="flex:1;white-space:nowrap;margin-right:20rpx;">运费</view>
     <view style="display: flex;">
-        <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text>
+        <!-- <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text> -->
+        <text>{{item.postFee?("￥"+(item.postFee/100)):"包邮"}}</text>
         <view wx:if="{{item.postFee>0 && item.sku.batch_shipment==1}}">
             <text style="padding-left: 10rpx;">x{{item.sku.batch_count}}</text>
             <text style="padding-left: 40rpx;">￥{{(item.postFee/100)*item.sku.batch_count}}</text>
diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml
index 4883063..fa56cfa 100644
--- a/pages/user/profile/index.wxml
+++ b/pages/user/profile/index.wxml
@@ -16,11 +16,11 @@
   <view style="font-size:30rpx" class="info">{{info.nickname}}</view>
   <view class="iconfont icon-you"></view>
 </navigator>
-<navigator url="../email/index" class="profile-item" wx:if="{{info}}">
+<!-- <navigator url="../email/index" class="profile-item" wx:if="{{info}}">
   <text>邮箱</text>
   <view class="info">{{info.email}}</view>
   <view class="iconfont icon-you"></view>
-</navigator>
+</navigator> -->
 <navigator url="../bindtel/index" class="profile-item" wx:if="{{info}}">
   <text>手机号</text>
   <view class="info">{{info.mobile?info.mobile:''}}</view>
diff --git a/pages/user/user.js b/pages/user/user.js
index e5497a5..2986d71 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -30,8 +30,8 @@ Page({
     })
   },
   supplier:function(){
-    let url = "https://m.cloud.sz-trip.com/Audit"
-    app.globalData.weburl = "https://m.cloud.sz-trip.com/Audit"
+    let url = "https://m.cloud.sz-trip.com/ShoppingUnit"
+    app.globalData.weburl = "https://m.cloud.sz-trip.com/ShoppingUnit"
     wx.navigateTo({
       url: '/pages/pbService/web/index?weburl='+ encodeURIComponent(url)
     })
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 7f294a4..f071022 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -63,9 +63,9 @@
       购物车
     </navigator>
 
-    <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
+    <!-- <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
       团体预约订单
-    </navigator>
+    </navigator> -->
     <navigator url="videoCoupon/index" class="user-box-line">
     		中奖记录
     </navigator>
@@ -81,9 +81,7 @@
     <navigator url="likes/index" class="user-box-line" catchtap="pagePoint" data-event="mine_collection">
       我的收藏
     </navigator>
-    <view bindtap="supplier" class="user-box-line">
-    商户审核
-    </view>
+    <view bindtap="supplier" class="user-box-line">商户入驻</view>
     <!-- <navigator url="/pages/group/mine/index" class="user-box-line">
     我的团购
     </navigator>

From c5daac22a28484ffa105e0b8da231d370778cf0d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 21 Aug 2025 16:18:44 +0800
Subject: [PATCH 376/471] fix

---
 pages/info/sceneProductInfo/index.js   |  3 +--
 pages/info/sceneProductInfo/index.wxml | 12 ++++++------
 pages/info/sceneProductInfo/index.wxss |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 38c3acb..357c02e 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -897,7 +897,6 @@ Page({
   changeMenu: function (e) {
         let index = e.currentTarget.dataset.index,
             that = this;
-
         if (Array.isArray(this.data.skuDoms) && this.data.skuDoms.length>0) {
             console.log('进入暂存数据')
             try {
@@ -1010,7 +1009,7 @@ Page({
         showTabIndex:value
     })
   },
-  changeMenu: function (e) {
+  changePopMenu: function (e) {
     let value = e.currentTarget.dataset.index
     this.setData({
         menuType:value
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index bbe5b07..70ed99d 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -157,15 +157,15 @@
       product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
       
       <view class="orderNotice" wx:if="{{orderSku}}">
-        <view style="font-weight: 500;font-size: 15px;color: #000000;">预订须知</view>
-        <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.content}}">
+        <view style="font-weight: 500;font-size: 15px;color: #000000;margin-bottom: 26rpx;">预订须知</view>
+        <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.product_detail}}">
             <view class="scroll-menu-item{{noticeIndex==0?' active':''}}"
             bindtap="changeNoticeIndex" data-index="0" style="width: 276rpx;">预订须知</view>
             <view class="scroll-menu-item{{noticeIndex==1?' active':''}}"
             bindtap="changeNoticeIndex" data-index="1" style="width: 276rpx;">产品详情</view>
         </view>
         <rich-text wx:if="{{noticeIndex==0}}" class="detail" nodes="{{tool.formateRichText(orderSku.sku_model.bookinfo)}}"></rich-text>
-        <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.content)}}"></rich-text>
+        <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.product_detail)}}"></rich-text>
         
       </view>
       <view style="height: 180rpx;"></view>
@@ -288,9 +288,9 @@
 
 <view style="background:white" wx:if="{{showTabIndex==2}}">
     <view class="scroll-menus">
-        <view class="scroll-menu-item{{menuType==0?' active':''}}" bindtap="changeMenu" data-index="0">景点介绍</view>
-        <view class="scroll-menu-item{{menuType==1?' active':''}}" bindtap="changeMenu" data-index="1">开放时间</view>
-        <view class="scroll-menu-item{{menuType==2?' active':''}}" bindtap="changeMenu" data-index="2">优待政策</view>
+        <view class="scroll-menu-item{{menuType==0?' active':''}}" bindtap="changePopMenu" data-index="0">景点介绍</view>
+        <view class="scroll-menu-item{{menuType==1?' active':''}}" bindtap="changePopMenu" data-index="1">开放时间</view>
+        <view class="scroll-menu-item{{menuType==2?' active':''}}" bindtap="changePopMenu" data-index="2">优待政策</view>
     </view>
     <view class="scroll-content" style="padding: 20rpx 33rpx;">
         <view class="info-title">{{menuType==0?"景点介绍":menuType==1?"开放时间":"优待政策"}}</view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 24e6be0..6e92015 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -1003,7 +1003,7 @@ line-height: 93rpx;
 
 
 .scroll-menus{
-    padding: 26rpx 33rpx;
+    padding: 0rpx 33rpx 26rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;

From d565630f95eccc7aadb5e1fe319dd48e8a37de4f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 21 Aug 2025 17:19:29 +0800
Subject: [PATCH 377/471] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E4=B8=80=E9=81=8Duserinfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                      |  2 +-
 pages/order/pay/index.js    | 12 ++++++++++++
 project.private.config.json |  7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index aecfde0..9346f28 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest112? true : false;
+            data.isTest = data.isTest113? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index a278f65..af07a1f 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -64,8 +64,20 @@ Page({
     this.setData({
       id:options.id
     })
+    this.getUserInfo()
     
   },
+
+  getUserInfo () {
+    commonApi.user_post("uservice/user/getMyInfo",{}).then(res => {
+        if (res && res.data) {
+            wx.setStorageSync('jstrip_userid', res.data.id)
+            wx.setStorageSync('jstrip_token', res.data.token)
+            wx.setStorageSync('jstrip_userInfo', res.data)
+        }
+    })
+  },
+
   daojishi:function(time){
     let now = new Date().getTime();
     if(now>time){
diff --git a/project.private.config.json b/project.private.config.json
index 3034e43..5822978 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/order/pay/index",
+          "pathName": "pages/order/pay/index",
+          "query": "id=28182508211650158717&token=de4306f5-7f80-4a0f-a7ae-af63cf089fa4",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",

From 3416b87d42c157f71c8d0b8fc4f5a9e4367a03a3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 22 Aug 2025 10:36:25 +0800
Subject: [PATCH 378/471] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/roadInfo/index.js   |  51 ++++++++++-
 pages/info/roadInfo/index.wxml |  36 +++++++-
 pages/info/roadInfo/index.wxss | 152 ++++++++++++++++++++++++++++++++-
 utils/util.js                  |  74 ++++++++++++++++
 4 files changed, 310 insertions(+), 3 deletions(-)

diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 212fa51..1fab188 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -23,7 +23,11 @@ Page({
         showShareFlag: false,
         showQrCode: false,
         wxqrcode: null,
-        ZTPoint:''
+        ZTPoint:'',
+
+        skuIndex: 0,
+        skuFlag: false,
+        producNum: 1,
     },
 
     /**
@@ -159,6 +163,15 @@ Page({
 
     },
     order: function () {
+        // todo 判断组合产品
+        // if (this.data.info.is_compose == 1) {
+        // if (true) {
+        //     // 打开规格弹窗
+        //     this.setData({skuFlag: true})
+        //     return
+        // }
+
+
         commonApi.user_post('wx/get_user_keep', {
             jumpurl: '/pages/info/roadInfo/index?id=' + this.data.id,
             title: this.data.info.title,
@@ -196,6 +209,21 @@ Page({
 
 
     },
+
+    // 组合产品获取购买的sku
+    getComposeSku () {
+        commonApi.user_post("product/get_sku_compose_list", {
+            sku_id: "190720"
+        }).then(res => {
+            if (res&&Array.isArray(res.data)&&res.data.length>0) {
+                res.data.forEach(v => {
+                    v.sku.is_compose = 1
+                });
+                util.orderByShoppingCart(res.data,app)
+            }
+        })
+    },
+
     pagePoint: function (e) {
         util.pagePoint(e)
     },
@@ -467,6 +495,27 @@ Page({
         }
     },
 
+
+    setSimpleValue: function (e) {
+        let keyname = e.currentTarget.dataset.keyname
+        let val = e.currentTarget.dataset.val
+        let param = {}
+        param[keyname] = val
+        this.setData(param)
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index bfc2df6..7e1118c 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -120,4 +120,38 @@
   </view>
 </view>
 <code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
-</code>
\ No newline at end of file
+</code>
+
+
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="setSimpleValue" data-keyname="skuFlag" data-value="{{false}}"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="setSimpleValue" data-keyname="skuFlag" data-value="{{false}}"></view>
+    <view class="sku-info-box">
+      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view class="sku-price">{{info.sku[skuIndex].price/100}}
+          <!-- <view class="allowance" wx:if="{{allowance_data}}">
+            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view> -->
+        </view>
+        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+      </view>
+    </view>
+    <view class="sku-names">
+      <view bindtap="setSimpleValue" data-keyname="skuIndex" data-value="{{index}}"
+      class="sku-name-item textOver{{index==skuIndex?' active':''}}" 
+      wx:for="{{info.sku}}">{{item.sku_name}}</view>
+    </view>
+    <view class="number-box">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select" bindtap="add"></view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="getComposeSku" wx:if="{{info.sku[skuIndex].flag=='on'}}">立即购买</view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.wxss b/pages/info/roadInfo/index.wxss
index 991d6dd..32680b5 100644
--- a/pages/info/roadInfo/index.wxss
+++ b/pages/info/roadInfo/index.wxss
@@ -441,4 +441,154 @@ page {
   font-size: 31rpx;
   font-weight: 500;
   margin-top: 50rpx;
-}
\ No newline at end of file
+}
+
+
+
+
+.sku-info-box {
+    margin: 50rpx 40rpx;
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .sku-info-box image {
+    width: 218rpx;
+    height: 180rpx;
+    border-radius: 13rpx;
+    display: block;
+    margin-right: 40rpx;
+    flex-shrink: 0;
+  }
+  
+  .sku-info {
+    flex: 1;
+  }
+  
+  .sku-price {
+    font-size: 40rpx;
+    font-weight: 500;
+    color: #D62828;
+    margin: 20rpx 0;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  
+  .sku-price::before {
+    content: "￥";
+    font-weight: 400;
+    font-size: 27rpx;
+    vertical-align: baseline;
+  }
+  
+  .sku-price view {
+    font-size: 24rpx;
+    color: #FFFFFF;
+    background-color: #D62828;
+    border-radius: 22rpx;
+    line-height: 44rpx;
+    margin-left: 7rpx;
+    padding: 0 20rpx;
+  }
+  
+  .sku-name {
+    font-size: 27rpx;
+    color: #666666;
+  }
+  
+  .sku-names {
+    display: flex;
+    font-size: 29rpx;
+    color: #333;
+    margin: 0 40rpx;
+    text-align: center;
+    flex-wrap: wrap;
+    margin-bottom: 20rpx;
+    justify-content: space-between;
+  }
+  
+  .sku-name-item {
+    background: #EFEFEF;
+    border: 1rpx solid #EFEFEF;
+    /* width: 318rpx; */
+    line-height: 77rpx;
+    border-radius: 14rpx;
+    margin-bottom: 25rpx;
+    margin-right: 30rpx;
+    max-width: 100%;
+    padding: 0 15rpx;
+    min-width: 270rpx;
+  }
+  
+  .sku-name-item:nth-child(2n) {
+    margin-right: 0;
+  }
+  
+  .sku-name-item.active {
+    color: #0B898E;
+    border-color: #0B898E;
+    background: rgba(11, 137, 142, 0.1);
+  }
+  
+  .number-box {
+    display: flex;
+    align-items: center;
+    border-top: 1rpx solid #ccc;
+    justify-content: space-between;
+    margin: 0 40rpx;
+    padding: 40rpx 0;
+  }
+  
+  .number-box text {
+    flex: 1;
+    font-size: 29rpx;
+    color: #333;
+  }
+  
+  .number-box view {
+    border: 1rpx solid #666;
+    border-radius: 7rpx;
+    text-align: center;
+    width: 67rpx;
+    line-height: 67rpx;
+    font-size: 33rpx;
+    color: #000;
+  }
+  
+  .number-box view.disable {
+    border-color: #ccc;
+    color: #999;
+  }
+  
+  .number-box view.number {
+    width: 94rpx;
+    margin: 0 15rpx;
+  }
+  
+  .btn-box {
+    height: 138rpx;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+  .mask-btn {
+    width: 670rpx;
+    line-height: 78rpx;
+    background: #D62828;
+    border-radius: 39rpx;
+    color: #fff;
+    text-align: center;
+    font-size: 33rpx;
+    font-weight: 500;
+  }
+  
+  .mask-btn.disable {
+    background: #ccc;
+  }
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 80d287f..1609034 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -561,6 +561,79 @@ const detailPagePoint = function (url, res) {
 
 }
 
+// app 要传进来 util 获取不到
+const orderByShoppingCart = function (listData, app) {
+    let productType,flag,isCar;
+    commonApi.user_post('wx/get_user_keep', {
+        jumpurl: '/pages/user/cartlist/list',
+        title: '购物车',
+        type: 'mini'
+    }).then(res => {
+        if (res.data.subscribe == 0) {
+            this.setData({
+                wxqrcode: res.data.qrcode,
+                showQrCode: true
+            })
+        } else {
+            app.globalData.couponInfo = null;
+            let list = listData, product = [], product1 = []
+            list.map(item => {
+                // item.product.type="post";
+                if (item.product.type == 'post') {
+                    product.push({
+                        product: item.product,
+                        sku: item.sku,
+                        productNum: item.num
+                    })
+                } else {
+                    product1.push(item)
+                    app.globalData.list = product1
+                }
+                if (item.product.type.includes('post')) {
+                    productType = 'post'
+                }
+            })
+            if (product.length == 0 && product1.length == 0) {
+                wx.showToast({
+                    title: '请先选择产品',
+                    icon: 'none'
+                })
+                return;
+            }
+            if (product.length > 0 && product1.length > 0) {
+                flag = "mix";
+                isCar = "multiple"
+            }
+            if (product1.length > 1) {
+                isCar = "multiple"
+            } else {
+                isCar = "single"
+            }
+            console.log(product1,'product1');
+
+            app.globalData.listName = null
+            if (product1.length>0) {
+                app.globalData.listName = 'car'
+            }
+
+            app.globalData.postProduct = product;
+            if (app.globalData.list) {
+                app.globalData.index = 0
+                app.globalData.product = app.globalData.list[app.globalData.index]
+            }
+            if (productType == 'post') {
+                wx.navigateTo({
+                    url: '/pages/order/postOrder/index?from=cart&flag=' + flag,
+                })
+            } else {
+                wx.navigateTo({
+                    url: '/subPackages/gwcOrder/index?isCar=' + isCar,
+                })
+            }
+        }
+    })
+}
+
 
 module.exports = {
   formatTime: formatTime,
@@ -586,4 +659,5 @@ module.exports = {
   getGlobalPagePoint: getGlobalPagePoint,
   clearGlobalPagePoint: clearGlobalPagePoint,
   detailPagePoint: detailPagePoint,
+  orderByShoppingCart: orderByShoppingCart,
 }

From f0f9b0e8fdcbbd637faa4d6ea9ae3c970620fe80 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 22 Aug 2025 15:32:37 +0800
Subject: [PATCH 379/471] =?UTF-8?q?=E9=82=AE=E5=AF=84=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E3=80=81=E7=BB=84=E5=90=88=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.wxml |  46 ++++++-----
 pages/info/postProductInfo/index.wxss | 108 ++++++++++----------------
 pages/info/roadInfo/index.js          |  16 ++--
 pages/info/sceneProductInfo/index.js  |  15 ----
 pages/order/scene/index.wxml          |   6 +-
 project.config.json                   |  23 +-----
 subPackages/gwcOrder/index.wxml       |   4 +-
 utils/util.js                         |   1 +
 8 files changed, 85 insertions(+), 134 deletions(-)

diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index c852edb..b074660 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,12 +2,21 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
+<view class="swiper-bottom">
+    <view class="swiper-bottom-item active">1/2</view>
+    <view class="swiper-bottom-item">视频</view>
+    <view class="swiper-bottom-item">图片</view>
+    <view class="swiper-bottom-item">款式</view>
+</view>
+
+
 <image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
   <block wx:if="{{info.videourl}}" wx:key="*this">
     <swiper-item>
       <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
-       	 play-btn-position="center" enable-play-gesture="{{true}}"></video>
+       	show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+        show-progress="{{false}}"></video>
       <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
     </swiper-item>
   </block>
@@ -25,14 +34,16 @@
 
 <view wx:if="{{info}}">
     <!-- 酒景套餐 -->
-    <view class="top-info" style="padding: 0;" wx:if="{{info.is_package===1}}">
-        <div class="wineScene-price-container" >
-            <div class="wineSecne-price">{{info.price/100}}<span class="wineSecne-money">￥{{info.market_price/100}}</span></div>
-            <div>已售{{info.sales_number||0}}份</div>
-        </div>
-        <view style="padding: 26rpx 26rpx 0;">
-            <view class="title" style="font-weight: bold;">{{info.title}}</view>
-            <view class="hotel-custom" style="padding:26rpx 0">
+    <view class="top-info" style="padding: 0;" >
+        <view class="wineScene-price-container" >
+            <view class="wineSecne-price">{{info.price/100}}<text class="wineSecne-money">优惠前￥{{info.market_price/100}}</text></view>
+            <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
+        </view>
+        <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
+            <view class="flex"></view>
+
+            <view class="title textOver2">{{info.title}}</view>
+            <!-- <view class="hotel-custom" style="padding:26rpx 0">
                 <view class="hotel-custom-detail" wx:for="{{info.product_data}}" wx:key="item">
                     <view class="tip-info">
                         <view class="tip">{{index}}</view>
@@ -48,10 +59,15 @@
                     </view>
                 </view>
 
+            </view> -->
+            
+            <view class="tags-box textOver">
+                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
             </view>
         </view>
 
-        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;" bindtap="gotolocation">
+        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;"
+            bindtap="gotolocation" wx:if="{{info.is_package===1}}">
             <view class="map-container">
                 <view>
                     <view class="textOver" style="font-weight: 500;font-size: 28rpx;color: #000000;width: 600rpx;">{{info.scene_name}}</view>
@@ -65,15 +81,7 @@
             </view>
         </view>
     </view>
-    <view class="top-info" wx:else>
-        <view class="title">{{info.title}}</view>
-        <view class="subtitle">{{info.subtitle}}</view>
-        <view class="tags-box textOver">
-            <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
-            </view>
-            <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
-        </view>
-    </view>
+    
 </view>
 
 <!-- 买家评价 -->
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 89f1a60..8e4e39d 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -7,89 +7,64 @@ page {
   width: 100%;
   height: 750rpx;
 }
-
-.swiper image,
-.swiper video {
+.swiper image,.swiper video {
   height: 750rpx;
   display: block;
   width: 100%;
 }
+.swiper-bottom{
+    position: absolute;
+    /* top: 750rpx; */
+    margin-top: 694rpx;
+    right: 0;
+    width: fit-content;
+    height: 56rpx;
+    line-height: 56rpx;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx 0 0 13rpx;
+    display: flex;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    z-index: 10;
+    padding: 0 5rpx;
+    overflow: hidden;
+}
+.swiper-bottom-item{
+    padding: 0 14rpx;
+}
+.swiper-bottom-item.active{
+    color: #fff;
+}
 
 .top-info {
-  border-radius: 20rpx 20rpx 0 0;
   background: white;
   position: relative;
   z-index: 1;
-  padding: 20rpx 40rpx;
 }
 
 .top-info .title {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #000;
-}
-
-.top-info .subtitle {
-  color: #666;
-  font-size: 27rpx;
-  margin-top: 20rpx;
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #000000;
 }
 
 .tags-box {
-  margin-top: 10rpx;
   display: flex;
   align-items: center;
+  font-weight: 500;
+  font-size: 25rpx;
   color: #0B898E;
-  font-size: 27rpx;
-  height: 50rpx;
 }
 
 .tags-box .tag {
-  position: relative;
-  line-height: 20rpx;
-  font-size: 20rpx;
-  font-weight: 500;
-  line-height: 50rpx;
-  margin-right: 10rpx;
-}
-
-.tags-box .tag .line {
-  content: "1";
-  display: block;
-  font-size: 0;
-  position: absolute;
-  left: 0;
-  right: 0;
-  background: #DAF3E9;
-  height: 8rpx;
-  top: 30rpx;
-  z-index: -1;
-}
-
-.tags-price {
-  flex: 1;
-  text-align: right;
-  color: #D62828;
-}
-
-.tags-price text:nth-child(1) {
-  font-size: 27rpx;
-}
-
-.tags-price text:nth-child(2) {
-  font-size: 40rpx;
-  font-weight: bold;
-}
-
-.tags-price text:nth-child(3) {
-  font-size: 20rpx;
-  color: #999999;
-  margin-left: 4rpx;
-}
-
-.tags-box .iconfont {
-  margin-left: 4rpx;
-  font-size: 24rpx;
+  margin-top: 27rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  margin-right: 15rpx;
+  padding: 0 14rpx;
+  background: rgba(11, 137, 142, 0.1);
+  border-radius: 4rpx;
 }
 
 .address-box {
@@ -982,8 +957,9 @@ height: 133rpx;
  .wineScene-price-container {
     width: 750rpx;
     height: 100rpx;
-    background: linear-gradient(-90deg,#FF413B, #FFAB2E);
-    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
+    background: #FD3856;
+    /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -995,13 +971,13 @@ height: 133rpx;
 
  .wineScene-price-container .wineSecne-price {
     font-weight: bold;
-    font-size: 36rpx;
+    font-size: 48rpx;
     color: #FFFFFF;
 }
 .wineScene-price-container .wineSecne-money {
     font-size: 24rpx;
     font-weight: 500;
-    text-decoration-line: line-through;
+    /* text-decoration-line: line-through; */
     padding-left: 14rpx;
 }
 .wineScene-price-container .wineSecne-price::before {
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 1fab188..e213db5 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -165,11 +165,11 @@ Page({
     order: function () {
         // todo 判断组合产品
         // if (this.data.info.is_compose == 1) {
-        // if (true) {
-        //     // 打开规格弹窗
-        //     this.setData({skuFlag: true})
-        //     return
-        // }
+        if (true) {
+            // 打开规格弹窗
+            this.setData({skuFlag: true})
+            return
+        }
 
 
         commonApi.user_post('wx/get_user_keep', {
@@ -213,11 +213,13 @@ Page({
     // 组合产品获取购买的sku
     getComposeSku () {
         commonApi.user_post("product/get_sku_compose_list", {
-            sku_id: "190720"
+            // sku_id: "190720"
+            sku_id: "190740"
         }).then(res => {
             if (res&&Array.isArray(res.data)&&res.data.length>0) {
                 res.data.forEach(v => {
-                    v.sku.is_compose = 1
+                    v.sku.is_compose = 1;
+                    v.num = this.data.producNum;
                 });
                 util.orderByShoppingCart(res.data,app)
             }
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index b82804d..5725af7 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -827,10 +827,6 @@ Page({
     console.log(app.globalData.product);
     console.log(ticket_type);
 
-    // todo 判断是否组合产品
-    // this.getComposeSku()
-    // return
-
 
     if (ticket_type != 2) {
         let today = util.formatDate(new Date()), 
@@ -1035,17 +1031,6 @@ Page({
     })
   },
 
-  // 组合产品获取购买的sku
-  getComposeSku () {
-    commonApi.user_post("product/get_sku_compose_list", {
-        sku_id: "190720"
-    }).then(res => {
-        if (res&&Array.isArray(res.data)&&res.data.length>0) {
-            util.orderByShoppingCart(res.data,app)
-        }
-    })
-  },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 06a8275..e674c20 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -40,10 +40,10 @@
       <view class="s-price">
         {{product.sku.price/100}}
       </view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1 && !product.sku.is_compose}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1 && !product.sku.is_compose}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
       <view class="number-box">{{productNum}}</view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <image wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
       <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
     </view>
     <view class="text1">
diff --git a/project.config.json b/project.config.json
index 1241058..744f8a8 100644
--- a/project.config.json
+++ b/project.config.json
@@ -54,60 +54,39 @@
     "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.14.0",
+  "libVersion": "3.8.9",
   "appid": "wx4bb7b6050831f585",
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "currentL": -1,
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
-          "id": 0,
           "name": "pages/user/bindtel/index",
           "pathName": "pages/user/bindtel/index",
           "query": "id=0000000000LINELINEINFO18082257199008",
           "scene": null
         },
         {
-          "id": 1,
           "name": "好行",
           "pathName": "pages/list/haoxing/index",
           "query": "",
           "scene": null
         },
         {
-          "id": 2,
           "name": "pages/list/activitynew/index",
           "pathName": "pages/list/activitynew/index",
           "query": "id=0000000000LINELINEINFO18082257199008",
           "scene": null
         },
         {
-          "id": -1,
           "name": "微旅行",
           "pathName": "pages/list/minitrip/index",
           "query": "",
           "scene": null
         },
         {
-          "id": -1,
           "name": "一日游",
           "pathName": "pages/list/oneday/index",
           "query": "",
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 977d332..a258067 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -16,9 +16,9 @@
   <view class="box">
     <view class="box-title">
       <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
-      <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view>
+      <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="minus"></view>
       <view class="number-box">{{productNum}}</view>
-      <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view>
+      <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add"></view>
     </view>
   </view>
   <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
diff --git a/utils/util.js b/utils/util.js
index 1609034..c441416 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -578,6 +578,7 @@ const orderByShoppingCart = function (listData, app) {
             app.globalData.couponInfo = null;
             let list = listData, product = [], product1 = []
             list.map(item => {
+                item.num = item.num || 1;
                 // item.product.type="post";
                 if (item.product.type == 'post') {
                     product.push({

From 0f3da60c5576fb564b9538aed5f568dd9e5b06de Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 22 Aug 2025 15:56:03 +0800
Subject: [PATCH 380/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index aecfde0..8f07bc1 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest112? true : false;
+            data.isTest = data.isTest115? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From 08f60a2b1ba69407399b117b563f484891e819ed Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 22 Aug 2025 16:39:01 +0800
Subject: [PATCH 381/471] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/info/postProductInfo/index.wxml |  6 +++++-
 pages/info/postProductInfo/index.wxss | 10 ++++++++++
 pages/info/roadInfo/index.js          |  1 +
 pages/order/WineSceneOrder/index.js   |  1 +
 pages/order/orderList/index.js        |  1 +
 pages/order/postOrder/index.js        |  1 +
 pages/order/scene/index.js            |  1 +
 pages/order/showOrderNew/index.js     |  1 +
 subPackages/gwcOrder/index.js         |  1 +
 utils/https.js                        |  4 ++--
 11 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 8f07bc1..4267b37 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest115? true : false;
+            data.isTest = data.isTest114? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index b074660..5f260fa 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -40,7 +40,11 @@
             <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
         </view>
         <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
-            <view class="flex"></view>
+            <view class="select-img">
+                <image src="{{info.headimg}}"></image>
+                <text class="select-img">款式选择</text>
+                <image wx:for="{{info.sku}}" wx:key="index" src="{{item.headimg}}"></image>
+            </view>
 
             <view class="title textOver2">{{info.title}}</view>
             <!-- <view class="hotel-custom" style="padding:26rpx 0">
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 8e4e39d..c57475c 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -1049,3 +1049,13 @@ height: 133rpx;
     width: 29rpx;
     height: 29rpx;
 }
+
+.select-img{
+    display: flex;
+}
+.select-img image{
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 13rpx;
+    margin-right:20rpx;
+}
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index e213db5..3e90786 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -220,6 +220,7 @@ Page({
                 res.data.forEach(v => {
                     v.sku.is_compose = 1;
                     v.num = this.data.producNum;
+                    v.sku.compose_sku_id = v.compose_sku_id
                 });
                 util.orderByShoppingCart(res.data,app)
             }
diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js
index 9676795..d218f29 100644
--- a/pages/order/WineSceneOrder/index.js
+++ b/pages/order/WineSceneOrder/index.js
@@ -268,6 +268,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: '',
         end_time: '',
         use_date: '',
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 48b3f7a..ced412f 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -76,6 +76,7 @@ Page({
   },
   order: function (){
     console.log(app.globalData.createDate);
+
     app.globalData.createDate.coupon_id= this.data.coupon ? this.data.coupon.id : null;
 	  let service = "order/create", postData = {data: JSON.stringify(app.globalData.createDate)}
 	  commonApi.user_post(service, postData).then(res => {
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 2f9c76c..425694b 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -157,6 +157,7 @@ Page({
         product_num: item.productNum,
         remark: item.remark,
         is_batch_shipment: item.sku.batch_shipment,
+        compose_sku_id: item.sku.compose_sku_id,
       }
       product_list.push(productItem)
     })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 3cbd68f..3a8690c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -490,6 +490,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: time.start_time,
         end_time: time.end_time,
         use_date: date ? date.date : '',
diff --git a/pages/order/showOrderNew/index.js b/pages/order/showOrderNew/index.js
index 1118f99..99eff0f 100644
--- a/pages/order/showOrderNew/index.js
+++ b/pages/order/showOrderNew/index.js
@@ -418,6 +418,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: time.start_time,
         end_time: time.end_time,
         use_date: date ? date.date : '',
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 485496a..fe0d79d 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -382,6 +382,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: time.start_time,
         end_time: time.end_time,
         use_date: date ? date.date : '',
diff --git a/utils/https.js b/utils/https.js
index ac1e739..c120ad9 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 55a676c2dcb50986fecd49f592020dc8472a8016 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 25 Aug 2025 10:00:07 +0800
Subject: [PATCH 382/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/info/sceneProductInfo/index.js   | 48 +++++++++++++++++++-------
 pages/info/sceneProductInfo/index.wxml | 45 ++++++++++++++----------
 pages/info/sceneProductInfo/index.wxss | 48 ++++++++++++++++++++++++--
 4 files changed, 109 insertions(+), 34 deletions(-)

diff --git a/app.js b/app.js
index 8f07bc1..4267b37 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest115? true : false;
+            data.isTest = data.isTest114? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 357c02e..2909294 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -58,6 +58,8 @@ Page({
     noticeIndex: 0,
     skuPriceDate: [],
     
+    skuShowIndex: 0,
+    skuShowDomId: "",
   },
 
   /**
@@ -327,17 +329,17 @@ Page({
     })
   },
   showBookingInfo: function (e) {
-    this.setData({
-      bookingInfo: e.currentTarget.dataset.item.sku_model,
-      bookingInfoTitle: e.currentTarget.dataset.item.sku_name
-    })
-    util.pagePoint({
-      event: "scene_notice",
-      param: {
-        type: this.data.info.type,
-        id: this.data.info.id
-      }
-    }, 1)
+    // this.setData({
+    //   bookingInfo: e.currentTarget.dataset.item.sku_model,
+    //   bookingInfoTitle: e.currentTarget.dataset.item.sku_name
+    // })
+    // util.pagePoint({
+    //   event: "scene_notice",
+    //   param: {
+    //     type: this.data.info.type,
+    //     id: this.data.info.id
+    //   }
+    // }, 1)
   },
   closeMask: function () {
     this.setData({
@@ -826,6 +828,9 @@ Page({
     }
     console.log(app.globalData.product);
     console.log(ticket_type);
+
+    let showSkuIndex = e.currentTarget.dataset.index || 0
+
     if (ticket_type != 2) {
         let today = util.formatDate(new Date()), 
         end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000));
@@ -844,7 +849,9 @@ Page({
                     orderSku: e.currentTarget.dataset.sku,
                     orderProduct: e.currentTarget.dataset.product,
                     noticeIndex: 0,
-                    skuPriceDate: res.data
+                    skuPriceDate: res.data,
+                    skuShowIndex:showSkuIndex,
+                    skuShowDomId:"sku-show-"+showSkuIndex,
                 })
             }
         })
@@ -1028,6 +1035,23 @@ Page({
     })
   },
 
+  changeSimpleVal (e) {
+      let keyname = e.currentTarget.dataset.keyname;
+      let val = e.currentTarget.dataset.val;
+      let param = {}
+      param[keyname] = val
+
+      if (keyname == "skuShowIndex") {
+          param.skuShowDomId = "sku-show-0"
+          if (val == 1) {
+            param.skuShowDomId = "sku-show-1"
+          }
+      }
+
+      this.setData(param)
+      console.log(this.data)
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 70ed99d..b2962df 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -74,7 +74,9 @@
                     <view class="product-tag textOver" >{{sku.display_tags_str}}</view>
 
                     </view>
-                    <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">ⓘ预订须知></view>
+                    <view class="order-tip-text" bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
+                    data-index="1"
+                    data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}">ⓘ预订须知></view>
                 </view>
                 <view class="product-right">
                     <view class="price">
@@ -84,7 +86,7 @@
                     </view>
                     <!-- showOrder    selectDate  -->
                     <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
-                    data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
+                    data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" data-index="0"
                     class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">预订</view>
                 </view>
                 </view>
@@ -152,23 +154,30 @@
   <view class="mask" wx:if="{{showDate}}">
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
-      <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
-      product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
-      
-      <view class="orderNotice" wx:if="{{orderSku}}">
-        <view style="font-weight: 500;font-size: 15px;color: #000000;margin-bottom: 26rpx;">预订须知</view>
-        <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.product_detail}}">
-            <view class="scroll-menu-item{{noticeIndex==0?' active':''}}"
-            bindtap="changeNoticeIndex" data-index="0" style="width: 276rpx;">预订须知</view>
-            <view class="scroll-menu-item{{noticeIndex==1?' active':''}}"
-            bindtap="changeNoticeIndex" data-index="1" style="width: 276rpx;">产品详情</view>
+        <view class="mask-top-menu">
+            <view class="{{skuShowIndex==0?'active':''}}" bind:tap="changeSimpleVal" data-keyname="skuShowIndex" data-val="0">预订选择</view>
+            <view class="{{skuShowIndex==1?'active':''}}" bind:tap="changeSimpleVal" data-keyname="skuShowIndex" data-val="1">预订须知</view>
         </view>
-        <rich-text wx:if="{{noticeIndex==0}}" class="detail" nodes="{{tool.formateRichText(orderSku.sku_model.bookinfo)}}"></rich-text>
-        <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.product_detail)}}"></rich-text>
-        
-      </view>
-      <view style="height: 180rpx;"></view>
+
+        <scroll-view class="mask-scroll-content" scroll-y scroll-into-view="{{skuShowDomId}}" scroll-with-animation>
+            <!-- <view class="iconfont icon-close" bindtap="hideDate"></view> -->
+            <date id="sku-show-0" wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+            product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
+
+            <view id="sku-show-1" class="orderNotice" wx:if="{{orderSku}}">
+                <view style="font-weight: 500;font-size: 15px;color: #000000;margin-bottom: 26rpx;">预订须知</view>
+                <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.product_detail}}">
+                    <view class="scroll-menu-item{{noticeIndex==0?' active':''}}"
+                    bindtap="changeNoticeIndex" data-index="0" style="width: 276rpx;">预订须知</view>
+                    <view class="scroll-menu-item{{noticeIndex==1?' active':''}}"
+                    bindtap="changeNoticeIndex" data-index="1" style="width: 276rpx;">产品详情</view>
+                </view>
+                <rich-text wx:if="{{noticeIndex==0}}" class="detail" nodes="{{tool.formateRichText(orderSku.sku_model.bookinfo)}}"></rich-text>
+                <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.product_detail)}}"></rich-text>
+                
+            </view>
+            <view style="height: 180rpx;"></view>
+        </scroll-view>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{showPrice/100}}</text>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 6e92015..20b4ce1 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -926,9 +926,11 @@ line-height: 40rpx;
     bottom: 0;
     width: 100%;
     background: white;
-    border-radius: 12rpx;
+    /* border-radius: 12rpx; */
     overflow-y: auto;
     height: 85vh;
+    display: flex;
+    flex-direction: column;
 }
 .icon-close {
   position: absolute;
@@ -1003,7 +1005,7 @@ line-height: 93rpx;
 
 
 .scroll-menus{
-    padding: 0rpx 33rpx 26rpx;
+    padding: 26rpx 33rpx 26rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -1031,5 +1033,45 @@ line-height: 93rpx;
     margin-bottom: 30rpx;
   }
 .orderNotice{
-    padding: 0 25rpx 0 35rpx;
+    padding: 20rpx 25rpx 0 35rpx;
+}
+
+.mask-top-menu{
+    width: 100%;
+    height: 84rpx;
+    background: #FFFFFF;
+    font-weight: 500;
+    font-size: 31rpx;
+    color: #000000;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1rpx solid #D8D8D8;
+    padding: 0 128rpx;
+    box-sizing: border-box;
+    flex-shrink: 0;
+}
+.mask-top-menu>view{
+    height: 84rpx;
+    line-height: 84rpx;
+    min-width: 121rpx;
+}
+.mask-top-menu>view.active{
+    color: #0B898E;
+    border-bottom: 4rpx solid #0B898E;
+}
+.mask-content1 .date-box .box-title{
+    font-weight: bold;
+    font-size: 37rpx;
+    color: #000000;
+}
+
+.mask-content1 .date-box>view:nth-of-type(2){
+    border: none !important;
+    padding-top: 10rpx !important;
+    height: auto !important;
+}
+.mask-scroll-content{
+    flex: 1;
+    height: 100rpx;
 }
\ No newline at end of file

From 7f97576a665bbd01d82e9559f4190d997873b0b8 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 25 Aug 2025 10:11:33 +0800
Subject: [PATCH 383/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js   |   2 +-
 pages/info/postProductInfo/index.wxml |  53 +++++------
 pages/info/postProductInfo/index.wxss | 123 +++++++++++++++-----------
 3 files changed, 90 insertions(+), 88 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index b7d518b..f320a6e 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -11,7 +11,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        autoPlay: false,
+        autoPlay: true,
         fixed: false,
         type: 1,
         top: 0,
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 5f260fa..7f02116 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,21 +2,11 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<view class="swiper-bottom">
-    <view class="swiper-bottom-item active">1/2</view>
-    <view class="swiper-bottom-item">视频</view>
-    <view class="swiper-bottom-item">图片</view>
-    <view class="swiper-bottom-item">款式</view>
-</view>
-
-
 <image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
-<swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
+<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
   <block wx:if="{{info.videourl}}" wx:key="*this">
     <swiper-item>
-      <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
-       	show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
-        show-progress="{{false}}"></video>
+      <video bindplay="playVideo" src="{{info.videourl}}" controls></video>
       <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
     </swiper-item>
   </block>
@@ -34,20 +24,14 @@
 
 <view wx:if="{{info}}">
     <!-- 酒景套餐 -->
-    <view class="top-info" style="padding: 0;" >
-        <view class="wineScene-price-container" >
-            <view class="wineSecne-price">{{info.price/100}}<text class="wineSecne-money">优惠前￥{{info.market_price/100}}</text></view>
-            <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
-        </view>
-        <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
-            <view class="select-img">
-                <image src="{{info.headimg}}"></image>
-                <text class="select-img">款式选择</text>
-                <image wx:for="{{info.sku}}" wx:key="index" src="{{item.headimg}}"></image>
-            </view>
-
-            <view class="title textOver2">{{info.title}}</view>
-            <!-- <view class="hotel-custom" style="padding:26rpx 0">
+    <view class="top-info" style="padding: 0;" wx:if="{{info.is_package===1}}">
+        <div class="wineScene-price-container" >
+            <div class="wineSecne-price">{{info.price/100}}<span class="wineSecne-money">￥{{info.market_price/100}}</span></div>
+            <div>已售{{info.sales_number||0}}份</div>
+        </div>
+        <view style="padding: 26rpx 26rpx 0;">
+            <view class="title" style="font-weight: bold;">{{info.title}}</view>
+            <view class="hotel-custom" style="padding:26rpx 0">
                 <view class="hotel-custom-detail" wx:for="{{info.product_data}}" wx:key="item">
                     <view class="tip-info">
                         <view class="tip">{{index}}</view>
@@ -63,15 +47,10 @@
                     </view>
                 </view>
 
-            </view> -->
-            
-            <view class="tags-box textOver">
-                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
             </view>
         </view>
 
-        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;"
-            bindtap="gotolocation" wx:if="{{info.is_package===1}}">
+        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;" bindtap="gotolocation">
             <view class="map-container">
                 <view>
                     <view class="textOver" style="font-weight: 500;font-size: 28rpx;color: #000000;width: 600rpx;">{{info.scene_name}}</view>
@@ -85,7 +64,15 @@
             </view>
         </view>
     </view>
-    
+    <view class="top-info" wx:else>
+        <view class="title">{{info.title}}</view>
+        <view class="subtitle">{{info.subtitle}}</view>
+        <view class="tags-box textOver">
+            <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+            </view>
+            <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
+        </view>
+    </view>
 </view>
 
 <!-- 买家评价 -->
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index c57475c..ff73fe6 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -5,66 +5,92 @@ page {
 
 .swiper {
   width: 100%;
-  height: 750rpx;
+  height: 420rpx;
 }
-.swiper image,.swiper video {
-  height: 750rpx;
+
+.swiper image,
+.swiper video {
+  height: 420rpx;
   display: block;
   width: 100%;
 }
-.swiper-bottom{
-    position: absolute;
-    /* top: 750rpx; */
-    margin-top: 694rpx;
-    right: 0;
-    width: fit-content;
-    height: 56rpx;
-    line-height: 56rpx;
-    background: rgba(1, 0, 0, 0.6);
-    border-radius: 13rpx 0 0 13rpx;
-    display: flex;
-    font-weight: 500;
-    font-size: 24rpx;
-    color: rgba(255,255,255,0.5);
-    z-index: 10;
-    padding: 0 5rpx;
-    overflow: hidden;
-}
-.swiper-bottom-item{
-    padding: 0 14rpx;
-}
-.swiper-bottom-item.active{
-    color: #fff;
-}
 
 .top-info {
+  border-radius: 20rpx 20rpx 0 0;
   background: white;
   position: relative;
   z-index: 1;
+  margin-top: -20rpx;
+  padding: 20rpx 40rpx;
 }
 
 .top-info .title {
-    font-weight: bold;
-    font-size: 33rpx;
-    color: #000000;
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #000;
+}
+
+.top-info .subtitle {
+  color: #666;
+  font-size: 27rpx;
+  margin-top: 20rpx;
 }
 
 .tags-box {
+  margin-top: 10rpx;
   display: flex;
   align-items: center;
-  font-weight: 500;
-  font-size: 25rpx;
   color: #0B898E;
+  font-size: 27rpx;
+  height: 50rpx;
 }
 
 .tags-box .tag {
-  margin-top: 27rpx;
-  height: 40rpx;
-  line-height: 40rpx;
-  margin-right: 15rpx;
-  padding: 0 14rpx;
-  background: rgba(11, 137, 142, 0.1);
-  border-radius: 4rpx;
+  position: relative;
+  line-height: 20rpx;
+  font-size: 20rpx;
+  font-weight: 500;
+  line-height: 50rpx;
+  margin-right: 10rpx;
+}
+
+.tags-box .tag .line {
+  content: "1";
+  display: block;
+  font-size: 0;
+  position: absolute;
+  left: 0;
+  right: 0;
+  background: #DAF3E9;
+  height: 8rpx;
+  top: 30rpx;
+  z-index: -1;
+}
+
+.tags-price {
+  flex: 1;
+  text-align: right;
+  color: #D62828;
+}
+
+.tags-price text:nth-child(1) {
+  font-size: 27rpx;
+}
+
+.tags-price text:nth-child(2) {
+  font-size: 40rpx;
+  font-weight: bold;
+}
+
+.tags-price text:nth-child(3) {
+  font-size: 20rpx;
+  color: #999999;
+  margin-left: 4rpx;
+}
+
+.tags-box .iconfont {
+  margin-left: 4rpx;
+  font-size: 24rpx;
 }
 
 .address-box {
@@ -957,9 +983,8 @@ height: 133rpx;
  .wineScene-price-container {
     width: 750rpx;
     height: 100rpx;
-    /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
-    background: #FD3856;
-    /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
+    background: linear-gradient(-90deg,#FF413B, #FFAB2E);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -971,13 +996,13 @@ height: 133rpx;
 
  .wineScene-price-container .wineSecne-price {
     font-weight: bold;
-    font-size: 48rpx;
+    font-size: 36rpx;
     color: #FFFFFF;
 }
 .wineScene-price-container .wineSecne-money {
     font-size: 24rpx;
     font-weight: 500;
-    /* text-decoration-line: line-through; */
+    text-decoration-line: line-through;
     padding-left: 14rpx;
 }
 .wineScene-price-container .wineSecne-price::before {
@@ -1049,13 +1074,3 @@ height: 133rpx;
     width: 29rpx;
     height: 29rpx;
 }
-
-.select-img{
-    display: flex;
-}
-.select-img image{
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 13rpx;
-    margin-right:20rpx;
-}
\ No newline at end of file

From 213d666841f881d5e796762842b2a28fdc17df4d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 25 Aug 2025 13:36:03 +0800
Subject: [PATCH 384/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js   |  26 +++-
 pages/info/postProductInfo/index.wxml |  64 +++++++---
 pages/info/postProductInfo/index.wxss | 170 +++++++++++++++-----------
 3 files changed, 168 insertions(+), 92 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index f320a6e..fdc8505 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -11,7 +11,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        autoPlay: true,
+        autoPlay: false,
         fixed: false,
         type: 1,
         top: 0,
@@ -37,7 +37,13 @@ Page({
         showQrCode: false,
         wxqrcode: null,
 
-        ZTPoint:''
+        ZTPoint:'',
+        swiperCurrent: 0,
+        swiperRange: {
+            video: {min:0,max:0},
+            picture: {min:0,max:0},
+            sku: {min:0,max:0}
+        }
     },
 
     /**
@@ -100,10 +106,16 @@ Page({
             }
             } catch(e) {} 
 
+            let swiperRange = this.data.swiperRange;
+            swiperRange.video = resData.videourl? { min: 0, max: 0 } : { min: -1, max: -1 }
+            swiperRange.picture = {min:swiperRange.video.max+1, max:swiperRange.video.max+1+resData.listimg.length-1}
+            swiperRange.sku = {min:swiperRange.picture.max+1,max:swiperRange.picture.max+1+resData.sku.length-1}
+            console.log(swiperRange)
             this.setData({
                 info: resData,
                 supplierId: res.data.supplier_id,
-                iShop: res.data.supplier_id ? true : false
+                iShop: res.data.supplier_id ? true : false,
+                swiperRange: swiperRange
             })
 
             // 获取补贴
@@ -732,6 +744,14 @@ Page({
         }
     },
 
+    swiperChange (e) {
+        let index = e.detail.current
+        this.setData({
+            swiperCurrent: index
+        })
+        console.log(e, this.data.swiperCurrent)
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7f02116..7fb2e06 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,11 +2,22 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
+<view class="swiper-bottom" wx:if="{{info}}">
+    <view class="swiper-bottom-item active">1/2</view>
+    <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" wx:if="{{info.videourl}}">视频</view>
+    <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}">图片</view>
+    <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}">款式</view>
+</view>
+
+
 <image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
-<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
+<swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
+  interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
   <block wx:if="{{info.videourl}}" wx:key="*this">
     <swiper-item>
-      <video bindplay="playVideo" src="{{info.videourl}}" controls></video>
+      <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+       	show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+        show-progress="{{false}}"></video>
       <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
     </swiper-item>
   </block>
@@ -15,6 +26,12 @@
       <image src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
+  <block wx:for="{{info.sku}}" wx:key="*this">
+    <swiper-item style="position: relative;">
+      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <view class="sku-tips textOver">{{item.sku_name}}</view>
+    </swiper-item>
+  </block>
 </swiper>
 <view class="allowance-box" wx:if="{{allowance_data}}" bindtap="changeAllowance">
   补贴价
@@ -24,14 +41,24 @@
 
 <view wx:if="{{info}}">
     <!-- 酒景套餐 -->
-    <view class="top-info" style="padding: 0;" wx:if="{{info.is_package===1}}">
-        <div class="wineScene-price-container" >
-            <div class="wineSecne-price">{{info.price/100}}<span class="wineSecne-money">￥{{info.market_price/100}}</span></div>
-            <div>已售{{info.sales_number||0}}份</div>
-        </div>
-        <view style="padding: 26rpx 26rpx 0;">
-            <view class="title" style="font-weight: bold;">{{info.title}}</view>
-            <view class="hotel-custom" style="padding:26rpx 0">
+    <view class="top-info" style="padding: 0;" >
+        <view class="wineScene-price-container" >
+            <view class="wineSecne-price">{{info.price/100}}<text class="wineSecne-money">优惠前￥{{info.market_price/100}}</text></view>
+            <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
+        </view>
+        <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
+            <view class="select-img">
+                <image style="flex-shrink: 0;" src="{{info.headimg}}"></image>
+                <text style="flex-shrink: 0;" class="select-img-text">款式选择</text>
+                <view class="other-imgs no-scrollbar">
+                    <image wx:for="{{info.sku}}" wx:key="index" src="{{item.headimg}}"></image>
+                </view>
+ 
+                <view class="select-sku">></view>
+            </view>
+
+            <view class="title textOver2">{{info.title}}</view>
+            <!-- <view class="hotel-custom" style="padding:26rpx 0">
                 <view class="hotel-custom-detail" wx:for="{{info.product_data}}" wx:key="item">
                     <view class="tip-info">
                         <view class="tip">{{index}}</view>
@@ -47,10 +74,15 @@
                     </view>
                 </view>
 
+            </view> -->
+            
+            <view class="tags-box textOver">
+                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
             </view>
         </view>
 
-        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;" bindtap="gotolocation">
+        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;"
+            bindtap="gotolocation" wx:if="{{info.is_package===1}}">
             <view class="map-container">
                 <view>
                     <view class="textOver" style="font-weight: 500;font-size: 28rpx;color: #000000;width: 600rpx;">{{info.scene_name}}</view>
@@ -64,15 +96,7 @@
             </view>
         </view>
     </view>
-    <view class="top-info" wx:else>
-        <view class="title">{{info.title}}</view>
-        <view class="subtitle">{{info.subtitle}}</view>
-        <view class="tags-box textOver">
-            <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
-            </view>
-            <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
-        </view>
-    </view>
+    
 </view>
 
 <!-- 买家评价 -->
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index ff73fe6..ce70200 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -5,92 +5,66 @@ page {
 
 .swiper {
   width: 100%;
-  height: 420rpx;
+  height: 750rpx;
 }
-
-.swiper image,
-.swiper video {
-  height: 420rpx;
+.swiper image,.swiper video {
+  height: 750rpx;
   display: block;
   width: 100%;
 }
+.swiper-bottom{
+    position: absolute;
+    /* top: 750rpx; */
+    margin-top: 694rpx;
+    right: 0;
+    width: fit-content;
+    height: 56rpx;
+    line-height: 56rpx;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx 0 0 13rpx;
+    display: flex;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    z-index: 10;
+    padding: 0 5rpx;
+    overflow: hidden;
+}
+.swiper-bottom-item{
+    padding: 0 14rpx;
+}
+.swiper-bottom-item.active{
+    color: #fff;
+}
 
 .top-info {
-  border-radius: 20rpx 20rpx 0 0;
   background: white;
   position: relative;
   z-index: 1;
-  margin-top: -20rpx;
-  padding: 20rpx 40rpx;
 }
 
 .top-info .title {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #000;
-}
-
-.top-info .subtitle {
-  color: #666;
-  font-size: 27rpx;
-  margin-top: 20rpx;
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #000000;
 }
 
 .tags-box {
-  margin-top: 10rpx;
   display: flex;
   align-items: center;
+  font-weight: 500;
+  font-size: 25rpx;
   color: #0B898E;
-  font-size: 27rpx;
-  height: 50rpx;
 }
 
 .tags-box .tag {
-  position: relative;
-  line-height: 20rpx;
-  font-size: 20rpx;
-  font-weight: 500;
-  line-height: 50rpx;
-  margin-right: 10rpx;
-}
-
-.tags-box .tag .line {
-  content: "1";
-  display: block;
-  font-size: 0;
-  position: absolute;
-  left: 0;
-  right: 0;
-  background: #DAF3E9;
-  height: 8rpx;
-  top: 30rpx;
-  z-index: -1;
-}
-
-.tags-price {
-  flex: 1;
-  text-align: right;
-  color: #D62828;
-}
-
-.tags-price text:nth-child(1) {
-  font-size: 27rpx;
-}
-
-.tags-price text:nth-child(2) {
-  font-size: 40rpx;
-  font-weight: bold;
-}
-
-.tags-price text:nth-child(3) {
-  font-size: 20rpx;
-  color: #999999;
-  margin-left: 4rpx;
-}
-
-.tags-box .iconfont {
-  margin-left: 4rpx;
-  font-size: 24rpx;
+  margin-top: 27rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  margin-right: 15rpx;
+  padding: 0 14rpx;
+  background: rgba(11, 137, 142, 0.1);
+  border-radius: 4rpx;
 }
 
 .address-box {
@@ -983,8 +957,9 @@ height: 133rpx;
  .wineScene-price-container {
     width: 750rpx;
     height: 100rpx;
-    background: linear-gradient(-90deg,#FF413B, #FFAB2E);
-    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
+    background: #FD3856;
+    /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -996,13 +971,13 @@ height: 133rpx;
 
  .wineScene-price-container .wineSecne-price {
     font-weight: bold;
-    font-size: 36rpx;
+    font-size: 48rpx;
     color: #FFFFFF;
 }
 .wineScene-price-container .wineSecne-money {
     font-size: 24rpx;
     font-weight: 500;
-    text-decoration-line: line-through;
+    /* text-decoration-line: line-through; */
     padding-left: 14rpx;
 }
 .wineScene-price-container .wineSecne-price::before {
@@ -1074,3 +1049,60 @@ height: 133rpx;
     width: 29rpx;
     height: 29rpx;
 }
+
+.select-img{
+    display: flex;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 26rpx;
+}
+.select-img image{
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 13rpx;
+    margin-right:20rpx;
+    flex-shrink: 0;
+}
+.select-img .select-img-text{
+    font-weight: bold;
+    font-size: 24rpx;
+    color: #000000;
+    width: 51rpx;
+    height: 80rpx;
+    margin-right:20rpx;
+    display: flex;
+    align-items: center;
+}
+.select-img .other-imgs{
+    flex: 1;
+    width: 100rpx;
+    overflow-x: auto;
+    display: flex;
+}
+.select-img .select-sku{
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 25rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    background: white;
+    font-family: fangsong;
+    color: #999;
+}
+.sku-tips{
+    width: fit-content;
+    max-width: 533rpx;
+    height: 53rpx;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 27rpx;
+    padding: 0 28rpx;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    position: absolute;
+    bottom: 73rpx;
+    margin: 0 auto;
+}
\ No newline at end of file

From 94fdca9d82e8b360e1193c5b6494ffbe84a80f6b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 26 Aug 2025 09:43:46 +0800
Subject: [PATCH 385/471] 1

---
 pages/info/postProductInfo/index.js   |   6 +
 pages/info/postProductInfo/index.wxml |  54 +++++---
 pages/info/postProductInfo/index.wxss | 172 ++++++++++++++++++--------
 3 files changed, 165 insertions(+), 67 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index fdc8505..0c6d2ad 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -751,6 +751,12 @@ Page({
         })
         console.log(e, this.data.swiperCurrent)
     },
+    changeSwiperCurrent (e) {
+        let index = e.currentTarget.dataset.index
+        this.setData({
+            swiperCurrent: index
+        })
+    },
 
     /**
      * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7fb2e06..3f7deb1 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -3,7 +3,7 @@
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
 <view class="swiper-bottom" wx:if="{{info}}">
-    <view class="swiper-bottom-item active">1/2</view>
+    <view class="swiper-bottom-item active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
     <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" wx:if="{{info.videourl}}">视频</view>
     <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}">图片</view>
     <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}">款式</view>
@@ -29,7 +29,9 @@
   <block wx:for="{{info.sku}}" wx:key="*this">
     <swiper-item style="position: relative;">
       <image src="{{item.headimg}}" mode="aspectFill"></image>
-      <view class="sku-tips textOver">{{item.sku_name}}</view>
+      <view class="sku-tips ">
+        <view class="textOver">{{item.sku_name}}</view>
+      </view>
     </swiper-item>
   </block>
 </swiper>
@@ -48,10 +50,13 @@
         </view>
         <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
             <view class="select-img">
-                <image style="flex-shrink: 0;" src="{{info.headimg}}"></image>
+                <image class="{{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}" 
+                style="flex-shrink: 0;" src="{{info.headimg}}" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.min}}"></image>
                 <text style="flex-shrink: 0;" class="select-img-text">款式选择</text>
                 <view class="other-imgs no-scrollbar">
-                    <image wx:for="{{info.sku}}" wx:key="index" src="{{item.headimg}}"></image>
+                    <image wx:for="{{info.sku}}" wx:key="index" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.max+1+index}}"
+                    class="{{item.flag!='on'?'no-stock':''}} {{swiperCurrent==swiperRange.picture.max+1+index?'active':''}}"
+                    src="{{item.headimg}}"></image>
                 </view>
  
                 <view class="select-sku">></view>
@@ -106,7 +111,6 @@
         <text style="font-weight: bold;">买家评价</text>
         <text class="score" wx:if="{{info && info.rate && commentTotal>0}}">{{info.rate}}分</text>
         <text wx:else class="no-comment">暂无评价</text>
-
         <navigator url="/pages/list/comments/index?productid={{id}}" style="display: inline;"> 
             <text class="all-comment-num">共{{commentTotal}}条 <text style="font-family: fangsong;color: #000;">></text></text>
         </navigator>
@@ -115,6 +119,7 @@
         <view>这里空空如也，快去点评吧!</view>
        <navigator url="/pages/ask/index?id={{id}}" class="empty-btn">去点评</navigator>
     </view> -->
+    <view style="width: 100%;padding: 0 26rpx;box-sizing: border-box;">
     <navigator wx:for="{{comment}}" wx:key="index" wx:for-index="index" url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
         <view class="product-comment-top">
             <image class="avator-img" src="{{item.user.avatar}}" mode="aspectFill"></image>
@@ -144,9 +149,15 @@
         
         <!-- <view class="sku" wx:if="{{item.sku_name}}">{{item.sku_name}}</view> -->
     </navigator>
+    </view>
     <!-- <navigator url="/pages/list/comments/index?productid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">
         查看全部点评<text class="iconfont icon-you"></text></navigator> -->
+</view>
 
+<view class="shop-container" wx:if="{{iShop}}">
+    <image class="shop-img" src="{{info.supplier_name}}"></image>
+    <view class="textOver2">{{info.supplier_name}}</view>
+    <navigator class="shop-btn" url="/pages/list/store/index?id={{supplierId}}">进店</navigator>
 </view>
 
 <view class="scroll-all-box" id="menus" wx:if="{{info}}">
@@ -229,22 +240,33 @@
     <view class="sku-info-box">
       <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
-        <view class="sku-price">{{info.sku[skuIndex].price/100}}
-          <view class="allowance" wx:if="{{allowance_data}}">
-            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
+        <view>
+            <view class="sku-price">{{info.sku[skuIndex].price/100}}
+            <!-- <view class="allowance" wx:if="{{allowance_data}}">
+                补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view> -->
+            </view>
+            <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+        </view>
+        <view style="display: flex;align-items: center;">
+            <view class="number-box">
+                <view class="iconfont icon-sami-select" bindtap="minus"></view>
+                <view class="number">{{producNum}}</view>
+                <view class="iconfont icon-add-select" bindtap="add"></view>
+            </view>
+            <view class="limit-number" wx:if="{{info.sku[skuIndex].sku_model.traveller_limit_num>0}}">限购5件</view>
         </view>
-        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
       </view>
     </view>
+    <view style="font-weight: bold;font-size: 33rpx;color: #060001;margin:0rpx 25rpx 27rpx">产品分类（{{info.sku.length}}）</view>
     <view class="sku-names">
-      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item textOver{{index==skuIndex?' active':''}}" wx:for="{{info.sku}}">{{item.sku_name}}</view>
-    </view>
-    <view class="number-box">
-      <text>数量</text>
-      <view class="iconfont icon-sami-select" bindtap="minus"></view>
-      <view class="number">{{producNum}}</view>
-      <view class="iconfont icon-add-select" bindtap="add"></view>
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item {{index==skuIndex?' active':''}}" 
+      wx:for="{{info.sku}}">
+        <image src="{{item.headimg}}"></image>
+        <view class="sku-name textOver">{{item.sku_name}}</view>
+      </view>
     </view>
+    
+    
     <view style="height:138rpx"></view>
     <view class="btn-box">
       <view class="mask-btn" bindtap="order" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'确认':'立即购买'}}
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index ce70200..cf45b77 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -210,7 +210,6 @@ page {
 }
 .comment-box{
     background: #fff;
-    padding: 0 20rpx;
     margin: 20rpx 0;
     width: 100%;
     box-sizing: border-box;
@@ -227,7 +226,7 @@ page {
   border-bottom: 1rpx solid #d9d9d9;
   font-weight: 500;
   color: #000;
-  font-size: 35rpx;
+  font-size: 33rpx;
   padding: 0 20rpx;
   background: #fff;
   border-radius: 13rpx 13rpx 0 0;
@@ -271,8 +270,10 @@ page {
   /* margin: 0 20rpx; */
   border-bottom: 1rpx solid #ccc;
   /* padding: 33rpx 0; */
-  padding: 28rpx 20rpx;
+  padding: 28rpx 0rpx;
   background: #fff;
+  width: 100%;
+  box-sizing: border-box;
 }
 .product-comment:last-of-type{
     border-bottom: none;
@@ -319,7 +320,7 @@ page {
 .comment-content {
     width: 100%;
     padding-top: 12rpx;
-    font-size: 28rpx;
+    font-size: 27rpx;
     color: #000;
     font-weight: 500;
 }
@@ -470,38 +471,38 @@ page {
 }
 
 .sku-info-box {
-  margin: 50rpx 40rpx;
+  margin: 50rpx 25rpx;
   display: flex;
   justify-content: space-between;
 }
 
 .sku-info-box image {
-  width: 218rpx;
-  height: 180rpx;
+    width: 173rpx;
+    height: 173rpx;
   border-radius: 13rpx;
   display: block;
-  margin-right: 40rpx;
+  margin-right: 15rpx;
   flex-shrink: 0;
 }
 
 .sku-info {
   flex: 1;
+  width: 100rpx;
+  height: 173rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 }
 
 .sku-price {
   font-size: 40rpx;
-  font-weight: 500;
-  color: #D62828;
-  margin: 20rpx 0;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
+  font-weight: bold;
+  color: #F84A56;
 }
 
 .sku-price::before {
   content: "￥";
-  font-weight: 400;
-  font-size: 27rpx;
+  font-size: 24rpx;
   vertical-align: baseline;
 }
 
@@ -522,45 +523,63 @@ page {
 
 .sku-names {
   display: flex;
-  font-size: 29rpx;
-  color: #333;
-  margin: 0 40rpx;
-  text-align: center;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #333333;
+  margin: 0 25rpx;
   flex-wrap: wrap;
   margin-bottom: 20rpx;
   justify-content: space-between;
+  max-height: 800rpx;
+  min-height: 400rpx;
+  align-content: flex-start; 
 }
 
 .sku-name-item {
-  background: #EFEFEF;
-  border: 1rpx solid #EFEFEF;
-  /* width: 318rpx; */
-  line-height: 77rpx;
-  border-radius: 14rpx;
-  margin-bottom: 25rpx;
-  margin-right: 30rpx;
+    height: 67rpx;
+    border-radius: 13rpx;
+  margin-bottom: 34rpx;
   max-width: 100%;
-  padding: 0 15rpx;
-  min-width: 270rpx;
+  padding-right:15rpx;
+  min-width: 340rpx;
+  background: #EFEFEF;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
 }
-
-.sku-name-item:nth-child(2n) {
-  margin-right: 0;
+.sku-name-item>image{
+    width: 67rpx;
+    height: 67rpx;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+}
+.sku-name-item .sku-name{
+    flex:1;
+    width: 100rpx;
+    padding-left: 15rpx;
+    color: #333;
 }
 
-.sku-name-item.active {
+.sku-name-item.active{
   color: #0B898E;
-  border-color: #0B898E;
+  border: 1px solid #0B898E;
   background: rgba(11, 137, 142, 0.1);
 }
+.sku-name-item.active .sku-name{
+    color: #0B898E;
+  }
 
 .number-box {
   display: flex;
   align-items: center;
-  border-top: 1rpx solid #ccc;
   justify-content: space-between;
-  margin: 0 40rpx;
-  padding: 40rpx 0;
+  background: #EFEFEF;
+border-radius: 13rpx;
+padding: 10rpx 0;
+box-sizing: border-box;
+height: 53rpx;
+width: 250rpx;
+
 }
 
 .number-box text {
@@ -570,23 +589,21 @@ page {
 }
 
 .number-box view {
-  border: 1rpx solid #666;
-  border-radius: 7rpx;
   text-align: center;
-  width: 67rpx;
-  line-height: 67rpx;
-  font-size: 33rpx;
+  width: 80rpx;
+  height: 33rpx;
+  line-height: 33rpx;
+  font-size: 31rpx;
   color: #000;
 }
 
-.number-box view.disable {
-  border-color: #ccc;
-  color: #999;
-}
-
 .number-box view.number {
   width: 94rpx;
-  margin: 0 15rpx;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+.limit-number{
+    font-weight: 500;font-size: 27rpx;color: #666666;padding-left:20rpx;
 }
 
 .btn-box {
@@ -1062,6 +1079,14 @@ height: 133rpx;
     border-radius: 13rpx;
     margin-right:20rpx;
     flex-shrink: 0;
+    box-sizing: border-box;
+}
+.select-img image.active{
+    border: 2px solid #DC2525;
+}
+.select-img image.no-stock{
+    border: none;
+    opacity: 0.5;
 }
 .select-img .select-img-text{
     font-weight: bold;
@@ -1092,6 +1117,15 @@ height: 133rpx;
     color: #999;
 }
 .sku-tips{
+    width: 100%;
+    position: absolute;
+    bottom: 73rpx;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: center;
+}
+.sku-tips>view{
     width: fit-content;
     max-width: 533rpx;
     height: 53rpx;
@@ -1102,7 +1136,43 @@ height: 133rpx;
     font-weight: 500;
     font-size: 24rpx;
     color: #FFFFFF;
-    position: absolute;
-    bottom: 73rpx;
     margin: 0 auto;
-}
\ No newline at end of file
+}
+
+.shop-container{
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    padding: 32rpx 23rpx;
+    width: 100%;
+    background: white;
+    box-sizing: border-box;
+}
+.shop-container .shop-img{
+    width: 113rpx;
+    height: 113rpx;
+    flex-shrink: 0;
+}
+.shop-container .shop-btn{
+    width: 135rpx;
+height: 57rpx;
+border-radius: 13rpx;
+border: 1px solid #0B898E;
+font-weight: 500;
+font-size: 31rpx;
+color: #0B898E;
+text-align: center;
+line-height: 57rpx;
+flex-shrink: 0;
+}
+.shop-container .textOver2{
+    flex: 1;
+    width: 100rpx;
+    padding: 0 50rpx 0 20rpx;
+    font-weight: bold;
+font-size: 32rpx;
+color: #010101;
+}
+
+
+

From c3e87650086f089df61d47a23809e25ed8e8d0a8 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 26 Aug 2025 10:42:11 +0800
Subject: [PATCH 386/471] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js   |  9 +++++++++
 pages/info/sceneProductInfo/index.wxml |  5 +++--
 pages/info/sceneProductInfo/index.wxss |  4 ++--
 pages/order/components/date/index.js   | 17 ++++++++++++-----
 pages/order/components/date/index.wxml |  4 ++--
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 2909294..b0071cc 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -857,6 +857,15 @@ Page({
         })
         
     }else {
+        // 如果是预定须知
+        if (showSkuIndex == 1) {
+            this.setData({
+                bookingInfo: e.currentTarget.dataset.sku.sku_model,
+                bookingInfoTitle: e.currentTarget.dataset.sku.sku_name
+            })
+            return
+        }
+
         let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id)
 
       this.setData({
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index b2962df..38ad34b 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -42,8 +42,8 @@
 
 <view class="tab-info-container" wx:if="{{info}}">
     <view class="tab-item {{showTabIndex==0?'active':''}}" bind:tap="changeTabIndex" data-value="0">预订</view>
-    <view class="tab-item {{showTabIndex==1?'active':''}}" bind:tap="changeTabIndex" data-value="1">评价/问答</view>
     <view class="tab-item {{showTabIndex==2?'active':''}}" bind:tap="changeTabIndex" data-value="2">详情/政策</view>
+    <view class="tab-item {{showTabIndex==1?'active':''}}" bind:tap="changeTabIndex" data-value="1">评价/问答</view>
 </view>
 
 <view class="sku-type-container" wx:if="{{info&&showTabIndex==0}}">
@@ -154,13 +154,14 @@
   <view class="mask" wx:if="{{showDate}}">
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
+    <view class="iconfont icon-close" bindtap="hideDate"></view>
         <view class="mask-top-menu">
             <view class="{{skuShowIndex==0?'active':''}}" bind:tap="changeSimpleVal" data-keyname="skuShowIndex" data-val="0">预订选择</view>
             <view class="{{skuShowIndex==1?'active':''}}" bind:tap="changeSimpleVal" data-keyname="skuShowIndex" data-val="1">预订须知</view>
         </view>
 
         <scroll-view class="mask-scroll-content" scroll-y scroll-into-view="{{skuShowDomId}}" scroll-with-animation>
-            <!-- <view class="iconfont icon-close" bindtap="hideDate"></view> -->
+            
             <date id="sku-show-0" wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
             product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
 
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 20b4ce1..39bb9fd 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -934,8 +934,8 @@ line-height: 40rpx;
 }
 .icon-close {
   position: absolute;
-  top: 30rpx;
-  right: 30rpx;
+  top: 24rpx;
+  right: 24rpx;
 }
 
 
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 423c986..4c17eb6 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -169,9 +169,10 @@ Component({
                       }
                   })
               }
-
+              leftIndex = (leftIndex-1)>=0?(leftIndex-1):0;
               this.setData({
-                  scrollLeft: 70*leftIndex
+                //   scrollLeft: 70*leftIndex
+                scrollLeft: "scroll-item-"+leftIndex
               })
               setTimeout(() => {
                   this.changeDate(seldDate)
@@ -211,13 +212,16 @@ Component({
     },
     changeDate: function (e) {
       let date = e.currentTarget ? e.currentTarget.dataset.date : e
+      let index = e.currentTarget.dataset.index;
       if (date.stock <= 0) return;
       if (date.stock == null) return;
       if (date.price == null) return;
+      index = (index-1)>=0?(index-1):0;
       this.setData({
         activeDate: date,
         moreFlag: true,
-        date_price:date.price
+        date_price:date.price,
+        scrollLeft: "scroll-item-"+index
       })
       this.triggerEvent("onChangeDate", this.data.activeDate)
       this.getTimeStock()
@@ -225,17 +229,20 @@ Component({
     // 修改日期
     onTapDay: function (e) {
       let threeDays = this.data.threeDays, flag = false;
-      threeDays.map(item => {
+      threeDays.map((item,i) => {
         if (item.date == e.detail.date) {
           flag = true
         }
       })
+      let index = this.data.datelist.findIndex(v=>v.date == e.detail.date)
       e.detail.short_date = e.detail.date.substr(5, 5);
       e.detail.date_price = this.data.activeDate.price;
+      index = (index-1)>=0?(index-1):0;
       this.setData({
         activeDate: e.detail,
         showMoreDateFlag: false,
-        moreFlag: flag
+        moreFlag: flag,
+        scrollLeft: "scroll-item-"+index
       })
       app.globalData.product.price = this.data.activeDate.price
       this.triggerEvent("onChangeDate", this.data.activeDate)
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index db88887..2e274ec 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -28,9 +28,9 @@
       使用日期
     </view>
     <view class="dates-boxes">
-      <scroll-view scroll-x enable-flex scroll-left="{{scrollLeft}}"
+      <scroll-view scroll-x enable-flex scroll-into-view="{{scrollLeft}}" scroll-with-animation
         style="height: 133rpx;width: 580rpx;display: flex;overflow-x: scroll;flex-direction: row;">
-        <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
+        <view id="scroll-item-{{index}}" bindtap="changeDate" data-date="{{item}}" data-index="{{index}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
             <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
             <view>{{item.week}}</view>
             <view class="short-date">{{item.short_date}}</view>

From 07c94b6884bb700718cf56cbf4b5a24e2574a4c6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 26 Aug 2025 19:41:46 +0800
Subject: [PATCH 387/471] 1

---
 pages/info/postProductInfo/index.js   |  27 ++++++-
 pages/info/postProductInfo/index.wxml |  89 ++++++++++++++++++----
 pages/info/postProductInfo/index.wxss | 103 +++++++++++++++++++++++---
 project.private.config.json           |   7 ++
 utils/https.js                        |   4 +-
 5 files changed, 199 insertions(+), 31 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 0c6d2ad..89739fc 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -43,7 +43,8 @@ Page({
             video: {min:0,max:0},
             picture: {min:0,max:0},
             sku: {min:0,max:0}
-        }
+        },
+        otherInfoShow: 0,
     },
 
     /**
@@ -115,7 +116,7 @@ Page({
                 info: resData,
                 supplierId: res.data.supplier_id,
                 iShop: res.data.supplier_id ? true : false,
-                swiperRange: swiperRange
+                swiperRange: swiperRange,
             })
 
             // 获取补贴
@@ -319,7 +320,8 @@ Page({
     selectSku: function (e) {
         let index = e.currentTarget.dataset.index;
         this.setData({
-            skuIndex: index
+            skuIndex: index,
+            swiperCurrent: index+this.data.swiperRange.picture.max+1
         })
     },
     showOrder: function () {
@@ -341,8 +343,14 @@ Page({
                     })
                     return;
                 }
+                let swiperCurrent = this.data.swiperCurrent;
+                let skuIndex = swiperCurrent - this.data.swiperRange.sku.min
+                console.log(swiperCurrent, skuIndex)
+                if (skuIndex<0) {skuIndex=0}
                 this.setData({
-                    skuFlag: 'order'
+                    skuFlag: 'order',
+                    skuIndex: skuIndex,
+                    swiperCurrent: skuIndex+this.data.swiperRange.picture.max+1
                 })
             }
         })
@@ -745,10 +753,12 @@ Page({
     },
 
     swiperChange (e) {
+        if(e.detail.source == "touch") {
         let index = e.detail.current
         this.setData({
             swiperCurrent: index
         })
+        }
         console.log(e, this.data.swiperCurrent)
     },
     changeSwiperCurrent (e) {
@@ -757,6 +767,15 @@ Page({
             swiperCurrent: index
         })
     },
+    changeSimpleVal (e) {
+        let keyname = e.currentTarget.dataset.keyname;
+        let val = e.currentTarget.dataset.val;
+        let param = {}
+        param[keyname] = val
+        this.setData(param)
+        console.log(this.data)
+    },
+
 
     /**
      * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 3f7deb1..db828dc 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -1,12 +1,15 @@
 <!--pages/info/hotelProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
-<view class="iconfont icon-fenxiang" bindtap="share"></view>
+<view class="share-icon" bindtap="share"></view>
 <view class="swiper-bottom" wx:if="{{info}}">
-    <view class="swiper-bottom-item active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
-    <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" wx:if="{{info.videourl}}">视频</view>
-    <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}">图片</view>
-    <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}">款式</view>
+    <view class="swiper-bottom-item bottom-number active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
+    <view class="swuper-bottom-bg">
+        <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" wx:if="{{info.videourl}}">视频</view>
+        <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}">图片</view>
+        <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}">款式</view>
+    </view>
+    
 </view>
 
 
@@ -17,7 +20,7 @@
     <swiper-item>
       <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
        	show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
-        show-progress="{{false}}"></video>
+        show-progress="{{true}}" ></video>
       <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
     </swiper-item>
   </block>
@@ -51,19 +54,45 @@
         <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
             <view class="select-img">
                 <image class="{{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}" 
-                style="flex-shrink: 0;" src="{{info.headimg}}" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.min}}"></image>
+                style="flex-shrink: 0;" src="{{info.headimg}}" bind:tap="changeSwiperCurrent" data-index="{{0}}"></image>
                 <text style="flex-shrink: 0;" class="select-img-text">款式选择</text>
                 <view class="other-imgs no-scrollbar">
                     <image wx:for="{{info.sku}}" wx:key="index" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.max+1+index}}"
-                    class="{{item.flag!='on'?'no-stock':''}} {{swiperCurrent==swiperRange.picture.max+1+index?'active':''}}"
+                    class="{{swiperCurrent==swiperRange.picture.max+1+index?'active':''}}"
                     src="{{item.headimg}}"></image>
                 </view>
  
-                <view class="select-sku">></view>
+                <view class="select-sku" bind:tap="showOrder">></view>
             </view>
 
             <view class="title textOver2">{{info.title}}</view>
-            <!-- <view class="hotel-custom" style="padding:26rpx 0">
+            <view class="tags-box textOver">
+                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
+            </view>
+
+            <view class="other-info-box" wx:if="{{info.is_package!=1}}">
+                <view class="other-info-item" style="align-items: flex-start;"bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{1}}">
+                    <image style="margin-top: 6rpx;" src="https://static.ticket.sz-trip.com/uploads/20250826/c520e7e453443bfe19e27ea0e44e6b22.png"></image>
+                    <view class="other-content">
+                        <view style="color: #0B898E;">预计48小时内发货</view>
+                        <view style="padding-top: 10rpx;">江苏苏州 | 快递：免运费</view>
+                    </view>
+                    <view style="margin-top: 6rpx;" class="view-arrow">></view>
+                </view>
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{2}}">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20250826/30fc41c747c0126edd396ef92ff7ef62.png"></image>
+                    <view class="other-content">极速退款 | 未使用可退 | 客服售后</view>
+                    <view  class="view-arrow">></view>
+                </view>
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{3}}">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20250826/049b31024ee73e76f9612e8d8141bd66.png"></image>
+                    <view class="other-content">名称  鸡头米 | 产地  苏州 | 类型  机剥 | 重量  500g</view>
+                    <view  class="view-arrow">></view>
+                </view>
+            </view>
+
+
+            <view class="hotel-custom" style="padding:26rpx 0" wx:if="{{info.is_package===1}}">
                 <view class="hotel-custom-detail" wx:for="{{info.product_data}}" wx:key="item">
                     <view class="tip-info">
                         <view class="tip">{{index}}</view>
@@ -79,10 +108,6 @@
                     </view>
                 </view>
 
-            </view> -->
-            
-            <view class="tags-box textOver">
-                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
             </view>
         </view>
 
@@ -314,4 +339,38 @@
   </view>
 </view>
 <code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
-</code>
\ No newline at end of file
+</code>
+
+<view class="mask" wx:if="{{otherInfoShow>0}}">
+  <view class="mask-bg" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+    <view class="other-info-content">
+        <view class="title">{{otherInfoShow==3?"产品参数":otherInfoShow==2?"服务说明":"发货说明"}}</view>
+        <view wx:if="{{otherInfoShow==1}}">
+            <view class="key-title">该商品预计13小时内发货</view>
+            <view class="key-content">订单支付成功后48小时内发货，若未在48小时内发货消费者 可联系客服咨询催促发货。</view>
+        </view>
+       
+        <view wx:if="{{otherInfoShow==3}}">
+            <view class="prod-param">
+                <view class="prod-key">名称</view>
+                <view class="prod-content">鸡头米</view>
+            </view>
+            <view class="prod-param">
+                <view class="prod-key">购买须知</view>
+                <view class="prod-content">购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知</view>
+            </view>
+        </view>
+    
+    </view>
+ 
+
+    
+    
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}">确定</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index cf45b77..81ec2e2 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -20,22 +20,37 @@ page {
     width: fit-content;
     height: 56rpx;
     line-height: 56rpx;
-    background: rgba(1, 0, 0, 0.6);
-    border-radius: 13rpx 0 0 13rpx;
+    /* background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx 0 0 13rpx; */
     display: flex;
+    align-items: center;
     font-weight: 500;
     font-size: 24rpx;
     color: rgba(255,255,255,0.5);
     z-index: 10;
-    padding: 0 5rpx;
+    
     overflow: hidden;
 }
+.swuper-bottom-bg{
+    display: flex;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx 0 0 0;
+    padding: 0 5rpx;
+}
 .swiper-bottom-item{
     padding: 0 14rpx;
 }
 .swiper-bottom-item.active{
     color: #fff;
 }
+.swiper-bottom-item.bottom-number{
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 0 10rpx;
+    margin-right: 6rpx;
+}
 
 .top-info {
   background: white;
@@ -647,18 +662,15 @@ width: 250rpx;
   font-size: 36rpx;
   z-index: 1;
 } */
-.icon-fenxiang {
+.share-icon {
   position: absolute;
   right: 20rpx;
   margin-top: 20rpx;
   width: 60rpx;
-  line-height: 60rpx;
-  background: rgba(0, 0, 0, 0.4);
-  border-radius: 50%;
-  text-align: center;
-  color: #fff;
-  font-size: 36rpx;
+  height: 60rpx;
   z-index: 1;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250826/81287df192b80ea03318e06b2b19ebe1.png");
+  background-size: 100% 100%;
 }
 
 .icon-shoucang {
@@ -1176,3 +1188,74 @@ color: #010101;
 
 
 
+.other-info-box{
+}
+.other-info-box .other-info-item{
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+    margin-top: 30rpx;
+}
+.other-info-box .other-info-item image{
+    width: 32rpx;
+    height: 32rpx;
+    flex-shrink: 0;
+}
+.other-info-box .view-arrow{
+    font-family: fangsong;
+    color: #999;
+    width: 25rpx;
+    flex-shrink: 0;
+}
+.other-info-box .other-content{
+    padding: 0 20rpx;
+    overflow: hidden;
+    flex: 1;
+    width: 100rpx;
+    
+}
+
+.other-info-content{
+    min-height: 600rpx;
+    padding: 32rpx 23rpx;
+}
+.other-info-content .title{
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #060001;
+    text-align: center;
+    margin-bottom: 36rpx;
+}
+.other-info-content .key-title{
+    color: #060001;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    font-weight: bold;
+}
+.other-info-content .key-content{
+    color: #666;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    margin-top: 6rpx;
+}
+.prod-param{
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 45rpx;
+}
+.prod-param .prod-key{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+}
+.prod-param .prod-content{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+font-size: 27rpx;
+color: #000000;
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 5822978..ddd41d2 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=457638",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/order/pay/index",
           "pathName": "pages/order/pay/index",
diff --git a/utils/https.js b/utils/https.js
index ac1e739..c120ad9 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 7f15b8518e3ed73a4854f6de41f0926c71826ccf Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 27 Aug 2025 09:13:51 +0800
Subject: [PATCH 388/471] =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |  2 +-
 pages/index/index.wxml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 4267b37..5cf47f2 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest114? true : false;
+            data.isTest = data.isTest126? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 546ed64..c8bbb02 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -4,7 +4,7 @@
 <view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular
             indicator-dots 	indicator-active-color="#fff">
             <block wx:for="{{banner}}" wx:key="index">
@@ -70,7 +70,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -134,7 +134,7 @@
                     </view>
                     <!-- 右边的banner -->
                     <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                        <swiper class="xpth-banner-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}" data-source="限时特惠">
@@ -152,7 +152,7 @@
             </view>
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
@@ -286,7 +286,7 @@
     <!-- 广告弹窗 -->
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
-        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
             <block wx:for="{{alertSwipeList}}" wx:key="index">
             <swiper-item data-item="{{item}}" bindtap="bannerClick">
                 <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
@@ -321,7 +321,7 @@
 <view class="bg" wx:else style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item data-item="{{item}}">
@@ -347,7 +347,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item data-item="{{item}}">
@@ -361,7 +361,7 @@
 
 
         <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item  data-item="{{item}}" style="position: relative;">

From c7b33e278a96a2bd4bb6aa3f3e80b8a8c8dd5b71 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 09:58:36 +0800
Subject: [PATCH 389/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js   |  43 ++++++----
 pages/info/postProductInfo/index.wxml | 119 ++++++++++++++------------
 pages/info/postProductInfo/index.wxss |  44 ++++++----
 3 files changed, 119 insertions(+), 87 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 89739fc..1e643e0 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -91,20 +91,33 @@ Page({
 
             let resData = res.data
             try {
-            if (resData.product_data && resData.is_package==1) {
-                for(let key in resData.product_data) {
-                    resData.product_data[key] = JSON.parse(resData.product_data[key])
+                if (resData.product_data && resData.is_package==1) {
+                    for(let key in resData.product_data) {
+                        resData.product_data[key] = JSON.parse(resData.product_data[key])
+                    }
+                    // if (resData.product_data["住"]) {
+                    //     resData.product_data["住"] = JSON.parse(resData.product_data["住"])
+                    // }
+                    // if (resData.product_data["游"]) {
+                    //     resData.product_data["游"] = JSON.parse(resData.product_data["游"])
+                    // }
+                    // if (resData.product_data["食"]) {
+                    //     resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+                    // }
                 }
-                // if (resData.product_data["住"]) {
-                //     resData.product_data["住"] = JSON.parse(resData.product_data["住"])
-                // }
-                // if (resData.product_data["游"]) {
-                //     resData.product_data["游"] = JSON.parse(resData.product_data["游"])
-                // }
-                // if (resData.product_data["食"]) {
-                //     resData.product_data["食"] = JSON.parse(resData.product_data["食"])
-                // }
-            }
+
+                resData.shipment_tag_arr = []
+                if (resData.shipment_tag) {
+                    resData.shipment_tag_arr = resData.shipment_tag.split(',')
+                    resData.shipment_tag_str = resData.shipment_tag_arr.slice(1).join(' | ')
+                }
+                if (resData.service_tag) {
+                    resData.service_tag_str = resData.service_tag.split(',').join(' | ')
+                }
+                if (resData.parameter_tag) {
+                    resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ')
+                }
+
             } catch(e) {} 
 
             let swiperRange = this.data.swiperRange;
@@ -159,14 +172,14 @@ Page({
 
         commonApi._post("search/product_recommend", {
             offset: 0,
-            limit: 6,
+            limit: 4,
             rand: true,
             type: 'post',
             product_ids:options.id,
         }).then(res => {
             try {
                 this.setData({
-                    tjList: res.data.list
+                    tjList: res.data.list.slice(0,4)
                 })
             } catch (error) {
                 console.log(error);
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index db828dc..e3ca65f 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,42 +2,45 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="share-icon" bindtap="share"></view>
-<view class="swiper-bottom" wx:if="{{info}}">
-    <view class="swiper-bottom-item bottom-number active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
-    <view class="swuper-bottom-bg">
-        <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" wx:if="{{info.videourl}}">视频</view>
-        <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}">图片</view>
-        <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}">款式</view>
+<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
+<view style="position: relative;">
+    <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
+    interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
+    <block wx:if="{{info.videourl}}" wx:key="*this">
+        <swiper-item>
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+            show-progress="{{false}}" ></video>
+        <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.listimg}}" wx:key="*this">
+        <swiper-item>
+        <image src="{{item}}" mode="aspectFill"></image>
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.sku}}" wx:key="*this">
+        <swiper-item style="position: relative;">
+        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <view class="sku-tips ">
+            <view class="textOver">{{item.sku_name}}</view>
+        </view>
+        </swiper-item>
+    </block>
+    </swiper>
+    <view class="swiper-bottom" wx:if="{{info}}">
+        <view class="swuper-bottom-bg">
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 
+            wx:if="{{info.videourl}}" bind:tap="changeSwiperCurrent" data-index="{{0}}">视频</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.min}}">图片</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.sku.min}}">款式</view>
+        </view>
+        <view class="swiper-bottom-item bottom-number active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
     </view>
-    
 </view>
 
-
-<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
-<swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
-  interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
-  <block wx:if="{{info.videourl}}" wx:key="*this">
-    <swiper-item>
-      <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
-       	show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
-        show-progress="{{true}}" ></video>
-      <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
-    </swiper-item>
-  </block>
-  <block wx:for="{{info.listimg}}" wx:key="*this">
-    <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
-    </swiper-item>
-  </block>
-  <block wx:for="{{info.sku}}" wx:key="*this">
-    <swiper-item style="position: relative;">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
-      <view class="sku-tips ">
-        <view class="textOver">{{item.sku_name}}</view>
-      </view>
-    </swiper-item>
-  </block>
-</swiper>
 <view class="allowance-box" wx:if="{{allowance_data}}" bindtap="changeAllowance">
   补贴价
   <view class="com-price two">￥{{ allowance_data.mini_price / 100 }}起</view>
@@ -71,22 +74,25 @@
             </view>
 
             <view class="other-info-box" wx:if="{{info.is_package!=1}}">
-                <view class="other-info-item" style="align-items: flex-start;"bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{1}}">
+                <view class="other-info-item" style="align-items: flex-start;"bindtap="changeSimpleVal" 
+                data-keyname="otherInfoShow" data-val="{{1}}" wx:if="{{info.shipment_tag}}">
                     <image style="margin-top: 6rpx;" src="https://static.ticket.sz-trip.com/uploads/20250826/c520e7e453443bfe19e27ea0e44e6b22.png"></image>
-                    <view class="other-content">
-                        <view style="color: #0B898E;">预计48小时内发货</view>
-                        <view style="padding-top: 10rpx;">江苏苏州 | 快递：免运费</view>
+                    <view class="other-content" >
+                        <view class="textOver" style="color: #0B898E;">{{info.shipment_tag_arr[0]}}</view>
+                        <view class="textOver" style="padding-top: 10rpx;">{{info.shipment_tag_str}}</view>
                     </view>
                     <view style="margin-top: 6rpx;" class="view-arrow">></view>
                 </view>
-                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{2}}">
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{2}}" 
+                    wx:if="{{info.service_tag_str}}">
                     <image src="https://static.ticket.sz-trip.com/uploads/20250826/30fc41c747c0126edd396ef92ff7ef62.png"></image>
-                    <view class="other-content">极速退款 | 未使用可退 | 客服售后</view>
+                    <view  class="other-content textOver">{{info.service_tag_str}}</view>
                     <view  class="view-arrow">></view>
                 </view>
-                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{3}}">
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{3}}"
+                    wx:if="{{info.parameter_tag_str}}">
                     <image src="https://static.ticket.sz-trip.com/uploads/20250826/049b31024ee73e76f9612e8d8141bd66.png"></image>
-                    <view class="other-content">名称  鸡头米 | 产地  苏州 | 类型  机剥 | 重量  500g</view>
+                    <view class="other-content textOver">{{info.parameter_tag_str}}</view>
                     <view  class="view-arrow">></view>
                 </view>
             </view>
@@ -205,21 +211,21 @@
         <view class="info-title">预订须知</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
     </view>
+    <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
 
-    <view class="proad" id="box4">
-    <view class="proad-title">
+    <view class="info-box" id="box4" style="padding: 20rpx 26rpx;">
+    <!-- <view class="proad-title">
         <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
-    </view>
+    </view> -->
+    <view class="info-title">产品推荐</view>
     <view class="pro-list">
         <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
         <view class="item-hd">
         <image src="{{item.headimg}}"></image>
         </view>
-        <view class="item-bm">
-        <view class="protitle textOver">{{item.title}}</view>
-        <view class="pro-price">
-            {{item.price/100}}
-        </view>
+        <view class="item-bm" style="height: 120rpx;display: flex;flex-direction: column;justify-content: space-between;">
+            <view class="protitle textOver2">{{item.title}}</view>
+            <view class="pro-price">{{item.price/100}}</view>
         </view>
     </view>
     </view>
@@ -348,19 +354,26 @@
     <view class="other-info-content">
         <view class="title">{{otherInfoShow==3?"产品参数":otherInfoShow==2?"服务说明":"发货说明"}}</view>
         <view wx:if="{{otherInfoShow==1}}">
-            <view class="key-title">该商品预计13小时内发货</view>
-            <view class="key-content">订单支付成功后48小时内发货，若未在48小时内发货消费者 可联系客服咨询催促发货。</view>
+            <rich-text class="details" nodes="{{tool.formateRichText(info.shipment_info)}}"></rich-text>
+            <!-- <view class="key-title">该商品预计13小时内发货</view>
+            <view class="key-content">订单支付成功后48小时内发货，若未在48小时内发货消费者 可联系客服咨询催促发货。</view> -->
         </view>
+        <view wx:if="{{otherInfoShow==2}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.service_info)}}"></rich-text>
+        </view>
+        
        
         <view wx:if="{{otherInfoShow==3}}">
-            <view class="prod-param">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.parameter_info)}}"></rich-text>
+
+            <!-- <view class="prod-param">
                 <view class="prod-key">名称</view>
                 <view class="prod-content">鸡头米</view>
             </view>
             <view class="prod-param">
                 <view class="prod-key">购买须知</view>
                 <view class="prod-content">购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知</view>
-            </view>
+            </view> -->
         </view>
     
     </view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 81ec2e2..04bedac 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -15,41 +15,45 @@ page {
 .swiper-bottom{
     position: absolute;
     /* top: 750rpx; */
-    margin-top: 694rpx;
+    bottom: 77rpx;
     right: 0;
-    width: fit-content;
-    height: 56rpx;
-    line-height: 56rpx;
-    /* background: rgba(1, 0, 0, 0.6);
-    border-radius: 13rpx 0 0 13rpx; */
+    width: 90rpx;
+    height: fit-content;
     display: flex;
+    flex-direction: column;
     align-items: center;
     font-weight: 500;
     font-size: 24rpx;
     color: rgba(255,255,255,0.5);
     z-index: 10;
-    
-    overflow: hidden;
 }
 .swuper-bottom-bg{
-    display: flex;
     background: rgba(1, 0, 0, 0.6);
-    border-radius: 13rpx 0 0 0;
-    padding: 0 5rpx;
+    border-radius: 20rpx 0rpx 0rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding: 8rpx 0;
+    margin-bottom: 12rpx;
 }
 .swiper-bottom-item{
-    padding: 0 14rpx;
+    width: 100%;
+    text-align: center;
+    padding: 14rpx 0;
 }
 .swiper-bottom-item.active{
     color: #fff;
 }
 .swiper-bottom-item.bottom-number{
+    max-width: 100%;
+    width: fit-content;
     background: rgba(1, 0, 0, 0.6);
     border-radius: 13rpx;
     height: 40rpx;
     line-height: 40rpx;
     padding: 0 10rpx;
-    margin-right: 6rpx;
+    overflow: hidden;
+    box-sizing: border-box;
 }
 
 .top-info {
@@ -459,8 +463,9 @@ page {
 }
 
 .btns .btn:nth-child(1) {
-  margin-right: 3rpx;
+  /* margin-right: 3rpx; */
   border-radius: 39rpx 0 0 39rpx;
+  background: #FD7601;
 }
 
 .btns .btn:nth-child(2) {
@@ -692,6 +697,7 @@ width: 250rpx;
   border-radius: 50%;
   right: 20rpx;
   bottom: 166rpx;
+  z-index: 15;
 }
 
 .cart-box image {
@@ -922,16 +928,16 @@ height: 133rpx;
   flex-wrap: wrap;
 }
 .proitem{
-  width: 226rpx;
-  height: 234rpx;
+  width: 334rpx;
+  height: 497rpx;
   background: #FFFFFF;
   border-radius: 10rpx;
   margin-top: 20rpx;
 }
 .item-hd image{
-  width: 226rpx;
-  height: 130rpx;
-  border-radius: 10rpx 10rpx 0px 0px;
+  width: 334rpx;
+  height: 342rpx;
+  border-radius: 13rpx 13rpx 0px 0px;
 }
 .item-bm{
   padding: 8rpx 12rpx;

From 1ce232a775d1c9241b0c6adc7a6abe67e49f96a9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 10:26:18 +0800
Subject: [PATCH 390/471] =?UTF-8?q?=E5=8D=81=E6=99=AF=E9=85=92=E5=BA=97?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/list/six/index.js    |  9 ++++++++-
 pages/list/six/index.wxml  | 11 ++++++++---
 pages/pbService/index.wxml |  6 ++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index e788f1d..846d455 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -1,6 +1,7 @@
 // pages/list/six/index.js
 let app = getApp()
 
+import { unix } from "dayjs"
 import commonApi from "../../../utils/https/common"
 import util from "../../../utils/util"
 Page({
@@ -15,7 +16,7 @@ Page({
     typeIndex:0,
     total:1,
     list:[],
-    keywords:""
+    keywords:"",
   },
 
   /**
@@ -143,6 +144,12 @@ Page({
     console.log(item)
     util.gotoDetail(item);
   },
+  goHotel () {
+      wx.navigateToMiniProgram({
+          appId : "wx0e6ed4f51db9d078",
+          page: "/pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063"
+      })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index a33d90b..3085b3c 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -28,10 +28,15 @@
     <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon2.png" mode="widthFix"></image>
     <view>景点门票</view>
   </navigator>
-  <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+  <!-- <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
     <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
-  </navigator>
+  </navigator> -->
+  <view class="new-icon" bind:tap="goHotel">
+    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
+    <view>酒店住宿</view>
+  </view>
+    
   <!-- <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
     <image class="purple-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon4.png" mode="widthFix"></image>
     <view>电影购票</view>
@@ -39,7 +44,7 @@
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
-  <navigator  data-title="景区舒适度" url="/pages/pbService/sceneComfort/index" class="new-icon">
+  <navigator  data-title="景区舒适度" url="/pages/pbService/sceneComfort/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
     <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon5.png" mode="widthFix"></image>
     <view>景区舒适度</view>
   </navigator>
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 34a9eb6..cbd6b5b 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -9,8 +9,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
-    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoPath"
-    data-path="/pages/pbService/sceneComfort/index?title=高峰预警">
+    <!-- data-path="/pages/pbService/sceneComfort/index?title=高峰预警" -->
+    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoUrl"
+   
+    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=FQqP774V6H3PacOWYqJLykUBBywTAZEWMu9Nz9tzrOZUIf/Zto2OvXmirAi7/FSOkZg1uwNpcK0kdZgK0FjuzEZKYBjL/1RXp3XpQhxv9H91g9c737NfSxRcfYUHo2SGLX8kAlAiAbt72AoEfG++i+WTjbTo57sunVEzn/nF7n55StkcgfesDKjXOm+txOYbEc0tH32A5Mn">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>高峰预警</view>
     </view>

From 1d40ce91767390ae0e70b9d7fd584a1eaa0a0a95 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 13:27:27 +0800
Subject: [PATCH 391/471] 1

---
 pages/pbService/sceneComfort/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index 67bd108..d4f67ce 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -53,7 +53,7 @@ Page({
     commonApi._post('pbservice/Comfort/getComfortAreaList').then(res=>{
       let areaObj = {}
       res.data.forEach(item=>{
-        item.area_code = item.area
+        item.area_code = item.area_code
         item.area_name = item.area
         areaObj[item.area_code] = item.area;
       })

From a6fa3e003204b818d9041ffdc8a08a8bd4e5d036 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 14:29:10 +0800
Subject: [PATCH 392/471] =?UTF-8?q?=E6=99=AF=E5=8C=BA=E8=88=92=E9=80=82?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/pbService/sceneComfort/index.js | 31 ++++++++++++++-------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index 5cf47f2..d1c771c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest126? true : false;
+            data.isTest = data.isTest127? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index d4f67ce..e3a59cf 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -32,6 +32,20 @@ Page({
     if (options.title) {
         this.setData({title: options.title})
     }
+    commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
+        console.log(res)
+        let sceneLevelObj = {};
+        res.data.map(item=>{
+          sceneLevelObj[item.level] = item.name;
+        })
+        res.data.unshift({
+          name:"不选择"
+        })
+        this.setData({
+          sceneLevel:res.data,
+          sceneLevelObj:sceneLevelObj
+        })
+      })
 
     commonApi._post("pbservice/Comfort/getComfortLevel").then(res=>{
       let comfortObj = {}
@@ -48,7 +62,6 @@ Page({
         comfortLevel:res.data,
         comfortObj:comfortObj
       })
-      this.getList();
     })
     commonApi._post('pbservice/Comfort/getComfortAreaList').then(res=>{
       let areaObj = {}
@@ -70,21 +83,9 @@ Page({
         areas:res.data,
         areaObj:areaObj
       })
+      this.getList();
     })
-    commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
-      console.log(res)
-      let sceneLevelObj = {};
-      res.data.map(item=>{
-        sceneLevelObj[item.level] = item.name;
-      })
-      res.data.unshift({
-        name:"不选择"
-      })
-      this.setData({
-        sceneLevel:res.data,
-        sceneLevelObj:sceneLevelObj
-      })
-    })
+
     
   },
   changeArea:function(e){

From 92b91ff16d1bb0d3c983d76c9c6b307c97a06e82 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 15:03:28 +0800
Subject: [PATCH 393/471] =?UTF-8?q?=E8=AE=A2=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/pay/index.js | 42 ++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index af07a1f..ab3e25d 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -50,6 +50,24 @@ Page({
 
     isPaying: false,
 
+    sku_model_type: "",
+    templateIds: {
+        "ticket": [
+            // 订单状态变化通知
+            "cgeAlh1IzNlCua-q0UInEHzWaZdqvpfiVq1eBo-Oj4o",
+            //出票结果通知
+            "zdh2DYFLJ8M-jwiW6EXfhJ4qPpreWp1rHIMd0jrLWII",
+            // 订单支付成功通知
+            "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
+        ],
+        "post": [
+             // 订单支付成功通知
+             "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
+             // 订单发货通知
+             "zyoVCQnrhXYojldRffIgz8O4uEeuJvbhWBxqNbhrPMU"
+        ],
+    }
+
   },
 
   /**
@@ -141,9 +159,6 @@ Page({
     commonApi.user_post("order/query",{
       order_id:this.data.id
     }).then(res=>{
-      
-
-      
 	  // 书券产品
       if(res.data.order_product_list[0].product_id == 75012 || 
         res.data.order_product_list[0].product_id == 75013 || 
@@ -156,7 +171,7 @@ Page({
             isBook:true,
             payIndex:1
 		  })
-	  }
+      }
       if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
         let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
         this.daojishi(time);
@@ -199,6 +214,7 @@ Page({
         carCouponTip:carCouponTip,
         info: res.data,
         MTTip: MTTip,
+        sku_model_type: res.data.order_product_list[0].product_model
       })
       
       console.log(this.data.ERMB);
@@ -230,6 +246,7 @@ Page({
     })
   },
   pay:function(){
+    let _this = this;
     let arr = []
     this.data.info.order_product_list.forEach(item => {
       arr.push(item.product_id)
@@ -260,7 +277,6 @@ Page({
       }
     }
 
-    let _this = this;
     if(this.data.payIndex==1) {
       this.setData({
         showNumMask:true
@@ -289,11 +305,25 @@ Page({
             title: '支付成功',
             icon:'success'
           })
+
+            let templateIds = _this.data.templateIds[_this.data.sku_model_type];
+            if (templateIds && Array.isArray(templateIds) && templateIds.length>0) {
+                wx.requestSubscribeMessage({
+                    tmplIds: templateIds,
+                    complete (res) {
+                        wx.redirectTo({
+                            url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
+                        })
+                    }
+                })
+                return
+            }
+
           setTimeout(()=>{
               // 支付成功不还原isPaying  redirectTo 会删掉当前页面触发unload
             // _this.data.isPaying = false
             wx.redirectTo({
-              url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
+                url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',')
             })
           },1000)
         },

From 77653f67c18f4345f5aa2083e0216b1afd1edd48 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 15:30:03 +0800
Subject: [PATCH 394/471] 1

---
 pages/order/pay/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index ab3e25d..387593c 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -58,11 +58,11 @@ Page({
             //出票结果通知
             "zdh2DYFLJ8M-jwiW6EXfhJ4qPpreWp1rHIMd0jrLWII",
             // 订单支付成功通知
-            "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
+            // "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
         ],
         "post": [
              // 订单支付成功通知
-             "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
+            //  "KFtX7CPbFkYTbxowaLC0-bEdeGdzfWpaOXCTOOWS_NM",
              // 订单发货通知
              "zyoVCQnrhXYojldRffIgz8O4uEeuJvbhWBxqNbhrPMU"
         ],

From 986da8505aba0da7e717926d70bf327926a28da3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 29 Aug 2025 15:58:41 +0800
Subject: [PATCH 395/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js    | 15 +++++++++++++++
 pages/info/postProductInfo/index.wxml  |  2 +-
 pages/info/sceneProductInfo/index.wxml |  9 ++++++++-
 pages/info/sceneProductInfo/index.wxss |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 1e643e0..7d8f92f 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -118,6 +118,10 @@ Page({
                     resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ')
                 }
 
+                if (resData.supplier_headimg) {
+                    resData.supplier_headimg = that.showImg(resData.supplier_headimg)
+                }
+
             } catch(e) {} 
 
             let swiperRange = this.data.swiperRange;
@@ -186,6 +190,17 @@ Page({
             }
         })
     },
+
+    showImg (img) {
+        if (!img) { return img }
+        if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
+            return img;
+        } else {
+            // return "https://test.api.cloud.sz-trip.com"+img
+            return "https://static.ticket.sz-trip.com" + img;
+        }
+    },
+
     changeAllowance: function () {
         this.setData({
             showAllowance: !this.data.showAllowance
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index e3ca65f..7397ce9 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -186,7 +186,7 @@
 </view>
 
 <view class="shop-container" wx:if="{{iShop}}">
-    <image class="shop-img" src="{{info.supplier_name}}"></image>
+    <image class="shop-img" src="{{info.supplier_headimg}}" mode="aspectFill"></image>
     <view class="textOver2">{{info.supplier_name}}</view>
     <navigator class="shop-btn" url="/pages/list/store/index?id={{supplierId}}">进店</navigator>
 </view>
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 38ad34b..ee83019 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -3,7 +3,14 @@
 <title title="{{isBook?'产品详情':'景点详情'}}"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
 <image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
-<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
+<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{false}}" interval="{{2000}}" duration="{{300}}">
+    <block wx:if="{{info.videourl}}" wx:key="*this">
+        <swiper-item>
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+            ></video>
+        </swiper-item>
+    </block>
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
       <image src="{{item}}" mode="aspectFill"></image>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 39bb9fd..5c0eb15 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -8,7 +8,7 @@ page {
   height: 400rpx;
 }
 
-.swiper image {
+.swiper image,.swiper video {
   height: 400rpx;
   display: block;
   width: 100%;

From 3bf9baa3d5772c194bd2cf4f66e3c40b06c26548 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 1 Sep 2025 09:39:19 +0800
Subject: [PATCH 396/471] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/artfestival/index.wxml         |  20 +--
 pages/activity/autumnten/index.wxml           |  10 +-
 pages/activity/autumnten/list/index.wxml      |   2 +-
 pages/activity/graduate/index.wxml            |  12 +-
 pages/activity/huawei/form/index.wxml         |   6 +-
 pages/activity/huawei/index.wxml              |   6 +-
 pages/activity/huawei/list/index.wxml         |  10 +-
 pages/activity/huawei/result/index.wxml       |   6 +-
 pages/activity/huawei/upload/index.wxml       |   8 +-
 pages/activity/huawei/uploadres/index.wxml    |   6 +-
 pages/activity/newarrival/index.wxml          |  12 +-
 pages/activity/redlist/index.wxml             |   6 +-
 pages/activity/spring2021/index.wxml          |  14 +-
 pages/activity/springten/index.wxml           |   6 +-
 pages/activity/springten/list/index.wxml      |   2 +-
 pages/activity/subway/index.wxml              |  16 +--
 pages/activity/suyear/index.wxml              |  14 +-
 pages/activity/tenscenic/index.wxml           |  10 +-
 pages/activity/year2020/index.wxml            |  28 ++--
 pages/ask/index.wxml                          |   6 +-
 pages/ask/info/index.wxml                     |   6 +-
 pages/ask/my/index.wxml                       |   4 +-
 pages/component/commonImage/index.wxml        |   4 +-
 pages/component/newCalendar/index.wxml        |  12 +-
 pages/component/orderAdv/orderAdv.wxml        |   2 +-
 pages/component/proRec/proRec.wxml            |   2 +-
 pages/culture/index.wxml                      |   4 +-
 pages/culture/info/index.wxml                 |   6 +-
 pages/group/apply/index.wxml                  |   4 +-
 pages/group/index.wxml                        |  14 +-
 pages/group/info/index.wxml                   |  28 ++--
 pages/group/mine/index.wxml                   |   6 +-
 pages/index/index.wxml                        | 104 +++++++--------
 pages/info/activityInfo/index.wxml            |  24 ++--
 pages/info/cardInfo/index.wxml                |  14 +-
 pages/info/culturalUnitInfo/index.wxml        |  24 ++--
 pages/info/foodInfo/index.wxml                |   2 +-
 pages/info/foodProductInfo/index.wxml         |   2 +-
 pages/info/groupOrderInfo/index.wxml          |   2 +-
 pages/info/guideInfo/index.wxml               |   2 +-
 pages/info/hotelInfo/index.wxml               |   6 +-
 pages/info/hotelProductInfo/index.wxml        |  24 ++--
 pages/info/luggageInfo/index.wxml             |   6 +-
 pages/info/museumInfo/index.wxml              |  18 +--
 pages/info/newsInfo/index.wxml                |   2 +-
 pages/info/postProductInfo/index.wxml         |  38 +++---
 pages/info/redmapInfo/index.wxml              |  22 ++--
 pages/info/roadInfo/index.wxml                |  18 +--
 pages/info/sceneProductInfo/index.wxml        |  34 ++---
 pages/info/sceneProductInfoNew/index.wxml     |  26 ++--
 pages/info/showInfo/index.wxml                |  26 ++--
 pages/info/strategyInfo/index.wxml            |   6 +-
 pages/kj/his/index.wxml                       |   2 +-
 pages/kj/index.wxml                           |   6 +-
 pages/kj/info/index.wxml                      |  24 ++--
 pages/kj/mine/index.wxml                      |   4 +-
 pages/list/activity/index.wxml                |   8 +-
 pages/list/activitynew/index.wxml             |  28 ++--
 pages/list/card/index.wxml                    |   4 +-
 pages/list/comments/index.wxml                |   6 +-
 pages/list/culturalUnit/index.wxml            |   2 +-
 pages/list/daysu/detail/index.wxml            |   2 +-
 pages/list/daysu/index.wxml                   |   2 +-
 pages/list/feiyi/index.wxml                   |  12 +-
 pages/list/food/index.wxml                    |   8 +-
 pages/list/haoxing/index.wxml                 |   6 +-
 pages/list/hotel/index.wxml                   |   8 +-
 pages/list/mayday/index.wxml                  |  46 +++----
 pages/list/message/index.wxml                 |   2 +-
 pages/list/minitrip/index.wxml                |  12 +-
 pages/list/movieticket/index.wxml             |   8 +-
 pages/list/movieticket/list/cinema/index.wxml |   4 +-
 pages/list/movieticket/list/info/index.wxml   |   4 +-
 pages/list/movieticket/list/seats/index.wxml  |   6 +-
 pages/list/movieticket/list/ticket/index.wxml |   4 +-
 pages/list/museum/index.wxml                  |   4 +-
 pages/list/night/index.wxml                   |   6 +-
 pages/list/oneday/index.wxml                  |  12 +-
 pages/list/road/index.wxml                    |  12 +-
 pages/list/sale/index.wxml                    |  10 +-
 pages/list/scene/index.wxml                   |   8 +-
 pages/list/six/index.wxml                     |  28 ++--
 pages/list/store/index.wxml                   |   4 +-
 pages/list/strategy/index.wxml                |  20 +--
 pages/list/techan/index.wxml                  |   8 +-
 pages/list/theatre/index.wxml                 |   6 +-
 pages/map/index.wxml                          |  90 ++++++-------
 pages/old/index.wxml                          |   4 +-
 pages/old/profile/index.wxml                  |   2 +-
 pages/old/user/index.wxml                     |  22 ++--
 pages/order/WineSceneOrder/index.wxml         |   6 +-
 pages/order/comment/index.wxml                |  10 +-
 pages/order/components/contact/index.wxml     |  12 +-
 pages/order/components/wxqrCode/index.wxml    |   4 +-
 pages/order/coupon/index.wxml                 |   2 +-
 pages/order/food/index.wxml                   |   2 +-
 pages/order/hotel/index.wxml                  |   2 +-
 pages/order/joinOrder/success/index.wxml      |   2 +-
 pages/order/movie/index.wxml                  |  10 +-
 pages/order/pay/index.wxml                    |  10 +-
 pages/order/payresult/index.wxml              |   6 +-
 pages/order/postOrder/index.wxml              |   8 +-
 pages/order/roadOrder/index.wxml              |   2 +-
 pages/order/scene/index.wxml                  |   8 +-
 pages/order/sceneCart/index.wxml              |   2 +-
 pages/order/show/index.wxml                   |   6 +-
 pages/order/showOrderNew/index.wxml           |   6 +-
 pages/order/showSeat/index.wxml               |   2 +-
 pages/pbService/PRpark/index.wxml             |   2 +-
 pages/pbService/activity/index.wxml           |   6 +-
 pages/pbService/appreciate/index.wxml         |   4 +-
 pages/pbService/bus/index.wxml                |   2 +-
 pages/pbService/bus/lineinfo/index.wxml       |   6 +-
 pages/pbService/bus/search/index.wxml         |   6 +-
 pages/pbService/feiyi/index.wxml              |   2 +-
 pages/pbService/feiyi/info/index.wxml         |  12 +-
 pages/pbService/group/index.wxml              |   2 +-
 pages/pbService/gym/index.wxml                |   6 +-
 pages/pbService/gym/info/index.wxml           |  28 ++--
 pages/pbService/index.wxml                    |  66 +++++-----
 pages/pbService/library/bookinfo/index.wxml   |   2 +-
 pages/pbService/library/getpoint/index.wxml   |   2 +-
 pages/pbService/library/index.wxml            |   2 +-
 pages/pbService/library/mybook/index.wxml     |   2 +-
 pages/pbService/museum/index.wxml             |   2 +-
 pages/pbService/museum/info/index.wxml        |  32 ++---
 pages/pbService/sceneComfort/index.wxml       |   6 +-
 pages/pbService/wbdw/index.wxml               |   4 +-
 pages/pbService/wbdw/info/index.wxml          |   2 +-
 pages/pbService/wwcx/index.wxml               |   2 +-
 pages/pbService/wwcx/info/index.wxml          |  12 +-
 pages/pbService/wwcx/search/index.wxml        |   2 +-
 pages/search/list/index.wxml                  |  22 ++--
 pages/supplier/apply/index.wxml               |   6 +-
 pages/supplier/good/index.wxml                |  18 +--
 pages/supplier/index.wxml                     |  14 +-
 pages/user/address/index.wxml                 |   2 +-
 pages/user/bindtel/index.wxml                 |   2 +-
 pages/user/cartlist/list.wxml                 |   4 +-
 pages/user/coupon/index.wxml                  |   2 +-
 pages/user/couponCenter/index.wxml            |   2 +-
 pages/user/likes/index.wxml                   |   6 +-
 pages/user/linkman/index.wxml                 |   2 +-
 pages/user/order/activityOrderInfo/index.wxml |   6 +-
 pages/user/order/couponOrderInfo/index.wxml   |   6 +-
 pages/user/order/foodOrderInfo/index.wxml     |   6 +-
 pages/user/order/hotelOrderInfo/index.wxml    |   4 +-
 pages/user/order/lineOrderInfo/index.wxml     |   4 +-
 pages/user/order/list.wxml                    |   4 +-
 pages/user/order/movieOrderInfo/index.wxml    |   8 +-
 pages/user/order/museumOrderInfo/index.wxml   |  10 +-
 pages/user/order/postOrderInfo/index.wxml     |   4 +-
 pages/user/order/sceneOrderInfo/index.wxml    |   8 +-
 pages/user/order/showOrderInfo/index.wxml     |   4 +-
 pages/user/order/team/list.wxml               |   4 +-
 pages/user/profile/index.wxml                 |   2 +-
 pages/user/retail/goods/index.wxml            |   2 +-
 pages/user/retail/list/index.wxml             |   2 +-
 pages/user/service/index.wxml                 |   2 +-
 pages/user/user.wxml                          |  20 +--
 pages/user/verify/index.wxml                  |   2 +-
 pages/user/videoCoupon/index.wxml             |   2 +-
 subPackageCheckPoint/pages/content/index.wxml |   2 +-
 .../pages/detailsmap/index.wxml               |   2 +-
 subPackageCheckPoint/pages/index/index.wxml   |   2 +-
 .../pages/scopemap/index.wxml                 |   2 +-
 subPackages/feiyiNew/CGCIndex/index.wxml      |  24 ++--
 subPackages/feiyiNew/CGCLetter/index.wxml     |   8 +-
 subPackages/feiyiNew/CGCTime/index.wxml       |  10 +-
 subPackages/feiyiNew/index.wxml               |  48 +++----
 subPackages/goods/oneCardTour/info/index.wxml |  20 +--
 subPackages/gwcOrder/index.wxml               |   2 +-
 subPackages/index/index.wxml                  |  84 ++++++------
 subPackages/indexGQ/index.wxml                | 124 +++++++++---------
 subPackages/indexs/index.wxml                 |  86 ++++++------
 subPackages/postSearch/index.wxml             |  28 ++--
 subPackages/techanCart/index.wxml             |   4 +-
 subPackages/techanNew/index.wxml              |  38 +++---
 utils/wxParse/wxParse.wxml                    |   4 +-
 179 files changed, 1058 insertions(+), 1058 deletions(-)

diff --git a/pages/activity/artfestival/index.wxml b/pages/activity/artfestival/index.wxml
index a340838..89f9877 100644
--- a/pages/activity/artfestival/index.wxml
+++ b/pages/activity/artfestival/index.wxml
@@ -1,40 +1,40 @@
 <!--pages/activity/artfestival/index.wxml-->
-<image class="main-img" src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/top.png" mode="widthFix"></image>
-<image wx:if="{{imgIndex>-1 && imgIndex<list.length}}" src="{{list[imgIndex].head_img}}?x-oss-process=image/resize,w_500,m_lfit" bindload="imageLoad" mode="widthFix" class="testimg"></image>
+<image lazy-load class="main-img" src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/top.png" mode="widthFix"></image>
+<image lazy-load wx:if="{{imgIndex>-1 && imgIndex<list.length}}" src="{{list[imgIndex].head_img}}?x-oss-process=image/resize,w_500,m_lfit" bindload="imageLoad" mode="widthFix" class="testimg"></image>
 <view class="vr-box" bindtap="goVr">点击体验VR观展</view>
 <view class="menus">
   <view bindtap="changeType" data-type="1" class="menu{{index==1?' active':''}}">
-    <image src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==1?'1':'0'}}.png" mode="aspectFill"></image>
+    <image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==1?'1':'0'}}.png" mode="aspectFill"></image>
     <view>美术作品</view>
   </view>
   <view bindtap="changeType" data-type="3" class="menu{{index==3?' active':''}}">
-    <image src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==3?'1':'0'}}.png" mode="aspectFill"></image>
+    <image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==3?'1':'0'}}.png" mode="aspectFill"></image>
     <view>书法篆刻</view>
   </view>
   <view bindtap="changeType" data-type="2" class="menu{{index==2?' active':''}}">
-    <image src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==2?'1':'0'}}.png" mode="aspectFill"></image>
+    <image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==2?'1':'0'}}.png" mode="aspectFill"></image>
     <view>评委作品</view>
   </view>
   <view bindtap="changeType" data-type="4" class="menu{{index==4?' active':''}}">
-    <image src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==4?'1':'0'}}.png" mode="aspectFill"></image>
+    <image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/bg{{index==4?'1':'0'}}.png" mode="aspectFill"></image>
     <view>特邀作品</view>
   </view>
 </view>
 <view class="list">
   <view class="list-left">
     <view class="list-item" bindtap="previewImg" data-item="{{item}}" wx:for="{{left}}">
-      <image style="height:{{item.h}}rpx" src="{{item.head_img}}?x-oss-process=image/resize,w_500,m_lfit" mode="aspectFill"></image>
+      <image lazy-load style="height:{{item.h}}rpx" src="{{item.head_img}}?x-oss-process=image/resize,w_500,m_lfit" mode="aspectFill"></image>
       <view class="img-text textOver">{{item.title}}</view>
     </view>
   </view>
   <view class="list-left">
     <view class="list-item" bindtap="previewImg" data-item="{{item}}" wx:for="{{right}}">
-      <image style="height:{{item.h}}rpx" src="{{item.head_img}}?x-oss-process=image/resize,w_500,m_lfit" mode="aspectFill"></image>
+      <image lazy-load style="height:{{item.h}}rpx" src="{{item.head_img}}?x-oss-process=image/resize,w_500,m_lfit" mode="aspectFill"></image>
       <view class="img-text textOver">{{item.title}}</view>
     </view>
   </view>
 </view>
 <view class="nomore" wx:if="{{(left.length+right.length)>=total}}">没有更多数据了</view>
-<image src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/text.png" mode="widthFix" class="bottomimg"></image>
-<image bindtap="goTop" src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/topbtn.png" mode="widthFix" class="btnimg"></image>
+<image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/text.png" mode="widthFix" class="bottomimg"></image>
+<image lazy-load bindtap="goTop" src="https://m.cloud.sz-trip.com/static/images/activity/artfestival/topbtn.png" mode="widthFix" class="btnimg"></image>
 <view style="height:1rpx"></view>
\ No newline at end of file
diff --git a/pages/activity/autumnten/index.wxml b/pages/activity/autumnten/index.wxml
index 2b78fa5..22df12c 100644
--- a/pages/activity/autumnten/index.wxml
+++ b/pages/activity/autumnten/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/springten/index.wxml-->
 <title title="苏州游必选榜"></title>
-<image src="https://static.ticket.sz-trip.com/xcxImages/autumnten/top.png" mode="widthFix" class="top-img"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/autumnten/top.png" mode="widthFix" class="top-img"></image>
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">
   <view class="picker">
     <view class="areatext">{{areas[areaIndex].area_title}}</view>
@@ -9,7 +9,7 @@
 </picker>
 <view class="type-icons">
   <view wx:for="{{types}}" bindtap="changeType" data-type="{{index}}" class="type-icon {{type==index?'type-icon-active':''}}">
-    <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/bg{{type==index?'1':''}}.png"></image>
+    <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/bg{{type==index?'1':''}}.png"></image>
     <view class="icon-text">{{item}}</view>
   </view>
 </view>
@@ -17,11 +17,11 @@
 <view class="list" style="padding-bottom:30rpx">
   <view class="item-box" wx:for="{{list}}">
     <view class="item-bg"></view>
-    <image mode="widthFix" class="lefticon" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/lefticon.png"></image>
-    <image mode="widthFix" class="righticon" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/righticon.png"></image>
+    <image lazy-load mode="widthFix" class="lefticon" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/lefticon.png"></image>
+    <image lazy-load mode="widthFix" class="righticon" src="https://static.ticket.sz-trip.com/xcxImages/autumnten/righticon.png"></image>
     <view class="item">
       <view class="item-in">
-        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="item-info">
           <view class="item-title textOver">{{item.title}}</view>
           <view class="item-result textOver">上榜理由：{{item.brief_intro}}</view>
diff --git a/pages/activity/autumnten/list/index.wxml b/pages/activity/autumnten/list/index.wxml
index 7a83e50..c788c6c 100644
--- a/pages/activity/autumnten/list/index.wxml
+++ b/pages/activity/autumnten/list/index.wxml
@@ -7,6 +7,6 @@
       <view class="title textOver">{{item.title}}</view>
       <view class="address textOver"><text class="iconfont icon-location"></text>{{item.address}}</view>
     </view>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/autumnten/btn.png" mode="aspectFill"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/autumnten/btn.png" mode="aspectFill"></image>
   </view>
 </view>
diff --git a/pages/activity/graduate/index.wxml b/pages/activity/graduate/index.wxml
index 7e09944..9efb905 100644
--- a/pages/activity/graduate/index.wxml
+++ b/pages/activity/graduate/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/graduate/index.wxml-->
 <view style="position:relative;min-height:100vh">
-  <image style="position:absolute;top:0;left:0" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/top.png" mode="widthFix"></image>
+  <image lazy-load style="position:absolute;top:0;left:0" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/top.png" mode="widthFix"></image>
   <view class="top-menus">
     <view class="top-menu" bindtap="scrollToBox" data-index="1">好玩景点</view>
     <view class="top-menu" bindtap="scrollToBox" data-index="2">一日游</view>
@@ -9,22 +9,22 @@
   </view>
   <view style="height:650rpx"></view>
   <view class="list" wx:for="{{list}}" id="box{{index+1}}">
-    <image class="titleimg" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/title{{index+1}}.png"></image>
+    <image lazy-load class="titleimg" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/title{{index+1}}.png"></image>
     <view class="list-box">
       <view class="item" wx:for="{{item}}" bindtap="gotoDetail" data-item="{{item}}">
-        <image class="mainimg" src="{{item.headimg}}" mode="aspectFill"></image>
+        <image lazy-load class="mainimg" src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="title textOver">{{item.title}}</view>
         <view class="product-tags">
           <view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
         </view>
         <view class="product-bottom">
           <view class="price">￥<text>{{item.price/100}}</text></view>
-          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/btn.png"></image>
+          <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/btn.png"></image>
         </view>
       </view>
     </view>
   </view>
   <view style="height:80rpx"></view>
-  <image class="bottomtext" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bottom.png"></image>
-  <image class="bottombg" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bottombg.png" mode="widthFix"></image>
+  <image lazy-load class="bottomtext" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bottom.png"></image>
+  <image lazy-load class="bottombg" src="https://static.ticket.sz-trip.com/xcxImages/activity/graduate/bottombg.png" mode="widthFix"></image>
 </view>
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.wxml b/pages/activity/huawei/form/index.wxml
index b881647..e4a0c2e 100644
--- a/pages/activity/huawei/form/index.wxml
+++ b/pages/activity/huawei/form/index.wxml
@@ -1,8 +1,8 @@
 <!--pages/activity/huawei/form/index.wxml-->
 <title title="信息填写"></title>
-<image src="{{info.head_img}}" mode="widthFix" class="topimg"></image>
+<image lazy-load src="{{info.head_img}}" mode="widthFix" class="topimg"></image>
 <view class="input-box">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/huawei/regtip.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/huawei/regtip.png" mode="widthFix"></image>
   <view class="input-item">
     <view>姓名</view>
     <input bindinput="changeName" type="text" />
@@ -24,6 +24,6 @@
       </view>
     </picker>
   </view>
-  <image bindtap="submit" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsubmit.png" class="submit-btn" mode="widthFix"></image>
+  <image lazy-load bindtap="submit" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsubmit.png" class="submit-btn" mode="widthFix"></image>
 </view>
 <view style="height:30rpx"></view>
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxml b/pages/activity/huawei/index.wxml
index 774ee39..e4be85a 100644
--- a/pages/activity/huawei/index.wxml
+++ b/pages/activity/huawei/index.wxml
@@ -5,9 +5,9 @@
     <view bindtap="showRule" class="rule-btn">规则</view>
     <view wx:if="{{!isReg}}" class="tiptext">线上报名时间：{{info.sign_begin_time}} - {{info.sign_end_time}} </view>
     <view wx:if="{{!isReg}}" class="tiptext">线上投票时间：{{info.begin_time}} - {{info.end_time}} </view>
-    <image bindtap="gotoPath" style="margin-top:40rpx" data-path="form/index?id={{id}}" wx:if="{{!isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regbtn.png" mode="widthFix" class="btnimg"></image>
-    <image bindtap="gotoPath" data-path="upload/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix" class="btnimg"></image>
-    <image bindtap="gotoPath" data-path="list/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix" class="btnimg"></image>
+    <image lazy-load bindtap="gotoPath" style="margin-top:40rpx" data-path="form/index?id={{id}}" wx:if="{{!isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regbtn.png" mode="widthFix" class="btnimg"></image>
+    <image lazy-load bindtap="gotoPath" data-path="upload/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix" class="btnimg"></image>
+    <image lazy-load bindtap="gotoPath" data-path="list/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix" class="btnimg"></image>
     <view class="bottomtext">{{info.sub_title}}</view>
   </view>
 </view>
diff --git a/pages/activity/huawei/list/index.wxml b/pages/activity/huawei/list/index.wxml
index 3b18059..dbb0d71 100644
--- a/pages/activity/huawei/list/index.wxml
+++ b/pages/activity/huawei/list/index.wxml
@@ -6,7 +6,7 @@
 <view wx:if="{{list.length!=0}}">
   <view class="title">{{list[0].title}}</view>
   <view class="work-tips-my" wx:if="{{user_id}}">
-    <image src="{{list[0].user.avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{list[0].user.avatar}}" mode="aspectFill"></image>
     <view class="nickname">{{list[0].user.nickname}}</view>
     <text style="color:#333">作品id：{{list[0].id}}</text>
   </view>
@@ -16,7 +16,7 @@
     <text class="status{{list[0].status==1?' active':''}}">{{list[0].status_text}}</text>
   </view>
   <view class="refund-msg" wx:if="{{!user_id && list[0].status==2 && list[0].refund_msg}}">拒绝理由：{{list[0].refund_msg}}</view>
-  <image src="{{list[0].img}}" class="mainimg" mode="widthFix"></image>
+  <image lazy-load src="{{list[0].img}}" class="mainimg" mode="widthFix"></image>
   <view class="vote-box">
     <view class="count-num">当前得票：{{list[0].votes}}</view>
     <view class="vote-btn" wx:if="{{user_id}}" bindtap="vote">投票</view>
@@ -25,13 +25,13 @@
     {{list[0].desc}}
   </view>
   <view wx:if="{{!user_id}}" class="rule-btn" bindtap="showRule">规则</view>
-  <!-- <image wx:if="{{!user_id}}" style="width:646rpx" bindtap="reUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/reupload.png" mode="widthFix"></image> -->
+  <!-- <image lazy-load wx:if="{{!user_id}}" style="width:646rpx" bindtap="reUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/reupload.png" mode="widthFix"></image> -->
   <view wx:if="{{!user_id}}" style="height:50rpx"></view>
 </view>
 <view wx:else>
-  <image class="emptyimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/emptyimg.png" mode="widthFix"></image>
+  <image lazy-load class="emptyimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/emptyimg.png" mode="widthFix"></image>
   <view class="tip1">投票已开始，无法上传作品！</view>
-  <!-- <image bindtap="gotoUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image> -->
+  <!-- <image lazy-load bindtap="gotoUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image> -->
 </view>
 <view class="mask" wx:if="{{detail && showRuleFlag}}">
   <view bindtap="showRule" class="mask-bg"></view>
diff --git a/pages/activity/huawei/result/index.wxml b/pages/activity/huawei/result/index.wxml
index 3f7b432..c322998 100644
--- a/pages/activity/huawei/result/index.wxml
+++ b/pages/activity/huawei/result/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/activity/huawei/result/index.wxml-->
 <title title="报名成功"></title>
-<image class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsuccess.png" mode="widthFix"></image>
+<image lazy-load class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsuccess.png" mode="widthFix"></image>
 <view class="text">恭喜您已报名成功！</view>
 <view>点击下方按钮开始进行作品上传</view>
-<image class="arrowimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/resarrow.png" mode="widthFix"></image>
-<image bindtap="upload" class="uploadimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png"></image>
+<image lazy-load class="arrowimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/resarrow.png" mode="widthFix"></image>
+<image lazy-load bindtap="upload" class="uploadimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png"></image>
diff --git a/pages/activity/huawei/upload/index.wxml b/pages/activity/huawei/upload/index.wxml
index 49aa817..f35bff1 100644
--- a/pages/activity/huawei/upload/index.wxml
+++ b/pages/activity/huawei/upload/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/huawei/upload/index.wxml-->
 <title title="作品上传"></title>
-<image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadtop.png" mode="widthFix"></image>
+<image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadtop.png" mode="widthFix"></image>
 <view class="input-box">
   <view class="input-item">
     <text>作品标题</text>
@@ -30,9 +30,9 @@
   </view>
 </view>
 <view class="tip1">上传图片</view>
-<image wx:if="{{img}}" class="uploadimg" bindtap="uploadImg" src="{{img}}" mode="aspectFill"></image>
-<image wx:else class="uploadimg" bindtap="uploadImg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadimg.png" mode="widthFix"></image>
+<image lazy-load wx:if="{{img}}" class="uploadimg" bindtap="uploadImg" src="{{img}}" mode="aspectFill"></image>
+<image lazy-load wx:else class="uploadimg" bindtap="uploadImg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadimg.png" mode="widthFix"></image>
 <view class="tip1">作品描述</view>
 <textarea bindinput="changeContent" placeholder="请添加您作品的描述（最多300字）" class="textarea"></textarea>
-<image bindtap="submit" class="uploadbtn" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image>
+<image lazy-load bindtap="submit" class="uploadbtn" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image>
 <view class="tip2">一个分类的作品多次提交，平台只保留最近上传的作品</view>
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxml b/pages/activity/huawei/uploadres/index.wxml
index 14e0cd8..76a59da 100644
--- a/pages/activity/huawei/uploadres/index.wxml
+++ b/pages/activity/huawei/uploadres/index.wxml
@@ -1,8 +1,8 @@
 <!--pages/activity/huawei/uploadres/index.wxml-->
 <title title="上传成功"></title>
-<image class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadres.png" mode="widthFix"></image>
+<image lazy-load class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadres.png" mode="widthFix"></image>
 <view class="tip1">恭喜您的作品已上传完成！</view>
-<image class="btnimg" bindtap="backhome" data-path="/pages/index/index" src="https://static.ticket.sz-trip.com/xcxImages/huawei/gobtn.png" mode="widthFix"></image>
-<image class="btnimg" bindtap="gotoPath" data-path="../list/index?id={{id}}" style="margin-bottom:92rpx" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix"></image>
+<image lazy-load class="btnimg" bindtap="backhome" data-path="/pages/index/index" src="https://static.ticket.sz-trip.com/xcxImages/huawei/gobtn.png" mode="widthFix"></image>
+<image lazy-load class="btnimg" bindtap="gotoPath" data-path="../list/index?id={{id}}" style="margin-bottom:92rpx" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix"></image>
 <view class="tip2">通过第一轮评审的摄影作品将在9月1号后</view>
 <view class="tip2">进行线上展示，请注意查看平台通知</view>
\ No newline at end of file
diff --git a/pages/activity/newarrival/index.wxml b/pages/activity/newarrival/index.wxml
index 1b11062..9b9a3f1 100644
--- a/pages/activity/newarrival/index.wxml
+++ b/pages/activity/newarrival/index.wxml
@@ -1,10 +1,10 @@
 <!--pages/activity/newarrival/index.wxml-->
-<image src="https://m.cloud.sz-trip.com/static/images/activity/newarrival/topBac.png" mode="widthFix" class="main-img"></image>
+<image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/newarrival/topBac.png" mode="widthFix" class="main-img"></image>
 <view class="title">景点门票</view>
 <view class="subtitle">新品来袭 爆款推荐</view>
 <view class="list" wx:if="{{list1.length}}">
   <view class="item" wx:for="{{list1}}">
-    <image src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="product-title textOver">{{item.title}}</view>
     <view class="product-tags">
       <view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -20,7 +20,7 @@
 <view class="subtitle">甄选好货 口碑之选</view>
 <view class="list" wx:if="{{list2.length}}">
   <view class="item" wx:for="{{list2}}">
-    <image src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="product-title textOver">{{item.title}}</view>
     <view class="product-tags">
       <view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -36,7 +36,7 @@
 <view class="subtitle">精湛演出 生动体验</view>
 <view class="list" wx:if="{{list3.length}}">
   <view class="item" wx:for="{{list3}}">
-    <image src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="product-title textOver">{{item.title}}</view>
     <view class="product-tags">
       <view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -52,7 +52,7 @@
 <view class="subtitle">精挑细选 好物推荐</view>
 <view class="list" wx:if="{{list4.length}}">
   <view class="item" wx:for="{{list4}}">
-    <image src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="product-title textOver">{{item.title}}</view>
     <view class="product-tags">
       <view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -63,5 +63,5 @@
     </view>
   </view>
 </view>
-<image class="logo" src="https://m.cloud.sz-trip.com/static/images/activity/newarrival/botLogo.png" mode="widthFix"></image>
+<image lazy-load class="logo" src="https://m.cloud.sz-trip.com/static/images/activity/newarrival/botLogo.png" mode="widthFix"></image>
 <view style="height:1rpx"></view>
\ No newline at end of file
diff --git a/pages/activity/redlist/index.wxml b/pages/activity/redlist/index.wxml
index c5c99de..45afe6e 100644
--- a/pages/activity/redlist/index.wxml
+++ b/pages/activity/redlist/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/activity/redlist/index.wxml-->
-<image src="https://static.ticket.sz-trip.com/xcxImages/listtop/redlist.png" mode="widthFix" class="mainimg"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/listtop/redlist.png" mode="widthFix" class="mainimg"></image>
 <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
-  <image src="{{item.headimg}}" mode="aspectFill" class="mainimg"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="mainimg"></image>
   <view class="item-info">
     <view class="item-title textOver">{{item.title}}</view>
     <view class="tags">
@@ -13,4 +13,4 @@
     </view>
   </view>
 </view>
-<image bindtap="goTop" mode="widthFix" src="https://m.cloud.sz-trip.com/static/images/activity/redTravel/return.png" class="top"></image>
\ No newline at end of file
+<image lazy-load bindtap="goTop" mode="widthFix" src="https://m.cloud.sz-trip.com/static/images/activity/redTravel/return.png" class="top"></image>
\ No newline at end of file
diff --git a/pages/activity/spring2021/index.wxml b/pages/activity/spring2021/index.wxml
index dd676af..5cb3f15 100644
--- a/pages/activity/spring2021/index.wxml
+++ b/pages/activity/spring2021/index.wxml
@@ -1,10 +1,10 @@
 <!--pages/activity/spring2021/index.wxml-->
-<image mode="widthFix" class="main-img topimg" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/top.png"></image>
+<image lazy-load mode="widthFix" class="main-img topimg" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/top.png"></image>
 <view style="height:613rpx"></view>
 <view class="list" wx:if="{{list1.length>0}}">
   <view class="list-in" wx:for="{{list1}}">
     <view class="item1" wx:for="{{item}}" bindtap="gotoDetail" data-item="{{item}}">
-      <image src="{{item.headimg}}"></image>
+      <image lazy-load src="{{item.headimg}}"></image>
       <view class="textOver item1-title">{{item.title}}</view>
       <view class="item1-bottom">
         <view class="item1-price">{{item.price/100}}</view>
@@ -14,11 +14,11 @@
   </view>
 </view>
 <view wx:else style="height:100rpx"></view>
-<image style="margin:30rpx 0" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/title1.jpg" class="main-img" mode="widthFix"></image>
+<image lazy-load style="margin:30rpx 0" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/title1.jpg" class="main-img" mode="widthFix"></image>
 <view class="list list2" wx:if="{{list2.length>0}}">
   <view class="list-in list-in2">
     <view class="item1 item2" wx:for="{{list2}}" bindtap="gotoDetail" data-item="{{item}}">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="textOver item1-title item2-title">{{item.title}}</view>
       <view class="item1-bottom">
         <view class="item1-price item2-price">{{item.price/100}}</view>
@@ -27,11 +27,11 @@
     </view>
   </view>
 </view>
-<image style="margin:30rpx 0" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/title2.jpg" class="main-img" mode="widthFix"></image>
+<image lazy-load style="margin:30rpx 0" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/title2.jpg" class="main-img" mode="widthFix"></image>
 <view class="list" wx:if="{{list3.length>0}}" style="margin-top:-160rpx">
   <view class="list-in" wx:for="{{list3}}">
     <view class="item1" wx:for="{{item}}" bindtap="gotoDetail" data-item="{{item}}">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="textOver item1-title">{{item.title}}</view>
       <view class="item1-bottom">
         <view class="item1-price">{{item.price/100}}</view>
@@ -40,4 +40,4 @@
     </view>
   </view>
 </view>
-<image class="main-img" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/bottom.jpg"></image>
\ No newline at end of file
+<image lazy-load class="main-img" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/spring2021/bottom.jpg"></image>
\ No newline at end of file
diff --git a/pages/activity/springten/index.wxml b/pages/activity/springten/index.wxml
index 5eb19f4..06d2bb9 100644
--- a/pages/activity/springten/index.wxml
+++ b/pages/activity/springten/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/activity/springten/index.wxml-->
 <title title="苏州游必选榜"></title>
-<image src="https://m.cloud.sz-trip.com/static/images/activity/topten/topBacNew.png" mode="widthFix" class="top-img"></image>
+<image lazy-load src="https://m.cloud.sz-trip.com/static/images/activity/topten/topBacNew.png" mode="widthFix" class="top-img"></image>
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">
   <view class="picker">
     <view class="areatext">{{areas[areaIndex].area_title}}</view>
@@ -9,7 +9,7 @@
 </picker>
 <view class="type-icons">
   <view wx:for="{{types}}" bindtap="changeType" data-type="{{index}}" class="type-icon {{type==index?'type-icon-active':''}}">
-    <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/springten/icon{{type==index?'2':'1'}}.png"></image>
+    <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/springten/icon{{type==index?'2':'1'}}.png"></image>
     <view class="icon-text">{{item}}</view>
   </view>
 </view>
@@ -17,7 +17,7 @@
 <view class="list" style="padding-bottom:30rpx">
   <view class="item" wx:for="{{list}}">
     <view class="item-in">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-title textOver">{{item.title}}</view>
         <view class="item-result textOver">上榜理由：{{item.brief_intro}}</view>
diff --git a/pages/activity/springten/list/index.wxml b/pages/activity/springten/list/index.wxml
index 644c35e..ff03706 100644
--- a/pages/activity/springten/list/index.wxml
+++ b/pages/activity/springten/list/index.wxml
@@ -5,5 +5,5 @@
     <view class="title textOver">{{item.title}}</view>
     <view class="address textOver"><text class="iconfont icon-location"></text>{{item.address}}</view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/uploads/20210401/62fed792ae34b824a7c3ae1a30a142c8.png" mode="aspectFill"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20210401/62fed792ae34b824a7c3ae1a30a142c8.png" mode="aspectFill"></image>
 </view>
diff --git a/pages/activity/subway/index.wxml b/pages/activity/subway/index.wxml
index d1208cb..85b9479 100644
--- a/pages/activity/subway/index.wxml
+++ b/pages/activity/subway/index.wxml
@@ -1,20 +1,20 @@
 <!--pages/activity/subway/index.wxml-->
 <title title="坐着地铁游苏州"></title>
-<image style="position:absolute;left:0;height:994rpx" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/top.png" mode="aspectFill"></image>
+<image lazy-load style="position:absolute;left:0;height:994rpx" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/top.png" mode="aspectFill"></image>
 <view style="height:949rpx"></view>
 <view class="lines{{isFixed?' fixed-lines':''}}">
   <view bindtap="changeLine" data-index="{{index}}" class="line{{index==line?' active':''}}" wx:for="{{5}}">{{index+1}}号线</view>
 </view>
 <view wx:if="{{isFixed}}" style="height:110rpx"></view>
 <view class="content" id="content" style="background:{{colors[line]}}">
-  <image mode="widthFix" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/title{{line+1}}.png"></image>
-  <image bindtap="showMap" data-src="https://static.ticket.sz-trip.com/xcxImages/subway/map{{line+1}}-1.png" class="mapimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/map{{line+1}}.png"></image>
+  <image lazy-load mode="widthFix" class="mainimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/title{{line+1}}.png"></image>
+  <image lazy-load bindtap="showMap" data-src="https://static.ticket.sz-trip.com/xcxImages/subway/map{{line+1}}-1.png" class="mapimg" src="https://static.ticket.sz-trip.com/xcxImages/subway/map{{line+1}}.png"></image>
   <view class="tags">
-    <view bindtap="changeTag" style="color:{{colors[line]}}" data-index="{{index}}" class="tag{{tagIndex==index?' active':''}}" wx:for="{{tags[line]}}"><view class="tagtext">{{item.name}}</view><image wx:if="{{tagIndex==index}}" src="https://static.ticket.sz-trip.com/xcxImages/subway/arrow.png"></image></view>
+    <view bindtap="changeTag" style="color:{{colors[line]}}" data-index="{{index}}" class="tag{{tagIndex==index?' active':''}}" wx:for="{{tags[line]}}"><view class="tagtext">{{item.name}}</view><image lazy-load wx:if="{{tagIndex==index}}" src="https://static.ticket.sz-trip.com/xcxImages/subway/arrow.png"></image></view>
     <view style="width:1rpx;height:1rpx;flex-shrink:0"></view>
   </view>
   <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" style="background-image:url('https://static.ticket.sz-trip.com/xcxImages/subway/bg{{line+1}}.png');background-size:100% 100%;">
-    <image src="{{item.headimg}}" class="headimg" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" class="headimg" mode="aspectFill"></image>
     <view class="right-info">
       <view class="title textOver">{{item.title}}</view>
       <view style="color:{{colors[line]}} !important" class="subtitle textOver">{{item.brief_intro}}</view>
@@ -24,10 +24,10 @@
   <view wx:if="{{list.length<total}}" class="morebtn" bindtap="getList">点击查看更多 <text>>></text></view>
   <view style="height:1rpx"></view>
 </view>
-<image src="https://static.ticket.sz-trip.com/xcxImages/subway/text.png" mode="widthFix" class="textimg"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/subway/text.png" mode="widthFix" class="textimg"></image>
 <view style="height:53rpx"></view>
-<image src="https://static.ticket.sz-trip.com/xcxImages/subway/bottom.png" mode="widthFix" class="mainimg bottomimg"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/subway/bottom.png" mode="widthFix" class="mainimg bottomimg"></image>
 <view class="topbtn" bindtap="toTop">
-  <image mode="wdithFix" src="https://static.ticket.sz-trip.com/xcxImages/subway/totop.png"></image>
+  <image lazy-load mode="wdithFix" src="https://static.ticket.sz-trip.com/xcxImages/subway/totop.png"></image>
   <view>顶部</view>
 </view>
\ No newline at end of file
diff --git a/pages/activity/suyear/index.wxml b/pages/activity/suyear/index.wxml
index 9d2886c..6b3f3bc 100644
--- a/pages/activity/suyear/index.wxml
+++ b/pages/activity/suyear/index.wxml
@@ -1,18 +1,18 @@
 <!--pages/activity/suyear/index.wxml-->
 <title title="留苏过大年"></title>
 <view style="position:relative">
-  <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/top.png" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/top.png" mode="widthFix" class="main-img"></image>
   <view class="area-list">
-    <image bindtap="changeArea" data-area="{{item.areaid}}" wx:for="{{tabs}}" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/{{item.imgname}}.png" mode="widthFix" class="area-img"></image>
+    <image lazy-load bindtap="changeArea" data-area="{{item.areaid}}" wx:for="{{tabs}}" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/{{item.imgname}}.png" mode="widthFix" class="area-img"></image>
   </view>
 </view>
 <view class="list">
   <view class="item" bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}">
-    <image class="border" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/border.png" mode="widthFix"></image>
-    <image src="{{item.headimg}}" class="product-img" mode="aspectFill"></image>
-    <image wx:if="{{item.area_id}}" mode="widthFix" class="addressimg" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/{{item.area_id}}.png"></image>
-    <image class="bgimg" mode="widthFix" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/bg.png"></image>
+    <image lazy-load class="border" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/border.png" mode="widthFix"></image>
+    <image lazy-load src="{{item.headimg}}" class="product-img" mode="aspectFill"></image>
+    <image lazy-load wx:if="{{item.area_id}}" mode="widthFix" class="addressimg" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/{{item.area_id}}.png"></image>
+    <image lazy-load class="bgimg" mode="widthFix" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/bg.png"></image>
     <view class="title textOver2">{{item.title}}</view>
-    <image class="btn" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/btn.png" mode="widthFix"></image>
+    <image lazy-load class="btn" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/suyear/btn.png" mode="widthFix"></image>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/activity/tenscenic/index.wxml b/pages/activity/tenscenic/index.wxml
index 2fa8c10..1226cfb 100644
--- a/pages/activity/tenscenic/index.wxml
+++ b/pages/activity/tenscenic/index.wxml
@@ -6,9 +6,9 @@
     <view class="iconfont icon-xia"></view>
   </view>
 </picker>
-<image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/top.png" mode="widthFix" class="topimg"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/top.png" mode="widthFix" class="topimg"></image>
 <view class="video-box" wx:if="{{playFlag==false}}" bindtap="play">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/play.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/play.png" mode="widthFix"></image>
 </view>
 <view class="video-box1" wx:else>
   <video autoplay="{{true}}" bindended="playEnd" src="https://static.ticket.sz-trip.com/uploads/20210803/9acc76d92267c923044c8a335301e13e.mp4"></video>
@@ -21,7 +21,7 @@
     <view bindtap="changeTag" data-tag="3" class="tag{{tag1==3?' active':''}}">横塘驿站</view>
     <view bindtap="changeTag" data-tag="4" class="tag{{tag1==4?' active':''}}">宝带桥</view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/bridge.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/bridge.png" mode="widthFix"></image>
   <view class="tags" style="position:static;margin-top:20rpx">
     <view bindtap="changeTag" data-tag="5" class="tag{{tag1==5?' active':''}}">浒墅关</view>
     <view bindtap="changeTag" data-tag="6" class="tag{{tag1==6?' active':''}}">枫桥夜泊</view>
@@ -44,7 +44,7 @@
   <view bindtap="changeTag2" data-tag="73" class="new-tag{{tag2==73?' active':''}}">必玩</view> -->
 </view>
 <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver title">{{item.title}}</view>
     <view class="textOver subtitle">上榜理由：{{item.brief_intro}}</view>
@@ -54,6 +54,6 @@
 <view wx:if="{{list.length==total}}" class="nomore">没有更多了</view>
 <view style="height:50rpx"></view>
 <view class="fixed-top" bindtap="goTop">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/arrow.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/tenscenic/arrow.png" mode="widthFix"></image>
   <view>顶部</view>
 </view>
\ No newline at end of file
diff --git a/pages/activity/year2020/index.wxml b/pages/activity/year2020/index.wxml
index 833d935..1371d73 100644
--- a/pages/activity/year2020/index.wxml
+++ b/pages/activity/year2020/index.wxml
@@ -1,34 +1,34 @@
 <!--pages/activity/year2020/index.wxml-->
 <title title="年货节"></title>
 <view style="position:relative">
-  <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/top.jpg" mode="widthFix" class="yearimg" style="margin-top:0"></image>
+  <image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/top.jpg" mode="widthFix" class="yearimg" style="margin-top:0"></image>
   <view bindtap="gotoScroll" data-index="1" class="block1"></view>
   <view bindtap="gotoScroll" data-index="2" class="block2"></view>
 </view>
 <view class="product-list">
-  <image bindtap="gotoDetail" data-item="{{item}}" style="{{zhouzhuang.length%2==1 && index==zhouzhuang.length-1?'width:730rpx;height:290rpx;':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{zhouzhuang}}"></image>
+  <image lazy-load bindtap="gotoDetail" data-item="{{item}}" style="{{zhouzhuang.length%2==1 && index==zhouzhuang.length-1?'width:730rpx;height:290rpx;':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{zhouzhuang}}"></image>
 </view>
-<image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/haofengguang.jpg" mode="widthFix" class="yearimg" id="box1"></image>
+<image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/haofengguang.jpg" mode="widthFix" class="yearimg" id="box1"></image>
 <view class="product-list">
-  <image bindtap="gotoDetail" data-item="{{item}}" style="{{haofengguang.length%2==1 && index==haofengguang.length-1?'width:730rpx;height:290rpx;':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{haofengguang}}"></image>
+  <image lazy-load bindtap="gotoDetail" data-item="{{item}}" style="{{haofengguang.length%2==1 && index==haofengguang.length-1?'width:730rpx;height:290rpx;':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{haofengguang}}"></image>
 </view>
-<image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/dongshan.jpg" mode="widthFix" class="yearimg" id="box2"></image>
+<image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/dongshan.jpg" mode="widthFix" class="yearimg" id="box2"></image>
 <view class="product-list">
-  <image bindtap="gotoDetail" data-item="{{item}}" style="{{dongshan.length%2==1 && index==dongshan.length-1?'width:730rpx;height:290rpx':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{dongshan}}"></image>
+  <image lazy-load bindtap="gotoDetail" data-item="{{item}}" style="{{dongshan.length%2==1 && index==dongshan.length-1?'width:730rpx;height:290rpx':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{dongshan}}"></image>
 </view>
-<image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/huqiu.jpg" mode="widthFix" class="yearimg"></image>
+<image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/huqiu.jpg" mode="widthFix" class="yearimg"></image>
 <view class="product-list">
-  <image bindtap="gotoDetail" data-item="{{item}}" style="{{huqiu.length%2==1 && index==huqiu.length-1?'width:730rpx;height:290rpx':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{huqiu}}"></image>
+  <image lazy-load bindtap="gotoDetail" data-item="{{item}}" style="{{huqiu.length%2==1 && index==huqiu.length-1?'width:730rpx;height:290rpx':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{huqiu}}"></image>
 </view>
-<image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/jiangnan.jpg" mode="widthFix" class="yearimg"></image>
+<image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/jiangnan.jpg" mode="widthFix" class="yearimg"></image>
 <view class="product-list">
-  <image bindtap="gotoDetail" data-item="{{item}}" style="{{jiangnan.length%2==1 && index==jiangnan.length-1?'width:730rpx;height:290rpx':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{jiangnan}}"></image>
+  <image lazy-load bindtap="gotoDetail" data-item="{{item}}" style="{{jiangnan.length%2==1 && index==jiangnan.length-1?'width:730rpx;height:290rpx':''}}" src="{{item.img}}" mode="aspectFill" wx:for="{{jiangnan}}"></image>
 </view>
-<image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/bixuan.jpg" mode="widthFix" class="yearimg"></image>
+<image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/bixuan.jpg" mode="widthFix" class="yearimg"></image>
 <view class="product-list">
   <view bindtap="gotoDetail2" data-item="{{item}}" class="product-item" wx:for="{{list}}">
-    <image class="main-img" src="{{item.headimg}}" mode="aspectFill"></image>
-    <image class="bg-img" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/bg.png" mode="aspectFill"></image>
+    <image lazy-load class="main-img" src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="bg-img" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/bg.png" mode="aspectFill"></image>
     <view class="info-box">
       <view class="title textOver">{{item.title}}</view>
       <view class="subtitle textOver">{{item.subtitle}}</view>
@@ -38,7 +38,7 @@
           <view>￥</view>
         </view>
         <view class="price">{{item.price/100}}</view>
-        <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/btn.png" mode="widthFix"></image>
+        <image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/btn.png" mode="widthFix"></image>
       </view>
     </view>
   </view>
diff --git a/pages/ask/index.wxml b/pages/ask/index.wxml
index 51950ae..e496f9f 100644
--- a/pages/ask/index.wxml
+++ b/pages/ask/index.wxml
@@ -1,17 +1,17 @@
 <!--pages/ask/index.wxml-->
 <title title="问大家">
   <navigator url="my/index" class="ask-top-right" style="right:{{menuWidth}}px">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/ask/my.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/ask/my.png" mode="widthFix"></image>
     <view>我的问答</view>
   </navigator>
 </title>
 <navigator url="info/index?id={{item.id}}" class="item" wx:for="{{list}}">
   <view class="item-ques">
-    <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+    <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
     <view class="ques">{{item.question_name}}</view>
   </view>
   <view class="item-ques">
-    <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+    <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
     <view class="ans">{{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}}</view>
   </view>
   <view class="ques-tip">
diff --git a/pages/ask/info/index.wxml b/pages/ask/info/index.wxml
index 58f1dc7..8cd9267 100644
--- a/pages/ask/info/index.wxml
+++ b/pages/ask/info/index.wxml
@@ -6,14 +6,14 @@
     <view class="iconfont icon-you"></view>
   </navigator>
   <view class="ques-top">
-    <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+    <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
     <view class="ques">{{info.question_name}}</view>
   </view>
   <view class="ques-time">{{info.created_time}}提问</view>
 </view>
 <view class="list">
   <view class="list-top">
-    <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+    <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
     <view wx:if="{{total>0}}">共{{total}}个回答</view>
     <view wx:else>暂无回答</view>
   </view>
@@ -22,7 +22,7 @@
   </view>
   <view class="item" wx:for="{{list}}">
     <view class="author-info">
-      <image src="{{item.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.avatar}}" mode="aspectFill"></image>
       <view>{{item.nickname}}</view>
     </view>
     <view class="content">{{item.answer}}</view>
diff --git a/pages/ask/my/index.wxml b/pages/ask/my/index.wxml
index b64c779..dc2c42d 100644
--- a/pages/ask/my/index.wxml
+++ b/pages/ask/my/index.wxml
@@ -11,11 +11,11 @@
   </navigator>
   <navigator url="../info/index?id={{item.id || item.question_id}}" class="ans-item" wx:for='{{item.my_questions}}'>
     <view class="item-ques">
-      <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+      <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
       <view class="ques">{{item.question_name}}</view>
     </view>
     <view class="item-ques">
-      <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+      <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
       <view class="ans">{{item.answers && item.answers.rows && item.answers.rows[0]?item.answers.rows[0].answer:"暂无回答"}}</view>
     </view>
     <view class="ques-tip">
diff --git a/pages/component/commonImage/index.wxml b/pages/component/commonImage/index.wxml
index ce03897..d3e287a 100644
--- a/pages/component/commonImage/index.wxml
+++ b/pages/component/commonImage/index.wxml
@@ -1,3 +1,3 @@
 <!--pages/component/commonImage/index.wxml-->
-<image wx:if='{{!finishLoadFlag}}' mode='{{mode}}' src='{{defaultImage}}' style='display:block;{{width ? "width:" + width : ""}};{{height ? "height:" + height : ""}}' />
-<image mode='{{mode}}' class='{{finishLoadFlag ? "" : "before-load"}}' src='{{src}}' bindload='finishLoad' style='display:block;{{finishLoadFlag && width ? "width:" + width : ""}};{{finishLoadFlag && height ? "height:" + height : ""}}' />
+<image lazy-load wx:if='{{!finishLoadFlag}}' mode='{{mode}}' src='{{defaultImage}}' style='display:block;{{width ? "width:" + width : ""}};{{height ? "height:" + height : ""}}' />
+<image lazy-load mode='{{mode}}' class='{{finishLoadFlag ? "" : "before-load"}}' src='{{src}}' bindload='finishLoad' style='display:block;{{finishLoadFlag && width ? "width:" + width : ""}};{{finishLoadFlag && height ? "height:" + height : ""}}' />
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 02d248a..15ed6c6 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -3,7 +3,7 @@
 <view class="title-wrap">
     <view class="change-date">
         <view class="prev" bindtap="changeMonthFun" data-type="prev">
-            <image style="margin-right: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/283ac46c0fab03c04dad40f765854514.png" mode="" />
+            <image lazy-load style="margin-right: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/283ac46c0fab03c04dad40f765854514.png" mode="" />
             <text wx:if="{{currentViewType==='month'}}">上一月</text>
             <text wx:else>上一周</text>
         </view>
@@ -13,13 +13,13 @@
         <view class="next" bindtap="changeMonthFun" data-type="next" >
             <text wx:if="{{currentViewType==='month'}}">下一月</text>
             <text wx:else>下一周 </text>
-            <image style="margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/ab2097432f5c34915665cb376e72c4aa.png" mode="" />
+            <image lazy-load style="margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/ab2097432f5c34915665cb376e72c4aa.png" mode="" />
         </view>
     </view>
 </view>
 <!-- 日期 -->
 <view class="date-wrap">
-    <image wx:if="{{currentViewType === 'month'}}" class="bottom-image" src="https://static.ticket.sz-trip.com/uploads/20250421/a0b731399b5c348ae4dc5199c9034ab5.png"></image>
+    <image lazy-load wx:if="{{currentViewType === 'month'}}" class="bottom-image" src="https://static.ticket.sz-trip.com/uploads/20250421/a0b731399b5c348ae4dc5199c9034ab5.png"></image>
 
     <view class="week">
         <text wx:for="{{weeksArr}}" wx:key="*this">{{item}}</text>
@@ -57,11 +57,11 @@
     <view class="footer" bindtap="toggleMode">
         <!-- <view class="arrow {{currentViewType==='month'?'arrow-up':'arrow-down'}}">></view>
         <view> {{currentViewType==="month"?"收起":"更多"}} </view> -->
-        <image wx:if="{{currentViewType==='week'}}" src="https://static.ticket.sz-trip.com/uploads/20240327/8b5f8a284de3831392560c367f8c59ca.png" mode=""/>
-        <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
+        <image lazy-load wx:if="{{currentViewType==='week'}}" src="https://static.ticket.sz-trip.com/uploads/20240327/8b5f8a284de3831392560c367f8c59ca.png" mode=""/>
+        <image lazy-load wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
     </view>
     <!-- 节假日花样 -->
-    <!-- <image wx:if="{{currentViewType==='month'}}" style="width: 250rpx;height: 144.67rpx;position: absolute;right: 0;bottom: 30.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240605/1dda9e2e0fbc5d64aef702b5e692b2e5.png" mode=""/> -->
+    <!-- <image lazy-load wx:if="{{currentViewType==='month'}}" style="width: 250rpx;height: 144.67rpx;position: absolute;right: 0;bottom: 30.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240605/1dda9e2e0fbc5d64aef702b5e692b2e5.png" mode=""/> -->
 </view> 
 
  
\ No newline at end of file
diff --git a/pages/component/orderAdv/orderAdv.wxml b/pages/component/orderAdv/orderAdv.wxml
index dbbb929..1715ac8 100644
--- a/pages/component/orderAdv/orderAdv.wxml
+++ b/pages/component/orderAdv/orderAdv.wxml
@@ -1,5 +1,5 @@
 <view>
 	<view class="box" wx:if="{{advList.length > 0}}">
-		<image src="{{advList[0].head_img}}" mode="scaleToFill" bindtap="bannerClick" data-item="{{advList[0]}}"></image>
+		<image lazy-load src="{{advList[0].head_img}}" mode="scaleToFill" bindtap="bannerClick" data-item="{{advList[0]}}"></image>
 	</view>
 </view>
\ No newline at end of file
diff --git a/pages/component/proRec/proRec.wxml b/pages/component/proRec/proRec.wxml
index cd6fe91..86fb248 100644
--- a/pages/component/proRec/proRec.wxml
+++ b/pages/component/proRec/proRec.wxml
@@ -4,7 +4,7 @@
   <view class="tj-list" wx:else>
     <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
     <view class="item-hd">
-      <image src="{{item.headimg}}"></image>
+      <image lazy-load src="{{item.headimg}}"></image>
     </view>
     <view class="item-bm">
       <view class="protitle textOver">{{item.title}}</view>
diff --git a/pages/culture/index.wxml b/pages/culture/index.wxml
index f9e4564..2e17fad 100644
--- a/pages/culture/index.wxml
+++ b/pages/culture/index.wxml
@@ -12,7 +12,7 @@
     </view>
     <picker mode="date" value="{{date}}" start="1970-01-01" end="2027-09-01" bindchange="bindDateChange">
       <view class="picker calendar-img">
-        <image width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/xcxImages/activity/calendar.png"></image>
+        <image lazy-load width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/xcxImages/activity/calendar.png"></image>
       </view>
     </picker>
   </view>
@@ -26,7 +26,7 @@
 </view>
 <view class="list" id="types">
   <navigator url="info/index?id={{item.id}}" class="item" wx:for="{{list}}">
-    <image src="{{item.cover}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.cover}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="textOver2">{{item.name}}</view>
       <view wx:if="{{item.activity_end_date && item.activity_date}}" style="margin-bottom:5rpx;margin-top:3rpx">{{item.activity_date}}-{{item.activity_end_date}}</view>
diff --git a/pages/culture/info/index.wxml b/pages/culture/info/index.wxml
index a2c3cbd..2966740 100644
--- a/pages/culture/info/index.wxml
+++ b/pages/culture/info/index.wxml
@@ -2,15 +2,15 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="活动详情"></title>
 <view wx:if="{{info}}">
-  <image src="{{info.cover}}" mode="widthFix" class="swiper"></image>
+  <image lazy-load src="{{info.cover}}" mode="widthFix" class="swiper"></image>
   <view class="top-box">
     <view class="top-box-title">{{info.name}}</view>
     <view class="top-tip-box" wx:if="{{info.begin_date || info.end_date}}">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/time.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/time.png" mode="widthFix"></image>
       <text>活动时间：{{info.begin_date}} ~ {{info.end_date}}</text>
     </view>
     <view class="top-tip-box" wx:if="{{info.address}}">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/location.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/location.png" mode="widthFix"></image>
       <text>活动地点：{{info.address}}</text>
     </view>
   </view>
diff --git a/pages/group/apply/index.wxml b/pages/group/apply/index.wxml
index 3d9aae5..d5e98f7 100644
--- a/pages/group/apply/index.wxml
+++ b/pages/group/apply/index.wxml
@@ -35,7 +35,7 @@
 </view>
 <view wx:elif="{{step==1}}">
   <view class="inputs" style="height:400rpx">
-    <view class="com-flex top-tip"><image src="http://erdos-yijiyou.oss-cn-huhehaote.aliyuncs.com/uploads/20220211/30e03ed2db0b8267299bf24cba752bb0.png" mode="widthFix"></image>信息提交成功</view>
+    <view class="com-flex top-tip"><image lazy-load src="http://erdos-yijiyou.oss-cn-huhehaote.aliyuncs.com/uploads/20220211/30e03ed2db0b8267299bf24cba752bb0.png" mode="widthFix"></image>信息提交成功</view>
     <view class="info">姓名：      {{applyInfo.apply_user}}</view>
     <view class="info">手机号码：{{applyInfo.mobile}}</view>
     <view class="info">机构名称：{{applyInfo.organization_name}}</view>
@@ -45,7 +45,7 @@
 </view>
 <view wx:elif="{{step==2}}">
   <view class="inputs" style="height:400rpx">
-    <view class="com-flex top-tip" style="background:#D62828"><image src="https://static.ticket.sz-trip.com/uploads/20220214/70e2dfdbca9cfe8efb6f3b8b7beb8ff2.png" mode="widthFix"></image>申请被拒绝</view>
+    <view class="com-flex top-tip" style="background:#D62828"><image lazy-load src="https://static.ticket.sz-trip.com/uploads/20220214/70e2dfdbca9cfe8efb6f3b8b7beb8ff2.png" mode="widthFix"></image>申请被拒绝</view>
     <view class="info">拒绝原因：</view>
     <view class="info" style="line-height:50rpx;margin:20rpx">{{applyInfo.refund_msg}}</view>
   </view>
diff --git a/pages/group/index.wxml b/pages/group/index.wxml
index 1a17067..4d52b01 100644
--- a/pages/group/index.wxml
+++ b/pages/group/index.wxml
@@ -1,9 +1,9 @@
 <title title="团购专区"></title>
 <view class="hot-box">
-  <view class="hot-title">热门团购<image src="https://resources.jszhwlpt.com/004e4591-a67a-4282-abf9-1c20feb5554e.png" mode="widthFix"></image></view>
+  <view class="hot-title">热门团购<image lazy-load src="https://resources.jszhwlpt.com/004e4591-a67a-4282-abf9-1c20feb5554e.png" mode="widthFix"></image></view>
   <view class="hot-list">
     <view wx:for="{{hot}}" bindtap="gotoDetail" data-item="{{item}}" class="hot-item">
-      <image src="{{item.headimg}}" mode="apsectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="apsectFill"></image>
       <view class="hot-info">
         <view class="hot-title1">{{item.title+item.sku_name}}</view>
         <view class="hot-bottom">
@@ -15,9 +15,9 @@
   </view>
 </view>
 <view class="list-box">
-  <view class="hot-title">精品团购<image src="https://resources.jszhwlpt.com/b994d3ca-e77e-4ef3-84ae-ba6a31bed666.png" mode="widthFix"></image></view>
+  <view class="hot-title">精品团购<image lazy-load src="https://resources.jszhwlpt.com/b994d3ca-e77e-4ef3-84ae-ba6a31bed666.png" mode="widthFix"></image></view>
   <view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="item">
-    <image src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
+    <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
     <view class="item-num">{{item.gp_num}}人团</view>
     <view class="info-box">
       <view>
@@ -51,12 +51,12 @@
       <view class="time-bg">{{ingGroup[0].s}}</view>
     </view>
     <view class="time-box headimglist">
-      <image src="{{item.avatar}}" wx:for="{{ingGroup}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.avatar}}" wx:for="{{ingGroup}}" mode="aspectFill"></image>
       <view wx:if="{{ingGroup[0].gp_num>ingGroup.length}}">
-        <button open-type="share" plain="true" style="border:none;padding:0;margin:0;"><image style="margin-right:0" src="https://resources.jszhwlpt.com/ffece698-001a-42be-8d8c-ff86985818e3.png" mode="aspectFill"></image></button>
+        <button open-type="share" plain="true" style="border:none;padding:0;margin:0;"><image lazy-load style="margin-right:0" src="https://resources.jszhwlpt.com/ffece698-001a-42be-8d8c-ff86985818e3.png" mode="aspectFill"></image></button>
       </view>
     </view>
     <button open-type="share" plain="true" class="yq-btn">邀请好友</button>
   </view>
-  <image class="closeimg" bindtap="hideGroup" src="https://resources.jszhwlpt.com/c34835f4-037d-441a-9282-b9e98c1ddae2.png" mode="widthFix"></image>
+  <image lazy-load class="closeimg" bindtap="hideGroup" src="https://resources.jszhwlpt.com/c34835f4-037d-441a-9282-b9e98c1ddae2.png" mode="widthFix"></image>
 </view>
\ No newline at end of file
diff --git a/pages/group/info/index.wxml b/pages/group/info/index.wxml
index 174a6f5..482163b 100644
--- a/pages/group/info/index.wxml
+++ b/pages/group/info/index.wxml
@@ -2,7 +2,7 @@
 <title title="团购详情"></title>
 <view class="info-top-box" wx:if="{{info}}">
   <view class="item">
-    <image src="{{info.headimg}}" mode="aspectFill" class="headimg"></image>
+    <image lazy-load src="{{info.headimg}}" mode="aspectFill" class="headimg"></image>
     <view class="item-num">{{info.gp_num}}人团</view>
     <view class="info-box">
       <view>
@@ -29,16 +29,16 @@
       <view class="time-bg">{{myIngList.s}}</view>
     </view>
     <view class="time-box headimglist">
-      <image wx:for="{{myIngList.team_list}}" src="{{item.avatar}}" mode="aspectFill"></image>
+      <image lazy-load wx:for="{{myIngList.team_list}}" src="{{item.avatar}}" mode="aspectFill"></image>
       <view>
-        <button bindtap="share" plain="true" style="border:none;padding:0;margin:0;"><image style="margin-right:0" src="https://resources.jszhwlpt.com/ffece698-001a-42be-8d8c-ff86985818e3.png" mode="aspectFill"></image></button>
+        <button bindtap="share" plain="true" style="border:none;padding:0;margin:0;"><image lazy-load style="margin-right:0" src="https://resources.jszhwlpt.com/ffece698-001a-42be-8d8c-ff86985818e3.png" mode="aspectFill"></image></button>
       </view>
     </view>
     <button bindtap="share" plain="true" class="yq-btn">邀请好友</button>
   </view>
   <!-- 失败的拼团 -->
   <view class="fail-box" wx:if="{{info.productDetail.status==0 && info.isGroupPurchasing==1}}">
-    <image src="https://resources.jszhwlpt.com/1fccfcab-2e85-4925-826e-4c35d35b8a9a.png" mode="widthFix"></image>
+    <image lazy-load src="https://resources.jszhwlpt.com/1fccfcab-2e85-4925-826e-4c35d35b8a9a.png" mode="widthFix"></image>
     <view class="fail-text">团购未满规定人数  已失败</view>
     <view class="fail-btns">
       <view class="fail-btn border-btn" bindtap="goBuy">原价购买</view>
@@ -47,7 +47,7 @@
   </view>
   <!-- 成功的拼团 -->
   <view class="fail-box" wx:if="{{info.productDetail.status==2 && info.isGroupPurchasing==1}}">
-    <image src="https://resources.jszhwlpt.com/fa6904a2-3063-4d90-8da0-d02424d4ac76.png" mode="widthFix"></image>
+    <image lazy-load src="https://resources.jszhwlpt.com/fa6904a2-3063-4d90-8da0-d02424d4ac76.png" mode="widthFix"></image>
     <view class="fail-text" style="color:#F34922">团购活动已人满   团购成功</view>
     <view class="fail-btns">
       <view class="fail-btn" style="width:600rpx" bindtap="startGroup">再开一单</view>
@@ -55,7 +55,7 @@
   </view>
   <!-- 活动结束 -->
   <view class="fail-box" wx:if="{{info.productDetail.state==2}}">
-    <image src="https://resources.jszhwlpt.com/fdd3bdd5-7e78-4ab3-8cd7-e5dc08e234e9.png" mode="widthFix"></image>
+    <image lazy-load src="https://resources.jszhwlpt.com/fdd3bdd5-7e78-4ab3-8cd7-e5dc08e234e9.png" mode="widthFix"></image>
     <view class="fail-text">团购活动已结束</view>
     <view class="fail-btns">
       <view class="fail-btn" style="width:600rpx" bindtap="backList">查看其它活动</view>
@@ -69,7 +69,7 @@
     <view style="margin-top:30rpx" bindtap="showRule">拼团规则</view>
     <view class="group-list">
       <view class="group-item" wx:for="{{list}}" wx:if="{{item.is_team==1}}">
-        <image src="{{item.avatar}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.avatar}}" mode="aspectFill"></image>
         <view class="nickname">{{item.nickname}}</view>
         <view class="group-num">还差<text>{{item.team_num}}</text>人</view>
         <view class="btn-box" bindtap="join" data-item="{{item}}">
@@ -88,7 +88,7 @@
   </view>
   <view class="hot-list" wx:if="{{hot.length>0}}">
     <view class="hot-item" wx:for="{{hot}}" bindtap="gotoDetail" data-id="{{item.id}}">
-      <image src="{{item.headimg}}" mode="apsectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="apsectFill"></image>
       <view class="hot-info">
         <view class="hot-title1">{{item.title+item.sku_name}}</view>
         <view class="hot-bottom">
@@ -113,18 +113,18 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/group/mine/index.wxml b/pages/group/mine/index.wxml
index 75c35f7..e81f69b 100644
--- a/pages/group/mine/index.wxml
+++ b/pages/group/mine/index.wxml
@@ -8,7 +8,7 @@
   <view class="list-title" wx:if="{{type==1 && list.launchList.length>0 || type==2 && over.launchList.length>0}}">我发起的</view>
   <view class="item" wx:for="{{type==1?list.launchList:over.launchList}}" bindtap="gotoDetail" data-item="{{item}}">
     <view class="item-top">
-      <image src="{{item.g_headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.g_headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-info-top">
           <view class="item-title">{{item.title+item.sku_name}}</view>
@@ -34,7 +34,7 @@
   <view class="list-title" wx:if="{{type==1 && list.joinList.length>0 || type==2 && over.joinList.length>0}}">我参与的</view>
   <view class="item" wx:for="{{type==1?list.joinList:over.joinList}}" bindtap="gotoDetail" data-item="{{item}}">
     <view class="item-top">
-      <image src="{{item.g_headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.g_headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-info-top">
           <view class="item-title">{{item.title+item.sku_name}}</view>
@@ -59,7 +59,7 @@
   </view>
 </view>
 <view wx:if="{{list.joinList.length==0 && list.launchList.length==0 && type==1 || type==2 && over.joinList.length==0 && over.launchList.length==0}}" class="common-empty" style="z-index:-1">
-  <image style="width:200rpx" mode="widthFix" src="https://resources.jszhwlpt.com/d8f70d62-ad43-4347-962a-5b4c49f704ad.png"></image>
+  <image lazy-load style="width:200rpx" mode="widthFix" src="https://resources.jszhwlpt.com/d8f70d62-ad43-4347-962a-5b4c49f704ad.png"></image>
   <view wx:if="{{type==1}}">您暂时还未参加拼团活动</view>
   <view wx:if="{{type==2}}">您暂时还未参团成功</view>
   <view wx:if="{{type==1}}" class="empty-btn" bindtap="gotoPdd">立即前往</view>
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c8bbb02..e2b2a47 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -9,7 +9,7 @@
             indicator-dots 	indicator-active-color="#fff">
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+                <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
             </swiper-item>
             </block>
         </swiper>
@@ -22,18 +22,18 @@
                 <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
                 <view class="weather-num">{{weather.max_temp}}°</view>
                 <view class="weather">{{weather.weather}}</view>
-                <image style="margin: 0 30rpx;" lazy-load bindtap="gotoPath"  data-path="/pages/user/service/index"
+                <image lazy-load style="margin: 0 30rpx;" bindtap="gotoPath"  data-path="/pages/user/service/index"
                     src="https://static.ticket.sz-trip.com/uploads/20250714/1f3ac6a7144c6e6849edad89289061cc.png" mode="aspectFill"></image>
             </view>
             <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-                <image src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
                 <view class="textOver" style="color:#000000">搜索您想要的</view>
             </navigator>
         </view>
 
         <view class="banner-main">
             <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
-                <image src="{{item.icon}}" mode="aspectFill"></image>
+                <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
             </view>
         </view>
     </view>
@@ -44,7 +44,7 @@
             <!-- <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
                 <view  class="top-icons no-scrollbar">
                     <view bindtap="mainNavClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
-                        <image src="{{item.icon}}" mode="aspectFill"></image>
+                        <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                         <view class="top-icon-text">{{item.menu_name}}</view>
                     </view>
                 </view>
@@ -55,7 +55,7 @@
                 current="0">
                 <block wx:for="{{mainTypeList}}" wx:key="index">
                 <swiper-item  bindtap="mainNavClick" class="top-icon-item {{(mainNavIndex+2)==index || (index==0&&mainNavIndex==mainTypeList.length-2)||(index==1&&mainNavIndex==mainTypeList.length-1)?'active':''}}"  data-item="{{item}}">
-                    <image src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
+                    <image lazy-load src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
                     <view class="top-icon-text">{{item.menu_name}}</view>
                 </swiper-item>
                 </block>
@@ -75,7 +75,7 @@
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
-                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
                 </swiper>
@@ -89,12 +89,12 @@
                 <!-- 上方标题部分 -->
                 <view class="xsth-title">
                     <view class="xsth-left" style="display: flex;">
-                        <image style="width: 253.33rpx;" wx:if="{{xpthIndex==0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
-                        <image style="width: 253.33rpx;"  wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
+                        <image lazy-load style="width: 253.33rpx;" wx:if="{{xpthIndex==0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
+                        <image lazy-load style="width: 253.33rpx;"  wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
                         
                         <view style="font-size: 0;" wx:if="{{indexSeason.xpthBac && indexSeason.xpthBacImg}}">
-                            <image style="width: 253.33rpx;"  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
-                            <image style="width: 253.33rpx;"  wx:else  mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
+                            <image lazy-load style="width: 253.33rpx;"  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
+                            <image lazy-load style="width: 253.33rpx;"  wx:else  mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
                         </view>
                         
                     </view>
@@ -104,14 +104,14 @@
                     <scroll-view scroll-x style="height:372rpx;padding-top: 25rpx;">
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}" data-source="当季热门">
-                                <image src="{{item.headimg}}"></image>
+                                <image lazy-load src="{{item.headimg}}"></image>
                                 <view class="season-content" style="padding:6rpx 12rpx;min-height: 130rpx;">
                                     <view class="textOver2">{{item.title}}</view>
                                     <view class="price">
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
                                 </view>
-                                <!-- <image class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image> -->
+                                <!-- <image lazy-load class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image> -->
                             </view>
                         </view>
                     </scroll-view>
@@ -122,14 +122,14 @@
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id" data-source="限时特惠">
-                            <image class="prod-img" src="{{item.headimg}}" mode="aspectFill" />
+                            <image lazy-load class="prod-img" src="{{item.headimg}}" mode="aspectFill" />
                             <view class="xpth-item-content">
                                 <view class="xpth-item-title textOver2">{{item.title}}</view>
                                 <view class="xpth-item-bottom">
                                 <view class="xpth-item-price">{{item.price/100}}</view>
                                 </view>
                             </view>
-                            <!-- <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"></image> -->
+                            <!-- <image lazy-load class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"></image> -->
                         </view>
                     </view>
                     <!-- 右边的banner -->
@@ -138,9 +138,9 @@
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}" data-source="限时特惠">
-                                <image  src="{{item.head_img}}" mode="aspectFill"></image>
+                                <image lazy-load  src="{{item.head_img}}" mode="aspectFill"></image>
                                 <!-- <view class="xpth-cover textOver2">{{item.title}}</view> -->
-                                <!-- <image class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"></image> -->
+                                <!-- <image lazy-load class="cover-image" src="https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"></image> -->
                             </swiper-item>
                         </block>
                         </swiper>
@@ -157,8 +157,8 @@
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
                     <!-- 原 圆角77rpx，现改为13rpx -->
-                    <!-- <image style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index2025/smallBg.png"></image> -->
-                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    <!-- <image lazy-load style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index2025/smallBg.png"></image> -->
+                    <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
                 </swiper>
@@ -169,52 +169,52 @@
 
             <!-- 公共服务 -->
             <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
-                <image class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
+                <image lazy-load class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
                 <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
                     <view style="height: 40rpx;line-height: 40rpx;">更多 ></view>
-                    <!-- <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
+                    <!-- <image lazy-load style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
                 </navigator>
             </view>
             <view wx:if="{{func_data.service_public}}">
                 <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
                     <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick">
-                        <image src="{{item.icon}}" mode="aspectFill"></image>
+                        <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                     </view>
                 </view>
             </view>
 
             <!-- 旅游助手 -->
             <view class="sale-road-boxes" style="margin-top:36rpx" wx:if="{{func_data.helper_travel}}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="pic-list" style="margin-top:30rpx" wx:if="{{func_data.helper_travel}}">
-                <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick"
+                <image lazy-load class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick"
                 src="{{item.icon}}" mode="aspectFill"></image>
             </view>
 
             <!-- ai避高峰 -->
             <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
                 <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-                    <image src="{{indexSeason.ai}}" mode=""/>
+                    <image lazy-load src="{{indexSeason.ai}}" mode=""/>
                 </view>
                 <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-                    <image src="{{indexSeason.avoid}}" mode=""/>
+                    <image lazy-load src="{{indexSeason.avoid}}" mode=""/>
                 </view>
             </view> -->
 
 
             <!-- 数字文旅-->
             <view class="sale-road-boxes" style="margin-top:30rpx" wx:if="{{func_data.culture_digital}}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="slide-out-box" wx:if="{{func_data.culture_digital}}">
                 <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
                 <scroll-view scroll-x style="height:400rpx" bindscroll="listenScroll" data-keyname="scrollLeft" class="slide-box">
                 <view class="pbservice">
                     <view class="pbservice-item" wx:for="{{travelCulture}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick">
-                        <image src="{{item.icon}}" mode="aspectFill"></image>
+                        <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                         <!-- <view class="text">{{item.title}}</view> -->
                     </view>
                     
@@ -228,36 +228,36 @@
 
             <!-- 十全十美 -->
             <view class="sale-road-boxes" wx:if="{{func_data.scenery_ten}}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
             </view>
             <view class="six-box-new" wx:if="{{func_data.scenery_ten}}">
-                <image wx:for="{{SQSM}}" src="{{item.icon}}" data-item="{{item}}" bindtap="mainNavClick" mode="aspectFill" wx:key="index"></image>
+                <image lazy-load wx:for="{{SQSM}}" src="{{item.icon}}" data-item="{{item}}" bindtap="mainNavClick" mode="aspectFill" wx:key="index"></image>
             </view>
 
             <!-- 长三角文旅平台 --> 
             <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat &&func_data.platform_nearby}}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="other-plats" wx:if="{{otherPlat &&func_data.platform_nearby}}">
                 <view class="other-plat" wx:for="{{otherPlat}}" bindtap="mainNavClick" data-item="{{item}}" wx:key="index">
-                <image src="{{item.icon}}" mode="aspectFill"></image>
+                <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                 <!-- <view>{{item.name}}</view> -->
                 </view>
             </view>
 
             <!-- 热门推荐 -->
             <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0 &&func_data.repurchase }}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="hot-list" wx:if="{{func_data.repurchase}}">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
                 <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" data-source="回购榜" wx:key="id">
                     <view class="hot-item">
                     <view style="position:relative;flex-shrink: 0;">
-                        <common-image width="100%" src="{{item.headimg}}" mode="aspectFill"></common-image>
+                        <image lazy-load width="100%" src="{{item.headimg}}" mode="aspectFill"></image>
                     </view>
                     <view class="hot-info">
                         <view class="hot-title textOver2">{{item.title}}</view>
@@ -289,29 +289,29 @@
         <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
             <block wx:for="{{alertSwipeList}}" wx:key="index">
             <swiper-item data-item="{{item}}" bindtap="bannerClick">
-                <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+                <image lazy-load src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
             </swiper-item>
             </block>
         </swiper>
-        <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+        <image lazy-load bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
     </view>
     <!-- 广告弹窗结束 -->
     <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
         <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
         <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-            <image src="{{startList.head_img}}"  style="width: 100%;height: 100vh;" bindtap="bannerClick" data-item="{{startList}}"></image>
+            <image lazy-load src="{{startList.head_img}}"  style="width: 100%;height: 100vh;" bindtap="bannerClick" data-item="{{startList}}"></image>
         </view>
 
         <!-- 视频 -->
         <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
             <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
-            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+            <!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+            <!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
         </view>
     </view>
 
@@ -325,7 +325,7 @@
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item data-item="{{item}}">
-                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+                <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
             </swiper-item>
             </block>
         </swiper>
@@ -337,7 +337,7 @@
 
         <view class="banner-main">
             <view catchtap="mainIconClick" class="banner-main-item" wx:for="{{bannerDataListFake}}" wx:key="index" data-item="{{item}}">
-                <image src="{{item.img}}" ></image>
+                <image lazy-load src="{{item.img}}" ></image>
             </view>
         </view>
     </view>
@@ -352,7 +352,7 @@
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
-                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
                 </swiper>
@@ -366,7 +366,7 @@
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item  data-item="{{item}}" style="position: relative;">
              
-                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
                 </swiper>
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 938db6c..a0653ae 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -6,20 +6,20 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{listimgs}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper> -->
 <view wx:if="{{info}}" style="width:750rpx;overflow:hidden">
-  <image src="{{info.post_url}}" mode="widthFix" class="swiper"></image>
+  <image lazy-load src="{{info.post_url}}" mode="widthFix" class="swiper"></image>
   <view class="top-box">
     <view class="top-box-title">{{info.name}}</view>
     <view class="top-tip-box" wx:if="{{info.begin_date || info.end_date}}">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/time.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/time.png" mode="widthFix"></image>
       <text>活动时间：{{info.begin_date}} ~ {{info.end_date}}</text>
     </view>
     <view class="top-tip-box" wx:if="{{info.detail_address}}" bindtap="gotolocation">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/location.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/location.png" mode="widthFix"></image>
       <text>活动地点：{{info.detail_address}}</text>
     </view>
   </view>
@@ -36,12 +36,12 @@
 </view>
 <navigator url="/pages/info/sceneProductInfo/index?id={{info.scene_data.id}}"
   wx:if="{{info && info.scene_data && info.scene_data.id}}" class="scene-box" catchtap="pagePoint" data-event='activity_detail_click' data-id='{{info.scene.data.id}}' data-type='scene'>
-  <image src="{{info.scene_data.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{info.scene_data.headimg}}" mode="aspectFill"></image>
   <view class="scene-info">
     <view class="scene-title-box">
       <view class="scene-title textOver">{{info.scene_data.title}}</view>
       <view>预订</view>
-      <image style="width:15rpx;margin:0;margin-left:8rpx" src="https://static.ticket.sz-trip.com/uploads/20211115/bce693953f019999dbc11ee16abf64bb.png" mode="widthFix"></image>
+      <image lazy-load style="width:15rpx;margin:0;margin-left:8rpx" src="https://static.ticket.sz-trip.com/uploads/20211115/bce693953f019999dbc11ee16abf64bb.png" mode="widthFix"></image>
     </view>
     <view class="scene-address textOver2">{{info.scene_data.address}}</view>
     <!-- <view class="scene-btn">查看详情</view> -->
@@ -56,24 +56,24 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
         mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/cardInfo/index.wxml b/pages/info/cardInfo/index.wxml
index 8957aa8..397eb8d 100644
--- a/pages/info/cardInfo/index.wxml
+++ b/pages/info/cardInfo/index.wxml
@@ -6,7 +6,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -62,18 +62,18 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/info/culturalUnitInfo/index.wxml b/pages/info/culturalUnitInfo/index.wxml
index 076edc7..6a0c9b1 100644
--- a/pages/info/culturalUnitInfo/index.wxml
+++ b/pages/info/culturalUnitInfo/index.wxml
@@ -6,32 +6,32 @@
     <swiper-item>
       <view class="title">{{info.company_name}}</view>
       <view class="address">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.mobile}}</text></view>
       </view>
       <swiper wx:if="{{info.list_img.length>0}}" style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
         <swiper-item wx:for="{{info.list_img}}">
-          <image style="width:690rpx;height:560rpx;display:block;" src="{{item}}" mode="aspectFill"></image>
+          <image lazy-load style="width:690rpx;height:560rpx;display:block;" src="{{item}}" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
-      <!-- <image wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image> -->
-      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <!-- <image lazy-load wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image> -->
+      <image lazy-load mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </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://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(item)}}"></rich-text>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
   </swiper>
-  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
+  <image lazy-load mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
 </view>
 <!-- <view wx:if="{{info}}">
   <title title="{{info.company_name}}"></title>
@@ -39,7 +39,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
     <block wx:for="{{info.list_img}}" wx:key="*this">
       <swiper-item>
-        <image src="{{item}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item}}" mode="aspectFill"></image>
       </swiper-item>
     </block>
   </swiper>
diff --git a/pages/info/foodInfo/index.wxml b/pages/info/foodInfo/index.wxml
index 61d240c..c243022 100644
--- a/pages/info/foodInfo/index.wxml
+++ b/pages/info/foodInfo/index.wxml
@@ -4,7 +4,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index 8465283..16afd14 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -6,7 +6,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}" wx:if="{{info.listimg}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml
index 6491d0a..0289864 100644
--- a/pages/info/groupOrderInfo/index.wxml
+++ b/pages/info/groupOrderInfo/index.wxml
@@ -46,7 +46,7 @@
   <view class="mask-bg" bindtap="showShare"></view>
   <view class="mask-content">
     <view bindtap="showShare" class="iconfont icon-close"></view>
-    <image src="{{codeImg}}" mode="widthFix"></image>
+    <image lazy-load src="{{codeImg}}" mode="widthFix"></image>
     <view class="mask-info">
       <view>{{info.list.scene.title}}</view>
       <view>{{info.list.team_name}}</view>
diff --git a/pages/info/guideInfo/index.wxml b/pages/info/guideInfo/index.wxml
index 98d7728..475b936 100644
--- a/pages/info/guideInfo/index.wxml
+++ b/pages/info/guideInfo/index.wxml
@@ -4,7 +4,7 @@
 <view class="info">
   <swiper bindchange="changePage" current="{{page}}">
     <swiper-item wx:for="{{images}}" class="img-box">
-      <image bindtap="showImg" data-img="{{item}}" src="{{item}}?x-oss-process=image/resize,w_750,m_lfit" mode="aspectFit"></image>
+      <image lazy-load bindtap="showImg" data-img="{{item}}" src="{{item}}?x-oss-process=image/resize,w_750,m_lfit" mode="aspectFit"></image>
     </swiper-item>
   </swiper>
   <view class="pages">
diff --git a/pages/info/hotelInfo/index.wxml b/pages/info/hotelInfo/index.wxml
index 5e752a9..c79d755 100644
--- a/pages/info/hotelInfo/index.wxml
+++ b/pages/info/hotelInfo/index.wxml
@@ -13,7 +13,7 @@
   </view>
 	<view class="info-box" id="box1">
 		<view class="info-title">
-      <image class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/e78f4f525e72199013ad18a0200c3352.png" mode=""/>
+      <image lazy-load class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/e78f4f525e72199013ad18a0200c3352.png" mode=""/>
       酒店介绍
     </view>
 		<!-- <rich-text class="details"></rich-text> -->
@@ -32,7 +32,7 @@
   <!-- </view> -->
   <view class="info-box" id="box3">
     <view class="info-title">
-      <image class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/8a5d9e1546712bf70f4b42dccb124c96.png" mode=""/>
+      <image lazy-load class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/8a5d9e1546712bf70f4b42dccb124c96.png" mode=""/>
       预订须知
     </view>
 		<rich-text class="detail" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
@@ -46,6 +46,6 @@
   </view>
 </view>
 <view class="call-phone" bindtap="call" data-num="{{tel}}">
-  <image class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/a2cb3d2b1c1b2f8f7090bc6e88e360bf.png" mode=""/>
+  <image lazy-load class="icon-img" src="https://static.ticket.sz-trip.com/uploads/20240109/a2cb3d2b1c1b2f8f7090bc6e88e360bf.png" mode=""/>
   拨打酒店电话：{{tel}}
 </view>
\ No newline at end of file
diff --git a/pages/info/hotelProductInfo/index.wxml b/pages/info/hotelProductInfo/index.wxml
index bfe3e6c..aac90cc 100644
--- a/pages/info/hotelProductInfo/index.wxml
+++ b/pages/info/hotelProductInfo/index.wxml
@@ -6,7 +6,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{sceneInfo.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -35,7 +35,7 @@
   </picker>
 </view>
 <view wx:if="{{sceneInfo && sceneInfo.third_supplier_type!='mt'}}" class="product-item" wx:for="{{products}}">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="product-info textOver">
     <view class="title textOver">{{item.product.title+item.sku_name}}</view>
     <view class="subtitle textOver2">{{item.sku_model.area}} {{item.sku_model.bed_type}} {{item.sku_model.breakfast}}</view>
@@ -58,7 +58,7 @@
 			<view class="mt-price">{{item.low_price>0?item.low_price/100:'0'}}</view>
     </view>
     <view class="product-right">
-      <image class="product-arrow-img" bindtap="getSkuList" data-id="{{item.real_room_id}}" data-index="{{index}}" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow{{activeSkuIndex==index?'1':''}}.png" mode="widthFix"></image>
+      <image lazy-load class="product-arrow-img" bindtap="getSkuList" data-id="{{item.real_room_id}}" data-index="{{index}}" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow{{activeSkuIndex==index?'1':''}}.png" mode="widthFix"></image>
     </view>
   </view>
   <view class="sku-item" wx:if="{{activeSkuIndex==index && skuList.length>0}}" wx:for="{{skuList}}" wx:for-index="skuIndex" wx:for-item="sku">
@@ -84,7 +84,7 @@
   <view class="ask-list" wx:else>
     <navigator url="/pages/ask/info/index?id={{item.id}}" class="ask-item" wx:for="{{ask}}">
       <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
         <view class="ques">{{item.question_name}}</view>
         <view class="ques-num" wx:if="{{item.answer.total!=0}}">{{item.answer.total}}个回答</view>
         <view class="ques-num" wx:if="{{item.answer.total==0}}">暂无回答</view>
@@ -105,7 +105,7 @@
   </view>
   <navigator wx:for="{{comment}}"  wx:for-index="index"  url="/pages/list/comments/index?id={{info.id}}&&index={{index}}" class="product-comment">
     <view class="product-comment-top">
-      <image src="{{item.user.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.user.avatar}}" mode="aspectFill"></image>
       <view class="comment-info">
         <view class="nickname">{{item.nickname}}</view>
         <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
@@ -115,7 +115,7 @@
     <view class="comment-content">{{item.content}}</view>
     <view wx:if="{{item.img_list}}">
       <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
-        <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
+        <image lazy-load wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
         </image>
         <view class="all" wx:if="{{index==5}}" >
         <view>共{{item.img_list.length}}张</view>
@@ -201,18 +201,18 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/info/luggageInfo/index.wxml b/pages/info/luggageInfo/index.wxml
index 67755ec..cf13baf 100644
--- a/pages/info/luggageInfo/index.wxml
+++ b/pages/info/luggageInfo/index.wxml
@@ -7,13 +7,13 @@
     {{info.title}}
   </view>
   <view class="address">
-    <image class="address-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/3625398e2fba9768aa891f806b855716.png" mode=""/>
+    <image lazy-load class="address-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/3625398e2fba9768aa891f806b855716.png" mode=""/>
     <view class="textOver address-text">{{info.address}}</view>
-    <image class="map-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/bfe241bd7606cdaec78da737166a42fc.png" mode=""/>
+    <image lazy-load class="map-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/bfe241bd7606cdaec78da737166a42fc.png" mode=""/>
     <view class="go-there" bindtap="gotolocation">到这去</view>
   </view>
   <view class="address" style="margin: 27rpx 0;">
-    <image class="call-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/fbd073d47279f137775ad39b5a6fe454.png" mode=""/>
+    <image lazy-load class="call-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/fbd073d47279f137775ad39b5a6fe454.png" mode=""/>
     <view class="call">电话：{{info.tel}}</view>
   </view>
   <view class="line"></view>
diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml
index 939e585..e5cc852 100644
--- a/pages/info/museumInfo/index.wxml
+++ b/pages/info/museumInfo/index.wxml
@@ -4,14 +4,14 @@
 <title title="场馆详情" wx:else></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
 <view class="vr-box com-flex" wx:if="{{info && info.vr_info_url}}" bindtap="goVr">
-  <image src="https://m.cloud.sz-trip.com/static/images/VR.png" mode="widthFix"></image>
+  <image lazy-load src="https://m.cloud.sz-trip.com/static/images/VR.png" mode="widthFix"></image>
   <text>VR景点</text>
 </view>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}"
   duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
   <view class="title" wx:if="{{info && info.team_order && isGroup}}">{{info.title}}（团体预约）</view>
@@ -53,7 +53,7 @@
           <view class="textOver">{{item.begin_date}}—{{item.end_date}}</view>
         </view>
       </view>
-      <image src="{{item.post_url}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.post_url}}" mode="aspectFill"></image>
       <view wx:if="{{item.isEnd}}" class="end-box">已结束</view>
     </navigator>
     <view style="font-size:26rpx;text-align:center;line-height:200rpx;" wx:if="{{actList.length==0}}">暂无活动</view>
@@ -76,24 +76,24 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
         mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/newsInfo/index.wxml b/pages/info/newsInfo/index.wxml
index 363e773..41ee3b5 100644
--- a/pages/info/newsInfo/index.wxml
+++ b/pages/info/newsInfo/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/info/newsInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="资讯详情"></title>
-<image wx:if="{{info}}" class="swiper" src="{{info.cover}}" mode="aspectFill"></image>
+<image lazy-load wx:if="{{info}}" class="swiper" src="{{info.cover}}" mode="aspectFill"></image>
 <view class="content" wx:if="{{info}}">
   <view class="title">{{info.title}}</view>
   <view class="subtitle" wx:if="{{info.source}}">来源：{{info.source}}</view>
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7f02116..2771928 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,17 +2,17 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
+<image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{autoPlay}}" interval="{{2000}}" duration="{{300}}">
   <block wx:if="{{info.videourl}}" wx:key="*this">
     <swiper-item>
       <video bindplay="playVideo" src="{{info.videourl}}" controls></video>
-      <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
+      <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
     </swiper-item>
   </block>
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -58,7 +58,7 @@
                     
                 </view>
                 <view style="text-align: center;">
-                    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/navigation.png"></image>
+                    <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/navigation.png"></image>
                     <view style="padding-top: 14rpx;">去这里</view>
                 </view>
             </view>
@@ -93,8 +93,8 @@
     </view> -->
     <navigator wx:for="{{comment}}" wx:key="index" wx:for-index="index" url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
         <view class="product-comment-top">
-            <image class="avator-img" src="{{item.user.avatar}}" mode="aspectFill"></image>
-            <!-- <image class="avator-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/commentUser.png" mode="aspectFill"></image> -->
+            <image lazy-load class="avator-img" src="{{item.user.avatar}}" mode="aspectFill"></image>
+            <!-- <image lazy-load class="avator-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/commentUser.png" mode="aspectFill"></image> -->
             <view class="comment-container">
                 <view class="comment-info">
                     <view class="nickname" style="padding-right:20rpx ;">{{item.nickname}}</view>
@@ -104,9 +104,9 @@
                 <view class="comment-content textOver2">{{item.content}}</view>
             </view>
             <view class="img-box" wx:if="{{item.img_list.length>0}}">
-                <image class="imgs" data-item="{{item}}" mode="aspectFill" src="{{item.img_list[0]}}" catch:tap="viewImg"></image>
+                <image lazy-load class="imgs" data-item="{{item}}" mode="aspectFill" src="{{item.img_list[0]}}" catch:tap="viewImg"></image>
                 <!-- <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
-                    <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc"></image>
+                    <image lazy-load wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc"></image>
                     <view class="all" wx:if="{{index==5}}">
                     <view>共{{item.img_list.length}}张</view>
                     <view>查看全部</view>
@@ -148,12 +148,12 @@
 
     <view class="proad" id="box4">
     <view class="proad-title">
-        <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
+        <image lazy-load mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
     </view>
     <view class="pro-list">
         <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
         <view class="item-hd">
-        <image src="{{item.headimg}}"></image>
+        <image lazy-load src="{{item.headimg}}"></image>
         </view>
         <view class="item-bm">
         <view class="protitle textOver">{{item.title}}</view>
@@ -172,7 +172,7 @@
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
   <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
   <view class="shop-box">
-    <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
+    <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
     <view>店铺</view>
   </view>
   </navigator>
@@ -195,7 +195,7 @@
 </view>
 <!-- 购物车悬浮框 -->
 <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
 <view class="mask" wx:if="{{skuFlag}}">
@@ -203,7 +203,7 @@
   <view class="mask-content">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <view class="allowance" wx:if="{{allowance_data}}">
@@ -237,23 +237,23 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/redmapInfo/index.wxml b/pages/info/redmapInfo/index.wxml
index 6693ea8..43692a1 100644
--- a/pages/info/redmapInfo/index.wxml
+++ b/pages/info/redmapInfo/index.wxml
@@ -6,22 +6,22 @@
     <swiper-item>
       <view class="title">{{info.title}}</view>
       <view class="address" wx:if="{{info.address}}">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address" wx:if="{{info.mobile}}">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.mobile}}</text></view>
       </view>
       <swiper wx:if="{{info.list_img.length>0}}" style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
         <swiper-item wx:for="{{info.list_img}}">
-          <image style="width:690rpx;height:560rpx;display:block;" src="{{item}}" mode="aspectFill"></image>
+          <image lazy-load style="width:690rpx;height:560rpx;display:block;" src="{{item}}" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
-      <!-- <image wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image> -->
-      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <!-- <image lazy-load wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image> -->
+      <image lazy-load mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
       <view class="tips">
         <view>中共苏州市委党史工作办公室</view>
         <view>苏州市文化广电和旅游局</view>
@@ -29,10 +29,10 @@
       </view>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(item)}}"></rich-text>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
       <view class="tips">
         <view>中共苏州市委党史工作办公室</view>
         <view>苏州市文化广电和旅游局</view>
@@ -40,5 +40,5 @@
       </view>
     </swiper-item>
   </swiper>
-  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
+  <image lazy-load mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
 </view>
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index 7e1118c..7269190 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -6,7 +6,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -73,7 +73,7 @@
   </view>
   <navigator wx:for="{{comment}}" url="/pages/list/comments/index?id={{info.id}}" class="product-comment">
     <view class="product-comment-top">
-      <image src="{{item.user.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.user.avatar}}" mode="aspectFill"></image>
       <view class="comment-info">
         <view class="nickname">{{item.user.nickname}}</view>
         <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
@@ -102,18 +102,18 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
@@ -128,7 +128,7 @@
   <view class="mask-content">
     <view class="iconfont icon-close" bindtap="setSimpleValue" data-keyname="skuFlag" data-value="{{false}}"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <!-- <view class="allowance" wx:if="{{allowance_data}}">
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 38ad34b..dd8b99d 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -2,11 +2,11 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="{{isBook?'产品详情':'景点详情'}}"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
+<image lazy-load wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -22,7 +22,7 @@
         <view class="sub-info-address textOver">{{info.open_time}}</view>
     </view>
     <view class="iconfont">
-        <image src="https://static.ticket.sz-trip.com/uploads/20250808/b64e49752fc3e0831db700331db766dd.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250808/b64e49752fc3e0831db700331db766dd.png"></image>
         <view>详情</view>
     </view>
   </view>
@@ -32,7 +32,7 @@
         <view class="sub-info-address textOver">{{info.address}}</view>
     </view>
     <view class="iconfont">
-        <image src="https://static.ticket.sz-trip.com/uploads/20250808/0faddf87d40d7bd782a6aab047f2046e.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250808/0faddf87d40d7bd782a6aab047f2046e.png"></image>
         <view>导航</view>
     </view>
     
@@ -115,7 +115,7 @@
   </view>
   <!-- 购物车悬浮框 -->
   <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
     <view class="cart-num">{{cartCount}}</view>
   </navigator>
   <!-- <view class="mask" wx:if="{{skuFlag}}">
@@ -123,7 +123,7 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{info.headimg}}" mode="aspectFill"></image>
+        <image lazy-load id="skuImg" src="{{info.headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
           <view class="sku-price">{{info.product[0].sku[skuIndex].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
@@ -195,7 +195,7 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
+        <image lazy-load id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
           <view class="sku-price">{{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
@@ -241,7 +241,7 @@
   </view>
   <navigator wx:for="{{comment}}" wx:for-index="index" url="/pages/list/comments/index?sceneid={{info.id}}&&index={{index}}" class="product-comment">
     <view class="product-comment-top">
-      <image src="{{item.user.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.user.avatar}}" mode="aspectFill"></image>
       <view class="comment-info">
         <view class="nickname">{{item.nickname}}</view>
         <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
@@ -251,7 +251,7 @@
     <view class="comment-content">{{item.content}}</view>
     <view wx:if="{{item.img_list}}">
       <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
-        <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
+        <image lazy-load wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
         </image>
         <view class="all" wx:if="{{index==5}}" >
         <view>共{{item.img_list.length}}张</view>
@@ -276,13 +276,13 @@
   <view class="ask-list" wx:else>
     <navigator url="/pages/ask/info/index?id={{item.id}}" catchtap="pagePoint" data-event="scene_comment" class="ask-item" wx:for="{{ask}}">
       <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
         <view class="ques">{{item.question_name}}</view>
         <view class="ques-num" wx:if="{{item.answer.total!=0}}">{{item.answer.total}}个回答</view>
         <view class="ques-num" wx:if="{{item.answer.total==0}}">暂无回答</view>
       </view>
       <!-- <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
         <view class="ans">{{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}}</view>
       </view>
       <view class="ques-tip">
@@ -322,23 +322,23 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box" style="bottom: 200rpx;">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/sceneProductInfoNew/index.wxml b/pages/info/sceneProductInfoNew/index.wxml
index a5ceaf5..4cea162 100644
--- a/pages/info/sceneProductInfoNew/index.wxml
+++ b/pages/info/sceneProductInfoNew/index.wxml
@@ -4,13 +4,13 @@
 <!-- <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}" bindtap="like"></view> -->
 <!-- <view class="audio-box" bindtap="audioGuide">
   <view>语音导览</view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/play-btn.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/play-btn.png" mode="widthFix"></image>
 </view> -->
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}"
   duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -75,13 +75,13 @@
     <navigator url="/pages/ask/info/index?id={{item.id}}" catchtap="pagePoint" data-event="scene_comment"
       class="ask-item" wx:for="{{ask}}">
       <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
         <view class="ques">{{item.question_name}}</view>
         <view class="ques-num" wx:if="{{item.answer.total!=0}}">{{item.answer.total}}个回答</view>
         <view class="ques-num" wx:if="{{item.answer.total==0}}">暂无回答</view>
       </view>
       <!-- <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
         <view class="ans">{{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}}</view>
       </view>
       <view class="ques-tip">
@@ -105,7 +105,7 @@
   </view>
   <navigator wx:for="{{comment}}" url="/pages/list/comments/index?id={{info.id}}" class="product-comment">
     <view class="product-comment-top">
-      <image src="{{item.user.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.user.avatar}}" mode="aspectFill"></image>
       <view class="comment-info">
         <view class="nickname">{{item.user.nickname}}</view>
         <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text
@@ -139,7 +139,7 @@
 <!-- 购物车悬浮框 -->
 <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box"
   id="cart">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
 <view class="mask" wx:if="{{skuFlag}}">
@@ -147,7 +147,7 @@
   <view class="mask-content">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <view class="allowance" wx:if="{{allowance_data}}">
@@ -184,24 +184,24 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png"
         mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml
index e23c9ef..7d8be71 100644
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@@ -6,7 +6,7 @@
 <view wx:if="{{info}}">
     <view class="top-info">
         <view class="product-base-info">
-            <image class="headImg" src="{{info.listimg[0]}}" mode="aspectFill"></image>
+            <image lazy-load class="headImg" src="{{info.listimg[0]}}" mode="aspectFill"></image>
             <view class="base-info">
                 <view class="title textOver2">{{info.title}}</view>
                 <view class="tags-box textOver">
@@ -32,7 +32,7 @@
                     <view class="textOver2" style="padding-top: 26rpx;">{{info.scene_address}}</view>
                 </view>
                 <view style="text-align: center;">
-                    <image src="https://static.ticket.sz-trip.com/uploads/20241119/a98e35f23497c1a8ddf7c7769fbd4fd1.png"></image>
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20241119/a98e35f23497c1a8ddf7c7769fbd4fd1.png"></image>
                     <view style="padding-top: 14rpx;" wx:if="{{distance}}">{{distance}}km</view>
                 </view>
             </view>
@@ -40,7 +40,7 @@
 
         <view class="show-tip" wx:if="{{info.serviceData.length>0}}">
             <view class="com-flex" wx:for="{{info.serviceData}}">
-                <image src="{{item.image}}"></image>
+                <image lazy-load src="{{item.image}}"></image>
                 {{item.info}}
             </view>
 
@@ -85,7 +85,7 @@
         <view class="pro-list no-scrollbar">
             <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
             <view class="item-hd">
-            <image src="{{item.headimg}}" mode="aspectFill"></image>
+            <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
             </view>
             <view class="item-bm">
             <view class="protitle textOver">{{item.title}}</view>
@@ -109,7 +109,7 @@
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
   <navigator url="/pages/index/index" open-type="switchTab" class="shop-box">
   <view class="shop-box">
-    <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20241119/868addcaedbc5d63ebdfa150fcace34d.png" mode="aspectFill"/>
+    <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20241119/868addcaedbc5d63ebdfa150fcace34d.png" mode="aspectFill"/>
     <view>首页</view>
   </view>
   </navigator>
@@ -134,7 +134,7 @@
 </view>
 <!-- 购物车悬浮框 -->
 <!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator> -->
 
@@ -144,7 +144,7 @@
   <view class="mask-content">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <view class="allowance" wx:if="{{allowance_data}}">
@@ -182,23 +182,23 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/strategyInfo/index.wxml b/pages/info/strategyInfo/index.wxml
index 004203b..730ee0e 100644
--- a/pages/info/strategyInfo/index.wxml
+++ b/pages/info/strategyInfo/index.wxml
@@ -6,15 +6,15 @@
     autoplay="{{true}}" interval="{{2000}}" duration="{{300}}" wx:if="{{info.img}}">
     <block wx:for="{{info.img}}" wx:key="*this">
       <swiper-item>
-        <image src="{{item}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item}}" mode="aspectFill"></image>
       </swiper-item>
     </block>
   </swiper>
-  <!-- <image src="{{info.headimg}}" mode="widthFix" style="width:100%;display:block"></image> -->
+  <!-- <image lazy-load src="{{info.headimg}}" mode="widthFix" style="width:100%;display:block"></image> -->
   <view class="content">
     <view class="title">{{info.title}}</view>
     <view class="author-info">
-      <image src="{{info.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{info.avatar}}" mode="aspectFill"></image>
       <view class="username">{{info.nickname}}</view>
     </view>
     <rich-text nodes="{{filter.formateRichText(info.detail)}}"></rich-text>
diff --git a/pages/kj/his/index.wxml b/pages/kj/his/index.wxml
index 5d3d3e4..fc0ab9e 100644
--- a/pages/kj/his/index.wxml
+++ b/pages/kj/his/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/info/pddInfo/pddhis/index.wxml-->
 <title title="帮砍记录"></title>
 <view class="his-item" wx:for="{{list}}">
-  <image src="{{item.avatar}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.avatar}}" mode="aspectFill"></image>
   <view class="his-info">
     <view class="username">{{item.help_user_name}}</view>
     <view class="his-time">{{item.created_time}}</view>
diff --git a/pages/kj/index.wxml b/pages/kj/index.wxml
index a224737..92981af 100644
--- a/pages/kj/index.wxml
+++ b/pages/kj/index.wxml
@@ -9,7 +9,7 @@
   <view class="top-line-box">我参与的活动</view>
   <navigator class="item" wx:for="{{mineList}}" wx:key="id" url="info/index?userid={{item.user_id}}&id={{item.act_product_id}}">
     <view class="item-top">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-info-top">
           <view class="item-title">{{item.title+item.sku_name}}</view>
@@ -31,7 +31,7 @@
   </view>
   <view class="item" wx:for="{{list}}" wx:key="id" style="margin:0 30rpx;border-radius:0;border-bottom:1rpx solid #ccc" bindtap="gotoDetail" data-index="{{index}}" data-id="{{item.id}}" data-aid="{{item.actId}}" data-sid="{{item.skuId}}">
     <view class="item-top">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-info-top">
           <view class="item-title">{{item.title+""+item.sku_name}}</view>
@@ -55,7 +55,7 @@
   <view class="top-line-box">{{item.timeText}}</view>
   <view wx:for="{{item.showList}}" wx:key="id" style="border-radius:20rpx !important" class="item" bindtap="nextShowInfo">
     <view class="item-top">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-info-top">
           <view class="item-title">{{item.title+item.sku_name}}</view>
diff --git a/pages/kj/info/index.wxml b/pages/kj/info/index.wxml
index 3f9446d..c999c48 100644
--- a/pages/kj/info/index.wxml
+++ b/pages/kj/info/index.wxml
@@ -2,12 +2,12 @@
 <title title="砍价详情"></title>
 <view class="content" wx:if="{{info}}">
   <view class="top-info" wx:if="{{info.user_record && info.user_record.over_time && info.isOver || info.user_record && info.user_record.flag=='over'}}">
-    <image src="{{info.user_record.avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{info.user_record.avatar}}" mode="aspectFill"></image>
     <view class="time-tip time-tip1" style="margin-left:0">已结束</view>
     <view class="rule-box" bindtap="showRule">活动规则</view>
   </view>
   <view class="top-info" wx:elif="{{info.user_record && info.user_record.over_time}}">
-    <image src="{{info.user_record.avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{info.user_record.avatar}}" mode="aspectFill"></image>
     <view class="time-box">{{info.h}}</view>
     <view class="time-tip">:</view>
     <view class="time-box">{{info.m}}</view>
@@ -17,13 +17,13 @@
     <view class="rule-box" bindtap="showRule">活动规则</view>
   </view>
   <view class="top-info" wx:else>
-    <image src="{{userInfo.avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{userInfo.avatar}}" mode="aspectFill"></image>
     <view class="time-tip time-tip1" style="margin-left:0">{{userInfo.nickname}}</view>
     <view class="rule-box" bindtap="showRule">活动规则</view>
   </view>
   <view class="info-box">
     <view class="info-tip">砍至0元可进行购买</view>
-    <image src="{{info.detail.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{info.detail.headimg}}" mode="aspectFill"></image>
     <view class="info">
       <view class="info-top">
         <view class="info-top-left">
@@ -86,7 +86,7 @@
     </view>
     <view class="kanjia-list">
       <view class="kanjia-item" wx:for="{{helpList}}">
-        <image src="{{item.avatar}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.avatar}}" mode="aspectFill"></image>
         <view class="username">{{item.help_user_name}}</view>
         <view class="userprice">-￥{{item.bargined_money/100}}</view>
       </view>
@@ -103,7 +103,7 @@
   <view class="mask-bg" bindtap="hideShare"></view>
   <view class="mask-content" style="width:500rpx;overflow:hidden;text-align:center;color:#E14135;padding:40rpx 0;">
     <view>请先关注公众号</view>
-    <image bindlongpress="saveImg" style="width:260rpx;height:260rpx;display:block;margin:40rpx auto;border-radius:10rpx;border:1rpx solid" src="https://resources.jszhwlpt.com/d3c2d106-b893-474f-bf5c-091bd04f247f.jpeg" mode="aspectFill" class="codeimg"></image>
+    <image lazy-load bindlongpress="saveImg" style="width:260rpx;height:260rpx;display:block;margin:40rpx auto;border-radius:10rpx;border:1rpx solid" src="https://resources.jszhwlpt.com/d3c2d106-b893-474f-bf5c-091bd04f247f.jpeg" mode="aspectFill" class="codeimg"></image>
     <view style="color:#333">长按保存二维码</view>
   </view>
 </view>
@@ -115,18 +115,18 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix"></image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix"></image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>
diff --git a/pages/kj/mine/index.wxml b/pages/kj/mine/index.wxml
index 11cf770..a6d0d29 100644
--- a/pages/kj/mine/index.wxml
+++ b/pages/kj/mine/index.wxml
@@ -7,7 +7,7 @@
 <view class="list">
   <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
     <view class="item-top">
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
       <view class="item-info">
         <view class="item-info-top">
           <view class="item-title">{{item.title+item.sku_name}}</view>
@@ -30,7 +30,7 @@
   </view>
 </view>
 <view wx:if="{{list.length==0 && type==1 || type==2 && over.length==0}}" class="common-empty" style="z-index:-1">
-  <image style="width:200rpx" mode="widthFix" src="https://resources.jszhwlpt.com/4d86a34e-4772-4649-b57f-b54c2ad222dc.png"></image>
+  <image lazy-load style="width:200rpx" mode="widthFix" src="https://resources.jszhwlpt.com/4d86a34e-4772-4649-b57f-b54c2ad222dc.png"></image>
   <view wx:if="{{type==1}}">您暂时还未参加砍价活动</view>
   <view wx:if="{{type==2}}">您暂时还未砍价成功</view>
   <view wx:if="{{type==1}}" class="empty-btn" bindtap="gotoPdd">立即前往</view>
diff --git a/pages/list/activity/index.wxml b/pages/list/activity/index.wxml
index 5c6200e..1fb4e26 100644
--- a/pages/list/activity/index.wxml
+++ b/pages/list/activity/index.wxml
@@ -12,7 +12,7 @@
     </view>
     <picker mode="date" value="{{date}}" start="1970-01-01" end="2027-09-01" bindchange="bindDateChange">
       <view class="picker calendar-img">
-        <image class="calendar-img" width="56rpx" height="60rpx" mode="aspectFill" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/activity/calendar.png"></image>
+        <image lazy-load class="calendar-img" width="56rpx" height="60rpx" mode="aspectFill" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/activity/calendar.png"></image>
       </view>
     </picker>
   </view>
@@ -20,7 +20,7 @@
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea">
       <view class="picker">
         <view class="areatext">{{areas[area].area_name}}</view>
-        <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+        <image lazy-load src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
     </picker>
     <!-- <view class="activity-search-bg">
@@ -42,11 +42,11 @@
         </view>
       </view>
       <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
-      <!-- <image  ></image> -->
+      <!-- <image lazy-load  ></image> -->
     </view>
   </view>
   <view wx:else class="common-empty" style="z-index:-1;top:430rpx">
-    <image mode="widthFix" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/other/nodata.png"></image>
+    <image lazy-load mode="widthFix" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/other/nodata.png"></image>
     <view>暂无内容</view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 99e2af9..3bc3226 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -1,16 +1,16 @@
 <!--pages/activity/index.wxml-->
 <title-header title="活动日历"></title-header>
-<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png" mode=""/> -->
+<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png" mode=""/> -->
 <new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
   <!-- 节假日花样 -->
-  <!-- <image class="bg-pic" src="https://static.ticket.sz-trip.com/uploads/20240605/ffe34fccbb11173e96b2bd8feacef6a3.png" mode="widthFix"/> -->
+  <!-- <image lazy-load class="bg-pic" src="https://static.ticket.sz-trip.com/uploads/20240605/ffe34fccbb11173e96b2bd8feacef6a3.png" mode="widthFix"/> -->
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
         <view class="areatext" style="font-size: 31rpx;font-weight: bold;color: #000;">{{areas[area].area_name}}</view>
-        <image src="https://static.ticket.sz-trip.com/uploads/20240429/be4c68c518d5ee781e6345a09121f882.png" mode="widthFix"></image>
-        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image> -->
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240429/be4c68c518d5ee781e6345a09121f882.png" mode="widthFix"></image>
+        <!-- <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image> -->
       </view>
     </picker>
     <view class="my-search-box">
@@ -30,37 +30,37 @@
   </view>
   <!-- <view scroll-x enable-flex class="types">
     <view class="type-item" bindtap="changeType" data-type="9">
-      <image src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
       <view style="{{type==9?'color: #0B898E':''}}">全部</view>
     </view>
     <view class="type-item" bindtap="changeType" data-type="3">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon3{{type==3?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon3{{type==3?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==3?'color:#358FE4':''}}">景区活动</view>
     </view>
     <view class="type-item" bindtap="changeType" data-type="1">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==1?'color:#FFB423':''}}">演出</view>
     </view>
     <view class="type-item" bindtap="changeType" data-type="2">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==2?'color:#C155E9':''}}">展览</view>
     </view>
     <view class="type-item" bindtap="changeType" data-type="4">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
     </view>
     <view class="type-item" bindtap="changeType" data-type="7">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==7?'color:#F75D2A':''}}">文化惠民</view>
     </view> -->
 
     <!-- <view class="type-item" bindtap="changeType" data-type="5">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
     </view> -->
 
     <!-- <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>
     </view>
     <view style="width:1rpx;flex-shrink:0;height:1rpx"></view>
@@ -80,7 +80,7 @@
     </view>
     <picker mode="date" value="{{date}}" start="1970-01-01" end="2027-09-01" bindchange="bindDateChange">
       <view class="picker calendar-img{{isYL?'':' active'}}">
-        <image width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20230208/967796a90039681fee47e9271c2207d7.png"></image>
+        <image lazy-load width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20230208/967796a90039681fee47e9271c2207d7.png"></image>
       </view>
     </picker>
   </view> -->
@@ -147,7 +147,7 @@
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:430rpx;position: inherit;">
-    <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+    <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
     <view>暂无内容</view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/list/card/index.wxml b/pages/list/card/index.wxml
index c646de7..633c092 100644
--- a/pages/list/card/index.wxml
+++ b/pages/list/card/index.wxml
@@ -1,10 +1,10 @@
 <!--pages/list/card/index.wxml-->
 <titleHeader title="一卡游苏州"></titleHeader>
-<image class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/card/top.png" mode="widthFix"></image>
+<image lazy-load class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/card/top.png" mode="widthFix"></image>
 <view class="all-bg"></view>
 <view class="list">
   <view bindtap="gotoDetail" data-item="{{item}}" url="/pages/info/cardInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
-    <image src="{{item.headimg}}"></image>
+    <image lazy-load src="{{item.headimg}}"></image>
     <view class="item-info">
       <view class="textOver2">{{item.title}}</view>
       <view class="item-bottom">
diff --git a/pages/list/comments/index.wxml b/pages/list/comments/index.wxml
index 24fc758..0edbc62 100644
--- a/pages/list/comments/index.wxml
+++ b/pages/list/comments/index.wxml
@@ -3,7 +3,7 @@
 <view class="comment-title">全部评论</view>
 <view class="comment-item" wx:for="{{list}}" wx:for-index="index">
   <view class="comment-top">
-    <image src="{{item.user.avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.user.avatar}}" mode="aspectFill"></image>
     <view class="author-info">
       <view class="top">
         <view class="author-name">{{item.nickname}}</view>
@@ -17,7 +17,7 @@
   </view>
   <view class="comment-detail">{{item.content}}</view>
   <view wx:if="{{item.img_list}}">
-    <image class="imgs" wx:for="{{item.img_list}}" wx:for-item="Goods" mode="scaleToFill" data-img="{{Goods}}" data-list="{{item.img_list}}" src="{{Goods}}" bindtap="imgsc"></image>
+    <image lazy-load class="imgs" wx:for="{{item.img_list}}" wx:for-item="Goods" mode="scaleToFill" data-img="{{Goods}}" data-list="{{item.img_list}}" src="{{Goods}}" bindtap="imgsc"></image>
   </view>
   <view class="zan-box">
     <view></view>
@@ -31,6 +31,6 @@
 
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/culturalUnit/index.wxml b/pages/list/culturalUnit/index.wxml
index 9025793..4417aed 100644
--- a/pages/list/culturalUnit/index.wxml
+++ b/pages/list/culturalUnit/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/list/culturalUnit/index.wxml-->
 <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>
+  <image lazy-load src="{{item.head_img}}" mode="aspectFill"></image>
   <view class="textOver title">{{item.company_name}}</view>
   <view class="location textOver"><view class="iconfont icon-location"></view><text class="textOver">{{item.address}}</text></view>
 </navigator>
diff --git a/pages/list/daysu/detail/index.wxml b/pages/list/daysu/detail/index.wxml
index e837858..3496c8b 100644
--- a/pages/list/daysu/detail/index.wxml
+++ b/pages/list/daysu/detail/index.wxml
@@ -1,2 +1,2 @@
 <title title="天工苏作"></title>
-<image style="display:block;width:100%" src="https://static.ticket.sz-trip.com/xcxImages/other/daysudetail.jpg" mode="widthFix"></image>
\ No newline at end of file
+<image lazy-load style="display:block;width:100%" src="https://static.ticket.sz-trip.com/xcxImages/other/daysudetail.jpg" mode="widthFix"></image>
\ No newline at end of file
diff --git a/pages/list/daysu/index.wxml b/pages/list/daysu/index.wxml
index c4323a6..80320b9 100644
--- a/pages/list/daysu/index.wxml
+++ b/pages/list/daysu/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/list/daysu/index.wxml-->
 <title title="天工苏作"></title>
 <view style="position:relative">
-  <image style="display:block;width:100%" src="https://static.ticket.sz-trip.com/xcxImages/other/DaySu.jpg" mode="widthFix"></image>
+  <image lazy-load style="display:block;width:100%" src="https://static.ticket.sz-trip.com/xcxImages/other/DaySu.jpg" mode="widthFix"></image>
   <navigator url="detail/index" class="intro-box"></navigator>
   <view class="video-box" wx:if="{{showVideo}}">
     <video 
diff --git a/pages/list/feiyi/index.wxml b/pages/list/feiyi/index.wxml
index fd547a7..fc0b292 100644
--- a/pages/list/feiyi/index.wxml
+++ b/pages/list/feiyi/index.wxml
@@ -1,12 +1,12 @@
 <!--pages/list/feiyi/index.wxml-->
 <title title="非遗专卖"></title>
-<image src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyinew_02.jpg" mode="widthFix" class="main-img"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyinew_02.jpg" mode="widthFix" class="main-img"></image>
 <view  wx:for="{{list}}" class="store-item" >
-  <image class="top-img" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_03.png" mode="widthFix"></image>
+  <image lazy-load class="top-img" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_03.png" mode="widthFix"></image>
   <view class="store-in-box">
     <view class="store-item-top" bindtap="goShop" data-id="{{item.id}}">
-      <image src="{{item.headimg}}" mode="aspectFill" class="main-store-img"></image>
-      <!-- <image mode="aspectFill" src="" class="main-store-img"><image> -->
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="main-store-img"></image>
+      <!-- <image lazy-load mode="aspectFill" src="" class="main-store-img"><image lazy-load> -->
       <view class="store-main-info">
         <view>{{item.shop_name}}</view>
         <view class="mid-box">
@@ -25,7 +25,7 @@
     </view>
     <view class="store-product-list" wx:if="{{item.product.length>0}}">
       <view class="product-item" wx:for="{{item.product}}" wx:for-item="goods" bindtap="goodsDetail" data-goods="{{goods}}">
-        <image class="product-img" src="{{goods.headimg}}" mode="aspectFill" ></image>
+        <image lazy-load class="product-img" src="{{goods.headimg}}" mode="aspectFill" ></image>
         <view class="product-title">{{goods.title}}</view>
         <view class="price-box">
           <text class="now-price">{{goods.price/100}}</text>
@@ -34,5 +34,5 @@
       </view>
     </view>
   </view>
-  <image class="top-img" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_06.png"></image>
+  <image lazy-load class="top-img" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_06.png"></image>
 </view>
diff --git a/pages/list/food/index.wxml b/pages/list/food/index.wxml
index ec4019b..2c100af 100644
--- a/pages/list/food/index.wxml
+++ b/pages/list/food/index.wxml
@@ -5,7 +5,7 @@
     <picker mode="selector" range="{{types}}" bindchange="changeType">
       <view class="picker">
         <view class="areatext">{{types[typeIndex]}}</view>
-        <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
     </picker>
   </view>
@@ -13,7 +13,7 @@
 </view>
 <view class="list">
   <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/foodProductInfo/index?id={{item.id}}" class="item">
-    <image class="main-img" src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="main-img" src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="infos">
       <view class="title textOver2">{{item.title}}</view>
       <view class="location"><text class="iconfont icon-location"></text>{{item.address}}</view>
@@ -25,10 +25,10 @@
     </view>
     <view class="iconfont icon-arrow-line-right"></view>
     <view class="order-btn" wx:if="{{typeIndex==1}}">立即预定</view>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/listtop/foodtip.png" mode="widthFix" class="tip-img"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/listtop/foodtip.png" mode="widthFix" class="tip-img"></image>
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/haoxing/index.wxml b/pages/list/haoxing/index.wxml
index a50b0d1..23a0e79 100644
--- a/pages/list/haoxing/index.wxml
+++ b/pages/list/haoxing/index.wxml
@@ -1,10 +1,10 @@
 <!--pages/list/haoxing/index.wxml-->
 <search bind:onload="search" title="君到苏州"></search>
-<image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/haoxing.jpg" mode="widthFix"></image>
+<image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/haoxing.jpg" mode="widthFix"></image>
 <view class="content">
-  <image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/haoxingimg2.png" mode="widthFix"></image>
+  <image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/haoxingimg2.png" mode="widthFix"></image>
   <view bindtap="gotoDetail" data-item="{{item}}" class="product-item" wx:for="{{list}}" style="{{index==0?'margin-top:-40rpx':''}}">
-    <image class="topimg" src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="topimg" src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="product-bottom">
       <text class="textOver">{{item.title}}</text>
       <view class="price">{{item.price/100}}/</view>
diff --git a/pages/list/hotel/index.wxml b/pages/list/hotel/index.wxml
index 855294c..bb60d0f 100644
--- a/pages/list/hotel/index.wxml
+++ b/pages/list/hotel/index.wxml
@@ -1,8 +1,8 @@
 <!--pages/list/hotel/index.wxml-->
 <search bind:onload="search"></search>
 <view style="position:relative">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/listtop/hotel_top.png" mode="widthFix" class="topimg"></image>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/listtop/hotel1.png" class="hotelimg" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/listtop/hotel_top.png" mode="widthFix" class="topimg"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/listtop/hotel1.png" class="hotelimg" mode="widthFix"></image>
 </view>
 <view class="hotel-types">
   <view class="hotel-type{{type==8?' active':''}}" bindtap="changeType" data-type="8">特色民宿</view>
@@ -15,9 +15,9 @@
   <view bindtap="changeSort">距离最近</view>
 </view>
 <view bindtap="gotoDetail" data-item="{{item}}" url="/pages/info/hotelProductInfo/index?id={{item.id}}" class="hotel-item" wx:for="{{list}}">
-  <image mode="aspectFill" class="headimg" src="{{item.headimg}}"></image>
+  <image lazy-load mode="aspectFill" class="headimg" src="{{item.headimg}}"></image>
   <view class="top-bg" wx:if="{{index<3}}">
-    <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/listtop/hotel_top_bg.png" mode="widthFix"></image> -->
+    <!-- <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/listtop/hotel_top_bg.png" mode="widthFix"></image> -->
     <text>TOP{{index+1}}</text>
   </view>
   <view class="infos">
diff --git a/pages/list/mayday/index.wxml b/pages/list/mayday/index.wxml
index 8ff9f4c..d04a999 100644
--- a/pages/list/mayday/index.wxml
+++ b/pages/list/mayday/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/list/mayday/index.wxml-->
 <view style="position:relative">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/top.png" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/top.png" mode="widthFix" class="main-img"></image>
   <view class="btns">
     <view bindtap="scrollPage" data-index="1" class="btn" style="width:122rpx"></view>
     <view bindtap="scrollPage" data-index="2" class="btn" style="width:189rpx"></view>
@@ -13,11 +13,11 @@
   </view>
 </view>
 <view class="content">
-  <image style="margin-top:0" id="box1" src="https://static.ticket.sz-trip.com/xcxImages/mayday/1.png" mode="widthFix" class="main-img"></image>
+  <image lazy-load style="margin-top:0" id="box1" src="https://static.ticket.sz-trip.com/xcxImages/mayday/1.png" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list1}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
-      <image src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
       <view class="title textOver">{{item.title}}</view>
       <view class="tags">
         <view class="tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -28,22 +28,22 @@
       </view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/2.png" id="box2" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/2.png" id="box2" mode="widthFix" class="main-img"></image>
   <view class="new-item" wx:for="{{list2}}" bindtap="gotoDetail" data-item="{{item}}">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1"></image>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1" style="right:60rpx;left:auto;width:54rpx"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/icon.png" mode="widthFix" class="iconimg1" style="right:60rpx;left:auto;width:54rpx"></image>
     <view class="new-item-bg">
       <view class="new-item-bg-in"></view>
     </view>
     <view class="new-item-bg new-item-bg1">
       <view class="new-item-info">
         <view class="topbg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/topbg.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/topbg.png" mode="widthFix"></image>
           <view class="topbg-text">TOP{{index+1}}</view>
         </view>
-        <image src="{{item.headimg}}" class="new-headimg" mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" class="new-headimg" mode="aspectFill"></image>
         <view class="new-info">
           <view class="new-info-title textOver2">{{item.title}}</view>
           <view class="textOver" wx:if="{{item.address || item.scene_address}}">地址：{{item.address || item.scene_address}}</view>
@@ -53,11 +53,11 @@
       </view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/3.png" id="box3" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/3.png" id="box3" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list3}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
-      <image src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
       <view class="title textOver">{{item.title}}</view>
       <view class="tags">
         <view class="tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -68,11 +68,11 @@
       </view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/4.png" id="box4" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/4.png" id="box4" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list4}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
-      <image src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
       <view class="title textOver">{{item.title}}</view>
       <view class="tags">
         <view class="tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -83,11 +83,11 @@
       </view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/5.png" id="box5" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/5.png" id="box5" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list5}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
-      <image src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
       <view class="title textOver">{{item.title}}</view>
       <view class="tags">
         <view class="tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -98,11 +98,11 @@
       </view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/6.png" id="box6" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/6.png" id="box6" mode="widthFix" class="main-img"></image>
   <view class="list">
     <view class="item" wx:for="{{list6}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="city-box" wx:if="{{areas[item.area_id]}}">{{areas[item.area_id]}}</view>
-      <image src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill" class="headimg"></image>
       <view class="title textOver">{{item.title}}</view>
       <view class="tags">
         <view class="tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
@@ -113,17 +113,17 @@
       </view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/7.png" id="box7" mode="widthFix" class="main-img"></image>
-  <image bindtap="clickBanner" src="https://static.ticket.sz-trip.com/xcxImages/mayday/banner.png" mode="widthFix" class="main-img" style="width:713rpx;margin-top:0"></image>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/8.png" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/7.png" id="box7" mode="widthFix" class="main-img"></image>
+  <image lazy-load bindtap="clickBanner" src="https://static.ticket.sz-trip.com/xcxImages/mayday/banner.png" mode="widthFix" class="main-img" style="width:713rpx;margin-top:0"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/8.png" mode="widthFix" class="main-img"></image>
 </view>
 <view style="position:relative">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/mayday/bottom.png" mode="widthFix" class="main-img"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/mayday/bottom.png" mode="widthFix" class="main-img"></image>
   <view class="bottom-btns">
     <navigator url="/pages/list/{{bottoms[index]}}/index" class="bottom-btn" wx:for="{{6}}"></navigator>
   </view>
 </view>
-<image style="width:300rpx;margin:40rpx auto;" src="https://static.ticket.sz-trip.com/xcxImages/mayday/text.png" mode="widthFix" class="main-img"></image>
+<image lazy-load style="width:300rpx;margin:40rpx auto;" src="https://static.ticket.sz-trip.com/xcxImages/mayday/text.png" mode="widthFix" class="main-img"></image>
 <view></view>
 <view class="totop-box" bindtap="gototop">
   <view class="iconfont icon-ziyuan"></view>
diff --git a/pages/list/message/index.wxml b/pages/list/message/index.wxml
index 175e768..9f60008 100644
--- a/pages/list/message/index.wxml
+++ b/pages/list/message/index.wxml
@@ -8,6 +8,6 @@
   <view class="more">查看详情>></view>
 </navigator>
 <view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
 </view>
diff --git a/pages/list/minitrip/index.wxml b/pages/list/minitrip/index.wxml
index 2c2b375..c298564 100644
--- a/pages/list/minitrip/index.wxml
+++ b/pages/list/minitrip/index.wxml
@@ -1,26 +1,26 @@
 <!--pages/list/road/index.wxml-->
 <search bind:onload="search"></search>
-<image class="topimg" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/carPurchase/topImg.jpg" mode="widthFix"></image>
+<image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/carPurchase/topImg.jpg" mode="widthFix"></image>
 <view class="top-box">
   <!-- <picker mode="selector" value="{{type}}" range="{{types}}" range-key="type_name" bindchange="changeType">
     <view class="picker">
       <view class="typetext {{type==null?'disable':''}}">{{type==null?'选择类型':types[type].type_name}}</view>
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
     </view>
   </picker> -->
   <view class="{{sort=='weight'?'active':''}}" bindtap="changeSort" data-sort="weight" data-order="desc">综合</view>
   <view class="price-box{{sort=='price'?' active':''}}" bindtap="changeSort" data-sort="price" data-order="{{sort=='price' && order=='asc'?'desc':'asc'}}">
     <view>价格</view>
     <view style="margin-left:4rpx">
-      <image class="{{sort=='price' && order=='asc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="asc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
-      <image class="{{sort=='price' && order=='desc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="desc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="{{sort=='price' && order=='asc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="asc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="{{sort=='price' && order=='desc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="desc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
     </view>
   </view>
   <view class="{{sort=='sales_number'?'active':''}}" bindtap="changeSort" data-sort="sales_number" data-order="desc">销量</view>
   <view class="{{sort=='rate'?'active':''}}" bindtap="changeSort" data-sort="rate" data-order="desc">好评</view>
 </view>
 <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/roadInfo/index" class="item">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2">{{item.title}}</view>
     <view><text class="score" wx:if="{{item.rate}}">{{item.rate}}分</text><text class="sales" wx:if="{{item.sales_number}}">月销{{item.sales_number}}份</text></view>
@@ -34,6 +34,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:400rpx">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index 5cbbc5d..c151e6b 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -15,7 +15,7 @@
 <!-- 热映 -->
 <view wx:if="{{type==1}}"  style="margin-top: 110rpx;">
   <navigator url="list/info/index?id={{item.third_id}}" class="item" wx:for="{{list}}">
-    <image src="{{item.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="info">
       <view class="title textOver">{{item.title}}</view>
       <view class="subtitle textOver">导演：{{item.director}}</view>
@@ -28,7 +28,7 @@
 <view wx:if="{{type==3}}">
   <navigator url="list/info/index?id={{item.third_id}}" class="item active" wx:for="{{list}}">
     <common-image width="184rpx" height="253rpx" src="{{item.headimg}}" mode="aspectFill"></common-image>
-    <!-- <image></image> -->
+    <!-- <image lazy-load></image> -->
     <view class="info">
       <view class="title textOver">{{item.title}}</view>
       <view class="time textOver">上映时间：{{item.open_time}}</view>
@@ -44,7 +44,7 @@
     <picker mode="selector" value="{{areaIndex}}" bindchange="changeArea" range="{{areas}}" range-key="area_title">
       <view class="picker">
         <view class="areatext">{{areas[areaIndex].area_title}}</view>
-        <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
     </picker>
     <view class="sort-text{{sort=='distance'?' active':''}}" bindtap="changeSort" data-sort="distance">离我最近</view>
@@ -67,6 +67,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
 </view>
diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml
index 30ab097..b26cace 100644
--- a/pages/list/movieticket/list/cinema/index.wxml
+++ b/pages/list/movieticket/list/cinema/index.wxml
@@ -4,7 +4,7 @@
   <block wx:for="{{movie}}" wx:key="this">
     <swiper-item class="banner-item">
       <view class="banner-box" animation="{{currentNum == index ? animationSelected : animationNoSelected}}">
-        <image src="{{item.headimg}}" class="banner-img"  mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" class="banner-img"  mode="aspectFill"></image>
       </view>
     </swiper-item>
   </block>
@@ -31,6 +31,6 @@
   </view>
 </div>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 651fcac..a231dec 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/list/movieticket/list/info/index.wxml-->
 <title title="影片详情"></title>
 <view class="top-info" wx:if="{{info}}">
-  <image src="{{info.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image>
   <view class="info-box">
     <view class="title">{{info.title}}</view>
     <view wx:if="{{info.duration || info.type || info.country}}">{{info.duration?(info.duration+'分钟/'):''}}{{info.type?(info.type):''}}{{info.country?'/'+info.country:''}}</view>
@@ -19,7 +19,7 @@
   <view class="line"></view>
   <view class="title">剧照</view>
   <view class="subtitle">
-    <image style="display:block;width:100%" wx:for="{{info.listimg}}" src="{{item}}" mode="widthFix"></image>
+    <image lazy-load style="display:block;width:100%" wx:for="{{info.listimg}}" src="{{item}}" mode="widthFix"></image>
   </view>
   <!-- <view class="line"></view> -->
 </view>
diff --git a/pages/list/movieticket/list/seats/index.wxml b/pages/list/movieticket/list/seats/index.wxml
index cf9f850..d2959a0 100644
--- a/pages/list/movieticket/list/seats/index.wxml
+++ b/pages/list/movieticket/list/seats/index.wxml
@@ -16,7 +16,7 @@
   <view class="seatDemos" style="justify-content:flex-start;width:700rpx">
     <block wx:for="{{level_price}}" wx:key="index">
       <view class="seatDemo" style="margin-right:20rpx">
-        <image class="seatDemoItem" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/movie/icon1-{{item.level}}.png"></image>
+        <image lazy-load class="seatDemoItem" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/movie/icon1-{{item.level}}.png"></image>
         <view class="seatDemoItem"> {{item.price/100}}</view>
       </view>
     </block>
@@ -35,7 +35,7 @@
         <text>{{hallName}}{{seatScaleHeight}}</text>
       </view> -->
       <view wx:for="{{seatList}}" wx:key="id" wx:for-index="index" wx:for-item="item" class='seatTap' catchtap='clickSeat' data-index='{{index}}' style="left:{{(item.gCol-1)* seatScaleHeight}}px;top:{{(item.gRow-1) * seatScaleHeight}}px;width: {{seatScaleHeight}}px;height: {{seatScaleHeight}}px">
-        <image src="{{item.nowIcon}}" class='normal' />
+        <image lazy-load src="{{item.nowIcon}}" class='normal' />
       </view>
     </view>
   </movable-view>
@@ -53,7 +53,7 @@
         <view class='scrollTextBottom'>
           ￥{{selectedSeatItem.price}}
         </view>
-        <image src='/images/close.png'></image>
+        <image lazy-load src='/images/close.png'></image>
       </view>
     </block>
   </scroll-view>
diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml
index 622fdb0..e48d1b3 100644
--- a/pages/list/movieticket/list/ticket/index.wxml
+++ b/pages/list/movieticket/list/ticket/index.wxml
@@ -11,7 +11,7 @@
     <picker mode="selector" value="{{areaIndex}}" bindchange="changeArea" range="{{areas}}" range-key="area_title">
       <view class="picker">
         <view class="areatext">{{areas[areaIndex].area_title}}</view>
-        <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
     </picker>
     <view class="sort-text{{sort=='distance'?' active':''}}" bindtap="changeSort" data-sort="distance">离我最近</view>
@@ -40,7 +40,7 @@
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-    <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+    <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
     <view>暂无内容</view>
   </view>
 </view>
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 56b57e9..b7b94f3 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -3,7 +3,7 @@
 <view class="list">
   <view bindtap="gotoDetail" wx:if="{{item.title!=='苏州博物馆西馆' && item.title!=='苏州博物馆西馆探索体验馆'}}" data-item="{{item}}" url="/pages/info/museumInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
     <view style="position:relative">
-      <image src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx;'}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx;'}}" mode="aspectFill"></image>
       <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view>
     </view>
     <view class="info textOver" wx:if="{{item.title!='苏州博物馆'}}">
@@ -30,6 +30,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/night/index.wxml b/pages/list/night/index.wxml
index cc536d0..4e1bed2 100644
--- a/pages/list/night/index.wxml
+++ b/pages/list/night/index.wxml
@@ -8,9 +8,9 @@
   
 </view> -->
 <!-- <view style="height:87rpx"></view> -->
-<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/shuishangyou.png" class="topImg"></image>
+<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/shuishangyou.png" class="topImg"></image>
 <view bindtap="gotoDetail" data-item="{{item}}" class="hotel-item" wx:for="{{list}}">
-  <image mode="widthFix" class="headimg" src="{{item.headimg}}"></image>
+  <image lazy-load mode="widthFix" class="headimg" src="{{item.headimg}}"></image>
   <view class="infos">
     <view class="textOver">{{item.title}}</view>
     <view class="tags textOver">
@@ -20,6 +20,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
 </view>
diff --git a/pages/list/oneday/index.wxml b/pages/list/oneday/index.wxml
index e3d9502..5d13c45 100644
--- a/pages/list/oneday/index.wxml
+++ b/pages/list/oneday/index.wxml
@@ -1,26 +1,26 @@
 <!--pages/list/road/index.wxml-->
 <search bind:onload="search"></search>
-<image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/oneday.jpg" mode="widthFix"></image>
+<image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/oneday.jpg" mode="widthFix"></image>
 <view class="top-box">
   <!-- <picker mode="selector" value="{{type}}" range="{{types}}" range-key="type_name" bindchange="changeType">
     <view class="picker">
       <view class="typetext {{type==null?'disable':''}}">{{type==null?'选择类型':types[type].type_name}}</view>
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
     </view>
   </picker> -->
   <view class="{{sort=='weight'?'active':''}}" bindtap="changeSort" data-sort="weight" data-order="desc">综合</view>
   <view class="price-box{{sort=='price'?' active':''}}" bindtap="changeSort" data-sort="price" data-order="{{sort=='price' && order=='asc'?'desc':'asc'}}">
     <view>价格</view>
     <view style="margin-left:4rpx">
-      <image class="{{sort=='price' && order=='asc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="asc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
-      <image class="{{sort=='price' && order=='desc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="desc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="{{sort=='price' && order=='asc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="asc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="{{sort=='price' && order=='desc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="desc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
     </view>
   </view>
   <view class="{{sort=='sales_number'?'active':''}}" bindtap="changeSort" data-sort="sales_number" data-order="desc">销量</view>
   <view class="{{sort=='rate'?'active':''}}" bindtap="changeSort" data-sort="rate" data-order="desc">好评</view>
 </view>
 <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/roadInfo/index" class="item">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2">{{item.title}}</view>
     <view><text class="score" wx:if="{{item.rate}}">{{item.rate}}分</text><text class="sales" wx:if="{{item.sales_number}}">月销{{item.sales_number}}份</text></view>
@@ -34,6 +34,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:400rpx">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/road/index.wxml b/pages/list/road/index.wxml
index a992dba..0393a9c 100644
--- a/pages/list/road/index.wxml
+++ b/pages/list/road/index.wxml
@@ -3,27 +3,27 @@
 <view class="types">
   <view bindtap="changeType" data-type="{{index}}" class="type-item{{type==index?' active':''}}" wx:for="{{types}}">{{item.type_name}}</view>
 </view>
-<!-- <image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/road.jpg" mode="widthFix"></image> -->
+<!-- <image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/road.jpg" mode="widthFix"></image> -->
 <view class="top-box">
   <!-- <picker mode="selector" value="{{type}}" range="{{types}}" range-key="type_name" bindchange="changeType">
     <view class="picker">
       <view class="typetext {{type==null?'disable':''}}">{{type==null?'选择类型':types[type].type_name}}</view>
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
     </view>
   </picker> -->
   <view class="{{sort=='weight'?'active':''}}" bindtap="changeSort" data-sort="weight" data-order="desc">综合</view>
   <view class="price-box{{sort=='price'?' active':''}}" bindtap="changeSort" data-sort="price" data-order="{{sort=='price' && order=='asc'?'desc':'asc'}}">
     <view>价格</view>
     <view style="margin-left:4rpx">
-      <image class="{{sort=='price' && order=='asc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="asc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
-      <image class="{{sort=='price' && order=='desc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="desc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="{{sort=='price' && order=='asc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="asc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="{{sort=='price' && order=='desc'?'active':''}}" catchtap="changeSort" data-sort="price" data-order="desc" src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
     </view>
   </view>
   <view class="{{sort=='sales_number'?'active':''}}" bindtap="changeSort" data-sort="sales_number" data-order="desc">销量</view>
   <view class="{{sort=='rate'?'active':''}}" bindtap="changeSort" data-sort="rate" data-order="desc">好评</view>
 </view>
 <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/roadInfo/index" class="item">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2">{{item.title}}</view>
     <view><text class="score" wx:if="{{item.rate}}">{{item.rate}}分</text><text class="sales" wx:if="{{item.sales_number}}">月销{{item.sales_number}}份</text></view>
@@ -37,6 +37,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:400rpx">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/sale/index.wxml b/pages/list/sale/index.wxml
index 43f1465..f974489 100644
--- a/pages/list/sale/index.wxml
+++ b/pages/list/sale/index.wxml
@@ -22,8 +22,8 @@
     </view>
     <view class="item" wx:for="{{activity.fast_sales_sku}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="image-box">
-        <image class="border-img" src="https://static.ticket.sz-trip.com/xcxImages/activity/border.png" mode="aspectFill"></image>
-        <image src="{{item.sku.product.type=='movie'?item.sku.product.headimg:item.sku.headimg}}" mode="aspectFill"></image>
+        <image lazy-load class="border-img" src="https://static.ticket.sz-trip.com/xcxImages/activity/border.png" mode="aspectFill"></image>
+        <image lazy-load src="{{item.sku.product.type=='movie'?item.sku.product.headimg:item.sku.headimg}}" mode="aspectFill"></image>
       </view>
       <view class="right-info">
         <view class="textOver2 title">{{item.sku.product.title +item.sku.sku_name}}</view>
@@ -44,8 +44,8 @@
 <view wx:else  class="list">
   <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
     <view class="image-box">
-      <image class="border-img" src="https://static.ticket.sz-trip.com/xcxImages/activity/border.png" mode="aspectFill"></image>
-      <image src="{{item.headimg}}" mode="aspectFill"></image>
+      <image lazy-load class="border-img" src="https://static.ticket.sz-trip.com/xcxImages/activity/border.png" mode="aspectFill"></image>
+      <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
     </view>
     <view class="right-info">
       <view class="textOver2 title">{{item.title}}</view>
@@ -63,6 +63,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/scene/index.wxml b/pages/list/scene/index.wxml
index d54e890..081da4c 100644
--- a/pages/list/scene/index.wxml
+++ b/pages/list/scene/index.wxml
@@ -5,10 +5,10 @@
   <view class="hot-item" wx:for="{{10}}">产品产品产</view>
 </view> -->
 <!-- <view style="height:100rpx"></view> -->
-<image class="topImg" src="https://static.ticket.sz-trip.com/uploads/20240521/3022ab8f3d45444ead1e77f9a2112dc0.png" mode=""/>
+<image lazy-load class="topImg" src="https://static.ticket.sz-trip.com/uploads/20240521/3022ab8f3d45444ead1e77f9a2112dc0.png" mode=""/>
 <view class="navBox">
   <view class="nav {{index == navIndex?'seld-nav':''}}" wx:for="{{navList}}" data-item="{{item}}" bindtap="changeType" data-index="{{index}}">
-    <image src="https://static.ticket.sz-trip.com{{item.icon}}" mode=""/>
+    <image lazy-load src="https://static.ticket.sz-trip.com{{item.icon}}" mode=""/>
     <view class="{{index == navIndex?'seld-nav-text':'nav-text'}}">
       {{item.name}}
     </view>
@@ -16,7 +16,7 @@
 </view>
 <view style="height:30rpx"></view>
 <view bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" url="/pages/info/sceneProductInfo/index?id={{item.id}}" class="item">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <!-- <view class="no-text" wx:if="{{index<3 && keywords==''}}">NO.{{index+1}}</view> -->
   <!-- <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view> -->
   <view class="right-info">
@@ -37,6 +37,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top: 220rpx;">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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.wxml b/pages/list/six/index.wxml
index 3085b3c..74e84bb 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -2,8 +2,8 @@
 <!-- <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"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>
+<!-- <image lazy-load src="https://resource.sz-trip.com/uploads/20190831/3ecfcb81bab36027606676737788110c.png" mode="aspectFill" class="topbg"></image> -->
+<image lazy-load src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>
 <view class="types-box">
   <picker mode="selector" range="{{areas}}" range-key="area_title" bindchange="changeArea">
     <view class="picker active">
@@ -21,54 +21,54 @@
 <view class="new-title">文旅服务</view>
 <view class="new-icons">
   <navigator url="../activitynew/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/six/icon1.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/six/icon1.png" mode="widthFix"></image>
     <view>活动日历</view>
   </navigator>
   <navigator url="../scene/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
-    <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon2.png" mode="widthFix"></image>
+    <image lazy-load class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon2.png" mode="widthFix"></image>
     <view>景点门票</view>
   </navigator>
   <!-- <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
-    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
+    <image lazy-load class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
   </navigator> -->
   <view class="new-icon" bind:tap="goHotel">
-    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
+    <image lazy-load class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
   </view>
     
   <!-- <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
-    <image class="purple-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon4.png" mode="widthFix"></image>
+    <image lazy-load class="purple-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon4.png" mode="widthFix"></image>
     <view>电影购票</view>
   </navigator> -->
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
   <navigator  data-title="景区舒适度" url="/pages/pbService/sceneComfort/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
-    <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon5.png" mode="widthFix"></image>
+    <image lazy-load class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon5.png" mode="widthFix"></image>
     <view>景区舒适度</view>
   </navigator>
   <navigator url="/pages/pbService/bike/index?type=2&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
-    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon6.png" mode="widthFix"></image>
+    <image lazy-load class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon6.png" mode="widthFix"></image>
     <view>停车场</view>
   </navigator>
   <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon" wx:if="{{areaIndex != 0 && areaIndex != 1 && areaIndex != 2 && areaIndex != 3}}">
-    <image class="red-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon7.png" mode="widthFix"></image>
+    <image lazy-load class="red-shadow" src="https://static.ticket.sz-trip.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">
-    <image class="yellow-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon8.png" mode="widthFix"></image>
+    <image lazy-load class="yellow-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
   </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://static.ticket.sz-trip.com/xcxImages/six/icon8.png" mode="widthFix"></image>
+    <image lazy-load class="yellow-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
   </view> -->
 </view>
 <view class="new-title">周边推荐</view>
 <view class="list">
   <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
-    <image src="{{item.headimg}}" class="main-img" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" class="main-img" mode="aspectFill"></image>
     <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>
@@ -76,7 +76,7 @@
     <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>
+    <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
     <view>暂无内容</view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/list/store/index.wxml b/pages/list/store/index.wxml
index 4a0f479..f9e4cd8 100644
--- a/pages/list/store/index.wxml
+++ b/pages/list/store/index.wxml
@@ -13,7 +13,7 @@
 <!-- <common-image class="top-img" wx:if="{{info}}" originalImage="{{info.logo}}" width="100%" mode="widthFix" defaultImage="/images/empty2.png"></common-image> -->
 <view class="feiyi-list">
 	<view bindtap="gotoDetail" data-item="{{item}}" url="/pages/info/postProductInfo/index?id={{item.id}}" class="feiyi-item" wx:for="{{list}}">
-    <image src="{{item.headimg}}" class="main-img" mode="aspectFill"></image>
+    <image lazy-load src="{{item.headimg}}" class="main-img" mode="aspectFill"></image>
     <!-- <common-image class="main-img" originalImage="{{item.headImg}}" width="340rpx" height="224rpx" mode="aspectFill"></common-image> -->
     <view class="info-box">
       <view class="title">{{item.title}}</view>
@@ -25,6 +25,6 @@
 	</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>
+  <image lazy-load 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/strategy/index.wxml b/pages/list/strategy/index.wxml
index 33e3f1b..10f15a7 100644
--- a/pages/list/strategy/index.wxml
+++ b/pages/list/strategy/index.wxml
@@ -5,19 +5,19 @@
   <input type="text" bindinput="changeKeyword" placeholder="请输入搜索关键字" />
   <view class="search-btn" bindtap="search">搜索</view>
 </view>
-<image class="topimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/topBac.png" mode="widthFix"></image>
+<image lazy-load class="topimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/topBac.png" mode="widthFix"></image>
 <view class="types">
 
   <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://static.ticket.sz-trip.com/xcxImages/listtop/gl{{type==0?'0':'new1'}}.png" mode="aspectFill"></image>
+    <image lazy-load wx:if="{{type==0}}" class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBacActive.png" mode="aspectFill"></image>
+    <image lazy-load wx:else class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBac.png" mode="aspectFill"></image>
+    <image lazy-load class="iconimg" src="https://static.ticket.sz-trip.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://static.ticket.sz-trip.com/xcxImages/listtop/sc{{type==1?'0':'new1'}}.png" mode="aspectFill"></image>
+    <image lazy-load wx:if="{{type==1}}" class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBacActive.png" mode="aspectFill"></image>
+    <image lazy-load wx:else class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBac.png" mode="aspectFill"></image>
+    <image lazy-load class="iconimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/sc{{type==1?'0':'new1'}}.png" mode="aspectFill"></image>
     <view>官方手册</view>
   </view>
 </view>
@@ -25,11 +25,11 @@
   <navigator url="/pages/info/strategyInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
     <view class="title textOver">
       <text class="textOver">{{item.title}}</text>
-      <image wx:if="{{item.is_hot==1}}" src="https://static.ticket.sz-trip.com/xcxImages/listtop/hot.png" mode="widthFix"></image>
+      <image lazy-load wx:if="{{item.is_hot==1}}" src="https://static.ticket.sz-trip.com/xcxImages/listtop/hot.png" mode="widthFix"></image>
     </view>
     <view class="subtitle textOver2">{{item.subtitle}}</view>
     <view class="strategy-bottom">
-      <image src="{{item.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.avatar}}" mode="aspectFill"></image>
       <view class="author-name">{{item.nickname}}</view>
       <view class="iconfont icon-xin"></view>
       <text>{{item.like_number}}</text>
@@ -42,7 +42,7 @@
   <view bindtap="gotoGuide" data-item='{{item}}' url="/pages/info/guideInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
     <view class="title textOver">
       <text class="textOver">{{item.title}}</text>
-      <image wx:if="{{item.is_hot==1}}" src="https://static.ticket.sz-trip.com/xcxImages/listtop/hot.png" mode="widthFix"></image>
+      <image lazy-load wx:if="{{item.is_hot==1}}" src="https://static.ticket.sz-trip.com/xcxImages/listtop/hot.png" mode="widthFix"></image>
     </view>
     <view class="subtitle textOver2"> </view>
     <view class="strategy-bottom">
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index afaad8a..2544553 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -2,9 +2,9 @@
 <!-- 非遗列表页面 -->
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="文创特产"></title>
-<image class="heaimg" src="https://static.ticket.sz-trip.com/xcxImages/techan/top1.png" mode="widthFix"></image>
+<image lazy-load class="heaimg" src="https://static.ticket.sz-trip.com/xcxImages/techan/top1.png" mode="widthFix"></image>
 <view style="position:relative;margin-top: -107rpx;">
-  <image mode="widthFix" class="classimg" src="https://static.ticket.sz-trip.com/xcxImages/techan/class.png"></image>
+  <image lazy-load mode="widthFix" class="classimg" src="https://static.ticket.sz-trip.com/xcxImages/techan/class.png"></image>
   <view class="type-text" bindtap="changeType" data-type="3"><text>特</text><text>产</text></view>
   <view class="type-text" bindtap="changeType" data-type="2" style="left:auto;right:135rpx"><text>文</text><text>创</text></view>
 </view>
@@ -31,14 +31,14 @@
     </view>
     <view class="product-list">
       <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}">
-        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="product-title textOver2">{{item.title}}</view>
         <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
       </view>
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:700rpx">
-    <!-- <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image> -->
+    <!-- <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image> -->
     <view>暂无内容</view>
   </view>
 </view>
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index 097052b..f1f11b7 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -2,7 +2,7 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <view class="my-header-search">
     <search bind:onload="search" transparent="1"></search>
-    <image class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
+    <image lazy-load class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20241118/5540525af7880d15a3899f56f9000237.png" mode="widthFix"></image>
 
     <view class="sale-types no-scrollbar">
         <view class="sale-type{{type==477?' active':''}}" bindtap="changeType" data-type="477">全部</view>
@@ -16,7 +16,7 @@
 
 <view style="height:580rpx"></view>
 <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2 title">{{item.title}}</view>
     <view class="textOver subtitle">{{item.subtitle}}</view>
@@ -27,6 +27,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/map/index.wxml b/pages/map/index.wxml
index ccfb077..50707e7 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -9,86 +9,86 @@
 <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="area_title" bindchange="changeArea">
   <view class="picker" style="top:{{selectHeight}}px">
     <view class="areatext">{{areas[areaIndex].area_title}}</view>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
   </view>
 </picker>
 <view class="menus" wx:if="{{showMore=='close'}}">
   <!-- <view class="open" bindtap="changeShow"></view> -->
-  <image bindtap="changeShow" class="img-icon-new" src="https://static.ticket.sz-trip.com/uploads/20240426/dcc098205e0fbf21f0056ebe6046d10f.png" mode=""/>
+  <image lazy-load bindtap="changeShow" class="img-icon-new" src="https://static.ticket.sz-trip.com/uploads/20240426/dcc098205e0fbf21f0056ebe6046d10f.png" mode=""/>
   <view class="menu-list">
     <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
-      <image class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
       <text class="text">景点</text>
     </view>
     <view class="menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
-      <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
       <text class="text">场馆</text>
     </view>
     <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
-      <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
     </view>
     <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
-      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
       <text class="text">公共自行车</text>
     </view>
   </view>
 </view>
 <view class="menus2" wx:else>
-  <!-- <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/> -->
-  <image bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240429/f2443b72067da82373d545db179f4dca.png" mode=""/>
+  <!-- <image lazy-load class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/> -->
+  <image lazy-load bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240429/f2443b72067da82373d545db179f4dca.png" mode=""/>
   <scroll-view scroll-x style="height:280rpx" bindscroll="listenScroll" class="">
     <view class="menus-list1" style="margin-bottom:30rpx">
       <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
-        <image class="menu-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
+        <image lazy-load class="menu-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
         <text class="text">景点</text>
       </view>
       <view class="menus-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
-      <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
       <text class="text">场馆</text>
     </view>
     <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
-      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
       <text class="text">停车场</text>
     </view>
     <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
-      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
       <text class="text">游客中心</text>
     </view>
     <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
-      <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
     </view>
     <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
-      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
       <text class="text">行李寄存</text>
     </view>
     <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
-      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
       <text class="text">特产</text>
     </view>
     <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
-      <image class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
       <text class="text">美食</text>
     </view>
     <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
-      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
       <text class="text">公共自行车</text>
     </view>
     <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
-      <image class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
       <text class="text">运河十景</text>
     </view>
     <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
-      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
       <text class="text">文保单位</text>
     </view>
     <view class="menus-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
-      <image class="menu-item-img" src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20240123/a95f3135ee4c9550b7bb0e855e8eb13b.png':'https://static.ticket.sz-trip.com/uploads/20240123/7dc1051d06ad9a4703edc209b065e851.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20240123/a95f3135ee4c9550b7bb0e855e8eb13b.png':'https://static.ticket.sz-trip.com/uploads/20240123/7dc1051d06ad9a4703edc209b065e851.png'}}" mode="aspectFill"/>
       <text class="text">江南小书场</text>
     </view>
     <view class="menus-item{{type==13?' active':''}}" bindtap="changeType" data-title="红色地图" data-type="13">
-      <image class="menu-item-img" src="{{type==13?'https://static.ticket.sz-trip.com/uploads/20240123/176d442b0df8b16329ac62ffd481815a.png':'https://static.ticket.sz-trip.com/uploads/20240123/789606012a481332c98a5bd7ccb07306.png'}}" mode="aspectFill"/>
+      <image lazy-load class="menu-item-img" src="{{type==13?'https://static.ticket.sz-trip.com/uploads/20240123/176d442b0df8b16329ac62ffd481815a.png':'https://static.ticket.sz-trip.com/uploads/20240123/789606012a481332c98a5bd7ccb07306.png'}}" mode="aspectFill"/>
       <text class="text">红色地图</text>
     </view>
     </view>
@@ -100,27 +100,27 @@
 </view>
 <!-- <view class="right-menus" style="top:{{seachHeight}}px">
   <view class="right-menu-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
-    <image src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/5ec907e6ff03f558b1f6a3bf96894ccb.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/5ec907e6ff03f558b1f6a3bf96894ccb.png'}}" mode="aspectFill"/>
     <text class="text">景点</text>
   </view>
   <view class="right-menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
-    <image src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/4019480777583c7efcf18943b21b1ba3.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/4019480777583c7efcf18943b21b1ba3.png'}}" mode="aspectFill"/>
 
     <text class="text">场馆</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==3?' active':''}}" data-title="特产" bindtap="changeType" data-type="3">
 
-    <image src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
 
     <text class="text">特产</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==4?' active':''}}" data-title="美食" bindtap="changeType" data-type="4">
-    <image src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/04c558efe2650ca21f4612d60cc02a32.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/04c558efe2650ca21f4612d60cc02a32.png'}}" mode="aspectFill"/>
 
     <text class="text">美食</text>
   </view>
   <view class="right-menu-item{{type==5?' active':''}}" bindtap="changeType" data-title="文物" data-type="5">
-    <image src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/be9f147b71b30acb0cd210b973787a31.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/be9f147b71b30acb0cd210b973787a31.png'}}" mode="aspectFill"/>
 
     <text class="text">文保单位</text>
   </view> -->
@@ -129,17 +129,17 @@
     <text>影院</text>
   </view> -->
   <!-- <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
-    <image src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/848919fa7df7d7a2cac6c671ff36c28c.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/848919fa7df7d7a2cac6c671ff36c28c.png'}}" mode="aspectFill"/>
 
     <text class="text">运河十景</text>
   </view>
   <view class="right-menu-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
-    <image src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/825ba0d2c4879e5609ecd1f585e48df8.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/825ba0d2c4879e5609ecd1f585e48df8.png'}}" mode="aspectFill"/>
 
     <text class="text">江南小书场</text>
   </view>
   <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="9">
-    <image src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
+    <image lazy-load src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
     <text class="text">红色地图</text>
   </view> -->
   <!-- <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="文化单位" data-type="9">
@@ -191,7 +191,7 @@
 <view class="map-item scenic-item" wx:if="{{showInfo && info && info.info.type=='scenic'}}">
   <view style="display: flex;">
     <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
-    <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
+    <image lazy-load wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
     <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
       <view class="title textOver">{{info.info.title}}</view>
       <view class="subtitle textOver2">地址：{{info.info.address}}</view>
@@ -219,7 +219,7 @@
 </view>
 <view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage'&&info.info.type!='scenic')}}">
   <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
-  <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
+  <image lazy-load wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
     <view class="title textOver">{{info.info.title}}</view>
     <view class="subtitle textOver2">地址：{{info.info.address}}</view>
@@ -235,7 +235,7 @@
   <view class="subtitle textOver">开放时间：{{info.info.open_time}}</view>
   <view class="map-item-tip">景区图片</view>
   <view class="sign-pic-list">
-    <image bindtap="showImages" data-index="{{index}}" src="{{item}}" wx:for="{{info.info.listimg}}" mode="aspectFill"></image>
+    <image lazy-load bindtap="showImages" data-index="{{index}}" src="{{item}}" wx:for="{{info.info.listimg}}" mode="aspectFill"></image>
   </view>
   <view class="map-item-menus" wx:if="{{menus.length>0}}">
     <view bindtap="changeMenu" wx:if="{{item}}" data-index="{{index}}" wx:for="{{menus}}" class="map-item-menu {{menuIndex==index?'active':''}}">{{item}}</view>
@@ -243,7 +243,7 @@
   <view class="list{{menus[menuIndex]=='视频'?' videolist':''}}">
     <view wx:for="{{productList}}" bindtap="gotoDetailNew" data-item="{{item}}">
       <view class="video-item" wx:if="{{menus[menuIndex]=='视频'}}">
-        <image class="main-img" src="{{item.head_img}}" mode="aspectFill"></image>
+        <image lazy-load class="main-img" src="{{item.head_img}}" mode="aspectFill"></image>
         <view class="video-title textOver2">{{item.title}}</view>
         <view class="video-bottom">
           <view class="iconfont icon-eye"></view>
@@ -252,27 +252,27 @@
           <view>{{item.like_number}}</view>
         </view>
         <view class="video-play-mask">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/map/videoplay.png" mode="aspectFill"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/map/videoplay.png" mode="aspectFill"></image>
         </view>
       </view>
       <view wx:elif="{{menus[menuIndex]=='讲解'}}" class="audio-item">
-        <image src="{{item.head_img}}" class="mainimg" mode="aspectFill"></image>
+        <image lazy-load src="{{item.head_img}}" class="mainimg" mode="aspectFill"></image>
         <view class="audio-info">
           <view class="audio-title textOver">{{item.title}}</view>
           <view class="audio-bottom">
             <view class="audio-time">{{timeList['audio'+item.id] && timeList['audio'+item.id].time?timeList['audio'+item.id].time:"00:00"}} / {{timeList['audio'+item.id]?timeList['audio'+item.id].all_time:"00:00"}}</view>
             <view class="audio-new-bg">
               <view style="left:{{timeList['audio'+item.id]?timeList['audio'+item.id].width:0}}%" class="audio-line"></view>
-              <image style="left:{{timeList['audio'+item.id]?timeList['audio'+item.id].width:0}}%" src="https://static.ticket.sz-trip.com/xcxImages/map/audiobtn.png" mode="aspectFill"></image>
+              <image lazy-load style="left:{{timeList['audio'+item.id]?timeList['audio'+item.id].width:0}}%" src="https://static.ticket.sz-trip.com/xcxImages/map/audiobtn.png" mode="aspectFill"></image>
             </view>
             <!-- <audio src="{{item.multimedia_url}}" id="audio{{item.id}}" loop></audio> -->
           </view>
         </view>
-        <image bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:if="{{!item.play}}" src="https://static.ticket.sz-trip.com/xcxImages/map/audioplay.png" mode="aspectFill" class="playimg"></image>
-        <image bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:else src="https://static.ticket.sz-trip.com/xcxImages/map/audiostop.png" mode="aspectFill" class="playimg"></image>
+        <image lazy-load bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:if="{{!item.play}}" src="https://static.ticket.sz-trip.com/xcxImages/map/audioplay.png" mode="aspectFill" class="playimg"></image>
+        <image lazy-load bindtap="startAuido" data-id="{{item.id}}" data-index="{{index}}" wx:else src="https://static.ticket.sz-trip.com/xcxImages/map/audiostop.png" mode="aspectFill" class="playimg"></image>
       </view>
       <view wx:elif="{{menus[menuIndex]!='攻略'}}" class="item">
-        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="right-info" style="display:flex;flex-direction:column;justify-content:space-between">
           <view>
             <view class="title textOver2">{{item.title}}</view>
@@ -291,7 +291,7 @@
         <view class="title textOver2">{{item.title}}</view>
         <view class="product-address textOver">{{item.subtitle}}</view>
         <view class="product-bottom">
-          <image src="{{item.avatar}}" mode="aspectFill"></image>
+          <image lazy-load src="{{item.avatar}}" mode="aspectFill"></image>
           <view class="username">
             {{item.nickname}}
           </view>
@@ -308,7 +308,7 @@
   </view>
 </view>
 <view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask" catchtouchmove="preventTouchMove">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
 </view>
 
 </view>
@@ -319,21 +319,21 @@
         <!-- 元旦修改 ggfw为新增类名 -->
         <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
         <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
             <view>电子社保卡</view>
         </view>
         <!-- 这个不用改 假数据 -->
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
             <view>景区舒适度</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
             <view>行李寄存</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
 
-            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
             <view>实时路况</view>
         </view>
 
diff --git a/pages/old/index.wxml b/pages/old/index.wxml
index fd03ba0..e6a2432 100644
--- a/pages/old/index.wxml
+++ b/pages/old/index.wxml
@@ -2,11 +2,11 @@
 <view style="height:175rpx"></view>
 <view class="bottom com-flex">
   <view class="bottom-item active">
-    <image src="/images/homeSel.png" mode="widthFix"></image>
+    <image lazy-load src="/images/homeSel.png" mode="widthFix"></image>
     <view>首页</view>
   </view>
   <navigator url="user/index" class="bottom-item">
-    <image src="/images/user.png" mode="widthFix"></image>
+    <image lazy-load src="/images/user.png" mode="widthFix"></image>
     <view>我的</view>
   </navigator>
 </view>
diff --git a/pages/old/profile/index.wxml b/pages/old/profile/index.wxml
index 847c008..9acbf72 100644
--- a/pages/old/profile/index.wxml
+++ b/pages/old/profile/index.wxml
@@ -5,7 +5,7 @@
 <view class="profile-item">
   <text>头像</text>
   <view class="info" bindtap="uploadTap" style="text-align:right;">
-    <image src="{{avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{avatar}}" mode="aspectFill"></image>
   </view>
   <view class="iconfont icon-you"></view>
 </view>
diff --git a/pages/old/user/index.wxml b/pages/old/user/index.wxml
index 58f8b6b..0866069 100644
--- a/pages/old/user/index.wxml
+++ b/pages/old/user/index.wxml
@@ -1,14 +1,14 @@
 <!--pages/old/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <view class="topbg com-flex">
-  <image src="{{info.avatar}}" mode="aspectFill" class="avatar"></image>
+  <image lazy-load src="{{info.avatar}}" mode="aspectFill" class="avatar"></image>
   <navigator url="../profile/index" class="userinfo">
     <view class="com-flex">
       <view>{{info.nickname}}</view>
-      <image wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/user/sex{{info.gender}}.png"></image>
+      <image lazy-load wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/user/sex{{info.gender}}.png"></image>
       <view style="flex:1"></view>
       <view class="com-flex changebox">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/old/change.png" mode="widthFix"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/old/change.png" mode="widthFix"></image>
         <view>切换常规模式</view>
       </view>
     </view>
@@ -18,28 +18,28 @@
 <view class="list">
   <view class="item com-flex">
     <view>我的订单</view>
-    <image class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/old/orderbg.png" mode="widthFix"></image>
-    <image class="circle" src="https://static.ticket.sz-trip.com/xcxImages/old/circle.png" mode="widthFix"></image>
+    <image lazy-load class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/old/orderbg.png" mode="widthFix"></image>
+    <image lazy-load class="circle" src="https://static.ticket.sz-trip.com/xcxImages/old/circle.png" mode="widthFix"></image>
   </view>
   <navigator url="../linkman/index" class="item com-flex">
     <view>出行人信息</view>
-    <image class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/old/linkmanbg.png" mode="widthFix"></image>
-    <image class="circle" src="https://static.ticket.sz-trip.com/xcxImages/old/circle.png" mode="widthFix"></image>
+    <image lazy-load class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/old/linkmanbg.png" mode="widthFix"></image>
+    <image lazy-load class="circle" src="https://static.ticket.sz-trip.com/xcxImages/old/circle.png" mode="widthFix"></image>
   </navigator>
   <view class="item com-flex">
     <view>联系客服</view>
-    <image class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/old/servicebg.png" mode="widthFix"></image>
-    <image class="circle" src="https://static.ticket.sz-trip.com/xcxImages/old/circle.png" mode="widthFix"></image>
+    <image lazy-load class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/old/servicebg.png" mode="widthFix"></image>
+    <image lazy-load class="circle" src="https://static.ticket.sz-trip.com/xcxImages/old/circle.png" mode="widthFix"></image>
   </view>
 </view>
 <view style="height:175rpx"></view>
 <view class="bottom com-flex">
   <navigator url="../index" class="bottom-item">
-    <image src="/images/home.png" mode="widthFix"></image>
+    <image lazy-load src="/images/home.png" mode="widthFix"></image>
     <view>首页</view>
   </navigator>
   <view class="bottom-item active">
-    <image src="/images/userSel.png" mode="widthFix"></image>
+    <image lazy-load src="/images/userSel.png" mode="widthFix"></image>
     <view>我的</view>
   </view>
 </view>
diff --git a/pages/order/WineSceneOrder/index.wxml b/pages/order/WineSceneOrder/index.wxml
index e5971bf..e2f5348 100644
--- a/pages/order/WineSceneOrder/index.wxml
+++ b/pages/order/WineSceneOrder/index.wxml
@@ -17,10 +17,10 @@
       <view class="s-price">
         {{product.sku.price/100}}
       </view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
       <view class="number-box">{{productNum}}</view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
  
     </view>
     <view class="text1">
diff --git a/pages/order/comment/index.wxml b/pages/order/comment/index.wxml
index 3f59adc..5958fd6 100644
--- a/pages/order/comment/index.wxml
+++ b/pages/order/comment/index.wxml
@@ -2,7 +2,7 @@
 <title title="填写评论"></title>
 <view class="product-box" wx:if="{{info}}" wx:for="{{info.order_product_list}}">
   <view class="product-top prd">
-    <image src="{{item.product_img}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.product_img}}" mode="aspectFill"></image>
     <view class="product-info">
       <view class="product-title">{{item.product_title}}</view>
       <view class="sku-name">{{item.sku_name}}</view>
@@ -20,12 +20,12 @@
   <textarea bindinput="changeContent" data-index="{{index}}" placeholder="您对产品还满意吗？您的评价会帮助更多的人哦~"></textarea>
   <view class="weui-uploader">
     <view class='pics' wx:for="{{imgs}}" wx:for-item="item" wx:key="*this">
-        <image class='weui-uploader__img' src="{{item}}" data-index="{{index}}" mode="aspectFill" bindtap="previewImg">
+        <image lazy-load class='weui-uploader__img' src="{{item}}" data-index="{{index}}" mode="aspectFill" bindtap="previewImg">
                   <icon type='cancel' class="delete-btn" data-index="{{index}}" catchtap="deleteImg"></icon>
         </image>
     </view>
     <view class="tp_cont {{tj_ycang?'':'hide'}}" bindtap="chooseImg">
-      <view class="tp_add"><image style="width: 60rpx;" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20220811/13f3f3558cb7e627cef42581f8a2555d.png"></image> <view>上传图片</view></view>
+      <view class="tp_add"><image lazy-load style="width: 60rpx;" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20220811/13f3f3558cb7e627cef42581f8a2555d.png"></image> <view>上传图片</view></view>
     </view>
 </view>
 </view>
@@ -38,12 +38,12 @@
 <view class="btn" bindtap="submit">提交</view>
 <view class="proad" id="box4">
   <view class="proad-title">
-    <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/25af23290c0e6ed438f9c4f2222dd81c.png"></image>
+    <image lazy-load mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/25af23290c0e6ed438f9c4f2222dd81c.png"></image>
   </view>
   <view class="pro-list">
     <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="item-hd">
-        <image src="{{item.headimg}}"></image>
+        <image lazy-load src="{{item.headimg}}"></image>
       </view>
       <view class="item-bm">
         <view class="protitle text-overflowRows">{{item.title}}</view>
diff --git a/pages/order/components/contact/index.wxml b/pages/order/components/contact/index.wxml
index 5e9d430..fd9496b 100644
--- a/pages/order/components/contact/index.wxml
+++ b/pages/order/components/contact/index.wxml
@@ -19,7 +19,7 @@
         <!-- <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button> -->
         <input bindinput="phoneInput" type="number" value="{{phone}}" class="weui-input" placeholder="请输入手机号" />
       </view>
-      <image class="cha" bindtap="delTel" wx:if="{{phone!=''}}" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/cha.png" mode=""/>
+      <image lazy-load class="cha" bindtap="delTel" wx:if="{{phone!=''}}" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/cha.png" mode=""/>
     </view>
     <!-- 实名 -->
     <!-- <view class="contacts-list" wx:if="{{selectLinkman.length>0}}">
@@ -44,7 +44,7 @@
         <view style="width: 550rpx;display: flex;">
           <view class="{{item.selected == 1 ?'name-box':'frame'}}"  wx:for="{{manList}}" bindtap="selcetFrame" data-index="{{index}}" wx-if="{{index < 3}}" data-item="{{item}}">
             <text>{{item.name}}</text>
-            <image wx:if="{{item.selected == 1}}" class="name-selected-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/dui.png" mode=""/>
+            <image lazy-load wx:if="{{item.selected == 1}}" class="name-selected-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/dui.png" mode=""/>
           </view>
         </view>
         <view class="more" bindtap="showLinkman">
@@ -71,22 +71,22 @@
       
         <view class="text1" bindtap="addMask" wx:for="{{productNum}}" wx:for-index="index" wx:if="{{index > (seldManList.length -1)}}">
           <view style="display: flex;align-items: center;">
-            <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
+            <image lazy-load style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
             <!-- <view style="margin-right: 36rpx;" wx:if="{{selectLinkman.length>0}}">出行人{{selectLinkman.length+1}}</view> -->
             <view style="margin-right: 36rpx;">出行人{{index+1}}</view>
             <view>点击填写1位出行人信息</view>
           </view>
-          <image style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
+          <image lazy-load style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
         </view>
       </view>
       <view wx:if="{{is_real_name=='0' && seldManList.length==0}}">
         <view class="text1" bindtap="addMask">
           <view style="display: flex;align-items: center;">
-            <image style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
+            <image lazy-load style="width: 43.33rpx;height: 46rpx;margin-right: 28rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/add.png" mode=""/>
             <view style="margin-right: 36rpx;">出行人1</view>
             <view>点击填写1位出行人信息</view>
           </view>
-          <image style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
+          <image lazy-load style="width: 12rpx;height: 19.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/rightIcon.png" mode=""/>
         </view>
       </view>
     </view>
diff --git a/pages/order/components/wxqrCode/index.wxml b/pages/order/components/wxqrCode/index.wxml
index 36bf915..f907229 100644
--- a/pages/order/components/wxqrCode/index.wxml
+++ b/pages/order/components/wxqrCode/index.wxml
@@ -1,7 +1,7 @@
 <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModel}}"></view>
 <view class="modalDlg" wx:if="{{showModel}}">
 	<view class="img-box">
-		<image class="codeImg" src="{{qrcode}}" show-menu-by-longpress="{{true}}"></image>
+		<image lazy-load class="codeImg" src="{{qrcode}}" show-menu-by-longpress="{{true}}"></image>
 	</view>
 	<view class="text-box">
 		扫码关注<text>【君到苏州】</text> 微信公众号
@@ -9,5 +9,5 @@
 	<view class="more">
 		查看更多旅游资讯
 	</view>
-	<image bindtap="submit" class="close" src="https://static.ticket.sz-trip.com/uploads/20230619/c62511826c880bddc20f98011a87a5a9.png" mode=""/>
+	<image lazy-load bindtap="submit" class="close" src="https://static.ticket.sz-trip.com/uploads/20230619/c62511826c880bddc20f98011a87a5a9.png" mode=""/>
 </view>
\ No newline at end of file
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 3a169d0..7bca12b 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -15,6 +15,6 @@
   <view class="btn" bindtap="submit">确定</view>
 </view>
 <view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/order/food/index.wxml b/pages/order/food/index.wxml
index ba82d4b..36b7601 100644
--- a/pages/order/food/index.wxml
+++ b/pages/order/food/index.wxml
@@ -2,7 +2,7 @@
 <title title="订单填写"></title>
 <view class="box topbox" wx:if="{{product}}">
   <view class="skuinfo">
-    <image src="{{product.sku.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{product.sku.headimg}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="sku-name textOver2">{{product.product.title+product.sku.sku_name}}</view>
       <view class="info-tips">
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index 94eea6a..6bad614 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -41,7 +41,7 @@
         </view>
       </view>
     </view>
-    <view bindtap="showLinkman"><image src="https://static.ticket.sz-trip.com/xcxImages/other/selectLinkman.png" mode="widthFix"></image></view>
+    <view bindtap="showLinkman"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/other/selectLinkman.png" mode="widthFix"></image></view>
   </view>
   <view class="line-box" style="height:auto;margin:0;border:none">
     <view class="line-box-text">
diff --git a/pages/order/joinOrder/success/index.wxml b/pages/order/joinOrder/success/index.wxml
index ebb3316..245ea05 100644
--- a/pages/order/joinOrder/success/index.wxml
+++ b/pages/order/joinOrder/success/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/order/joinOrder/success/index.wxml-->
 <title title="添加成功"></title>
-<image class="successimg" src="https://static.ticket.sz-trip.com/uploads/20211108/b11f361c5785a20fddf138a523d8ad71.png" mode="widthFix"></image>
+<image lazy-load class="successimg" src="https://static.ticket.sz-trip.com/uploads/20211108/b11f361c5785a20fddf138a523d8ad71.png" mode="widthFix"></image>
 <view class="submit-success">提交成功</view>
 <view>团长确认后请前往公众号</view>
 <view>君到苏州-个人中心  凭码入园</view>
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 4733428..c67f738 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -2,7 +2,7 @@
 <title title="订单填写"></title>
 <view class="info-box" wx:if="{{product}}">
   <view class="info-top">
-    <image src="{{product.product.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{product.product.headimg}}" mode="aspectFill"></image>
     <view class="info">
       <view class="title">{{product.info.movieName}}</view>
       <view>{{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
@@ -15,13 +15,13 @@
 
 <view class="tips">
   <view class="tips-box">
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" />
+    <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" />
     <view>
       不支持退票
     </view>
   </view>
   <view class="tips-box">
-    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" alt="" />
+    <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/cha1.png" mode="aspectFit" alt="" />
     <view>
       不支持改签
     </view>
@@ -76,7 +76,7 @@
 </view>
 <view class="mask" wx:if="{{showModel}}">
   <view class="model">
-    <image bindtap="closeModel" class="close-img" src="https://static.ticket.sz-trip.com/uploads/20230725/e63b0a4ec4063bb92767690bbf857bb9.png" mode="" />
+    <image lazy-load bindtap="closeModel" class="close-img" src="https://static.ticket.sz-trip.com/uploads/20230725/e63b0a4ec4063bb92767690bbf857bb9.png" mode="" />
     <view class="model-title">
       退改须知
     </view>
@@ -84,7 +84,7 @@
       <text>该产品一经购买，不支持退票/改签，</text> 您的订单页面会显示【不支持退票】【不支持改签】提示，此时 <text>平台无法为您处理退。</text> 请您提前规划好出行时间，按时观影。
     </view>
     <view class="select-btn" bindtap="changeAgree">
-      <image src="{{agree?'https://static.ticket.sz-trip.com/uploads/20230725/9eda0f72b566f904b40c1a493b3c4c44.png':'https://static.ticket.sz-trip.com/uploads/20230725/0f6634ada1fc348a10a818b6f77239cd.png'}}" mode="aspectFill" />
+      <image lazy-load src="{{agree?'https://static.ticket.sz-trip.com/uploads/20230725/9eda0f72b566f904b40c1a493b3c4c44.png':'https://static.ticket.sz-trip.com/uploads/20230725/0f6634ada1fc348a10a818b6f77239cd.png'}}" mode="aspectFill" />
       <view class="select-text">
         我已认可此规则
       </view>
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index e798803..e943460 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -16,12 +16,12 @@
     <view class="iconfont {{payIndex==-1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:if="{{payList.length>0 && SUBWALLET}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
-    <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
+    <image lazy-load src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
     <view class="method-name">数字人民币</view>
     <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/numLogo.png" mode="aspectFill"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/numLogo.png" mode="aspectFill"></image>
     <view class="red-num">君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权</view>
   </view>
 </view>
@@ -34,12 +34,12 @@
     <view class="iconfont {{payIndex==-1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:if="{{payList.length>0}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
-    <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
+    <image lazy-load src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
     <view class="method-name">数字人民币</view>
     <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
   </view>
   <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/numLogo.png" mode="aspectFill"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/numLogo.png" mode="aspectFill"></image>
     <view class="red-num">君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权</view>
   </view>
 </view>
@@ -53,7 +53,7 @@
       <view class="price">¥{{info.paid_money/100}}</view>
     </view>
     <view style="margin:0 30rpx" class="pay-method" wx:for="{{payList}}" bindtap="changeNumIndex" data-index="{{index}}">
-      <image src="{{item.bank_logo}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.bank_logo}}" mode="aspectFill"></image>
       <!-- <view class="iconfont icon-weixin1"></view> -->
       <view class="method-name" style="position:relative">
         <text>{{item.bank_name}}</text>
diff --git a/pages/order/payresult/index.wxml b/pages/order/payresult/index.wxml
index ea70e50..16fd439 100644
--- a/pages/order/payresult/index.wxml
+++ b/pages/order/payresult/index.wxml
@@ -1,19 +1,19 @@
 <!--pages/order/payresult/index.wxml-->
 <title title="订单"></title>
 <!-- <view class="iconfont icon-gou1"></view> -->
-<image class="gou" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/5d53ee0d2e6136d634202b9651984d60.png"></image>
+<image lazy-load class="gou" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/5d53ee0d2e6136d634202b9651984d60.png"></image>
 <view class="order-tip">订单正在处理中</view>
 <view>具体出票/发货状态</view>
 <view>将会通过短信/订单状态进行通知</view>
 <view class="btn" bindtap="gotoOrderList">查看订单</view>
 <view class="proad" id="box4">
   <view class="proad-title">
-    <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/25af23290c0e6ed438f9c4f2222dd81c.png"></image>
+    <image lazy-load mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20231013/25af23290c0e6ed438f9c4f2222dd81c.png"></image>
   </view>
   <view class="pro-list">
     <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
       <view class="item-hd">
-        <image src="{{item.headimg}}"></image>
+        <image lazy-load src="{{item.headimg}}"></image>
       </view>
       <view class="item-bm">
         <view class="protitle text-overflowRows">{{item.title}}</view>
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index d6949c5..fced9b1 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -6,7 +6,7 @@
     供应商：{{item.product.supplier_name}}
   </view>
   <view class="skuinfo">
-    <image src="{{item.sku.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="sku-name textOver">
         <text class="textOver">{{item.product.title}}</text>
@@ -30,13 +30,13 @@
     <view class="batch-view">
         <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">
             <view class="no-select" wx:if="{{item.sku.batch_shipment==1}}"></view>
-            <image class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
+            <image lazy-load class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
             <text>一次性收货</text>
         </view>
         <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{1}}" data-index="{{index}}"
              style="margin-left: 30rpx;" wx:if="{{item.sku.is_batch_shipment}}">
             <view class="no-select" wx:if="{{item.sku.batch_shipment==0}}"></view>
-            <image class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
+            <image lazy-load class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
             <text>分批收货<text style="font-size: 24rpx;">(共{{item.sku.batch_count}}次)</text></text>
         </view>
 
@@ -70,7 +70,7 @@
     <view bindtap="changeAllowance">惠民补贴</view>
     <view class="com-flex-tao" bindtap="selectAllowance">
       -￥{{allowance_price / 100}}
-      <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
         alt="" wx:if="{{select_allowance}}"></image>
       <view class="border" wx:else></view>
     </view>
diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml
index f81629e..52331d5 100644
--- a/pages/order/roadOrder/index.wxml
+++ b/pages/order/roadOrder/index.wxml
@@ -32,7 +32,7 @@
 <coupon bind:getNewCoupon = 'getNewCoupon' money="{{price}}" sku="{{sku_ids}}"></coupon>
 <!-- <view class="user-box">
   <view class="user-item" style="border:none">
-    <image style="width:32rpx" src="https://static.ticket.sz-trip.com/xcxImages/other/hetong.png" mode="widthFix"></image>
+    <image lazy-load style="width:32rpx" src="https://static.ticket.sz-trip.com/xcxImages/other/hetong.png" mode="widthFix"></image>
     <text style="flex:1;margin:0 15rpx">一日游合同</text>
     <view class="add-btn" bindtap="ondayConfirm" style="width:152rpx">点击确认</view>
   </view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 06a8275..aab8015 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -40,10 +40,10 @@
       <view class="s-price">
         {{product.sku.price/100}}
       </view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
       <view class="number-box">{{productNum}}</view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
       <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
     </view>
     <view class="text1">
@@ -63,7 +63,7 @@
       <view bindtap="changeAllowance">惠民补贴</view>
       <view class="com-flex-tao" bindtap="selectAllowance">
         -￥{{allowance_price / 100}}
-        <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
           alt="" wx:if="{{select_allowance}}"></image>
         <view class="border" wx:else></view>
       </view>
diff --git a/pages/order/sceneCart/index.wxml b/pages/order/sceneCart/index.wxml
index ba74161..c6f5e6e 100644
--- a/pages/order/sceneCart/index.wxml
+++ b/pages/order/sceneCart/index.wxml
@@ -28,7 +28,7 @@
       <view bindtap="changeAllowance">惠民补贴</view>
       <view class="com-flex-tao" bindtap="selectAllowance">
         -￥{{allowance_price / 100}}
-        <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
           alt="" wx:if="{{select_allowance}}"></image>
         <view class="border" wx:else></view>
       </view>
diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml
index 119a2f1..e7bda80 100644
--- a/pages/order/show/index.wxml
+++ b/pages/order/show/index.wxml
@@ -26,7 +26,7 @@
     
 
     <view wx:if="{{noStock}}">
-        <image  class="no-data" src="https://static.ticket.sz-trip.com/uploads/20241129/894f45acb51cffcdddd5a2ddd695660b.png"></image>
+        <image lazy-load  class="no-data" src="https://static.ticket.sz-trip.com/uploads/20241129/894f45acb51cffcdddd5a2ddd695660b.png"></image>
         <view style="text-align: center;color: #666;padding-top: 40rpx;">暂无场次</view>
     </view>
     
@@ -52,7 +52,7 @@
 
 
   <view wx:if="{{initFinsih && dateArrPage.length<=0}}">
-        <image  class="no-data" src="https://static.ticket.sz-trip.com/uploads/20241129/894f45acb51cffcdddd5a2ddd695660b.png"></image>
+        <image lazy-load  class="no-data" src="https://static.ticket.sz-trip.com/uploads/20241129/894f45acb51cffcdddd5a2ddd695660b.png"></image>
         <view style="text-align: center;color: #666;padding-top: 40rpx;">暂无场次</view>
     </view>
     
@@ -77,7 +77,7 @@
 
 <!-- 购物车悬浮框 -->
 <!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator> -->
 
diff --git a/pages/order/showOrderNew/index.wxml b/pages/order/showOrderNew/index.wxml
index 9891d53..380b633 100644
--- a/pages/order/showOrderNew/index.wxml
+++ b/pages/order/showOrderNew/index.wxml
@@ -23,10 +23,10 @@
       <view class="s-price">
         {{product.sku.price/100}}
       </view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
-      <image wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
       <view class="number-box">{{productNum}}</view>
-      <image wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
       <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
     </view>
     <view class="text1">
diff --git a/pages/order/showSeat/index.wxml b/pages/order/showSeat/index.wxml
index 1b8e79c..d671975 100644
--- a/pages/order/showSeat/index.wxml
+++ b/pages/order/showSeat/index.wxml
@@ -9,7 +9,7 @@
     <view class='seatArea' style='width:{{seatScaleHeight * maxX}}px;height:{{seatScaleHeight * maxY}}px'>
       <view class='alignLine'></view>
       <view wx:for="{{seatList}}" wx:key="id" wx:for-index="index" wx:for-item="item" class='seatTap' catchtap='clickSeat' data-index='{{index}}' style="left:{{(item.gCol-1)* seatScaleHeight}}px;top:{{(item.gRow-1) * seatScaleHeight}}px;width: {{seatScaleHeight}}px;height: {{seatScaleHeight}}px">
-        <image src="{{item.nowIcon}}" class='normal' />
+        <image lazy-load src="{{item.nowIcon}}" class='normal' />
       </view>
     </view>
   </movable-view>
diff --git a/pages/pbService/PRpark/index.wxml b/pages/pbService/PRpark/index.wxml
index fe0ed54..a8d0f9d 100644
--- a/pages/pbService/PRpark/index.wxml
+++ b/pages/pbService/PRpark/index.wxml
@@ -6,7 +6,7 @@
       <view class="parkname">{{item.name}}</view>
       <view class="park-tips">距离定位<text>{{item.distance}}公里</text>共{{item.nums}}车位</view>
     </view>
-    <image src="https://static.ticket.sz-trip.com/uploads/20210407/fa5139b0dc0266197248110a9c65ba56.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20210407/fa5139b0dc0266197248110a9c65ba56.png" mode="widthFix"></image>
   </view>
   <view class="park-box" wx:if="{{item.is_free==1}}">
     <view class="park-bg">免费</view>
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index 5e3fbf3..143e4b9 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/pbService/activity/index.wxml-->
 <title title="精彩回顾"></title>
-<image mode="widthFix" class="topimg" src="https://static.ticket.sz-trip.com/activity/WonderfulReview/topBacNew.png"></image>
+<image lazy-load mode="widthFix" class="topimg" src="https://static.ticket.sz-trip.com/activity/WonderfulReview/topBacNew.png"></image>
 <view class="nav-box com-flex-tao">
   <view class="nav-item com-bac  {{index == navIndex ? 'active' : ''}}" bindtap="onReload"  wx:for="{{navList}}" data-index="{{index}}">{{ item.title }}</view>
 </view>
@@ -11,8 +11,8 @@
 </view>
 <view class="list">
   <view bindtap="gotoDetail" data-item="{{item}}" url="{{item.mini_url}}" class="item" wx:for="{{list}}">
-    <image mode="aspectFill" class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/hgbg.png"></image>
-    <image src="{{item.head_image}}" mode="aspectFill" class="main-img"></image>
+    <image lazy-load mode="aspectFill" class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/hgbg.png"></image>
+    <image lazy-load 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>
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index e25de35..ca8d319 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -14,12 +14,12 @@
 <view style="height:180rpx"></view>
 <view class="list">
   <view bindtap="gotoDetail" data-info="{{item}}" class="item" wx:for="{{list}}">
-    <image src="{{item.Cover || item.Thumbnail}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.Cover || item.Thumbnail}}" mode="aspectFill"></image>
     <view class="title textOver">{{item.Name}}</view>
     <view class="subtitle textOver">{{item.CatalogName || item.Tag}}</view>
   </view>
 </view>
 <!-- <view class="mask"  wx:if="{{imgInfo}}" catchtouchmove="preventTouchMove">
   <view class="mask-bg" bindtap="closeImg"></view>
-  <image bindtap="closeImg" style="width:100%;height:100%;display:block" src="{{imgInfo.Pic}}" mode="aspectFit"></image>
+  <image lazy-load bindtap="closeImg" style="width:100%;height:100%;display:block" src="{{imgInfo.Pic}}" mode="aspectFit"></image>
 </view> -->
\ No newline at end of file
diff --git a/pages/pbService/bus/index.wxml b/pages/pbService/bus/index.wxml
index 8cc2b16..1448bab 100644
--- a/pages/pbService/bus/index.wxml
+++ b/pages/pbService/bus/index.wxml
@@ -11,7 +11,7 @@
 <view class="text-tip">附近公交点</view>
 <view class="box" wx:for="{{list}}">
   <view class="box-title-box">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/bus.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/bus.png" mode="widthFix"></image>
     <view class="box-title">{{item.Name}}</view>
     <view class="iconfont {{index==activeInex?'icon-ziyuan':'icon-xia'}}" bindtap="showMore" data-index="{{index}}"></view>
   </view>
diff --git a/pages/pbService/bus/lineinfo/index.wxml b/pages/pbService/bus/lineinfo/index.wxml
index a568e84..2de38ff 100644
--- a/pages/pbService/bus/lineinfo/index.wxml
+++ b/pages/pbService/bus/lineinfo/index.wxml
@@ -17,16 +17,16 @@
       <view>{{item.SName}}</view>
     </view>
     <view class="start-name" wx:elif="{{!item.BusInfo}}">
-      <image class="arrow" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/arrow.png" mode="widthFix"></image>
+      <image lazy-load class="arrow" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/arrow.png" mode="widthFix"></image>
       <view>{{item.SName}}</view>
     </view>
     <view class="start-name" wx:else>
-      <image class="stop" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/stop.png" mode="widthFix"></image>
+      <image lazy-load class="stop" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/stop.png" mode="widthFix"></image>
       <view style="font-size:30rpx;font-weight:bold">{{item.SName}}</view>
       <view style="color:#0B898E;margin-top:20rpx">{{item.BusInfo}}</view>
     </view>
   </view>
-<image bindtap="getDetail" class="busfresh" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/busfresh.png" mode="widthFix"></image>
+<image lazy-load bindtap="getDetail" class="busfresh" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/busfresh.png" mode="widthFix"></image>
   
   
 </view>
\ No newline at end of file
diff --git a/pages/pbService/bus/search/index.wxml b/pages/pbService/bus/search/index.wxml
index 74549cb..61b91fc 100644
--- a/pages/pbService/bus/search/index.wxml
+++ b/pages/pbService/bus/search/index.wxml
@@ -9,16 +9,16 @@
 <view style="height:100rpx"></view>
 <view wx:if="{{type=='QueryLineInfo'}}">
   <navigator url="../lineinfo/index?id={{item.Guid}}" class="stop-item" wx:for="{{list}}">
-    <image style="width:40rpx;height:40rpx" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/busline.png" mode="widthFix"></image>
+    <image lazy-load style="width:40rpx;height:40rpx" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/busline.png" mode="widthFix"></image>
     <view>
       <view>{{item.LName}}</view>
-      <view class="line-info">{{item.LFStdName}} <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/busto.png" mode="widthFix"></image> {{item.LEStdName}}</view>
+      <view class="line-info">{{item.LFStdName}} <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/busto.png" mode="widthFix"></image> {{item.LEStdName}}</view>
     </view>
   </navigator> 
 </view>
 <view wx:else>
   <view class="stop-item" wx:for="{{list}}" style="align-items:flex-start;padding: 30rpx 0;min-height:0">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/bus.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/bus.png" mode="widthFix"></image>
     <view class="textOver" style="flex:1">
       <view>{{item.Name}} {{item.Direct}}</view>
       <navigator wx:if="{{index==carIndex}}" url="../lineinfo/index?id={{item.Guid}}" class="bus-item" wx:for="{{info}}" wx:for-index="lineIndex">
diff --git a/pages/pbService/feiyi/index.wxml b/pages/pbService/feiyi/index.wxml
index a0b2b03..6ebfc62 100644
--- a/pages/pbService/feiyi/index.wxml
+++ b/pages/pbService/feiyi/index.wxml
@@ -8,7 +8,7 @@
 </picker>
 <navigator url="info/index?id={{item.id}}" class="feiyi-item" wx:for="{{list}}">
   <common-image width="200rpx" height="200rpx" src="{{item.default_pic_url}}" mode="aspectFill"></common-image>
-  <!-- <image></image> -->
+  <!-- <image lazy-load></image> -->
   <view class="feiyiinfo textOver">
     <view class="title textOver">{{item.title}}</view>
     <view class="subtitle textOver">{{item.protect_office}}</view>
diff --git a/pages/pbService/feiyi/info/index.wxml b/pages/pbService/feiyi/info/index.wxml
index 92c7901..13678c7 100644
--- a/pages/pbService/feiyi/info/index.wxml
+++ b/pages/pbService/feiyi/info/index.wxml
@@ -2,17 +2,17 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <view class="mypage">
   <title title="非遗详情"></title>
-  <image class="main-img" wx:if="{{info}}" src="{{info.default_pic_url}}" mode="widthFix"></image>
+  <image lazy-load class="main-img" wx:if="{{info}}" src="{{info.default_pic_url}}" mode="widthFix"></image>
   <view class="top-info" wx:if="{{info}}">
     <view class="title">{{info.title}}</view>
-    <!-- <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view> -->
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/feiyilogo.png" mode="widthFix" class="logo"></image>
-    <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.protect_office || "暂无"}}</view>
+    <!-- <view class="subtitle"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view> -->
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/feiyilogo.png" mode="widthFix" class="logo"></image>
+    <view class="subtitle"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.protect_office || "暂无"}}</view>
   </view>
   <view class="content" wx:if="{{info}}">
     <view class="tip">非遗介绍:</view>
     <rich-text  class="detail" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
 </view>
\ No newline at end of file
diff --git a/pages/pbService/group/index.wxml b/pages/pbService/group/index.wxml
index 78d5528..b34183f 100644
--- a/pages/pbService/group/index.wxml
+++ b/pages/pbService/group/index.wxml
@@ -9,7 +9,7 @@
 </view>
 <view style="height:60rpx"></view>
 <navigator url="/pages/info/museumInfo/index?id={{item.id}}&isGroup=1" class="group-item" wx:for="{{list}}">
-  <image src="{{item.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="group-info">
     <view class="group-title textOver">{{item.title}}（团体预约）</view>
     <view class="iconfont textOver"><text class="icon-dianhua3"></text>电话：{{item.tel}}</view>
diff --git a/pages/pbService/gym/index.wxml b/pages/pbService/gym/index.wxml
index 3671093..4f05918 100644
--- a/pages/pbService/gym/index.wxml
+++ b/pages/pbService/gym/index.wxml
@@ -8,15 +8,15 @@
 </picker>
 <view style="height:100rpx"></view>
 <navigator url="info/index?id={{item.parent_id}}" class="gym-item" wx:for="{{list}}">
-  <image src="{{item.pic_address}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.pic_address}}" mode="aspectFill"></image>
   <view class="gym-info textOver">
     <view class="textOver gym-name">{{item.mName}}-{{item.sName}}</view>
     <view class="gym-tip textOver">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/shijian.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/shijian.png" mode="widthFix"></image>
       <text class="textOver">{{item.open_time}}</text>
     </view>
     <view class="gym-tip textOver" style="margin-bottom:0">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/dingwei.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/dingwei.png" mode="widthFix"></image>
       <text class="textOver">{{item.address}}</text>
     </view>
     <view class="distance">{{item.distance}}</view>
diff --git a/pages/pbService/gym/info/index.wxml b/pages/pbService/gym/info/index.wxml
index ba6b0af..f6e6afa 100644
--- a/pages/pbService/gym/info/index.wxml
+++ b/pages/pbService/gym/info/index.wxml
@@ -5,7 +5,7 @@
   autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{picList}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item.pic_address}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.pic_address}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -22,36 +22,36 @@
     <swiper-item>
       <view class="title">{{info.name}}</view>
       <view class="address">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.telephone}}</text></view>
       </view>
       <swiper style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
         <swiper-item wx:for="{{picList}}">
-          <image style="width:690rpx;height:560rpx;display:block;" src="{{item.pic_address}}" mode="aspectFill"></image>
+          <image lazy-load style="width:690rpx;height:560rpx;display:block;" src="{{item.pic_address}}" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
-      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
       <view class="title title2">{{info.name}}</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(item)}}"></rich-text>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item>
       <view class="title title2" style="height:125rpx">开放时间</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(info.open_time)}}"></rich-text>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
   </swiper>
-  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
+  <image lazy-load mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
 </view> -->
\ No newline at end of file
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index cbd6b5b..a03d83e 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -1,114 +1,114 @@
 <!--pages/pbService/index.wxml-->
 <title title="公共服务"></title>
-<image class="title-img" style="margin-top:16rpx"
+<image lazy-load class="title-img" style="margin-top:16rpx"
   src="https://static.ticket.sz-trip.com/uploads/20211105/9925a5e6d5e535c3c25c6923ec5a2897.png" mode="widthFix"></image>
 <view class="pb-box">
   <!-- <view class="pb-title">游玩助手</view> -->
   <view class="pb-list">
     <!-- <view class="pb-item" bindtap="gotoSku">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
     <!-- data-path="/pages/pbService/sceneComfort/index?title=高峰预警" -->
     <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoUrl"
    
     data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=FQqP774V6H3PacOWYqJLykUBBywTAZEWMu9Nz9tzrOZUIf/Zto2OvXmirAi7/FSOkZg1uwNpcK0kdZgK0FjuzEZKYBjL/1RXp3XpQhxv9H91g9c737NfSxRcfYUHo2SGLX8kAlAiAbt72AoEfG++i+WTjbTo57sunVEzn/nF7n55StkcgfesDKjXOm+txOYbEc0tH32A5Mn">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>高峰预警</view>
     </view>
     <view class="pb-item"  data-title="行李直送" bindtap="xlzs">
-	  <image src="https://static.ticket.sz-trip.com/uploads/20250115/1628737d70e74613fc12e9fdbd8c192f.png" mode="widthFix"></image>
+	  <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250115/1628737d70e74613fc12e9fdbd8c192f.png" mode="widthFix"></image>
 	  <view>行李直送</view>
 	</view>
     <view class="pb-item" bindtap="gotoUrl" data-event="xlqc" 
     data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
-      <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
       <view>行李寄存</view>
     </view>
     <view class="pb-item" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=1">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
       <view>找厕所</view>
     </view>
     <view class="pb-item"  data-title="Suzhou Tour" bindtap="gotoUrl"
         data-url="https://traveltosuzhou.wglj.suzhou.gov.cn/">
-      <image src="https://m.cloud.sz-trip.com/static/images/serve/isuzhou.png" mode="widthFix"></image>
+      <image lazy-load src="https://m.cloud.sz-trip.com/static/images/serve/isuzhou.png" mode="widthFix"></image>
       <view>Suzhou Tour</view>
     </view>
     <view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
       data-path="/pages/pbService/security/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
       <view>安全服务</view>
     </view>
     <!-- <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath"
       data-path="/pages/pbService/gym/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png" mode="widthFix"></image>
       <view>体育场馆</view>
     </view> -->
     <view class="pb-item" data-event="garbage_click" data-title="垃圾分类" bindtap="garbage">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
       <view>垃圾分类</view>
     </view>
     <!-- <view class="pb-item" data-title="文化配送" bindtap="gotoPath" data-path="/pages/culture/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
       <view>文化配送</view>
     </view> -->
      <view class="pb-item" data-title="附近图书馆" bindtap="gotoUrl" data-url="https://www.szlib.com/szlibposition">
-      <image src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
       <view>附近图书馆</view>
     </view>
     <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
       class="pb-item">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
       <view>12348</view>
     </view>
     <view bindtap="gotoUrl"  data-title="文化场馆查询" data-url="https://m.cloud.sz-trip.com/Museum" class="pb-item">
-      <image src="https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png" mode="widthFix"></image>
       <view>文化场馆查询</view>
     </view>
 
     
   </view>
 </view>
-<image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
+<image lazy-load class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
   mode="widthFix"></image>
 <view class="pb-box">
 
   <!-- <view class="pb-title">交通出行</view> -->
   <view class="pb-list">
     <!-- <view class="pb-item" bindtap="gotoPath" data-path="/pages/pbService/bus/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
       <view>实时公交</view>
     </view> -->
     <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
       <view>停车场</view>
     </view>
     <!-- <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=2">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
       <view>停车场</view>
     </view> -->
     <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=0">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>
       <view>公共自行车</view>
     </view>
     <view class="pb-item" data-event="passport_click" data-title="接送机" bindtap="jiesongji">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb18.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb18.png" mode="widthFix"></image>
       <view>接送机</view>
     </view>
     <view class="pb-item" data-event="prparking_click" data-title="P+R停车场" bindtap="gotoPath"
       data-path="/pages/pbService/PRpark/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png" mode="widthFix"></image>
       <view>P+R停车场</view>
     </view>
     <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pb-item">
-      <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
       <view>实时路况</view>
     </view>
 	<view class="pb-item" data-event="gaode_click" data-title="实时打车" bindtap="gaode">
-	  <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png" mode="widthFix"></image>
+	  <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png" mode="widthFix"></image>
 	  <view>实时打车</view>
 	</view>
   </view>
@@ -117,44 +117,44 @@
   <view class="pb-title">文旅查询</view>
   <view class="pb-list">
     <view class="pb-item" data-title="投资导引图" bindtap="gotoUrl" data-url="https://hot-map.sz-trip.com/">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb17.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb17.png" mode="widthFix"></image>
       <view>投资导引图</view>
     </view>
     <view class="pb-item" data-title="非遗传承" bindtap="gotoPath" data-path="/pages/pbService/feiyi/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb9.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb9.png" mode="widthFix"></image>
       <view>非遗传承</view>
     </view>
     <view class="pb-item" data-title="文物查询" bindtap="gotoPath" data-path="/pages/pbService/wwcx/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb11.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb11.png" mode="widthFix"></image>
       <view>文物查询</view>
     </view>
     <view class="pb-item" data-title="视觉中心" bindtap="gotoPath" data-path="/pages/pbService/appreciate/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb12.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb12.png" mode="widthFix"></image>
       <view>视觉中心</view>
     </view>
     <view class="pb-item" data-title="书香借阅" bindtap="gotoPath" data-path="/pages/pbService/library/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb13.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb13.png" mode="widthFix"></image>
       <view>书香借阅</view>
     </view>
     
     <view class="pb-item" data-title="文化配送" bindtap="gotoPath" data-path="/pages/culture/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
       <view>文化配送</view>
     </view>
     <view class="pb-item" data-title="博物馆查询" bindtap="gotoPath" data-path="/pages/pbService/museum/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb19.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb19.png" mode="widthFix"></image>
       <view>博物馆查询</view>
     </view>
     <view class="pb-item" data-title="精彩回顾" bindtap="gotoPath" data-path="/pages/pbService/activity/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb16.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/pb16.png" mode="widthFix"></image>
       <view>精彩回顾</view>
     </view>
     <view class="pb-item" data-title="团队预约" bindtap="gotoPath" data-path="/pages/pbService/group/index">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb21.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb21.png" mode="widthFix"></image>
       <view>团队预约</view>
     </view>
     <view class="pb-item" data-title="廉洁地图" bindtap="gotoUrl" data-url="https://www.lianshi.gov.cn:6295/jianchawei/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb22.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb22.png" mode="widthFix"></image>
       <view>廉洁地图</view>
     </view>
   </view>
diff --git a/pages/pbService/library/bookinfo/index.wxml b/pages/pbService/library/bookinfo/index.wxml
index ccade09..efff808 100644
--- a/pages/pbService/library/bookinfo/index.wxml
+++ b/pages/pbService/library/bookinfo/index.wxml
@@ -3,7 +3,7 @@
 <view wx:if="{{info}}">
   <view class="info-top">
     <view class="img-box">
-      <image src="{{info.bookjpgs}}" mode="aspectFill"></image>
+      <image lazy-load src="{{info.bookjpgs}}" mode="aspectFill"></image>
     </view>
     <view class="info">
       <view class="title">{{info.title}}</view>
diff --git a/pages/pbService/library/getpoint/index.wxml b/pages/pbService/library/getpoint/index.wxml
index 7ccf892..2c2113d 100644
--- a/pages/pbService/library/getpoint/index.wxml
+++ b/pages/pbService/library/getpoint/index.wxml
@@ -5,7 +5,7 @@
   <view class="max-width">地址：{{now.address}}</view>
   <view class="max-width">{{now.description}}</view>
   <view class="max-width">是否开放：{{item.isopen==1?'是':'否'}}</view>
-  <image bindtap="gotoLocation" data-info="{{now}}" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/booklocation.png" mode="widthFix"></image>
+  <image lazy-load bindtap="gotoLocation" data-info="{{now}}" src="https://static.ticket.sz-trip.com/xcxImages/pbservice/booklocation.png" mode="widthFix"></image>
 </view>
 <view class="other-tip">其他借书点</view>
 <view class="item" wx:for="{{other}}">
diff --git a/pages/pbService/library/index.wxml b/pages/pbService/library/index.wxml
index 939bab0..6a951ef 100644
--- a/pages/pbService/library/index.wxml
+++ b/pages/pbService/library/index.wxml
@@ -14,7 +14,7 @@
 <view style="height:180rpx"></view>
 <view class="list">
   <view bindtap="gotoInfo" data-item="{{item}}" class="item" wx:for="{{list}}">
-    <image src="{{item.bookjpgs}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.bookjpgs}}" mode="aspectFill"></image>
     <view class="info">
       <view class="title textOver">{{item.title}}</view>
       <view class="subtitle textOver">{{item.author}}</view>
diff --git a/pages/pbService/library/mybook/index.wxml b/pages/pbService/library/mybook/index.wxml
index 6351043..ea79d2d 100644
--- a/pages/pbService/library/mybook/index.wxml
+++ b/pages/pbService/library/mybook/index.wxml
@@ -2,7 +2,7 @@
 <title title="我的借阅"></title>
 <view class="info-top" wx:for="{{list}}">
   <view class="img-box">
-    <image src="{{item.bookjpgs}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.bookjpgs}}" mode="aspectFill"></image>
   </view>
   <view class="info">
     <view class="title">{{item.title}}</view>
diff --git a/pages/pbService/museum/index.wxml b/pages/pbService/museum/index.wxml
index a48f5de..f3286c8 100644
--- a/pages/pbService/museum/index.wxml
+++ b/pages/pbService/museum/index.wxml
@@ -15,7 +15,7 @@
 </view>
 <view style="height:180rpx"></view>
 <navigator url="info/index?id={{item.id}}" class="item" wx:for="{{list}}">
-  <image src="{{item.headimg || '/images/place2.png'}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.headimg || '/images/place2.png'}}" mode="aspectFill"></image>
   <view class="right-info">
     <view class="textOver title">{{item.name}}</view>
     <view class="icon-box textOver">
diff --git a/pages/pbService/museum/info/index.wxml b/pages/pbService/museum/info/index.wxml
index 5bf7c7e..1e4718d 100644
--- a/pages/pbService/museum/info/index.wxml
+++ b/pages/pbService/museum/info/index.wxml
@@ -5,7 +5,7 @@
   <swiper class="swiper">
     <block wx:for="{{info.listimg}}" wx:key="*this">
       <swiper-item>
-        <image src="{{item || '/images/place1.png'}}" mode="aspectFill" class="mainimg"></image>
+        <image lazy-load src="{{item || '/images/place1.png'}}" mode="aspectFill" class="mainimg"></image>
       </swiper-item>
     </block>
   </swiper>
@@ -30,41 +30,41 @@
     <swiper-item>
       <view class="title">{{info.name}}</view>
       <view class="address">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png"></image>
         <view>地址：{{info.address}}</view>
       </view>
       <view class="address">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infotel.png"></image>
         <view>电话：<text style="color:#0B898E">{{info.phone}}</text></view>
       </view>
       <swiper wx:if="{{info.listimg.length>0}}" style="width:690rpx;height:560rpx;margin:0 auto;margin-top:30rpx">
         <swiper-item wx:for="{{info.listimg}}">
-          <image style="width:690rpx;height:560rpx;display:block;" src="{{item}}" mode="aspectFill"></image>
+          <image lazy-load style="width:690rpx;height:560rpx;display:block;" src="{{item}}" mode="aspectFill"></image>
         </swiper-item>
       </swiper>
-      <image wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image>
-      <image mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load wx:else mode="aspectFill" style="width:690rpx;height:560rpx;display:block;margin:0 auto;margin-top:30rpx" src="{{info.headimg}}"></image>
+      <image lazy-load mode="widthFix" class="infoline1" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
       <view class="title title2">{{info.name}}</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(item)}}"></rich-text>
       
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
     <swiper-item>
       <view class="title title2" style="height:125rpx">接待时间</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(info.open_time)}}"></rich-text>
       <view class="title title2" style="height:125rpx">交通线路</view>
-      <image mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
+      <image lazy-load mode="widthFix" class="infoline1" style="position:static" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(info.route)}}"></rich-text>
-      <image mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
-      <image mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
+      <image lazy-load mode="widthFix" class="infoline2" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline2.png"></image>
+      <image lazy-load mode="widthFix" class="infoline3" src="https://static.ticket.sz-trip.com/xcxImages/info/infoline3.png"></image>
     </swiper-item>
   </swiper>
-  <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
+  <image lazy-load mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://static.ticket.sz-trip.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
 </view> -->
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 803068c..c073991 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -38,19 +38,19 @@
 
 <view class="comfort-container">
     <view class="comfort-head">
-        <image style="width: 39.67rpx;height: 39.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/ca10f9d72f8d5f3696dee41081357c82.png"></image>
+        <image lazy-load style="width: 39.67rpx;height: 39.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/ca10f9d72f8d5f3696dee41081357c82.png"></image>
         <text style="height: fit-content;padding-left: 20rpx;">景区舒适度</text>
     </view>
 
     <view class="comfort-content" wx:if="{{list.length>0}}">
         <view class="ai-tip">
-            <image style="width: 27.67rpx;height: 27.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/c3513e7eb0c43ece5f47a8f044063b64.png"></image>
+            <image lazy-load style="width: 27.67rpx;height: 27.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/c3513e7eb0c43ece5f47a8f044063b64.png"></image>
             <text style="padding-left: 12rpx;">本预测趋势图由AI生成，内容仅供参考。</text>
         </view>
         
         <view class="item-container">
             <view class="comfort-item" wx:for="{{list}}" wx:key="index">
-                <image class="comfort-item-img" src="{{item.img_url}}" mode="aspectFill"></image>
+                <image lazy-load class="comfort-item-img" src="{{item.img_url}}" mode="aspectFill"></image>
                 <view class="comfort-item-content">
                     <view class="scene-title">
                         <view class="textOver">{{item.third_scene_name}}</view>
diff --git a/pages/pbService/wbdw/index.wxml b/pages/pbService/wbdw/index.wxml
index d31225a..913f57a 100644
--- a/pages/pbService/wbdw/index.wxml
+++ b/pages/pbService/wbdw/index.wxml
@@ -27,10 +27,10 @@
 </view>
 <view style="height:180rpx"></view>
 <navigator url="info/index?id={{item.id}}" class="item" wx:for="{{list}}">
-  <image class="main-img" src="{{item.logo}}" mode="wdithFix"></image>
+  <image lazy-load class="main-img" src="{{item.logo}}" mode="wdithFix"></image>
   <view class="title">{{item.name}}</view>
   <view class="location">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/listtop/wbdw.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/listtop/wbdw.png" mode="widthFix"></image>
     <text>{{item.address}}</text>
   </view>
 </navigator> 
\ No newline at end of file
diff --git a/pages/pbService/wbdw/info/index.wxml b/pages/pbService/wbdw/info/index.wxml
index 0abf918..205e1fd 100644
--- a/pages/pbService/wbdw/info/index.wxml
+++ b/pages/pbService/wbdw/info/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/pbService/wbdw/info/index.wxml-->
 <title title="详情"></title>
-<image class="main-img" src="{{info.logo}}" mode="widthFix"></image>
+<image lazy-load class="main-img" src="{{info.logo}}" mode="widthFix"></image>
 <view class="content">
   <view class="title">{{info.name}}</view>
   <view class="subtitle">地址：{{info.address}}</view>
diff --git a/pages/pbService/wwcx/index.wxml b/pages/pbService/wwcx/index.wxml
index 2eb35d0..688f463 100644
--- a/pages/pbService/wwcx/index.wxml
+++ b/pages/pbService/wwcx/index.wxml
@@ -32,7 +32,7 @@
 </view>
 <view style="height:190rpx"></view>
 <navigator url="info/index?id={{item.id}}" class="feiyi-item" wx:for="{{list}}">
-  <image src="{{item.logo}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.logo}}" mode="aspectFill"></image>
   <view class="feiyiinfo textOver">
     <view class="title textOver">{{item.name}}</view>
     <view class="subtitle textOver" wx:if="{{type==1 && item.collection_name}}"><text>藏于</text>{{item.collection_name}}</view>
diff --git a/pages/pbService/wwcx/info/index.wxml b/pages/pbService/wwcx/info/index.wxml
index febcdf3..bfde060 100644
--- a/pages/pbService/wwcx/info/index.wxml
+++ b/pages/pbService/wwcx/info/index.wxml
@@ -2,17 +2,17 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <view class="mypage">
   <title title="文物详情"></title>
-  <image class="main-img" wx:if="{{info}}" src="{{info.logo}}" mode="widthFix"></image>
+  <image lazy-load class="main-img" wx:if="{{info}}" src="{{info.logo}}" mode="widthFix"></image>
   <view class="top-info" wx:if="{{info}}">
     <view class="title">{{info.name}}</view>
-    <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/wenwulogo.png" mode="widthFix" class="logo"></image>
-    <view class="subtitle"><image src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.collection_name || "暂无"}}</view>
+    <view class="subtitle"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infoage.png" mode="widthFix"></image><text>年代：</text>{{info.age || "暂无"}}</view>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/wenwulogo.png" mode="widthFix" class="logo"></image>
+    <view class="subtitle"><image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infolocation.png" mode="widthFix"></image><text>地址：</text>{{info.collection_name || "暂无"}}</view>
   </view>
   <view class="content" wx:if="{{info}}">
     <view class="tip">文物介绍:</view>
     <view class="detail">{{info.introduction}}</view>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infotitleimg.png" mode="widthFix" class="titleimg"></image>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/infobottomimg.png" mode="widthFix" class="bottomimg"></image>
 </view>
\ No newline at end of file
diff --git a/pages/pbService/wwcx/search/index.wxml b/pages/pbService/wwcx/search/index.wxml
index 3488a8e..ece75d0 100644
--- a/pages/pbService/wwcx/search/index.wxml
+++ b/pages/pbService/wwcx/search/index.wxml
@@ -15,7 +15,7 @@
 </view>
 <view style="height:100rpx"></view>
 <navigator url="../info/index?id={{item.id}}" class="feiyi-item" wx:for="{{list}}">
-  <image src="{{item.logo}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.logo}}" mode="aspectFill"></image>
   <view class="feiyiinfo textOver">
     <view class="title textOver">{{item.name}}</view>
     <view class="subtitle textOver" wx:if="{{relicTypeIndex==0}}"><text>藏于</text>{{item.collection_name}}</view>
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 12cee6b..6fc1997 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -15,11 +15,11 @@
   <navigator wx:if="{{item.type=='travels'}}" url="/pages/info/strategyInfo/index?id={{item.s_id}}" class="strategy-item">
     <view class="strategy-title textOver">
       <text class="textOver">{{item.title}}</text>
-      <image wx:if="{{item.ext.is_hot}}" src="https://static.ticket.sz-trip.com/xcxImages/listtop/hot.png" mode="widthFix"></image>
+      <image lazy-load wx:if="{{item.ext.is_hot}}" src="https://static.ticket.sz-trip.com/xcxImages/listtop/hot.png" mode="widthFix"></image>
     </view>
     <view class="strategy-subtitle textOver2">{{item.ext.subtitle}}</view>
     <view class="strategy-bottom">
-      <image src="{{item.ext.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.ext.avatar}}" mode="aspectFill"></image>
       <view class="strategy-author-name">{{item.ext.user_name}}</view>
       <view class="iconfont icon-xin"></view>
       <text>{{item.ext.like_number}}</text>
@@ -30,7 +30,7 @@
   <!-- 景点、门票 -->
   <view class="product-item" wx:if="{{item.ext.type=='scenic' || item.ext.type=='ticket'||item.ext.type=='tenscenic'}}">
     <common-image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
-    <!-- <image></image> -->
+    <!-- <image lazy-load></image> -->
     <view class="product-info">
       <view class="product-title textOver2">{{item.title}}</view>
       <view class="scene-tags textOver" style="margin-top:20rpx;margin-bottom:30rpx">
@@ -46,7 +46,7 @@
   </view>
   <!-- 线路 -->
   <view class="product-item" wx:if="{{item.ext.type=='line'}}">
-    <image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info">
       <view class="product-title">{{item.title}}</view>
       <view class="sale-rate" style="margin-top:15rpx"><text style="color:#D62828;margin-right:20rpx">{{item.ext.rate}}分</text><text>月销{{item.ext.sales_number}}份</text></view>
@@ -54,7 +54,7 @@
         <text class="scene-tag textOver" wx:for="{{item.ext.display_tags}}">{{item}}</text>
       </view>
       <view class="price-box">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/other/tag.png" mode="widthFix"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/other/tag.png" mode="widthFix"></image>
         <view class="textOver" style="color:#A3A3A3">{{item.supplier_name}}</view>
         <view class="price" wx:if="{{item.ext.price}}"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
       </view>
@@ -62,7 +62,7 @@
   </view>
   <!-- 活动 -->
   <view class="product-item" wx:if="{{item.ext.type=='activity'}}">
-    <image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info show-info">
       <view class="product-title">{{item.title}}</view>
       <view class="show-info">  
@@ -73,7 +73,7 @@
   </view>
   <!-- 电影 -->
   <view class="product-item" wx:if="{{item.ext.type=='movie'}}">
-    <image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info show-info">
       <view class="product-title">{{item.title}}</view>
       <view class="show-info">  
@@ -84,7 +84,7 @@
   </view>
   <!-- 美食 卡券 -->
   <view class="product-item" wx:if="{{item.ext.type=='food' || item.ext.type=='coupon'}}">
-    <image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info show-info">
       <view class="product-title">{{item.title}}</view>
       <view class="show-info">  
@@ -98,7 +98,7 @@
   </view>
   <!-- 场馆 -->
   <view class="product-item" wx:if="{{item.ext.type=='venue'}}">
-    <image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info show-info">
       <view class="product-title">{{item.title}}</view>
       <view class="show-info">  
@@ -109,7 +109,7 @@
   </view>
   <!-- 特产和酒店 演出 -->
   <view class="product-item" wx:if="{{item.ext.type=='post' || item.ext.type=='show' || item.ext.type=='room' || item.ext.type=='hotel'}}">
-    <image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info show-info">
       <view class="product-title">{{item.title}}</view>
       <view class="show-info">  
@@ -124,6 +124,6 @@
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/supplier/apply/index.wxml b/pages/supplier/apply/index.wxml
index c05cfca..7dee8bd 100644
--- a/pages/supplier/apply/index.wxml
+++ b/pages/supplier/apply/index.wxml
@@ -43,7 +43,7 @@
   <view class="input-item-in">
     <text>门头照</text>
     <view class="com-flex" wx:if="{{info.banner_img}}">
-      <image src="{{info.banner_img}}" mode="aspectFill"></image>
+      <image lazy-load src="{{info.banner_img}}" mode="aspectFill"></image>
       <view wx:if="{{!oldInfo || oldInfo && oldInfo.audit==2}}" class="iconfont icon-close" bindtap="delimg" data-name="banner_img"></view>
     </view>
     <view class="btn" bindtap="upload" data-name="banner_img" wx:else>点击上传</view>
@@ -54,7 +54,7 @@
   <view class="input-item-in">
     <text>营业执照</text>
     <view class="com-flex" wx:if="{{info.licence_img}}">
-      <image src="{{info.licence_img}}" mode="aspectFill"></image>
+      <image lazy-load src="{{info.licence_img}}" mode="aspectFill"></image>
       <view wx:if="{{!oldInfo || oldInfo && oldInfo.audit==2}}" class="iconfont icon-close" bindtap="delimg" data-name="licence_img"></view>
     </view>
     <view class="btn" bindtap="upload" data-name="licence_img" wx:else>点击上传</view>
@@ -65,7 +65,7 @@
   <view class="input-item-in">
     <text>经营许可证</text>
     <view class="com-flex" wx:if="{{info.business_license}}">
-      <image src="{{info.business_license}}" mode="aspectFill"></image>
+      <image lazy-load src="{{info.business_license}}" mode="aspectFill"></image>
       <view wx:if="{{!oldInfo || oldInfo && oldInfo.audit==2}}" class="iconfont icon-close" bindtap="delimg" data-name="business_license"></view>
     </view>
     <view class="btn" bindtap="upload" data-name="business_license" wx:else>点击上传</view>
diff --git a/pages/supplier/good/index.wxml b/pages/supplier/good/index.wxml
index 05f45dc..93b343c 100644
--- a/pages/supplier/good/index.wxml
+++ b/pages/supplier/good/index.wxml
@@ -24,7 +24,7 @@
     </view>
     <view style="flex:1"></view>
     <view class="com-flex" bindtap="delSku" data-index="{{index}}" wx:if="{{item.audit && item.audit.value==2 || !item.audit}}">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/delicon.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/delicon.png" mode="widthFix"></image>
       <view>删除</view>
     </view>
   </view>
@@ -41,7 +41,7 @@
         <text>规格图片</text>
         <view style="flex:1"></view>
         <view class="img-box" wx:for="{{item.sku_img.value}}" wx:for-index="j" wx:for-item="img">
-          <image src="{{img}}" mode="aspectFill"></image>
+          <image lazy-load src="{{img}}" mode="aspectFill"></image>
           <view class="iconfont icon-close" wx:if="{{item.audit && item.audit.value==2 || !item.audit}}" bindtap="delImg" data-index="{{index}}" data-imgindex="{{j}}"></view>
         </view>
         <view class="btn" style="margin-left:30rpx" bindtap="upload" data-index="{{index}}" data-name="sku_img" wx:if="{{item.sku_img && item.sku_img.value.length<3 && (item.audit && item.audit.value==2 || !item.audit)}}">点击上传</view>
@@ -52,7 +52,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>线路详情</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="1" data-text="线路详情">
-          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
+          <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height disabled="{{item.audit && item.audit.value<2}}" value="{{item.line_desc.value}}" bindblur="blur" data-name="line_desc" data-index="{{index}}" bindinput="changeInfo" maxlength="-1" placeholder="请输入线路详情描述"></textarea>
@@ -63,7 +63,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>使用说明</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="2" data-text="使用说明">
-          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
+          <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height disabled="{{item.audit && item.audit.value<2}}" value="{{item.use_desc.value}}" data-name="use_desc" bindblur="blur" data-index="{{index}}" bindinput="changeInfo" maxlength="-1" placeholder="请输入使用说明描述"></textarea>
@@ -74,7 +74,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>费用说明</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="3" data-text="费用说明">
-          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
+          <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height disabled="{{item.audit && item.audit.value<2}}" value="{{item.cost_desc.value}}" data-name="cost_desc" bindblur="blur" data-index="{{index}}" bindinput="changeInfo" maxlength="-1" placeholder="请输入费用说明"></textarea>
@@ -106,7 +106,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>预定须知</text>
         <view class="com-flex sl-box" bindtap="showFlag" data-index="4" data-text="预定须知">
-          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
+          <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height value="{{item.reserve_desc.value}}" disabled="{{item.audit && item.audit.value<2}}" data-name="reserve_desc" data-index="{{index}}" bindblur="blur" bindinput="changeInfo" maxlength="-1" placeholder="请输入预定须知"></textarea>
@@ -138,7 +138,7 @@
       <view class="input-item-in" style="align-items:flex-start">
         <text>退款规则</text>
         <view class="com-flex sl-box" style="opacity:0">
-          <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
+          <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/supplier/sl.png"></image>
           <text>示例</text>
         </view>
         <textarea auto-height value="{{item.refund_desc.value}}" disabled="{{item.audit && item.audit.value<2}}" data-name="refund_desc" bindinput="changeInfo" bindblur="blur" data-index="{{index}}" maxlength="-1" placeholder="请输入退款规则"></textarea>
@@ -148,11 +148,11 @@
   </view>
   <view class="com-flex sku-bottom" bindtap="arrow" data-index="{{index}}">
     <text>{{item.show?'收起':'展开'}}</text>
-    <image class="{{item.show?'':'rotate'}}" src="https://static.ticket.sz-trip.com/xcxImages/supplier/arrowicon.png" mode="widthFix"></image>
+    <image lazy-load class="{{item.show?'':'rotate'}}" src="https://static.ticket.sz-trip.com/xcxImages/supplier/arrowicon.png" mode="widthFix"></image>
   </view>
 </view>
 <view class="com-flex add-sku-btn" bindtap="addSku">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/iconadd.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/iconadd.png" mode="widthFix"></image>
   <text>点击添加规格</text>
 </view>
 <view class="error-tip" style="text-align:center" wx:if="{{skuerror}}">请添加规格</view>
diff --git a/pages/supplier/index.wxml b/pages/supplier/index.wxml
index 0397708..16baf3a 100644
--- a/pages/supplier/index.wxml
+++ b/pages/supplier/index.wxml
@@ -1,13 +1,13 @@
 <!--pages/supplier/index.wxml-->
 <view class="content">
-  <image class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/supplier/indexbg1.png" mode="widthFix"></image>
+  <image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/supplier/indexbg1.png" mode="widthFix"></image>
   <view class="btn" bindtap="supplierpage" wx:if="{{passFlag===null}}">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/user.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/user.png" mode="widthFix"></image>
     <view>点击填写商户信息</view>
   </view>
   <view class="btn line-btn btnbg{{passFlag.audit}}" bindtap="supplierpage" wx:else="{{passFlag}}">
     <view class="com-flex">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/icon{{passFlag.audit}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/icon{{passFlag.audit}}.png" mode="widthFix"></image>
       <view>{{supplier_text[passFlag.audit]}}</view>
     </view>
     <view class="right-btn">
@@ -16,16 +16,16 @@
     </view>
   </view>
   <view class="btn disable" wx:if="{{passFlag===null || passFlag && passFlag.audit==0 || passFlag && passFlag.audit==2}}">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
     <view>点击填写商品信息</view>
   </view>
   <view class="btn" wx:elif="{{passFlag && passFlag.audit==1 && sku.length==0}}" bindtap="gotoGood">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/lock.png" mode="widthFix"></image>
     <view>点击填写商品信息</view>
   </view>
   <view class="btn line-btn btnbg{{audit}}" bindtap="supplierpage"  wx:else bindtap="gotoGood">
     <view class="com-flex">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/icon{{audit}}.png" mode="widthFix"></image>
+      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/icon{{audit}}.png" mode="widthFix"></image>
       <view>{{goods_text[audit]}}</view>
     </view>
     <view class="right-btn" wx:if="{{audit==2}}">
@@ -37,5 +37,5 @@
       <view>查看</view>
     </view>
   </view>
-  <image src="https://static.ticket.sz-trip.com/xcxImages/supplier/indexbg2.png" class="bottomimg" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/supplier/indexbg2.png" class="bottomimg" mode="widthFix"></image>
 </view>
diff --git a/pages/user/address/index.wxml b/pages/user/address/index.wxml
index 6951b66..73b5583 100644
--- a/pages/user/address/index.wxml
+++ b/pages/user/address/index.wxml
@@ -27,7 +27,7 @@
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-		<image mode="widthFix" src="https://trip-1302104628.cos.ap-nanjing.myqcloud.com/1798833b-b97b-4caf-a9e9-0fc6d8315903.png"></image>
+		<image lazy-load mode="widthFix" src="https://trip-1302104628.cos.ap-nanjing.myqcloud.com/1798833b-b97b-4caf-a9e9-0fc6d8315903.png"></image>
 		<view>暂无收货地址</view>
 	</view>
   <view class="btn" bindtap="add" style="{{list.length==0?'position:absolute;bottom:'+(safeBottom + 40)+'rpx':''}}">新增收货地址</view>
diff --git a/pages/user/bindtel/index.wxml b/pages/user/bindtel/index.wxml
index 0e252e3..2d12221 100644
--- a/pages/user/bindtel/index.wxml
+++ b/pages/user/bindtel/index.wxml
@@ -9,7 +9,7 @@
     <view class="bind-item" wx:if="{{imgCodeInfo}}">
       <view class="bind-item-left">图形验证码</view>
       <input type="number" bindinput="picCodeInput" class="weui-input" placeholder="请输入图形验证码" />
-      <image bindtap="changeImgCode" class="code-img" src="{{imgCodeInfo.code}}" mode="aspectFill"></image>
+      <image lazy-load bindtap="changeImgCode" class="code-img" src="{{imgCodeInfo.code}}" mode="aspectFill"></image>
       <!-- <input bindinput="telInput" class="weui-input" auto-focus placeholder="请输入手机号" /> -->
     </view>
     <view class="bind-item">
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index 0db4975..d05a364 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -5,7 +5,7 @@
 <view wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
   <view class="item{{(item.product.flag!=1 || item.sku.flag!='on')?' disable':''}}">
     <view class="iconfont{{item.checked?' icon-gou':' icon-quan'}}" bindtap="select" data-index="{{index}}"></view>
-    <image src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
+    <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
     <view class="item-info textOver">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="sku-title textOver">
@@ -24,7 +24,7 @@
   <view class='del' catchtap="del" data-index="{{index}}">删除</view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
 </view>
 <view style="height:113rpx"></view>
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 8eceacb..1fffc3d 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -50,6 +50,6 @@
 <view style="height:110rpx"></view>
 <navigator url="../couponCenter/index" class="fixed-btn">前往<text>领券中心</text></navigator>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-	<image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+	<image lazy-load 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/user/couponCenter/index.wxml b/pages/user/couponCenter/index.wxml
index afbacc7..347b155 100644
--- a/pages/user/couponCenter/index.wxml
+++ b/pages/user/couponCenter/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/user/couponCenter/index.wxml-->
 <title title="领取优惠券"></title>
-<image class="bg-img" style="height:calc(100% - {{height}}px)" src="https://static.ticket.sz-trip.com/xcxImages/user/coupon-bg.png" mode="aspectFill"></image>
+<image lazy-load class="bg-img" style="height:calc(100% - {{height}}px)" src="https://static.ticket.sz-trip.com/xcxImages/user/coupon-bg.png" mode="aspectFill"></image>
 <view class="content" style="top:{{height}}px">
   <view class="coupon-title">【兑换优惠券】</view>
   <view class="input-box">
diff --git a/pages/user/likes/index.wxml b/pages/user/likes/index.wxml
index fb366e4..2fcc5b4 100644
--- a/pages/user/likes/index.wxml
+++ b/pages/user/likes/index.wxml
@@ -7,7 +7,7 @@
 <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}}">
   <view class="item" bindtap="gotoDetail" data-item="{{item}}">
-    <image src="{{item.product.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.product.headimg}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="price">￥{{item.product.price/100}}</view>
@@ -18,7 +18,7 @@
 </view>
 <view wx:if="{{type==2}}" wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
   <view class="item" bindtap="gotoDetail" data-item="{{item}}">
-    <image src="{{item.scene.headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.scene.headimg}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="title textOver">{{item.scene.title}}</view>
       <view class="price">￥{{item.scene.price/100}}</view>
@@ -29,6 +29,6 @@
 </view>
 
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load 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/user/linkman/index.wxml b/pages/user/linkman/index.wxml
index 2d34fd9..6706793 100644
--- a/pages/user/linkman/index.wxml
+++ b/pages/user/linkman/index.wxml
@@ -27,7 +27,7 @@
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-		<image mode="widthFix" src="https://trip-1302104628.cos.ap-nanjing.myqcloud.com/1798833b-b97b-4caf-a9e9-0fc6d8315903.png"></image>
+		<image lazy-load mode="widthFix" src="https://trip-1302104628.cos.ap-nanjing.myqcloud.com/1798833b-b97b-4caf-a9e9-0fc6d8315903.png"></image>
 		<view>暂无联系人</view>
 	</view>
   <view bindtap="add" class="btn" style="{{list.length==0?'position:absolute;bottom:'+(safeBottom + 40)+'rpx':''}}">新增出游人</view>
diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml
index 9c9fb0b..a8f91db 100644
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
@@ -19,7 +19,7 @@
 
 <view class="box" style="padding-bottom:0" wx:if="{{info}}">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
-    <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
       <view class="title textOver2">{{item.product_title}}</view>
       <view class="subtitle textOver2">{{item.sku_name}}</view>
@@ -82,7 +82,7 @@
 
 
 <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/couponOrderInfo/index.wxml b/pages/user/order/couponOrderInfo/index.wxml
index 3055269..be4ebc8 100644
--- a/pages/user/order/couponOrderInfo/index.wxml
+++ b/pages/user/order/couponOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
@@ -18,7 +18,7 @@
 </view>
 <view class="box" style="padding-bottom:0" wx:if="{{info}}">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
-    <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
       <view class="title textOver2">{{item.product_title}}</view>
       <view class="subtitle textOver2">{{item.sku_name}}</view>
@@ -93,7 +93,7 @@
   </view>
 </view>
 <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml
index 30ece10..220255e 100644
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
@@ -21,7 +21,7 @@
 
 <view class="box" wx:if="{{product_model=='food'}}" style="padding-bottom:0">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
-    <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
       <view class="title textOver2">{{item.product_title}}</view>
       <view class="subtitle textOver2">{{item.sku_name}}</view>
@@ -99,7 +99,7 @@
   <rich-text class="detail-item" style="display:block;height:auto" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.refund_info)}}"></rich-text>
 </view> -->
 <navigator url="/pages/user/service/index" wx:if="{{info && info.state!='CLOSED'}}" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index e54ef76..ccfdfa0 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
@@ -72,7 +72,7 @@
   </view>
 </view>
 <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml
index be5d0da..146f690 100644
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
@@ -87,7 +87,7 @@
   </view>
 </view>
 <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 3ecccf1..7d50a4d 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -24,7 +24,7 @@
     <text class="status">{{item.orderStateText?item.orderStateText:orderState[item.state]}}</text>
   </view>
   <view data-item="{{item}}" class="order-info" wx:for="{{item.order_product_list}}">
-    <image src="{{item.product_model=='movie'?item.product_img:item.sku_headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.product_model=='movie'?item.product_img:item.sku_headimg}}" mode="aspectFill"></image>
     <view class="sku-title textOver2">{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}</view>
     <view class="sku-tips">
       <view class="sku-price">￥{{item.product_price/100}}</view>
@@ -49,6 +49,6 @@
   </view>
 </view>
 <view class="empty-box" wx:if="{{list.length==0}}">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/other/order-empty.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/other/order-empty.png" mode="widthFix"></image>
   <view>还没有订单，赶快去下单吧~</view>
 </view>
\ No newline at end of file
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 810f99b..1ba027f 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -9,12 +9,12 @@
         <text class="movie-type">{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}-电影票</text>
     </view>
 
-    <image bind:tap="showKeFu" class="kefu" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png"></image>
+    <image lazy-load bind:tap="showKeFu" class="kefu" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png"></image>
 </view>
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <!-- <view class="code-img"></view> -->
@@ -28,7 +28,7 @@
 
 <view class="box" wx:if="{{info}}" style="padding-bottom:0">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
-    <image src="{{item.product_img}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.product_img}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
       <view class="title textOver2">{{item.product_title}}</view>
       <view class="subtitle textOver2">{{info.order_product_list[0].order_product_extend.seats_list}}</view>
@@ -151,7 +151,7 @@
 
 
 <!-- <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 562f1a7..03f2665 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}" style="position: relative;">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
     <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
       <view class="text-shadow-state">
         {{item.stateText}}
@@ -23,7 +23,7 @@
 </view>
 <view class="box" style="padding-bottom:0" wx:if="{{info}}">
   <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
-    <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
       <view class="title textOver2">{{item.product_title}}</view>
       <view class="subtitle textOver2">{{item.sku_name}}</view>
@@ -75,7 +75,7 @@
       <text>地址：{{info.order_product_list[0].scene_detail.address}}</text>
     </view>
     <view style="display: flex;align-items: center;" bindtap="openMap">
-      <image style="width: 36rpx;height: 36rpx;margin-right: 13.33rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/c915f86073571a724afdb03524d05887.png" mode=""/>
+      <image lazy-load style="width: 36rpx;height: 36rpx;margin-right: 13.33rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/c915f86073571a724afdb03524d05887.png" mode=""/>
       <text style="font-weight: 500;font-size: 24rpx;color: #0B898E;">导航</text>
     </view>
   </view>
@@ -119,14 +119,14 @@
 <view class="box">
   <view class="box-title">交通推荐</view>
   <view class="box-bg" bindtap="openMap">
-    <image style="width:37.33rpx;height:52.67rpx;margin-left: 37.33rpx;margin-right: 30rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/a04ab4996e17d5d801afee00547d08d4.png" mode=""/>
+    <image lazy-load style="width:37.33rpx;height:52.67rpx;margin-left: 37.33rpx;margin-right: 30rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/a04ab4996e17d5d801afee00547d08d4.png" mode=""/>
     <view style="font-family: PingFang SC;font-weight: 500;font-size: 32rpx;color: #111111;">
       {{info.order_product_list[0].product_title}}>
     </view>
   </view>
 </view>
 <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index f0d8ffc..6f0664f 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -18,7 +18,7 @@
     <view>
         <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
             <view class="product-info-top">
-                <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+                <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
                 <view class="title-box textOver2">
                     <view class="title textOver2">{{item.product_title}}</view>
                     <view class="subtitle textOver2">{{item.sku_name}}</view>
@@ -177,7 +177,7 @@
 <sptj ids="{{ ids }}"></sptj>
 
 <navigator url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view style="height: 40rpx;"></view>
 <view class="mask" wx:if="{{feeInfoFlag}}">
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 118ce54..015e2df 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -7,7 +7,7 @@
 <!-- <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
-    <image src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{codeImgs[codeIndex]}}" mode="widthFix" style="width:300rpx;"></image>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <view class="code-text" wx:if="{{info.order_product_list[0].qrcode[codeIndex].use_url}}">{{info.order_product_list[0].qrcode[codeIndex].use_code_display_text}}:{{info.order_product_list[0].qrcode[codeIndex].use_code}}</view>
@@ -17,7 +17,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
-    <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
     <!-- 代表核销后是否继续展示二维码（0否1是） -->
     <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
       <view class="text-shadow-state">
@@ -138,7 +138,7 @@
     <view wx:else>
         <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
             <view class="product-info-top">
-                <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
+                <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
                 <view class="title-box textOver2">
                     <view class="title textOver2">{{item.product_title}}</view>
                     <view class="subtitle textOver2">{{item.sku_name}}</view>
@@ -307,7 +307,7 @@
 <sptj ids="{{ ids }}"></sptj>
 
 <navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 
 <view style="height: 40rpx;"></view>
diff --git a/pages/user/order/showOrderInfo/index.wxml b/pages/user/order/showOrderInfo/index.wxml
index c46c547..2cbad7f 100644
--- a/pages/user/order/showOrderInfo/index.wxml
+++ b/pages/user/order/showOrderInfo/index.wxml
@@ -8,7 +8,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
-    <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
     <!-- 代表核销后是否继续展示二维码（0否1是） -->
     <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
       <view class="text-shadow-state">
@@ -131,7 +131,7 @@
 </view>
 
 <navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/team/list.wxml b/pages/user/order/team/list.wxml
index 4d5100f..05f0b32 100644
--- a/pages/user/order/team/list.wxml
+++ b/pages/user/order/team/list.wxml
@@ -21,7 +21,7 @@
     <text class="status">{{orderState[item.team_state]}}</text>
   </view>
   <view data-item="{{item}}" class="order-info" wx:for="{{item.order_product_list}}">
-    <image src="{{item.product_model=='movie'?item.product_img:item.sku_headimg}}" mode="aspectFill"></image>
+    <image lazy-load src="{{item.product_model=='movie'?item.product_img:item.sku_headimg}}" mode="aspectFill"></image>
     <view class="sku-title textOver2">{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}</view>
     <view class="sku-tips">
       <view class="sku-price">￥{{item.product_price/100}}</view>
@@ -46,6 +46,6 @@
   </view>
 </view>
 <view class="empty-box" wx:if="{{list.length==0}}">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/other/order-empty.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/other/order-empty.png" mode="widthFix"></image>
   <view>还没有订单，赶快去下单吧~</view>
 </view>
\ No newline at end of file
diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml
index fa56cfa..8af1f3f 100644
--- a/pages/user/profile/index.wxml
+++ b/pages/user/profile/index.wxml
@@ -7,7 +7,7 @@
 <view class="profile-item">
   <text>头像</text>
   <view class="info" bindtap="uploadTap" style="text-align:right;">
-    <image src="{{avatar}}" mode="aspectFill"></image>
+    <image lazy-load src="{{avatar}}" mode="aspectFill"></image>
   </view>
   <view class="iconfont icon-you"></view>
 </view>
diff --git a/pages/user/retail/goods/index.wxml b/pages/user/retail/goods/index.wxml
index 83f9518..4068303 100644
--- a/pages/user/retail/goods/index.wxml
+++ b/pages/user/retail/goods/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/user/retail/goods/index.wxml-->
 <title title="可分销商品"></title>
 <view class="item" wx:for="{{list}}">
-  <image src="{{item.product.headimg}}" mode="aspectFill"></image>
+  <image lazy-load src="{{item.product.headimg}}" mode="aspectFill"></image>
   <view class="item-center">
     <view class="item-title">{{item.product.title+item.sku.sku_name}}</view>
     <view class="item-price">￥{{item.sku.price/100}}<text>起</text></view>
diff --git a/pages/user/retail/list/index.wxml b/pages/user/retail/list/index.wxml
index b193d5b..bf56902 100644
--- a/pages/user/retail/list/index.wxml
+++ b/pages/user/retail/list/index.wxml
@@ -10,7 +10,7 @@
     <text>佣金：{{item.commission_price?item.commission_price/100:0}}</text>
   </view>
   <view class="item-info" wx:for="{{item.order_product}}" wx:for-item="product">
-    <image src="{{product.product_img}}" mode="aspectFill"></image>
+    <image lazy-load src="{{product.product_img}}" mode="aspectFill"></image>
     <view class="item-title">{{product.product_title+product.sku_name}}</view>
     <view class="item-right">
       <view class="price">{{product.paid_money?product.paid_money/100:0}}</view>
diff --git a/pages/user/service/index.wxml b/pages/user/service/index.wxml
index 8cb1cfa..e154bee 100644
--- a/pages/user/service/index.wxml
+++ b/pages/user/service/index.wxml
@@ -2,7 +2,7 @@
 <title title="在线客服"></title>
 <view class="top-box">
   <view class="welcome-box">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png" mode="aspectFill"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/zwt/logo.png" mode="aspectFill"></image>
     <view class="welcome-bg">
       你好，欢迎来到苏州，您可点击以下问题列表自助查询相关信息
     </view>
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index f071022..94f9bdb 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -1,12 +1,12 @@
 <!--pages/user/user.wxml-->
 <view>
-  <image class="topbg" style="height:calc({{height}}px + 341rpx)"
+  <image lazy-load class="topbg" style="height:calc({{height}}px + 341rpx)"
     src="https://static.ticket.sz-trip.com/xcxImages/user/topbg.png" mode="aspectFill"></image>
   <view style="height:{{height}}rpx"></view>
   <navigator url="profile/index" catchtap="pagePoint" data-event="mine_information" class="top-box" wx:if="{{info}}">
-    <image class="headimg" src="{{info.avatar}}" mode="aspectFill"></image>
+    <image lazy-load class="headimg" src="{{info.avatar}}" mode="aspectFill"></image>
     <view class="userinfo">
-      <view class="username">{{info.nickname}}<image wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix"
+      <view class="username">{{info.nickname}}<image lazy-load wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix"
           src="https://static.ticket.sz-trip.com/xcxImages/user/sex{{info.gender}}.png"></image>
       </view>
       <view>id：{{info.id}}</view>
@@ -19,27 +19,27 @@
     </navigator>
     <view class="user-order-types">
       <navigator url="order/list?type=WAIT_PAYMENT" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dfk.png" mode="aspectFill"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/user/dfk.png" mode="aspectFill"></image>
         <view>待付款</view>
       </navigator>
       <navigator url="order/list?type=WAIT_POST" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dfh.png" mode="aspectFill"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/user/dfh.png" mode="aspectFill"></image>
         <view>待发货</view>
       </navigator>
       <navigator url="order/list?type=WAIT_USE" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dcx.png" mode="aspectFill"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/user/dcx.png" mode="aspectFill"></image>
         <view>待出行</view>
       </navigator>
       <navigator url="order/list?type=WAIT_DELIVERY" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dsh.png" mode="aspectFill"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/user/dsh.png" mode="aspectFill"></image>
         <view>待收货</view>
       </navigator>
       <navigator url="order/list?type=WAIT_COMMENT" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/user/ddp.png" mode="aspectFill"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/user/ddp.png" mode="aspectFill"></image>
         <view>待评价</view>
       </navigator>
       <navigator url="order/list?type=NEED_REFUND" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/user/th.png" mode="aspectFill"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/user/th.png" mode="aspectFill"></image>
         <view>退货/退款</view>
       </navigator>
     </view>
@@ -47,7 +47,7 @@
       <swiper autoplay interval="{{3500}}" circular="true"  class="swiper">
         <swiper-item wx:for="{{list}}">
           <view class="s-box" bindtap="gotoDetail" data-item="{{orderList[index]}}">
-              <image style="width:248rpx;height:168rpx" mode="aspectFill" src="{{item.product_img}}"></image>
+              <image lazy-load style="width:248rpx;height:168rpx" mode="aspectFill" src="{{item.product_img}}"></image>
               <view class="box-r">
                 <view class="wpay">等待付款</view>
                 <view class="time">剩余时间: <text>{{formatTime[index]}}</text></view>
diff --git a/pages/user/verify/index.wxml b/pages/user/verify/index.wxml
index 475f900..7bb160b 100644
--- a/pages/user/verify/index.wxml
+++ b/pages/user/verify/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/user/verify/index.wxml-->
 <title title="实名认证"></title>
-<image class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/shiming_top.png" mode="widthFix"></image>
+<image lazy-load class="bgimg" src="https://static.ticket.sz-trip.com/xcxImages/listtop/shiming_top.png" mode="widthFix"></image>
 <view class="top-box">
   <view class="item">
     <text>姓名：</text>
diff --git a/pages/user/videoCoupon/index.wxml b/pages/user/videoCoupon/index.wxml
index c90e803..f657a9b 100644
--- a/pages/user/videoCoupon/index.wxml
+++ b/pages/user/videoCoupon/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/user/videoCoupon/index.wxml-->
 <title title="中奖纪录"></title>
 <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
-  <image src="{{item.head_img}}"></image>
+  <image lazy-load src="{{item.head_img}}"></image>
   <view class="info">
     <view class="title">{{item.prize_name}}</view>
     <view>获取来源：{{item.act_name}}</view>
diff --git a/subPackageCheckPoint/pages/content/index.wxml b/subPackageCheckPoint/pages/content/index.wxml
index 156a968..1f436f9 100644
--- a/subPackageCheckPoint/pages/content/index.wxml
+++ b/subPackageCheckPoint/pages/content/index.wxml
@@ -1 +1 @@
-<audio-com wx:if="{{a}}" class="r data-v-b48e95cf" u-r="audioCom" u-i="b48e95cf-0" bind:__l="__l"></audio-com><view class="content data-v-b48e95cf"><view class="swiperContent data-v-b48e95cf"><swiper class="swiper data-v-b48e95cf" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-b48e95cf"><view class="swiper-item uni-bg-red data-v-b48e95cf"><image class="data-v-b48e95cf" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-b48e95cf"><label class="data-v-b48e95cf">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-b48e95cf"><view class="detailsTitle data-v-b48e95cf">{{k}}</view><view class="detailsMapPoint data-v-b48e95cf"><view class="icoBox data-v-b48e95cf"><image class="data-v-b48e95cf" src="{{l}}"/></view><view class="contentText data-v-b48e95cf">{{m}}</view></view><view class="detailsText data-v-b48e95cf"><view class="icoBox data-v-b48e95cf"><image class="data-v-b48e95cf" src="{{n}}"/></view><view class="contentText data-v-b48e95cf">{{o}}</view></view></view><view class="toNewPage data-v-b48e95cf"><view class="btn data-v-b48e95cf" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-b48e95cf" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
+<audio-com wx:if="{{a}}" class="r data-v-b48e95cf" u-r="audioCom" u-i="b48e95cf-0" bind:__l="__l"></audio-com><view class="content data-v-b48e95cf"><view class="swiperContent data-v-b48e95cf"><swiper class="swiper data-v-b48e95cf" circular indicator-dots="{{d}}" autoplay="{{e}}" interval="{{f}}" duration="{{g}}" bindchange="{{h}}"><swiper-item wx:for="{{c}}" wx:for-item="item" wx:key="b" class="data-v-b48e95cf"><view class="swiper-item uni-bg-red data-v-b48e95cf"><image lazy-load class="data-v-b48e95cf" src="{{item.a}}"/></view></swiper-item></swiper><view class="swiperLength data-v-b48e95cf"><label class="data-v-b48e95cf">{{i}}</label>/{{j}}</view></view><view class="contentDetails data-v-b48e95cf"><view class="detailsTitle data-v-b48e95cf">{{k}}</view><view class="detailsMapPoint data-v-b48e95cf"><view class="icoBox data-v-b48e95cf"><image lazy-load class="data-v-b48e95cf" src="{{l}}"/></view><view class="contentText data-v-b48e95cf">{{m}}</view></view><view class="detailsText data-v-b48e95cf"><view class="icoBox data-v-b48e95cf"><image lazy-load class="data-v-b48e95cf" src="{{n}}"/></view><view class="contentText data-v-b48e95cf">{{o}}</view></view></view><view class="toNewPage data-v-b48e95cf"><view class="btn data-v-b48e95cf" bindtap="{{p}}">前往景点</view><view wx:if="{{q}}" class="btn data-v-b48e95cf" bindtap="{{r}}">前往购票</view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/detailsmap/index.wxml b/subPackageCheckPoint/pages/detailsmap/index.wxml
index 192f41d..f8c29b6 100644
--- a/subPackageCheckPoint/pages/detailsmap/index.wxml
+++ b/subPackageCheckPoint/pages/detailsmap/index.wxml
@@ -1 +1 @@
-<audio-com wx:if="{{a}}" class="r data-v-5f2d6979" u-r="audioCom" u-i="5f2d6979-0" bind:__l="__l"></audio-com><view class="content data-v-5f2d6979" style="{{'background:' + w}}"><view class="bgBox data-v-5f2d6979"><view class="bgItem bgGusuItem data-v-5f2d6979" style="{{'width:' + d + ';' + ('height:' + e)}}"><image class="data-v-5f2d6979" src="{{c}}"/></view></view><movable-area class="movableArea data-v-5f2d6979" style="width:100vw;height:100vh"><movable-view class="data-v-5f2d6979" style="{{'width:' + h + ';' + ('height:' + i)}}" disabled="{{j}}" animation="{{false}}" scale-value="{{k}}" scale-min="{{l}}" x="{{m}}" y="{{n}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{o}}" bindscale="{{p}}"><view class="detailsMap data-v-5f2d6979"><image class="data-v-5f2d6979" src="{{f}}"/></view><view wx:for="{{g}}" wx:for-item="item" wx:key="a" class="detailsMapPoint data-v-5f2d6979" style="{{'width:' + item.b + ';' + ('height:' + item.c) + ';' + ('left:' + item.d) + ';' + ('top:' + item.e) + ';' + ('z-index:' + item.f)}}" bindtap="{{item.g}}" data-name="{{item.h}}"></view><view class="stickyMask data-v-5f2d6979"></view></movable-view></movable-area><view class="stickyMask data-v-5f2d6979"><view class="stickyItem data-v-5f2d6979"><view class="stickyTitle data-v-5f2d6979" style="{{'width:' + r + ';' + ('height:' + s) + ';' + ('left:' + t) + ';' + ('top:' + v)}}"><image class="data-v-5f2d6979" src="{{q}}"/></view></view></view></view>
\ No newline at end of file
+<audio-com wx:if="{{a}}" class="r data-v-5f2d6979" u-r="audioCom" u-i="5f2d6979-0" bind:__l="__l"></audio-com><view class="content data-v-5f2d6979" style="{{'background:' + w}}"><view class="bgBox data-v-5f2d6979"><view class="bgItem bgGusuItem data-v-5f2d6979" style="{{'width:' + d + ';' + ('height:' + e)}}"><image lazy-load class="data-v-5f2d6979" src="{{c}}"/></view></view><movable-area class="movableArea data-v-5f2d6979" style="width:100vw;height:100vh"><movable-view class="data-v-5f2d6979" style="{{'width:' + h + ';' + ('height:' + i)}}" disabled="{{j}}" animation="{{false}}" scale-value="{{k}}" scale-min="{{l}}" x="{{m}}" y="{{n}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{o}}" bindscale="{{p}}"><view class="detailsMap data-v-5f2d6979"><image lazy-load class="data-v-5f2d6979" src="{{f}}"/></view><view wx:for="{{g}}" wx:for-item="item" wx:key="a" class="detailsMapPoint data-v-5f2d6979" style="{{'width:' + item.b + ';' + ('height:' + item.c) + ';' + ('left:' + item.d) + ';' + ('top:' + item.e) + ';' + ('z-index:' + item.f)}}" bindtap="{{item.g}}" data-name="{{item.h}}"></view><view class="stickyMask data-v-5f2d6979"></view></movable-view></movable-area><view class="stickyMask data-v-5f2d6979"><view class="stickyItem data-v-5f2d6979"><view class="stickyTitle data-v-5f2d6979" style="{{'width:' + r + ';' + ('height:' + s) + ';' + ('left:' + t) + ';' + ('top:' + v)}}"><image lazy-load class="data-v-5f2d6979" src="{{q}}"/></view></view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/index/index.wxml b/subPackageCheckPoint/pages/index/index.wxml
index 36c5245..ed52baa 100644
--- a/subPackageCheckPoint/pages/index/index.wxml
+++ b/subPackageCheckPoint/pages/index/index.wxml
@@ -1 +1 @@
-<audio-com wx:if="{{a}}" class="r data-v-46c0ccd2" u-r="audioCom" u-i="46c0ccd2-0" bind:__l="__l"></audio-com><view class="content data-v-46c0ccd2"><view class="home data-v-46c0ccd2" hidden="{{!e}}" bindtap="{{f}}"><view class="goScopeMapBtn data-v-46c0ccd2"><image class="data-v-46c0ccd2" src="{{c}}"/></view><image class="data-v-46c0ccd2" src="{{d}}" alt=""/></view><view class="scopeMapDefaultBg data-v-46c0ccd2" hidden="{{!i}}"><image class="data-v-46c0ccd2" src="{{g}}"/><view class="scopeBird data-v-46c0ccd2"><image class="data-v-46c0ccd2" src="{{h}}"/></view></view><movable-area class="movableArea data-v-46c0ccd2" style="width:100vw;height:100vh" hidden="{{!q}}"><movable-view class="data-v-46c0ccd2" style="{{'width:' + l + ';' + ('height:' + m)}}" scale-value="1" scale-min="1" scale-max="1.3" x="{{n}}" y="{{o}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{p}}"><view class="scopeMap data-v-46c0ccd2"><view class="scopeMapBg data-v-46c0ccd2"><image class="data-v-46c0ccd2" src="{{j}}"/></view><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="{{['scopePoint', 'data-v-46c0ccd2', item.b]}}" style="{{item.d}}" data-tag="{{item.e}}" bindtap="{{item.f}}"><image class="data-v-46c0ccd2" src="{{item.a}}"/></view></view></movable-view></movable-area><view class="scopeTitle data-v-46c0ccd2" hidden="{{!s}}"><image class="data-v-46c0ccd2" src="{{r}}"/></view><view class="scopePerson data-v-46c0ccd2" hidden="{{!v}}"><image class="data-v-46c0ccd2" src="{{t}}"/></view></view>
\ No newline at end of file
+<audio-com wx:if="{{a}}" class="r data-v-46c0ccd2" u-r="audioCom" u-i="46c0ccd2-0" bind:__l="__l"></audio-com><view class="content data-v-46c0ccd2"><view class="home data-v-46c0ccd2" hidden="{{!e}}" bindtap="{{f}}"><view class="goScopeMapBtn data-v-46c0ccd2"><image lazy-load class="data-v-46c0ccd2" src="{{c}}"/></view><image lazy-load class="data-v-46c0ccd2" src="{{d}}" alt=""/></view><view class="scopeMapDefaultBg data-v-46c0ccd2" hidden="{{!i}}"><image lazy-load class="data-v-46c0ccd2" src="{{g}}"/><view class="scopeBird data-v-46c0ccd2"><image lazy-load class="data-v-46c0ccd2" src="{{h}}"/></view></view><movable-area class="movableArea data-v-46c0ccd2" style="width:100vw;height:100vh" hidden="{{!q}}"><movable-view class="data-v-46c0ccd2" style="{{'width:' + l + ';' + ('height:' + m)}}" scale-value="1" scale-min="1" scale-max="1.3" x="{{n}}" y="{{o}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{p}}"><view class="scopeMap data-v-46c0ccd2"><view class="scopeMapBg data-v-46c0ccd2"><image lazy-load class="data-v-46c0ccd2" src="{{j}}"/></view><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="{{['scopePoint', 'data-v-46c0ccd2', item.b]}}" style="{{item.d}}" data-tag="{{item.e}}" bindtap="{{item.f}}"><image lazy-load class="data-v-46c0ccd2" src="{{item.a}}"/></view></view></movable-view></movable-area><view class="scopeTitle data-v-46c0ccd2" hidden="{{!s}}"><image lazy-load class="data-v-46c0ccd2" src="{{r}}"/></view><view class="scopePerson data-v-46c0ccd2" hidden="{{!v}}"><image lazy-load class="data-v-46c0ccd2" src="{{t}}"/></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/scopemap/index.wxml b/subPackageCheckPoint/pages/scopemap/index.wxml
index d4924f3..02ac2f3 100644
--- a/subPackageCheckPoint/pages/scopemap/index.wxml
+++ b/subPackageCheckPoint/pages/scopemap/index.wxml
@@ -1 +1 @@
-<view class="content"><movable-area style="width:750rpx;height:1334rpx"><movable-view style="width:750rpx;height:1334rpx;background-color:aqua" scale-value="0.5" x="{{b}}" y="{{c}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{d}}"><image class="logo" src="{{a}}"></image></movable-view></movable-area></view>
\ No newline at end of file
+<view class="content"><movable-area style="width:750rpx;height:1334rpx"><movable-view style="width:750rpx;height:1334rpx;background-color:aqua" scale-value="0.5" x="{{b}}" y="{{c}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{d}}"><image lazy-load class="logo" src="{{a}}"></image></movable-view></movable-area></view>
\ No newline at end of file
diff --git a/subPackages/feiyiNew/CGCIndex/index.wxml b/subPackages/feiyiNew/CGCIndex/index.wxml
index e115fe9..cac2b6c 100644
--- a/subPackages/feiyiNew/CGCIndex/index.wxml
+++ b/subPackages/feiyiNew/CGCIndex/index.wxml
@@ -4,7 +4,7 @@
         <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" >
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+                <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
             </swiper-item>
             </block>
         </swiper>
@@ -14,8 +14,8 @@
     <view class="menu-box flex-between">
         <view class="menu-left">
             <view class="menu-item" wx:for="{{menuList}}" data-item="{{item}}" bindtap="goFeiYiList" wx:key="index">
-                <image src="https://static.ticket.sz-trip.com/cgc/images/index/{{index + 1}}.png" style="height: 108rpx;" mode="heightFix"></image>
-                <image src="https://static.ticket.sz-trip.com/cgc/images/index/{{index + 1}}s.png" style="height: 22rpx;margin-top: 8rpx;" mode="heightFix"></image>
+                <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/{{index + 1}}.png" style="height: 108rpx;" mode="heightFix"></image>
+                <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/{{index + 1}}s.png" style="height: 22rpx;margin-top: 8rpx;" mode="heightFix"></image>
             </view>
             
         </view>
@@ -23,7 +23,7 @@
             <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" >
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                 <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                    <image src="{{item.head_img}}" mode="scaleToFill"></image>
+                    <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
                 </swiper-item>
                 </block>
             </swiper>
@@ -32,27 +32,27 @@
 
     <!-- 非遗手札 -->
     <view class="title-image-box flex-between">
-        <image src="https://static.ticket.sz-trip.com/cgc/images/index/title1.png" mode="" style="width: 350rpx;height: 32rpx;"></image>
-        <image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" 
+        <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/title1.png" mode="" style="width: 350rpx;height: 32rpx;"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" 
         mode="" style="width: 59rpx;height: 20rpx;"
         bind:tap="goMoreList" data-url="{{'/subPackages/feiyiNew/CGCLetter/index'}}"></image>
     </view>
     <view class="handwritten-box flex-between">
-        <image src="{{item.headimg}}" mode="aspectFill" data-item="{{item}}" 
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill" data-item="{{item}}" 
         wx:for="{{handwrittenList}}" wx:key="index"
         bindtap="goDetail" data-type="travel"></image>
     </view>
 
     <!-- 非遗shi光 -->
     <view class="title-image-box flex-between">
-        <image src="https://static.ticket.sz-trip.com/cgc/images/index/title2.png" mode="" style="width: 350rpx;height: 32rpx;"></image>
-        <image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" 
+        <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/title2.png" mode="" style="width: 350rpx;height: 32rpx;"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" 
         mode="" style="width: 59rpx;height: 20rpx;"
         bind:tap="goMoreList" data-url="{{'/subPackages/feiyiNew/CGCTime/index'}}"></image>
     </view>
     <view class="time-box" wx:if="{{SGVideo&&SGVideo.head_img}}" style="background-image: url({{SGVideo.head_img}});"
     bindtap="goPlayVideo" data-item="{{SGVideo}}">
-        <image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
     </view>
 
     <!-- 底部推荐 -->
@@ -68,8 +68,8 @@
             <view wx:if="{{index%2==number}}" data-item="{{item}}" wx:for="{{hotList}}" wx:key="id" 
                  class="hot-data" bindtap="goDetail" data-type="{{hotIndex==0?'post':'video'}}">
                  <view style="position: relative;height: fit-content;">
-                    <image class="hot-data-image" src="{{item.headimg}}" mode="widthFix"></image>
-                    <image wx:if="{{hotIndex==1}}" src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+                    <image lazy-load class="hot-data-image" src="{{item.headimg}}" mode="widthFix"></image>
+                    <image lazy-load wx:if="{{hotIndex==1}}" src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
                  </view>
                 
                 <view class="hot-data-title textOver">{{item.title}}</view>
diff --git a/subPackages/feiyiNew/CGCLetter/index.wxml b/subPackages/feiyiNew/CGCLetter/index.wxml
index d60b25e..3e7535b 100644
--- a/subPackages/feiyiNew/CGCLetter/index.wxml
+++ b/subPackages/feiyiNew/CGCLetter/index.wxml
@@ -2,18 +2,18 @@
 <!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
 <title title="非遗手札"></title>
 <view class="my-header-search" wx:if="{{headImg}}">
-    <image class="heaimg" src="{{headImg}}" mode="widthFix"></image>
+    <image lazy-load class="heaimg" src="{{headImg}}" mode="widthFix"></image>
 </view>
 
 <view class="content">
     <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
-        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="info">
             <view class="textOver2 title">{{item.title}}</view>
             <view class="textOver subtitle">{{item.subtitle}}</view>
             <view class="letter-user">
                 <view style="display: flex;align-items: center;">
-                    <!-- <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar || 'https://static.ticket.sz-trip.com/tongli/images/index/user.png'}}" mode="aspectFill"></image>
+                    <!-- <image lazy-load style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="{{item.avatar || 'https://static.ticket.sz-trip.com/tongli/images/index/user.png'}}" mode="aspectFill"></image>
                     <text>{{item.nickname}}</text> -->
                 </view>
                 <view style="display: flex;align-items: center;color: #848484;">
@@ -26,7 +26,7 @@
         </view>
     </view>
     <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-        <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+        <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
         <view>暂无内容</view>
     </view>
 
diff --git a/subPackages/feiyiNew/CGCTime/index.wxml b/subPackages/feiyiNew/CGCTime/index.wxml
index 875140f..24d3940 100644
--- a/subPackages/feiyiNew/CGCTime/index.wxml
+++ b/subPackages/feiyiNew/CGCTime/index.wxml
@@ -2,25 +2,25 @@
 <!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
 <title title="非遗拾光"></title>
 <view class="my-header-search" wx:if="{{headImg}}">
-    <image class="heaimg" src="{{headImg}}" mode="widthFix"></image>
+    <image lazy-load class="heaimg" src="{{headImg}}" mode="widthFix"></image>
 </view>
 
 <view class="content">
     <view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}" wx:key="index">
        
         <!-- <view style="display: flex;align-items: center;">
-            <image style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="https://static.ticket.sz-trip.com/tongli/images/index/user.png" mode="aspectFill"></image>
+            <image lazy-load style="width: 48rpx;height: 48rpx;margin-right: 8rpx;" src="https://static.ticket.sz-trip.com/tongli/images/index/user.png" mode="aspectFill"></image>
             <text>君到苏州</text>
         </view> -->
         <view class="textOver2 title">{{item.title}}</view>
         <view class="video-image">
-            <image src="{{item.head_img}}" mode="asectFill"></image>
-            <image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+            <image lazy-load src="{{item.head_img}}" mode="asectFill"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
         </view>
             
     </view>
     <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-        <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+        <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
         <view>暂无内容</view>
     </view>
 
diff --git a/subPackages/feiyiNew/index.wxml b/subPackages/feiyiNew/index.wxml
index b0ca7c2..39b1351 100644
--- a/subPackages/feiyiNew/index.wxml
+++ b/subPackages/feiyiNew/index.wxml
@@ -17,14 +17,14 @@
         </view>
       </view>
     </view>
-    <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240715/590b8c17b06ccadd09f43ee9260d2a36.png" mode="widthFix"></image>
+    <image lazy-load wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240715/590b8c17b06ccadd09f43ee9260d2a36.png" mode="widthFix"></image>
   </view>
   <view wx:if="{{!seachFlag}}" class="feiyi-centent">
     <!-- <view class="type-box">
     <view style="display: flex;">
       <view wx:for="{{flag?navList:navList2}}" wx:key="*this" bindtap="changeNav" data-index="{{index}}" class="{{index == navIndex ? 'seld-nav':'nav'}}">{{item.title}}</view>
     </view>
-    <image bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+    <image lazy-load bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
   </view> -->
     <!-- 产品部分 -->
     <view wx:if="{{navIndex == 0}}" style="height: 100%; overflow: hidden;">
@@ -46,9 +46,9 @@
           <view style="width: 550rpx; display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
             <view class="nav-box">
               <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
-                <image src="{{navIndex == index ?item.icon :item.seldIcon}}" mode="" class="style-icon" style="width:29rpx;height:29rpx;" />
-                <!-- <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" /> -->
-                <!-- <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" /> -->
+                <image lazy-load src="{{navIndex == index ?item.icon :item.seldIcon}}" mode="" class="style-icon" style="width:29rpx;height:29rpx;" />
+                <!-- <image lazy-load wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" /> -->
+                <!-- <image lazy-load wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" /> -->
                 <text>{{item.title}}</text>
               </view>
             </view>
@@ -56,7 +56,7 @@
           <view class="list" style="width:550rpx; height:100%; flex:1; overflow: hidden;padding-bottom: 30rpx;">
             <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getList" bindscroll="scroll">
               <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
-                <image class="img" src="{{item.headimg}}" mode="" />
+                <image lazy-load class="img" src="{{item.headimg}}" mode="" />
                 <view class="content">
                   <view class="title">
                     {{item.title}}
@@ -80,9 +80,9 @@
       <view style="width: 700rpx;display: flex;justify-content: flex-end;margin: 21rpx 24rpx 20rpx 0;">
         <view class="nav-box">
           <view class="{{navIndex == index ? 'styleBtn-seld' : 'styleBtn'}}" wx:for="{{navList}}" data-index="{{index}}" bindtap="changeNav">
-            <image src="{{navIndex == index ?item.icon :item.seldIcon}}" mode="" class="style-icon" style="width:29rpx;height:29rpx;" />
-            <!-- <image wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
-          <image wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" /> -->
+            <image lazy-load src="{{navIndex == index ?item.icon :item.seldIcon}}" mode="" class="style-icon" style="width:29rpx;height:29rpx;" />
+            <!-- <image lazy-load wx:if="{{navIndex == index}}" class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/1cb81757944dd8523f3786195969266c.png" mode="" />
+          <image lazy-load wx:else class="style-icon" style="width:29rpx;height:29rpx;" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" /> -->
             <text>{{item.title}}</text>
           </view>
         </view>
@@ -110,7 +110,7 @@
             </view>
             <view class="product-list">
               <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}" wx:key="*this">
-                <image src="{{item.headimg}}" mode="aspectFill"></image>
+                <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
                 <view class="product-title textOver2">{{item.title}}</view>
                 <view class="supplier-price"><text>￥</text><text style="font-size:32rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
               </view>
@@ -126,7 +126,7 @@
   <view class="hot-list" wx:if="{{list.length>0}}">
     <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
       <view class="hot-item" wx:for="{{list}}" wx:if="{{index%2==number}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
-        <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+        <image lazy-load class="hot-item-img" src="{{item.headimg}}" mode="" />
         <view class="hot-item-main">
           <view class="hot-item-title textOver2">
             {{item.title}}
@@ -136,14 +136,14 @@
               <text class="hot-item-price">{{item.price/100}}</text>
               <text class="hot-item-market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text>
             </view>
-            <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+            <image lazy-load class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
           </view>
         </view>
       </view>
     </view>
   </view>
   <view wx:if="{{list.length==0}}" style="display: flex;flex-direction: column;align-items: center;position: absolute;left: 211rpx;top: 286.67rpx;">
-    <image style="width:328rpx;height:450.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
+    <image lazy-load style="width:328rpx;height:450.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
     <view style="font-family: PingFang SC;font-weight: 500;font-size: 28rpx;color: #666666;margin-top: 67rpx;">
       暂无搜索结果
     </view>
@@ -156,8 +156,8 @@
   <!-- 左边购物车图标及价格 -->
   <view class="gwc-left">
     <view class="gwc" bindtap="openPopup">
-      <image wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
-      <image wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
+      <image lazy-load wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
+      <image lazy-load wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
       <view class="cartCount">{{cartCount}}</view>
     </view>
     <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
@@ -165,8 +165,8 @@
     </view>
     <view wx:if="{{totalPrice>0}}" style="margin-left: 16.67rpx;font-family: PingFang SC;font-weight: 500;font-size: 27rpx;color: #0B898E;" bindtap="openPopup">
       <text>明细</text>
-      <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode="" />
-      <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode="" />
+      <image lazy-load wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode="" />
+      <image lazy-load wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode="" />
     </view>
   </view>
   <!-- 去结算按钮 -->
@@ -179,7 +179,7 @@
   <view class="mask-content" style="z-index: 99999;">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <view class="allowance" wx:if="{{allowance_data}}">
@@ -214,21 +214,21 @@
       <!-- 顶部操作按钮 -->
       <view class="flex" style="margin-bottom: 56.67rpx;">
         <view class="flex">
-          <image bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <image lazy-load bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view bindtap="allSelected" wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
           <text class="all">全选</text>
         </view>
         <view class="flex" bindtap="delAll">
-          <image style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
+          <image lazy-load style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
           <text class="del-all">清空</text>
         </view>
       </view>
       <view class="gwc-item" wx:for="{{gwcList}}" wx:key="*this" bindtap="selectedIt" data-item="{{item}}">
         <view style="margin-right: 26.67rpx;">
-          <image wx:if="{{item.selected ==1}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <image lazy-load wx:if="{{item.selected ==1}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
         </view>
-        <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
         <view class="main">
           <view>
             <view class="title textOver">{{item.product.title}}</view>
@@ -237,9 +237,9 @@
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
             <view class="num-box">
-              <image class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
               <view style="margin: 0 25.33rpx;">{{item.num}}</view>
-              <image class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
index 8ee35cc..4b59334 100644
--- a/subPackages/goods/oneCardTour/info/index.wxml
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -2,11 +2,11 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="{{info.title}}"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
+<image lazy-load wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -103,7 +103,7 @@
   </view>
   <!-- 购物车悬浮框 -->
   <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
     <view class="cart-num">{{cartCount}}</view>
   </navigator>
  <!-- 日期弹框 -->
@@ -129,7 +129,7 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
+        <image lazy-load id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
           <view class="sku-price">{{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
@@ -172,23 +172,23 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box" style="bottom: 200rpx;">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 977d332..2c27939 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -28,7 +28,7 @@
       <view bindtap="changeAllowance">惠民补贴</view>
       <view class="com-flex-tao" bindtap="selectAllowance">
         -￥{{allowance_price / 100}}
-        <image src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20220602/6ecdbc41527c0c603608686967d4493b.png"
           alt="" wx:if="{{select_allowance}}"></image>
         <view class="border" wx:else></view>
       </view>
diff --git a/subPackages/index/index.wxml b/subPackages/index/index.wxml
index 1ae631c..6fbb422 100644
--- a/subPackages/index/index.wxml
+++ b/subPackages/index/index.wxml
@@ -8,7 +8,7 @@
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <image src="{{item.head_img}}" mode="scaleToFill"></image>
+                <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
             </swiper-item>
             </block>
         </swiper>
@@ -18,14 +18,14 @@
 
         <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+20}}px">
             <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-                <image src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
                 <view class="textOver" >搜一搜您想要的</view>
             </navigator>
         </view>
 
         <view class="banner-main">
             <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
-                <image src="{{item.icon}}" ></image>
+                <image lazy-load src="{{item.icon}}" ></image>
             </view>
         </view>
     </view>
@@ -36,7 +36,7 @@
             <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
                 <view  class="top-icons no-scrollbar">
                     <view bindtap="mainNavClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
-                        <image src="{{item.icon}}" mode="aspectFill"></image>
+                        <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                         <view class="top-icon-text">{{item.title}}</view>
                     </view>
                 </view>
@@ -56,7 +56,7 @@
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
-                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
                 </swiper>
@@ -70,11 +70,11 @@
                 <!-- 上方标题部分 -->
                 <view class="xsth-title">
                     <view class="xsth-left" style="display: flex;">
-                        <image wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/f2dc42edee46a79a6ba375ae1a1c24b7.png"></image>
-                        <image wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
+                        <image lazy-load wx:if="{{xpthIndex==0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/f2dc42edee46a79a6ba375ae1a1c24b7.png"></image>
+                        <image lazy-load wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/2bcce6d179c4abd3fa6cbdec8c8519bf.png"></image>
                         
-                        <image wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/1d1117bf6120fb75159eb8657b15c640.png"></image>
-                        <image wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
+                        <image lazy-load wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250527/1d1117bf6120fb75159eb8657b15c640.png"></image>
+                        <image lazy-load wx:else  mode="heightFix" class="common-header-img" src="https://static.ticket.sz-trip.com/uploads/20250526/fcab4f467a250c2750c4af53942fa205.png"></image>
                     </view>
                 </view>
                 <!-- 热门 -->
@@ -82,14 +82,14 @@
                     <scroll-view scroll-x style="height:372rpx">
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}">
-                                <image src="{{item.headimg}}"></image>
+                                <image lazy-load src="{{item.headimg}}"></image>
                                 <view class="season-content" style="padding:6rpx 12rpx 0;">
                                     <view style="height: 70rpx;" class="textOver2">{{item.title}}</view>
                                     <view class="price" >
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
                                 </view>
-                                <image class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image>
+                                <image lazy-load class="hot-cover-img" src="https://static.ticket.sz-trip.com/uploads/20250529/4b2ad9bdc8df0b0f7e67da1bef171e5d.png"></image>
                             </view>
                         </view>
                     </scroll-view>
@@ -100,7 +100,7 @@
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id">
-                        <image src="{{item.headimg}}" mode="" />
+                        <image lazy-load src="{{item.headimg}}" mode="" />
                         <view class="xpth-item-content">
                             <view class="xpth-item-title textOver2">{{item.title}}</view>
                             <view class="xpth-item-bottom">
@@ -115,7 +115,7 @@
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                            <image style="border-radius:13rpx" src="{{item.head_img}}"></image>
+                            <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}"></image>
                             </swiper-item>
                         </block>
                         </swiper>
@@ -132,7 +132,7 @@
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
-                    <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+                    <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
                     </swiper-item>
                 </block>
                 </swiper>
@@ -143,52 +143,52 @@
 
             <!-- 公共服务 -->
             <view class="sale-road-boxes" style="margin-top:0;">
-                <image class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
+                <image lazy-load class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
                 <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
                     <view style="height: 40rpx;line-height: 40rpx;">更多</view>
-                    <image style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" />
+                    <image lazy-load style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" />
                 </navigator>
             </view>
             <view>
                 <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
                     <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
-                        <image src="{{item.img}}"></image>
+                        <image lazy-load src="{{item.img}}"></image>
                     </view>
                 </view>
             </view>
 
             <!-- 旅游助手 -->
             <view class="sale-road-boxes" style="margin-top:36rpx">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="pic-list" style="margin-top:30rpx">
-                <image class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick"
+                <image lazy-load class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick"
                 src="{{item.img}}" mode="aspectFill"></image>
             </view>
 
             <!-- ai避高峰 -->
             <!-- <view style="display: flex;margin-top: 30rpx;justify-content: space-between;">
                 <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-                    <image src="{{indexSeason.ai}}" mode=""/>
+                    <image lazy-load src="{{indexSeason.ai}}" mode=""/>
                 </view>
                 <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-                    <image src="{{indexSeason.avoid}}" mode=""/>
+                    <image lazy-load src="{{indexSeason.avoid}}" mode=""/>
                 </view>
             </view> -->
 
 
             <!-- 数字文旅-->
             <view class="sale-road-boxes" style="margin-top:30rpx">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="slide-out-box">
                 <!-- 元旦修改 .slide-box的原样式 height:360rpx-->
                 <scroll-view scroll-x style="height:400rpx" bindscroll="listenScroll" data-keyname="scrollLeft" class="slide-box">
                 <view class="pbservice">
                     <view class="pbservice-item" wx:for="{{travelCulture}}" wx:key="index" data-item="{{item}}" bindtap="mainIconClick">
-                        <image src="{{item.img}}" mode="widthFix"></image>
+                        <image lazy-load src="{{item.img}}" mode="widthFix"></image>
                         <!-- <view class="text">{{item.title}}</view> -->
                     </view>
                     
@@ -202,29 +202,29 @@
 
             <!-- 十全十美 -->
             <view class="sale-road-boxes">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
             </view>
             <view class="six-box-new">
-                <image wx:for="{{SQSM}}" src="{{item.img}}" data-item="{{item}}" bindtap="mainIconClick" mode="widthFix" wx:key="index"></image>
+                <image lazy-load wx:for="{{SQSM}}" src="{{item.img}}" data-item="{{item}}" bindtap="mainIconClick" mode="widthFix" wx:key="index"></image>
             </view>
 
             <!-- 长三角文旅平台 -->
             <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat}}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="other-plats" wx:if="{{otherPlat}}">
                 <view class="other-plat" wx:for="{{otherPlat}}" bindtap="gotoOther" data-item="{{item}}" wx:key="index">
-                <image src="{{item.icon}}" mode="heightFix"></image>
+                <image lazy-load src="{{item.icon}}" mode="heightFix"></image>
                 <!-- <view>{{item.name}}</view> -->
                 </view>
             </view>
 
             <!-- 热门推荐 -->
             <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0}}">
-                <image mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
-                <!-- <image class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
+                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
+                <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="hot-list">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
@@ -263,29 +263,29 @@
         <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
             <block wx:for="{{alertSwipeList}}" wx:key="index">
             <swiper-item data-item="{{item}}" bindtap="bannerClick">
-                <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
+                <image lazy-load src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
             </swiper-item>
             </block>
         </swiper>
-        <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
+        <image lazy-load bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
     </view>
     <!-- 广告弹窗结束 -->
     <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
         <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
         <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-            <image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+            <image lazy-load src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
         </view>
 
         <!-- 视频 -->
         <view style="width:100vw;height: 100vh;position: relative;" wx:if="{{!startList.media_type}}">
             <video style="width:100vw;height:100vh;display:block;" id="myVideo" src="{{startList.head_img}}" show-center-play-btn="{{false}}" show-play-btn="{{true}}" autoplay controls="{{false}}" bindended="videoend" loop="{{true}}" muted="{{isMuted}}" object-fit="fill"></video>
 
-            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-            <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+            <!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+            <!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
         </view>
     </view>
 
diff --git a/subPackages/indexGQ/index.wxml b/subPackages/indexGQ/index.wxml
index 184d94e..06c7497 100644
--- a/subPackages/indexGQ/index.wxml
+++ b/subPackages/indexGQ/index.wxml
@@ -1,21 +1,21 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image lazy-load class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
+<image lazy-load  class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/index51/topBgs.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <image lazy-load  src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
-  <!-- <image lazy-load bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+  <!-- <image lazy-load  bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20250120/2186b1d4a689243273d78ae71563a81f.png"
     mode="aspectFill"></image> -->
-  <image lazy-load bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+  <image lazy-load  bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
     src="https://static.ticket.sz-trip.com/uploads/20250429/224929eeb4520d0c3ea8f10a657825b4.png" mode="aspectFill"></image>
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
   <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
     <!-- <view class="iconfont icon-sousuo"></view> -->
-    <image lazy-load class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
+    <image lazy-load  class="search-icon" src="https://static.ticket.sz-trip.com/uploads/20250429/d58f99bf233dbd34a83d002681f5fec6.png"></image>
     <view class="textOver">搜索想要的旅游产品或服务</view>
   </navigator>
 </view>
@@ -23,7 +23,7 @@
   <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex"  circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
+        <image lazy-load  src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
@@ -34,7 +34,7 @@
 <view class="content" wx:if="{{!isTest}}">
   <!-- 活动日历 -->
   <view class="sale-road-boxes date-container" style="margin: 0 26.67rpx;">
-    <image lazy-load mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
+    <image lazy-load  mode="heightFix" style="height:66rpx;width: 358rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/3e5717a0cf9198daa1e078b50b7d5c41.png"></image>
     <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
     <view class="nowDate"> 
         <view class="num">{{nowDate[0]}}</view>
@@ -52,7 +52,7 @@
     <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index" >
         <view style="background: #fff;display: flex;border-radius: 7rpx;width: 100%;">
-          <!-- <image lazy-load class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
+          <!-- <image lazy-load  class="hdrlItem-img" src="{{item.post_url}}" mode="aspectFill"/> -->
           <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.post_url || item.cover}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
@@ -66,7 +66,7 @@
     <view style="margin-left:24.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="index">
         <view style="background: #fff;width: 100%;display: flex;border-radius: 7rpx;width: 100%;">
-          <!-- <image lazy-load class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
+          <!-- <image lazy-load  class="movieItem-img" src="{{item.headimg}}" mode=""/> -->
           <common-image class="hdrlItem-img" width="240rpx" height='213rpx' src="{{item.headimg}}" defaultImage="https://static.ticket.sz-trip.com/uploads/20240909/c9a0029cc9426d2a17f1dbbb7a179762.jpg" mode="aspectFill"></common-image>
           
           <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 10rpx 0;font-size: 30rpx;font-weight: bold;width: 500rpx;box-sizing: border-box;">
@@ -83,12 +83,12 @@
   <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image lazy-load bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
+      <image lazy-load  bindtap="gotoUrl" data-event="comfort_click" data-title="ai伴你游"
         data-url="https://m.cloud.sz-trip.com/aiPlay" class="gfyj"
         src="https://static.ticket.sz-trip.com/uploads/20250429/4bb075515851ae9a760e60a736a40b5b.png" mode=""/>
-      <!-- <image lazy-load bindtap="gotoUrls" data-event="xlqc" class="sslk"
+      <!-- <image lazy-load  bindtap="gotoUrls" data-event="xlqc" class="sslk"
        src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/> -->
-       <image lazy-load  class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=AI避高峰"
+       <image lazy-load   class="sslk" bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=AI避高峰"
        src="https://static.ticket.sz-trip.com/uploads/20250429/81596463b9f18a3a8d3998a1dd222e7a.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
@@ -96,57 +96,57 @@
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
         <view class="pbservice no-scrollbar" style="margin-bottom:30rpx;width: fit-content;padding-left: 16rpx;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6fcd03c4b5adc17b714186825e1f5da6.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/6fcd03c4b5adc17b714186825e1f5da6.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
           <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
             <view class="text">水上游</view>
           </view>
           <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/nightTour2025" data-event="night_sz" data-title="夜游苏州"  class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/b797b57b9a132f6e815dbf95d459bffa.png" mode="widthFix"></image>
             <view class="text">夜游苏州</view>
           </view>
           
           <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/e503579d2a533a47836595b82b5b1a3e.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
           <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/subPackages/techanNew/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/a106c6bbdbd76ee03c4ef7e1b785a370.png" mode="widthFix"></image>
             <view class="text">文创特产</view>
           </view>
 
           <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/13fcee318d6f9fcdb15b478715fe2ca7.png" mode="widthFix"></image>
             <view class="text">场馆预约</view>
           </view>
           <view bindtap="gotoUrl" data-event="card" data-title="一日游" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
           <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>
           <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/subPackages/feiyiNew/index" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/cbaba65da8f36d9902eb3ad769f89705.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
 
           <view wx:if="{{isMayDay}}" bindtap="gotoMini" data-event="hotel_click" data-title="酒店住宿" 
           data-appid="wx0e6ed4f51db9d078" data-path="pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063" class="pbservice-item">
-            <image  src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
             <view class="text">酒店住宿</view>
         </view>
         <!-- 五一前临时跳转专题页 -->
         <view wx:else bindtap="gotoUrl" data-event="hotel_click" data-title="酒店住宿" data-url="https://m.cloud.sz-trip.com/nightMooring"  class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/6481d532e45597a1a53f1dd3b0169e98.png" mode="widthFix"></image>
             <view class="text">酒店住宿</view>
         </view>
 
         <!-- <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
             <view class="text">研学游</view>
         </view> -->
 
@@ -164,7 +164,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load  style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -175,54 +175,54 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image lazy-load style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
+      <image lazy-load  style="width: 358.67rpx;height: 66.67rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250429/0790204f33d4fbc1255df668e3613e6f.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image lazy-load class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
+    <image lazy-load  class="ysz-right-img" src="https://static.ticket.sz-trip.com/uploads/20250429/113c0e62bb9bf2345f9b95ddc1171481.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;height: 160rpx;">
         <!-- <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view> -->
         <view  data-event="comfort_click" data-title="高峰预警"
             bindtap="gotoPath"  data-path="/pages/pbService/sceneComfort/index?title=高峰预警"
          class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/29cb73cdbaa44f4b2c7300d4a55cd40a.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/068d421a83e215b455ac7820bb93b64d.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
         <view bindtap="xlzs"  class="pbservice-item ggfw" >
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/97de98ec65e23c40749e6cb1bde75874.png" mode="widthFix"></image>
             <view>行李直送</view>
         </view>
         <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea" class="pbservice-item ggfw">
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/106a059913416dc311a466989ab4dd38.png" mode="widthFix"></image>
             <view>停车场</view>
         </view>
 
         <!-- <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250117/785044f09a3de0cb3b540f5ba11f8afb.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view> -->
         
         <view class="pbservice-item ggfw" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
             data-path="/pages/pbService/bike/index?type=1">
-            <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250429/8b2fdbd75401fba8cf26c8613bb56718.png" mode="widthFix"></image>
             <view>找厕所</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view> -->
         
@@ -234,28 +234,28 @@
     </view>
     <view wx:else style="margin: 0rpx 14rpx 0;">
       <view class="pic-list"  wx:if="{{!isTest}}">
-        <image lazy-load class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
+        <image lazy-load  class="new-pic" bindtap="gotoPath"  data-path="/subPackageCheckPoint/pages/index/index"
           src="https://static.ticket.sz-trip.com/uploads/20250429/eacfc180904e8f1e8717afe2aa959c28.png" mode="aspectFill"></image>
-          <image lazy-load class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          <image lazy-load  class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
           data-path="/pages/list/{{isTest?'road':'food'}}/index"
           src="https://static.ticket.sz-trip.com/uploads/20250429/e86972b98e8fbb5c5983f38124a77cb2.png" mode="aspectFill"></image>
-          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          <image lazy-load  class="new-pic" bindtap="audioGuide" data-event="voice_click"
           src="https://static.ticket.sz-trip.com/uploads/20250429/62637ab5923016ef9baa573372d2452f.png" mode="aspectFill">
         </image>
-        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        <image lazy-load  class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
           src="https://static.ticket.sz-trip.com/uploads/20250429/13060c57ee40d1f92145968a0fbd8378.png" mode="aspectFill"></image>
       </view>
     </view>
   </view>
   <!-- 推荐榜单 -->
-  <image lazy-load class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
+  <image lazy-load  class="tjbd-title" style="width: 358rpx;height: 53rpx;margin:64rpx 26rpx 20rpx;" 
   src="https://static.ticket.sz-trip.com/uploads/20250429/179e3d1e09a17149f260c8d51458ed15.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{bdItem.bg}};" wx:for-item="bdItem" wx:for-index="i" wx:for="{{bdList}}" wx:key="i">
-    <!-- <image lazy-load class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
+    <!-- <image lazy-load  class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/> -->
     <view class="bd-top">
-      <image lazy-load class="bd-type" src="{{bdItem.icon}}" mode=""/>
+      <image lazy-load  class="bd-type" src="{{bdItem.icon}}" mode=""/>
       <view bindtap="moreBtn" class="bd-more" style="color:{{i%2==1?'#55578E':'#F34017'}}" data-item="{{bdItem}}">更多 ></view>
     </view>
     <view style="position: relative;z-index: 9;">
@@ -263,7 +263,7 @@
         wx:key="id" data-item="{{item}}">
         <view class="bd-index" style="color: {{bdItem.color}};">{{index+1}}</view>
         <view class="bd-item">
-          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load  class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -292,7 +292,7 @@
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box no-scrollbar">
         <view class="pbservice no-scrollbar" style="margin:0 auto;width: fit-content;">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
 
@@ -307,7 +307,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="index">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load  style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -318,39 +318,39 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image lazy-load style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
+      <image lazy-load  style="width: 333rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/2e6fb944c77767ef49602e7ae0b3e12d.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image lazy-load style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
+    <image lazy-load  style="width: 192rpx;height: 164rpx;" src="https://static.ticket.sz-trip.com/uploads/20240923/ad8c0a411610938ec234d0afc864ccff.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;overflow-x: auto;">
         <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/4c0ee81974879d5160b932a7e526e90d.png" mode="widthFix"></image>
           <view>电子社保卡</view>
         </view>
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy"
          class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/43f561c40ef50aafa30a0a637fb016fb.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" >
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/d59d84a7d728f4b2671b5d2e52d1d72e.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/18818826384a788ab7ac457572174b39.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
 
         <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw">
-          <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
+          <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20240923/38fa0db45de3290d44341699dd81d8b8.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view> -->
         
@@ -362,14 +362,14 @@
     </view>
     <view wx:else>
       <view class="pic-list" style="margin-top:20rpx" >
-        <image lazy-load class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        <image lazy-load  class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
           data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
           
-          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          <image lazy-load  class="new-pic" bindtap="audioGuide" data-event="voice_click"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
         </image>
-        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        <image lazy-load  class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
       </view>
     </view>
@@ -381,7 +381,7 @@
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image lazy-load src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+		<image lazy-load  src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
 	
 	<!-- 视频 -->
@@ -400,12 +400,12 @@
 			object-fit="fill"
 		></video>
 		
-		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+		<!-- <image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image lazy-load  src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
 	</view>
 </view>
 
diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml
index 1e3582c..1c582b4 100644
--- a/subPackages/indexs/index.wxml
+++ b/subPackages/indexs/index.wxml
@@ -1,15 +1,15 @@
 <!--pages/indexs/index.wxml-->
 <title title="君到苏州（文化旅游总入口）"></title>
 <!-- 后台获取的季节动图 -->
-<image class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/topImg.gif" mode="widthFix"></image>
+<image lazy-load class="top-bg-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/topImg.gif" mode="widthFix"></image>
 <view wx:if="{{weather}}" class="top-box" style="height: 63rpx">
-  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
+  <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
   <view class="weather-num">{{weather.max_temp}}°</view>
   <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+  <image lazy-load bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
     data-event="customer_service_click" src="https://static.ticket.sz-trip.com/uploads/20240428/7c77f3fc227acb3f15963c54fbd3d954.png"
     mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
+  <image lazy-load bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
     src="https://static.ticket.sz-trip.com/uploads/20240428/ae4b559db397a7b7d76b471576bfa3c0.png" mode="aspectFill"></image>
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx" wx:if="{{!isTest}}">
@@ -22,7 +22,7 @@
   <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
     <block wx:for="{{banner}}" wx:key="this">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
-        <image src="{{item.head_img}}" mode="scaleToFill"></image>
+        <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
       </swiper-item>
     </block>
   </swiper>
@@ -33,7 +33,7 @@
 <view class="content">
   <!-- 活动日历 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
-    <image mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendar.png"></image>
+    <image lazy-load mode="heightFix" style="height:86rpx" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendar.png"></image>
     <navigator url="/pages/list/activitynew/index" class="right-more">更多 ></navigator>
   </view>
   <view class="hdrlNavList">
@@ -45,7 +45,7 @@
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" class="hdrlList" wx:if="{{!isTest}}">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this" style="width: 593.33rpx;">
         <view style="background: #fff;display: flex;border-radius: 13rpx;">
-          <image class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
+          <image lazy-load class="hdrlItem-img" src="{{item.post_url}}" mode=""/>
           <view class="hdrlItem-content">
             <view class="hdrlItem-title textOver3">{{item.name}}</view>
             <view class="hdrlItem-date">{{item.begin_date}}-{{item.end_date}}</view>
@@ -58,7 +58,7 @@
     <view style="margin-left:16.67rpx;margin-right: 14.67rpx;display: flex;overflow-x: scroll;" wx:if="{{!isTest}}" class="one">
       <view class="hdrlItem" wx:for="{{hdrlList}}" bindtap="goDetail" data-item="{{item}}" wx:key="this">
         <view style="background: #fff;width: 570rpx;display: flex;border-radius: 13rpx;">
-          <image class="movieItem-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load class="movieItem-img" src="{{item.headimg}}" mode=""/>
           <view style="display: flex;flex-direction: column;justify-content: space-between;padding: 10rpx 10rpx 5rpx 2rpx;font-size: 30rpx;font-weight: 500;width: 500rpx;box-sizing: border-box;">
             <view>{{item.title}}</view>
             <view style="display: flex;justify-content: flex-end;">
@@ -73,44 +73,44 @@
   <view class="main-box" wx:if="{{!isTest}}">
     <!-- 上面的高峰预警、实时路况 -->
     <view class="main-box-top">
-      <image bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
+      <image lazy-load bindtap="gotoUrl" data-event="comfort_click" data-title="高峰预警"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="gfyj" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gfyj.png" mode=""/>
-      <image bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
+      <image lazy-load bindtap="gotoUrl" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="sslk" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/sslk.png" mode=""/>
     </view>
     <!-- 下面几大板块 -->
     <view class="slide-out-box">
       <scroll-view scroll-x bindscroll="listenScroll" class="slide-box">
         <view class="pbservice" style="margin-bottom:30rpx">
           <view bindtap="gotoPath" data-event="ticket_click" style="margin-left: 10rpx;" data-title="景点门票" data-path="/pages/list/scene/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jdmp.png" mode="widthFix"></image>
             <view class="text">景点门票</view>
           </view>
           <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yysz.png" mode="widthFix"></image>
             <view class="text">夜游苏州</view>
           </view>
           <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/wctc.png" mode="widthFix"></image>
             <view class="text">文创特产</view>
           </view>
           <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/cgyy.png" mode="widthFix"></image>
             <view class="text">场馆预约</view>
           </view>
           <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
           <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
           <view bindtap="gotoPath" data-event="one_card" data-title="一卡游" data-path="/pages/list/card/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yky.png" mode="widthFix"></image>
             <view class="text">一卡游</view>
           </view>
           <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index" class="pbservice-item">
-            <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
+            <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
         </view>
@@ -127,7 +127,7 @@
       bindchange="changeSmBannerIndex">
       <block wx:for="{{xiaobanner}}" wx:key="*this">
         <swiper-item bindtap="bannerClick" data-item="{{item}}">
-          <image style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
+          <image lazy-load style="border-radius:13rpx" src="{{item.head_img}}" mode="aspectFill"></image>
         </swiper-item>
       </block>
     </swiper>
@@ -138,33 +138,33 @@
   <!-- 游苏州 -->
   <view class="sale-road-boxes" style="margin: 0 26.67rpx;">
     <view style="margin-bottom:6rpx;">
-      <image style="width: 286.67rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/ysz.png" mode=""/>
+      <image lazy-load style="width: 286.67rpx;height: 80rpx;margin-bottom: 14.67rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/ysz.png" mode=""/>
       <view>
         <text style="padding: 11.33rpx 18rpx;" class="hdrlNav{{index==yszIndex?' hdrlNavActive':''}}" wx:for="{{yszNav}}" data-index="{{index}}" bindtap="changeType" wx:key="this">{{item}}</text>
       </view>
     </view>
-    <image style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
+    <image lazy-load style="width: 218rpx;height: 109.33rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/boat.png" mode=""/>
   </view>
   <view class="ysz-box {{yszIndex==1?'ysz-box2':''}}">
     <view wx:if="{{yszIndex == 0}}" style="margin: 20rpx 14rpx 0;">
       <view class="pbservice ggfw-list" style="width:100%;justify-content: space-between;">
         <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/anquan.png" mode="widthFix"></image>
           <view>安全服务</view>
         </view>
         <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
         data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gaofeng.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/gaofeng.png" mode="widthFix"></image>
           <view>高峰预警</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
         data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/xingli.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/xingli.png" mode="widthFix"></image>
           <view>行李寄存</view>
         </view>
         <view bindtap="gotoUrl" data-event="xlqc"
           data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
-          <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/shishi.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/shishi.png" mode="widthFix"></image>
           <view>实时路况</view>
         </view>
       </view>
@@ -174,35 +174,35 @@
     </view>
     <view wx:else>
       <view class="pic-list" style="margin-top:20rpx" wx:if="{{!isTest}}">
-        <image class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
+        <image lazy-load class="new-pic" bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
           data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/douyin.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
+          <image lazy-load class="new-pic" bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
           data-path="/pages/list/{{isTest?'road':'food'}}/index"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jiexiang.png" mode="aspectFill"></image>
-          <image class="new-pic" bindtap="audioGuide" data-event="voice_click"
+          <image lazy-load class="new-pic" bindtap="audioGuide" data-event="voice_click"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yuyin.png" mode="aspectFill">
         </image>
-        <image class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
+        <image lazy-load class="new-pic" bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
           src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/youji.png" mode="aspectFill"></image>
       </view>
     </view>
   </view>
   <!-- 推荐榜单 -->
-  <image class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
+  <image lazy-load class="tjbd-title" style="width: 286.67rpx;height: 80rpx;margin-left: 26rpx;margin-bottom: 20rpx;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/tjbd.png" mode=""/>
   <!-- 4个产品榜单 -->
  <view style="display: flex;overflow-x: scroll;padding-right: 20rpx;" class="bottom-box" wx:if="{{!isTest}}">
   <view class="bd-box" style="background:{{item.bg}};" wx:for="{{bdList}}" wx:key="this">
-    <image class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
+    <image lazy-load class="zz" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/zzIcon.png" mode=""/>
     <view class="bd-top">
-      <image class="bd-type" src="{{item.icon}}" mode=""/>
+      <image lazy-load class="bd-type" src="{{item.icon}}" mode=""/>
       <view bindtap="moreBtn" class="bd-more" data-item="{{item}}">更多 ></view>
     </view>
     <view wx:if="{{index==0}}" style="position: relative;z-index: 9;">
       <view data-url="/pages/info/sceneProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list1}}" wx:key="id" bindtap="gobdDetail">
         <view class="bd-index">{{index+1}}</view>
         <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -219,7 +219,7 @@
       <view bindtap="gobdDetail" data-url="/pages/info/postProductInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list2}}" wx:key="id">
         <view class="bd-index">{{index+1}}</view>
         <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
+          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode="aspectFill"/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -236,7 +236,7 @@
       <view bindtap="gobdDetail" data-url="/pages/info/roadInfo/index?id={{item.id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list3}}" wx:key="id">
         <view class="bd-index">{{index+1}}</view>
         <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -253,7 +253,7 @@
       <view bindtap="gobdDetail" data-url="/pages/info/sceneProductInfo/index?id={{item.scene_id}}" style="display: flex;align-items: center;margin-bottom: 20rpx;" wx:for="{{list4}}" wx:key="id">
         <view class="bd-index">{{index+1}}</view>
         <view class="bd-item">
-          <image class="bd-item-img" src="{{item.headimg}}" mode=""/>
+          <image lazy-load class="bd-item-img" src="{{item.headimg}}" mode=""/>
           <view class="bd-item-content">
             <view class="bd-item-title textOver2">
               {{item.title}}
@@ -277,7 +277,7 @@
 <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}"  style="opacity: {{opacity}}">
 	<view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
     <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-		<image src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
+		<image lazy-load src="{{startList.head_img}}" mode="widthFix" style="width: 100%;height: 100%;"></image>
     </view>
 	
 	<!-- 视频 -->
@@ -296,12 +296,12 @@
 			object-fit="fill"
 		></video>
 		
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
-		<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
-		<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
+		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/mute.png" class="muteImg" mode="widthFix" wx:if="{{isMuted}}" bindtap="closeMuted"></image> -->
+		<!-- <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/sound.png" class="muteImg" mode="widthFix" wx:else bindtap="closeMuted"></image> -->
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/logo.png" class="logoImg" mode="widthFix"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/btn.png" class="btnImg" mode="widthFix" bindtap="closeFullAdv"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/play.png" class="playImg" mode="widthFix" wx:if="{{videoPlay}}" bindtap="videoPlay"></image>
+		<image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/startPage/pause.png" class="playImg" mode="widthFix" wx:else bindtap="videoPause"></image>
 	</view>
 </view>
 
diff --git a/subPackages/postSearch/index.wxml b/subPackages/postSearch/index.wxml
index 9408dc4..e6bcff6 100644
--- a/subPackages/postSearch/index.wxml
+++ b/subPackages/postSearch/index.wxml
@@ -16,7 +16,7 @@
     <view class="hot-list" wx:if="{{list.length>0}}">
       <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
         <view class="hot-item" wx:if="{{index%2==number}}" wx:for="{{list}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
-          <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+          <image lazy-load class="hot-item-img" src="{{item.headimg}}" mode="" />
           <view class="hot-item-main">
             <view class="hot-item-title textOver2">
               {{item.title}}
@@ -26,14 +26,14 @@
                 <text class="hot-item-price">{{item.price/100}}</text>
                 <text class="hot-item-market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text>
               </view>
-              <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
       </view>
     </view>
     <view wx:else style="display: flex;flex-direction: column;align-items: center;">
-      <image style="width:328rpx;height:450.67rpx;margin-top: 286.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
+      <image lazy-load style="width:328rpx;height:450.67rpx;margin-top: 286.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
       <view style="font-family: PingFang SC;font-weight: 500;font-size: 28rpx;color: #666666;margin-top: 67rpx;">
         暂无搜索结果
       </view>
@@ -43,8 +43,8 @@
     <!-- 左边购物车图标及价格 -->
     <view class="gwc-left">
       <view class="gwc" bindtap="openPopup">
-        <image wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
-        <image wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
+        <image lazy-load wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
+        <image lazy-load wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
         <view class="cartCount">{{cartCount}}</view>
       </view>
       <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
@@ -52,8 +52,8 @@
       </view>
       <view wx:if="{{totalPrice>0}}" bindtap="openPopup">
         <text style="margin-left: 16.67rpx;font-weight: 500;font-size: 27rpx;color: #0B898E;">明细</text>
-        <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left:10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode=""/>
-        <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode=""/>
+        <image lazy-load wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left:10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode=""/>
+        <image lazy-load wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode=""/>
       </view>
     </view>
     <!-- 去结算按钮 -->
@@ -65,7 +65,7 @@
   <view class="mask-content" style="z-index: 99999;">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <view class="allowance" wx:if="{{allowance_data}}">
@@ -100,21 +100,21 @@
       <!-- 顶部操作按钮 -->
       <view class="flex" style="margin-bottom: 56.67rpx;">
         <view class="flex">
-          <image bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <image lazy-load bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view bindtap="allSelected" wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
           <text class="all">全选</text>
         </view>
         <view class="flex" bindtap="delAll">
-          <image style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
+          <image lazy-load style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
           <text class="del-all">清空</text>
         </view>
       </view>
       <view class="gwc-item" wx:for="{{gwcList}}" wx:key="*this" bindtap="selectedIt" data-item="{{item}}">
         <view style="margin-right: 26.67rpx;">
-          <image wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <image lazy-load wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
         </view>
-        <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
         <view class="main">
           <view>
             <view class="title textOver">{{item.product.title}}</view>
@@ -123,9 +123,9 @@
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
             <view class="num-box">
-              <image class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
               <view style="margin: 0 25.33rpx;">{{item.num}}</view>
-              <image class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
diff --git a/subPackages/techanCart/index.wxml b/subPackages/techanCart/index.wxml
index 66130c7..0a6471e 100644
--- a/subPackages/techanCart/index.wxml
+++ b/subPackages/techanCart/index.wxml
@@ -5,7 +5,7 @@
 <view wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
   <view class="item{{(item.product.flag!=1 || item.sku.flag!='on')?' disable':''}}">
     <view class="iconfont{{item.checked?' icon-gou':' icon-quan'}}" bindtap="select" data-index="{{index}}"></view>
-    <image src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
+    <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
     <view class="item-info textOver">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="sku-title textOver">
@@ -24,7 +24,7 @@
   <view class='del' catchtap="del" data-index="{{index}}">删除</view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
 </view>
 <view style="height:113rpx"></view>
diff --git a/subPackages/techanNew/index.wxml b/subPackages/techanNew/index.wxml
index 3b06131..0a7fe57 100644
--- a/subPackages/techanNew/index.wxml
+++ b/subPackages/techanNew/index.wxml
@@ -18,7 +18,7 @@
         </view>
       </view>
     </view>
-    <image wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240710/a39dd5504c4baa66dd239153d2d20787.png" mode="widthFix"></image>
+    <image lazy-load wx:if="{{!seachFlag}}" class="heaimg" src="https://static.ticket.sz-trip.com/uploads/20240710/a39dd5504c4baa66dd239153d2d20787.png" mode="widthFix"></image>
   </view>
 
   <view wx:if="{{!seachFlag}}" class="techan-centent">
@@ -28,8 +28,8 @@
         <view wx:for="{{flag?navList:navList2}}" wx:key="*this" bindtap="changeNav" data-index="{{index}}" class="{{index == navIndex ? 'seld-nav':'nav'}}">{{item.title}}</view>
       </view>
       <!-- 店铺--产品 切换 -->
-      <image wx:if="{{flag}}" bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
-      <image wx:else bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240717/a092bdcdbac0bb26573f8997f3d4ba38.png" mode="" />
+      <image lazy-load wx:if="{{flag}}" bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240710/62bb38d5f88754e57447a26b14176aa2.png" mode="" />
+      <image lazy-load wx:else bindtap="changeStyle" class="changeStyle" src="https://static.ticket.sz-trip.com/uploads/20240717/a092bdcdbac0bb26573f8997f3d4ba38.png" mode="" />
     </view>
     <!-- 产品部分 -->
     <view wx:if="{{flag}}" style="flex: 1; display: flex; overflow: hidden;">
@@ -49,7 +49,7 @@
       <view class="list" style="width: 100%;height:100%; overflow: hidden;padding-bottom: 30rpx;">
         <scroll-view scroll-y="true" style="height: 100%" bindscrolltoupper="upper" bindscrolltolower="getList" bindscroll="scroll">
           <view class="item" wx:for="{{list}}" wx:key="*this" bindtap="goodsDetail" data-goods="{{item}}">
-            <image class="img" src="{{item.headimg}}" mode="" />
+            <image lazy-load class="img" src="{{item.headimg}}" mode="" />
             <view class="content">
               <view class="title">
                 {{item.title}}
@@ -91,7 +91,7 @@
           </view>
           <view class="product-list">
             <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}" wx:key="*this">
-              <image src="{{item.headimg}}" mode="aspectFill"></image>
+              <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
               <view class="product-title textOver2">{{item.title}}</view>
               <view class="supplier-price"><text>￥</text><text style="font-size:32rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
             </view>
@@ -105,7 +105,7 @@
     <view class="hot-list" wx:if="{{list.length>0}}">
       <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
         <view class="hot-item" wx:if="{{index%2==number}}" wx:for="{{list}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
-          <image class="hot-item-img" src="{{item.headimg}}" mode="" />
+          <image lazy-load class="hot-item-img" src="{{item.headimg}}" mode="" />
           <view class="hot-item-main">
             <view class="hot-item-title textOver2">
               {{item.title}}
@@ -115,14 +115,14 @@
                 <text class="hot-item-price">{{item.price/100}}</text>
                 <text class="hot-item-market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text>
               </view>
-              <image class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="add" catchtap="addBuyCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
       </view>
     </view>
     <view wx:else style="display: flex;flex-direction: column;align-items: center;">
-      <image style="width:328rpx;height:450.67rpx;margin-top: 286.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
+      <image lazy-load style="width:328rpx;height:450.67rpx;margin-top: 286.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3750a41a89b49e9f546a6ba85d71d66e.png" mode="" />
       <view style="font-family: PingFang SC;font-weight: 500;font-size: 28rpx;color: #666666;margin-top: 67rpx;">
         暂无搜索结果
       </view>
@@ -135,8 +135,8 @@
     <!-- 左边购物车图标及价格 -->
     <view class="gwc-left">
       <view class="gwc" bindtap="openPopup">
-        <image wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
-        <image wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
+        <image lazy-load wx:if="{{cartCount == 0}}" style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240715/520600afc4bd32ed1f44bc5985fc2ba5.png" mode="" />
+        <image lazy-load wx:else style="width: 100%;height: 100%;" src="https://static.ticket.sz-trip.com/uploads/20240711/f9c290c64c521feae643d28f1b8c9c60.png" mode="" />
         <view class="cartCount">{{cartCount}}</view>
       </view>
       <view style="font-weight: 500;font-size: 27rpx;color: #000000;">
@@ -144,8 +144,8 @@
       </view>
       <view wx:if="{{totalPrice>0}}" bindtap="openPopup">
         <text style="margin-left: 16.67rpx;font-weight: 500;font-size: 27rpx;color: #0B898E;">明细</text>
-        <image wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left:10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode=""/>
-        <image wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode=""/>
+        <image lazy-load wx:if="{{showPopup}}" style="width:17.33rpx;height:17.33rpx;margin-left:10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/524acef87f09269f6a4fa39d0fa38c18.png" mode=""/>
+        <image lazy-load wx:else style="width:17.33rpx;height:17.33rpx;margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/080e94053d1444707d18860a73b17915.png" mode=""/>
       </view>
     </view>
     <!-- 去结算按钮 -->
@@ -159,7 +159,7 @@
   <view class="mask-content" style="z-index: 99999;">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view class="sku-price">{{info.sku[skuIndex].price/100}}
           <view class="allowance" wx:if="{{allowance_data}}">
@@ -194,21 +194,21 @@
       <!-- 顶部操作按钮 -->
       <view class="flex" style="margin-bottom: 56.67rpx;">
         <view class="flex">
-          <image bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <image lazy-load bindtap="allSelected" wx:if="{{allSelectedBtn}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view bindtap="allSelected" wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
           <text class="all">全选</text>
         </view>
         <view class="flex" bindtap="delAll">
-          <image style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
+          <image lazy-load style="width:26.67rpx;height:26.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/3320fbf5ccf471145c3c600582cd9b65.png" mode="" />
           <text class="del-all">清空</text>
         </view>
       </view>
       <view class="gwc-item" wx:for="{{gwcList}}" wx:key="*this" bindtap="selectedIt" data-item="{{item}}">
         <view style="margin-right: 26.67rpx;">
-          <image wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
+          <image lazy-load wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
         </view>
-        <image style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
         <view class="main">
           <view>
             <view class="title textOver">{{item.product.title}}</view>
@@ -217,9 +217,9 @@
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
             <view class="num-box">
-              <image class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
               <view style="margin: 0 25.33rpx;">{{item.num}}</view>
-              <image class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
diff --git a/utils/wxParse/wxParse.wxml b/utils/wxParse/wxParse.wxml
index 00fa568..df0c57a 100644
--- a/utils/wxParse/wxParse.wxml
+++ b/utils/wxParse/wxParse.wxml
@@ -18,7 +18,7 @@
 </template>
 
 <template name="wxParseImg">
-  <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;"
+  <image lazy-load class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;"
   />
 </template>
 
@@ -27,7 +27,7 @@
     <block wx:for="{{item.textArray}}" wx:key="">
       <block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block>
       <block wx:elif="{{item.node == 'element'}}">
-        <image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
+        <image lazy-load class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
       </block>
     </block>
   </view>

From a8f95026607eed5f7063635099c9f542c2e7b66c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 1 Sep 2025 16:56:53 +0800
Subject: [PATCH 397/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/index.js   | 257 +++++++++++++++++++++++++------------
 pages/pbService/index.wxml | 100 +--------------
 2 files changed, 181 insertions(+), 176 deletions(-)

diff --git a/pages/pbService/index.js b/pages/pbService/index.js
index 6da1e5b..bf04a97 100644
--- a/pages/pbService/index.js
+++ b/pages/pbService/index.js
@@ -8,105 +8,198 @@ Page({
    * 页面的初始数据
    */
   data: {
-    jsj: null
+    jsj: null,
+    // 交通助手
+    trafficHelper: [
+        {
+            title: "高峰预警",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png",
+            weburl: "https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=FQqP774V6H3PacOWYqJLykUBBywTAZEWMu9Nz9tzrOZUIf/Zto2OvXmirAi7/FSOkZg1uwNpcK0kdZgK0FjuzEZKYBjL/1RXp3XpQhxv9H91g9c737NfSxRcfYUHo2SGLX8kAlAiAbt72AoEfG++i+WTjbTo57sunVEzn/nF7n55StkcgfesDKjXOm+txOYbEc0tH32A5Mn",
+            // path: "/pages/pbService/sceneComfort/index?title=高峰预警"
+        },
+        {
+            title: "行李直送",
+            img: "https://static.ticket.sz-trip.com/uploads/20250115/1628737d70e74613fc12e9fdbd8c192f.png",
+            appId: 'wx757dd1ee184e75e9',
+            page: "pages/tabBar/index/index",
+        },
+        {
+            title: "行李寄存",
+            img: "https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png",
+            weburl: "https://weixin.2500sz.net/zt/2023/07/luggage_storage/"
+        },
+        {
+            title: "找厕所",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png",
+            path: "/pages/pbService/bike/index?type=1"
+        },
+        {
+            title: "Suzhou Tour",
+            img: "https://m.cloud.sz-trip.com/static/images/serve/isuzhou.png",
+            weburl: "https://traveltosuzhou.wglj.suzhou.gov.cn/"
+        },
+        {
+            title: "安全服务",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png",
+            path: "/pages/pbService/security/index"
+        },
+        // {
+        //     title: "体育场馆",
+        //     img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png",
+        //     path: "/pages/pbService/gym/index"
+        // },
+        {
+            title: "垃圾分类",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png",
+            appId: 'wx13be821f3b1afed3',
+            path: 'pages/home/home'
+        },
+        // {
+        //     title: "文化配送",
+        //     img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png",
+        //     path: "/pages/culture/index"
+        // },
+        {
+            title: "附近图书馆",
+            img: "https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png",
+            weburl: "https://www.szlib.com/szlibposition"
+        },
+        {
+            title: "12348",
+            img: "https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png",
+            appId: 'wxcdfd45c001466ba3',
+            path: 'pages/index/index'
+        },
+        {
+            title: "文化场馆查询",
+            img: "https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png",
+            weburl: "https://m.cloud.sz-trip.com/Museum"
+        },
+    ],
+    // 交通出行
+    transportation: [
+        // {
+        //     title: "实时公交",
+        //     img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png",
+        //     path: "/pages/pbService/bus/index"
+        // },
+        {
+            title: "停车场",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png",
+            weburl: "https://m.cloud.sz-trip.com/ParkingArea"
+        },
+        {
+            title: "公共自行车",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png",
+            path: "/pages/pbService/bike/index?type=0"
+        },
+        {
+            title: "接送机",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb18.png",
+            appId: "wxd4d86d58fcf658ff",
+            path: "/subpages/product/airport/index"
+        },
+        {
+            title: "P+R停车场",
+            img: "https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png",
+            path: "/pages/pbService/PRpark/index"
+        },
+        {
+            title: "实时路况",
+            img: "https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png",
+            weburl: "https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/"
+        },
+        {
+            title: "实时打车",
+            img: "https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png",
+            appId: 'wxbc0cf9b963bd3550',
+            page: "onlineCar/online_index/page/Home/Home?gd_from=taizhouwenlv"
+        },
+
+
+    ],
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+onLoad: function (options) {
     commonApi._post("pbservice/Other/getClientConfig", {
-      unique_key: "wechatxcx"
+        unique_key: "wechatxcx"
     }).then(res => {
-      let data = JSON.parse(res.data);
-      console.log(data)
-      this.setData({
+        let data = JSON.parse(res.data);
+        console.log(data)
+        this.setData({
         jsj: data.jiesongji
-      })
-      console.log(data)
+        })
+        console.log(data)
     })
-  },
-  gotoPath: function (e) {
-    if (e.currentTarget.dataset.event) {
-      util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+},
+mainIconClick: function(e) {
+    let item = e.currentTarget.dataset.item
+    console.log(item)
+    if (item.pagePoint) { 
+        this.newPagePoint(item.pagePoint) 
     }
-    if (e.currentTarget.dataset.title == '12348') {
-      wx.navigateToMiniProgram({
-        appId: 'wxcdfd45c001466ba3',
-        path: 'pages/index/index'
-      })
-      return;
+
+    if (item.appId) {
+        wx.navigateToMiniProgram({
+            appId: item.appId,
+            path: item.pagePath,
+        })
+        return
     }
-    wx.navigateTo({
-      url: e.currentTarget.dataset.path,
-    })
-    if (e.currentTarget.dataset.title) {
-      commonApi._post("browse/burying_point", {
-        uuid: app.globalData.uuid,
-        drive: "mini",
-        title: e.currentTarget.dataset.title
-      }).then(res => {
-
-      })
+    if (item.path) {
+        wx.navigateTo({
+            url: item.path
+        })
+        return
     }
-  },
-  jiesongji: function (e) {
-    if (!this.data.jsj) return;
-    if (e.currentTarget.dataset.event) {
-      util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+    if (item.weburl) {
+        wx.navigateTo({
+            url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.weburl)
+        })
+        return
     }
-    wx.navigateToMiniProgram({
-      appId: this.data.jsj, // 之前后台的appid    wx336dcaf6a1ecf632
-      page: "subpages/product/airport/index"
-    })
-    // wx.navigateToMiniProgram({
-    //   appId: this.data.jsj,
-    //   page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
-    // })
-  },
-  gaode: function (e) {
-    if (!this.data.jsj) return;
-    if (e.currentTarget.dataset.event) {
-      util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
-    }
-    wx.navigateToMiniProgram({
-      appId: 'wxbc0cf9b963bd3550',
-      page: "onlineCar/online_index/page/Home/Home?gd_from=taizhouwenlv"
+    
+},
+
+
+
+jiesongji: function (e) {
+if (!this.data.jsj) return;
+if (e.currentTarget.dataset.event) {
+    util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
+}
+wx.navigateToMiniProgram({
+    appId: this.data.jsj, // 之前后台的appid    wx336dcaf6a1ecf632
+    page: "subpages/product/airport/index"
+})
+// wx.navigateToMiniProgram({
+//   appId: this.data.jsj,
+//   page: "page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect"
+// })
+},
+
+
+gotoSku: function () {
+commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
+    app.globalData.weburl = res.data.url;
+    wx.navigateTo({
+    url: '/pages/pbService/web/index'
     })
-  },
-  xlzs: function (e) {
+    return;
+})
+},
 
-    wx.navigateToMiniProgram({
-      appId: 'wx757dd1ee184e75e9',
-      page: "pages/tabBar/index/index"
-    })
-  },
 
-  gotoUrl: function (e) {
-    if (e.currentTarget.dataset.event) {
-      util.pagePoint({ event: e.currentTarget.dataset.event }, 1)
-    }
-    let url = e.currentTarget.dataset.url;
-    app.globalData.weburl = url;
-    wx.navigateTo({
-			url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(url)
-		})
-  },
-  gotoSku: function () {
-    commonApi.user_post("pbservice/Ztfw/sukangCode").then(res => {
-      app.globalData.weburl = res.data.url;
-      wx.navigateTo({
-        url: '/pages/pbService/web/index'
-      })
-      return;
-    })
-  },
-  garbage: function () {
-    wx.navigateToMiniProgram({
-      appId: 'wx13be821f3b1afed3',
-      path: 'pages/home/home'
+newPagePoint (param) {
+    commonApi._post("browse/newBuryingPoint", {
+            uuid: app.globalData.uuid,
+            drive: "mini",
+            ...param,
     })
-  },
+},
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index a03d83e..d898c8a 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -9,108 +9,20 @@
       <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
-    <!-- data-path="/pages/pbService/sceneComfort/index?title=高峰预警" -->
-    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoUrl"
-   
-    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=FQqP774V6H3PacOWYqJLykUBBywTAZEWMu9Nz9tzrOZUIf/Zto2OvXmirAi7/FSOkZg1uwNpcK0kdZgK0FjuzEZKYBjL/1RXp3XpQhxv9H91g9c737NfSxRcfYUHo2SGLX8kAlAiAbt72AoEfG++i+WTjbTo57sunVEzn/nF7n55StkcgfesDKjXOm+txOYbEc0tH32A5Mn">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
-      <view>高峰预警</view>
+    <view wx:for="{{trafficHelper}}" bindtap="mainIconClick" data-item="{{item}}" wx:key="index" class="pb-item">
+      <image lazy-load src="{{item.img}}" mode="widthFix"></image>
+      <view>{{item.title}}</view>
     </view>
-    <view class="pb-item"  data-title="行李直送" bindtap="xlzs">
-	  <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250115/1628737d70e74613fc12e9fdbd8c192f.png" mode="widthFix"></image>
-	  <view>行李直送</view>
-	</view>
-    <view class="pb-item" bindtap="gotoUrl" data-event="xlqc" 
-    data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
-      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
-      <view>行李寄存</view>
-    </view>
-    <view class="pb-item" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath"
-      data-path="/pages/pbService/bike/index?type=1">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
-      <view>找厕所</view>
-    </view>
-    <view class="pb-item"  data-title="Suzhou Tour" bindtap="gotoUrl"
-        data-url="https://traveltosuzhou.wglj.suzhou.gov.cn/">
-      <image lazy-load src="https://m.cloud.sz-trip.com/static/images/serve/isuzhou.png" mode="widthFix"></image>
-      <view>Suzhou Tour</view>
-    </view>
-    <view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
-      data-path="/pages/pbService/security/index">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
-      <view>安全服务</view>
-    </view>
-    <!-- <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath"
-      data-path="/pages/pbService/gym/index">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png" mode="widthFix"></image>
-      <view>体育场馆</view>
-    </view> -->
-    <view class="pb-item" data-event="garbage_click" data-title="垃圾分类" bindtap="garbage">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
-      <view>垃圾分类</view>
-    </view>
-    <!-- <view class="pb-item" data-title="文化配送" bindtap="gotoPath" data-path="/pages/culture/index">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
-      <view>文化配送</view>
-    </view> -->
-     <view class="pb-item" data-title="附近图书馆" bindtap="gotoUrl" data-url="https://www.szlib.com/szlibposition">
-      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
-      <view>附近图书馆</view>
-    </view>
-    <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
-      class="pb-item">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
-      <view>12348</view>
-    </view>
-    <view bindtap="gotoUrl"  data-title="文化场馆查询" data-url="https://m.cloud.sz-trip.com/Museum" class="pb-item">
-      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png" mode="widthFix"></image>
-      <view>文化场馆查询</view>
-    </view>
-
-    
   </view>
 </view>
 <image lazy-load class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
   mode="widthFix"></image>
 <view class="pb-box">
-
-  <!-- <view class="pb-title">交通出行</view> -->
   <view class="pb-list">
-    <!-- <view class="pb-item" bindtap="gotoPath" data-path="/pages/pbService/bus/index">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
-      <view>实时公交</view>
-    </view> -->
-    <view class="pb-item" data-title="停车场" bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/ParkingArea">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
-      <view>停车场</view>
-    </view>
-    <!-- <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
-      data-path="/pages/pbService/bike/index?type=2">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
-      <view>停车场</view>
-    </view> -->
-    <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath"
-      data-path="/pages/pbService/bike/index?type=0">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>
-      <view>公共自行车</view>
-    </view>
-    <view class="pb-item" data-event="passport_click" data-title="接送机" bindtap="jiesongji">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb18.png" mode="widthFix"></image>
-      <view>接送机</view>
-    </view>
-    <view class="pb-item" data-event="prparking_click" data-title="P+R停车场" bindtap="gotoPath"
-      data-path="/pages/pbService/PRpark/index">
-      <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png" mode="widthFix"></image>
-      <view>P+R停车场</view>
-    </view>
-    <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pb-item">
-      <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
-      <view>实时路况</view>
+    <view wx:for="{{transportation}}" bindtap="mainIconClick" data-item="{{item}}" wx:key="index" class="pb-item">
+      <image lazy-load src="{{item.img}}" mode="widthFix"></image>
+      <view>{{item.title}}</view>
     </view>
-	<view class="pb-item" data-event="gaode_click" data-title="实时打车" bindtap="gaode">
-	  <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/gdImg.png" mode="widthFix"></image>
-	  <view>实时打车</view>
-	</view>
   </view>
 </view>
 <!-- <view class="pb-box">

From 3b35d7bd71bb8bc9da2bdbd37678532809d9aff6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 2 Sep 2025 14:21:06 +0800
Subject: [PATCH 398/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E3=80=81=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index b0071cc..3384f5b 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -224,7 +224,9 @@ Page({
     })
     // 获取评价列表
     commonApi._post("scene/get_comment", {
-      scene_id: options.id
+      scene_id: options.id,
+      offset:0,
+      limit:5,
     }).then(res => {
       res.data.list.map(item => {
         item.rate = Number(item.rate)
@@ -1080,14 +1082,15 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post('cart/get_list', {noLogin: true}).then(res => {
+    if (!wx.getStorageSync('jstrip_token')) {
+        return;
+    }
+    commonApi.user_post('cart/get_count', {noLogin: true}).then(res => {
       this.setData({
-        cartCount: res.data.length //1
+        cartCount: res.data //1
       })
     })
-    if (!wx.getStorageSync('jstrip_token')) {
-      return;
-    }
+    
     if (this.data.info && this.data.info.id) {
       this.drawImg()
       //// 获取补贴
@@ -1122,11 +1125,6 @@ Page({
       // }
       //// 获取补贴结束
 
-    } else {
-      console.log(2222);
-      setTimeout(() => {
-        // this.onShow()
-      }, 200)
     }
 
   },

From 8e5a112e4c02eb7d8570d5d21318e28fc638bea1 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 2 Sep 2025 14:40:05 +0800
Subject: [PATCH 399/471] =?UTF-8?q?=E5=88=86=E6=97=B6=E6=8B=99=E6=94=BF?=
 =?UTF-8?q?=E5=9B=AD7=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js   | 22 +++++++++++++++-------
 pages/info/sceneProductInfo/index.wxml |  4 ++--
 pages/order/scene/index.js             |  9 ++++++++-
 pages/order/scene/index.wxml           |  2 +-
 subPackages/gwcOrder/index.js          |  9 +++++++--
 subPackages/gwcOrder/index.wxml        |  2 +-
 utils/filter.wxs                       | 14 +++++++++++++-
 7 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 3384f5b..fe8ccb4 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -60,6 +60,8 @@ Page({
     
     skuShowIndex: 0,
     skuShowDomId: "",
+
+    skuDays: 30,
   },
 
   /**
@@ -98,6 +100,12 @@ Page({
         return;
       }
       res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+      // 拙政园分时7天
+      if(options.id == 5442) {
+          this.setData({skuDays: 7})
+      }
+
+
       // 如果是带有指定good_id的 那么取指定的
       if (options.gid) {
         let pItem = res.data.product.find(item => item.id == options.gid);
@@ -174,12 +182,12 @@ Page({
 
 
       // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
-      res.data.product.map(product => {
-        product.sku.map(sku => {
-          sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
-          sku.display_tags_str = sku.display_tags.join(' | ')
-        })
-      })
+    //   res.data.product.map(product => {
+    //     product.sku.map(sku => {
+    //       sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+    //       sku.display_tags_str = sku.display_tags.join(' | ')
+    //     })
+    //   })
       this.setData({
         info: res.data
       })
@@ -835,7 +843,7 @@ Page({
 
     if (ticket_type != 2) {
         let today = util.formatDate(new Date()), 
-        end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000));
+        end_date = util.formatDate(new Date(new Date().getTime() + this.data.skuDays * 24 * 60 * 60 * 1000));
         commonApi.user_post("product/product_date_price", {
             start_date: today,
             end_date: end_date,
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index dd8b99d..50826b8 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -71,7 +71,7 @@
                 <view class="product-left textOver">
                     <view class="product-tags">
                     <!-- <view class="product-tag textOver" wx:for="{{sku.display_tags}}">{{item}}</view> -->
-                    <view class="product-tag textOver" >{{sku.display_tags_str}}</view>
+                    <view class="product-tag textOver" >{{tool.filterTag(sku.display_tags,",",2,false)}}</view>
 
                     </view>
                     <view class="order-tip-text" bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
@@ -163,7 +163,7 @@
         <scroll-view class="mask-scroll-content" scroll-y scroll-into-view="{{skuShowDomId}}" scroll-with-animation>
             
             <date id="sku-show-0" wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
-            product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
+            product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{skuDays}}"></date>
 
             <view id="sku-show-1" class="orderNotice" wx:if="{{orderSku}}">
                 <view style="font-weight: 500;font-size: 15px;color: #000000;margin-bottom: 26rpx;">预订须知</view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 3cbd68f..2a00084 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -45,7 +45,9 @@ Page({
     showDate:false,
     showDate2:false,
     showYhq:null,
-    couponFlag:false
+    couponFlag:false,
+
+    skuDays: 30,
   },
 
   /**
@@ -102,6 +104,11 @@ Page({
         } catch(e) {}
         // app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | ");
     }
+    if (this.data.product.product.scene_id == 5442) {
+        this.setData({skuDays: 7})
+    }
+
+
     this.setData({
       product: app.globalData.product,
       singlePrice: app.globalData.product.date?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index aab8015..2fabf39 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -135,7 +135,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content2">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{30}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{skuDays}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{price}}</text>
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 485496a..54365f0 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -36,7 +36,9 @@ Page({
     is_authentication:1, // 是否实名，0否1是，默认实名
     phone:'', //不实名时传的手机号
     is_real_name:1, // 是否是一证一票，0否1是，
-    status:false
+    status:false,
+
+    skuDays: 30,
   },
 
   /**
@@ -74,7 +76,10 @@ Page({
 		this.setData({
 		  productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num
 		})
-  }
+    }
+    if (this.data.product.product.scene_id == 5442) {
+        this.setData({skuDays: 7})
+    }
     this.setData({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 2c27939..81db641 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -6,7 +6,7 @@
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
   <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
-    product="{{product}}"></date>
+    product="{{product}}" endDays="{{skuDays}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">
       <view style="flex-shrink:0">团体主体名称：</view>
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 6a3c348..2821b85 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -52,9 +52,21 @@ var showAllSeldDate = function (date, index,today,tomorrow,afterTom) {
 var toFix = function(value) {
       return (value / 100).toFixed(2);
 };
+  
+  var filterTag = function (tagStr, splitStr = "," ,arrNum = 2, needArr=false) {
+      if (!tagStr) return ''; // 处理空值
+      var arr = tagStr.split(splitStr); // 拆分字符串
+      var limited = arr.slice(0, arrNum); // 只取前2个
+      if (needArr) {
+          return limited
+      }
+      return limited.join(' | '); // 拼接成字符串
+  };
+  
 module.exports = {
   formateRichText:formateRichText,
   gotoUrl:gotoUrl,
   toFix:toFix,
-  showAllSeldDate:showAllSeldDate
+  showAllSeldDate:showAllSeldDate,
+  filterTag: filterTag
 };
\ No newline at end of file

From 59fc06a74b46c2b8ec79023ba75d55d3b5115dbd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 3 Sep 2025 16:49:09 +0800
Subject: [PATCH 400/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml |  6 +++---
 pages/index/index.wxss | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e2b2a47..6257faa 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -170,10 +170,10 @@
             <!-- 公共服务 -->
             <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
                 <image lazy-load class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
-                <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                    <view style="height: 40rpx;line-height: 40rpx;">更多 ></view>
+                <!-- <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
+                    <view style="height: 40rpx;line-height: 40rpx;">更多 ></view> -->
                     <!-- <image lazy-load style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
-                </navigator>
+                <!-- </navigator> -->
             </view>
             <view wx:if="{{func_data.service_public}}">
                 <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 018081a..8f9ea1c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -760,15 +760,16 @@
 
 
 .ggfw-list {
-  display: flex;
-  flex-wrap: wrap;
+  display: grid;
+  grid-template-columns: repeat(4, 166rpx);
+  row-gap: 23rpx;
   justify-content: space-between;
 }
 
 .ggfw-list .ggfw {
-  width: 220rpx;
-  height: 106.67rpx;
-  margin-bottom: 20rpx;
+  width: 166rpx;
+  height: 133rpx;
+  /* margin-bottom: 23rpx; */
 }
 .ggfw image{
   width: 100%;

From 72b14d6c7f4ed9d43e2b423469e13b3d03f69134 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 3 Sep 2025 16:53:16 +0800
Subject: [PATCH 401/471] =?UTF-8?q?=E6=99=AF=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=81=E7=89=B9=E4=BA=A7=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js        | 11 ++++++++---
 pages/user/order/sceneOrderInfo/index.js   |  4 +++-
 pages/user/order/sceneOrderInfo/index.wxml |  2 +-
 pages/user/order/sceneOrderInfo/index.wxss |  1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index f320a6e..5627b5c 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -756,11 +756,16 @@ Page({
                 })
                 this.drawImg()
             })
-            commonApi.user_post('cart/get_list', {}).then(res => {
+            // commonApi.user_post('cart/get_list', {}).then(res => {
+            //     this.setData({
+            //         cartCount: res.data.length
+            //     })
+            // })
+            commonApi.user_post('cart/get_count', {noLogin: true}).then(res => {
                 this.setData({
-                    cartCount: res.data.length
+                  cartCount: res.data //1
                 })
-            })
+              })
         } else {
             setTimeout(() => {
                 this.onShow()
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index f65c46d..bb8e872 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -108,7 +108,8 @@ Page({
     console.log(this.data.codeImgs);
   },
   prevCodeImg:function(){
-    let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
+    let qrcode=this.data.codeImgs,codeIndex = this.data.codeIndex;
+    console.log(codeIndex)
     if(codeIndex==0){
       this.setData({
         codeIndex:qrcode.length-1
@@ -119,6 +120,7 @@ Page({
         codeIndex:codeIndex-1
       })
     }
+    console.log(codeIndex)
   },
   nextCodeImg:function(){
     console.log(this.data.codeImgs);
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 015e2df..a1976d8 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -17,7 +17,7 @@
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
-    <image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
+    <image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;height: 300rpx;"></image>
     <!-- 代表核销后是否继续展示二维码（0否1是） -->
     <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
       <view class="text-shadow-state">
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 69d4dcd..4a04db4 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -210,6 +210,7 @@ page {
   left: 40rpx;
   text-align: center;
   margin-top: 125rpx;
+  z-index: 5;
 }
 .code-box .iconfont.icon-you {
   left: auto;

From 9e3237f4169a7cd7f0937ee2f2b150606248b3fb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 3 Sep 2025 17:29:19 +0800
Subject: [PATCH 402/471] 1

---
 app.js               | 2 +-
 pages/index/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index d1c771c..ae5e570 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest127? true : false;
+            data.isTest = data.isTest128? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 34ff738..6ce436f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -518,7 +518,7 @@ Page({
             })
         } else {
             // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+            commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image

From 7c9e2e60c2a96341ebc8f9f6d9a0de4c696281de Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 09:25:29 +0800
Subject: [PATCH 403/471] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E3=80=81=E5=9B=BE=E6=B8=B8=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 |  2 +-
 pages/index/index.js   | 12 +++++++++++-
 pages/index/index.wxml |  6 +++---
 pages/map/index.wxml   | 10 +++++++---
 pages/map/index.wxss   |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index ae5e570..6573851 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest128? true : false;
+            data.isTest = data.isTest129? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 6ce436f..4ac7827 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -410,6 +410,7 @@ Page({
 		hotIndex: 0,
 		indexHot: [],
         weather: null,
+        showMore: false,
         
         // 页面图片
         // imageSourceList:imageSource,
@@ -462,6 +463,7 @@ Page({
         })
         
         this.getUrlToPage()
+        this.getShowMore()
     },
     
     showImg (img) {
@@ -518,7 +520,7 @@ Page({
             })
         } else {
             // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
@@ -588,6 +590,14 @@ Page({
 		})
     },
 
+    getShowMore () {
+        commonApi._post("multimedia/detail", {id: 2462}).then(res => {
+            this.setData({
+                showMore: res.data.company_name ==1?true:false
+            })
+        })
+    },
+
 
 
     // --------------------banner 相关---------------------------
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 6257faa..7cd195b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -170,10 +170,10 @@
             <!-- 公共服务 -->
             <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
                 <image lazy-load class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
-                <!-- <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
-                    <view style="height: 40rpx;line-height: 40rpx;">更多 ></view> -->
+                <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more" wx:if="{{showMore}}">
+                    <view style="height: 40rpx;line-height: 40rpx;">更多 ></view>
                     <!-- <image lazy-load style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
-                <!-- </navigator> -->
+                </navigator>
             </view>
             <view wx:if="{{func_data.service_public}}">
                 <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 50707e7..1f467da 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -28,9 +28,13 @@
       <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
     </view>
-    <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+    <!-- <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
       <image lazy-load class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
       <text class="text">公共自行车</text>
+    </view> -->
+    <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
+      <image lazy-load class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
+      <text class="text">运河十景</text>
     </view>
   </view>
 </view>
@@ -71,10 +75,10 @@
       <image lazy-load class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
       <text class="text">美食</text>
     </view>
-    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+    <!-- <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
       <image lazy-load class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
       <text class="text">公共自行车</text>
-    </view>
+    </view> -->
     <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
       <image lazy-load class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
       <text class="text">运河十景</text>
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 7c6d54b..9faef2f 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -583,7 +583,7 @@
   display: flex;
   /* justify-content: space-around; */
   flex-wrap: wrap;
-  width: calc(170rpx * 8);
+  width: calc(170rpx * 7);
   margin: 0 20rpx;
 }
 

From 5f504615a986054ad6a6cd8fbf896760b7155167 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 14:02:53 +0800
Subject: [PATCH 404/471] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E8=B7=B3=E5=8C=BA?=
 =?UTF-8?q?=E5=8E=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/proRec/proRec.js          |  8 ++
 pages/user/order/postOrderInfo/index.wxml | 23 +++---
 utils/util.js                             | 98 +++++++++++++++++++++++
 3 files changed, 119 insertions(+), 10 deletions(-)

diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index 0150cb1..854cc8b 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -102,6 +102,14 @@ Component({
           type: item.type
         }
       }, 1)
+
+      // if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
+      //   util.goProdInOtherPlatform(item)
+      //   return
+      // } 
+
+
+
       if (item.type == 'travels') {
         // 游记做特殊处理 其他都按照原来的来
         wx.navigateTo({
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 6f0664f..e7e887a 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -93,18 +93,21 @@
             
             <!-- 一次性发货 -->
             <view wx:elif="{{item.post_detail_list.length>=1}}">
-                <view class="detail-item post-line-info">
-                    <text>快递公司：{{item.post_detail_list[0].express_name}}</text>
-                </view>
-                <view class="detail-item post-line-info">
-                    <text>快递单号：</text>
-                    <view style="flex:1;width: 1rpx;">
-                        {{item.post_detail_list[0].courier_number}} <text data-num="{{item.post_detail_list[0].courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                <view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
+                    <view class="detail-item post-line-info">
+                        <text>快递公司：{{shipment.express_name}}</text>
+                    </view>
+                    <view class="detail-item post-line-info">
+                        <text>快递单号：</text>
+                        <view style="flex:1;width: 1rpx;">
+                            {{shipment.courier_number}} <text data-num="{{shipment.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                        </view>
+                    </view>
+                    <view class="detail-item post-line-info">
+                        <text>发货时间：{{shipment.post_time}} </text>
                     </view>
                 </view>
-                <view class="detail-item post-line-info">
-                    <text>发货时间：{{item.post_detail_list[0].post_time}} </text>
-                </view>
+                
             </view>
         </view>
 
diff --git a/utils/util.js b/utils/util.js
index 1609034..916616f 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -635,6 +635,103 @@ const orderByShoppingCart = function (listData, app) {
 }
 
 
+// 产品跳转其他小程序
+const goProdInOtherPlatform = function (item) {
+    let webUrl = "https://m.cloud.sz-trip.com"
+    let platform = item.goods_jump_type;
+    console.log(item)
+
+    let appIdObj = {
+        "changshu": "wxdaf3d5edd07dc7af",
+        "yjks": "wx8888a3fd0862b4c8"
+    }
+
+    switch (item.type) {
+        case 'ticket': // 是产品的 票务
+            webUrl+= `/${platform==='yjks' ? 'ScenicDetailKs' : 'ScenicDetail'}?id=${item.scene_id || item.id}`
+            break;
+        case 'hotel': // 是产品的 酒店
+            webUrl+= `/HotelDetail?id=${item.scene_id || item.id}`
+            break;
+        case 'post':  // 是产品的 邮寄
+            webUrl+= `/${platform==='yjks'? 'MailMerchandiseDetailKs' : 'MailMerchandiseDetail'}?id=${item.id}`
+            break;
+        case 'line':  // 是产品的 线路
+            webUrl+= `/LineDetail?id=${item.id}`
+            break;
+        case 'coupon':  // 是产品的 卡券
+            webUrl+= `/CardDetail?id=${item.id}`
+            break;
+        case 'show':  // 是产品的 演出
+            webUrl+= `/PerformDetail?id=${item.id}`
+            break;
+        case 'food':  // 是产品的 食品
+            webUrl+= `/FoodDetail?id=${item.id}`
+            break;
+        case 'activity':  // 是产品的 活动 todo 这里要弄成是活动的id去跳转的，特别是从 江苏夜游过去的
+            webUrl+= `/ActivityDetail?id=${item.act_calendar_id || item.id}`
+            break;
+        case 'calendar':  // ai入口活动日历
+            webUrl+= `/AppointmentDetail?id=${item.id}`
+            break;
+        case 'movie':  // 是产品的 电影
+            webUrl+= `/MovieInfo?id=${item.third_id || item.id}`
+            break;
+        case 'scenic': // 是场景的 景点
+            webUrl+= `/${platform===0? 'ScenicDetailKs' : 'ScenicDetail'}?id=${item.scene_id || item.id}`
+            break;
+        case 'room': // 是场景的 酒店
+            webUrl+= `/HotelDetail?id=${item.scene_id || item.id}`
+            break;
+        case 'restaurant': // 是场景 美食
+            webUrl+= `/RestaurantDetail?id=${item.id}`
+            break;
+        case 'tenscenic': // 是场景 十景
+            webUrl+= `/TenScenicDetail?id=${item.id}`
+            break;
+        case 'venue':  // 是场景的 场馆
+            webUrl+= `/PavilionDetail?id=${item.scene_id || item.id}`
+            break;
+        case 'cinema':  // 是场景的 影院
+            webUrl+= `/CinemaDetail?id=${item.third_id || item.id}`
+            break;
+        case 'relic':  // 文物
+            webUrl+= `/ProtectionUnitsInfo?id=${item.id}`
+            break;
+        case 'units':  // 文化单位
+            webUrl+= `/CulturalUnitInfo?id=${item.id}`
+            break;
+        case 'red_map':  // 红色地图
+            webUrl+= `/RedTouristInfo?id=${item.id}`
+            break;
+        case 'travels':  // 红色地图
+            webUrl+= `/TravelNotesIntroductionInfo?id=${item.id}`
+            break;
+    }
+    console.log(appIdObj[platform],webUrl)
+
+
+    // 酒景套餐
+    if(item.is_package == 1) {
+        webUrl+= `/${platform==='yjks' ? 'MailMerchandiseDetailKs' : 'MailMerchandiseDetail'}?id=${item.id}`
+    }
+
+    // 一卡游详情
+    if(item.is_package == 2) {
+        webUrl+= `/OneCardTourDetail?id=${item.scene_id || item.id}`
+    }
+
+
+    wx.navigateToMiniProgram({
+      appId: appIdObj[platform],
+      path: "/subPackages/webPage/webPage?url="+encodeURIComponent(webUrl),
+    })
+
+
+    // return webUrl;
+}
+
+
 module.exports = {
   formatTime: formatTime,
   formatNumber: formatNumber,
@@ -660,4 +757,5 @@ module.exports = {
   clearGlobalPagePoint: clearGlobalPagePoint,
   detailPagePoint: detailPagePoint,
   orderByShoppingCart: orderByShoppingCart,
+  goProdInOtherPlatform: goProdInOtherPlatform,
 }

From f2b9dc3f4ae34d85aac590fcfb2984be0b7ccdcd Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 14:03:42 +0800
Subject: [PATCH 405/471] 1

---
 pages/order/payresult/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index 79d9fee..6021b75 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -47,6 +47,7 @@ Page({
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
+    // todo 区县跳转
     util.gotoDetail(item)
   },
   gotoOrderList:function(){

From 1df148a6f5158e2abe56b878323618e85e93ea57 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 14:33:49 +0800
Subject: [PATCH 406/471] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=89=A9=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.wxml | 9 +++++----
 pages/order/payresult/index.js         | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 50826b8..c4700a7 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -65,7 +65,9 @@
                 <text>{{item.title}}</text>
             </view>
 
-            <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI">
+            <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI" 
+                bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}" data-index="0"
+                data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" >
                 <view class="skutitle">{{sku.sku_name}}</view>
                 <view class="product-box">
                 <view class="product-left textOver">
@@ -74,7 +76,7 @@
                     <view class="product-tag textOver" >{{tool.filterTag(sku.display_tags,",",2,false)}}</view>
 
                     </view>
-                    <view class="order-tip-text" bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
+                    <view class="order-tip-text" capture-bind:tap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
                     data-index="1"
                     data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}">ⓘ预订须知></view>
                 </view>
@@ -85,8 +87,7 @@
                         <!-- <text wx:if="{{sku.is_merged}}">起</text> -->
                     </view>
                     <!-- showOrder    selectDate  -->
-                    <view bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
-                    data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" data-index="0"
+                    <view  data-sku="{{sku}}" data-product="{{item}}"
                     class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">预订</view>
                 </view>
                 </view>
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index 6021b75..2bcc30e 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -48,6 +48,12 @@ Page({
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
     // todo 区县跳转
+    // if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
+      //   util.goProdInOtherPlatform(item)
+      //   return
+      // } 
+
+
     util.gotoDetail(item)
   },
   gotoOrderList:function(){

From 6bfd9a3501caa5093a5ff7a8170bd56d0b794bd7 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 15:21:48 +0800
Subject: [PATCH 407/471] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.wxml |  7 ++++---
 pages/info/sceneProductInfo/index.wxss |  6 ------
 pages/order/components/date/index.js   | 11 +++++++++--
 pages/order/components/date/index.wxml |  3 ++-
 pages/order/components/date/index.wxss | 14 ++++++++++++++
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index c4700a7..4090021 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -66,7 +66,7 @@
             </view>
 
             <view class="product-item" wx:for="{{item.sku}}" wx:for-item="sku" wx:for-index="itemI" 
-                bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}" data-index="0"
+                bindtap="selectDate" data-sku="{{sku}}" data-product="{{item}}" data-index="1"
                 data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" >
                 <view class="skutitle">{{sku.sku_name}}</view>
                 <view class="product-box">
@@ -76,7 +76,7 @@
                     <view class="product-tag textOver" >{{tool.filterTag(sku.display_tags,",",2,false)}}</view>
 
                     </view>
-                    <view class="order-tip-text" capture-bind:tap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
+                    <view class="order-tip-text" catchtap="selectDate" data-sku="{{sku}}" data-product="{{item}}"
                     data-index="1"
                     data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}">ⓘ预订须知></view>
                 </view>
@@ -87,7 +87,8 @@
                         <!-- <text wx:if="{{sku.is_merged}}">起</text> -->
                     </view>
                     <!-- showOrder    selectDate  -->
-                    <view  data-sku="{{sku}}" data-product="{{item}}"
+                    <view  data-sku="{{sku}}" data-product="{{item}}" catchtap="selectDate" 
+                    data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" data-index="0"
                     class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">预订</view>
                 </view>
                 </view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index 39bb9fd..99fd590 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -1065,12 +1065,6 @@ line-height: 93rpx;
     font-size: 37rpx;
     color: #000000;
 }
-
-.mask-content1 .date-box>view:nth-of-type(2){
-    border: none !important;
-    padding-top: 10rpx !important;
-    height: auto !important;
-}
 .mask-scroll-content{
     flex: 1;
     height: 100rpx;
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 4c17eb6..c6f7149 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -51,16 +51,23 @@ Component({
     afterTom:util.formatHou(new Date()),
     skuName:'',
     monthList:[],
-    scrollLeft: 0
+    scrollLeft: 0,
+    refundTag: "",
   },
   lifetimes: {
     attached: function () {
       console.log(app.globalData.product);
       let skuName = app.globalData.product.sku.sku_name
+      let refundTag = "";
+      if (app.globalData.product&&app.globalData.product.sku&&app.globalData.product.sku.sku_model) {
+        if(app.globalData.product.sku.sku_model.is_auto_refund == 1) refundTag = "过期自动退";
+        if(app.globalData.product.sku.sku_model.is_auto_refund == 2) refundTag = "过期自动核销";
+      }
       this.setData({
         kjIdCom: app.globalData.kjId,
         gpIdCom: app.globalData.gp_id || app.globalData.team_id,
-        skuName
+        skuName,
+        refundTag: refundTag
       })
       // 在组件实例进入页面节点树时执行
       let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + this.properties.endDays * 24 * 60 * 60 * 1000));
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index 2e274ec..79ec513 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -23,7 +23,8 @@
 </view> -->
 <view class="date-box">
   <view class="box-title">{{skuName}}</view>
-  <view style="border-top: 1rpx solid #ccc;padding: 48rpx 0 0 21rpx;">
+  <view class="refund-tag" wx:if="{{refundTag}}">{{refundTag}}</view>
+  <view style="padding: 48rpx 0 0 21rpx;">
     <view style="font-weight: 500;font-size: 31rpx;color: #000000;margin-bottom: 40rpx;">
       使用日期
     </view>
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index b954718..4c5d8e8 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -128,4 +128,18 @@
   font-weight: 500;
   font-size: 27rpx;
   color: #000000;
+}
+.refund-tag{
+    margin-left: 20rpx;
+    background: rgba(241, 34, 34, 0.1);
+    border-radius: 7rpx;
+    height: 37rpx;
+    line-height: 37rpx;
+    padding: 0 10rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #F12222;
+    width: fit-content;
+
+
 }
\ No newline at end of file

From aaedb96de85dee84a13eb021bb9aad3b7963f515 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 15:30:44 +0800
Subject: [PATCH 408/471] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/scene/index.wxml | 5 ++++-
 pages/order/scene/index.wxss | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 2fabf39..c18c03f 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -135,7 +135,10 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content2">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{skuDays}}"></date>
+      <view>
+        <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{skuDays}}"></date>
+        <view style="width: 100%;height: 133rpx;"></view>
+      </view>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{price}}</text>
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index 649d9ab..c3e18f0 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -409,7 +409,7 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  position: absolute;
+  position: fixed;
     left: 0;
     right: 0;
     bottom: 0;

From dd7dc9ddb33012a5cfd6b379f5eee5a7d55109e9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Sep 2025 16:46:13 +0800
Subject: [PATCH 409/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 6573851..caeee4c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest129? true : false;
+            data.isTest = data.isTest131? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From ee929f7d77a1c7340bdaf5ca657a379654417a91 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Sep 2025 11:47:39 +0800
Subject: [PATCH 410/471] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/proRec/proRec.js | 8 ++++----
 pages/info/roadInfo/index.js     | 1 -
 pages/order/payresult/index.js   | 8 ++++----
 project.private.config.json      | 7 +++++++
 utils/https.js                   | 4 ++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index 854cc8b..ebe399b 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -103,10 +103,10 @@ Component({
         }
       }, 1)
 
-      // if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
-      //   util.goProdInOtherPlatform(item)
-      //   return
-      // } 
+      if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
+        util.goProdInOtherPlatform(item)
+        return
+      } 
 
 
 
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 1fab188..35a79f9 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -165,7 +165,6 @@ Page({
     order: function () {
         // todo 判断组合产品
         // if (this.data.info.is_compose == 1) {
-        // if (true) {
         //     // 打开规格弹窗
         //     this.setData({skuFlag: true})
         //     return
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index 2bcc30e..642090c 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -48,10 +48,10 @@ Page({
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
     // todo 区县跳转
-    // if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
-      //   util.goProdInOtherPlatform(item)
-      //   return
-      // } 
+    if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") {
+        util.goProdInOtherPlatform(item)
+        return
+    } 
 
 
     util.gotoDetail(item)
diff --git a/project.private.config.json b/project.private.config.json
index 5822978..17493bb 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=457643",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/order/pay/index",
           "pathName": "pages/order/pay/index",
diff --git a/utils/https.js b/utils/https.js
index ac1e739..c120ad9 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 817b4b6e2541bf16adbcb93ee8147154a15d12d3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Sep 2025 11:48:10 +0800
Subject: [PATCH 411/471] des

---
 pages/info/roadInfo/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 3e90786..58d358d 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -164,8 +164,7 @@ Page({
     },
     order: function () {
         // todo 判断组合产品
-        // if (this.data.info.is_compose == 1) {
-        if (true) {
+        if (this.data.info.is_compose == 1) {
             // 打开规格弹窗
             this.setData({skuFlag: true})
             return

From 0eaf61eb4d1cb54fd9bb19c231759ea432c07d32 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Sep 2025 17:34:35 +0800
Subject: [PATCH 412/471] des

---
 pages/info/roadInfo/index.js  |  7 +++++--
 project.private.config.json   | 11 +++++++++--
 subPackages/gwcOrder/index.js |  5 +++--
 utils/https.js                |  4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 58d358d..3c312d6 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -211,9 +211,9 @@ Page({
 
     // 组合产品获取购买的sku
     getComposeSku () {
+        let skuId = this.data.info.sku[this.data.skuIndex].id
         commonApi.user_post("product/get_sku_compose_list", {
-            // sku_id: "190720"
-            sku_id: "190740"
+            sku_id: skuId
         }).then(res => {
             if (res&&Array.isArray(res.data)&&res.data.length>0) {
                 res.data.forEach(v => {
@@ -221,6 +221,9 @@ Page({
                     v.num = this.data.producNum;
                     v.sku.compose_sku_id = v.compose_sku_id
                 });
+                app.globalData.list = []
+                app.globalData.postProduct = []
+                app.globalData.product = null
                 util.orderByShoppingCart(res.data,app)
             }
         })
diff --git a/project.private.config.json b/project.private.config.json
index 92c79b1..6ee0549 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -5,11 +5,18 @@
   },
   "condition": {
     "miniprogram": {
-      "list": [       
+      "list": [
+        {
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=457643",
+          "scene": null,
+          "launchMode": "default"
+        }
       ]
     }
   },
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "libVersion": "development"
+  "libVersion": "3.9.3"
 }
\ No newline at end of file
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index aea92d8..6d4ea30 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -321,8 +321,9 @@ Page({
     commonApi._post("product/get_sku_detail_id", {
         sku_id: sku_id
     }).then(res => {
-        this.data.product.sku = res.data
-        app.globalData.product.sku = res.data
+        let skuInfo = {...this.data.product.sku, ...res.data, is_compose: this.data.product.sku.is_compose || 0}
+        this.data.product.sku = skuInfo
+        app.globalData.product.sku = skuInfo
         this.setData({
             singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
             product: this.data.product
diff --git a/utils/https.js b/utils/https.js
index c120ad9..ac1e739 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From c14c04dcb4a8a01bf80bbc2cf7e4953637db5fb7 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Sep 2025 09:11:23 +0800
Subject: [PATCH 413/471] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/component/proRec/proRec.js | 2 +-
 utils/https.js                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index caeee4c..3470599 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest131? true : false;
+            data.isTest = data.isTest132? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index ebe399b..e76f3c7 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -33,7 +33,7 @@ Component({
     'ids': function(newVal,oldVal){
       console.log('newVal--------',newVal)
       console.log('oldVal--------',oldVal)
-      if (newVal) {
+      if (newVal && this.data.tjList.length<=0) {
         this.getTj(newVal)
       }
     }
diff --git a/utils/https.js b/utils/https.js
index c120ad9..ac1e739 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From c222561c83b1d315bf5086f91a439c7d353bebdc Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Sep 2025 15:45:20 +0800
Subject: [PATCH 414/471] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/sceneOrderInfo/index.wxml | 2 +-
 pages/user/order/sceneOrderInfo/index.wxss | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index a1976d8..40c9dd0 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -26,7 +26,7 @@
     </view>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
-  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}  <view class="copy-box" bindtap="copy">复制</view></view>
+  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}  <view class="copy-box" data-num="{{codeImgs[codeIndex].code}}" bindtap="copy">复制</view></view>
   <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
 </view>
 
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 4a04db4..5aabe9b 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -198,7 +198,7 @@ page {
 }
 .code-box {
   text-align: center;
-  height: 440rpx;
+  min-height: 440rpx;
   position: relative;
 }
 .code-box .iconfont {
@@ -330,7 +330,8 @@ page {
 	text-align: center;
 	font-weight: 500;
 	font-size: 23rpx;
-	color: #0E8790;
+    color: #0E8790;
+    height: 40rpx;
 }
 
 .goods-line{

From 3b07021b16c83b0823c19dd3b3fd92e5d5cc41f3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Sep 2025 15:51:54 +0800
Subject: [PATCH 415/471] lazy-load

---
 pages/info/postProductInfo/index.wxml  | 54 +++++++++++++-------------
 pages/info/sceneProductInfo/index.wxml | 34 ++++++++--------
 project.private.config.json            |  2 +-
 utils/https.js                         |  4 +-
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7397ce9..12507d8 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,7 +2,7 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="share-icon" bindtap="share"></view>
-<image wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
+<image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
     interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
@@ -11,17 +11,17 @@
         <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" ></video>
-        <!-- <image src="{{info.headimg}}" mode="aspectFill"></image> -->
+        <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
         </swiper-item>
     </block>
     <block wx:for="{{info.listimg}}" wx:key="*this">
         <swiper-item>
-        <image src="{{item}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item}}" mode="aspectFill"></image>
         </swiper-item>
     </block>
     <block wx:for="{{info.sku}}" wx:key="*this">
         <swiper-item style="position: relative;">
-        <image src="{{item.headimg}}" mode="aspectFill"></image>
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="sku-tips ">
             <view class="textOver">{{item.sku_name}}</view>
         </view>
@@ -56,11 +56,11 @@
         </view>
         <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
             <view class="select-img">
-                <image class="{{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}" 
+                <image lazy-load class="{{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}" 
                 style="flex-shrink: 0;" src="{{info.headimg}}" bind:tap="changeSwiperCurrent" data-index="{{0}}"></image>
                 <text style="flex-shrink: 0;" class="select-img-text">款式选择</text>
                 <view class="other-imgs no-scrollbar">
-                    <image wx:for="{{info.sku}}" wx:key="index" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.max+1+index}}"
+                    <image lazy-load wx:for="{{info.sku}}" wx:key="index" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.max+1+index}}"
                     class="{{swiperCurrent==swiperRange.picture.max+1+index?'active':''}}"
                     src="{{item.headimg}}"></image>
                 </view>
@@ -76,7 +76,7 @@
             <view class="other-info-box" wx:if="{{info.is_package!=1}}">
                 <view class="other-info-item" style="align-items: flex-start;"bindtap="changeSimpleVal" 
                 data-keyname="otherInfoShow" data-val="{{1}}" wx:if="{{info.shipment_tag}}">
-                    <image style="margin-top: 6rpx;" src="https://static.ticket.sz-trip.com/uploads/20250826/c520e7e453443bfe19e27ea0e44e6b22.png"></image>
+                    <image lazy-load style="margin-top: 6rpx;" src="https://static.ticket.sz-trip.com/uploads/20250826/c520e7e453443bfe19e27ea0e44e6b22.png"></image>
                     <view class="other-content" >
                         <view class="textOver" style="color: #0B898E;">{{info.shipment_tag_arr[0]}}</view>
                         <view class="textOver" style="padding-top: 10rpx;">{{info.shipment_tag_str}}</view>
@@ -85,13 +85,13 @@
                 </view>
                 <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{2}}" 
                     wx:if="{{info.service_tag_str}}">
-                    <image src="https://static.ticket.sz-trip.com/uploads/20250826/30fc41c747c0126edd396ef92ff7ef62.png"></image>
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250826/30fc41c747c0126edd396ef92ff7ef62.png"></image>
                     <view  class="other-content textOver">{{info.service_tag_str}}</view>
                     <view  class="view-arrow">></view>
                 </view>
                 <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{3}}"
                     wx:if="{{info.parameter_tag_str}}">
-                    <image src="https://static.ticket.sz-trip.com/uploads/20250826/049b31024ee73e76f9612e8d8141bd66.png"></image>
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250826/049b31024ee73e76f9612e8d8141bd66.png"></image>
                     <view class="other-content textOver">{{info.parameter_tag_str}}</view>
                     <view  class="view-arrow">></view>
                 </view>
@@ -126,7 +126,7 @@
                     
                 </view>
                 <view style="text-align: center;">
-                    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/navigation.png"></image>
+                    <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/navigation.png"></image>
                     <view style="padding-top: 14rpx;">去这里</view>
                 </view>
             </view>
@@ -153,8 +153,8 @@
     <view style="width: 100%;padding: 0 26rpx;box-sizing: border-box;">
     <navigator wx:for="{{comment}}" wx:key="index" wx:for-index="index" url="/pages/list/comments/index?productid={{id}}&&index={{index}}" class="product-comment">
         <view class="product-comment-top">
-            <image class="avator-img" src="{{item.user.avatar}}" mode="aspectFill"></image>
-            <!-- <image class="avator-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/commentUser.png" mode="aspectFill"></image> -->
+            <image lazy-load class="avator-img" src="{{item.user.avatar}}" mode="aspectFill"></image>
+            <!-- <image lazy-load class="avator-img" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/commentUser.png" mode="aspectFill"></image> -->
             <view class="comment-container">
                 <view class="comment-info">
                     <view class="nickname" style="padding-right:20rpx ;">{{item.nickname}}</view>
@@ -164,9 +164,9 @@
                 <view class="comment-content textOver2">{{item.content}}</view>
             </view>
             <view class="img-box" wx:if="{{item.img_list.length>0}}">
-                <image class="imgs" data-item="{{item}}" mode="aspectFill" src="{{item.img_list[0]}}" catch:tap="viewImg"></image>
+                <image lazy-load class="imgs" data-item="{{item}}" mode="aspectFill" src="{{item.img_list[0]}}" catch:tap="viewImg"></image>
                 <!-- <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
-                    <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc"></image>
+                    <image lazy-load wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc"></image>
                     <view class="all" wx:if="{{index==5}}">
                     <view>共{{item.img_list.length}}张</view>
                     <view>查看全部</view>
@@ -186,7 +186,7 @@
 </view>
 
 <view class="shop-container" wx:if="{{iShop}}">
-    <image class="shop-img" src="{{info.supplier_headimg}}" mode="aspectFill"></image>
+    <image lazy-load class="shop-img" src="{{info.supplier_headimg}}" mode="aspectFill"></image>
     <view class="textOver2">{{info.supplier_name}}</view>
     <navigator class="shop-btn" url="/pages/list/store/index?id={{supplierId}}">进店</navigator>
 </view>
@@ -215,13 +215,13 @@
 
     <view class="info-box" id="box4" style="padding: 20rpx 26rpx;">
     <!-- <view class="proad-title">
-        <image mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
+        <image lazy-load mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20221027/93dd0ad8fade0ad845e6b67512b4e61b.png"></image>
     </view> -->
     <view class="info-title">产品推荐</view>
     <view class="pro-list">
         <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
         <view class="item-hd">
-        <image src="{{item.headimg}}"></image>
+        <image lazy-load src="{{item.headimg}}"></image>
         </view>
         <view class="item-bm" style="height: 120rpx;display: flex;flex-direction: column;justify-content: space-between;">
             <view class="protitle textOver2">{{item.title}}</view>
@@ -238,7 +238,7 @@
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
   <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
   <view class="shop-box">
-    <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
+    <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
     <view>店铺</view>
   </view>
   </navigator>
@@ -261,7 +261,7 @@
 </view>
 <!-- 购物车悬浮框 -->
 <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-  <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
 </navigator>
 <view class="mask" wx:if="{{skuFlag}}">
@@ -269,7 +269,7 @@
   <view class="mask-content">
     <view class="iconfont icon-close" bindtap="hideSku"></view>
     <view class="sku-info-box">
-      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
       <view class="sku-info">
         <view>
             <view class="sku-price">{{info.sku[skuIndex].price/100}}
@@ -292,7 +292,7 @@
     <view class="sku-names">
       <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item {{index==skuIndex?' active':''}}" 
       wx:for="{{info.sku}}">
-        <image src="{{item.headimg}}"></image>
+        <image lazy-load src="{{item.headimg}}"></image>
         <view class="sku-name textOver">{{item.sku_name}}</view>
       </view>
     </view>
@@ -314,23 +314,23 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index ee83019..6975956 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -2,7 +2,7 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="{{isBook?'产品详情':'景点详情'}}"></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<image wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
+<image lazy-load wx:for="{{info.product}}" style="{{aniSkuIndex==index?('top:689px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{item.headimg}}" mode="aspectFill"></image>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{false}}" interval="{{2000}}" duration="{{300}}">
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
@@ -13,7 +13,7 @@
     </block>
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
-      <image src="{{item}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
 </swiper>
@@ -29,7 +29,7 @@
         <view class="sub-info-address textOver">{{info.open_time}}</view>
     </view>
     <view class="iconfont">
-        <image src="https://static.ticket.sz-trip.com/uploads/20250808/b64e49752fc3e0831db700331db766dd.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250808/b64e49752fc3e0831db700331db766dd.png"></image>
         <view>详情</view>
     </view>
   </view>
@@ -39,7 +39,7 @@
         <view class="sub-info-address textOver">{{info.address}}</view>
     </view>
     <view class="iconfont">
-        <image src="https://static.ticket.sz-trip.com/uploads/20250808/0faddf87d40d7bd782a6aab047f2046e.png"></image>
+        <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250808/0faddf87d40d7bd782a6aab047f2046e.png"></image>
         <view>导航</view>
     </view>
     
@@ -122,7 +122,7 @@
   </view>
   <!-- 购物车悬浮框 -->
   <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+    <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
     <view class="cart-num">{{cartCount}}</view>
   </navigator>
   <!-- <view class="mask" wx:if="{{skuFlag}}">
@@ -130,7 +130,7 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{info.headimg}}" mode="aspectFill"></image>
+        <image lazy-load id="skuImg" src="{{info.headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
           <view class="sku-price">{{info.product[0].sku[skuIndex].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
@@ -202,7 +202,7 @@
     <view class="mask-content">
       <view class="iconfont icon-close" bindtap="hideSku"></view>
       <view class="sku-info-box">
-        <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
+        <image lazy-load id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
           <view class="sku-price">{{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
@@ -248,7 +248,7 @@
   </view>
   <navigator wx:for="{{comment}}" wx:for-index="index" url="/pages/list/comments/index?sceneid={{info.id}}&&index={{index}}" class="product-comment">
     <view class="product-comment-top">
-      <image src="{{item.user.avatar}}" mode="aspectFill"></image>
+      <image lazy-load src="{{item.user.avatar}}" mode="aspectFill"></image>
       <view class="comment-info">
         <view class="nickname">{{item.nickname}}</view>
         <view class="iconfont"><text wx:for="{{item.rate}}" class="icon-xingxing"></text><text wx:for="{{5 - item.rate}}" style="color:#999" class="icon-xingxing"></text></view>
@@ -258,7 +258,7 @@
     <view class="comment-content">{{item.content}}</view>
     <view wx:if="{{item.img_list}}">
       <view class="img-box" wx:for="{{item.img_list}}" wx:for-index="index" wx:for-item="img" mode="scaleToFill" data-img="{{img}}" data-list="{{item.img_list}}">
-        <image wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
+        <image lazy-load wx:if="{{index<6}}" class="imgs" src="{{img}}" bindtap="imgsc">
         </image>
         <view class="all" wx:if="{{index==5}}" >
         <view>共{{item.img_list.length}}张</view>
@@ -283,13 +283,13 @@
   <view class="ask-list" wx:else>
     <navigator url="/pages/ask/info/index?id={{item.id}}" catchtap="pagePoint" data-event="scene_comment" class="ask-item" wx:for="{{ask}}">
       <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
         <view class="ques">{{item.question_name}}</view>
         <view class="ques-num" wx:if="{{item.answer.total!=0}}">{{item.answer.total}}个回答</view>
         <view class="ques-num" wx:if="{{item.answer.total==0}}">暂无回答</view>
       </view>
       <!-- <view class="item-ques">
-        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
+        <image lazy-load class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ans.png" mode="widthFix"></image>
         <view class="ans">{{item.answer && item.answer.lastest_answer?item.answer.lastest_answer.answer:"暂无回答"}}</view>
       </view>
       <view class="ques-tip">
@@ -329,23 +329,23 @@
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box" style="bottom: 200rpx;">
-    <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
         </image>
         <view>保存图片到相册</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
       </view>
-      <image style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
         </image>
         <view>微信识别二维码</view>
         <view class="tipimg">
-          <image src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
diff --git a/project.private.config.json b/project.private.config.json
index 28e2921..90e1973 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -81,5 +81,5 @@
   },
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "libVersion": "development"
+  "libVersion": "3.9.3"
 }
\ No newline at end of file
diff --git a/utils/https.js b/utils/https.js
index c120ad9..ac1e739 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From bfa4cfe0fe03a06733074cfae19c8348c112b0be Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Sep 2025 17:20:23 +0800
Subject: [PATCH 416/471] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/postOrderInfo/index.js  |  2 ++
 pages/user/order/sceneOrderInfo/index.js | 10 ++++++++++
 pages/user/order/showOrderInfo/index.js  |  3 +++
 utils/util.js                            | 16 ++++++++++++++++
 4 files changed, 31 insertions(+)

diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 0d6a56a..0d3c819 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -191,6 +191,8 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+    util.gotoDetail(item)
+    return
     if (item.is_package == 1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index bb8e872..1d682c1 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -226,6 +226,16 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+
+    util.gotoDetail(item)
+    return
+    // 组合产品 跳线路
+    if (item.compose_product_id) {
+        wx.navigateTo({
+            url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+          })
+        return
+    }
     if (item.is_package == 1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id
diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js
index ef6d292..bae81e8 100644
--- a/pages/user/order/showOrderInfo/index.js
+++ b/pages/user/order/showOrderInfo/index.js
@@ -223,6 +223,9 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+    util.gotoDetail(item)
+    return
+
     if (item.is_package==1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id
diff --git a/utils/util.js b/utils/util.js
index 0a025c2..dc2cb8b 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -180,6 +180,14 @@ const gotoDetail = (item,isPagePoint) =>{
     },
     type: item.type
   }
+  // 组合产品 跳线路
+  if (item.compose_product_id) {
+    wx.navigateTo({
+        url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+      })
+    return
+}
+  
 
   if (item.is_package === 1) {
     wx.navigateTo({
@@ -339,6 +347,14 @@ const orderMoreTime = function(item){
   if(item && item.order_product_list && item.order_product_list[0]){
     let info = item.order_product_list[0];
     console.log(info)
+    // 组合产品 跳线路
+    if (info.compose_product_id) {
+        wx.navigateTo({
+            url: '/pages/info/roadInfo/index?id='+info.compose_product_id
+          })
+        return
+    }
+
     if (info.is_package === 1) {
         wx.navigateTo({
             url: '/pages/info/postProductInfo/index?id='+info.product_id,

From 38d0acbacc1782b8197992e4d5c5e6ee060d1675 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 12 Sep 2025 09:15:13 +0800
Subject: [PATCH 417/471] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/roadInfo/index.js               | 5 ++++-
 pages/user/order/sceneOrderInfo/index.wxss | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 3c312d6..1508b5c 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -503,9 +503,12 @@ Page({
 
     setSimpleValue: function (e) {
         let keyname = e.currentTarget.dataset.keyname
-        let val = e.currentTarget.dataset.val
+        let val = e.currentTarget.dataset.value
         let param = {}
         param[keyname] = val
+        // this.setData({
+        //     skuFlag: false
+        // })
         this.setData(param)
     },
     minus: function () {
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index 5aabe9b..f384d99 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -210,7 +210,7 @@ page {
   left: 40rpx;
   text-align: center;
   margin-top: 125rpx;
-  z-index: 5;
+  z-index: 1;
 }
 .code-box .iconfont.icon-you {
   left: auto;

From 241a42f0c5e3fa2e38d82ad4680b9721755abf2d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 12 Sep 2025 16:12:26 +0800
Subject: [PATCH 418/471] =?UTF-8?q?des=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/component/TitleHeader.js           |  6 ++++++
 pages/order/orderList/index.js           | 14 ++++++++++++--
 pages/user/order/postOrderInfo/index.js  |  8 ++++++--
 pages/user/order/sceneOrderInfo/index.js |  3 ---
 pages/user/order/showOrderInfo/index.js  |  8 ++++++--
 utils/https.js                           |  9 +++++++++
 utils/util.js                            |  7 +++++++
 8 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 3470599..4773a83 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest132? true : false;
+            data.isTest = data.isTest133? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 1fc9b5a..07c67a8 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -92,6 +92,12 @@ Component({
     
    
 	  else if (pages[pages.length-1].route.indexOf('orderList') != -1){
+          // 清空购物车
+          try {
+            console.log("清除购物车")
+            app.globalData.list = null;app.globalData.createDate = null;
+            app.globalData.index = 0;app.globalData.productPrice = 0;app.globalData.ticketPrice = 0;
+        } catch(e) {  console.log("清空购物车失败", e) }
 		  wx.navigateTo({
 		    url: '/pages/user/cartlist/list'
 		  })
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index ced412f..3fe0fed 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -80,7 +80,6 @@ Page({
     app.globalData.createDate.coupon_id= this.data.coupon ? this.data.coupon.id : null;
 	  let service = "order/create", postData = {data: JSON.stringify(app.globalData.createDate)}
 	  commonApi.user_post(service, postData).then(res => {
-		  
 	  })
   },
   changePrice: function () {
@@ -165,7 +164,18 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-
+    // 清空购物车
+    console.log("清除购物车")
+    try {
+        app.globalData.list = null
+        app.globalData.createDate = null
+        app.globalData.index = 0
+        app.globalData.productPrice = 0
+        app.globalData.ticketPrice = 0
+    } catch(e) {
+        console.log("清空购物车失败", e)
+    }
+    
   },
 
   /**
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 0d3c819..6325b72 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -191,8 +191,12 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
-    util.gotoDetail(item)
-    return
+    if (item.compose_product_id) {
+        wx.navigateTo({
+            url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+          })
+        return
+    }
     if (item.is_package == 1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 1d682c1..9e48030 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -226,9 +226,6 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
-
-    util.gotoDetail(item)
-    return
     // 组合产品 跳线路
     if (item.compose_product_id) {
         wx.navigateTo({
diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js
index bae81e8..428abb1 100644
--- a/pages/user/order/showOrderInfo/index.js
+++ b/pages/user/order/showOrderInfo/index.js
@@ -223,8 +223,12 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
-    util.gotoDetail(item)
-    return
+    if (item.compose_product_id) {
+        wx.navigateTo({
+            url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+          })
+        return
+    }
 
     if (item.is_package==1) {
         wx.navigateTo({
diff --git a/utils/https.js b/utils/https.js
index ac1e739..d55ab84 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -225,6 +225,15 @@ function user_post_new(url, data = {}, type) {
             if (url.indexOf('/order/create') != -1 && res.data.code == 1 && res.data.data) {
               // 下单成功
               wx.removeStorageSync('prizeId')
+
+                // 清空购物车
+                try {
+                    console.log("清除购物车")
+                    let app = getApp()
+                    app.globalData.list = null;app.globalData.createDate = null;
+                    app.globalData.index = 0;app.globalData.productPrice = 0;app.globalData.ticketPrice = 0;
+                } catch(e) {  console.log("清空购物车失败", e) }
+
               if (res.data.data.pay_status == 1) {
                 // 0元直接付款成功
                 wx.navigateTo({
diff --git a/utils/util.js b/utils/util.js
index dc2cb8b..5fe8ecd 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -579,6 +579,13 @@ const detailPagePoint = function (url, res) {
 
 // app 要传进来 util 获取不到
 const orderByShoppingCart = function (listData, app) {
+    app.globalData.list = []
+    app.globalData.postProduct = []
+    app.globalData.product = null
+    app.globalData.createDate = null
+    app.globalData.index = 0
+    app.globalData.productPrice = 0
+    app.globalData.ticketPrice = 0
     let productType,flag,isCar;
     commonApi.user_post('wx/get_user_keep', {
         jumpurl: '/pages/user/cartlist/list',

From 8febadd415af0c80288cff6afd6b473a4dfaa7d0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 12 Sep 2025 19:41:12 +0800
Subject: [PATCH 419/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.js   | 4 +++-
 pages/info/postProductInfo/index.wxml | 6 +++---
 pages/info/postProductInfo/index.wxss | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 5ad5c2b..43e1c90 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -150,7 +150,9 @@ Page({
         })
         // 获取评价列表
         commonApi._post("product/product_comment_list", {
-            product_id: options.id
+            product_id: options.id,
+            offset: 0,
+            limit: 3
         }).then(res => {
             res.data.list.map(item => {
                 item.rate = Number(item.rate)
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 12507d8..5ebbda2 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -10,7 +10,7 @@
         <swiper-item>
         <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
-            show-progress="{{false}}" ></video>
+            show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
         </swiper-item>
     </block>
@@ -284,7 +284,7 @@
                 <view class="number">{{producNum}}</view>
                 <view class="iconfont icon-add-select" bindtap="add"></view>
             </view>
-            <view class="limit-number" wx:if="{{info.sku[skuIndex].sku_model.traveller_limit_num>0}}">限购5件</view>
+            <view class="limit-number" wx:if="{{info.sku[skuIndex].sku_model.traveller_limit_num>0}}">限购{{info.sku[skuIndex].sku_model.traveller_limit_num}}件</view>
         </view>
       </view>
     </view>
@@ -293,7 +293,7 @@
       <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item {{index==skuIndex?' active':''}}" 
       wx:for="{{info.sku}}">
         <image lazy-load src="{{item.headimg}}"></image>
-        <view class="sku-name textOver">{{item.sku_name}}</view>
+        <view class="sku-name textOver2">{{item.sku_name}}</view>
       </view>
     </view>
     
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 04bedac..74cd9b1 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -556,7 +556,7 @@ page {
 }
 
 .sku-name-item {
-    height: 67rpx;
+    min-height: 67rpx;
     border-radius: 13rpx;
   margin-bottom: 34rpx;
   max-width: 100%;
@@ -569,13 +569,13 @@ page {
 }
 .sku-name-item>image{
     width: 67rpx;
-    height: 67rpx;
+    height: 100%;
     border-radius: 13rpx;
     flex-shrink: 0;
 }
 .sku-name-item .sku-name{
     flex:1;
-    width: 100rpx;
+    /* width: 100rpx; */
     padding-left: 15rpx;
     color: #333;
 }
@@ -937,7 +937,7 @@ height: 133rpx;
 .item-hd image{
   width: 334rpx;
   height: 342rpx;
-  border-radius: 13rpx 13rpx 0px 0px;
+  border-radius: 13rpx 13rpx;
 }
 .item-bm{
   padding: 8rpx 12rpx;

From 2ad4ee047dc4768bb81e18b9ede0baf476f34464 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 15 Sep 2025 09:17:05 +0800
Subject: [PATCH 420/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 4773a83..9035caf 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest133? true : false;
+            data.isTest = data.isTest134? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From cb6ff5e2a8a8598240eff4c812bf292cd2793e85 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 15 Sep 2025 13:17:11 +0800
Subject: [PATCH 421/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 14 +++++---
 pages/index/index.wxml | 76 ++++++++++++++++++++++--------------------
 pages/index/index.wxss | 69 ++++++++++++++++++++++++++------------
 utils/https.js         |  4 +--
 4 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 4ac7827..1505b1e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -592,9 +592,12 @@ Page({
 
     getShowMore () {
         commonApi._post("multimedia/detail", {id: 2462}).then(res => {
-            this.setData({
-                showMore: res.data.company_name ==1?true:false
-            })
+            if (res && res.data) {
+                this.setData({
+                    showMore: res.data.company_name ==1?true:false
+                })
+            }
+            
         })
     },
 
@@ -926,7 +929,10 @@ Page({
             tag_id: 85,offset: 0,limit: 5,
         }).then(res=>{
             let resData = res.data.list || []
-            resData.forEach(v=>{ v.pagePoint = {classification: 'hot', key_number: v.id} })
+            resData.forEach(v=>{ 
+                v.pagePoint = {classification: 'hot', key_number: v.id};
+                v.display_tags_arr = v.display_tags?v.display_tags.split(",") : []
+            })
             this.setData({ list: resData})
         })
     },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7cd195b..488c1da 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,22 +1,7 @@
 <!--index.wxml-->
-
-
-<view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});">
+<view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});background: linear-gradient(165deg, #FF8623 213px, #FFE68A 213px); ">
     <!-- 顶部banner -->
-    <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
-            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular
-            indicator-dots 	indicator-active-color="#fff">
-            <block wx:for="{{banner}}" wx:key="index">
-            <swiper-item bindtap="bannerClick" data-item="{{item}}">
-                <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
-            </swiper-item>
-            </block>
-        </swiper>
-        <!-- <view class="com-flex dot-list">
-            <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
-        </view> -->
-
+    <view style="position:relative;z-index: 1;padding-top: 200rpx;">
         <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+10}}px">
             <view wx:if="{{weather}}" style="display: flex;flex-shrink: 0;">
                 <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
@@ -30,6 +15,19 @@
                 <view class="textOver" style="color:#000000">搜索您想要的</view>
             </navigator>
         </view>
+        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+            <block wx:for="{{banner}}" wx:key="index">
+            <swiper-item bindtap="bannerClick" data-item="{{item}}">
+                <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
+            </swiper-item>
+            </block>
+        </swiper>
+        <!-- <view class="com-flex dot-list">
+            <view class="dot{{index===activeBannerIndex?' active':''}}" wx:for="{{banner}}" wx:key="index"></view>
+        </view> -->
+
+        
 
         <view class="banner-main">
             <view catchtap="mainNavClick" class="banner-main-item" wx:for="{{bannerDataList}}" wx:key="index" data-item="{{item}}">
@@ -40,16 +38,8 @@
 
     <view class="main-content" >
          <!-- 金刚区 -->
-        <view class="no-scrollbar" wx:if="{{mainTypeList.length>0}}">
-            <!-- <scroll-view scroll-x style="height:152rpx" bindscroll="listenScroll" data-keyname="mainTypeLeft" class="no-scrollbar">
-                <view  class="top-icons no-scrollbar">
-                    <view bindtap="mainNavClick" class="top-icon-item" wx:for="{{mainTypeList}}" wx:key="index" data-item="{{item}}">
-                        <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
-                        <view class="top-icon-text">{{item.menu_name}}</view>
-                    </view>
-                </view>
-            </scroll-view> -->
-            <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:180rpx;padding-top: 43rpx;" 
+        <view style="padding: 0 20rpx;" wx:if="{{mainTypeList.length>0}}">
+            <!-- <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:180rpx;padding-top: 43rpx;" 
                 bindchange="changeBannerIndex" data-keyname="mainNavIndex" 
                 display-multiple-items="5" circular
                 current="0">
@@ -59,12 +49,21 @@
                     <view class="top-icon-text">{{item.menu_name}}</view>
                 </swiper-item>
                 </block>
-            </swiper>
-            <view class="scroll-line" >
+            </swiper> -->
+            <view class="top-icons no-scrollbar">
+            
+                <view bindtap="mainNavClick" class="top-icon-item" data-item="{{item}}" wx:for="{{mainTypeList}}" wx:key="index">
+                    <image lazy-load src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
+                    <view class="top-icon-text">{{item.menu_name}}</view>
+                </view>
+            </view>
+            <!-- <view class="scroll-line" >
                 <view class="scroll-line-bg" wx:if="{{(mainNavIndex+2) < (mainTypeList.length/2)}}" style="width:17rpx;"></view>
                 <view class="scroll-line-bg" wx:else style="width:17rpx;margin-left: 17rpx;"></view>
-            </view>
+            </view> -->
         </view>
+
+
         
 
         <view class="content-box">
@@ -89,12 +88,12 @@
                 <!-- 上方标题部分 -->
                 <view class="xsth-title">
                     <view class="xsth-left" style="display: flex;">
-                        <image lazy-load style="width: 253.33rpx;" wx:if="{{xpthIndex==0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
-                        <image lazy-load style="width: 253.33rpx;"  wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
+                        <image lazy-load  wx:if="{{xpthIndex==0}}" mode="widthFix" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
+                        <image lazy-load   wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="widthFix" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
                         
-                        <view style="font-size: 0;" wx:if="{{indexSeason.xpthBac && indexSeason.xpthBacImg}}">
-                            <image lazy-load style="width: 253.33rpx;"  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
-                            <image lazy-load style="width: 253.33rpx;"  wx:else  mode="aspectFill" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
+                        <view style="font-size: 0;padding-left: 34rpx;" wx:if="{{indexSeason.xpthBac && indexSeason.xpthBacImg}}">
+                            <image lazy-load  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="widthFix" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
+                            <image lazy-load   wx:else  mode="widthFix" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
                         </view>
                         
                     </view>
@@ -107,6 +106,9 @@
                                 <image lazy-load src="{{item.headimg}}"></image>
                                 <view class="season-content" style="padding:6rpx 12rpx;min-height: 130rpx;">
                                     <view class="textOver2">{{item.title}}</view>
+                                    <view class="tags textOver" wx:if="{{item.display_tags}}">
+                                        <view class="tag" wx:for="{{item.display_tags_arr}}" wx:key="index" wx:for-item="tag">{{tag}}</view>
+                                    </view>
                                     <view class="price">
                                         <text>￥</text><text>{{item.price/100}}</text><text>起</text>
                                     </view>
@@ -169,14 +171,14 @@
 
             <!-- 公共服务 -->
             <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
-                <image lazy-load class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
+                <image lazy-load class="common-header-img" mode="widthFix" src="{{indexSeason.ggfw}}"></image>
                 <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more" wx:if="{{showMore}}">
                     <view style="height: 40rpx;line-height: 40rpx;">更多 ></view>
                     <!-- <image lazy-load style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
                 </navigator>
             </view>
             <view wx:if="{{func_data.service_public}}">
-                <view class="ggfw-list" style="width:100%;margin-top: 30rpx;">
+                <view class="ggfw-list" style="width:100%;margin-top: -40rpx;position: relative;z-index: 1;">
                     <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick">
                         <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                     </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 8f9ea1c..76e79dc 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -2,18 +2,27 @@
 /* 元旦修改 */
 
 .bg{
-    height: 100vh;
+    min-height: 100vh;
     overflow-x: hidden;
     overflow-y: auto;
     background-size: 100% 100%;
     background-repeat: no-repeat;
     /* background-color:#E8F9FA; */
+
 }
-.swiper,.swiper image {
-  width: 100%;
-  display: block;
-  height: 908rpx;
+.swiper{
+    display: block;
+    width: 697rpx;
+    height: 340rpx;
+    margin: 0 auto;
 }
+.swiper image {
+    display: block;
+    width: 100%;
+    height: 100%;
+    border-radius: 20rpx;
+}
+
 
 .top-box {
   display: flex;
@@ -45,7 +54,7 @@
   font-size: 25rpx;
   padding: 2rpx 5rpx;
   box-sizing: border-box;
-  background: rgba(255, 255, 255, 0.6);
+  background: #FFEEAD;
 }
 .search-box .iconfont {
   font-size: 30rpx;
@@ -55,21 +64,17 @@
 }
 
 .banner-main{
-    position: absolute;
-    z-index: 3;
+
     width: 100%;
-    left: 0;
-    bottom: 0rpx;
-    right: 0;
     display: flex;
     justify-content: space-between;
-    padding: 0rpx 20rpx 30rpx;
+    padding: 26rpx 20rpx 30rpx;
     box-sizing: border-box;
     /* background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2)) */
 }
 .banner-main image{
-    width: 173.33rpx;
-    height: 173.33rpx;
+    width: 156rpx;
+    height: 156rpx;
 }
 
 .swiper .wx-swiper-dots.wx-swiper-dots-horizontal {
@@ -88,19 +93,21 @@
     /* padding-top: 63rpx; */
 }
 
+
 .top-icons {
   display: flex;
-  padding:0 20rpx;
-  align-items: center;
+  flex-wrap: wrap;
+  border-radius: 20rpx;
+  background: #FFEEAD;
 }
 .top-icon-item {
-  margin-bottom: 20rpx;
+  margin-bottom: 37rpx;
   line-height: 37rpx;
   font-size: 25rpx;
   color: #000;
   text-align: center;
   flex-shrink: 0;
-  width: 20%;
+  width: 25%;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -131,7 +138,7 @@
   margin: 0 25rpx;
 }
 .common-header-img{
-    height: 106.67rpx;
+    width: 220.67rpx;
 }
 
 .small-swiper {
@@ -185,6 +192,7 @@
     flex-direction: column;
     justify-content: space-between;
   }
+
   .season-hot{
       display: flex;
   }
@@ -218,6 +226,23 @@
       height: 100%;
       border-radius: 0;
   }
+  .season-hot .tags{
+    width: 100%;
+    display: flex;
+    flex-wrap: nowrap;
+    overflow-x: hidden;
+  }
+  .season-hot .tag{
+    height: 27rpx;
+    border: 1px solid #FF8623;
+    line-height: 27rpx;
+    padding: 0 10rpx;
+    font-weight: 500;
+    font-size: 20rpx;
+    color: #FF8623;
+    margin-right: 8rpx;
+    flex-shrink: 0;
+  }
 
   .xsth-more {
     margin-top: 19.33rpx;
@@ -761,14 +786,14 @@
 
 .ggfw-list {
   display: grid;
-  grid-template-columns: repeat(4, 166rpx);
+  grid-template-columns: repeat(4, 157.33rpx);
   row-gap: 23rpx;
   justify-content: space-between;
 }
 
 .ggfw-list .ggfw {
-  width: 166rpx;
-  height: 133rpx;
+  width: 157.33rpx;
+  height: 130.67rpx;
   /* margin-bottom: 23rpx; */
 }
 .ggfw image{
diff --git a/utils/https.js b/utils/https.js
index d55ab84..b0f9a8b 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 413dcd072344e474248a3dd1febff1d23e7cd5b3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 15 Sep 2025 13:35:26 +0800
Subject: [PATCH 422/471] =?UTF-8?q?webPage=20=E5=A4=B4=E9=83=A8fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/web/index.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/pbService/web/index.json b/pages/pbService/web/index.json
index 8835af0..e0d8c42 100644
--- a/pages/pbService/web/index.json
+++ b/pages/pbService/web/index.json
@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationStyle":"default"
 }
\ No newline at end of file

From adfcf61634e1e40757c390735b48e2ed9c8ba523 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 16 Sep 2025 17:15:13 +0800
Subject: [PATCH 423/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json               |   4 +-
 images/ai.png          | Bin 5049 -> 17471 bytes
 images/ai_seld.png     | Bin 5572 -> 25847 bytes
 images/aindex_seld.png | Bin 5008 -> 0 bytes
 images/amap_seld.png   | Bin 7571 -> 0 bytes
 images/auser_seld.png  | Bin 5503 -> 0 bytes
 images/index.png       | Bin 3705 -> 6130 bytes
 images/index_seld.png  | Bin 4956 -> 7247 bytes
 images/map.png         | Bin 6090 -> 11233 bytes
 images/map_seld.png    | Bin 8215 -> 13725 bytes
 images/user.png        | Bin 4423 -> 7445 bytes
 images/user_seld.png   | Bin 5894 -> 11041 bytes
 pages/index/index.js   |  24 ++++++++--
 pages/index/index.wxml |  38 ++++++++++-----
 pages/index/index.wxss | 105 ++++++++++++++++++++++++++++++++++-------
 utils/https.js         |   4 +-
 16 files changed, 138 insertions(+), 37 deletions(-)
 delete mode 100644 images/aindex_seld.png
 delete mode 100644 images/amap_seld.png
 delete mode 100644 images/auser_seld.png

diff --git a/app.json b/app.json
index a23c41d..0f44cc5 100644
--- a/app.json
+++ b/app.json
@@ -249,8 +249,8 @@
     "style": "v2",
     "sitemapLocation": "sitemap.json",
     "tabBar": {
-      "color": "#999999",
-      "selectedColor": "#22A3CD",
+      "color": "#000000",
+      "selectedColor": "#000000",
       "borderStyle": "white",
       "list": [
         {
diff --git a/images/ai.png b/images/ai.png
index 8ed8e01c8d5a2f85ef0f77d898d47a8fbabe5fb6..3f74b7e4a51dc9e5ed22558090a3684e81f2681f 100644
GIT binary patch
literal 17471
zcmV*BKyJT@P)<h;3K|Lk000e1NJLTq005x?005x~1^@s6uTkH&000mGNkl<ZcmeF)
z2b?BFoj35BVOO%QXF^n51A-s|qL>v#MSKll!h~W%Jy9`d!Hmi&#yj=Sh&f;YbHIFx
z33E=!2?Dw*$ilKa@9*0?{m|3<JTuQT^UTaMyEC7v>FVn0>I%R5r}}q4<7N48c?1@D
z1eQU#$P=*q_)?ZZxQv2DAAw~MF8UNKH(+xD;ntbXJrnPeczEIiMmRn&ZM%QsJri%1
zc-6!$HY{}zj%DVyPuwN(=81<UK0NX0#3xL~$LBbTQ5zqfwplO-<anLLZ4>n=hb<>8
zbr71g{WD#UO?*Y7Nxf5!`zG#H#ZqpZ<0!^`(ym)4J|yw!iBC#I6;bpp3W!S;g#VTa
zyJg}dCL;=H0<V?xRf(wMD97z4+j#jLuadZT;$0ITnTS>Io+B{ku=$6j1j4N{9Xljm
zH}STK4^Dhy;(ZcL+EVIEnmi?}$eDg&&HtYC-4g-Rg3|AtZoXluOq_P2es{=JJR|Y>
ziT6uH`8F4dfdyYKeWF|eA{Kq`oL?!?wH!9jU~)&jXV*vrX}m|}i2WXtBYEn|IhwQ_
zri62I_VvV%CcZE6{UaK`ly;qyxFN9_w#mu06K|i0HS0IZZxJSI^9!R2!j&0n6ySzA
z-Z}AMi8S1M<cRvU+kI*B*ChTn@ym(tPJCnHYZ6~OqVer%*B29inRr3sL}D{oWPtd%
zWD-3nG5Wr_Q2umlV`xw2#@xmK&*XAgn(?B<XC@w$Xi{?M8vc^p&m}4^ekAGtP5e>f
z86z4`O}k!_`1-`JCSH`-4&*_K%e`{JI6NxH8zsump$bd>-zb3)YrS4Z)PNgotO)pS
zki07<wg(>d`(yG?NqlqSI}$&g_`^hO?w>hcIKuJ#wCyK}pG<t`Wc+cC7biA@e&Y%^
zO(rV<4Vp5xI_DIc9F}%iY!DK-u@_X1ocI4SoY*cohyj;&n5<5~vM$NlUlUE(XL7`L
zMU#1U&X-#FT^jtcL=^GEIetHpTx*df*$EaYDu^{xTn^5aJrZ|JT<m#F6J{S4yYT?H
zYno5tI5x*)60P_v<OrZSObP39hWe5DUYPXD6Tg;-ssLz`OEO@^ze&sAl88m0oa32^
z?O;sUKljUprzA3PQ`!JAr%N*|76|Qh+$2M0f7foueUqjE+PY#3Y`4oKk?r1_a<5Lr
zz9=AnN}3Wwg9c`lLcO<0{;d*km&mMxt&0cd+;bSZf!)rEd)%uIY#+r*u>}un^Te|f
zzmiC+r?`ARX;eRlPN;#X&31=SMv9yM7`slvrIKh*_I$Rx9=vPjA-38WX6>Jn|E%n8
zs~L48Ba!j2DU$+xv`NNYESvVsY{S4ynPER9Pnw*E=2`ZVQCiVt*(Q5X@+|;m+2Uy3
z>H%7N(159a3erv~OD40sVe!nj9QKbqPapp~M-ip}ebN@9@kp{0EF6^3J~@X7K-69f
zvr}l)6AKAKTU98K0Xsee11L-|y#~yHlZ#LXW(@Kn;F6svAtvZmspkcW47+4WfIcGU
zC@TdAFijGGiNFeQ1bZM<7C0@2XXifcdP9z=(EsFkLZZ3>*ZuaRdA!W`xUn798o&Ng
zyuO>Z5Jz&D5>RenwCJ9bD;5|kndH(4GY;kux`B!SA1ZWY>f^qI+MtLiOR{<f?E~Jc
zrvxD!n??OlQrlYcXwS52+9EsJ&MAu;TrEfD4bQJ51qg^-Q>V#uk9)75^0xl~4Q2Km
zzyn$o6IFdo%2-6U3oRn--96o?c#6&`Sb$jZ_fiYR#lmBF|8>sSCpH5h>JwX{1!kNn
zdGc_eX4#QTo8<Xu6te;Wnv8dwJOCvjL>nNW>1SY+Q4c@?hWmgh)h$?{AOW~VV^U4-
zQ}c96lp`w2Y+~|vOTM-OWH0KTBC`rV&0PS9N`E|Q=YPww4MvOF0=3{R7z;`J&4uyI
zEu$Ca1B5zji;2+8!1~;Do7{!+(S~!n<bpoc(ZV1fqJYdKCi|7?(TRz)dkT=gDxa*O
z1#&R66mt{}`m?E-tenG?U`~y{#g9GPaiOFE=#+w^a-zY*Y>UAsgE6RDjbt#a4O_%A
zhWV_zF7gwqz~1)rWHMHNCr3Lb-^kH!#A!L&BC8|8|C`A>J(0r0Xl%>x&pH2lB376~
z&j4U16=k;1OOe5vQAPa*OjHsj!tQ%kG{6NiGUGc_4h8L`+$-8A2hf~$f_WuF;~?Z>
zoQMoee3`F#=sbMTgvJhfPrE$UW96X?WGDbc5y(<NX~Np~%=MgrZm*cu_=8jiXpGfl
zrw`?viNgdj<&dQ)8O`{%lzCU;dlEm8$S!9a?F&iMM#*8nNSdvV0sOqAX{|KWUI0bq
zi46KpNx}t;g)sqA3lVUKF&^xqpGuo3ER?8kCv5?-BqTW{V8^Tm+JqwkCK-9YwfrfK
znC@g4ASCyZ^<JC@JuT7dM<J3da~W_eUmfj84q~wWU@nj|*%?hZ`{92j&!n&?+I`?j
z^NHly&cnXy2(W-h&H`3OV(e5OxQg-6M#)SZqqyrpipl~&s_Yu-{sJ2ch+UH%Y1uS)
zyF$aFMD;k>wj`rkY(Gn@x-Akip#@@5JTGM|6a*s4#Se1<A*~hQXo*Pu9n&4u5LN8A
zUO>Z2nP6(xY0C<WO?8_D`@vW(3I;qtg$fvaYzk#Wz5XwEqF`hurVf;>89l@GKbKM%
zynz}!M*Xm6)D@fK6amDjE6R!TFcASefO|F*Qn!f*HjB}iVAU2XR?RE~jKeT2;|Tge
z^sp!ak>X+uG6YkCg~9HrE#^!+q_OQO1sD3HU$As*mjPxVWenzWM3d}RuFkV^u`@Ck
zV3<6V1uHetR<yxHX@Ik)D(-jwuO#f680@zuZD&DVlJgeSubt#Z)D#=1gdCSAqP(^b
z0ad$zfrwylTYFQa69Cfg3|k(`$lh5SmR;)<oMplyAVLs7ED&wAC@tFdf~Hj2MY2DS
zI#XIuMShIUF`s2q2ET2#Aaoyl8(ST=GgISD3YiM%P!L9Dwl*8_G&lnXd`unecQnvu
zZ)|CqY;qkL4)tnYpU<?mHzT<VB?U|i!u~a}0GmTG+3`@QZf!!1*d!?m$^!yV>S4)e
z76Izak5aoRU-H^*F@MZSxEEHg9Tv$j7DW45GoEYAjD@-ss3*nh>2kSPeW;y@B1-|!
z>r#+xg?a#@)rti(J7D47h_i!YrKV^nVAqrdK7zDDtj5ak6j+3W{-H9I0U9}Kj*=4-
z-jw!Wi`opVIh_(HFbwJzoLwEZ$GfG3y!PTtb|=iV&=u4!oQ6n2?j;{vwC2I$QKpW7
zPg(MU7{$fHaI{@HTU^w24|JUE!+;PtOaL~-L|{_nVPBj{xv$ewtxArjgnsM{kjQ|{
z4I0bDfvpqbvGjVdJp)C->L?H>;X+bCZ5t#S2c{o(Jg=VufOBloxado>K47G&0wLv!
ze1=L|*!37l+ts06lP!%8@HFe`l{OD3H7;Wwa3MP|?RI#U`pJp5FDWey@18Z?qUiP9
zf%9hzLJvaeP&RwG0LQlv#lvQ3mE<Or0ehe*=)9E*T%tO#UPe`smfdWR@&?X|7Cp~B
zqa5`Qm8R&Rj254lvS{kv7LfkhVX+;_vOs$!E7m|`*R!YnpXszk?6pu^aXIZPXbWY_
zBF1)6MQtOWw=2*N;*|wKM8c|3%67S-pBsePR!V3GFl-Y0p*`v(_KQ8Ck_H}oFc{6}
zSbYXsrx|$d+csC7$pl<=(SWhNZUfh>bClAQ6Pme2MC?F`P(}+C#nivLy~ctFVl3>d
z+o#4A>^Nc5fM=09r_j)>QAqdIbxe0$n~Q%)WUyztqP(z&wimVfXzWZmo==Hl^{_yg
zcv8jugt>swKw`tp8EkG=KJ!U8IjG%w0Hn~=gUgSvS;hc;D;dlU*m06eHei7OfK7|I
z26GTgLCq2B&XI{3lu<<6Z5Ak5(RGvxbz&CdC1aC7e!tQ4SQN;ttP9#?q02Xy&3afq
z?6lbV;kbc1Q$#5)z}hT3=k#1aSU=oA>VzmQ*4KI+tt_1+2N~RUIc`hjNAgtr+EP46
z#eoqBYIiY;3yRt9kICkEE0WEcV5425h$tj#*uJ-)bM{h{kOBQaa)U*Vt0g%l;7nvx
z^F*|wxM+|3DFx?xG7Jz7+6Dr-tt0?so@lnAmIF}>tR5>LwEj^oZ;>*WVA1TN<YiU@
zGFo%t;u5R{q78wu9d_8ET>kQxFXQ9ms1P7<jWdSEa?t)-5P)c*dp@e@$l%`=n@~QA
z5lx<$z`#vBU{@UUxjoA_0noG1kS}1vRymFA3az?P3vwV<0f5cPX%+2yYLdjR7e^=)
zg(t!=Tag*bY;2)Z`nz)F%5vo^U%BkL=bmM^-F7Q0R;(CHA5cI5<X*<sm#m&ad9hmo
zi-K4{o~QU|4>_KdqYXyXm?_6rrY%kT;i%;Hsd&y9nsWtd#GruyZVQWM+`N~3X%Kk2
zF!30q=JkHk221QU@cq=WP-SZ4Jvk8w0CS2h?@Cv?Qn}+D?^quG@Q0VX-~H}o+ih{<
zs(Dy8PQtuZW%T%ms?IdWL;@_C!orK298RvEvLGhwC%dD<9DD7tTL^RB_M54Jlg}Q?
z0XTL|O;!~97*><hPGCDU00zXs@bs|SP|RDTl&vO?r3}1mTJ~XWJ25G+Zy6Y-AyHbM
zYs!#kuoE^gtJqeRHkd>MYqIi)1q~({)zM$xKlZ{c!cHTucD1XOLk>Bl9DMM><)$~i
zX}R{buU$~b6u3g77rL&MV;%HEpJ=wmhf-k-P%h(U(VK(1eDla=%ap^0s~w`fbN0<<
zIg8tK5E8N?8|ST4fObD?EY14HJa}X1|3CGgX2<haT8G?iGRP??0n5IX#SB4nJ|qRa
zFG543Ej~HtJZ7xemnKcPwudVcvI+fSGv8h>8yowj_eFpdTLDVGj{s@61|ZqRJRh4O
z57lkVqvkdIDz%$<I~`?gY-}R(U)g1sUCOO)b*l<|*SN+t%HDhLU9NH!O)S7fF0)8E
zB><y^s!!bLc>XY$8w-6mcE(-b@~EDH2*iv;Oki@e?MHq@q0LkCMzSIk4zm(N`fTLW
zs=kE;A<A~gJaym1=5xs(toyD5hi}JVPX^L}qGCGANrI_>G6OJJk`<`)C|S4Y8mhs}
z!4_!+Te&F15ow1#UtY@G=6T0>rZ%9uCRm**Ht)f6SP3fb5D<=C_qx}uWWj&?H~L8_
zSG?jC%S~=_lY%-<wgwO_9^+$CGB8U6BVek}LPEJvNL+voaPs!92S5|qWhqY<FhJr`
zxKsNk?Y?<35ev^ta`4au!{B%Ke+R%|A9euRs}Z#^p!O_*6uUH#2H2nh16Bg0Kxd+q
zAEfPDrK#H_?vQ9w>^cB4O%pIZ4^;$q)Wl?B<07_W;kajz2$k2r000mGNkl<ZXXa6T
z2NS3*`bZ0|6p<U>_{L?MZ8W=7+A#%%qB2>lanmmQy-YT@Og`|fitM;@)v8rxyY054
z%p|*LyTxaW-6wClh%f-6y?whq%w?QtDKc#^qQXR`ZKkVmx@+?_sO@JOVD_!6v@hh`
zYT7ABpa9l|YEvFLCDiReZA~n>5{2=l12Ps-VvpRRjev}0Z=G}Z^)s<4+B2-m6^o9M
zxNNo6R^<jaxIsk;qY>v)sQ|Tl_3CnkD<JGumT^Me_sQ9nBP)*YxZ{px=bd*h`|i7M
z*?<52%k{2zy~4axO2xic=Lj&Xa<nLOm@xnx(+vYR?nG%MKQ?cy7q)R|=J%Z*@4Mve
z3Yr`&!A<~eZX<8mv@Yf9xark}%h3j7Vv@8QWkSJimtl8A1uW{{(<D@Tw;X{|*(7Hj
zP<V9#cSXG@A=kOib*i*l1F}jU+<tr5ms7>My<_CZd)@0^<rS}ZMS0b$UR9p{^rsi+
z>ZwYW0wm-(V3eNBp7Fp+!I+IIqK2#(&6|uBAP!Pz^Zt4NF&&eGrIJaoij`BIKK%*1
znf+J(c{E7c8c!Os3co$ZUi-0}D6CYGTt~i>=1jo`rkwrlQ}Z}G1%z!TATLI-OJY5_
z)HRso9diW*(FY5OY(-fjQ<5KPpFqjE*OnWKkD6kA?#=Bp29tQblv;%fQa*OtX{Um+
zQBaa!g|OLjxyu>S>a_YN58FQU&_m0E9`vAcx4Ye~-2CP@FSoeGEh=i*kRg@7TK-XJ
za_9ulwvgllsWKMDc&Eh11n}`(cifnB*?%0NV?VkqyT4TXLH*s;e<{n>r!~l3y;cg%
z7~q&Im;~6U$R0FhMr&pp8}D4}y$3?$!zOu`JS|P(982THKCw>9hCE7*>nIp+78Hz-
z4V)Ybc;)~$K-xp)R7*Rw>H(90p6W|G;)eivXf6QXvvPb{A}3NFGoJm>oRiaNq*x{~
z1R%*x-NxLc1HiT@-Rjk=D@7!AObHVc6Ex>3dDpz=H7knu(1$*>-04nts$@q6fR{#X
zr^R`q1%<Njk~Gkvy4q&JQ2J1I3y9c3*}%QD8^GL~+bTa%^JLDP*U{YS!_*a0U!CFD
zZ9rzYWuVI@jHzYM+*NlZ$ti)+mJ@`nBff`##J&eiG*|v`K*)4}irMyJ(x6c@AJ~Am
z-A8^ArI{40Sl4;-uz_)Z=iP%Ma;ybNpaEXb18kI)4<Ml&8=BJ4$rJrBZrG5)N8L>n
zc@EWQ@*z_KC}3jY_FjFS!(wbw40Tboh$&S*W#U@bx>g5Flh3RUmtJ~lx%gsTt4=F<
z??yMeQMt!G?ooE%efKIenss$VF=^DbVpC<70(is=HdYIVp<Eli8*agR^}wRF&|PC|
zq;%+?DlAU(g=jdhqj3PjZR(6cjs|m(@`IEGKqDg><mSCP;hkULLg8p%fPu}TeB8Hq
z(V$WQXMYuIMk#^IOc;=6o!!zC$y5$dtzhhzE0t|BzyyAd1b}JVir<}`18u^}0bd*3
zm#Q`fR0f-)JlIY{jj+yKH3=pfRU_l=mpocGP_n5p?g9XVGIkBX#tDTok=3q<`X&{M
z+<sXAFxs(aQCRlaV~=wC+uy$Iy6djB5xY}Z8v#(c$xMK!0HV&?BcgoHDMfpv9AdFo
zj)01Tp^8lqqJYNH_@`JWSdjWrEu>CvpNaVdAtzOP#7KIxIXc2cAL!WSP#~M=to1Z8
zE3H|6A=27}vT~ZR5KsqH(z`H#Nhrs%QQAs-1(aLf@|NYE_q=Dh^PTTp$zMQu^{ZdK
zVx@pG34(g^aRhQB=Tg)cyS6}q5jd*3aL-PW2eIXL$5A&1Yrq3Q&pqIP12&Np-G_Cr
zU%$RMI#1LNY#7*X9FSf`eJC%MEdo9TC}jl;m?q6UX0gb#pn(t(ab8Ct97#%ey|j?5
zam5^)0RVZ)V2!98Dy4IPfCcJ&v;0D(Jy#pF1xv@0fznO}vA|-fb~H9@*ig<p@4Sj-
zQU;#(w5OHhk3YV==}m7cC!Tm>dDgR@RqlWP`&SAAikS`o0FaTHP(3W$%SGzNrm^vA
zqPO09>&j_?!jb!?1XRsl@(W-1!t%y9zOfv6<dNn2*T4QIRM1VATyja(#tSc;Vo|Bv
zF`oJ>gE%=-A0GCwhn2$)JFGC0yMHp`I^<;IBFoWv8-%F%jwyf><S<w;FoWGOb7^%V
z&4gYny-lKR&(U&er#dxrjf+#lg5Y|Eb$b<+B10xUCm`H#?z!idKmPHL<!^ucTVYDE
zw|l?=2ULy*_rCYN%L5+pfI?Z|d|;Aqd)wQV)loP?eE?xqx`g#%ha#3|A}gw9mjp#j
znJED~MrqjrZ++`q7j{4tQ~s2KIr-;5|5<+g;~y98%xNdEGujH&zDGRb5#@*@jwla&
z-~$Wo8fCxgRT0ZhasB6DY+=fD#HrdKL<!CL$bgU#yL(!EgG7T3lu4F}{KL*{0hv@}
zJy}a8(4HwR-wcbp_+S6}SNY!ezE|G$u6I?(n)QXk6kxmE?QU01@H3wAjPjxvy{J6y
zagQr^z3W{IHp&Ep;srb?BX*2yR3O9-0VQCa)4=@w?|(1f{qA?m|NS2+qEx#ut5&V5
z93hT6>ZpoZA9Ktxl{j&m+uWvVm+PqQ<b%x@s&{VAYhvNp4TRc`9k&TiZk;*Q0GYXD
z|0OhJ{}czrX8iz286fxRm{pZxOC}J;i4a5yipqvR|M}15^Pm5G`Pj!kRsk{KtU42U
ztCAZ{C`v`!y~7>uP>w$O=*pP<*vCG$0z<Bk<pyIUCRr-uG&v0ztBhIxyXc~eI+R)!
z>O}3H{NyKB?qQ7Ed4Bag*Da!R&N-)`pw1`bpp?+uPu|-9VZ8sMeU~H~usvbN&6|*L
z8Zo&FAe+~gLK=G}Cw?o9B~F~fWP&As>QkR8AO7%%%Xhx>ozjxQQnXYPjr!g2hBvGL
zaG(3!r;-`(a+kX_9TKXtp^gQWWVEg_X8DhjVXs+a%x1(s^w2{qZJPZM0Gm~#?7#p0
z?<?_QG9T4L{aGcXWg{G@BRSrA9kFASa3t6<_QE`I!?bRSaFKIDE<qnP%;}O1+Rx32
z-EnQG-^34p_`~v{4}GY-=RNN!XPj|HL4{D3ZaoCDz4qFxk{KWW_{UeSS^$H3Do+*^
z>vMUti4-ET>HY3^zv@}Uf!l=bqRidu1H#|^?sqi^CsM|Iv9mIZ)gW{PLIfp6IsrRI
zd`1F<yQEoIF~e<=oj}_pocuI7jyjp-k_;x{jI^AM6GcQF%9&@LS+V8UzV@{hAph|X
zqEkxs2)w5E+i$;e_~D0FCLS^%GYQrWls#_iI~$N`x(wMgb*7zFkqLWMfDJb&A&{}n
zqJ+&`^pz~{dNUs-92v!Aby~)yNQ08>1SFl&7du<Z0MsGvClgXqxH&nlVG=QkWW@Kq
z?|tQiAN*kX{`bFMrUN4_7<HnZJ}f4ZM?LCMl^1m{YUSbmMwFBs$eu}2Vz=zZ;zP+R
zIq*+^`cpao{PSzOqOD8jGnBCTNFcNb+aN><&G|^kgec*@X|+x996I6mNiq0NPaaZe
zi3C9WQ`%~0hXVyU5&OFIuYdh(`O=rZR8BbIgo-_r6WJ8kty@=O+Q}_b1J^6^+Dl*h
z((-~Ayr9~GL&c_+y6j9H>caA|(6wvV7OWqbE-N)yid_5ipZ~nMB?yGXjv9nxlQpi-
z(Hyoxh!QTkOsEmOFHk}<A=xnP6{`4${AZTYfh0GZz=q~s;@74}<iv9Wh6w=q!yo=o
z-v9phmzTf%<>hs+dtGHNY3}=`d=<!u6cMZv1*8?rt1fo=2YA2!^{>lkKJ%IK$xnW=
zeEZwqu55w8*`;`2S-<`5Z!4Q(qkR_Ck8<<*iQ6TT^~^D`ie<y~WOssVi!Kwg4YCW`
zs?+GYbyg0+_IJrZ4cjXy*-JX;pS@@-`F-h$ExzyN_z&!voOs%4r&TiIJKy=v@{x~x
zr2OCqKbV$9=iZ(HxWD$buN8H@``zy@qV(I|_O^2J$tRZ|{pd#pW$al&mkZkYt6%-9
zy0-yBfFj#_E7I2>L|*1crV1~bv1=wdB>*aRj5SZWFw@ESOa=P9?&15SEW;~Sm1Gr|
zVvuzpyr|0AJpWyoZvAhf7p~ruBR4d%(*~^b7r*#L0Tfh`27UVJr<cF{<u3(Q!%9<r
z#-JRT4Uj26AOHBr%PFUvQUUVCFMe^s&QCh&r1I0B{<M<u`k{=<tXZ?B{N^{mDX6Qq
zPBvuc9FI<XX`+2}FHPy&YjQ5ns{%|`Iqd{28v!DU4TP(K3U?m2X~HVtd0~ZUOkD!y
zqe<GTYl5@BzBwH&IQ!xpGfqgyK9G23*mEVbp-?Ceg@x>A7X>?IAWpd%11gBJ+5rJx
z6pWn`aGd|_XFsbb?aN;FvhumleXgRmKsH^)?gKt`s!LlZ%fkhc%Dgrsxeq`oA<cPq
zn{&hn6~&(A^%Xs=uY%JQQU`gEak_0AY=Ur_DmIHtL=x}Gh{j?2^lHjv03r?gt6%+U
zr9IQ4QLYvMa$EO+8j9VnsvDrlie%9*eBlcf5WAJF^T?iLP}_te4VuPof10Vtp1A#K
zrk>TSR~OzrkzdDipE(D*x~lpJgn;ULoj2ogpu#<B<Emwg&avGv@}O<HvvTj|NC}M}
z@U2S!I3(OXM_(r3BuaLoq$O)($mEqeqJZQ@tQtjXP@#>5TmRV+ITx@cwk}OMwPSPY
zsi&5=zy0mym%sdFWjLQwpmAcKn-|W_Zg#W6A%fkKbHhOg9aNc$Xzg6peEq@hj_Yig
z)3g-`vEwO=ukpyPNrTw+!T_1xP1q;pt$-XlffmI$?YKDtP)7~;{z)8@=oNyaa^$||
zofK?r%Az!RY;}$(knJ<ng;orlxwmHkLc1WVLy>?{J>3dp!GK6f`M?K0P?%o2m6OMo
z2-LuK?6Jp|m%QX9<$2G0UU|w>o>HFhgeR28JmxWl?UKX8Lmu*wYRfN_(5<~9nGg;J
z!qq^9dpy}{-zV3wpBy^jtfXj)YjWJ&0u6Atbc$o@19Ln)k+<}Xa=cOiwgSNHQgB@0
zr^lU(TbFp`kw=zCKJt;3mkqBPfSL(}skd_H=Q8GX&OAd_&xq1~_OqX@v|g+l@VgbZ
zhwP0!b)tff`|Pt%v9+jeUK?;^_+|qoi*~DLG7lvL!Ud;<1XX**R>5Rjssm##5Vmbf
z)x{<H&!RQZOi_U6J(wfXm)$~D#<$sKo9ew_F8`cG?See>na?b*eB~=ETjA?p|N8Rk
zSHHTv;SF!7jM?^%d1L4Pz5<|ni_Z6HP*CT+ZUj8+n8H#k9=*!Wl#jA9z|+WW@1;D>
z*4B=bU5pLI#5g(cD-Kk+RU@>M15rXp)S+3#79DoXe9_EbuFCwv000mGNkl<Z%4q|P
z-Fm|g2=_>5aDcHGo5#4_^RlL)VrM8Ic?+fS(h(U9MX4j!h6<*RzCwUrC=DEBQC9Dk
zOm`#AnMTbREj?Y?Ue|!`wAebo@|CX?^-NMib86#(owRxDwmC6Iu#secVJ;w~!ZXQ`
ze+cLG6E%#b9VN79Y`?L-wp5P>l?8woH1<mY*&_hjjyCB%UycY5e(-}U7cI`Kyr22(
z1)P;D*RVQ{ebQLDWl<Qg%U-M*3%=lj3knBUvf`j^06;cPZfYE4QCD@Q9&`Ki94}66
z2HX%k9tc+h6>dH)X{aXyF-hdK6WGfbsQ;LpegH^#M@0$pR?!u5A8pf7r>b`^lDC+_
z!0wX<cv0!TIaY5EqGU`Nyi`y=n&j#z4%4y8+}l?$*>*6<VO;b9sW#7`q<jQXLlG!x
zt(2GX@yn*vIi*MWX8ueK@Ep(k<~P4t`AM>8+F#CnHG%m-(%kae8xZEpyjip<(qFi&
z#r>6UmO=@!Bb2b2Z*^EDKuC6IUh9=!oeRE{^^_b>NPI)$@rm_IKuIoY(8s%^1^R2T
zRO4o10q*Rx&n^vLyvhudvU3W6zzgU3&wqaPY5;lith3Il4BsjSFtX=;?|a|M@qzq_
z`qFk?M={y=hy#=i<>mJi^@Z$8mi@#hK2gp)ul8doI2#u>p95i-x0l?k5@A9}s_|)F
zm@Yj~;Z{Yc!>-BODX|%VkoPpFg=T)YG^6eva>19d0M3u<khPpU$~!REvBH5?SMC{R
zK&>}<J|i;^nQwgK8-+RK9q)KYv317N8WmxPCX;y?s$ZFm&5%L+i(mX=Ri_;m(JlyT
zggVw8L*W3CiN%Xc!~v!hFE7!+opTlAsRNYtebXJWTsu4VqPeAMzXdUQ4@-xS53v1m
z-e_~W8ibpS)#UwM53>a!DhL={w+QCV$_cF~A-SO!CDce{n~?9b89w82k5ppUh3(CC
zEZGa#<S>Td_H$Bv!NS>j(rJk%;M^Q({K3P;mqzoP0J!(Q_r1kypFTwN>}Nl_oOt4i
zm4m^jKmF<Qt#5s+ve%_-<++U2@iVNWb3jGucxf{>^SrUoj2-8B)qNC$`dnTeDLg11
zvk#@n>!6<hq$fS8Ft?!Cb=m2TL;y0RXV8e1Md=+AX~XccQ_`qix48vE#7Vgn>n{vc
zxKSklvXcQ!BfHq913r_6A~vrz(>j6LJv5n|VAThBBC6Ajs3mqy-bnF933h(Ikte?_
z(dROJc<Hm5wBJYIUymXNk(EON#{>pq8l~+s<{10L0Kxd{B`0a`CNmHN>@mk2Qy%^3
zM_0z-XU3%C{bj%=3#vQMtlYJ}{N*nfCKmw7vt?HiP*6H1BGi$5NEQT6`BkAl{;6lx
zs#S%ubKrpoR_`=N`Ks?UCoCbj)se|OAhAst%n{;Z9&@?BFk2Arl<Id+g!~*j0hRb=
z&UldI&^4?|t{0*1nd5B}y$Ya%Np=m|Nc(o|T3`V(DO(oSH}k9yC34$(caA3|@|xk?
z`rV{CYMdXIwhkD1r+DWCySA50z5+~p#?2@X%jFdVXm&ez%mm=6a$`U(0h6Z62#s<!
zfw-~M-2VeDMaTOoSUWA8(LH<1<_Pg17voOm4(OT>RYo38+036dJ==*zoo<kt+aP2c
z^sAjbb91?Cz*_mK@xVs9yB2C>V(-8W2#xGTOX?e$*9V*^Q7GeaY0VoGKb-jWMAiXj
zDr{SM90F%p7ix29K)Qa-nl<YK)C~dC2ItAAc@p%MbB~4m&(wttR(rr?wYR?Yt>rCm
zc}wArUsK7H8EOdNik%)5`?%wdE5K;qSU!;EVdkIPUN^AG1H=^TFU$pm*m3(|gjEw@
z5Zf)VN@$kMI#!a7w99lmS0|&l3F&ryq4UT>1ae@pK(vpn_?a~1?TJ|S({p@s;!6_!
z042bBXZeg!uU{vg87g;f;@=bhmUAB2XQu3r5`9Avg>~=Sa?U7RQl<bM1qYR6!;{YS
zp@%Gp>PryVI)gZ)`%|C#)IyYCf(na<8!XqHwx7Qu87L<1mE_DpWiyw$tb~UG5_W96
z4(czvT8atzbu!xaqhwW|tYzxJ#%+6Pto&XPWiT-S=xEY=m0j$7V6<0GYvkO@gz^3~
z3ab{e?m7ZkuUMCH4^zk|QpfibD<I}r1?HAP<-O|0`~%!j;OZqTyC6KhDMX>hxw>ia
zEG}KXfx{rrB*YX%_T02|l>?mQ!Zw$zE_VAjC<qyjfe#3qLMiHi<(!j;P)xe9PJjhK
z8nyB%I&Hv?Pz96Pjj~RA^9Wot27qb*oXkj$d{f%RLm9O^F6n0{`W~RPy#LHOmQD#W
zju!MO$@9_B95x1Qai^Vjs;Je*oc{l#ptSWjzxmCTH#XMJ2a!1mh2=a8kig0`g95AF
zt_(*8``wK5Ohc3(*IE&AnO6`35;Ka=g`tY|^T{%d(`3S46w3<nMJjS&^WM6S<`L`V
zk^Qk`o}P#*=CGuKg{Ixc1|Tg`9KwPUQBN|XqbSdH<L4foHJ$+M^@z#{UOS$mPznqh
z0gYmF+G(d%rX$J_bI^02``q%J=RBu!w2()kVgrr1(0PPs+Pg*(fsw+3Wp@f}Oqgfv
z7{}b0GsFKuDIq@3Kn;Y=stvML>&5nFelu-S479S-fzUg>v{2uf_9`XwNVA?TDGiXQ
zASI^)p&gM`t5#JXIGW8s02L<$W}YZV)%R+!WCnH`yO*cx$nefq>03L1%YY8N?3E}a
z>Nu&WG@F83lJ^0zncp)#8xYo%uvw|WnhAu!XF%<wSn)tf^AidBR=@ortf-cau=nP3
zMlEeIS@~8y@kAsGVM)VktMNfmjn@QO5F4aC%;o_cE_^YJM|JyttQuPeNVZCL%qKqa
zi3Qc8m~eQNS5r)0;aGR89w59*^5zYM2D=*w0n8iwD51eh8#W1b8FJpKxmtq}>t$QS
zdi^xmYjW*#i7226NOEKYu;B{#N(;$$$L46Okp%!ib2^j&=;|9|kOsurf)Ew8l~?~d
zRFjgSk~DCJcd{XB852_Vi4%asqU~p+oO~7Ste~o`9wI0xH&LT?sr%_5l+YmX9x>=`
z(+ru0+%g^I0w~G`7EAL(?P!5@bWWrEQkqH@%3-8~@vxI~Xj%z)b>!sA)oZWhZycv2
z<`}AZ0z6xAqI9=9f#N4W`AM-|Na4UbDHwHGER=sEFKSzTJb@;!;Y1Ab6e;E;W+$A>
zT=>k%zXHmOLoF}K*53N;aZh*_;7;COA87Kw$jNkA$mPpI)w#<~r%hckSD9GaTXk3k
z<fDRw?-ZLh=oCtLd`j_}@nX=4Ni%CuZh$qXBOQ#}s<hCqf$vWrl=L+cZ9n=pwXH1%
zc_2;pZ~{3DphW3*tpI^?*~hjO=v@(x2)?5TFm-wNdQITqgAcBLD`hg@+yUK5Ie&5D
zTM}vNz9mjMv<ZRGm}_ObaXiFG9qgU+0zy>Kpkm2sUnfu`d|g2UI+@cXfR+r2Tw}$e
zd*!*-t#i{<w<wpeVZZfpK%VYJFA5u$DFP^GU+<sTRg#Blrs%8#DrH<Im`=oQHDRGV
zZLm(!4vSCLQ80MJ0IB;>QGSqIyimnSYKUr^Uu^{<gyJ13|GGq=L@ewO{XFO9N<WjF
z5-5~RQOrx)JLO`plWrCDD$BgW#%I8rWvmP!v^tvkn{%4*?K2r7vsJsV#>kG6cW>BL
z2N~yfUCt?TEDP0lZo(G3eq0HKtK~U2p?>5y`_1;I?Oy|?eP}=gKopVLCFL!aopMCc
zDOY56+moo^SCa3DUF%D`&lU;A6xIA<$`ZSB=r5?SzmlcY?AQP|@1a0oqgF>Ve{)W6
zlg=?!p?JN<P(Dfsj3{SrnN>hhaEmno*#-cj5Y$wyStC21FT&EE>wKW3Q20ui&yZl%
zT=uz@DYMT$`xI{mN>4`AkYa^0PG(iVi^r{wm_gQUi)2{u$5Z&UMB*0ZB+34Qf$Fbh
zDP*9U^_0dRc5KybDU=YPa0TLtH1^dPj!qI~K?PBkLB_dL!DIpmE%ft&kPjk*a~IP{
zwS(g0o6Rk?+*7b`_jpeP2)$p-<l@H|?VhYzvu5&9MPJOZ1y)l#M929ZQ-}ky-H;?Z
z!OgZ7fsouduuMP5;CMK4jTLoTkc0u+k|?1`0YEG(-R~JpsD&#IGS2M^fshvwR!C;9
zUR<*O3ta8Ob}&#v>{iTm_b`uL60l7)eI0p&`y`3i6H=}Y<`^}s=h^uoxyS+8qO!Ph
zS_Nzv0LhPbxXAX^g+cxeGB}KneE;gk)z88I4Umr3d7JamBw$sJGxZZS0os|$O?Mp#
zjW1yzpsKHKk?pYM_KnOpfM|Pf5`^Xjx2iSUic+DFG-*DMj+6D&3&)O!dDeD6Ire~D
z$A)w01OUW(Kb;)ATSSH=2M_&#P#FM33EQh*L)e7?vFhC5O;~bw=%<NwoT>3-BXOp3
z(_Qx*oQCP60wKAOoQE2=Zv;G)5C{WE02X=o9G|l6utcYIKuE4+oOaB$I+$;5b{}&S
z0NS9ipz1P?cDK|=5s|Li=E9)S182I&ipNq2qs{Uj3V>FCNtvmh&E+};j2z@RU7t*%
zu`x!{)0Lg>ntRz`Q8M+FHEY&XUw*BXi{{NhXh#J#3<yy+6b&Uru{c98v9#xl_U##1
zt8!lH^eV4Un;e+>5uqG90nzzR&bXQZxHjf=cA*KXUNtDg^QBD%fsj1N-lwy@?%&+<
zQGYTTaOqpG2|&SUjaaF)va^ZmH^!(Tzsid!Ctis1Y9`xYi;`8p6iPV($UG1T5fDlg
zmTr4hA9AS*>St!-GUv0$KJ0|LQ9=Na0UjZ$3g;gx>78Sax&SyUIWYBf0)TZ+dL%Re
z2+2XsA_mq(SVhhJEg`MXC=*Z^hi-i~xol_l#Z6qdGK1s+zAeu`108CJC5vqZg{j6K
z^CSp8qh_Uu2FGIrM1CCs70`jp!l9VlB^SL<(j+h_D6xP&u-@NKvAKnQL5Li8ql6l6
zLgv<rrFXZ<@M078)t*qjkq4kypQCg6bBU;xJzX+gVTkt20KB8Kmpi3iP6=WIgs7ls
zz5ub=9w0+05gAmCZS$_FkU}Ca$xZ-ZEZsM{ht;pr4+xdvqC`{bv?d7@fQ&NlAk4Ey
zEnsK1s7wZM7z>n7)K(LOr2(Pwsq<Z%Z6w#BgxKl7qF8LelD(a0s}3mZiX#iQzkg#6
z&7Zaaq4w6r9nCL|7zO-)$?zs*8-M_8JCCCYb4-d2CurPEHCZV-fMhqz8dwxz7_6pQ
z?@~ycM6#Y80xu)+H~~y!;<ZoC7(9ir<6-s3GXWkDza0>+13d2`+aG4K@gUR>JGLJz
zEicg=nrlD;!X_om<tljZ$9v#pLB@DuSao6YpG9Y1n0PVNad}SZ000mGNkl<ZjR_5#
zd`8cM4gg@gQ3iZV1);tJ9hapKWaI$O`^dabOcdWpV4+3k^3a0ura<t?L>UW1vkw;e
zX$iX`<VCC)HEcZ<h-Cp{HxN-k7^Qbts1fzkVj>56E<K=edG5)6K?s2DvL=F=LL;T;
z-kPOX1E&IS1A0Npr%WD`F8H|xY}(l5bf^K4XrvqpJooRkW4j<e9pZa6G-tLyvGHW{
zQ*$gp2BbDML}++KW6h0QtB)XARH#1VbX`xg%$(9~VD+jDH58lIb*zrf{4FW1{}v(H
z7-bSoFiPXve2j&9QDA<5yj-du(D9WAY?-3s6;2=w%dVdfyxQs95rx)9=XEr{ZDO+~
z7dg4w7Y2IuBx|^#Ul4YCsz$rtvD@|Ky!jgeI~253W)d>mrC9OTzy9^=dxCyy%$6S3
zJlO<PPjrfsStv76Y7~?9|H<4$5y8fj9DV?zermP)#CBO~ztyu0#P-MxbUtulfMPdf
zFeZaCom3x9`shbLTKEkzWH;=G09DT)YQ_{Juh)Z7%d>M408h?w-T;`o`!dmJv<6#2
z?x`aHGlG&O>b&LS!i@l+V9PXdd$_;h_Rry!Ljv1jgA$rM<+YBb1BlJ5^KKEPRVO(R
zz?JV-ZYX(xG*d+yO8^JNW?9sa0UHpT`OE2r8v%AdwmVumWd(IyPZk8o$!4H{6b|42
zVFTnB$Y&53CyPuukQeO>lLIM1Q!dWONxvXOj@yE)dudX=Ix`>bU9NM}5x`o>ZZudX
z6u@kk;wkO@5Fcmq%LBd%$y2^v4#DBZ|Iu7vXjgZV^BVwZrYC5a#<W357VNgCJX3wk
z*M~m>IF(P*0U=Gj`GlHdc~zH#Dvv0Hqubn@W80C~FwMAG&%C9(HKhG8@&Ij0N1NAx
zkcY8-WhB3OZ8^R0BS4PhUhgAJZPBUU)|f}))i$}IA8e%9+(SPP0z%tGSaS1;Kxlgh
z2>Yq0dGB(1entQlBqLHLdOZQq>ewzr#`g}jPdTHQ?d!8XpYFzfz(cdL->8ECS=Z-Y
zG9iy^$2x!cxOgM**F4&GA$P1Ky9OK$)kIW?TFpY{)Z2l#N~XPJY&*&M4IbLh6BssW
zO@L?>)%TD$tQguCGG6Bo{g?;rutVA5s@s?C$u-;M0iK=1a%hZzIpP!ewd65kqlh9O
zKpHQvX-bE8LfHRoF9K|BzR7I`@OaYzBXLXKyvBY(s1XEJ@&-UUuOlt1+e`8F^*JAR
zE@iv5D^~0^vDGDaDl69?yxq#}_SmuPNEBc!Uk2l4BaF(~UgO#0(<+<}#CN60^AhcE
z`^gR;Z>m3M479+T%bfs-D4{X#WX@M&5D;R?K-d;~HPlD63A00Q=MJHMYqr|@z%sGo
zQDbA{M~_XEqsAvDo-?sx-Q%}kvGpCY0xm!Fhc4|35eZb#ZU@H-@q_6S?;GAQ<oi0J
zko*(PZHjaPT#ye}c5>!1;bHw&Pu}3wtCP)p!YPZlu{64wKa})_l^0)gtFdy>#8}~O
zev4EZd1d0zv9WSQnHW2K-By=7Xxp-_4>b+amsGP^2ev|Ug)NI59dNRCr^$pYAMH6+
z&b0}N`Hq839NEH3(!plCc;s>k->#WCtn}E#cqr|7Kt48w(oRg2T>`|z%Gmf*$5(Ff
zeLxg(nKchK@GKnL=a#lS4}ffjO<6I;<|hmaLZrLBY6!372gjkea=eURuwiT>3t*zD
znS0Jw`4?_n_8yxUJ7oKn+uVJJvIDA|?B&qs2w=B}2p~3Z0lqcK0K^>THw*$ojY8tF
z<z}l;9~}Y2P_5>rxu@5ynD9QV-2i@Vo^6#jE8Z?A`;ARZ95%LMy$=-SbUE}n0>Eb<
znVGG53lL`E7iOGh{=B3I0U`MS2ne$T+h&8X%9|u3Y_kAmlEVpW*RDNtY~6}e%lO#;
zq-Gu?HtE?en-92hDP#MuADh^7hmF*5sBI{l=byRHxD_wCd)uzrOCpzdl-pW!v&_)a
z8Zt;_OaMG9G_ZN!b~&LmkPU$~r$Y-HE+`kAJF#;7D`lemchL2ku`=ch0S2n`tRz;A
zZy4Kq{fhP4FlfJq*4QOf5zghc&Ndaaz%6u?aOBvr@ip;0HoW-lypHTjJ_yOcsZ(S1
zg&`d$F1+x<voE-G?P=>SE$^Nv6Mn)=8#>QPV!VuP*m=dodZIy2hxFvlvl^UhzjW=k
ziA}3U)^hP43E6)^s9>I7#{C;0)*z%MHx-3iNx+VQ5oH{p+Ww2KEo;vk9~(O*RFVH&
zQ%UmUh5y(vHpb(p{|dLfk~Cr8Oa#E&rTfjf0zx)M@^^D=Q*8dipddu5ZS#-|eImGR
zxCX*or@1>O&R4kTa_cUN-D~WNA$MO27|%-NivHaV8_H=LE*&Q>w3V0nYRf{^JFMr}
zVL~JxmI{4u+m>q+0~8YPQ2Q+zqF0K|e`q$K-=_g0O33f5O?6hM5}y;}yO!j<go*6F
z|8vF4iPOi%%6m&0`$#F}<g#Jn!|T_VuU=Fx^7Vsd5N1#sfw+|2&%&A2PhRknAv!gR
z6!ITOR^k?R+$J#1vO`VJ280@*kv6~E+dWJ)KBnkHIy5h3=OwOLyY{Thty_C?S-;hb
z%K8<@uH10(NnzChI4{o|(MrP%Vl&v-xH|1<UPWROc6;3v@o5iV;D21wG-6aS$xa{(
zdQAWb*LQLkAfchNc?{bfN=P}df|_+O7~eS=dne9kScf9goW-mLf;4tApU)hnx`7SA
zm{(9bX$v3V_Dw^*Q{uB8&rJHciP9*c`5_m&KiO3v&iL4p*GP$4Rpvtdn=J^DY5??o
zl6IqMTZCRF8<cUj&seB2SW3?U9J@p~4Ul<pN%R#hN53R>SUPmyM87aa_Iq^F4@~sC
zEA3q^Vhb7HuW0$;CC}^ylLgbJD$E5Stm!;8PESoblS3731##{28y|pZPq(_T{BO=9
zfV~>iC#9x0B)%@u?<Y%h-Fj)xvD~9_#D1A!5Q3a`4QzqTUGL0Q8vzRrz&v+g6ODW7
zhz&<eEo2B(5p}Gu87w;}_f7^6mmHSE5Jmvo1wtP#Vu@fA<>X5d6n)ePOGYg%eq701
zv>(mXhKs#57XXk?AtjTECRqy`DoQxZN1}e*fPRqsxeG}r*$MU}nE`H<9O)dE!yHC{
zfqB>5Pu6DVOLCyV?q?^2)9V*<XDkcFw+1PgwqujEIAJaztXoWu@S-$jrOvC5gy6$-
z;@ih<Z7kW#VSo`}Vj=g<<fMU`iHL+KjmqIx-21U_EZYZ_nA#Rp6YkdEVStb`0|TcO
zrK8Q~(Aa8Cjk3aPqj`Nf-QNgctG*j}aEddp<giI#8SoAeP1ol^uv_nuygnsgocNN&
z|4yU<vj@hYP>4`Kn(W03!vLYy>o~zy$E`YfqWW3ovE+LtgL47JCCTN`=Li@>yBxOI
zI2?4_jRGWd@SW62S!BTXEg8Sk`CrL<V<O6DtJALlppeNLji7_WXbIrypzky@WD|Uw
z^|D<tBQPrvsE763<})_eGzEhqLfgezy7d#Nyl?D<CKT^KQV8gnUVOfoB_mm*8HNQ0
zD-jSmpZa`mTRvppqMZ04YI2QqH?3_nM`>|dWqjBJ|2>btM<Um&>Evp2N%=7L6b<Ya
z_~Zd;su<0n;lpehL6^~!wrm@ySvM>F&62^OiXt-I80cipcUW@un-`k!-O_RfXXY;E
z8H+htn*{mnfy^|t=uHZYa)!<hvwfT!yaGTL@fA_4uw6eOJ~o*?H^I~}>^7w8B_AwU
zGV~+T6I^3D3Ya2QAbYbBF1dw09{|9X8L&}A%1YaQNYle+9+IK6y=2ArGsr2vMFbSj
z_}J|*Hf_pAqqVq+K=pv2gbdU`I3IIbKWAQ!^U+}PhnJ$rhcq;R1k7d!0Fk!Gr3lN}
zGZ&Z5H>Cg|Qw$}Js}*o%Xga~zGJ|nE#dSItlHkz}gzCuY(h2hc!n*fN1~g_`8q-ZT
zqv$><j5Qybqm{oUn{RLfz@vm159X{4%aj0k#2og&<~}d58ar|!w(NY$jiY=rpCH68
zcxd<*iqB9m-_X{Y<3aYJ_0gCgo(m|Woq;5`sKE5X;e+Rk{dUg5K-C@uqRkn}<VMGJ
zEy*bXHz8+tvn5U`I7%n;2}1ou{k#UiQ^Qy0dEB%IPaDWSC;&|mE5e@1IIgK@bB+3^
zp8yDalo5NwTXpHM9T8?19L6_+EO4@6Rdn(nFtf?3b24l64+dc&TIm&0N($?}&2t_&
z?dOtd_`Lb1@>6rsHecKSE!mq*z%un27dSe-dO#uym_ye9gch))%>c5Y^JZa`5F5vq
zoB1Q1UMLWvh*oedBfcl20+=~;g0}DywvyQqADJus;%=X#$;x4~3BbZs<!8uP2`o4^
zK5}8NP7-g7qwCl*H#%N1&g+N`)2t~db>7GyP5eSN(jWpN8PWIiuxMHy0o%1^JIFQI
zGCA?Vx!{*4v1lv2o2--~OCn&Gs2$Lee;<`rb9dtxnB=s<T<JTYqJU&WPN~hCfEy(Q
zXysAc=Jk<GYv@8ZjB>&U@s)Y-n-i_*wh1TMg<ND;#a5sF(5EL8Fexre%?x3jQF-zn
zcl+n3FXUf_Xu!&8C(wY62e#YEOu~2ovA*+`u~$qk%%x6H7bjQy^TrNfI~PYaVQ?0@
zZKxg~qJsPod3eyCxfiwDLVIR%;6>s`U{FS2#HO8ljbJhQ&~9h1b8Q0#-&Q2|`ARBB
z1nzC*U7%^+3xJ$XIU=;jLs<$3Ai4(?r1W9QHJg?Xq~3UB@&a6WBOMLWVl@yLdE78)
zzdeocEoH7q2DMEEa=D;@SQi#XmO3JtgnDjb96eD0GSOnMeuj9?yxQdLHf_{a_D~MK
z7F2r|1c=T{e|-7CI1pD*x?~mO<cPKEA0Psxof9wmE7u+`AS6p$03#2?{y=C5<}cEe
zfsf{VY#wuJqW6dE!O!WGU;<1qlMYRq+mie4pHhT<?^!Iyzyk@H49K*NhOceD70nfk
zoR%hb4X7Gt(^urGmzHn|@-vf+U6N#1!2(15v0HP;UT9~^7*+-HPd>R52vK0^WRGsp
z;Kgnouu)DpJ{V9`0E<Q;y-tcnwcCj0VAEDQ4->4Ji37{yx()!ePLqHwDThL}>zT_r
zKR=qh7ms|^fXkH+l6w=*JHCLYZ74YH-r{LLkINNBjcm;6gLgVWk_owFu?M1(^?l~c
zPlTx#=z-M&<}=u|87c>;Y>&z-Th}piM~xk&M$!71aR8AkI+@Y$a_|ObmS|2$-EPzY
zm0|Gp&Mmg*%k++b$VmcAq+u(ARoS0KO;HH|r62$cmR?77%5z;g<!!6+ZpLN-pIaIh
z%iG15@d1!FPy6MD-wk*c74T8W*i3=XTW`RKCD;A30J-Tm*6KQI000BTNkl<Z`)s~g
z35X!th7FS;Ps>dfaSok;Dzm$4hx<krh#J>v^#~<^5%_4(&rZ9%Ct?4Yyohopt7ia8
z0j>j4{H7dWL5*mkzChp|T@(J6+=)$M;Xs3eQFH*-wwV{j9f8RnF8LFvX|(P`wJZ{8
zN|JI|AE2VpslI0b8f=!~Uf<MtN=oy+Y_eUz^8y(ek?fZuRWM%`3=r1un-E>tUF}9O
zVmHUf^MGF6&HSpeQTeA+qtcdUJ4^x%8cXs{EQ*Llzbb|PC($P>OlFc@1DTK(iDk3F
zu{+wMMghr<C>4V^4<4)(1w}DYHL|6n$UNjaN~*m3+>asx9csidOkn`PUew0RV1B~E
zJHEgR#3&yPn8y*YG&=$?s6Q%a42(y8-7`>STYL=D*f5Iuu@o>)01dcUIr-W%)R)Vn
z8AcU^&Cw!s8)O6QH#ty6E1$8OJcMnLqky(KS<O0{X?+G7Y?n+2nB*pM7J$`}EXkB&
zqLss*$${=~*4Iv(aBT)WR0=iY`C{+<O({$P!-jz*r(J_OfQzh$0{~*Pp!Q?6sG@u_
zwf9MY+_+%RUU*{aK~a?%**MdHj#|SB>;TEGcw8Ds5%K8@N(@aAyT*QUX`nEy!oZ`A
zzyk!R9+pjE;nD^Wz}4^b$a(JLlc`_oukS_e<T;m5lg1&48AOa1<$`naXOg2EmKq2R
zc1>j%YEeQf-`50~HeQyYCTkJ&d3Ixg0D<MXH<yPN$XO<shU%k|?0cx(%kzX264^e<
zdng%djWV`nwiKH-pzgNk_zwcLMFzyciPf^R))n9ac2ZDZeRgzS1GO$Ua>u0x!u9|f
zc#aSz8g+ba3IG5l1Q1b3K*0W(f4rnmMlwkz(!JOsIf{&lt(#~^TVnFCLKCXI`+$yt
z*vnkxI%0xFK;d~!o=<KCK>m};W0lFCRRDApjtvp3b;N1`&?h`_g;`ZRN;fTa5Oy0&
zR1eU|NG1wpd|C?f%3;6rkw_Z%@yP>L+Ad{>`~<XK94Eh#JKfJzq#O!In|(s=qjA%y
z*(7~dLwTS?ol(0K8CpQWEee3A<!e8RkNN`W&>pl{6>W|nL_M%<W*$@xrQ>^tYH*xD
z5m6~-5*j5|=L@CYmqyXZV2*$Vl&+z6*dZX0v&f(713HwFeUBXzs|1>1&nK3uKQ%Q*
z!IuQ9?Pnl1M-a}`Z$JSW6ADOJD{zu8v2_%UEXg#)_J)Nkr#y-@7xp?++qTH-TOtUz
z$cZi^-0Ni!j_~AcDNS1j;g&MfBizsb4*&rF|La~;od5s;21!IgR09Bjh|pkomoq8=
O0000<MNUMnLSTYKPdCW`

literal 5049
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
P00000NkvXXu0mjfzn{u(

diff --git a/images/ai_seld.png b/images/ai_seld.png
index 6e00ec9d1f9447cb2deb85f88199f556c3598a87..da28b49d482cc1066aee30b111083c61c481b036 100644
GIT binary patch
literal 25847
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
SdSRUa0000<MNUMnLSTZlaDwOn

literal 5572
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
S$?fd`0000<MNUMnLSTZGinzxB

diff --git a/images/aindex_seld.png b/images/aindex_seld.png
deleted file mode 100644
index 7e422ec27ecec4c4ff106004849d6e407cf7f51f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5008
zcmV;B6L0K^P)<h;3K|Lk000e1NJLTq003G5003GD1^@s6IH*Aa00001b5ch_0Itp)
z=>Px|N=ZaPRCr$PoeOwW<(bES?>RF`Krsj^tx~04)<^55TP{|sHC-T}R@<#2yRNp@
zx}a4QD<Gm`S}$A*0k70cwYmrhwYEkjpjK<Qb+^U(wB4=Mt~aXGO1XqfLXtV(yYqeL
z%w%Sgkjx}Z=Go;uPo6+>=3IW~J^$~$eP4vVTTuu|QO>gWB<uxUBqP`hdN1fA5h&7W
z_FD8_&>;a`Il*V=#sMVC_D6#_ssWe={=!zNc_~pOPCY(NNn5lk!h_Yrkl-TV0^s8)
z4ZxGAxt|TEzb-X3rpFYDaDdVVy{zg08ojGQE=4&I@KG_SZUugb=g*aYUHeWEIQ94x
zB?($Vcx3b-TIF)!DpW0G(C91t_YPE+6Z7Wq!71;Rx@DIfXb1V>sv!iiOHsWN7~%j!
zYa|={qEZn--v+XZKo+p+ls8KmcIkn>Z%iegUI984<iHTJD#|M$&tNzi<cv^8BFh$C
zLEzsmQ%YAxN(!`o|8oN{<=+6A4jdeTw4TLlcyb#pi5G}_ClGiypo~E&izH<S$}$qM
zIW&BBeJNUY$$-{JMh~Wii<9zj4RA;_`UDt$4J<^qJ}Z-7ZPfdQ$4Lwx3BgQ|u_$da
zqPhytFG(3G3D9~^)xMPZmjKtJd@Mci!S4~d747%5Os;E84gFeE7309zXHmTYm9bee
zqAW*ax63v4@AlYL=*0u{IcQyZazD28|0*8W1BYULXC*-8b=1tqYk0z1a_&7l*n{II
zfzHA(1~O$t9s_@FDalBmf>t;1aRI6`lD@`a5o8;H{0>-5B6vcscxgvxhNY8+$2oq`
zD2%zz$%vuCIxQ&MP*$R{kR7Grjr194t)0-1eK!3Ip3Fx1M24UIr=<Hfmu*d}<hoyM
z@9OP!mR)Hrn;U>?G|L-Vj`8Nm^uG5-`UJE-Tvb7<Hv!}(;7F_)DhA|jXN5uQ(%o5d
zhcZ&>kHq-1P_53E5gtQi9y|Lss3|&VH}IAF=Mw1kh#ZCD0XD3D6XdSs&mNP>&)a-P
zUYoP*0cE2wIul_GhJMjo(tyfJ#4Mue)HnLd^(!i9z4MH6Dq7A<h8Z_IOSS`FxUENJ
z0m7q&K+f_;`a2n!1&nKx5!nvG<0Sms<)*%ok)natl@rR?y5;O7+M47*bu6mZl5NEI
z0mvN)5A+0b7VI*AB)&fjlOZF99iYoF-duv>%Scf`>wRbU$KQDt#+wCtytA|r^1FyE
zp;aG}D__`@msad%XD1_N&a!6!HmHeYM64t|PJ%^HTyJELgLaXeRDKbW8jKtV>P1PS
z4^g>;xPQM~x@L24LC&`9NJfl|b3sj*xel{_p3W(zjO<a+5#%u--v&O@X34UVfF;EG
z-7S;r{?^-&vtd_^#OMtewGm`lIuWJ1ltAVaD~^opG0>q4=i7+QCV++m@lY;g1Ih#7
zEs@LDezd0`XTkO&8L{EIm60&(*MRakesN@EkAQX>In=k=wQpk_WLp`r_r4kRmH>Aa
z19Cgq0kaSphe-uBvK`eG2y^7tJ?oA1I%s{dD#n}sX-V(62E*sl2_M9kpB_N`MND4v
zp$n9YxVeWP_#+YDCa$dO7s`m$Y{O${d_EN;-`!JwcCUht{N&S6=f_&ektWJUlt&0;
zkxY4RLlOCAoyx&(EgOZ$42%ocLm7bvjLnUhMfBe@K~1lLc5ML-8&AV{HK<s~u`n_d
zn-qG0ge>Sw$XPPdTrm>Q+=$5yYFL3On<ESAdcEM=E1(_ZEe#_er~yW!cHnb|-ihH+
zeC9Ig`9F)zXq3R_EZf3Xb3HiC4l6Y_s1cU3%Ui(Uliuk~8R;=-tvR-gAwx#udoxi7
zxt|;Ol&uKM@R%o)pI=`BeA~-NQ`smGD<f93!%9tBMq-N?II`DrBRvAGH8maw{rf0l
z<|bF^u$Jr~YZK}{N=$DrMaWq)vdwC?%t9HTkz(BrvYbSGuH4-_GEy*TCl{Olb{u#&
zBb*hE;_h&}Kvv)dw=(IcZ<mT(boNF$8QEGf65)D8vt<O9qP-&{1%Y-h-0N~8zGth|
zUqsm_gse7E{{-UQ&gAF*r_>?0vuqQ|2q_uSt&umfn1g!ejpPm5^~2rwg%iNL5jY#9
zJc_iMft5*duHl<6yi;sHxu;`5+OloI*W}6wE6~_nS@O)=g`Oub&`y&-@w1~yhz+aH
z14#{hEr>itkf`BrFD4rgqx4OoSJg+KbFep7jC9rbTp3Z8;>EtpkivqRZi9B3ylLYx
zc>XmGvdVs;pUh4a+d*_In@;`j-gJq2!dq)5l(C~BPGd{<J@zkCwry&W`(JJC==cuy
zM`fc>xh|?fMtvi$v2rCQzL=r;dn4Tf?fT)q|AoJ!)t+1?g7lAEp<NDgLT5AOh1W|#
zlXc1&<y0mPrA0o4=N*JGF@g-FftSGJeGGqK;D8NMv#KQ*cm{0S%Fx~$G5$PxC_fqL
z613Cg?^PX!=gmO55cLK`mTbSh1l}}0I_0&#wqz%3P3wk2^Tmjq<Jx>x$^p+-B%^V}
zhD_F5Zp7$^2u~3BE4Xv@2f0S#VE@GiHMXfo!`w(1)NIGfi18Nk$?gX=y9KQ^cpO-D
zIKFokDi<V+r-Re6UD$lMl!|@6Dc^Xi%eH`?$Us-0b#L7D)kmXpHLB;L9Drt^OSP(}
z+J4)<+q}z40<D#M*Z#Rf%U*B8b+vDDHAYh@)~&AKYy8C=(LEX2J?Mw4hSB0Q`I2Pu
zbl)t<_F_ezB#2!sSFPUG6^uRkd!1S}kg~F?5oVx~tfhke&LOAztv9*xWyr~QcJx*{
z%YH8kYSJ>|d@5_%%W0AM^7!hvy1Ks(L5G?=_TwaUDr&p!b^msd!-4Q=c5<Q2%)dRL
zs|)My@7-J1RDCMQVwAtnYF5vLygT4fkMCV8cdh<IhXZ6)Rg7V=5fHNxWSfjw*hU^h
z%tDSl`R(1wXFJeNlkcq_iWgi4VjB-_Be>nK5wsB_2c$JxwT?!)s82ypnBeotZC^#T
zHVJ!R8g%CDfG&aC#vL<@@2y?g*?_M0JpHzh0<1S;BgiN>qM?igiNze#c~H|H^pbx#
z1kbx1<qDL_bkiZMLFJF2-)gg(5&&)c?*<-lMY2?O8-~yu>gX#R$il7t@3$lyD{tc9
zHA{9E12`FZx8Dd7dLxQ$hPMN)-L_*`j_=QtWgUAXS)kQU&S{8U0rE}IgEAVye@$Qq
z1co58DhqT|A6xW&lj6Mj-c<<SK|2ARg50@oH(+!&L)YHjRj}nOyKKiuR6`lbD)`D$
z)GXvv?PVklT9;HGgcn?jk;{OgkzBMSpWJ_9%pA1*r}!;r6GWih#cLhSB>?(Q>!)D!
z76-axi)|~MSqsbsZfr_dXLHEfd%6Pc4sT({oQ&AiaCO+l>Slm!#YEo7iP_$W1Fa98
zb|B4mN(0l9h0{Ul_E`(r_G830zbKPmZPmL*PsGTIwwsYUnze5=deWpg`>vmY>MgJv
z>By9e_A;{7S@faZ1MQgE0dh#c5n+{I&vZS6;W@0UyBziBaY9?TF0ScN;&yV*l=PGa
z+X!yE?Ty?_+2++2vOD<V(Gw9_5$ck2aq4I(0nq)|Pk{(@SMFTLGO`uT4|LkH{hcES
zjLrRI2Q}!UsQgfVT>p}zrAx*SgTz{tBcjgER#abet*)^x^_kuF4zyZ}PUq%I0QB%U
z{RUqNb_zy@baWSZC^dF4oXuft?(L3rWV(P(MzrB1@UF|25qnIjlb@{qS_t}%u}2Zt
zS5O8={cx|j*KpIIXLIuax^VPFJa0wDs9i^*k1g8X=)v1AL8(RA*FoqCa(fwBkC7WV
zynb0OXdOO0&as2b*j3potJ>#9(lRor-w4z;!|NGQrAAS$m#5a88G?Rr+#s5RTTnd*
zk@qoD%Mr1s<jmDJznrx>(2@f>=wr|}VA)bV8iVztk8_Z_8x^{TBK8G+5o4yyBWqvH
zvevJkaUi?&;&Aqt`8CJ`vZCWjNY1ib8b;uGQ^S51{Uvx$%1>559)h;%&kb7+A!ddl
z{x)J2Z)VPb$~v(HO$KPFqmMy5i@L1(AY$HhH`CS@Sv%I@4*X~53)t4M1#I3}D|OkE
zlJuX)oeQ!M<L1|FM&)K!t-hzTqK1Rrx?>n7@iDyEhs2xyDyzadI9+D%+JV*#&{86x
zZR9#-%yAfRHY#VMgjJv2%80|&1pFvzZ#T;$?ei5nas0P{1<}+GD@ltuu6|m+I-Wo1
z`5Dp?-bNj!Z>1w;2&yVvIsRAzorKCi0{dZ{%M}_^T9?H(S_Yt-T|Lk<k1(v`UTHnQ
zdK%(=H$(G_2s$Ml;l<ZMX@GW@V{_6UzWi|#<wxV0!wDFK5KF%DZYmP?VI;eJP(Dgt
z_glm(-jD~M`fKi3lzw>UkGs}Q`DlAkwH#kRy*L(arK9bYtV2o%bQ+MA#0eAPR5ZjH
zP?;@{+Z&XA!&>D2`#UUUWl80E<F17a(00H*u^6D|MDAV6eKOSHmmcWOEHvMr>sQ8I
zizf>*+}R?6w$jn|D*fLFooUe&)1p(-;RY9}BWC(E*O9N4=Ci-EXbZY6w_VGpizOWv
zv~}`Bovvf2xk%>qyu#wDI=kyN&C3xDFR!OfJPx!S3{#+mB7wfu1}uKIbo3Ck)>Kun
zz5kHp%+^X;OdL<zaAyuzoef=`{oGg&Lv~?wBfBa$$*NVEO$XgFZ2fYEMTbwWSfHyX
zqGW?^EZm}9#bR5<naMov)Myp3(5h2mbo;z<_5xO!{;~T^`c1R@+5aR^eua8>%45&|
zzFTxNc5<L|E&4OXkdALxPsFob@zK>-Kf0+0pszXWa7fsM{RO)%KXn=9<v`AU0L`Gc
zv7vd6yp-R9gbuWcq$50LEl(#wx23JR{p|8mKDD69uxJ|@76{sD@-<_JJBu-LdWI*{
zJ|~g#+dBmwsd2{z*+zGczck&FH|TS60v79a6b*E)bTk)c(GK+0qeq}I8+m;`vS?d6
z+kzp?9ClX8&XN~9r95X}_c=F1*B<BR1iF~V*ZeNu!BJD7GY7+>fS%ofbhPvUw6*BK
zTZr=cP>%F<@b5x{-x7G)K1gSSUPr5w+I@XrNZ55u6B}5u_WgVzyQ?{C+_gxKd-rTH
zq{D*Fln(3OC3*n*%CW;C0v%e-uP`!|`|AIr5HQ^q%x>=JK&SlZ@H4d(4RlI6!U3`8
zpfv*RbXeCR{xpWH{&^vZn{M*!_HGVzZc?ef7#4j)2htJr(4uWurq$>$yS5JFPvejh
z0ewaX(or<fRyx{7|2njXpc4^jcgzw5ohuzh1Dz`!y#d+|hAGfmViui}j+90h1@z47
ziAZG8p;gyG4=j4J^`kQ^+G@0wj>AesI>trP(WdIP6b*Eiba-`miGq?!&W}!kPFZwH
zqe}(!cvmyDV@PUSM18VmxW^+yYtdFZ!YRmMnzUIil)Lh8M9%_kQUQyu!%9c#fSw7=
zNn=)B$eJ}XiU4~21dQ6jFj^N$)*{~5<h##)*lnLF+A$3}6|jWS+&U-?&{|bBkctYs
zMA22zCEH0wHPqM7+w-8OkF7?$A7I=cHL%-%5$M%?Q2Dcb(~u7IB{pF37oZyEI*hEt
z$Ta>fsnG?zp7}oP&h}T^_gr25Sv+rkwC;%A^{wO__v=`*=0}ADQ~4#8rj9uV-=7~f
zVcQkS?E=~Nvu#I>Jk<3%qPaJwUmy1wkXqpMD6df(pvR1<#P_EoVjDlh`IPoAWf*g<
ztSxLwp!`5zTvfpV<(Fc(EtxXhFS6?OsCO?xY$frQ23ivBkJ-_jt$0ic<b>n`Dz`eT
z2}AI8$%Rx3wrKa3R8^HTkP2G&$?M+IM$p{+F?|1@5c#_66L*y#-HOO93>a`nzHe^o
zxOrcUPCfI}NMIWZ?UFt*H*Zh*E2?iK*S=`PWR#?K+Xp8G!~O_IV;JNv$bzN^pwBvM
zf4tx;i0i~J&uVsb(v<T~<(AHD#!qBmvcLIgaDR@(ZZ>W84Dt9(sjK^Aq4JbJXlvC2
z%O@lu+csIduy!GHMslkm;q^PvOlN8R%Y|sPerdb~d?zYLMrqQvhR4j5Yk02iZof%3
z-Q2{+jnB!e9ZzfS&Vlj<?XGd^mj_}R&quv0QMG;5w%0B7S0uvoc52NzN&2>M-WH#J
zf$^uZ?3v#bGT`Vr<1Ym6MH!Hl%g%({HDJ4kwc=gLx!}Ka53Zr%MS0~F+oxCXRuE_h
zd&W5fXxw#bxN?iw?}vh2<|kSbGt<)34L3PS`pkV`lbz&2%YL=8YE|CL8oO)y(wWC&
zj9pt{G?HF!ExUlwIcVF@Y*%Tplk49=^<{j2EklR?wmV%-T|I$<LAx7stGBQ(EoB43
zbvwi-NcAE_r*1c;J?D~AUDy(Dp)9^xe(+;^qXlhlUdev`U=rn(_=)JLCKrWh*XiBK
z;bSpFBGF1L)<hz)ol{O}>a98MJpx@2jsK?~+6%f!4}LG`y`YOkph&0LYtef_7l}ZT
aPV>L(k$~}CZ{_;{0000<MNUMnLSTaN#Kai@

diff --git a/images/amap_seld.png b/images/amap_seld.png
deleted file mode 100644
index d4af3f5a74a1633829299f46c26029daa1500e59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7571
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

diff --git a/images/auser_seld.png b/images/auser_seld.png
deleted file mode 100644
index 2cd9a438b62a0c37042868788e9f98dba7a614b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5503
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
Bq%{Bl

diff --git a/images/index.png b/images/index.png
index 3ad0a3baefbdb05701dc27becf7972d51df521e3..d8cb4f8d1bed46c85f70d3ce6a9624f0e7af64f5 100644
GIT binary patch
literal 6130
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
Eg4C(8-v9sr

literal 3705
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
XGU&d<-fFwo00000NkvXXu0mjfamEHu

diff --git a/images/index_seld.png b/images/index_seld.png
index 97f97e079284ab079f4d2beea9a1aa303efaa600..0d194b06ab36128f60a5a943171fb307dc6afd47 100644
GIT binary patch
literal 7247
zcma)BRa_Lz*WP83MRMtGkVd*wIwclZx<OL9rF&uN5)hE?29cC*L_nlNLg^4#`p<j&
zU40ibbAEH?Jm+f8JoB7bO$|kC3~~$r0D!HmB&Yqn7XCNT(Vpizt@Ty_00K~!lY#mI
z5A$B8naF1k_XM3>b_*HMi5V!rK|xJPk`6;b(=vAbRv%8QMQV@>REQQ4-HR`>6CWn?
z+MVc4cC$t$gi=yjV>O~B$tw^qMsadPasDlC@?>5;xp`VGo_)Aoz58m`^U#g4zM$LY
zvRYZ!ecMyFUsV|pn{~IxuW5}f3?Xg@8DHAsMBu!TUkCwN%yjg=+>rjmt?BunuM0C5
zun8_a_?_~fZ`4N%`NESHE0`uT5R(dBwHw~|x&UN>y!*0k^hX+YZbBFYq(UF>NgVHf
zffHe~9=Wp)0Qa4r^f$f_1z9ZmSlkHphPwXyAS|2siSaSlHxK!H>t@Tpp$LnALpm$8
z@yez~Pgp+iGm`#He_$b|hvl&x326X*PUF^gr=_eYMLVC=`Db}%H&``DFkm&PI<OZz
zO;SfVJb+Lr2(^$A4&!BGQY|9K_%j7XTAaOcgOk?F6A8wUeO_R>Z$^T)yc>!vo-+x@
zhj~(jBxuEy^p64i48GRl-OYG11t|q0eA~Y$8#8$m768G0fWbpmG;sjr;7Ulvih4w#
zcg}{EN4)OG>NH%6)!Rdkl`e)7J)GYvswAgo8LP&QRoqZqgOUhW@edJgt>)0%SXQgb
zH;R(v(gu>FMEOv5Y(OtA+W=5RX7gROLCz;Jg?NT=fxK#A8+O;Zy61dB>R1uN<P%Tz
zK^)&E$i4_vlHy?61j@YS6L0G5=S}3IDg=Vx$YS5M>+*=3N4?F(tfuR4OwqAdF`CdY
z`TmYZqIiZl9(Q7>6Mx!2R7F@mz8_@-SjI&q0y!Q8`1it1Dpff)DliOip-F1Am4bRU
zU_r&Bf$U4~!7;%OC;6%m)}}@34haTnSfh#m%-o`RUqkzt2jBxCpFHK+Gc|*DT7wF9
zU`(B`C^hkoGf-QK)%=@9s6nsSxZx3|CC5gJve#9^O@j9t-lSkrk?2k6HalRUu$XTk
zGcFOI?>$tr9r~BH_<?W!p)8gx%#9vUPzPSorf4Whbv#;OFg&y(55vuaIZk@vIcnb0
z{dPEHP`R5cRBwg-)zxL2$uB2(efQyO!n}kAT?ZEiTdJlKQ!8bR`2&vL@5KisW+dRd
zPc*~lm7_~Mv8@8byScts9jE2QIdvkme>1+Po<+<rKo<)M91g4dKOX%XR2Mu5aj^RJ
zbCs67hyu3Wf}tNf9LwG)#nw2p?*tf;30EbwLqrKMs%KVsO3Tiz`M7qObau|ydpb7;
zy)u8bLr7}%W~ccoYp>k6rE(SV5$agXw4>TxKEHD}$N~DGw#n!=sKpd^3b^FeOYBF3
zeQW=UV+^uJ_?+jW8FiE|>b<RNa&woA5V+tdpr%w2a5wa|ojmlPX2Wk?P>i;v2wW|N
zmsnQQukoG#;q`&;GwI@^+aJKZ(C^x@LigAt)elv*b|lN0Y-w^=&F!exoB$0)TIT!d
zqZc16%|5$;ew?ZE+%@k;lTa^iO)?A%$j|ysP5R%$&ay2L;SC+1$2@g`gcTuzS3+mB
z^7Z__z0B;U%s9o_=kD2ed8`2H3Jb5S8xs`~K!X9!_?Z2r_hqFZ?gW4*p<lb^4RM@X
zk}#v#+q1X=72u}v<tu<SP3D7fhH_e(ir2huqp?@3w_8&KdP36-v~8MYbgV=&S+b;y
z$8x-E&Tne00`sF&DP;yZ=LM?xU~@=2+ib)%3vRz>LZ7D2FPRZyN?ESd$HyH=RCk)j
zpnJ>MCcra)9^zm7^B(41F-tkU{ZJ~-{UhQFnInAI5!NHUQ=2_+K0&5TvA=xCj{kj9
zE4MJa$SNd-Dl_D8%wU(0)#E0bAh?0o_3)Ed?~6FTZC0gM{%z`0{V(|_4#%sOj~GRW
z2y(2>ol-As0tD>TT1=Xo2PK=zM~M-24NCP_JY593G||-E)k!sS)r_C_d5sCHqt0EJ
zmn}Fx<QCd;H(RKa6TYS6_~AMEq%n^GI|dF<mbZm(Ck=$is2p?PTjM#lWcbGP4im34
zx2*Z5c^iIoK<S_@U3vw-TmEM1&9Z<G5-1o-j8|bN`A){3j3DG|2S>~jmB|ueL0(0+
zFM8G-<Ox@q5?9Vkir0PnxUJ^fuE6tj@k#YsQQF$xZYEUV(_Y}m&OLbo$9Os#KNM=4
zm*B)~0*PUk>CmmTE0!83R_)f5G7Jr)U+(=t3v{Crj>C|o+IPG>gw$++TsrW!<q?pE
zSA(I&y%Z?x4m2=TcS#^eOxtBP|BC&{JQS8kB-fX^w>_C&nW3-RkaWM{Y4FI{k{Qe}
zha&nCm-NJ^ruHmkk@&)yCZLzSbS}Wi_3(OX!P_V=N~K@>?`CIeHAg`XJ$vB2+V;DD
zyM<KP-CI}iaM>3SdxkRC-M?r@dYWr#t@AeD`K#q>wsSdcrv~7ED6x_ZbjBc-3ALuG
z+=sw?H&`kUr6o2QJtkUjP&TUEe%>5$lfZedR9o}Bo<>a@+9-(=VOR7`Xv4B>fW1$G
z_Dp!#d9gc~&ZEdiTLLU^FqKv4OUnbcMmJ{0y$oN9>j&XX823^*9dPCtJ7#jc=gEkI
zv5}YhFO4E_$Au??XZpDl(~gha(JVUV#&}qwn7yTMYr;}eU-I$D6N7O{5BB_emp}-f
zsy=!qyVr;5`*uM~GmuN-7Lk&E?{z26z2b%#nA8$np!fl%sE3Nd9)NIQSA@{>jdLCX
z`8asA%4D^nD9BTBX3P-gY5V4J{Z_v+i=ldO^^~2knjeb*-4pAbwf&s?q*m&|A)MXt
zD9tZn=m*|xG(XD3a~%w|!pnZ0v13S2Rq35ZbT$u4o1*5<aCJ)hm-}whm}c!Ye86K^
zFQ<(QEE-PD<}NDr(cXF9ySvjCftdU$NMmn5uqDj_Um{__Wd}_p6LHe8F++GyEX3g0
zLB1t(6I;$u3k<j2_mNjl(?72$E~Hz3lV7x>Wzm28L*THJJ3*yyRW{+=+=To7D(Wx)
zh1}Bg5}lM%lx@_zj7o*q(xLerV2EYgFR?t<RqlVLr4Tz*c=<ct2Jng&4Ua~5E*GwE
zUgwm-M>D^6(yLCT*e97OxxP{w2w$gd>kW=n{ZFLD<|bHa8aE{!xaKBl>Id6KuyXjZ
zfgvcpvL(vB!<4Qcw<bOi7XOGS&B`mjp^;sTwoxXBJ%NTQ494kS+%#-A+qJY34v&N?
zGx$~=H<(Si;E8eASm3ErMcjYYS8m7+`34#yN1O7)`AN;K`r0?Ms&ru)=GXh_BGg8U
z&PH*Bvy=(|fsbqn)@7hIN9I#VTQ5eva7Ki4LQU7bbV@Q&)7j9IF{8u%XaLq!rv<bL
z4QVpN^>^PW_d!dTSG$`1d0{wg^>aVw5jg5Rr&-g&)r%V6xyF&D<vf?@kaQ->-eEER
zkmPxg0-^NBTcu<jdih$Za{ns@5zq(@`bAFjvJU2}IseymdEH+|iD_U~zJsi<>0iu4
zx&DUXf?Xu+RHw$4<kbbcx<vE-0q~-C)NCx-`qR*8_Zyqb=cHrA4`YMm9QtOh@B~i@
z`G@!P)oPk%=jbRCx8gtfU>M3~31L+wegEDq*y50IF{11>#Oll;1%5v(%r5+Dwge=3
zh)POk;5(zLTq5h~&#F|k-Y(BH0_7Qhjny;Ec6>K(L+Y?_+U#qY@FB>cDzAnv?oxUR
z&DIOUkSIg^lBx5-#*|s&?(~%v_+8v?x0>>gktyKfqqC$QF@Rq5?S;~&OFBNf*3^!J
zs0XPxO5iYg(500Pwj|^9_5S?Pm84(%M53>l#<U)m?r^2kRTlXj^1e$<hH{Lw^i0hj
z8Np-9moJ*lt@aqU%Jl-`UEUJ-bmAFVjRZ-rGi4b*tTgztd=kL}<bKCj_fa#Ik4obg
z_qcaLc!z3aFPP^W%sEw~bIU8wT5`}bU=?9^aA3{Lx5Xs$qwL)g_rF%<R@KEbr925$
z)6VsL0gA{Vb-?{e{BzWU{19{8$T{K7G*HVf!sSuu`@eq;U&zdSvsMg`x+aI`B2t$)
z9QbTr`ew-oJwCBli`I99UEseQF-qD-fgUg8?7wgg^xAOP+2BTDzb`)E&DP`>qqVcg
z8OU*k$<BVk5>EBd+a=P$BW}=FuWPD8I15cNx6aFRCIp@4W-1v`0wj&-mJ2cBWV`b|
z*=dnF>{a3H24P`#3e6Ncn&maDwYeMSeQ=j4YRmK=iTK#1%DvbbRWa75pu0bMHmUVH
zN5oNp|F_6nd$?Z)Z$XW^iW!G3E0*m`=E{SxRJqr%ypU>zmPw)})P8bWz?=;mPp+%K
z_1|sLlaAorrkpbM4=1Snvab6K>3Lxq1ApR4TDfM@b{@b&Fe!*ucVd{U9)Mn!j~$;c
z4NQw>y|5~-NhgC2(67Kgd}_26P(PEl4C~T62tLSY{dH$2NV@K=EYyuk47CvASLJEd
z-c6`#RYkb8ynXGILSo`fnTxF{ul84%Wdip}+YL*W&dnmS600u0NMQnKAe>h-qzBhw
zVdHEBPbji1f=p{9He%01itZ&ZRp0vcG8H>W>kx_W4T9%=RfTg|%!*Bz*36VA4@=Bx
zk$Mc$);-xKmEI>Bz{hQhh_q?Sq;&r%v$g!e?K1uv71mt(PfOH%8VSZhYB>!QKT758
zr|-M~X;Hkiep6~D8ETaRQ_!F{9uAVu69IyMmdY4!<8*{3=0$L#eutgWt}+K4r<|L7
zgT;=4X+;cCA@*r0+7;ceEHQ@`mP(%Mcqh|j6nLe)*_|{@$4KW5>%N6I6uAX5H<l=x
zx)an0i5PQ+_3nI~7Mq$_HBewMQNAe*BtrP@%~IS~o`wK7NCoIhBq<?lH!zWwsVUfs
zHB3g_T<{=W>eMQ2P2$?l7kh-hv4d9!zQjD~Qva6YU87ZVTK|F_h<ZrVk^}jOEz9?b
zuZZLW`KglkC~Lt;t#A?W`Nh^22|3}7RE$y9Nm7Az{Kw04`*RZN^wfV!vh>FYp_bYD
zuole#bjU)Jb%ZGYNj$|6U#zuhm=XUncNtMY>0qBtqhgMd)Z_P&lW%9AjGy;?Y(qEG
zE(`?Q#=Xe^5*Fjbt3zCBezr&!n6c8(T$|^9oG;ma0}8`+jIC;3pHh_e%C4PzTo&e-
z*jv=wiKmxVyEY!Wc7O2()m9t+(u|!|_(j6Y>&p<Y^&*FaK`Ly#6Fz$?m~>D>z0bnK
zXggZ55vSxYp!*fMW2M@D8{WMYscAu=aC)cd*vQZ7gIp~xX>`D_3O!&XjF~vek*S0^
z4U&r5WvGq*fLHymlI7Rxm#7_Q3Acm4MD)7sd1dB|0|<<Rj>EI2UTk4LU-2&(GPKBD
z^b_+l;gGR_y5aro-c9}M6m)@*o?<zlWFPE;3)C?hH}yL{_g}!o><3#!WWtxa>&y*;
zQM3pSn%_VMLetY3wjSAByu$dIzYIkV#=GChNsoXi;{X6A@;@!0t1laOtH6~yIRR|S
zGnh(k>_2oi69OTa@IasK*+T~yq+Jmdyp28mlT(XANu&lMuTOYfDk6_%S1KG;*%T%P
zTW3dE;C+io;VYXFAE~oQue7|0lr85NMirq2oS5u<P+egvb;F=cuSaWDZq*-{juC=~
z$7m(WI}0-SdW9SmblT7I0qKY#v*Sy6)ZA<Md*6{nNL`da)C&nl13d&M#A0mD*yjBH
zj9aQ(`Ee(NJ*-zvG3H?Ldc4r4zGkea5KjqS_pxo@%6UJO->lzGvR4cvXnGc+c0({0
z5RNq3>KK4&_S}EnDUaZnmf~@r@mWx=U5_D~Bt+ux;TyDW2Iq|f(OVx*Ndo!qm~2rn
z1e@Jv+@}4;rON3!*19SW6}R%?W&}F89tzbJTvX}hXn*q2M$t~7Uu3XIpNuvY+#n4M
zf;vKe`sj6J;U(kAcpIb!8cpqEBbwq077*tdYygrV(kI4@7^D}(DRZG<;|6_0UeM#f
zg!|B<x+!Z}3hmJw;XV@LKgi(Ww9*R5<^nW?C2PH+MO6Yo=%O<a<`YcE3kkslRzNeT
zl4%eTf1J3AJ9LY@Am98JN2~1scea9trBio;QY-XzDBf-?*57Wjdwf3NrXEqfa(oCz
zN{mSVrOJ)Z*@rEk0YqOB5DUvAP(gS%_AMHJLUPhy5=j~9jJa(!X{4gWBl{WVmJ81~
zXC4OLu^q;H!gYoqBXQDlVYd1ds`O;Es4Ft!Gu#v!M|7!DWWbgwPeFhz9Rr=3sR<&U
z7r0r(mSXnp2qT}kDdS&E-wFIlYvMzO4WSpIHui?6WL4`!8FJYYFx>g%H+TlDPdgx*
zra;dwe*T$vC=i)2JqDaPZ|M*E>R?bt8iQcn3-b!SSJ;ukOpkF$vq4-q8B?^O786+K
zRYsCFfczr#Y32ny+lPIC-V#CNwOti@%JgF$3C69o7cT7498nrMt$t^l#)=Nk{Dijz
zmin_*_ygbwH?a5?$_@2pQLzHhitmp#0XNIpy>Labv3`btHqD*C_-Z{1HZa1L4i&KD
zvvyQ3XdKu~KC&+Y?yH{Lqn?UHqeS;8l-F0#BX^~pQ2B7YY5cA?l$*rR)5f~wSycJI
zhgdKnw)1bUT}Pk6>bE;s?omV`SJymtG8o?;F56vup5aO`x}#@Fgbt2Wx6|)#C+?6i
zJw*-1_rJ;;Wy*hoVrp020_-oS?;dg_u6nChTV>Rcy+hRFQ8e2(`T?Ei)InXtpZx6F
zx;l!ck>blrQaGf7y*Dk2s~ee==loG70%xm7AFj%K-Ii&5ekJCwxClL1bgUvHe9cC@
z1OtooH8SzErzY9%ewO+C>Z&_z6cQE5<)FJ7{R|t_wh7Z*?doE7p)md1dLq$0|9BfL
zv@CRT)O<jF)JQ?S?(%dQyxesfo#<oGx?;9=ndr6HCgjxO`17RZK!5tUdCFxH$Ot#E
zd8!bHR1Ur$N2v{V%Y0DE*hi3fFC7>KIOhOnn9N-kzURKR6%KN>YFlNj^6ip-`Vr6=
zGczU_y`M66L&W<89~bexI$HG}*I7QQ&GcR@<zga)y)b%#j5a;E3PHw{g2X&07j!T=
z6h@)?BD84@-{^ebm+gkW|M%-?`l#7wn~|`J+51S@7cqurFjyvdBzV%Xn$iF}Cu~|9
z0~R)SD(>zodm#xdtCLgWRK)oINtMzJ6m6{<Qu9jIm_cLXbo_QgG^yfS{IpbgD8vHh
z*DGwxM2TB|?ut?fm5#oOcWgbg%4ytsX?309CLIty|5I-AWWCDB|44ok)1a&wntV_F
z(!}r?!({j~zXq6iB=9j)tA^97)pboy%w<r`$YX_4Z1b0acV`wi!Ex~Jz<iVLkdxT$
zNQGc&IIf<-SkLj=mm_>WGxc_|&k>&L6)cd?=pjnc{l>Vv%HY-|#f6Es3k@SnlDzf_
zE>Xw!8Ug~_zPo%avV1AKb`#fI?Hqyd*QMFhJs1MP;rv=|wDIp?h<7U&2e+*m{zlwB
zot$Epm7FGm{dyeJh|H?^9o4es#{RNjSyw|c4m2?ej7oC6*u_v&4sAbmJ$TjqVZq|@
zYFBGb)v&*Rv-dEgdVleXo->=HmLI=cdP7-2qVw^J%_^IbKv{}3i;8+(L0TM$jtb}Q
zl1J97E~H-@vHmbq%(R_+ve+NgAaxpUO{Q+LbE`HOnuIuy2GwHt+-B!4dbp^Ln|{*f
zD5RHx#ZhUE@<xIp(pSRi-gSU1&_x?oa-Og0u>>i~4HdfV_t>2^RB)gB$v4Qzi8N`L
z2FLX)VMvA|Zj_-4xKGpPy&wNnXubF?>zuYIB<gFxc##`U#Lmpy!i*oG+;gi&)CnH6
z9Em{~Eos!~va4?vzWl${XLi&G5Y;GL5u_i~z}7_B4K}v9w>vf?$A(g(R~5&z0cB+X
zFH1Y`UV^tr7)31ZGe-$tj2P*Li1L<yE~k|v!FxE1(98;5$+pwInInRKln1fJ4-=eq
zcMlxP(Ko0HuPSF@=P*H|j#LH+R?mdZ6x4`1RFp^L%ijelr_0S<m41wwAE=xN<LnNK
z)vFK2ub}m+7(^@6E8RWU<%j1C5>1one9=#2JS7>Z_Av6<inS9QJPA52>Av)lTJRZ`
zn7+0h{cvy+Q0UWN^!mE1!!O#fY%Cfgyb;BmQ~kbs=_H+<YMeWON^9qVihiQkCjE1L
z*u4&&w35}WNQFF0Y1!Mnb*eUJvD?Gdyqn*XV!y9GWu3^K?Ayc?AEXX6=$kH6K0GGi
zE|{Lpn+fLnEOI801hI;BZ=4&EFPPlS4%K})n7S?d^g&fnxLvXq`E_JU;^lI6>-$B#
z=_(wg^dF<;J146>>gBkt$Pp-~?;j3Su6NzTH?{GCSCy}1)PtiTRP}C-btZSGtw@0b
zq2V6yy^P!o{gagx$ntvax|3N?0Q}+hCT~rs(#A7NslV;r?O_+ESk>A}Gw1nIPTp3H
zfxF%IrId4mlYbfekJZ_6T%HOI>kU4y#LhM6^)GF+sdxs_n{tBww;k&)vB4MJQ%Huo
zYesGqWfW}V@9%$2hNg)RVF3GFMtf9O7&Pc54R37q>sIf#uLh(f>IKfaqTQ#TKJyM<
zt%BQ@S`wX_?#%uQR?B?EQA**-C;7*pkG*@)u%O&}qNHF=g?RYKpVEAyLbBcQcx`g^
z&!{7TCiLx{H+#b4xd7$YOb<3f^!3#3lemUB3^Y6miy_TOj`rP0cd#z(YKE<)pvR<W
zR=>{|;SPo3&rlepooDzaexZ%vjx7K4q&wQR#pMPmOf&Y-G_g>cR?wF@Dx0wLypZAf
zsVVbVp-CGkquy?EpZmqUhkJhK-8Oj)`$3K+06iKfg8x`j;52iKd4L}#GYaX~q-(b(
zmsCnpk6ULmeI2BpE9#|fDOs+Wk%aS@N`8uYhC9#}%X7C(NF1JI*TEJfAJ~Ir-pUye
z+RLu^JzV*_&2nk_zRDaYWS{bx_h+X2mLa7EMy{IQ0Adh?lTt(&5zP@6NM(6s%gjbT
z>m$XPgyk+gqTP1vg*63KQA(;n`0^A!%nOP?Nb`0M&HC!1Y0~_J6X^p_t}yG~e4{|P
zBu~+3(;JQRCy_=4u^uZn_@X2^l)H_-t7hvM|EURyapt$>G58;%grZHpM9j4Iec)Ni
zRvjEj=TQ(%R7P+<I(L?|f76Z>+hQLiiA%PxkN>;X{BkO?mP>2(i54veCdX00g{e9S
zpu-+iwI$oo6}T=Dzkss^v*<8;@#)*##1#5PpA&^uz%8;wekshya>(vb9DlTP|E8w+
z9r!cRYb6Z(o5OVw8yfnx{xQ7<=$S=8IEA??p9ulHGDu(KnO?|YBH)$JoT6*rCm3G-
zY|yi<>vrjba3TUOHy(+#o(*|uca?wLbIkSrw+GJ8{{@!^>R*~Zx6+R1Wsy%AuK%^o
zzId?7^Mm_T{{F>x*~<q408dYKKcY3C+k$BS{Q*FLnAFZOZ3>Z>&pQBRc@4SRH|Amg
E1HWItoB#j-

literal 4956
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
aoBcl->i;bvrW+Cf0000<MNUMnLSTYCgQV5~

diff --git a/images/map.png b/images/map.png
index b8f45d818d4e4da110e6def25e785089dbd20725..417c9359696ac09eb47b9fdcbc135fd2569395a7 100755
GIT binary patch
literal 11233
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%0D@A
zwuRjy{B9r1h+g~{S3+NpkNZ6ijMy}K2Z*fX-Vfo}4Z*V`Vm(j3m?19q6lb6)3=x+E
zX}mxvx%8NvB_{Il93!}fUbm}D4!wX!C9U3C^L@Phi_|(%=ar3RN$XB3#R0^=4gGm>
zVw1`{Wl?n>4n`wWb<}WDh?Eo&DmmjxRPX`rDcOuHx9tEv0d-nf=7Owr3{Wl;QAMQo
zb^%oKYwg#9JdkbG>v_cqF}{3Bs5zwGvG+&qFWRgGxD2ltkOo1L^l3;X8y9P8NT@yL
zr3ZW4#7g_)&=iO)QDoI)Hd!+x`LAu&J<(r}Q)Xzy*{Ij$5oFmZ;C<PMm$f`BunAXw
z&Cl2Fc+LZB9~01tte~#&loVN&yZppWDLi>Wt}iDtDa6CPIV(RJ%d>?bmIf7ELP?rW
zg#13)LGbfa|GfBufXFoRo4=P^iTa}){y1fSJhV!et!0GsCMHxsyA!+skw*wyfR-Co
zqFExuz*!vEgBrwo3E4qpg{XUgm`IhL@lU3y`JziR32+5Kv>NnLNV46k*Fo8;(|i3P
zVJLIbN<q{~vSTu($I9=Y4>N-S8Gw<UK05bGe&PZMEr39?L7R9_wBX*AaA%6jU})#V
zO$R7#f?9be<&&ZiV>dp_k86)uK81<0p_^0m8iS^O@xWKcw>Lb!#2>vUajJNr^u!dw
z9HtQG7W>LMX!vVbhV9n=j@rJ%-|ns7);~F1E^Hr0c)#EU$!lk1i-3sXUFHm4P#8Q0
zM_KX-xge>#1iZ6|mfnQ_2@MAul(F-Rplu+%S|fbPsl*A(lf4#mG52stBsoL%j0w2g
zs)8G{#ycfklxiX3zA%<3I^(WH=|y=U?Fv!n0Jjqr7^Mx%P_tdgd>&QvMq(+aOPzN}
zP@G|^XMIc=#~0&2t`awdUh(Ktp!4i>exE*f>f^nYl~Q83%0cvtaa6#P&F@G`wE|zA
z%MwJ7$H7%W-1d+V^r=m5;lcM9!?of5nwW=>!5JBHYIoOz3qVSO%K6DyuRzfYE?_H_
z(8}j4@f2LBTR8k>;QQ?H3}ur~-G!63;P6Vt+ShW(#6jGWIm#-oI?+e>x)j`Mk~rQx
zeajVtWo2v&>3(rb+P<!m?!m1L&&<e%$9>HcdHusAwm+VXgQMA1r^9&A8o?@>MU~c5
zRG0hynO?UITzI*4LW$8v_ue%xJz*N6dLRa=G1Lkb!=%_3g&PJ5mePT=DU+@0sEp=B
zM}MaRh<_`K%*g-sve^`+7@KNlC9&M_JmJeCNNX14<CL^@1gzFiZIQL~8uZvF+gEvS
zucS>-86PVgx-&B#uaRsE@SngUPEXMnUW*xS1J)Hx8ZQ#N-Bn131hw(k-aK%#WlUsN
znhDn|BOEK^R|F(Th^F{Uc9jOSqAADO9GhkfJbNhl`+K4VhnP>Kloi~51wifH0y!r_
zflR=b{3hK1cnVJ+uDT=?cCle0UR)=-@LnfTA9O#g$Dp|<tftc<4dE^TdE*x+=-cgp
z`oPvZ*uS|^1r_WnSfP-C*eOKVCK^Nlxwq3rjd73I?xnFC8Vr`}LsE~fEAEFPi`h4<
z86FZxQ~QI!c%pQ4o(ERDqy8*b{nm9)m6)E}PYZ9(Q&4qqCqx6>CH)y&>*^3$<e<+6
zw!H1l(l8{P#dw&vaD$2*KJrel=k?a2oo*(Imygl2kjIHA`#H~vJQUyOpffa70m8@(
z;$8r)6cQyRu%edioKc{L9!_^jU73eZ!ndMDhMeG|ctYP*0uR_C?L$R>cCGOi0mW=f
zrJ=lg5?QS*mAXlgI2y~@WJ*;A3W1j*rB4v{VFl}0R#u!wOFp9dw)~=o$VBAu_iN)}
zCl(pCx>hBHh1*$Ro{QH5mp&qXCDB(Mpk>Pk-w%YN{LIbkq2h^UeGLghg0%Q|#5g#2
mcSGSWz1WMoME{UDJ`NeO^nsGbx(v1iN9BbEv{K$Y?Ee8{%rh<k

literal 6090
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
Qw*UYD07*qoM6N<$g4s#fjQ{`u

diff --git a/images/map_seld.png b/images/map_seld.png
index 60b9cb5e8be7a481492f6439d2383f1893e4affe..25e6d9b6a7b49efe557c7a54bd3fc6981d7fb119 100644
GIT binary patch
literal 13725
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
D`bz3E

literal 8215
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
JPDHLkV1l2G5hnlu

diff --git a/images/user.png b/images/user.png
index 73eb19244266eb3553c931167bd3fad1fef88380..a84c2ac93c3eb5cc92879e39bff9197429c0d333 100755
GIT binary patch
literal 7445
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
U^FYX_s}X?CJwuIpxKqsk04BaQiU0rr

literal 4423
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
N002ovPDHLkV1lw6lg<DD

diff --git a/images/user_seld.png b/images/user_seld.png
index 8996d2add9c5583e5024a98706b5f30dd0a8c0da..578fb91c43658dd7e01a989e1aa544e36a42dc24 100644
GIT binary patch
literal 11041
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
WIZb;%#D~6H0P->_(sh!iq5lKpXdDXw

literal 5894
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

diff --git a/pages/index/index.js b/pages/index/index.js
index 1505b1e..0129399 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -403,7 +403,10 @@ Page({
         repurchaseList: [],
         canGetrepurchase: true,
 
-		urltopage: {},
+        urltopage: {},
+        
+        cityIndex: 0,
+        scrollItem: "scrollItem-0",
 
 		// ---------------2025-5-26改版没用到的------------------
 		fourProduct: [],
@@ -520,7 +523,7 @@ Page({
             })
         } else {
             // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+            commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
@@ -1010,7 +1013,22 @@ Page({
 		this.setData({
 			videoPlay: true
 		})
-	},
+    },
+    
+    changeSimpleVal (e) {
+        let keyname = e.currentTarget.dataset.keyname;
+        let val = e.currentTarget.dataset.val;
+        let param = {}
+        param[keyname] = val
+        if (keyname == "cityIndex") {
+            let scrollIndex = val-2
+            if (scrollIndex<0) { scrollIndex = 0 }
+            param.scrollItem = "scrollItem-"+scrollIndex
+        }
+
+        this.setData(param)
+        console.log(this.data)
+    },
 
 	onShow: function() {
         this.pagePoint({event: 'home_view'}, 1)
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 488c1da..55f7ff3 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -11,7 +11,7 @@
                     src="https://static.ticket.sz-trip.com/uploads/20250714/1f3ac6a7144c6e6849edad89289061cc.png" mode="aspectFill"></image>
             </view>
             <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-                <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250526/f7cbe782688db5e39d30a24e4a2724b6.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250916/7d6a5865ffc145ba762fb5a977e4bb37.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
                 <view class="textOver" style="color:#000000">搜索您想要的</view>
             </navigator>
         </view>
@@ -104,7 +104,7 @@
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}" data-source="当季热门">
                                 <image lazy-load src="{{item.headimg}}"></image>
-                                <view class="season-content" style="padding:6rpx 12rpx;min-height: 130rpx;">
+                                <view class="season-content" style="padding:0 12rpx 6rpx;min-height: 130rpx;">
                                     <view class="textOver2">{{item.title}}</view>
                                     <view class="tags textOver" wx:if="{{item.display_tags}}">
                                         <view class="tag" wx:for="{{item.display_tags_arr}}" wx:key="index" wx:for-item="tag">{{tag}}</view>
@@ -187,10 +187,10 @@
 
             <!-- 旅游助手 -->
             <view class="sale-road-boxes" style="margin-top:36rpx" wx:if="{{func_data.helper_travel}}">
-                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
+                <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="pic-list" style="margin-top:30rpx" wx:if="{{func_data.helper_travel}}">
+            <view class="pic-list" style="margin-top:-40rpx;position: relative;z-index: 1;" wx:if="{{func_data.helper_travel}}">
                 <image lazy-load class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick"
                 src="{{item.icon}}" mode="aspectFill"></image>
             </view>
@@ -208,7 +208,7 @@
 
             <!-- 数字文旅-->
             <view class="sale-road-boxes" style="margin-top:30rpx" wx:if="{{func_data.culture_digital}}">
-                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
+                <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.wlcx}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[0]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="slide-out-box" wx:if="{{func_data.culture_digital}}">
@@ -229,17 +229,31 @@
             </view>
 
             <!-- 十全十美 -->
-            <view class="sale-road-boxes" wx:if="{{func_data.scenery_ten}}">
-                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
+            <view  class="sale-road-boxes" wx:if="{{func_data.scenery_ten}}">
+                <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
             </view>
-            <view class="six-box-new" wx:if="{{func_data.scenery_ten}}">
-                <image lazy-load wx:for="{{SQSM}}" src="{{item.icon}}" data-item="{{item}}" bindtap="mainNavClick" mode="aspectFill" wx:key="index"></image>
+            <view class="six-box-new"  wx:if="{{func_data.scenery_ten}}" >
+                <view class="big-image-box">
+                    <image lazy-load src="{{SQSM[cityIndex].icon}}" mode="aspectFill" bindtap="mainNavClick" data-item="{{SQSM[cityIndex]}}"></image>
+                    <!-- <view class="text-container">
+                        <view style="font-weight: bold;font-size: 32rpx;">昆山市</view>
+                        <view>小昆山势卧麒麟，独角撑空甓塔新</view>
+                    </view> -->
+                </view>
+                <scroll-view scroll-x enable-flex scroll-with-animation class="small-image-box" scroll-into-view="{{scrollItem}}">
+                    <view id="scrollItem-{{index}}" class="small-image-item {{cityIndex==index?'active':''}}" wx:for="{{SQSM}}" bind:tap="changeSimpleVal" 
+                    data-keyname="cityIndex" data-val="{{index}}" mode="aspectFill" wx:key="index">
+                        <image lazy-load  src="{{item.icon}}"  mode="aspectFill"></image>
+                        <view class="text-box">{{item.menu_name}}</view>
+                    </view>
+                </scroll-view>
+
             </view>
 
             <!-- 长三角文旅平台 --> 
             <view class="sale-road-boxes" style="margin-top:0" wx:if="{{otherPlat &&func_data.platform_nearby}}">
-                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
+                <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.csjwlpt}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[3]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
             <view class="other-plats" wx:if="{{otherPlat &&func_data.platform_nearby}}">
@@ -251,10 +265,10 @@
 
             <!-- 热门推荐 -->
             <view class="sale-road-boxes" style="margin-top:0" wx:if="{{repurchaseList.length>0 &&func_data.repurchase }}">
-                <image lazy-load mode="heightFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
+                <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="hot-list" wx:if="{{func_data.repurchase}}">
+            <view class="hot-list" style="margin-top: -40rpx;position: relative;z-index: 1;" wx:if="{{func_data.repurchase}}">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
                 <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" data-source="回购榜" wx:key="id">
                     <view class="hot-item">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 76e79dc..57acb14 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -99,6 +99,7 @@
   flex-wrap: wrap;
   border-radius: 20rpx;
   background: #FFEEAD;
+  padding-top: 13rpx;
 }
 .top-icon-item {
   margin-bottom: 37rpx;
@@ -117,8 +118,8 @@
   margin-right: 0;
 }
 .top-icon-item image {
-  width: 93.33rpx;
-  height: 93.33rpx;
+  width: 66.33rpx;
+  height: 66.33rpx;
   display: block;
   transition: all 0.2s;
   /* margin: 0 auto; */
@@ -163,7 +164,7 @@
 .sale-road-boxes {
   display: flex;
   justify-content: space-between;
-  margin-top: 40rpx;
+  margin-top: 48rpx;
   position: relative;
   align-items: flex-end;
 }
@@ -423,9 +424,8 @@
   flex-wrap: wrap;
 }
 .new-pic {
-    width: 340rpx;
-    height: 146.67rpx;
-    margin-bottom: 20rpx;
+    width: 157.33rpx;
+    height: 226.67rpx;
   }
 
 .title-more {
@@ -805,23 +805,92 @@
   width: 697rpx;
   /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
   border-radius: 20rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  overflow: scroll;
-  margin: 32rpx 0 53.33rpx;
+  margin: -40rpx 0 53.33rpx;
   z-index: 1;
   position: relative;
 }
 
-.six-box-new image {
-  width: 333.33rpx;
-  height: 200rpx !important;
-  /* background: #FFE7C0; */
-  border-radius: 20rpx;
-  flex-shrink: 0;
-  margin-right: 13.33rpx;
+.six-box-new .big-image-box {
+  width: 100%;
+  height: 346rpx;
+  position: relative;
+ 
+}
+.six-box-new .big-image-box image{
+    width: 100%;
+    height: 100%;
+    border-radius: 20rpx 20rpx 0 0;
+}
+.six-box-new .big-image-box .text-container{
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    padding: 16rpx;
+    box-sizing: border-box;
+}
+.six-box-new .small-image-box{
+    width: 100%;
+    padding: 10rpx 16rpx;
+    overflow-x: auto;
+    background: white;
+    display: flex;
+    flex-wrap: nowrap;
+    border-radius: 0 0 20rpx 20rpx;
+    box-sizing: border-box;
+    height: 120rpx;
+}
+.six-box-new .small-image-box .small-image-item{
+    width: 120rpx;
+    height: 100rpx;
+    background: #FF8623;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+    margin-right: 27rpx;
+    position: relative;
+    box-sizing: border-box;
+    overflow: hidden;
+}
+.six-box-new .small-image-box .small-image-item.active{
+    border: 2px solid #000;
+}
+.six-box-new .small-image-box .small-image-item:last-of-type{
+    margin-right: 0rpx;
 }
+.six-box-new .small-image-box image{
+    width: 100%;
+    height: 100%;
+    border-radius: 13rpx;
+}
+.six-box-new .small-image-box .small-image-item .text-box{
+    width: 100%;
+    height: 40rpx;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: #FFC543;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #000000;
+    text-align: center;
+    line-height: 40rpx;
+    border-radius: 0 0 13rpx 13rpx;
+}
+.six-box-new .small-image-box .small-image-item.active .text-box{
+    background: #FF8623;
+    color: #FFFFFF;
+}
+
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
   color: #111111;
diff --git a/utils/https.js b/utils/https.js
index b0f9a8b..d55ab84 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 3b4c0958fb5aeef895afe6e561b6b26b2cd5f18c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 17 Sep 2025 09:07:11 +0800
Subject: [PATCH 424/471] =?UTF-8?q?=E6=9C=80=E7=BE=8E=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=82=B9=E5=81=9C=E6=AD=A2=E9=9F=B3=E4=B9=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 17 +++++++++++++++--
 pages/index/index.wxss |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 0129399..0c77f08 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -802,8 +802,7 @@ Page({
 				url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.weburl)
 			})
 			return
-		}
-		
+        }
     },
     // 后台配置数据跳转
     mainNavClick:function (e) {
@@ -866,6 +865,16 @@ Page({
             })
             return
         }
+        if (item.jump_type == "text") {
+            setTimeout(() => {
+                wx.showToast({
+                    title: item.text,
+                    icon:'none',
+                    duration: 2000,
+                })
+            }, 200);
+            
+        }
     },
 
     // 其他平台配置数据的跳转
@@ -1037,6 +1046,10 @@ Page({
             wx.showTabBar()
         }
         util.clearGlobalPagePoint()
+
+        if (app.globalData.innerAudioContext) {
+            app.globalData.innerAudioContext.stop()
+        }
 	},
 
 	/**
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 57acb14..5a361aa 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -497,13 +497,13 @@
   justify-content: space-between;
 }
 .hot-list-item {
-  width: 337rpx;
+  width: 340rpx;
 }
 .hot-item {
   background: white;
   /* box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); */
   border-radius: 15rpx;
-  margin-bottom: 15rpx;
+  margin-bottom: 20rpx;
   height: 498rpx;
 }
 .hot-item image:nth-child(1) {
@@ -802,7 +802,7 @@
 }
 
 .six-box-new {
-  width: 697rpx;
+  width: 100%;
   /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
   border-radius: 20rpx;
   margin: -40rpx 0 53.33rpx;

From 9a85f4f88b964cdbc1d2aa22d7ac71b5babb2f84 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 25 Sep 2025 10:57:48 +0800
Subject: [PATCH 425/471] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     |  2 +-
 pages/component/proRec/proRec.js           |  4 +--
 pages/index/index.js                       |  2 +-
 pages/index/index.wxml                     | 25 +++++++-------
 pages/order/payresult/index.js             |  2 +-
 pages/user/order/sceneOrderInfo/index.js   |  7 ++--
 pages/user/order/sceneOrderInfo/index.wxml |  2 +-
 utils/util.js                              | 40 +++++++++++-----------
 8 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/app.js b/app.js
index 9035caf..3ece948 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest134? true : false;
+            data.isTest = data.isTest136? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index e76f3c7..cb14dc9 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -113,10 +113,10 @@ Component({
       if (item.type == 'travels') {
         // 游记做特殊处理 其他都按照原来的来
         wx.navigateTo({
-          url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+          url: '/pages/info/strategyInfo/index?id=' + item.s_id+"&sourceFrom=recommend",
         })
       } else {
-        util.gotoDetail(item);
+        util.gotoDetail(item, false, "&sourceFrom=recommend");
       }
     },
   },
diff --git a/pages/index/index.js b/pages/index/index.js
index 0c77f08..1b0e9ea 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -523,7 +523,7 @@ Page({
             })
         } else {
             // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 55f7ff3..234c7dd 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -15,8 +15,9 @@
                 <view class="textOver" style="color:#000000">搜索您想要的</view>
             </navigator>
         </view>
-        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
-            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
+        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+            bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular 
+            indicator-dots 	indicator-color="rgba(255, 255, 255, .5)" indicator-active-color="#fff">
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item bindtap="bannerClick" data-item="{{item}}">
                 <image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -39,7 +40,7 @@
     <view class="main-content" >
          <!-- 金刚区 -->
         <view style="padding: 0 20rpx;" wx:if="{{mainTypeList.length>0}}">
-            <!-- <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:180rpx;padding-top: 43rpx;" 
+            <!-- <swiper class="top-icons no-scrollbar" autoplay="{{true}}" style="height:180rpx;padding-top: 43rpx;" 
                 bindchange="changeBannerIndex" data-keyname="mainNavIndex" 
                 display-multiple-items="5" circular
                 current="0">
@@ -69,7 +70,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -136,7 +137,7 @@
                     </view>
                     <!-- 右边的banner -->
                     <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                        <swiper class="xpth-banner-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}" data-source="限时特惠">
@@ -154,7 +155,7 @@
             </view>
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
@@ -302,7 +303,7 @@
     <!-- 广告弹窗 -->
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
-        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
             <block wx:for="{{alertSwipeList}}" wx:key="index">
             <swiper-item data-item="{{item}}" bindtap="bannerClick">
                 <image lazy-load src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
@@ -334,10 +335,10 @@
 </view>
 
 
-<view class="bg" wx:else style="background-image: url({{indexSeason.background}});">
+<view class="bg" wx:else style="background-image: url({{indexSeason.background}});background: linear-gradient(165deg, #FF8623 213px, #FFE68A 213px);">
     <!-- 顶部banner -->
-    <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+    <view style="position:relative;z-index: 1;padding-top: 60rpx;">
+        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item data-item="{{item}}">
@@ -363,7 +364,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item data-item="{{item}}">
@@ -377,7 +378,7 @@
 
 
         <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item  data-item="{{item}}" style="position: relative;">
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index 642090c..981fcb8 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -54,7 +54,7 @@ Page({
     } 
 
 
-    util.gotoDetail(item)
+    util.gotoDetail(item, false, "&sourceFrom=recommend")
   },
   gotoOrderList:function(){
     if(!this.data.info) return;
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 9e48030..d00901b 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -29,7 +29,9 @@ Page({
     sysm2:false,
     sysm2Text:'更多',
     imgLen:[],
-    ids:[]
+    ids:[],
+
+    isPost: false, // 有没有邮寄产品
   },
 
   /**
@@ -316,7 +318,8 @@ Page({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
         product_model:"ticket"||res.data.order_product_list[0].product_model,
-        ids: proId.join(",")
+        ids: proId.join(","),
+        isPost:  res.data.order_product_list.some(x=>x.product_model == 'post'),
       })
       console.log(res.data);
       // debugger
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 40c9dd0..8c27714 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -246,7 +246,7 @@
         <text>商品总价：</text>
         <text>￥{{info.total_money/100}}</text>
     </view>
-    <view class="detail-item">
+    <view class="detail-item" wx:if="{{isPost}}">
         <text>运费：</text>
         <view>
             <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">
diff --git a/utils/util.js b/utils/util.js
index 5fe8ecd..35b9226 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -172,7 +172,7 @@ const checkLocation = function(){
     })
   })
 }
-const gotoDetail = (item,isPagePoint) =>{
+const gotoDetail = (item,isPagePoint,queryStr="") =>{
   wx.removeStorageSync('prizeId');
   let pagePointData = {
     param: {
@@ -183,7 +183,7 @@ const gotoDetail = (item,isPagePoint) =>{
   // 组合产品 跳线路
   if (item.compose_product_id) {
     wx.navigateTo({
-        url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+        url: '/pages/info/roadInfo/index?id='+item.compose_product_id+queryStr
       })
     return
 }
@@ -191,12 +191,12 @@ const gotoDetail = (item,isPagePoint) =>{
 
   if (item.is_package === 1) {
     wx.navigateTo({
-        url: '/pages/info/postProductInfo/index?id='+item.id,
+        url: '/pages/info/postProductInfo/index?id='+item.id+queryStr,
     })
       return
   }else if (item.is_package==2) {
     wx.navigateTo({
-        url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
+        url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id+queryStr
       });
       return
 }
@@ -207,7 +207,7 @@ const gotoDetail = (item,isPagePoint) =>{
     case "tenscenic":
      
       wx.navigateTo({
-        url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id)
+        url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id)+queryStr
       })
       break;
     case "ticket":
@@ -217,7 +217,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)
+        url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)+queryStr
       })
       break;
     case "hotel":
@@ -227,7 +227,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)
+        url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)+queryStr
       })
       break;
     case "post":
@@ -240,11 +240,11 @@ const gotoDetail = (item,isPagePoint) =>{
       try {
         if (item.iShop) {
           wx.navigateTo({
-            url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId
+            url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId+queryStr
           })
         }else{
           wx.navigateTo({
-            url: '/pages/info/postProductInfo/index?id='+item.id
+            url: '/pages/info/postProductInfo/index?id='+item.id+queryStr
           })
         }
       } catch (error) {
@@ -260,7 +260,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/roadInfo/index?id='+item.id
+        url: '/pages/info/roadInfo/index?id='+item.id+queryStr
       })
       break;
     case "coupon":
@@ -271,7 +271,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/cardInfo/index?id='+item.id
+        url: '/pages/info/cardInfo/index?id='+item.id+queryStr
       })
       break;
     case "show":
@@ -282,24 +282,24 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/showInfo/index?id='+item.id
+        url: '/pages/info/showInfo/index?id='+item.id+queryStr
       })
       break;
     case "food":
       // 产品 美食
       wx.navigateTo({
-        url: '/pages/info/foodProductInfo/index?id='+item.id
+        url: '/pages/info/foodProductInfo/index?id='+item.id+queryStr
       })
       break;
     case "activity":
       // 活动 
       wx.navigateTo({
-        url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)
+        url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr
       })
       break;
     case "movie":
       // 产品 电影票
-      let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title
+      let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title+queryStr
       wx.navigateTo({
         url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl),
         // url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title
@@ -308,7 +308,7 @@ const gotoDetail = (item,isPagePoint) =>{
     case "cinema":
         // 产品 电影票
         wx.navigateTo({
-          url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id+'&title='+item.title
+          url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id+'&title='+item.title+queryStr
         })
         break;
     case "scenic":
@@ -318,7 +318,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)
+        url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)+queryStr
       })
       break;
     case "room":
@@ -328,7 +328,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)
+        url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)+queryStr
       })
       break;
     case "venue":
@@ -338,7 +338,7 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePoint(pagePointData,1)
       }
       wx.navigateTo({
-        url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id)
+        url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id)+queryStr
       })
       break;
   }
@@ -745,7 +745,7 @@ const goProdInOtherPlatform = function (item) {
         webUrl+= `/OneCardTourDetail?id=${item.scene_id || item.id}`
     }
 
-
+    webUrl+="&sourceFrom=recommend"
     wx.navigateToMiniProgram({
       appId: appIdObj[platform],
       path: "/subPackages/webPage/webPage?url="+encodeURIComponent(webUrl),

From dcdf5cb2537f56437bb1f6ffa1fca5a48d3d2026 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 25 Sep 2025 10:58:46 +0800
Subject: [PATCH 426/471] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/foodProductInfo/index.js   | 1008 +++++++++++++++++---
 pages/info/foodProductInfo/index.json |    3 +-
 pages/info/foodProductInfo/index.wxml |  315 +++++--
 pages/info/foodProductInfo/index.wxss | 1245 ++++++++++++++++++++++---
 pages/order/food/index.js             |    4 +-
 pages/order/food/index.wxml           |   24 +-
 pages/order/food/index.wxss           |   52 +-
 7 files changed, 2263 insertions(+), 388 deletions(-)

diff --git a/pages/info/foodProductInfo/index.js b/pages/info/foodProductInfo/index.js
index d1af35f..a5d0eb6 100644
--- a/pages/info/foodProductInfo/index.js
+++ b/pages/info/foodProductInfo/index.js
@@ -1,158 +1,890 @@
-// pages/info/sceneProductInfo/index.js
+// pages/info/roadInfo/index.js
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
 import commonApi from "../../../utils/https/common"
+import QRCode from '../../../utils/weapp-qrcode.js'
+import util from '../../../utils/util'
 let app = getApp()
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    info:{},
-    number:['一','二','三','四','五','六','七','八','九','十','十一','十二'],
-    skuIndex:0,
-    bookingInfo:null,
-    skuName:"",
-    retailId:''
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    let api = commonApi._post
-    if(wx.getStorageSync("jstrip_token")){
-      api = commonApi.user_post
-    }
-    if(options.retailId){
-      this.setData({
-        retailId:options.retailId
-      })
-    }
-    api("product/get_product_detail",{
-      id:options.id
-    }).then(res=>{
-      let tags = res.data.display_tags?res.data.display_tags.split(","):[];
-      res.data.tags = tags.splice(0,2);
-      // 如果带有指定skuid的话 那么取指定的sku展示
-      if(options.skuid){
-        for(let i = 0;i<res.data.sku.length;i++){
-          if(res.data.sku[i].id==options.skuid){
-            res.data.sku = [res.data.sku[i]];
-            break;
-          }
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        autoPlay: false,
+        fixed: false,
+        type: 1,
+        top: 0,
+        isLike: 0,
+        commentTotal: 0,
+        comment: [],
+        info: null,
+        skuFlag: null,
+        producNum: 1,
+        skuIndex: 0,
+        aniSkuIndex: -1,
+        retailId: "",
+        cartTop: 0,
+        cartImgInfo: null,
+        cartCount: 0,
+        shareImg: null,
+        showShareFlag: false,
+        allowance_data: null,
+        showAllowance: false,
+        tjList: [], //推荐商品列表
+        iShop: false,
+        supplierId: null,
+        showQrCode: false,
+        wxqrcode: null,
+
+        ZTPoint:'',
+        swiperCurrent: 0,
+        swiperRange: {
+            video: {min:0,max:0},
+            picture: {min:0,max:0},
+            sku: {min:0,max:0}
+        },
+        otherInfoShow: 0,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        console.log(options)
+        //删除临时存储的联系人
+        wx.removeStorageSync('linkMan')
+        let rect = wx.getMenuButtonBoundingClientRect(),
+            that = this;
+        let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+        this.setData({
+            top: height,
+            id: options.id
+        })
+        // 获取购物车按钮的位置
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
+        if (options.ZTPoint) {
+            this.setData({
+                ZTPoint: options.ZTPoint
+            })
         }
-      }
-      res.data.sku.map(item=>{
-        item.display_tags = (item.display_tags?item.display_tags.split(','):[]).splice(0,2)
-      })
-      // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
-      this.setData({
-        info:res.data
-      })
-      this.BroswerRecord()
-      console.log(res)
-    })
-  },
-  BroswerRecord:function(){
-    setTimeout(()=>{
-      if(app.globalData.uuid){
-        commonApi._post('browse/browse_record',{
-          type:"goods",
-          title:this.data.info.title,
-          drive:"mini",
-          source_id:this.data.info.id,
-          url:"/pages/info/foodProductInfo/index?id="+this.data.info.id,
-          uuid:app.globalData.uuid
-        }).then(res=>{
-        })
-      }
-      else {
-        this.BroswerRecord();
-      }
-    },500)
-  },
-  changeSku:function(e){
-    this.setData({
-      skuIndex:e.currentTarget.dataset.index
-    })
-  },
-  showNotice:function(e){
-    let sku = e.currentTarget.dataset.sku;
-    this.setData({
-      skuName:sku.sku_name,
-      bookingInfo:sku.sku_model
-    })
-  },
-  closeMask:function(){
-    this.setData({
-      skuName:"",
-      bookingInfo:null
-    })
-  },
-  gotoLocation:function(){
-    let info = this.data.info;
-    if(info && info.lat && info.lon){
-      wx.openLocation({
-        latitude: Number(info.lat),
-        longitude: Number(info.lon)
-      })
-    }
-  },
-  order:function(e){
-    app.globalData.couponInfo = null;
-    app.globalData.retailId = this.data.retailId;
-    app.globalData.product = e.currentTarget.dataset;
-    wx.navigateTo({
-      url: '/pages/order/food/index',
-    })
-  },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+        if (options.retailId) {
+            this.setData({
+                retailId: options.retailId
+            })
+        }
+        commonApi._post("product/get_product_detail", {
+            id: options.id
+        }).then(res => {
+            if (res.code == 0) { 
+                wx.showToast({
+                  title: res.msg,
+                  icon:'none'
+                })
+                setTimeout(() => {
+                    wx.navigateBack()
+                }, 1500);
+                return
+             }
+            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+            if (options.skuid) {
+                let sku = res.data.sku.find(item => item.id == options.skuid);
+                res.data.sku = [sku];
+            }
+            res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
 
-  },
+            let resData = res.data
+            try {
+                if (resData.product_data && resData.is_package==1) {
+                    for(let key in resData.product_data) {
+                        resData.product_data[key] = JSON.parse(resData.product_data[key])
+                    }
+                    // if (resData.product_data["住"]) {
+                    //     resData.product_data["住"] = JSON.parse(resData.product_data["住"])
+                    // }
+                    // if (resData.product_data["游"]) {
+                    //     resData.product_data["游"] = JSON.parse(resData.product_data["游"])
+                    // }
+                    // if (resData.product_data["食"]) {
+                    //     resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+                    // }
+                }
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+                resData.shipment_tag_arr = []
+                if (resData.shipment_tag) {
+                    resData.shipment_tag_arr = resData.shipment_tag.split(',')
+                    resData.shipment_tag_str = resData.shipment_tag_arr.join(' | ')
+                }
+                if (resData.service_tag) {
+                    resData.service_tag_str = resData.service_tag.split(',').join(' | ')
+                }
+                if (resData.parameter_tag) {
+                    resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ')
+                }
 
-  },
+                if (resData.supplier_headimg) {
+                    resData.supplier_headimg = that.showImg(resData.supplier_headimg)
+                }
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+            } catch(e) {} 
 
-  },
+            let swiperRange = this.data.swiperRange;
+            swiperRange.video = resData.videourl? { min: 0, max: 0 } : { min: -1, max: -1 }
+            swiperRange.picture = {min:swiperRange.video.max+1, max:swiperRange.video.max+1+resData.listimg.length-1}
+            swiperRange.sku = {min:swiperRange.picture.max+1,max:swiperRange.picture.max+1+resData.sku.length-1}
+            console.log(swiperRange)
+            this.setData({
+                info: resData,
+                supplierId: res.data.supplier_id,
+                iShop: res.data.supplier_id ? true : false,
+                swiperRange: swiperRange,
+            })
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+            // 获取补贴
+            // commonApi.user_post("product/getProductAllowancePrice", {
+            //   product_code: res.data.product_code
+            // }).then(resTwo => {
+            //   if (resTwo && resTwo.code == 1) {
+            //     this.setData({
+            //       allowance_data: resTwo.data
+            //     })
+            //   }
+            // })
+            this.BroswerRecord()
+        })
+        // 获取评价列表
+        commonApi._post("product/product_comment_list", {
+            product_id: options.id,
+            offset: 0,
+            limit: 3
+        }).then(res => {
+            res.data.list.map(item => {
+                item.rate = Number(item.rate)
+                item.create_time = item.create_time.substring(0, 10)
 
-  },
+            })
+            this.setData({
+                comment: res.data.list.splice(0, 5),
+                commentTotal: res.data.total
+            })
+            let arr = this.data.comment
+            arr.map((item) => {
+                if (item.img_list) {
+                    item.img_list = item.img_list.split(',')
+                } else {
+                    item.img_list = []
+                }
+            })
+            this.setData({
+                comment: arr
+            })
+        })
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+        commonApi._post("search/product_recommend", {
+            offset: 0,
+            limit: 4,
+            rand: true,
+            type: 'post',
+            product_ids:options.id,
+        }).then(res => {
+            try {
+                this.setData({
+                    tjList: res.data.list.slice(0,4)
+                })
+            } catch (error) {
+                console.log(error);
+            }
+        })
+    },
 
-  },
+    showImg (img) {
+        if (!img) { return img }
+        if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
+            return img;
+        } else {
+            // return "https://test.api.cloud.sz-trip.com"+img
+            return "https://static.ticket.sz-trip.com" + img;
+        }
+    },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    changeAllowance: function () {
+        this.setData({
+            showAllowance: !this.data.showAllowance
+        })
+    },
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "goods",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
+            }
+        }, 500)
+    },
+    like: function () {
+        let id = this.data.id,
+            isLike = this.data.isLike;
+        commonApi.user_post("product/" + (isLike == 1 ? "product_cancel_collection" : "product_collection"), {
+            product_id: id
+        }).then(res => {
+            if (res.code == 1) {
+                this.setData({
+                    isLike: isLike == 1 ? 0 : 1
+                })
+            }
+        })
+    },
+    changeMenu: function (e) {
+        let index = e.currentTarget.dataset.index,
+            that = this;
+        const query = wx.createSelectorQuery(); //创建节点查询器
+        query.select("#box" + index).boundingClientRect() //选择toViewid获取位置信息
+        query.selectViewport().scrollOffset() //获取页面查询位置的
+        query.exec(function (res) {
+            let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.data.top;
+            wx.pageScrollTo({
+                scrollTop: scrollTop + 4,
+                duration: 0
+            })
+            that.setData({
+                type: index
+            })
+        })
+    },
+    // onPageScroll: function (e) {
+    //     let that = this,
+    //         height = this.data.top;
+    //     let topHeight = height;
+    //     wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
+    //         if (rect.top <= topHeight) {
+    //             // 此时应该把menus固定在顶部
+    //             that.setData({
+    //                 fixed: true
+    //             })
+    //         } else {
+    //             that.setData({
+    //                 fixed: false
+    //             })
+    //         }
+    //         // 滚动时判断滚动到哪个部分了
+    //         const query = wx.createSelectorQuery(); //创建节点查询器
+    //         query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
+    //         query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
+    //         query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
+    //         query.select("#box4").boundingClientRect() //选择toViewid获取位置信息
+    //         let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
+    //         query.exec(function (res) {
+    //             if (res[3].top < minHeight) {
+    //                 that.setData({
+    //                     type: 4
+    //                 })
+    //             } else if (res[2].top < minHeight) {
+    //                 that.setData({
+    //                     type: 3
+    //                 })
+    //             }else if (res[1].top < minHeight) {
+    //                 that.setData({
+    //                     type: 2
+    //                 })
+    //             } else {
+    //                 that.setData({
+    //                     type: 1
+    //                 })
+    //             }
+    //         })
+    //     }).exec()
 
-  },
+    // },
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: "cart"
+                })
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    console.log(res)
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+    },
+    hideSku: function () {
+        this.setData({
+            skuFlag: null,
+            cartImgInfo: null
+        })
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+    selectSku: function (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            skuIndex: index,
+            swiperCurrent: index+this.data.swiperRange.picture.max+1
+        })
+    },
+    showOrder: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能购买',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                let swiperCurrent = this.data.swiperCurrent;
+                let skuIndex = swiperCurrent - this.data.swiperRange.sku.min
+                console.log(swiperCurrent, skuIndex)
+                if (skuIndex<0) {skuIndex=0}
+                this.setData({
+                    skuFlag: 'order',
+                    skuIndex: skuIndex,
+                    swiperCurrent: skuIndex+this.data.swiperRange.picture.max+1
+                })
+            }
+        })
+    },
+    order: function () {
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        commonApi.user_post("/product/checkStock", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+        }).then(res => {
+            if (res && res.code != 1) {
+                return;
+            } else {
+                if (this.data.skuFlag == 'order') {
+                    util.pagePoint({
+                        event: 'product_order',
+                        param: {
+                            id: this.data.info.id,
+                            type: this.data.info.type
+                        }
+                    }, 1)
+                    wx.setStorageSync('login_from', 'product_order_login')
+                    wx.setStorageSync('order_from', 'product_order_submit')
+                    app.globalData.couponInfo = null;
+                    // 购买
+                    let product = [{
+                        product: {...this.data.info,ZTPoint:this.data.ZTPoint},
+                        sku: this.data.info.sku[this.data.skuIndex],
+                        productNum: this.data.producNum
+                    }];
+                    app.globalData.retailId = this.data.retailId;
+                    app.globalData.listName = null
+                    app.globalData.product = product[0];
+                    wx.navigateTo({
+                        url: '/pages/order/food/index',
+                    })
+                } else {
+                    let tag_id = this.data.info.tag_id,type = ''
+                    if (tag_id.includes(20) || tag_id.includes(19)) {  //文创
+                      type = '1'
+                    }else if (tag_id.includes(5)) { //非遗
+                      type = '2'
+                    }else {
+                      type = ''
+                    }
+                    commonApi.user_post("cart/add_sku", {
+                        sku_id: this.data.info.sku[this.data.skuIndex].id,
+                        num: this.data.producNum,
+                        type:type
+                    }).then(res => {
+                        if (res.code == 1) {
+                            commonApi.user_post('cart/get_list', {}).then(res => {
+                                this.setData({
+                                    cartCount: res.data.length
+                                })
+                            })
+                            // 加动效
+                            this.setData({
+                                skuFlag: null,
+                                aniSkuIndex: this.data.skuIndex,
+                                cartImgInfo: null
+                            })
+                            setTimeout(() => {
+                                this.setData({
+                                    aniSkuIndex: -1
+                                })
+                                wx.showModal({
+                                    title: "提示",
+                                    content: "去购物车结算？",
+                                    success: function (res) {
+                                        if (res.confirm) {
+                                            wx.navigateTo({
+                                                url: '/pages/user/cartlist/list',
+                                            })
+                                        }
+                                    }
+                                })
+                            }, 650)
+                        }
+                    })
+                }
+            }
+        })
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
+            util.pagePoint({
+                event: 'product_share_login',
+                type: this.data.info.type,
+                id: this.data.info.id
+            }, 1)
+            commonApi.user_post("user/getMyInfo", {}).then(res => {
 
-  }
+            })
+            return;
+        }
+        if (!this.data.shareImg) {
+            wx.showToast({
+                title: '图片生成中，稍后再试',
+                icon: 'none'
+            })
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
+        })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !this.data.showShareFlag
+                        })
+                        util.pagePoint({
+                            event: 'product_share_save',
+                            type: that.data.info.type,
+                            id: that.data.info.id
+                        }, 1)
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                console.log(res);
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
+            }
+        });
+
+    },
+    pagePoint: function (e) {
+        util.pagePoint(e)
+    },
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
+        }
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
+
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
+            })
+        })
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
+            })
+        })
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = "￥" + (that.data.info.price / 100);
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.subtitle;
+            if (that.data.info.subtitle.length > 10) {
+                subtitle = that.data.info.subtitle.substr(0, 10) + '...'
+            }
+            ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            // ctx.draw();
+            // 划线价
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(32 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let market_price = "￥" + (that.data.info.market_price / 100)
+            ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
+            let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            ctx.beginPath()
+            ctx.setLineWidth(1)
+            ctx.moveTo(40 * ratio + width, 608 * ratio)
+            ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
+            ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
+        row.push(temp);
+
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
+        }
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+        }
+    },
+    gotoDetail: function (e) {
+        let item = e.currentTarget.dataset.item;
+        util.pagePoint({
+            event: 'recommend_click',
+            param: {
+                id: item.id,
+                type: item.type
+            }
+        }, 1)
+        if (item.type == 'travels') {
+            // 游记做特殊处理 其他都按照原来的来
+            wx.navigateTo({
+                url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+            })
+        } else {
+            util.gotoDetail(item);
+        }
+    },
+
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+          latitude: Number(info.scene_lat),
+          longitude: Number(info.scene_lon),
+          name:info.scene_name,
+            address:info.scene_address
+        })
+      },
+
+    viewImg:function(e){
+        let item = e.currentTarget.dataset.item;
+        if (item.img_list.length>0) {
+            wx.previewImage({
+                urls: item.img_list
+            })
+        }
+    },
+
+    swiperChange (e) {
+        if(e.detail.source == "touch") {
+        let index = e.detail.current
+        this.setData({
+            swiperCurrent: index
+        })
+        }
+        console.log(e, this.data.swiperCurrent)
+    },
+    changeSwiperCurrent (e) {
+        let index = e.currentTarget.dataset.index
+        this.setData({
+            swiperCurrent: index
+        })
+    },
+    changeSimpleVal (e) {
+        let keyname = e.currentTarget.dataset.keyname;
+        let val = e.currentTarget.dataset.val;
+        let param = {}
+        param[keyname] = val
+        this.setData(param)
+        console.log(this.data)
+    },
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        app.globalData.postProduct = []
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+        if (this.data.info && this.data.info.id) {
+            commonApi.user_post("product/is_product_collection", {
+                product_id: this.data.info.id
+            }).then(res => {
+                this.setData({
+                    isLike: res.data
+                })
+                this.drawImg()
+            })
+            // commonApi.user_post('cart/get_list', {}).then(res => {
+            //     this.setData({
+            //         cartCount: res.data.length
+            //     })
+            // })
+            commonApi.user_post('cart/get_count', {noLogin: true}).then(res => {
+                this.setData({
+                  cartCount: res.data //1
+                })
+              })
+        } else {
+            setTimeout(() => {
+                this.onShow()
+            }, 200)
+        }
+    },
+    playVideo() {
+        // 播放视频需要把autoplay暂停
+        this.setData({
+            autoPlay: false
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
 })
\ No newline at end of file
diff --git a/pages/info/foodProductInfo/index.json b/pages/info/foodProductInfo/index.json
index b5d8d8b..ab4ec76 100644
--- a/pages/info/foodProductInfo/index.json
+++ b/pages/info/foodProductInfo/index.json
@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "notice":"/pages/component/notice/notice"
+    "code":"../../order/components/wxqrCode/index"
+
   }
 }
\ No newline at end of file
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index 16afd14..2afc10c 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -1,79 +1,264 @@
-<!--pages/info/sceneProductInfo/index.wxml-->
+<!--pages/info/hotelProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
-<view class="iconfont icon-xin"></view>
-<swiper class="swiper" indicator-dots="{{true}}"
-  autoplay="{{true}}" interval="{{2000}}" duration="{{300}}" wx:if="{{info.listimg}}">
-  <block wx:for="{{info.listimg}}" wx:key="*this">
-    <swiper-item>
-      <image lazy-load src="{{item}}" mode="aspectFill"></image>
-    </swiper-item>
-  </block>
-</swiper>
-<view class="top-info">
-  <view class="title">{{info.title}}</view>
-  <view class="tags-box textOver" style="height:auto">
-    <view class="tag textOver" wx:for="{{info.tags}}">{{item}}<view class="line"></view></view>
-    <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
-    <!-- <view class="tags-text">详情 <text class="iconfont icon-you"></text></view> -->
+<view class="share-icon" bindtap="share"></view>
+<image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
+<view style="position: relative;">
+    <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
+    interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
+    <block wx:if="{{info.videourl}}" wx:key="*this">
+        <swiper-item>
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+            show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
+        <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.listimg}}" wx:key="*this">
+        <swiper-item>
+        <image lazy-load src="{{item}}" mode="aspectFill"></image>
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.sku}}" wx:key="*this">
+        <swiper-item style="position: relative;">
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
+        <view class="sku-tips ">
+            <view class="textOver">{{item.sku_name}}</view>
+        </view>
+        </swiper-item>
+    </block>
+    </swiper>
+    <view class="swiper-bottom" wx:if="{{info}}">
+        <!-- <view class="swuper-bottom-bg">
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 
+            wx:if="{{info.videourl}}" bind:tap="changeSwiperCurrent" data-index="{{0}}">视频</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.min}}">图片</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.sku.min}}">款式</view>
+        </view> -->
+        <view class="swiper-bottom-item bottom-number active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
+    </view>
+</view>
+
+<view class="allowance-box" wx:if="{{allowance_data}}" bindtap="changeAllowance">
+  补贴价
+  <view class="com-price two">￥{{ allowance_data.mini_price / 100 }}起</view>
+  <view class="yellow">单品最高补贴{{ allowance_data.max_price / 100 }}元</view>
+</view>
+
+<view wx:if="{{info}}">
+    <view class="top-info" style="padding: 0;" >
+        <view class="wineScene-price-container" >
+            <view class="wineSecne-price">{{info.price/100}}<text class="wineSecne-money">优惠前￥{{info.market_price/100}}</text></view>
+            <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
+        </view>
+        <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
+ 
+
+            <view class="title textOver2">{{info.title}}</view>
+            <view class="tags-box textOver">
+                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
+            </view>
+
+            <view class="other-info-box" >
+                <view class="other-info-item" style="align-items: flex-start;"bindtap="changeSimpleVal" 
+                data-keyname="otherInfoShow" data-val="{{1}}" wx:if="{{info.shipment_tag}}">
+                    <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250925/50f3e2316c3f3cc906fe4c78f127e960.png"></image>
+                    <view class="other-content textOver" >{{info.shipment_tag_str}}</view>
+                    <!-- <view style="margin-top: 6rpx;" class="view-arrow">></view> -->
+                </view>
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{2}}" 
+                    wx:if="{{info.service_tag_str}}">
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250925/ce4323d9bcdf2ff03a0985ae4cbdabbe.png"></image>
+                    <view  class="other-content textOver">{{info.service_tag_str}}</view>
+                    <!-- <view  class="view-arrow">></view> -->
+                </view>
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{3}}"
+                    wx:if="{{info.parameter_tag_str}}">
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250925/958d9a3ed9404790ba5d17548e20fee8.png"></image>
+                    <view class="other-content textOver">{{info.parameter_tag_str}}</view>
+                    <!-- <view  class="view-arrow">></view> -->
+                </view>
+            </view>
+
+        </view>
+
+    </view>
+    
+</view>
+
+
+
+
+
+<view class="scroll-all-box" id="menus" wx:if="{{info}}">
+    <view style="height:85rpx" wx:if="{{fixed}}"></view>
+    <view class="info-box" id="box1">
+        <view class="info-title">套餐详情</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
+    </view>
+    <!-- <view class="info-box" id="box2">
+        <view class="info-title">费用说明</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.expense_info)}}"></rich-text>
+    </view> -->
+    <view class="info-box" id="box3">
+        <view class="info-title">购买须知</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
+    </view>
+    <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
+
+    <!-- <view class="info-box" id="box4" style="padding: 20rpx 26rpx;">
+        <view class="info-title">产品推荐</view>
+        <view class="pro-list">
+            <view class="proitem" wx:for="{{tjList}}" bindtap="gotoDetail" data-item="{{item}}">
+            <view class="item-hd">
+            <image lazy-load src="{{item.headimg}}"></image>
+            </view>
+            <view class="item-bm" style="height: 120rpx;display: flex;flex-direction: column;justify-content: space-between;">
+                <view class="protitle textOver2">{{item.title}}</view>
+                <view class="pro-price">{{item.price/100}}</view>
+            </view>
+        </view>
+        </view>
+    </view> -->
+</view>
+
+<view style="height:140rpx"></view>
+<view class="fixed-bottom">
+<view class="['left-img',{{!iShop?'no-shop':''}}]">
+  <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <view class="shop-box">
+    <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
+    <view>店铺</view>
   </view>
+  </navigator>
+  <navigator url="/pages/user/service/index"  catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+    <view class="iconfont icon-kefu"></view>
+    <view>客服</view>
+  </navigator>
+  <!-- <view bindtap="like" class="kefu-box">
+    <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
+    <view>收藏</view>
+  </view> -->
+  <view class="kefu-box"></view>
 </view>
-<view class="box">
-  <view class="box-top" style="border-top:none;border-bottom:1rpx solid #d9d9d9">
-    <text>{{info.title}}</text>
+
+
+  <view class="btns">
+    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
+    <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
   </view>
-  <view class="product-item" wx:for="{{info.sku}}">
-    <view class="skutitle">{{item.sku_name}}</view>
-    <view class="product-box">
-      <view class="product-left textOver">
-        <view class="product-tags">
-          <view class="product-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
+</view>
+<!-- 购物车悬浮框 -->
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <view class="cart-num">{{cartCount}}</view>
+</navigator>
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view>
+            <view class="sku-price">{{info.sku[skuIndex].price/100}}
+            <!-- <view class="allowance" wx:if="{{allowance_data}}">
+                补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view> -->
+            </view>
+            <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+        </view>
+        <view style="display: flex;align-items: center;">
+            <view class="number-box">
+                <view class="iconfont icon-sami-select" bindtap="minus"></view>
+                <view class="number">{{producNum}}</view>
+                <view class="iconfont icon-add-select" bindtap="add"></view>
+            </view>
+            <view class="limit-number" wx:if="{{info.sku[skuIndex].sku_model.traveller_limit_num>0}}">限购{{info.sku[skuIndex].sku_model.traveller_limit_num}}件</view>
         </view>
-        <view class="order-tip-text" bindtap="showNotice" data-sku="{{item}}">预订须知>></view>
       </view>
-      <view class="product-right">
-        <view class="price"><text>￥</text><text>{{item.price/100}}</text><text>起</text></view>
-        <view wx:if="{{item.flag=='on'}}" class="btn" data-product="{{info}}" data-sku="{{item}}" bindtap="order">立即预订</view>
-        <view wx:else class="btn disable" >立即预订</view>
+    </view>
+    <view style="font-weight: bold;font-size: 33rpx;color: #060001;margin:0rpx 25rpx 27rpx">产品分类（{{info.sku.length}}）</view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item {{index==skuIndex?' active':''}}" 
+      wx:for="{{info.sku}}">
+        <image lazy-load src="{{item.headimg}}"></image>
+        <view class="sku-name textOver2">{{item.sku_name}}</view>
       </view>
     </view>
+    
+    
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="order" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+      </view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
   </view>
-  <!-- <view class="empty-box">
-    <view>这里空空如也，快去向大家提问吧!</view>
-    <view class="empty-btn">去提问</view>
-  </view> -->
 </view>
-<view class="box" wx:if="{{info}}">
-  <view class="box-top" style="border-top:none">
-    <text>商家信息</text>
-  </view>
-  <view class="info-address">
-    <text>商家电话：{{info.supplier_tel}}</text>
-    <view class="iconfont icon-dianhua"></view>
-  </view>
-  <view class="info-address">
-    <text>商家地址：{{info.supplier_address}}</text>
-    <view class="iconfont icon-daohang" bindtap="gotoLocation"></view>
-  </view>
-  <view class="box-top">
-    <text>购买须知</text>
-  </view>
-  <view class="sku-items">
-    <view class="sku-item{{skuIndex==index?' active':''}}" bindtap="changeSku" data-index="{{index}}" wx:for="{{info.sku}}">套餐{{number[index]}}</view>
-    <!-- <view class="sku-item">套餐一</view> -->
-    <!-- <view class="sku-item">套餐一</view> -->
-  </view>
-  <view class="details">
-    <rich-text nodes="{{tool.formateRichText(info.sku[skuIndex].sku_model.bookinfo)}}"></rich-text>
-    <!-- <rich-text nodes="{{tool.formateRichText(info.sku[skuIndex].sku_model.detailinfo)}}"></rich-text> -->
-    <!-- <rich-text nodes="{{tool.formateRichText(info.sku[skuIndex].sku_model.expenseinfo)}}"></rich-text> -->
-    <!-- <rich-text nodes="{{tool.formateRichText(info.sku[skuIndex].sku_model.extrainfo)}}"></rich-text> -->
-  </view>
-  <view class="box-top">
-    <text>产品详情</text>
+<view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
+  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
+  </canvas>
+  <canvas class="canvasCode" style="opacity:0;width:500px;height:500px" canvas-id="myQrcode"></canvas>
+</view>
+<view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
+  <view class="mask-bg" bindtap="share"></view>
+  <view class="mask-content share-img-box">
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <view class="share-tips">
+      <view style="position:relative">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        </image>
+        <view>保存图片到相册</view>
+        <view class="tipimg">
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+        </view>
+      </view>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <view style="position:relative">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        </image>
+        <view>微信识别二维码</view>
+        <view class="tipimg">
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+        </view>
+      </view>
+    </view>
+    <view class="save-btn" bindtap="save">保存到相册</view>
   </view>
-  <view class="details">
-    <rich-text nodes="{{tool.formateRichText(info.content)}}"></rich-text>
+</view>
+<view class="mask mask-allowance" wx:if="{{showAllowance}}">
+  <view bindtap="changeAllowance" class="mask-bg"></view>
+  <view class="mask-content rule-box">
+    <view class="rule-title">{{allowance_data.title}}</view>
+    <rich-text nodes="{{allowance_data.content}}"></rich-text>
   </view>
 </view>
-<notice wx:if="{{bookingInfo}}" bind:close="closeMask" bookingInfo="{{bookingInfo}}" skuName="{{skuName}}"></notice>
\ No newline at end of file
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
+
+<!-- <view class="mask" wx:if="{{otherInfoShow>0}}"> -->
+<view class="mask" wx:if="{{false}}">
+  <view class="mask-bg" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+    <view class="other-info-content">
+        <view class="title">{{otherInfoShow==3?"产品参数":otherInfoShow==2?"服务说明":"发货说明"}}</view>
+        <view wx:if="{{otherInfoShow==1}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.shipment_info)}}"></rich-text>
+        </view>
+        <view wx:if="{{otherInfoShow==2}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.service_info)}}"></rich-text>
+        </view>
+        <view wx:if="{{otherInfoShow==3}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.parameter_info)}}"></rich-text>
+        </view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}">确定</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/info/foodProductInfo/index.wxss b/pages/info/foodProductInfo/index.wxss
index 4c609ce..74cd9b1 100644
--- a/pages/info/foodProductInfo/index.wxss
+++ b/pages/info/foodProductInfo/index.wxss
@@ -1,69 +1,96 @@
-/* pages/info/sceneProductInfo/index.wxss */
+/* pages/info/hotelProductInfo/index.wxss */
 page {
   background: #f2f2f2;
 }
+
 .swiper {
   width: 100%;
-  height: 400rpx;
+  height: 750rpx;
 }
-.swiper image {
-  height: 400rpx;
+.swiper image,.swiper video {
+  height: 750rpx;
   display: block;
   width: 100%;
 }
+.swiper-bottom{
+    position: absolute;
+    /* top: 750rpx; */
+    bottom: 77rpx;
+    right: 0;
+    width: 90rpx;
+    height: fit-content;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    z-index: 10;
+}
+.swuper-bottom-bg{
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 20rpx 0rpx 0rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding: 8rpx 0;
+    margin-bottom: 12rpx;
+}
+.swiper-bottom-item{
+    width: 100%;
+    text-align: center;
+    padding: 14rpx 0;
+}
+.swiper-bottom-item.active{
+    color: #fff;
+}
+.swiper-bottom-item.bottom-number{
+    max-width: 100%;
+    width: fit-content;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 0 10rpx;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
 .top-info {
-  border-radius: 20rpx 20rpx 0 0;
   background: white;
   position: relative;
   z-index: 1;
-  margin-top: -20rpx;
-  padding: 20rpx 40rpx;
 }
+
 .top-info .title {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #000;
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #000000;
 }
+
 .tags-box {
-  margin-top: 10rpx;
   display: flex;
   align-items: center;
+  font-weight: 500;
+  font-size: 25rpx;
   color: #0B898E;
-  font-size: 27rpx;
-  height: 50rpx;
 }
+
 .tags-box .tag {
-  position: relative;
-  line-height: 20rpx;
-  font-size: 20rpx;
-  font-weight: 500;
-  line-height: 50rpx;
-  margin-right: 10rpx;
-}
-.tags-box .tag .line {
-  content: "1";
-  display: block;
-  font-size: 0;
-  position: absolute;
-  left: 0;
-  right: 0;
-  background: #DAF3E9;
-  height: 8rpx;
-  top: 30rpx;
-  z-index: -1;
-}
-.tags-text {
-  flex: 1;
-  text-align: right;
-}
-.tags-box .iconfont {
-  margin-left: 4rpx;
-  font-size: 24rpx;
+  margin-top: 27rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  margin-right: 15rpx;
+  padding: 0 14rpx;
+  background: rgba(11, 137, 142, 0.1);
+  border-radius: 4rpx;
 }
+
 .address-box {
   justify-content: space-between;
   margin-top: 0;
 }
+
 .info-address {
   color: #666;
   font-size: 27rpx;
@@ -71,57 +98,114 @@ page {
   height: 30rpx;
   line-height: 30rpx;
 }
+
 .address-box .iconfont {
   font-size: 34rpx;
 }
-.box {
-  margin: 20rpx;
-  padding: 0 20rpx;
-  background: white;
-  border-radius: 13rpx;
-}
-.box-top {
-  line-height: 120rpx;
-  border-top: 1rpx solid #d9d9d9;
-  font-weight: 500;
-  color: #000;
-  font-size: 35rpx;
-}
-.info-address {
+
+.date-all-box {
+  margin: 24rpx 20rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 30rpx;
-  color: #999;
-  font-size: 29rpx;
-}
-.info-address .iconfont {
-  color: #0B898E;
+  height: 80rpx;
+  border-radius: 13rpx;
+  background: #0B898E;
   font-size: 31rpx;
+  color: #fff;
+  font-weight: 500;
+  padding: 0 37rpx;
 }
-.product-item {
-  margin: 0 20rpx;
-  padding: 27rpx 0;
-  border-bottom: 1rpx solid #ccc;
+
+.days {
+  text-align: center;
+  font-size: 400;
+  width: 84rpx;
+  line-height: 34rpx;
+  height: 34rpx;
+  border-radius: 18rpx;
+  border: 1px solid white;
+  font-size: 23rpx;
 }
-.skutitle {
-  font-size: 29rpx;
-  color: #333;
-  font-weight: 500;
+
+.picker text {
+  font-weight: 400;
+  font-size: 21rpx;
+  margin-left: 13rpx;
 }
-.product-box {
+
+.product-item {
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
-  margin-top: 20rpx;
+  margin: 20rpx;
+  padding: 24rpx 20rpx;
+  background: white;
+  border-radius: 13rpx;
 }
-.product-left {
+
+.product-item image {
+  width: 201rpx;
+  height: 201rpx;
+  border-radius: 10rpx;
+  margin-right: 26rpx;
+  flex-shrink: 0;
+}
+
+.product-item .product-info {
   flex: 1;
 }
+
+.product-item .product-info .title {
+  font-size: 32rpx;
+  color: #000;
+  font-weight: 500;
+}
+
+.product-right {
+  flex-shrink: 0;
+  margin-left: 20rpx;
+}
+
+.product-right .price {
+  color: #D62828;
+  font-size: 40rpx;
+  font-weight: 500;
+}
+
+.product-right .price::before {
+  content: "￥";
+  font-size: 27rpx;
+  font-weight: 400;
+}
+
+.product-right .btn {
+  color: #fff;
+  width: 120rpx;
+  line-height: 80rpx;
+  background: #D62828;
+  border-radius: 13rpx;
+  font-size: 31rpx;
+  font-weight: 500;
+  text-align: center;
+  margin-top: 20rpx;
+}
+
+.product-info .subtitle {
+  font-size: 24rpx;
+  line-height: 36rpx;
+  height: 72rpx;
+  margin-top: 10rpx;
+  margin-bottom: 20rpx;
+  color: #999;
+  white-space: normal;
+}
+
 .product-tags {
   display: flex;
   align-items: center;
 }
+
 .product-tag {
   font-size: 20rpx;
   color: #0B898E;
@@ -131,57 +215,57 @@ page {
   padding: 0 15rpx;
   margin-right: 13rpx;
 }
+
 .product-tags .product-tags:last-child {
   margin-right: 0;
 }
-.order-tip-text {
-  margin-top: 33rpx;
-  font-size: 24rpx;
-  color: #666;
+
+.box {
+  /* margin: 20rpx; */
+  /* background: white; */
+  /* border-radius: 13rpx; */
+  background: #f2f2f2;
+  padding: 20rpx;
 }
-.product-right {
-  text-align: center;
-  flex-shrink: 0;
+.comment-box{
+    background: #fff;
+    margin: 20rpx 0;
+    width: 100%;
+    box-sizing: border-box;
 }
-.product-right .price {
-  color: #D62828;
-  font-size: 24rpx;
-  margin-bottom: 20rpx;
+.comment-box .no-comment{
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #999999;
+    padding-left: 18rpx;
 }
-.product-right .price text:nth-child(2){
+
+.box-top {
+  line-height: 95rpx;
+  border-bottom: 1rpx solid #d9d9d9;
   font-weight: 500;
+  color: #000;
   font-size: 33rpx;
+  padding: 0 20rpx;
+  background: #fff;
+  border-radius: 13rpx 13rpx 0 0;
 }
-.product-right .price text:nth-child(3){
-  color: #8D8D8D;
-  font-size: 20rpx;
-}
-.product-right .btn {
-  background: #D62828;
-  color: #fff;
-  border-radius: 30px;
-  line-height: 60rpx;
-  font-size: 29rpx;
-  font-weight: 500;
-  width: 176rpx;
-}
-.product-right .btn.disable {
-  background: #ccc;
-}
-.box .product-item:last-child {
-  border-bottom: none;
-}
+
 .box-top .iconfont {
   color: #0B898E;
   font-size: 33rpx;
   margin-right: 16rpx;
 }
+
 .empty-box {
   text-align: center;
   padding: 40rpx 0;
   font-size: 23rpx;
   color: #333;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
 }
+
 .empty-btn {
   margin: 0 auto;
   margin-top: 30rpx;
@@ -193,69 +277,385 @@ page {
   font-size: 32rpx;
   margin-bottom: 10rpx;
 }
+
 .box-top .score {
   color: #D62828;
   font-size: 30rpx;
   font-weight: 400;
   margin-left: 11rpx;
 }
+
 .product-comment {
-  margin: 0 20rpx;
+  /* margin: 0 20rpx; */
   border-bottom: 1rpx solid #ccc;
-  padding: 33rpx 0;
+  /* padding: 33rpx 0; */
+  padding: 28rpx 0rpx;
+  background: #fff;
+  width: 100%;
+  box-sizing: border-box;
+}
+.product-comment:last-of-type{
+    border-bottom: none;
 }
+
 .product-comment-top {
   display: flex;
   justify-content: space-between;
   color: #999999;
-  align-items: center;
+  align-items: flex-start;
   font-size: 24rpx;
 }
-.product-comment-top image {
+
+.product-comment-top .avator-img {
   flex-shrink: 0;
   width: 57rpx;
   height: 57rpx;
   border-radius: 50%;
 }
+.product-comment-top .comment-container{
+    flex: 1;
+    width: 10rpx;
+    padding: 0 45rpx 0 15rpx;
+}
 .product-comment-top .comment-info {
-  flex: 1;
-  margin: 0 15rpx;
-  color: #666;
-  font-size: 21rpx;
+  width: 100%;
+  height: 57rpx;
+  font-weight: bold;
+    font-size: 24rpx;
+    color: #666666;
+  display: flex;
+  align-items: center;
 }
+
 .product-comment-top .comment-info .iconfont {
   color: #D62828;
   font-size: 22rpx;
 }
-.product-comment-top .comment-info .iconfont  text {
+
+.product-comment-top .comment-info .iconfont text {
   margin-right: 6rpx;
 }
+
 .comment-content {
-  margin-left: 72rpx;
-  margin-top: 36rpx;
-  font-size: 28rpx;
-  color: #000;
+    width: 100%;
+    padding-top: 12rpx;
+    font-size: 27rpx;
+    color: #000;
+    font-weight: 500;
 }
+
 .more-comment-btn {
   line-height: 93rpx;
-  margin-right: 20rpx;
+  /* margin-right: 20rpx; */
   text-align: right;
   color: #999;
   font-size: 27rpx;
   font-weight: 500;
+  padding-right: 20rpx;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
 }
+
 .more-comment-btn .iconfont {
   margin-left: 6rpx;
   font-size: 24rpx;
 }
+
 .all-comment-num {
   float: right;
   color: #999999;
   font-size: 27rpx;
   font-weight: 400;
 }
-.icon-xin,.icon-shoucang {
+
+.scroll-all-box {
+  margin: 24rpx 0;
+  background: white;
+}
+
+.scroll-menus {
+  padding: 0 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 29rpx;
+  color: #333;
+  height: 84rpx;
+  border-bottom: 1rpx solid #d9d9d9;
+}
+
+.scroll-menu-item {
+  position: relative;
+  line-height: 84rpx;
+}
+
+.scroll-menu-item.active::after {
+  content: "1";
+  font-size: 0;
+  display: block;
+  position: absolute;
+  width: 46rpx;
+  height: 6rpx;
+  border-radius: 3rpx;
+  background: #0B898E;
+  left: 50%;
+  margin-left: -23rpx;
+  bottom: 0rpx;
+}
+
+.fixed-menus {
+  position: fixed;
+  left: 0;
+  right: 0;
+  background: white;
+  z-index: 1;
+}
+
+.info-title {
+  font-size: 35rpx;
+  font-weight: bold;
+  color: #000;
+  margin-bottom: 30rpx;
+}
+
+.info-box {
+  padding: 20rpx 40rpx;
+}
+
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 140rpx;
+  background: white;
+  display: flex;
+  align-items: center;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  padding: 0 40rpx;
+  color: #666666;
+  font-size: 23rpx;
+  justify-content: space-between;
+  text-align: center;
+  padding-left: 0;
+}
+
+.fixed-bottom .iconfont {
+  font-size: 34rpx;
+  line-height: 40rpx;
+}
+
+.btns {
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 500;
+  border-radius: 39rpx;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.btns .btn {
+  width: 216rpx;
+  line-height: 78rpx;
+  background: #D62828;
+}
+
+.btns .btn:nth-child(1) {
+  /* margin-right: 3rpx; */
+  border-radius: 39rpx 0 0 39rpx;
+  background: #FD7601;
+}
+
+.btns .btn:nth-child(2) {
+  border-radius: 0 39rpx 39rpx 0;
+}
+
+.btns .btn.disable {
+  background: #ccc;
+}
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+
+.sku-info-box {
+  margin: 50rpx 25rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.sku-info-box image {
+    width: 173rpx;
+    height: 173rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 15rpx;
+  flex-shrink: 0;
+}
+
+.sku-info {
+  flex: 1;
+  width: 100rpx;
+  height: 173rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.sku-price {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #F84A56;
+}
+
+.sku-price::before {
+  content: "￥";
+  font-size: 24rpx;
+  vertical-align: baseline;
+}
+
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+
+.sku-names {
+  display: flex;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #333333;
+  margin: 0 25rpx;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+  justify-content: space-between;
+  max-height: 800rpx;
+  min-height: 400rpx;
+  align-content: flex-start; 
+}
+
+.sku-name-item {
+    min-height: 67rpx;
+    border-radius: 13rpx;
+  margin-bottom: 34rpx;
+  max-width: 100%;
+  padding-right:15rpx;
+  min-width: 340rpx;
+  background: #EFEFEF;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+}
+.sku-name-item>image{
+    width: 67rpx;
+    height: 100%;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+}
+.sku-name-item .sku-name{
+    flex:1;
+    /* width: 100rpx; */
+    padding-left: 15rpx;
+    color: #333;
+}
+
+.sku-name-item.active{
+  color: #0B898E;
+  border: 1px solid #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+.sku-name-item.active .sku-name{
+    color: #0B898E;
+  }
+
+.number-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #EFEFEF;
+border-radius: 13rpx;
+padding: 10rpx 0;
+box-sizing: border-box;
+height: 53rpx;
+width: 250rpx;
+
+}
+
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+
+.number-box view {
+  text-align: center;
+  width: 80rpx;
+  height: 33rpx;
+  line-height: 33rpx;
+  font-size: 31rpx;
+  color: #000;
+}
+
+.number-box view.number {
+  width: 94rpx;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+.limit-number{
+    font-weight: 500;font-size: 27rpx;color: #666666;padding-left:20rpx;
+}
+
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
   position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 33rpx;
+  font-weight: 500;
+}
+
+.mask-btn.disable {
+  background: #ccc;
+}
+
+/* .icon-xin,.icon-shoucang {
+  position: absolute;
   right: 20rpx;
   margin-top: 20rpx;
   width: 60rpx;
@@ -265,48 +665,603 @@ page {
   text-align: center;
   color: #fff;
   font-size: 36rpx;
-  z-index: 3;
+  z-index: 1;
+} */
+.share-icon {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  height: 60rpx;
+  z-index: 1;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250826/81287df192b80ea03318e06b2b19ebe1.png");
+  background-size: 100% 100%;
 }
+
 .icon-shoucang {
   color: #D62828;
+  font-size: 40rpx !important;
+
 }
-.tags-price {
-  flex: 1;
-  text-align: right;
-  color: #D62828;
+
+/* 购物车 */
+.cart-box {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 80rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.2);
+  border-radius: 50%;
+  right: 20rpx;
+  bottom: 166rpx;
+  z-index: 15;
 }
-.tags-price text:nth-child(1){
-  font-size: 27rpx;
+
+.cart-box image {
+  display: block;
+  width: 49rpx;
 }
-.tags-price text:nth-child(2){
-  font-size: 40rpx;
-  font-weight: bold;
+
+.cart-num {
+  width: 26rpx;
+  border: 1rpx solid;
+  border-radius: 50%;
+  line-height: 26rpx;
+  text-align: center;
+  font-size: 23rpx;
+  color: #D20000;
+  position: absolute;
+  right: -2rpx;
+  top: -5rpx;
+}
+
+.headimg {
+  position: fixed;
+  z-index: 3;
+  left: -218rpx;
+  width: 218rpx;
+  height: 180rpx;
+  top: 0;
+}
+
+.headimg.active {
+  transition: left .6s linear, top .6s cubic-bezier(0.5, -0.5, 1, 1), width .6s ease, height .6s ease;
+  width: 80rpx;
+  height: 80rpx;
+  left: 650rpx;
+  border-radius: 50%;
+}
+
+.share-img-box {
+  /* width: 551rpx; */
+  position: static;
+  background: none;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.share-img {
+  display: block;
+  width: 551rpx;
+}
+
+.share-tips {
+  width: 426rpx;
+  height: 150rpx;
+  background: #FFFFFF;
+  border-radius: 25rpx;
+  margin-top: 25rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 65rpx;
+  color: #999;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 40rpx;
+}
+
+.share-tips .img {
+  display: block;
+  width: 55rpx;
+  margin: 0 auto;
+  margin-bottom: 4rpx;
+}
+
+.tipimg {
+  position: absolute;
+  left: 50%;
+  margin-left: 16rpx;
+  width: 24rpx;
+  height: 24rpx;
+  background: #D62828;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 34rpx;
+}
+
+.tipimg image {
+  width: 21rpx;
+  display: block;
+
 }
-.tags-price text:nth-child(3){
+
+.save-btn {
+  width: 403rpx;
+  line-height: 77rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 31rpx;
+  font-weight: 500;
+  margin-top: 50rpx;
+}
+
+.allowance-box {
+  height: 113rpx;
+  background: url("https://static.ticket.sz-trip.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
+  background-size: 100% auto;
+  background-repeat: no-repeat;
+  padding: 30rpx 30rpx 10rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  margin-top: -60rpx;
+  position: relative;
+  display: flex;
+  justify-content: start;
+  align-items: baseline;
+}
+
+.allowance-box .com-price {
+  font-size: 30rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:before {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:after {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .yellow {
+  color: #DF2115;
+  padding: 8rpx 14rpx;
+  background-color: #FDEDD4;
+  margin-left: 20rpx;
+  border-radius: 30rpx;
+}
+
+.mask-allowance .mask-content {
+  margin: auto;
+  width: auto;
+  top: initial;
+  bottom: initial;
+  padding: 20rpx;
+  width: 80%;
+}
+
+.mask-allowance .mask-content .rule-title {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.imgs{
+  width: 133rpx;
+  height: 133rpx;
+  border-radius: 13rpx;
+}
+.img-box{
+    width: 133rpx;
+height: 133rpx;
+  position: relative;
+  overflow: hidden;
+}
+.img-box .more-img{
+    height: 37rpx;
+    line-height: 37rpx;
+    background: #000;
+    border-radius: 13rpx 0rpx 13rpx 0rpx;
+    box-sizing: border-box;
+    padding: 0 5rpx;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    opacity: 0.8;
+}
+.all{
+  color: #fff;
+  position:absolute;
+  bottom: 17rpx;
+  right: 10rpx;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 8rpx;
+  background-color: rgba(0, 0, 0, .5);
+}
+.all view{
+  text-align: center;
+}
+.all view:first-child{
+  font-size: 45rpx;
+  margin-top: 40rpx;
+}
+.all view:last-child{
+  margin-top: 10rpx;
+}
+.sku{
+  margin-left: 10rpx;
+  color: #666;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.proad{
+  margin: 20rpx;
+}
+.proad-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+}
+.proad-title image{
+  width: 292rpx;
+  height: 34rpx;
+}
+.pro-list{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.proitem{
+  width: 334rpx;
+  height: 497rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+}
+.item-hd image{
+  width: 334rpx;
+  height: 342rpx;
+  border-radius: 13rpx 13rpx;
+}
+.item-bm{
+  padding: 8rpx 12rpx;
+}
+.protitle{
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #000000;
+}
+.pro-price{
+  color: #D62828;
+  font-weight: 500;
+  font-size: 30rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #D62828;
   font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
   color: #999999;
-  margin-left: 4rpx;
+  font-size: 10px;
 }
-.sku-items {
+.icon-shop{
+  width: 34rpx;
+  height: 36rpx;
+}
+.left-img{
   display: flex;
+  width: 290rpx;
+  flex-shrink: 0;
+  justify-content: space-between;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.no-shop{
+  width: 230rpx;
+}
+.shop-box{
+  display:flex;
+  flex-direction: column;
   align-items: center;
-  flex-wrap: wrap;
-  margin-bottom: 1rpx;
+  justify-content: space-between;
+  height: 70rpx;
 }
-.sku-item {
-  padding: 0 46rpx;
-  font-size: 29rpx;
-  color: #666;
-  border: 1rpx solid #999;
-  line-height: 58rpx;
-  margin-right: 40rpx;
-  margin-bottom: 25rpx;
+
+ .wineScene-price-container {
+    width: 750rpx;
+    height: 100rpx;
+    /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
+    background: #FD3856;
+    /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    color: #FFFFFF;
+    font-size: 24rpx;
+ }
+
+ .wineScene-price-container .wineSecne-price {
+    font-weight: bold;
+    font-size: 48rpx;
+    color: #FFFFFF;
 }
-.sku-item.active {
-  background: #0B898E;
-  border-color: #0B898E;
-  color: #fff;
+.wineScene-price-container .wineSecne-money {
+    font-size: 24rpx;
+    font-weight: 500;
+    /* text-decoration-line: line-through; */
+    padding-left: 14rpx;
+}
+.wineScene-price-container .wineSecne-price::before {
+    font-size: 24rpx;
+    content: '￥';
+}
+
+.hotel-custom-detail{
+    display: flex;
+    /* justify-content: space-between; */
+    height: fit-content;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 20rpx;
+}
+.hotel-custom-detail .tip-info{
+    width: 33rpx;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.hotel-custom-detail .tip-info .tip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    width: 33rpx;
+    height: 33rpx;
+    background: #6394FD;
+    border-radius: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    text-align: center;
+    line-height: 33rpx;
+}
+.hotel-custom-detail .tip-info .info{
+    width: 11rpx;
+    height: 100%;
+    background: #D0DFFE;
+    border-radius: 5rpx;
+}
+
+.hotel-custom-right>view{
+    margin-bottom: 20rpx;
+}
+.hotel-custom-right>view:last-of-type{
+    margin-bottom: 0;
+}
+.map-container{
+    background-image: url('https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/locationBg.png');
+    background-size: 100% 100%;
+    width: 100%;
+    height: 128rpx;
+    padding: 30rpx 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    box-sizing: border-box;
+}
+.map-container image{
+    width: 29rpx;
+    height: 29rpx;
+}
+
+.select-img{
+    display: flex;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 26rpx;
+}
+.select-img image{
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 13rpx;
+    margin-right:20rpx;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+.select-img image.active{
+    border: 2px solid #DC2525;
+}
+.select-img image.no-stock{
+    border: none;
+    opacity: 0.5;
+}
+.select-img .select-img-text{
+    font-weight: bold;
+    font-size: 24rpx;
+    color: #000000;
+    width: 51rpx;
+    height: 80rpx;
+    margin-right:20rpx;
+    display: flex;
+    align-items: center;
+}
+.select-img .other-imgs{
+    flex: 1;
+    width: 100rpx;
+    overflow-x: auto;
+    display: flex;
+}
+.select-img .select-sku{
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 25rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    background: white;
+    font-family: fangsong;
+    color: #999;
+}
+.sku-tips{
+    width: 100%;
+    position: absolute;
+    bottom: 73rpx;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: center;
+}
+.sku-tips>view{
+    width: fit-content;
+    max-width: 533rpx;
+    height: 53rpx;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 27rpx;
+    padding: 0 28rpx;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    margin: 0 auto;
+}
+
+.shop-container{
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    padding: 32rpx 23rpx;
+    width: 100%;
+    background: white;
+    box-sizing: border-box;
+}
+.shop-container .shop-img{
+    width: 113rpx;
+    height: 113rpx;
+    flex-shrink: 0;
+}
+.shop-container .shop-btn{
+    width: 135rpx;
+height: 57rpx;
+border-radius: 13rpx;
+border: 1px solid #0B898E;
+font-weight: 500;
+font-size: 31rpx;
+color: #0B898E;
+text-align: center;
+line-height: 57rpx;
+flex-shrink: 0;
+}
+.shop-container .textOver2{
+    flex: 1;
+    width: 100rpx;
+    padding: 0 50rpx 0 20rpx;
+    font-weight: bold;
+font-size: 32rpx;
+color: #010101;
+}
+
+
+
+.other-info-box{
+}
+.other-info-box .other-info-item{
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+    margin-top: 30rpx;
+}
+.other-info-box .other-info-item image{
+    width: 32rpx;
+    height: 32rpx;
+    flex-shrink: 0;
+}
+.other-info-box .view-arrow{
+    font-family: fangsong;
+    color: #999;
+    width: 25rpx;
+    flex-shrink: 0;
+}
+.other-info-box .other-content{
+    padding: 0 20rpx;
+    overflow: hidden;
+    flex: 1;
+    width: 100rpx;
+    
+}
+
+.other-info-content{
+    min-height: 600rpx;
+    padding: 32rpx 23rpx;
+}
+.other-info-content .title{
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #060001;
+    text-align: center;
+    margin-bottom: 36rpx;
+}
+.other-info-content .key-title{
+    color: #060001;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    font-weight: bold;
+}
+.other-info-content .key-content{
+    color: #666;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    margin-top: 6rpx;
+}
+.prod-param{
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 45rpx;
+}
+.prod-param .prod-key{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
 }
-.details {
-  padding-bottom: 30rpx;
+.prod-param .prod-content{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+font-size: 27rpx;
+color: #000000;
 }
\ No newline at end of file
diff --git a/pages/order/food/index.js b/pages/order/food/index.js
index bd05f06..9dff63a 100644
--- a/pages/order/food/index.js
+++ b/pages/order/food/index.js
@@ -85,14 +85,14 @@ Page({
   order:function(){
     if(!this.data.user){
       wx.showToast({
-        title: '请输入预订人',
+        title: '请输入联系人',
         icon: 'none'
       })
       return;
     }
     if(!this.data.tel){
       wx.showToast({
-        title: '请输入手机号码',
+        title: '请输入手机号',
         icon: 'none'
       })
       return;
diff --git a/pages/order/food/index.wxml b/pages/order/food/index.wxml
index 36b7601..a732f57 100644
--- a/pages/order/food/index.wxml
+++ b/pages/order/food/index.wxml
@@ -4,32 +4,34 @@
   <view class="skuinfo">
     <image lazy-load src="{{product.sku.headimg}}" mode="aspectFill"></image>
     <view class="right-info">
-      <view class="sku-name textOver2">{{product.product.title+product.sku.sku_name}}</view>
-      <view class="info-tips">
+      <view class="sku-name textOver2">{{product.product.title}}</view>
+      <view class="sku-name2 textOver2">{{product.sku.sku_name}}</view>
+      <!-- <view class="info-tips">
         <view class="price"><text>￥</text>{{product.sku.price/100}}</view>
         <view bindtap="showNotice">购买须知 <text class="iconfont icon-you"></text> </view>
-      </view>
+      </view> -->
     </view>
+    <view class="info-tips"><text>￥</text>{{product.sku.price/100}}</view>
   </view>
-  <view class="box-title">
-    <view style="flex:1">购票数量</view>
+  <view class="box-title" style="border-top: none;">
+    <view style="flex:1">购买数量</view>
     <view class="iconfont icon-sami-select" bindtap="minus"></view>
     <view class="number-box">{{productNum}}</view>
     <view class="iconfont icon-add-select" bindtap="add"></view>
   </view>
   <view class="box-title">
-    <view style="flex-shrink:0">预订人：</view>
-    <input type="text" value="{{user}}" bindinput="userInput" placeholder="请输入预订人真实姓名"></input>
+    <view style="flex-shrink:0">联系人：</view>
+    <input type="text" value="{{user}}" bindinput="userInput" placeholder="输入您的名字"></input>
   </view>
   <view class="box-title">
-    <view style="flex-shrink:0">手机号码：</view>
-    <input type="number" value="{{tel}}" bindinput="telInput" placeholder="请输入手机号码"></input>
+    <view style="flex-shrink:0">手机号：</view>
+    <input type="number" value="{{tel}}" bindinput="telInput" placeholder="请输入手机号"></input>
   </view>
 </view>
 <coupon id="coupon" money="{{product.sku.price * productNum}}" sku="{{product.sku.id}}"></coupon>
 <view style="height:113rpx"></view>
 <view class="fixed-bottom" wx:if="{{product}}">
-  <view class="fixed-price-box"><text>合计：</text><text class="price">¥{{((product.sku.price * productNum - (coupon?coupon.activity.money:0))>0?(product.sku.price * productNum - (coupon?coupon.activity.money:0)):0) / 100}}</text></view>
-  <view class="fixed-btn" bindtap="order">立即预约</view>
+  <view class="fixed-price-box"><text>订单金额：</text><text class="price">¥{{((product.sku.price * productNum - (coupon?coupon.activity.money:0))>0?(product.sku.price * productNum - (coupon?coupon.activity.money:0)):0) / 100}}</text></view>
+  <view class="fixed-btn" bindtap="order">提交订单</view>
 </view>
 <notice bind:close="closeNotice" wx:if="{{showNoticeFlag}}" bookingInfo="{{product.sku.sku_model}}" skuName="{{product.sku.sku_name}}"></notice>
\ No newline at end of file
diff --git a/pages/order/food/index.wxss b/pages/order/food/index.wxss
index 37a9558..0b1e087 100644
--- a/pages/order/food/index.wxss
+++ b/pages/order/food/index.wxss
@@ -12,10 +12,11 @@ page {
   margin: 0 20rpx;
   font-size: 31rpx;
   color: #000;
-  font-weight: 500;
+  font-weight: 600;
   display: flex;
   align-items: center;
 }
+
 .coupon-btn {
   width: 138rpx;
   line-height: 56rpx;
@@ -29,48 +30,47 @@ page {
   display: flex;
   justify-content: space-between;
   padding: 30rpx 20rpx;
-  margin-bottom: 30rpx;
+  align-items: flex-start;
 }
 .skuinfo image {
   flex-shrink: 0;
-  width: 174rpx;
-  height: 143rpx;
-  border-radius: 7rpx;
-  margin-right: 23rpx;
-  background: red;
+  width: 147rpx;
+  height: 147rpx;
+  border-radius: 13rpx;
+  margin-right: 12rpx;
 }
 .right-info {
   flex: 1;
   width: 100%;
+  padding-right: 30rpx;
 }
 .sku-name {
-  font-size: 32rpx;
-  line-height: 47rpx;
-  height: 94rpx;
-  color: #333;
-  margin-bottom: 10rpx;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #333333;
 }
-.info-tips {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 27rpx;
-  color: #666;
+.sku-name2{
+    font-weight: 500;
+font-size: 27rpx;
+color: #999999;
+margin-top: 30rpx;
 }
-.info-tips .price {
-  font-size: 33rpx;
-  color: #000;
+.info-tips {
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #000000;
+    flex-shrink: 0;
 }
-.info-tips .price text {
+.info-tips  text {
   font-size: 24rpx;
+  font-weight: 400;
 }
-.info-tips .iconfont {
-  font-size: 26rpx;
-}
+
 .box-title .iconfont {
   font-size: 28rpx;
   flex-shrink: 0;
 }
+
 .number-box {
   font-size: 29rpx;
   font-weight: 500;
@@ -95,7 +95,7 @@ page {
   flex: 1;
   display: block;
   font-size: 31rpx;
-  color: #666;
+  color: #000000;
   margin-left: 15rpx;
   font-weight: 400;
 }

From 6c74bc5d8e9692b5e41feb94aeaf0fd701eb3615 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 26 Sep 2025 16:05:23 +0800
Subject: [PATCH 427/471] =?UTF-8?q?=E7=BE=8E=E9=A3=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                   |  546 ++++----
 pages/info/foodNew/index.js                |  790 +++++++++++
 pages/info/foodNew/index.json              |    7 +
 pages/info/foodNew/index.wxml              |  289 ++++
 pages/info/foodNew/index.wxss              | 1374 ++++++++++++++++++++
 pages/info/foodProductInfo/index.js        |   35 +-
 pages/info/foodProductInfo/index.wxml      |   20 +-
 pages/info/foodProductInfo/index.wxss      |   18 +-
 pages/list/foodNew/index.js                |  194 +++
 pages/list/foodNew/index.json              |    5 +
 pages/list/foodNew/index.wxml              |   48 +
 pages/list/foodNew/index.wxss              |  156 +++
 pages/order/food/index.js                  |   31 +-
 pages/order/food/index.wxml                |    6 +-
 pages/user/order/foodOrderInfo/index.js    |   86 +-
 pages/user/order/foodOrderInfo/index.json  |    3 +-
 pages/user/order/foodOrderInfo/index.wxml  |   98 +-
 pages/user/order/foodOrderInfo/index.wxss  |   83 +-
 pages/user/order/sceneOrderInfo/index.wxml |   15 +-
 project.private.config.json                |   23 +-
 utils/https.js                             |    4 +-
 21 files changed, 3432 insertions(+), 399 deletions(-)
 create mode 100644 pages/info/foodNew/index.js
 create mode 100644 pages/info/foodNew/index.json
 create mode 100644 pages/info/foodNew/index.wxml
 create mode 100644 pages/info/foodNew/index.wxss
 create mode 100644 pages/list/foodNew/index.js
 create mode 100644 pages/list/foodNew/index.json
 create mode 100644 pages/list/foodNew/index.wxml
 create mode 100644 pages/list/foodNew/index.wxss

diff --git a/app.json b/app.json
index 0f44cc5..0a9a26d 100644
--- a/app.json
+++ b/app.json
@@ -1,283 +1,285 @@
 {
-    "pages": [
-      "pages/index/index",
-      "pages/map/index",
-      "pages/pbService/aiHelpYou/index",
-      "pages/search/index",
-      "pages/search/list/index",
-      "pages/login/index",
-      "pages/old/index",
-      "pages/old/user/index",
-      "pages/old/profile/index",
-      "pages/old/nickname/index",
-      "pages/old/linkman/index",
-      "pages/old/linkman/add/index",
-      "pages/order/comment/index",
-      "pages/order/coupon/index",
-      "pages/order/pay/index",
-      "pages/order/payresult/index",
-      "pages/order/showSeat/index",
-      "pages/order/show/index",
-      "pages/order/road/index",
-      "pages/order/roadOrder/index",
-      "pages/order/movie/index",
-      "pages/order/food/index",
-      "pages/order/scene/index",
-      "pages/order/sceneCart/index",
-      "pages/order/hotel/index",
-      "pages/order/card/index",
-      "pages/order/joinOrder/index",
-      "pages/order/joinOrder/success/index",
-      "pages/order/joinOrder/history/index",
-      "pages/order/postOrder/index",
-      "pages/order/showOrder/index",
-      "pages/info/newsInfo/index",
-      "pages/info/hotelProductInfo/index",
-      "pages/info/museumInfo/index",
-      "pages/info/sceneProductInfo/index",
-      "pages/info/sceneProductInfoNew/index",
-      "pages/info/foodInfo/index",
-      "pages/info/roadInfo/index",
-      "pages/info/cardInfo/index",
-      "pages/info/foodProductInfo/index",
-      "pages/info/postProductInfo/index",
-      "pages/info/sceneInfo/index",
-      "pages/info/hotelInfo/index",
-      "pages/info/activityInfo/index",
-      "pages/info/showInfo/index",
-      "pages/info/strategyInfo/index",
-      "pages/info/guideInfo/index",
-      "pages/info/groupOrderInfo/index",
-      "pages/info/culturalUnitInfo/index",
-      "pages/info/redmapInfo/index",
-      "pages/user/user",
-      "pages/user/retail/index",
-      "pages/user/retail/apply/index",
-      "pages/user/retail/goods/index",
-      "pages/user/retail/list/index",
-      "pages/user/retail/order/index",
-      "pages/user/coupon/index",
-      "pages/user/videoCoupon/index",
-      "pages/user/verify/index",
-      "pages/user/cartlist/list",
-      "pages/user/couponCenter/index",
-      "pages/user/order/list",
-      "pages/user/order/team/list",
-      "pages/user/order/sceneOrderInfo/index",
-      "pages/user/order/foodOrderInfo/index",
-      "pages/user/order/lineOrderInfo/index",
-      "pages/user/order/couponOrderInfo/index",
-      "pages/user/order/hotelOrderInfo/index",
-      "pages/user/order/postOrderInfo/index",
-      "pages/user/order/expressInfo/index",
-      "pages/user/order/movieOrderInfo/index",
-      "pages/user/order/activityOrderInfo/index",
-      "pages/user/order/museumOrderInfo/index",
-      "pages/user/order/refundInfo/index",
-      "pages/user/service/index",
-      "pages/user/service/list/index",
-      "pages/user/service/info/index",
-      "pages/user/address/index",
-      "pages/user/profile/index",
-      "pages/user/bindtel/index",
-      "pages/user/nickname/index",
-      "pages/user/likes/index",
-      "pages/user/email/index",
-      "pages/supplier/index",
-      "pages/supplier/apply/index",
-      "pages/supplier/good/index",
-      "pages/list/mayday/index",
-      "pages/list/feiyi/index",
-      "pages/list/haoxing/index",
-      "pages/list/culturalUnit/index",
-      "pages/list/food/index",
-      "pages/list/techan/index",
-      "pages/list/museum/index",
-      "pages/list/store/index",
-      "pages/list/activity/index",
-      "pages/list/activitynew/index",
-      "pages/list/road/index",
-      "pages/list/hotel/index",
-      "pages/list/strategy/index",
-      "pages/list/night/index",
-      "pages/list/sale/index",
-      "pages/list/movieticket/index",
-      "pages/list/movieticket/list/seats/index",
-      "pages/list/movieticket/list/cinema/index",
-      "pages/list/movieticket/list/ticket/index",
-      "pages/list/movieticket/list/web/index",
-      "pages/list/movieticket/list/info/index",
-      "pages/list/theatre/index",
-      "pages/list/card/index",
-      "pages/list/six/index",
-      "pages/list/scene/index",
-      "pages/list/comments/index",
-      "pages/list/message/index",
-      "pages/list/minitrip/index",
-      "pages/list/oneday/index",
-      "pages/list/daysu/index",
-      "pages/list/daysu/detail/index",
-      "pages/pbService/index",
-      "pages/pbService/activity/index",
-      "pages/pbService/museum/index",
-      "pages/pbService/museum/info/index",
-      "pages/pbService/PRpark/index",
-      "pages/pbService/sceneComfort/index",
-      "pages/pbService/gym/index",
-      "pages/pbService/gym/info/index",
-      "pages/pbService/bus/index",
-      "pages/pbService/bus/search/index",
-      "pages/pbService/bus/lineinfo/index",
-      "pages/pbService/security/index",
-      "pages/pbService/web/index",
-      "pages/pbService/feiyi/index",
-      "pages/pbService/bike/index",
-      "pages/pbService/feiyi/info/index",
-      "pages/pbService/appreciate/index",
-      "pages/pbService/appreciate/info/index",
-      "pages/pbService/library/index",
-      "pages/pbService/library/bookinfo/index",
-      "pages/pbService/library/getpoint/index",
-      "pages/pbService/library/mybook/index",
-      "pages/pbService/wbdw/index",
-      "pages/pbService/wbdw/info/index",
-      "pages/pbService/wwcx/index",
-      "pages/pbService/wwcx/info/index",
-      "pages/pbService/wwcx/search/index",
-      "pages/pbService/group/index",
-      "pages/ask/index",
-      "pages/ask/info/index",
-      "pages/ask/my/index",
-      "pages/activity/graduate/index",
-      "pages/activity/year2020/index",
-      "pages/activity/suyear/index",
-      "pages/activity/spring2021/index",
-      "pages/activity/springten/list/index",
-      "pages/activity/autumnten/list/index",
-      "pages/activity/springten/index",
-      "pages/activity/autumnten/index",
-      "pages/activity/newarrival/index",
-      "pages/activity/artfestival/index",
-      "pages/activity/redlist/index",
-      "pages/activity/subway/index",
-      "pages/activity/tenscenic/index",
+  "pages": [
+    "pages/index/index",
+    "pages/map/index",
+    "pages/pbService/aiHelpYou/index",
+    "pages/search/index",
+    "pages/search/list/index",
+    "pages/login/index",
+    "pages/old/index",
+    "pages/old/user/index",
+    "pages/old/profile/index",
+    "pages/old/nickname/index",
+    "pages/old/linkman/index",
+    "pages/old/linkman/add/index",
+    "pages/order/comment/index",
+    "pages/order/coupon/index",
+    "pages/order/pay/index",
+    "pages/order/payresult/index",
+    "pages/order/showSeat/index",
+    "pages/order/show/index",
+    "pages/order/road/index",
+    "pages/order/roadOrder/index",
+    "pages/order/movie/index",
+    "pages/order/food/index",
+    "pages/order/scene/index",
+    "pages/order/sceneCart/index",
+    "pages/order/hotel/index",
+    "pages/order/card/index",
+    "pages/order/joinOrder/index",
+    "pages/order/joinOrder/success/index",
+    "pages/order/joinOrder/history/index",
+    "pages/order/postOrder/index",
+    "pages/order/showOrder/index",
+    "pages/info/newsInfo/index",
+    "pages/info/hotelProductInfo/index",
+    "pages/info/museumInfo/index",
+    "pages/info/sceneProductInfo/index",
+    "pages/info/sceneProductInfoNew/index",
+    "pages/info/foodInfo/index",
+    "pages/info/roadInfo/index",
+    "pages/info/cardInfo/index",
+    "pages/info/foodProductInfo/index",
+    "pages/info/postProductInfo/index",
+    "pages/info/sceneInfo/index",
+    "pages/info/hotelInfo/index",
+    "pages/info/activityInfo/index",
+    "pages/info/showInfo/index",
+    "pages/info/strategyInfo/index",
+    "pages/info/guideInfo/index",
+    "pages/info/groupOrderInfo/index",
+    "pages/info/culturalUnitInfo/index",
+    "pages/info/redmapInfo/index",
+    "pages/user/user",
+    "pages/user/retail/index",
+    "pages/user/retail/apply/index",
+    "pages/user/retail/goods/index",
+    "pages/user/retail/list/index",
+    "pages/user/retail/order/index",
+    "pages/user/coupon/index",
+    "pages/user/videoCoupon/index",
+    "pages/user/verify/index",
+    "pages/user/cartlist/list",
+    "pages/user/couponCenter/index",
+    "pages/user/order/list",
+    "pages/user/order/team/list",
+    "pages/user/order/sceneOrderInfo/index",
+    "pages/user/order/foodOrderInfo/index",
+    "pages/user/order/lineOrderInfo/index",
+    "pages/user/order/couponOrderInfo/index",
+    "pages/user/order/hotelOrderInfo/index",
+    "pages/user/order/postOrderInfo/index",
+    "pages/user/order/expressInfo/index",
+    "pages/user/order/movieOrderInfo/index",
+    "pages/user/order/activityOrderInfo/index",
+    "pages/user/order/museumOrderInfo/index",
+    "pages/user/order/refundInfo/index",
+    "pages/user/service/index",
+    "pages/user/service/list/index",
+    "pages/user/service/info/index",
+    "pages/user/address/index",
+    "pages/user/profile/index",
+    "pages/user/bindtel/index",
+    "pages/user/nickname/index",
+    "pages/user/likes/index",
+    "pages/user/email/index",
+    "pages/supplier/index",
+    "pages/supplier/apply/index",
+    "pages/supplier/good/index",
+    "pages/list/mayday/index",
+    "pages/list/feiyi/index",
+    "pages/list/haoxing/index",
+    "pages/list/culturalUnit/index",
+    "pages/list/food/index",
+    "pages/list/techan/index",
+    "pages/list/museum/index",
+    "pages/list/store/index",
+    "pages/list/activity/index",
+    "pages/list/activitynew/index",
+    "pages/list/road/index",
+    "pages/list/hotel/index",
+    "pages/list/strategy/index",
+    "pages/list/night/index",
+    "pages/list/sale/index",
+    "pages/list/movieticket/index",
+    "pages/list/movieticket/list/seats/index",
+    "pages/list/movieticket/list/cinema/index",
+    "pages/list/movieticket/list/ticket/index",
+    "pages/list/movieticket/list/web/index",
+    "pages/list/movieticket/list/info/index",
+    "pages/list/theatre/index",
+    "pages/list/card/index",
+    "pages/list/six/index",
+    "pages/list/scene/index",
+    "pages/list/comments/index",
+    "pages/list/message/index",
+    "pages/list/minitrip/index",
+    "pages/list/oneday/index",
+    "pages/list/daysu/index",
+    "pages/list/daysu/detail/index",
+    "pages/pbService/index",
+    "pages/pbService/activity/index",
+    "pages/pbService/museum/index",
+    "pages/pbService/museum/info/index",
+    "pages/pbService/PRpark/index",
+    "pages/pbService/sceneComfort/index",
+    "pages/pbService/gym/index",
+    "pages/pbService/gym/info/index",
+    "pages/pbService/bus/index",
+    "pages/pbService/bus/search/index",
+    "pages/pbService/bus/lineinfo/index",
+    "pages/pbService/security/index",
+    "pages/pbService/web/index",
+    "pages/pbService/feiyi/index",
+    "pages/pbService/bike/index",
+    "pages/pbService/feiyi/info/index",
+    "pages/pbService/appreciate/index",
+    "pages/pbService/appreciate/info/index",
+    "pages/pbService/library/index",
+    "pages/pbService/library/bookinfo/index",
+    "pages/pbService/library/getpoint/index",
+    "pages/pbService/library/mybook/index",
+    "pages/pbService/wbdw/index",
+    "pages/pbService/wbdw/info/index",
+    "pages/pbService/wwcx/index",
+    "pages/pbService/wwcx/info/index",
+    "pages/pbService/wwcx/search/index",
+    "pages/pbService/group/index",
+    "pages/ask/index",
+    "pages/ask/info/index",
+    "pages/ask/my/index",
+    "pages/activity/graduate/index",
+    "pages/activity/year2020/index",
+    "pages/activity/suyear/index",
+    "pages/activity/spring2021/index",
+    "pages/activity/springten/list/index",
+    "pages/activity/autumnten/list/index",
+    "pages/activity/springten/index",
+    "pages/activity/autumnten/index",
+    "pages/activity/newarrival/index",
+    "pages/activity/artfestival/index",
+    "pages/activity/redlist/index",
+    "pages/activity/subway/index",
+    "pages/activity/tenscenic/index",
       "pages/activity/huawei/index",
       "pages/activity/huawei/form/index",
       "pages/activity/huawei/result/index",
       "pages/activity/huawei/upload/index",
       "pages/activity/huawei/uploadres/index",
       "pages/activity/huawei/list/index",
-      "pages/kj/index",
-      "pages/kj/his/index",
-      "pages/kj/info/index",
-      "pages/kj/mine/index",
-      "pages/group/index",
-      "pages/group/apply/index",
-      "pages/group/mine/index",
-      "pages/group/info/index",
-      "pages/culture/index",
-      "pages/culture/info/index",
-      "pages/user/logout/index",
-      "pages/order/orderList/index",
-      "pages/user/linkman/add/index",
-      "pages/user/address/add/index",
-      "pages/user/linkman/index",
-      "pages/user/userPrivacy/index",
-      "pages/user/personalInfo/index",
-      "pages/info/luggageInfo/index",
-      "pages/order/WineSceneOrder/index",
-      "pages/order/showOrderNew/index",
-      "pages/user/order/showOrderInfo/index",
-      "pages/user/suggest/suggest"
-    ],
-    "subpackages": [
+    "pages/kj/index",
+    "pages/kj/his/index",
+    "pages/kj/info/index",
+    "pages/kj/mine/index",
+    "pages/group/index",
+    "pages/group/apply/index",
+    "pages/group/mine/index",
+    "pages/group/info/index",
+    "pages/culture/index",
+    "pages/culture/info/index",
+    "pages/user/logout/index",
+    "pages/order/orderList/index",
+    "pages/user/linkman/add/index",
+    "pages/user/address/add/index",
+    "pages/user/linkman/index",
+    "pages/user/userPrivacy/index",
+    "pages/user/personalInfo/index",
+    "pages/info/luggageInfo/index",
+    "pages/order/WineSceneOrder/index",
+    "pages/order/showOrderNew/index",
+    "pages/user/order/showOrderInfo/index",
+    "pages/user/suggest/suggest",
+    "pages/list/foodNew/index",
+    "pages/info/foodNew/index"
+  ],
+  "subpackages": [
+    {
+      "root": "subPackages",
+      "pages": [
+        "indexs/index",
+        "index/index",
+        "techanNew/index",
+        "techanCart/index",
+        "feiyiNew/index",
+        "postSearch/index",
+        "gwcOrder/index",
+        "indexGQ/index",
+        "transferPage/transferPage",
+        "password/overview/overview",
+        "password/setting/setting",
+        "goods/oneCardTour/info/index",
+        "feiyiNew/CGCIndex/index",
+        "feiyiNew/CGCLetter/index",
+        "feiyiNew/CGCTime/index"
+      ]
+    },
+    {
+      "root": "subPackageCheckPoint",
+      "pages": [
+        "pages/index/index",
+        "pages/scopemap/index",
+        "pages/detailsmap/index",
+        "pages/content/index",
+        "pages/web/index"
+      ]
+    }
+  ],
+  "plugins": {
+    "live-player-plugin": {
+      "version": "1.3.5",
+      "provider": "wx2b03c6e691cd7370"
+    }
+  },
+  "requiredPrivateInfos": [
+    "getLocation",
+    "choosePoi",
+    "chooseAddress"
+  ],
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的位置信息将用于小程序位置接口的效果展示"
+    }
+  },
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "君到苏州（文化旅游总入口）",
+    "navigationBarTextStyle": "black",
+    "navigationStyle": "custom"
+  },
+  "lazyCodeLoading": "requiredComponents",
+  "style": "v2",
+  "sitemapLocation": "sitemap.json",
+  "tabBar": {
+    "color": "#000000",
+    "selectedColor": "#000000",
+    "borderStyle": "white",
+    "list": [
       {
-        "root": "subPackages",
-        "pages": [
-          "indexs/index",
-          "index/index",
-          "techanNew/index",
-          "techanCart/index",
-          "feiyiNew/index",
-          "postSearch/index",
-          "gwcOrder/index",
-          "indexGQ/index",
-          "transferPage/transferPage",
-          "password/overview/overview",
-          "password/setting/setting",
-          "goods/oneCardTour/info/index",
-          "feiyiNew/CGCIndex/index",
-          "feiyiNew/CGCLetter/index",
-          "feiyiNew/CGCTime/index"
-        ]
+        "pagePath": "pages/index/index",
+        "iconPath": "/images/index.png",
+        "selectedIconPath": "/images/index_seld.png",
+        "text": "首页",
+        "shareTimeline": true
       },
       {
-        "root": "subPackageCheckPoint",
-        "pages": [
-          "pages/index/index",
-          "pages/scopemap/index",
-          "pages/detailsmap/index",
-          "pages/content/index",
-          "pages/web/index"
-        ]
-      }
-    ],
-    "plugins": {
-      "live-player-plugin": {
-        "version": "1.3.5",
-        "provider": "wx2b03c6e691cd7370"
-      }
-    },
-    "requiredPrivateInfos": [
-      "getLocation",
-      "choosePoi",
-      "chooseAddress"
-    ],
-    "permission": {
-      "scope.userLocation": {
-        "desc": "你的位置信息将用于小程序位置接口的效果展示"
+        "pagePath": "pages/pbService/aiHelpYou/index",
+        "iconPath": "/images/ai.png",
+        "selectedIconPath": "/images/ai_seld.png",
+        "text": "AI"
+      },
+      {
+        "pagePath": "pages/map/index",
+        "iconPath": "/images/map.png",
+        "selectedIconPath": "/images/map_seld.png",
+        "text": "图游"
+      },
+      {
+        "pagePath": "pages/user/user",
+        "iconPath": "/images/user.png",
+        "selectedIconPath": "/images/user_seld.png",
+        "text": "我的"
       }
-    },
-    "window": {
-      "backgroundTextStyle": "light",
-      "navigationBarBackgroundColor": "#fff",
-      "navigationBarTitleText": "君到苏州（文化旅游总入口）",
-      "navigationBarTextStyle": "black",
-      "navigationStyle": "custom"
-    },
-    "lazyCodeLoading": "requiredComponents",
-    "style": "v2",
-    "sitemapLocation": "sitemap.json",
-    "tabBar": {
-      "color": "#000000",
-      "selectedColor": "#000000",
-      "borderStyle": "white",
-      "list": [
-        {
-          "pagePath": "pages/index/index",
-          "iconPath": "/images/index.png",
-          "selectedIconPath": "/images/index_seld.png",
-          "text": "首页",
-          "shareTimeline": true
-        },
-        {
-          "pagePath": "pages/pbService/aiHelpYou/index",
-          "iconPath": "/images/ai.png",
-          "selectedIconPath": "/images/ai_seld.png",
-          "text": "AI"
-        },
-        {
-          "pagePath": "pages/map/index",
-          "iconPath": "/images/map.png",
-          "selectedIconPath": "/images/map_seld.png",
-          "text": "图游"
-        },
-        {
-          "pagePath": "pages/user/user",
-          "iconPath": "/images/user.png",
-          "selectedIconPath": "/images/user_seld.png",
-          "text": "我的"
-        }
-      ]
-    }
-  }
\ No newline at end of file
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pages/info/foodNew/index.js b/pages/info/foodNew/index.js
new file mode 100644
index 0000000..6d25d54
--- /dev/null
+++ b/pages/info/foodNew/index.js
@@ -0,0 +1,790 @@
+// pages/info/roadInfo/index.js
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
+import commonApi from "../../../utils/https/common"
+import QRCode from '../../../utils/weapp-qrcode.js'
+import util from '../../../utils/util'
+let app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        autoPlay: false,
+        fixed: false,
+        type: 1,
+        top: 0,
+        isLike: 0,
+
+        info: null,
+        skuFlag: null,
+        producNum: 1,
+        skuIndex: 0,
+        aniSkuIndex: -1,
+
+        cartTop: 0,
+        cartImgInfo: null,
+        cartCount: 0,
+        shareImg: null,
+        showShareFlag: false,
+    
+
+        showQrCode: false,
+        wxqrcode: null,
+
+        ZTPoint:'',
+        swiperCurrent: 0,
+        swiperRange: {
+            video: {min:0,max:0},
+            picture: {min:0,max:0},
+            sku: {min:0,max:0}
+        },
+        otherInfoShow: 0,
+
+        supplierInfo: null,
+        showShopInfo: false,
+        idIndex: 0,
+
+        lon: null,
+        lat: null,
+        scrollLeft: 0,
+        windowWidth: 375,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        console.log(options)
+        //删除临时存储的联系人
+        wx.removeStorageSync('linkMan')
+        let rect = wx.getMenuButtonBoundingClientRect(),
+            that = this;
+        let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+        this.setData({top: height,id: options.id})
+        // 获取购物车按钮的位置
+        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+        //     console.log(res)
+        //     that.setData({
+        //         cartTop: res.top
+        //     })
+        // }).exec()
+        if (options.ZTPoint) {
+            this.setData({
+                ZTPoint: options.ZTPoint
+            })
+        }
+
+        wx.getLocation({
+            type: 'gcj02',
+            success: function (res) {
+              that.setData({lat:res.latitude,lon:res.longitude})
+              that.getShopInfo(options.id)
+            },
+            fail:function(){
+              that.getShopInfo(options.id)
+            }
+        })
+
+        const { windowWidth } = wx.getSystemInfoSync();
+        this.setData({ windowWidth });
+        console.log(windowWidth)
+    },
+
+    getShopInfo (id) {
+        commonApi._post("/supplier/get_supplier_products", 
+        {supplier_id: id, lon: this.data.lon,lat: this.data.lat}
+        ).then(res => {
+            if (res.code == 0) { 
+                wx.showToast({title: res.msg,icon:'none'})
+                setTimeout(() => { wx.navigateBack()}, 1000);
+                return
+            } else {
+                // res.data.products = [...res.data.products,...res.data.products,...res.data.products,...res.data.products]
+                this.setData({ supplierInfo: res.data})
+
+                if (res.data.products.length>0) {
+                    let id = res.data.products[0].id
+                    this.getProductInfo(id)
+                }
+            }
+        })
+    },
+
+    changeProduct (e) {
+        let _this = this;
+        let index = e.currentTarget.dataset.index;
+        let prod = e.currentTarget.dataset.item;
+        this.setData({
+            idIndex: index
+        })
+        this.getProductInfo(prod.id)
+
+        let windowWidth = this.data.windowWidth;
+        let domId = e.currentTarget.id
+        wx.createSelectorQuery().select(`#${domId}`).boundingClientRect(rect => {
+            console.log(rect)
+            if (rect) {
+                let targetScrollLeft = rect.left + (rect.width / 2) - (windowWidth / 2)+_this.data.scrollLeft;
+                console.log(e, targetScrollLeft)
+                this.setData({
+                    scrollLeft: targetScrollLeft
+                });
+            }
+        }).exec()
+
+    },
+
+
+    getProductInfo (id) {
+        commonApi._post("product/get_product_detail", {id: id}).then(res => {
+            res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0;
+            let resData = res.data
+            try {
+                resData.shipment_tag_arr = []
+                if (resData.shipment_tag) {
+                    resData.shipment_tag_arr = resData.shipment_tag.split(',')
+                    resData.shipment_tag_str = resData.shipment_tag_arr.join(' | ')
+                }
+                if (resData.service_tag) {
+                    resData.service_tag_str = resData.service_tag.split(',').join(' | ')
+                }
+                if (resData.parameter_tag) {
+                    resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ')
+                }
+
+                if (resData.supplier_headimg) {
+                    resData.supplier_headimg = that.showImg(resData.supplier_headimg)
+                }
+
+            } catch(e) {} 
+
+            // let swiperRange = this.data.swiperRange;
+            // swiperRange.video = resData.videourl? { min: 0, max: 0 } : { min: -1, max: -1 }
+            // swiperRange.picture = {min:swiperRange.video.max+1, max:swiperRange.video.max+1+resData.listimg.length-1}
+            // swiperRange.sku = {min:swiperRange.picture.max+1,max:swiperRange.picture.max+1+resData.sku.length-1}
+            this.setData({
+                info: resData,
+                // swiperRange: swiperRange,
+                shareImg: null,
+            })
+
+            this.drawImg()
+        })
+    },
+
+    showImg (img) {
+        if (!img) { return img }
+        if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
+            return img;
+        } else {
+            // return "https://test.api.cloud.sz-trip.com"+img
+            return "https://static.ticket.sz-trip.com" + img;
+        }
+    },
+
+
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "goods",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
+            }
+        }, 500)
+    },
+
+    onPageScroll: function (e) {
+        let that = this,
+            height = this.data.top;
+        let topHeight = height;
+        wx.createSelectorQuery().select('#menus').boundingClientRect(function (rect) {
+            console.log(rect,height, e.scrollTop)
+            if (rect.top < topHeight) {
+                // 此时应该把menus固定在顶部
+                that.setData({ fixed: true})
+            }
+            if (e.scrollTop<100) {
+                that.setData({fixed: false})
+            }
+        }).exec()
+
+    },
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: "cart"
+                })
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    console.log(res)
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+    },
+    hideSku: function () {
+        this.setData({
+            skuFlag: null,
+            cartImgInfo: null
+        })
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+    selectSku: function (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            skuIndex: index,
+            swiperCurrent: index+this.data.swiperRange.picture.max+1
+        })
+    },
+    showOrder: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能购买',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                let swiperCurrent = this.data.swiperCurrent;
+                let skuIndex = swiperCurrent - this.data.swiperRange.sku.min
+                console.log(swiperCurrent, skuIndex)
+                if (skuIndex<0) {skuIndex=0}
+                this.setData({
+                    skuFlag: 'order',
+                    skuIndex: skuIndex,
+                    swiperCurrent: skuIndex+this.data.swiperRange.picture.max+1
+                })
+            }
+        })
+    },
+    order: function (e) {
+        let skuFlag = e.currentTarget.dataset.type
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        commonApi.user_post("/product/checkStock", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+        }).then(res => {
+            if (res && res.code != 1) {
+                return;
+            } else {
+                if (skuFlag == 'order') {
+                    util.pagePoint({
+                        event: 'product_order',
+                        param: {
+                            id: this.data.info.id,
+                            type: this.data.info.type
+                        }
+                    }, 1)
+                    wx.setStorageSync('login_from', 'product_order_login')
+                    wx.setStorageSync('order_from', 'product_order_submit')
+                    app.globalData.couponInfo = null;
+                    // 购买
+                    let product = [{
+                        product: {...this.data.info,ZTPoint:this.data.ZTPoint},
+                        sku: this.data.info.sku[this.data.skuIndex],
+                        productNum: this.data.producNum
+                    }];
+
+                    app.globalData.listName = null
+                    app.globalData.product = product[0];
+                    wx.navigateTo({
+                        url: '/pages/order/food/index',
+                    })
+                } else {
+                    let tag_id = this.data.info.tag_id,type = ''
+                    if (tag_id.includes(20) || tag_id.includes(19)) {  //文创
+                      type = '1'
+                    }else if (tag_id.includes(5)) { //非遗
+                      type = '2'
+                    }else {
+                      type = ''
+                    }
+                    commonApi.user_post("cart/add_sku", {
+                        sku_id: this.data.info.sku[this.data.skuIndex].id,
+                        num: this.data.producNum,
+                        type:type
+                    }).then(res => {
+                        if (res.code == 1) {
+                            commonApi.user_post('cart/get_list', {}).then(res => {
+                                this.setData({
+                                    cartCount: res.data.length
+                                })
+                            })
+                            // 加动效
+                            this.setData({
+                                skuFlag: null,
+                                aniSkuIndex: this.data.skuIndex,
+                                cartImgInfo: null
+                            })
+                            setTimeout(() => {
+                                this.setData({
+                                    aniSkuIndex: -1
+                                })
+                                wx.showModal({
+                                    title: "提示",
+                                    content: "去购物车结算？",
+                                    success: function (res) {
+                                        if (res.confirm) {
+                                            wx.navigateTo({
+                                                url: '/pages/user/cartlist/list',
+                                            })
+                                        }
+                                    }
+                                })
+                            }, 650)
+                        }
+                    })
+                }
+            }
+        })
+
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
+            util.pagePoint({
+                event: 'product_share_login',
+                type: this.data.info.type,
+                id: this.data.info.id
+            }, 1)
+            commonApi.user_post("user/getMyInfo", {}).then(res => {
+
+            })
+            return;
+        }
+        if (!this.data.shareImg) {
+            wx.showToast({
+                title: '图片生成中，稍后再试',
+                icon: 'none'
+            })
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
+        })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !this.data.showShareFlag
+                        })
+                        util.pagePoint({
+                            event: 'product_share_save',
+                            type: that.data.info.type,
+                            id: that.data.info.id
+                        }, 1)
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                console.log(res);
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
+            }
+        });
+
+    },
+    pagePoint: function (e) {
+        util.pagePoint(e)
+    },
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
+        }
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
+
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
+            })
+        })
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
+            })
+        })
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = "￥" + (that.data.info.price / 100);
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.subtitle;
+            if (that.data.info.subtitle.length > 10) {
+                subtitle = that.data.info.subtitle.substr(0, 10) + '...'
+            }
+            ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            // ctx.draw();
+            // 划线价
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(32 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let market_price = "￥" + (that.data.info.market_price / 100)
+            ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
+            let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            ctx.beginPath()
+            ctx.setLineWidth(1)
+            ctx.moveTo(40 * ratio + width, 608 * ratio)
+            ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
+            ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
+        row.push(temp);
+
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
+        }
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+        }
+    },
+    gotoDetail: function (e) {
+        let item = e.currentTarget.dataset.item;
+        util.pagePoint({
+            event: 'recommend_click',
+            param: {
+                id: item.id,
+                type: item.type
+            }
+        }, 1)
+        if (item.type == 'travels') {
+            // 游记做特殊处理 其他都按照原来的来
+            wx.navigateTo({
+                url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+            })
+        } else {
+            util.gotoDetail(item);
+        }
+    },
+
+    gotolocation: function () {
+        let info = this.data.supplierInfo;
+        wx.openLocation({
+          latitude: Number(info.lat),
+          longitude: Number(info.lon),
+          name:info.shop_name,
+          address:info.address
+        })
+    },
+
+    callPhone :function () {
+        wx.makePhoneCall({
+            phoneNumber: this.data.supplierInfo.phone,
+        })
+    },
+
+    viewImg:function(e){
+        let item = e.currentTarget.dataset.item;
+        if (item.img_list.length>0) {
+            wx.previewImage({
+                urls: item.img_list
+            })
+        }
+    },
+
+    swiperChange (e) {
+        if(e.detail.source == "touch") {
+        let index = e.detail.current
+        this.setData({
+            swiperCurrent: index
+        })
+        }
+        console.log(e, this.data.swiperCurrent)
+    },
+    changeSwiperCurrent (e) {
+        let index = e.currentTarget.dataset.index
+        this.setData({
+            swiperCurrent: index
+        })
+    },
+    changeSimpleVal (e) {
+        let keyname = e.currentTarget.dataset.keyname;
+        let val = e.currentTarget.dataset.val;
+        let param = {}
+        param[keyname] = val
+        this.setData(param)
+        console.log(this.data)
+    },
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        app.globalData.postProduct = []
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+       
+        commonApi.user_post('cart/get_count', {noLogin: true}).then(res => {
+            this.setData({
+                cartCount: res.data //1
+            })
+            })
+        
+    },
+    playVideo() {
+        // 播放视频需要把autoplay暂停
+        this.setData({
+            autoPlay: false
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/pages/info/foodNew/index.json b/pages/info/foodNew/index.json
new file mode 100644
index 0000000..ab4ec76
--- /dev/null
+++ b/pages/info/foodNew/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader",
+    "code":"../../order/components/wxqrCode/index"
+
+  }
+}
\ No newline at end of file
diff --git a/pages/info/foodNew/index.wxml b/pages/info/foodNew/index.wxml
new file mode 100644
index 0000000..93f199b
--- /dev/null
+++ b/pages/info/foodNew/index.wxml
@@ -0,0 +1,289 @@
+<!--pages/info/hotelProductInfo/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<title title="产品详情"></title>
+<view class="shop-info" bindtap="changeSimpleVal" data-keyname="showShopInfo" data-val="{{true}}">
+    <image class="supplier-headImg" src="{{supplierInfo.headimg}}" mode="aspectFill"></image>
+    <view class="content">
+        <view style="display: flex;align-items: flex-start;">
+            <view class="shop-title shop-com-width  textOver2">{{supplierInfo.shop_name}}</view>
+            <image style="height: 25rpx;margin: 10rpx 68rpx 0 13rpx;" mode="heightFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/postDetail/rightIcon.png"></image>
+            <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+        </view>
+        <view class="address" style="display: flex;align-items: center;justify-content: space-between;">
+            <view class="shop-com-width textOver" style="padding-right: 98rpx;">{{supplierInfo.address}}</view>
+            <image class="icon-phone" catch:tap="gotolocation" src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+        </view>
+    </view>
+</view>
+
+<view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
+
+
+<scroll-view scroll-x scroll-with-animation enable-flex scroll-left="{{scrollLeft}}" id="menus"
+     class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px" wx:if="{{supplierInfo&&supplierInfo.products.length>0}}">
+    <view id="scrollView{{index}}" class="scroll-menu-item {{idIndex==index?'active':''}}"
+         wx:for="{{supplierInfo.products}}" data-item="{{item}}" data-index="{{index}}"
+         bind:tap="changeProduct">
+        {{item.subtitle}}
+    </view>
+   
+</scroll-view>
+
+<view class="share-icon" bindtap="share"></view>
+<image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
+<view style="position: relative;">
+    <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
+    interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
+    <block wx:if="{{info.videourl}}" wx:key="*this">
+        <swiper-item>
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+            show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
+        <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.listimg}}" wx:key="*this">
+        <swiper-item>
+        <image lazy-load src="{{item}}" mode="aspectFill"></image>
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.sku}}" wx:key="*this">
+        <swiper-item style="position: relative;">
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
+        <view class="sku-tips ">
+            <view class="textOver">{{item.sku_name}}</view>
+        </view>
+        </swiper-item>
+    </block>
+    </swiper>
+    <view class="swiper-bottom" wx:if="{{info}}">
+        <!-- <view class="swuper-bottom-bg">
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 
+            wx:if="{{info.videourl}}" bind:tap="changeSwiperCurrent" data-index="{{0}}">视频</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.min}}">图片</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.sku.min}}">款式</view>
+        </view> -->
+        <view class="swiper-bottom-item bottom-number active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
+    </view>
+</view>
+
+
+
+<view wx:if="{{info}}">
+    <view class="top-info" style="padding: 0;" >
+        <view class="wineScene-price-container" >
+            <view class="wineSecne-price">{{info.price/100}}<text class="wineSecne-money">优惠前￥{{info.market_price/100}}</text></view>
+            <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
+        </view>
+        <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
+            
+            <view class="title textOver2"><text class="hot-font">热</text>{{info.title}}</view>
+            <view class="tags-box textOver" wx:if="{{info.subtitle}}">
+                <view class="tag textOver" >{{info.subtitle}}</view>
+            </view>
+
+            <view class="other-info-box" >
+                <view class="other-info-item" style="align-items: flex-start;"bindtap="changeSimpleVal" 
+                data-keyname="otherInfoShow" data-val="{{1}}" wx:if="{{info.shipment_tag}}">
+                    <image lazy-load  src="https://static.ticket.sz-trip.com/uploads/20250925/50f3e2316c3f3cc906fe4c78f127e960.png"></image>
+                    <view class="other-content textOver" >{{info.shipment_tag_str}}</view>
+                    <!-- <view style="margin-top: 6rpx;" class="view-arrow">></view> -->
+                </view>
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{2}}" 
+                    wx:if="{{info.service_tag_str}}">
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250925/ce4323d9bcdf2ff03a0985ae4cbdabbe.png"></image>
+                    <view  class="other-content textOver">{{info.service_tag_str}}</view>
+                    <!-- <view  class="view-arrow">></view> -->
+                </view>
+                <view class="other-info-item" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{3}}"
+                    wx:if="{{info.parameter_tag_str}}">
+                    <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250925/958d9a3ed9404790ba5d17548e20fee8.png"></image>
+                    <view class="other-content textOver">{{info.parameter_tag_str}}</view>
+                    <!-- <view  class="view-arrow">></view> -->
+                </view>
+            </view>
+
+        </view>
+
+    </view>
+    
+</view>
+
+<view class="scroll-all-box"  wx:if="{{info}}">
+    <view style="height:85rpx" wx:if="{{fixed}}"></view>
+    <view class="info-box" id="box1">
+        <view class="info-title">套餐详情</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
+    </view>
+    <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
+
+    <!-- <view class="info-box" id="box2">
+        <view class="info-title">费用说明</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.expense_info)}}"></rich-text>
+    </view> -->
+    <view class="info-box" id="box3">
+        <view class="info-title">购买须知</view>
+        <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
+    </view>
+
+
+</view>
+
+<view style="height:140rpx"></view>
+<view class="fixed-bottom">
+<view class="['left-img',{{!iShop?'no-shop':''}}]">
+  <navigator url="/pages/user/service/index"  catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+    <view class="iconfont icon-kefu"></view>
+    <view>客服</view>
+  </navigator>
+
+  <view class="kefu-box"></view>
+</view>
+
+
+  <view class="btns">
+    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
+    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
+  </view>
+</view>
+<!-- 购物车悬浮框 -->
+<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <view class="cart-num">{{cartCount}}</view>
+</navigator> -->
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view>
+            <view class="sku-price">{{info.sku[skuIndex].price/100}}
+        
+            </view>
+            <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+        </view>
+        <view style="display: flex;align-items: center;">
+            <view class="number-box">
+                <view class="iconfont icon-sami-select" bindtap="minus"></view>
+                <view class="number">{{producNum}}</view>
+                <view class="iconfont icon-add-select" bindtap="add"></view>
+            </view>
+            <view class="limit-number" wx:if="{{info.sku[skuIndex].sku_model.traveller_limit_num>0}}">限购{{info.sku[skuIndex].sku_model.traveller_limit_num}}件</view>
+        </view>
+      </view>
+    </view>
+    <view style="font-weight: bold;font-size: 33rpx;color: #060001;margin:0rpx 25rpx 27rpx">产品分类（{{info.sku.length}}）</view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item {{index==skuIndex?' active':''}}" 
+      wx:for="{{info.sku}}">
+        <image lazy-load src="{{item.headimg}}"></image>
+        <view class="sku-name textOver2">{{item.sku_name}}</view>
+      </view>
+    </view>
+    
+    
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="order" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+      </view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
+<view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
+  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
+  </canvas>
+  <canvas class="canvasCode" style="opacity:0;width:500px;height:500px" canvas-id="myQrcode"></canvas>
+</view>
+<view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
+  <view class="mask-bg" bindtap="share"></view>
+  <view class="mask-content share-img-box">
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <view class="share-tips">
+      <view style="position:relative">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        </image>
+        <view>保存图片到相册</view>
+        <view class="tipimg">
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+        </view>
+      </view>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <view style="position:relative">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        </image>
+        <view>微信识别二维码</view>
+        <view class="tipimg">
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+        </view>
+      </view>
+    </view>
+    <view class="save-btn" bindtap="save">保存到相册</view>
+  </view>
+</view>
+
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
+
+<!-- <view class="mask" wx:if="{{otherInfoShow>0}}"> -->
+<view class="mask" wx:if="{{false}}">
+  <view class="mask-bg" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+    <view class="other-info-content">
+        <view class="title">{{otherInfoShow==3?"产品参数":otherInfoShow==2?"服务说明":"发货说明"}}</view>
+        <view wx:if="{{otherInfoShow==1}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.shipment_info)}}"></rich-text>
+        </view>
+        <view wx:if="{{otherInfoShow==2}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.service_info)}}"></rich-text>
+        </view>
+        <view wx:if="{{otherInfoShow==3}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.parameter_info)}}"></rich-text>
+        </view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}">确定</view>
+    </view>
+  </view>
+</view>
+
+
+<!-- 店铺信息 -->
+<view class="mask" wx:if="{{showShopInfo}}">
+  <view class="mask-bg" bindtap="changeSimpleVal" data-keyname="showShopInfo" data-val="{{false}}"></view>
+  <view class="mask-content supplier-mask">
+    <view class="iconfont icon-close" bindtap="changeSimpleVal" data-keyname="showShopInfo" data-val="{{false}}"></view>
+    <view class="supplier-mask-header">商家信息</view>
+    <view class="mask-shop-info">
+        <view>{{supplierInfo.shop_name}}</view>
+        <view class="shop-info-item">
+            <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/time.png"></image>
+            <view>
+                <view>营业时间</view>
+                <view class="subtitle">{{supplierInfo.business_hours}}</view>
+            </view>
+        </view>
+        <view class="shop-info-item" style="justify-content: space-between;">
+            <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/time.png"></image>
+            <view style="flex: 1;width: 100rpx;">
+                <view>{{supplierInfo.address}}</view>
+                <view class="subtitle" wx:if="{{supplierInfo.distance}}">据您约{{supplierInfo.distance}}km</view>
+            </view>
+            <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+            <image class="icon-phone" catch:tap="gotolocation" src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+        </view>
+
+    </view>
+    <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
+    <view class="supplier-mask-header">商家介绍</view>
+    <rich-text style="padding: 0 28rpx;"  class="details" nodes="{{tool.formateRichText(supplierInfo.content)}}"></rich-text >
+    <view style="width: 100%;height: 20rpx;"></view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/info/foodNew/index.wxss b/pages/info/foodNew/index.wxss
new file mode 100644
index 0000000..f3c5af7
--- /dev/null
+++ b/pages/info/foodNew/index.wxss
@@ -0,0 +1,1374 @@
+/* pages/info/hotelProductInfo/index.wxss */
+page {
+    background: #F7F7F7;
+}
+
+.shop-info{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: white;
+    padding:30rpx 28rpx;
+    box-sizing: border-box;
+    word-break: break-all;
+}
+.shop-info .supplier-headImg{
+    width: 113rpx;
+    height: 113rpx;
+    background: #BCBCBC;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+}
+.shop-info .content{
+    flex: 1;
+    height: 113rpx;
+    width: 1rpx;
+    padding-left: 12rpx;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #010101;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.shop-info .content .address{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #999999;
+}
+.shop-info .icon-phone{
+    width: 47.33rpx;
+    height: 46.67rpx;
+    flex-shrink: 0;
+}
+.shop-info .shop-com-width{
+    width: 100rpx;
+    flex: 1;
+}
+
+.swiper {
+  width: 100%;
+  height: 750rpx;
+}
+.swiper image,.swiper video {
+  height: 750rpx;
+  display: block;
+  width: 100%;
+}
+.swiper-bottom{
+    position: absolute;
+    /* top: 750rpx; */
+    bottom: 77rpx;
+    right: 0;
+    width: 90rpx;
+    height: fit-content;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    z-index: 1;
+}
+.swuper-bottom-bg{
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 20rpx 0rpx 0rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding: 8rpx 0;
+    margin-bottom: 12rpx;
+}
+.swiper-bottom-item{
+    width: 100%;
+    text-align: center;
+    padding: 14rpx 0;
+}
+.swiper-bottom-item.active{
+    color: #fff;
+}
+.swiper-bottom-item.bottom-number{
+    max-width: 100%;
+    width: fit-content;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 0 10rpx;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+.top-info {
+  background: white;
+  position: relative;
+  z-index: 1;
+}
+
+.top-info .title {
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #000000;
+}
+
+.tags-box {
+  display: flex;
+  align-items: center;
+  font-weight: 500;
+  font-size: 25rpx;
+  color: #0B898E;
+}
+
+.tags-box .tag {
+  margin-top: 27rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  margin-right: 15rpx;
+  padding: 0 14rpx;
+  background: rgba(11, 137, 142, 0.1);
+  border-radius: 4rpx;
+}
+
+.address-box {
+  justify-content: space-between;
+  margin-top: 0;
+}
+
+.info-address {
+  color: #666;
+  font-size: 27rpx;
+  margin-bottom: 0rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+}
+
+.address-box .iconfont {
+  font-size: 34rpx;
+}
+
+.date-all-box {
+  margin: 24rpx 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 80rpx;
+  border-radius: 13rpx;
+  background: #0B898E;
+  font-size: 31rpx;
+  color: #fff;
+  font-weight: 500;
+  padding: 0 37rpx;
+}
+
+.days {
+  text-align: center;
+  font-size: 400;
+  width: 84rpx;
+  line-height: 34rpx;
+  height: 34rpx;
+  border-radius: 18rpx;
+  border: 1px solid white;
+  font-size: 23rpx;
+}
+
+.picker text {
+  font-weight: 400;
+  font-size: 21rpx;
+  margin-left: 13rpx;
+}
+
+.product-item {
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-between;
+  margin: 20rpx;
+  padding: 24rpx 20rpx;
+  background: white;
+  border-radius: 13rpx;
+}
+
+.product-item image {
+  width: 201rpx;
+  height: 201rpx;
+  border-radius: 10rpx;
+  margin-right: 26rpx;
+  flex-shrink: 0;
+}
+
+.product-item .product-info {
+  flex: 1;
+}
+
+.product-item .product-info .title {
+  font-size: 32rpx;
+  color: #000;
+  font-weight: 500;
+}
+
+.product-right {
+  flex-shrink: 0;
+  margin-left: 20rpx;
+}
+
+.product-right .price {
+  color: #D62828;
+  font-size: 40rpx;
+  font-weight: 500;
+}
+
+.product-right .price::before {
+  content: "￥";
+  font-size: 27rpx;
+  font-weight: 400;
+}
+
+.product-right .btn {
+  color: #fff;
+  width: 120rpx;
+  line-height: 80rpx;
+  background: #D62828;
+  border-radius: 13rpx;
+  font-size: 31rpx;
+  font-weight: 500;
+  text-align: center;
+  margin-top: 20rpx;
+}
+
+.product-info .subtitle {
+  font-size: 24rpx;
+  line-height: 36rpx;
+  height: 72rpx;
+  margin-top: 10rpx;
+  margin-bottom: 20rpx;
+  color: #999;
+  white-space: normal;
+}
+
+.product-tags {
+  display: flex;
+  align-items: center;
+}
+
+.product-tag {
+  font-size: 20rpx;
+  color: #0B898E;
+  border-radius: 16rpx;
+  line-height: 30rpx;
+  border: 1rpx solid;
+  padding: 0 15rpx;
+  margin-right: 13rpx;
+}
+
+.product-tags .product-tags:last-child {
+  margin-right: 0;
+}
+
+.box {
+  /* margin: 20rpx; */
+  /* background: white; */
+  /* border-radius: 13rpx; */
+  background: #f2f2f2;
+  padding: 20rpx;
+}
+.comment-box{
+    background: #fff;
+    margin: 20rpx 0;
+    width: 100%;
+    box-sizing: border-box;
+}
+.comment-box .no-comment{
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #999999;
+    padding-left: 18rpx;
+}
+
+.box-top {
+  line-height: 95rpx;
+  border-bottom: 1rpx solid #d9d9d9;
+  font-weight: 500;
+  color: #000;
+  font-size: 33rpx;
+  padding: 0 20rpx;
+  background: #fff;
+  border-radius: 13rpx 13rpx 0 0;
+}
+
+.box-top .iconfont {
+  color: #0B898E;
+  font-size: 33rpx;
+  margin-right: 16rpx;
+}
+
+.empty-box {
+  text-align: center;
+  padding: 40rpx 0;
+  font-size: 23rpx;
+  color: #333;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
+}
+
+.empty-btn {
+  margin: 0 auto;
+  margin-top: 30rpx;
+  width: 283rpx;
+  line-height: 79rpx;
+  border: 1rpx solid #0B898E;
+  border-radius: 39rpx;
+  color: #0B898E;
+  font-size: 32rpx;
+  margin-bottom: 10rpx;
+}
+
+.box-top .score {
+  color: #D62828;
+  font-size: 30rpx;
+  font-weight: 400;
+  margin-left: 11rpx;
+}
+
+.product-comment {
+  /* margin: 0 20rpx; */
+  border-bottom: 1rpx solid #ccc;
+  /* padding: 33rpx 0; */
+  padding: 28rpx 0rpx;
+  background: #fff;
+  width: 100%;
+  box-sizing: border-box;
+}
+.product-comment:last-of-type{
+    border-bottom: none;
+}
+
+.product-comment-top {
+  display: flex;
+  justify-content: space-between;
+  color: #999999;
+  align-items: flex-start;
+  font-size: 24rpx;
+}
+
+.product-comment-top .avator-img {
+  flex-shrink: 0;
+  width: 57rpx;
+  height: 57rpx;
+  border-radius: 50%;
+}
+.product-comment-top .comment-container{
+    flex: 1;
+    width: 10rpx;
+    padding: 0 45rpx 0 15rpx;
+}
+.product-comment-top .comment-info {
+  width: 100%;
+  height: 57rpx;
+  font-weight: bold;
+    font-size: 24rpx;
+    color: #666666;
+  display: flex;
+  align-items: center;
+}
+
+.product-comment-top .comment-info .iconfont {
+  color: #D62828;
+  font-size: 22rpx;
+}
+
+.product-comment-top .comment-info .iconfont text {
+  margin-right: 6rpx;
+}
+
+.comment-content {
+    width: 100%;
+    padding-top: 12rpx;
+    font-size: 27rpx;
+    color: #000;
+    font-weight: 500;
+}
+
+.more-comment-btn {
+  line-height: 93rpx;
+  /* margin-right: 20rpx; */
+  text-align: right;
+  color: #999;
+  font-size: 27rpx;
+  font-weight: 500;
+  padding-right: 20rpx;
+  background: #fff;
+  border-radius: 0 0 13rpx 13rpx;
+}
+
+.more-comment-btn .iconfont {
+  margin-left: 6rpx;
+  font-size: 24rpx;
+}
+
+.all-comment-num {
+  float: right;
+  color: #999999;
+  font-size: 27rpx;
+  font-weight: 400;
+}
+
+.scroll-all-box {
+  margin: 24rpx 0;
+  background: white;
+}
+
+.scroll-menus {
+  display: flex;
+  height: 100rpx;
+  background: #FFFFFF;
+  font-weight: 500;
+    font-size: 31rpx;
+    color: #000000;
+    box-sizing: border-box;
+}
+
+.scroll-menu-item {
+  position: relative;
+  padding:  0 34rpx;
+  height: 100rpx;
+  box-sizing: border-box;
+  padding-top: 20rpx;
+  flex-shrink: 0;
+}
+.scroll-menu-item.active{
+    color: #0B898E;
+}
+
+.scroll-menu-item.active::after {
+  content: "1";
+  font-size: 0;
+  display: block;
+  position: absolute;
+  width: 46rpx;
+  height: 6rpx;
+  border-radius: 3rpx;
+  background: #0B898E;
+  left: 50%;
+  margin-left: -23rpx;
+  bottom: 20rpx;
+}
+
+.fixed-menus {
+  position: fixed;
+  left: 0;
+  right: 0;
+  background: white;
+  z-index: 5;
+}
+
+.info-title {
+  font-size: 35rpx;
+  font-weight: bold;
+  color: #000;
+  margin-bottom: 30rpx;
+}
+
+.info-box {
+  padding: 20rpx 40rpx;
+}
+
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 140rpx;
+  background: white;
+  display: flex;
+  align-items: center;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  padding: 0 40rpx;
+  color: #666666;
+  font-size: 23rpx;
+  justify-content: space-between;
+  text-align: center;
+  padding-left: 0;
+  z-index: 10;
+}
+
+.fixed-bottom .iconfont {
+  font-size: 34rpx;
+  line-height: 40rpx;
+}
+
+.btns {
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 500;
+  border-radius: 39rpx;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.btns .btn {
+  width: 216rpx;
+  line-height: 78rpx;
+  background: #D62828;
+}
+
+.btns .btn:nth-child(1) {
+  /* margin-right: 3rpx; */
+  border-radius: 39rpx 0 0 39rpx;
+  background: #FD7601;
+}
+
+.btns .btn:nth-child(2) {
+  border-radius: 0 39rpx 39rpx 0;
+}
+
+.btns .btn.disable {
+  background: #ccc;
+}
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+
+.sku-info-box {
+  margin: 50rpx 25rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.sku-info-box image {
+    width: 173rpx;
+    height: 173rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 15rpx;
+  flex-shrink: 0;
+}
+
+.sku-info {
+  flex: 1;
+  width: 100rpx;
+  height: 173rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.sku-price {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #F84A56;
+}
+
+.sku-price::before {
+  content: "￥";
+  font-size: 24rpx;
+  vertical-align: baseline;
+}
+
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+
+.sku-names {
+  display: flex;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #333333;
+  margin: 0 25rpx;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+  justify-content: space-between;
+  max-height: 800rpx;
+  min-height: 400rpx;
+  align-content: flex-start; 
+}
+
+.sku-name-item {
+    min-height: 67rpx;
+    border-radius: 13rpx;
+  margin-bottom: 34rpx;
+  max-width: 100%;
+  padding-right:15rpx;
+  min-width: 340rpx;
+  background: #EFEFEF;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+}
+.sku-name-item>image{
+    width: 67rpx;
+    height: 100%;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+}
+.sku-name-item .sku-name{
+    flex:1;
+    /* width: 100rpx; */
+    padding-left: 15rpx;
+    color: #333;
+}
+
+.sku-name-item.active{
+  color: #0B898E;
+  border: 1px solid #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+.sku-name-item.active .sku-name{
+    color: #0B898E;
+  }
+
+.number-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #EFEFEF;
+border-radius: 13rpx;
+padding: 10rpx 0;
+box-sizing: border-box;
+height: 53rpx;
+width: 250rpx;
+
+}
+
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+
+.number-box view {
+  text-align: center;
+  width: 80rpx;
+  height: 33rpx;
+  line-height: 33rpx;
+  font-size: 31rpx;
+  color: #000;
+}
+
+.number-box view.number {
+  width: 94rpx;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+.limit-number{
+    font-weight: 500;font-size: 27rpx;color: #666666;padding-left:20rpx;
+}
+
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 33rpx;
+  font-weight: 500;
+}
+
+.mask-btn.disable {
+  background: #ccc;
+}
+
+/* .icon-xin,.icon-shoucang {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  line-height: 60rpx;
+  background: rgba(0, 0, 0, 0.4);
+  border-radius: 50%;
+  text-align: center;
+  color: #fff;
+  font-size: 36rpx;
+  z-index: 1;
+} */
+.share-icon {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  height: 60rpx;
+  z-index: 1;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250826/81287df192b80ea03318e06b2b19ebe1.png");
+  background-size: 100% 100%;
+}
+
+.icon-shoucang {
+  color: #D62828;
+  font-size: 40rpx !important;
+
+}
+
+/* 购物车 */
+.cart-box {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 80rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.2);
+  border-radius: 50%;
+  right: 20rpx;
+  bottom: 166rpx;
+  z-index: 15;
+}
+
+.cart-box image {
+  display: block;
+  width: 49rpx;
+}
+
+.cart-num {
+  width: 26rpx;
+  border: 1rpx solid;
+  border-radius: 50%;
+  line-height: 26rpx;
+  text-align: center;
+  font-size: 23rpx;
+  color: #D20000;
+  position: absolute;
+  right: -2rpx;
+  top: -5rpx;
+}
+
+.headimg {
+  position: fixed;
+  z-index: 3;
+  left: -218rpx;
+  width: 218rpx;
+  height: 180rpx;
+  top: 0;
+}
+
+.headimg.active {
+  transition: left .6s linear, top .6s cubic-bezier(0.5, -0.5, 1, 1), width .6s ease, height .6s ease;
+  width: 80rpx;
+  height: 80rpx;
+  left: 650rpx;
+  border-radius: 50%;
+}
+
+.share-img-box {
+  /* width: 551rpx; */
+  position: static;
+  background: none;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.share-img {
+  display: block;
+  width: 551rpx;
+}
+
+.share-tips {
+  width: 426rpx;
+  height: 150rpx;
+  background: #FFFFFF;
+  border-radius: 25rpx;
+  margin-top: 25rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 65rpx;
+  color: #999;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 40rpx;
+}
+
+.share-tips .img {
+  display: block;
+  width: 55rpx;
+  margin: 0 auto;
+  margin-bottom: 4rpx;
+}
+
+.tipimg {
+  position: absolute;
+  left: 50%;
+  margin-left: 16rpx;
+  width: 24rpx;
+  height: 24rpx;
+  background: #D62828;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 34rpx;
+}
+
+.tipimg image {
+  width: 21rpx;
+  display: block;
+
+}
+
+.save-btn {
+  width: 403rpx;
+  line-height: 77rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 31rpx;
+  font-weight: 500;
+  margin-top: 50rpx;
+}
+
+.allowance-box {
+  height: 113rpx;
+  background: url("https://static.ticket.sz-trip.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
+  background-size: 100% auto;
+  background-repeat: no-repeat;
+  padding: 30rpx 30rpx 10rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  margin-top: -60rpx;
+  position: relative;
+  display: flex;
+  justify-content: start;
+  align-items: baseline;
+}
+
+.allowance-box .com-price {
+  font-size: 30rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:before {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:after {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .yellow {
+  color: #DF2115;
+  padding: 8rpx 14rpx;
+  background-color: #FDEDD4;
+  margin-left: 20rpx;
+  border-radius: 30rpx;
+}
+
+.mask-allowance .mask-content {
+  margin: auto;
+  width: auto;
+  top: initial;
+  bottom: initial;
+  padding: 20rpx;
+  width: 80%;
+}
+
+.mask-allowance .mask-content .rule-title {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.imgs{
+  width: 133rpx;
+  height: 133rpx;
+  border-radius: 13rpx;
+}
+.img-box{
+    width: 133rpx;
+height: 133rpx;
+  position: relative;
+  overflow: hidden;
+}
+.img-box .more-img{
+    height: 37rpx;
+    line-height: 37rpx;
+    background: #000;
+    border-radius: 13rpx 0rpx 13rpx 0rpx;
+    box-sizing: border-box;
+    padding: 0 5rpx;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    opacity: 0.8;
+}
+.all{
+  color: #fff;
+  position:absolute;
+  bottom: 17rpx;
+  right: 10rpx;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 8rpx;
+  background-color: rgba(0, 0, 0, .5);
+}
+.all view{
+  text-align: center;
+}
+.all view:first-child{
+  font-size: 45rpx;
+  margin-top: 40rpx;
+}
+.all view:last-child{
+  margin-top: 10rpx;
+}
+.sku{
+  margin-left: 10rpx;
+  color: #666;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.proad{
+  margin: 20rpx;
+}
+.proad-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+}
+.proad-title image{
+  width: 292rpx;
+  height: 34rpx;
+}
+.pro-list{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.proitem{
+  width: 334rpx;
+  height: 497rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+}
+.item-hd image{
+  width: 334rpx;
+  height: 342rpx;
+  border-radius: 13rpx 13rpx;
+}
+.item-bm{
+  padding: 8rpx 12rpx;
+}
+.protitle{
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #000000;
+}
+.pro-price{
+  color: #D62828;
+  font-weight: 500;
+  font-size: 30rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #D62828;
+  font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
+  color: #999999;
+  font-size: 10px;
+}
+.icon-shop{
+  width: 34rpx;
+  height: 36rpx;
+}
+.left-img{
+  display: flex;
+  width: 290rpx;
+  flex-shrink: 0;
+  justify-content: space-between;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.no-shop{
+  width: 230rpx;
+}
+.shop-box{
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  height: 70rpx;
+}
+
+ .wineScene-price-container {
+    width: 750rpx;
+    height: 100rpx;
+    /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
+    background: #FD3856;
+    /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    color: #FFFFFF;
+    font-size: 24rpx;
+ }
+
+ .wineScene-price-container .wineSecne-price {
+    font-weight: bold;
+    font-size: 48rpx;
+    color: #FFFFFF;
+}
+.wineScene-price-container .wineSecne-money {
+    font-size: 24rpx;
+    font-weight: 500;
+    /* text-decoration-line: line-through; */
+    padding-left: 14rpx;
+}
+.wineScene-price-container .wineSecne-price::before {
+    font-size: 24rpx;
+    content: '￥';
+}
+
+.hotel-custom-detail{
+    display: flex;
+    /* justify-content: space-between; */
+    height: fit-content;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 20rpx;
+}
+.hotel-custom-detail .tip-info{
+    width: 33rpx;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.hotel-custom-detail .tip-info .tip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    width: 33rpx;
+    height: 33rpx;
+    background: #6394FD;
+    border-radius: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    text-align: center;
+    line-height: 33rpx;
+}
+.hotel-custom-detail .tip-info .info{
+    width: 11rpx;
+    height: 100%;
+    background: #D0DFFE;
+    border-radius: 5rpx;
+}
+
+.hotel-custom-right>view{
+    margin-bottom: 20rpx;
+}
+.hotel-custom-right>view:last-of-type{
+    margin-bottom: 0;
+}
+.map-container{
+    background-image: url('https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/locationBg.png');
+    background-size: 100% 100%;
+    width: 100%;
+    height: 128rpx;
+    padding: 30rpx 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    box-sizing: border-box;
+}
+.map-container image{
+    width: 29rpx;
+    height: 29rpx;
+}
+
+.select-img{
+    display: flex;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 26rpx;
+}
+.select-img image{
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 13rpx;
+    margin-right:20rpx;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+.select-img image.active{
+    border: 2px solid #DC2525;
+}
+.select-img image.no-stock{
+    border: none;
+    opacity: 0.5;
+}
+.select-img .select-img-text{
+    font-weight: bold;
+    font-size: 24rpx;
+    color: #000000;
+    width: 51rpx;
+    height: 80rpx;
+    margin-right:20rpx;
+    display: flex;
+    align-items: center;
+}
+.select-img .other-imgs{
+    flex: 1;
+    width: 100rpx;
+    overflow-x: auto;
+    display: flex;
+}
+.select-img .select-sku{
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 25rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    background: white;
+    font-family: fangsong;
+    color: #999;
+}
+.sku-tips{
+    width: 100%;
+    position: absolute;
+    bottom: 73rpx;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: center;
+}
+.sku-tips>view{
+    width: fit-content;
+    max-width: 533rpx;
+    height: 53rpx;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 27rpx;
+    padding: 0 28rpx;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    margin: 0 auto;
+}
+
+.shop-container{
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    padding: 32rpx 23rpx;
+    width: 100%;
+    background: white;
+    box-sizing: border-box;
+}
+.shop-container .shop-img{
+    width: 113rpx;
+    height: 113rpx;
+    flex-shrink: 0;
+}
+.shop-container .shop-btn{
+    width: 135rpx;
+height: 57rpx;
+border-radius: 13rpx;
+border: 1px solid #0B898E;
+font-weight: 500;
+font-size: 31rpx;
+color: #0B898E;
+text-align: center;
+line-height: 57rpx;
+flex-shrink: 0;
+}
+.shop-container .textOver2{
+    flex: 1;
+    width: 100rpx;
+    padding: 0 50rpx 0 20rpx;
+    font-weight: bold;
+font-size: 32rpx;
+color: #010101;
+}
+
+
+
+.other-info-box{
+}
+.other-info-box .other-info-item{
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+    margin-top: 30rpx;
+}
+.other-info-box .other-info-item image{
+    width: 32rpx;
+    height: 32rpx;
+    flex-shrink: 0;
+}
+.other-info-box .view-arrow{
+    font-family: fangsong;
+    color: #999;
+    width: 25rpx;
+    flex-shrink: 0;
+}
+.other-info-box .other-content{
+    padding: 0 20rpx;
+    overflow: hidden;
+    flex: 1;
+    width: 100rpx;
+    
+}
+
+.other-info-content{
+    min-height: 600rpx;
+    padding: 32rpx 23rpx;
+}
+.other-info-content .title{
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #060001;
+    text-align: center;
+    margin-bottom: 36rpx;
+}
+.other-info-content .key-title{
+    color: #060001;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    font-weight: bold;
+}
+.other-info-content .key-content{
+    color: #666;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    margin-top: 6rpx;
+}
+.prod-param{
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 45rpx;
+}
+.prod-param .prod-key{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+}
+.prod-param .prod-content{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+font-size: 27rpx;
+color: #000000;
+}
+
+.supplier-mask{
+    min-height: 800rpx;
+    display: flex;
+    flex-direction: column;
+}
+.supplier-mask .supplier-mask-header{
+    padding: 28rpx 26rpx;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #000000;
+}
+.mask-shop-info{
+    padding: 0 26rpx;
+    font-weight: 500;
+    font-size: 31rpx;
+    color: #000000;
+}
+.shop-info-item{
+    display: flex;
+    align-items: flex-start;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #000000;
+    padding: 20rpx 0;
+    word-wrap: break-all;
+}
+.shop-info-item .start-icon{
+    width: 28rpx;
+    height: 28rpx;
+    margin: 4rpx 8rpx 0 0;
+    flex-shrink: 0;
+}
+.shop-info-item .subtitle{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-top: 26rpx;
+}
+.shop-info-item .icon-phone{
+    width: 56rpx;
+    height: 56rpx;
+    margin-left: 40rpx;
+}
+.hot-font{
+    width: 31rpx;
+    height: 31rpx;
+    background: linear-gradient(-30deg, #FF4000, #FF8D23);
+    border-radius: 7rpx;
+    text-align: center;
+    line-height: 31rpx;
+    font-weight: 500;
+font-size: 23rpx;
+color: #FFFFFF;
+display: inline-block;
+margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/pages/info/foodProductInfo/index.js b/pages/info/foodProductInfo/index.js
index a5d0eb6..6a7fde7 100644
--- a/pages/info/foodProductInfo/index.js
+++ b/pages/info/foodProductInfo/index.js
@@ -62,12 +62,12 @@ Page({
             id: options.id
         })
         // 获取购物车按钮的位置
-        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-            console.log(res)
-            that.setData({
-                cartTop: res.top
-            })
-        }).exec()
+        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+        //     console.log(res)
+        //     that.setData({
+        //         cartTop: res.top
+        //     })
+        // }).exec()
         if (options.ZTPoint) {
             this.setData({
                 ZTPoint: options.ZTPoint
@@ -395,7 +395,8 @@ Page({
             }
         })
     },
-    order: function () {
+    order: function (e) {
+        let buy_type = e.currentTarget.dataset.type
         app.globalData.postProduct = []
         app.globalData.list = []
         commonApi.user_post("/product/checkStock", {
@@ -404,16 +405,16 @@ Page({
             if (res && res.code != 1) {
                 return;
             } else {
-                if (this.data.skuFlag == 'order') {
-                    util.pagePoint({
-                        event: 'product_order',
-                        param: {
-                            id: this.data.info.id,
-                            type: this.data.info.type
-                        }
-                    }, 1)
-                    wx.setStorageSync('login_from', 'product_order_login')
-                    wx.setStorageSync('order_from', 'product_order_submit')
+                if (buy_type == 'order') {
+                    // util.pagePoint({
+                    //     event: 'product_order',
+                    //     param: {
+                    //         id: this.data.info.id,
+                    //         type: this.data.info.type
+                    //     }
+                    // }, 1)
+                    // wx.setStorageSync('login_from', 'product_order_login')
+                    // wx.setStorageSync('order_from', 'product_order_submit')
                     app.globalData.couponInfo = null;
                     // 购买
                     let product = [{
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index 2afc10c..df11404 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -22,9 +22,9 @@
     <block wx:for="{{info.sku}}" wx:key="*this">
         <swiper-item style="position: relative;">
         <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
-        <view class="sku-tips ">
+        <!-- <view class="sku-tips ">
             <view class="textOver">{{item.sku_name}}</view>
-        </view>
+        </view> -->
         </swiper-item>
     </block>
     </swiper>
@@ -56,9 +56,9 @@
         <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
  
 
-            <view class="title textOver2">{{info.title}}</view>
-            <view class="tags-box textOver">
-                <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}</view>
+            <view class="title textOver2"><text class="hot-font">热</text>{{info.title}}</view>
+            <view class="tags-box textOver" wx:if="{{info.subtitle}}">
+                <view class="tag textOver" >{{info.subtitle}}</view>
             </view>
 
             <view class="other-info-box" >
@@ -98,6 +98,7 @@
         <view class="info-title">套餐详情</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
     </view>
+    <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
     <!-- <view class="info-box" id="box2">
         <view class="info-title">费用说明</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.expense_info)}}"></rich-text>
@@ -106,7 +107,6 @@
         <view class="info-title">购买须知</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
     </view>
-    <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
 
     <!-- <view class="info-box" id="box4" style="padding: 20rpx 26rpx;">
         <view class="info-title">产品推荐</view>
@@ -127,7 +127,7 @@
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
-  <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <navigator wx:if="{{iShop}}" url="/pages/info/foodNew/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
   <view class="shop-box">
     <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
     <view>店铺</view>
@@ -147,15 +147,15 @@
 
   <view class="btns">
     <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
-    <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
     <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{skuFlag}}">
   <view class="mask-bg" bindtap="hideSku"></view>
   <view class="mask-content">
diff --git a/pages/info/foodProductInfo/index.wxss b/pages/info/foodProductInfo/index.wxss
index 74cd9b1..35fe5d5 100644
--- a/pages/info/foodProductInfo/index.wxss
+++ b/pages/info/foodProductInfo/index.wxss
@@ -1,6 +1,6 @@
 /* pages/info/hotelProductInfo/index.wxss */
 page {
-  background: #f2f2f2;
+    background: #F7F7F7;
 }
 
 .swiper {
@@ -25,7 +25,7 @@ page {
     font-weight: 500;
     font-size: 24rpx;
     color: rgba(255,255,255,0.5);
-    z-index: 10;
+    z-index: 1;
 }
 .swuper-bottom-bg{
     background: rgba(1, 0, 0, 0.6);
@@ -1264,4 +1264,18 @@ color: #010101;
     font-weight: 500;
 font-size: 27rpx;
 color: #000000;
+}
+
+.hot-font{
+    width: 31rpx;
+    height: 31rpx;
+    background: linear-gradient(-30deg, #FF4000, #FF8D23);
+    border-radius: 7rpx;
+    text-align: center;
+    line-height: 31rpx;
+    font-weight: 500;
+font-size: 23rpx;
+color: #FFFFFF;
+display: inline-block;
+margin-right: 10rpx;
 }
\ No newline at end of file
diff --git a/pages/list/foodNew/index.js b/pages/list/foodNew/index.js
new file mode 100644
index 0000000..d928f30
--- /dev/null
+++ b/pages/list/foodNew/index.js
@@ -0,0 +1,194 @@
+// pages/list/theatre/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[],
+    tagList: [
+        {id: 9, name: "品苏式面"},
+        {id: 10, name: "尝农家乐"},
+        {id: 11, name: "鉴苏帮菜"},
+        {id: 12, name: "寻夜食堂"},
+    ], // 父标签477
+    total:1,
+    type:9,
+
+    areas: [],
+    areaIndex:0,
+
+    needDistance: false,
+    lat:"",
+    lon:"",
+    keywords:""
+  },
+  
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.showShareMenu({
+        withShareTicket: true,
+        menus: ['shareAppMessage', 'shareTimeline']
+      })
+    this.getList();
+    this.getAreas();
+  },
+
+  getAreas:function(){
+    commonApi._post("supplier/get_area_list",{pid:320500}).then(res=>{
+        this.setData({
+            areas: [{id:0, name:"选择地区"},...res.data]
+        })
+    })
+  },
+  changeArea:function(e){
+    this.setData({
+      areaIndex:e.detail.value,
+      list: [],
+      total:1,
+    })
+    this.getList()
+  },
+  selectDistance: function () {
+      this.setData({
+        needDistance: !this.data.needDistance,
+        list: [],
+        total:1,
+      })
+      this.getList()
+  },
+
+  search:function(e){
+    this.setData({
+      list:[],
+      keywords:e.detail.keywords,
+      total:1
+    })
+    this.getList()
+  },
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    // util.pagePoint({
+    //   event: 'food_detail_click',
+    //   param: {
+    //     id:item.id
+    //   }
+    // },1)
+    wx.navigateTo({
+      url: '/pages/info/foodNew/index?id='+item.id,
+    })
+  },
+  getList:function(){
+    let list = this.data.list,that = this;
+    if(list.length>=this.data.total) return;0
+    // // 距离排序
+    if(this.data.needDistance && !this.data.lon){
+      wx.getLocation({
+        type: 'gcj02',
+        success: function (res) {
+          that.setData({
+            lat:res.latitude,
+            lon:res.longitude
+          })
+          that.realgetList()
+        },
+        fail:function(){
+          that.realgetList()
+        }
+      })
+    }
+    else {
+      this.realgetList()
+    }
+    
+  },
+  realgetList:function(){
+    let list = this.data.list;
+
+    commonApi._post("supplier/get_supplier_list",{
+      supplier_tag_id: this.data.type,
+      area_id: (this.data.areas[this.data.areaIndex] || {id: 0}).id,
+      offset:list.length,
+      limit:10,
+    //   lat:this.data.lat,
+    //   lon:this.data.lon,
+    keyword:this.data.keywords
+    }).then(res=>{
+      this.setData({
+        list:list.concat(res.data.list),
+        total:res.data.total
+      })
+    })
+  },
+  changeType:function(e){
+    this.setData({
+      type:e.currentTarget.dataset.type,
+      list:[],
+      total:1
+    })
+    this.getList();
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onShareTimeline: function() {
+    return {
+      title: '君到苏州-剧场演出',
+      query: '',
+      imageUrl: 'https://static.ticket.sz-trip.com/xcxImages/index/icon4New.png'
+    }
+  }
+})
\ No newline at end of file
diff --git a/pages/list/foodNew/index.json b/pages/list/foodNew/index.json
new file mode 100644
index 0000000..9134183
--- /dev/null
+++ b/pages/list/foodNew/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "search": "/pages/component/SearchHeader"
+  }
+}
\ No newline at end of file
diff --git a/pages/list/foodNew/index.wxml b/pages/list/foodNew/index.wxml
new file mode 100644
index 0000000..718e178
--- /dev/null
+++ b/pages/list/foodNew/index.wxml
@@ -0,0 +1,48 @@
+<!--pages/list/theatre/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<view class="my-header-search">
+    <search bind:onload="search" transparent="1"></search>
+    <view class="sale-types no-scrollbar">
+        <view wx:for="{{tagList}}" wx:key="id" class="sale-type{{type==item.id?' active':''}}" 
+        bindtap="changeType" data-type="{{item.id}}">{{item.name}}</view>
+    </view>
+
+    <view class="search-fix">
+        <view>
+            <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="name" bindchange="changeArea">
+                <view class="picker feiyi-picker">
+                    <text>{{areaIndex>0?areas[areaIndex].name:'选择地区'}}</text>
+                    <view class="trian-down"></view>
+                </view>
+            </picker>
+        </view>
+        <view bind:tap="selectDistance">距离最近</view>
+    </view>
+
+</view>
+
+
+<view style="height:700rpx"></view>
+
+<view class="prod-box">
+<view bindtap="gotoDetail" data-item="{{item}}" class="item" wx:for="{{list}}">
+  <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
+  <view class="info">
+    <view class="textOver2 title">{{item.supplier_name}}</view>
+    <view class="textOver subtitle">{{item.address}}</view>
+    <view class="line" wx:if="{{item.hot_products.length>0}}"></view>
+    <view class="prod-container" wx:for="{{item.hot_products}}" wx:for-item="prod" wx:for-index="indexs" wx:key="indexs">
+      <view class="prod-item textOver">
+            <text class="hot">热</text>
+            <text class="price">￥{{prod.price?prod.price/100:0}}</text>
+            <text class="prod-name">{{prod.title}}</text>
+      </view>
+    </view>
+  </view>
+</view>
+<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
+  <image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <view>暂无内容</view>
+</view>
+
+</view>
\ No newline at end of file
diff --git a/pages/list/foodNew/index.wxss b/pages/list/foodNew/index.wxss
new file mode 100644
index 0000000..593b84d
--- /dev/null
+++ b/pages/list/foodNew/index.wxss
@@ -0,0 +1,156 @@
+/* pages/list/theatre/index.wxss */
+page{
+    background:#F7F7F7;
+    padding-bottom: 20rpx;
+}
+
+.my-header-search{
+    background: white;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+}
+.my-header-search .bg-box .title-header{
+    color: #999;
+}
+.my-header-search .title-header .icon-fanhui1{
+    color: #333 !important;
+}
+
+.sale-types {
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250924/e47d70fa4d99ac1804729b024cdf4d6a.png");
+    background-size: 100% 100%;
+    width: 100%;
+    height: 466.67rpx;
+    display: flex;
+    align-items: flex-end;
+    padding: 0 26rpx 50rpx;
+    justify-content: space-between;
+    box-sizing: border-box;
+}
+.sale-type {
+    width: 160rpx;
+    height: 77.33rpx;
+    flex-shrink: 0;
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #FE7429;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250924/12b88d55fac2e526445d101f90eb9e0b.png");
+    background-size: 100% 100%;
+    text-align: center;
+    line-height: 77rpx;
+}
+.sale-type.active {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #000000;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250924/5c0f204a31181920f5561f2cdc725559.png");
+}
+.search-fix{
+    height: 95rpx;
+    width: 100%;
+    border-radius: 20rpx 20rpx 0 0;
+    background: #F7F7F7;
+    position: relative;
+    z-index: 2;
+    margin-top: -30rpx;
+    box-sizing: border-box;
+    padding: 0 144rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #000000;
+}
+.feiyi-picker{
+    
+    display: flex;
+    align-items: center;
+}
+.trian-down{
+    margin-left: 13rpx;
+    width: 0;
+    height: 0;
+    /* 关键：左右边框宽度大于底部边框宽度，形成扁平效果 */
+    border-left: 14rpx solid transparent;  /* 左宽 */
+    border-right: 14rpx solid transparent; /* 右宽 */
+    border-top: 10rpx solid #999;      /* 高度（数值越小越扁） */
+}
+.prod-box{
+    background: #F7F7F7;
+    border-radius: 20rpx 20rpx 0 0;
+    padding-top: 33rpx;
+}
+
+.item {
+  background: #FFFFFF;
+  margin: 0rpx 27rpx 30rpx;
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  padding: 6rpx;
+  border-radius: 13rpx;
+}
+.item image {
+    width: 160rpx;
+    height: 160rpx;
+    background: #D1D7CB;
+    border-radius: 7rpx;
+    margin-right: 14rpx;
+    flex-shrink: 0;
+}
+
+.info {
+  flex: 1;
+  width: 1rpx;
+  min-height: 160rpx;
+}
+.info .title {
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #000000;
+  margin-bottom: 20rpx;
+}
+.info .subtitle {
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #999999;
+}
+.info .line{
+    width: 100%;
+    height: 1px;
+    background: #D8D8D8;
+    margin: 22rpx 0;
+}
+
+.prod-item{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #000000;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
+.prod-item .hot{
+    width: 31rpx;
+    height: 31rpx;
+    background: linear-gradient(-30deg, #FF4000, #FF8D23);
+    border-radius: 7rpx;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 31rpx;
+    margin-right: 17rpx;
+}
+.prod-item .price{
+    font-weight: bold;
+font-size: 24rpx;
+color: #D80000;
+margin-right: 17rpx;
+}
+
+
+
diff --git a/pages/order/food/index.js b/pages/order/food/index.js
index 9dff63a..6af10de 100644
--- a/pages/order/food/index.js
+++ b/pages/order/food/index.js
@@ -14,7 +14,8 @@ Page({
     user:"",
     tel:"",
     showNoticeFlag:false,
-    coupon:null
+    coupon:null,
+    price: 0,
   },
 
   /**
@@ -46,6 +47,34 @@ Page({
     })
   },
 
+  getNewCoupon(e){
+    this.setData({
+       coupon:e.detail
+    })
+    this.showAllPrice()
+   },
+
+   showAllPrice () {
+    console.log('couponInfo',app.globalData.couponInfo);
+
+    let price
+    if (this.data.coupon) {
+        if (this.data.coupon.activity.discount_type == 'pricebreak') {
+            price = this.data.product.sku.price * this.data.productNum - this.data.coupon.activity.money
+        } else {
+        price =(this.data.product.sku.price * this.data.productNum * this.data.coupon.activity.fold)/ 10
+        }
+    } else {
+      price = this.data.product.sku.price * this.data.productNum
+    }
+    if (price >0) {
+      this.setData({ price:price/100})
+    }else {
+      this.setData({ price:0 })
+    }
+    
+   },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/order/food/index.wxml b/pages/order/food/index.wxml
index a732f57..91d0358 100644
--- a/pages/order/food/index.wxml
+++ b/pages/order/food/index.wxml
@@ -28,10 +28,12 @@
     <input type="number" value="{{tel}}" bindinput="telInput" placeholder="请输入手机号"></input>
   </view>
 </view>
-<coupon id="coupon" money="{{product.sku.price * productNum}}" sku="{{product.sku.id}}"></coupon>
+<coupon id="coupon" bind:getNewCoupon = 'getNewCoupon' money="{{product.sku.price * productNum}}" sku="{{product.sku.id}}"></coupon>
 <view style="height:113rpx"></view>
 <view class="fixed-bottom" wx:if="{{product}}">
-  <view class="fixed-price-box"><text>订单金额：</text><text class="price">¥{{((product.sku.price * productNum - (coupon?coupon.activity.money:0))>0?(product.sku.price * productNum - (coupon?coupon.activity.money:0)):0) / 100}}</text></view>
+  <!-- <view class="fixed-price-box"><text>订单金额：</text><text class="price">¥{{((product.sku.price * productNum - (coupon?coupon.activity.money:0))>0?(product.sku.price * productNum - (coupon?coupon.activity.money:0)):0) / 100}}</text></view> -->
+  <view class="fixed-price-box"><text>订单金额：</text><text class="price">¥{{price}}</text></view>
+  
   <view class="fixed-btn" bindtap="order">提交订单</view>
 </view>
 <notice bind:close="closeNotice" wx:if="{{showNoticeFlag}}" bookingInfo="{{product.sku.sku_model}}" skuName="{{product.sku.sku_name}}"></notice>
\ No newline at end of file
diff --git a/pages/user/order/foodOrderInfo/index.js b/pages/user/order/foodOrderInfo/index.js
index 64d5732..18adada 100644
--- a/pages/user/order/foodOrderInfo/index.js
+++ b/pages/user/order/foodOrderInfo/index.js
@@ -20,7 +20,11 @@ Page({
     codeImgs:[],
     minute:"",
     second:"",
-    pay_methods:app.globalData.pay_methods
+    pay_methods:app.globalData.pay_methods,
+    ids: [],
+
+    lon: null,
+    lat: null,
   },
 
   /**
@@ -177,6 +181,23 @@ Page({
     })
   },
 
+
+  gotolocation: function () {
+    let info = this.data.info.order_product_list[0].supplier_info;
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon),
+      name:info.shop_name,
+      address:info.address
+    })
+},
+
+callPhone :function () {
+    wx.makePhoneCall({
+        phoneNumber: this.data.info.order_product_list[0].supplier_info.phone,
+    })
+},
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -184,33 +205,52 @@ Page({
 
   },
 
+  getOrderInfo () {
+    commonApi.user_post("order/query",{
+        order_id:this.data.id,
+        lon: this.data.lon,
+        lat: this.data.lat
+      }).then(res=>{
+        if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
+          let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
+          this.daojishi(time);
+        }
+        console.log(res)
+        let state = ""
+        res.data.order_product_list.map(order=>{
+          order.qrcode.map(item=>{
+            item.stateText = app.globalData.codeState[item.state];
+          })
+          order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[];
+          state = state + order.state;
+        })
+        this.setData({
+          isRefund:state.indexOf("REFUND")!=-1,
+          info:res.data,
+          product_model:res.data.order_product_list[0].product_model,
+          ids: res.data.order_product_list.map(x=>x.product_id).join(","),
+        })
+        this.getCodeImg()
+      })
+  },
+
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post("order/query",{
-      order_id:this.data.id
-    }).then(res=>{
-      if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
-        let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
-        this.daojishi(time);
-      }
-      console.log(res)
-      let state = ""
-      res.data.order_product_list.map(order=>{
-        order.qrcode.map(item=>{
-          item.stateText = app.globalData.codeState[item.state];
-        })
-        order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[];
-        state = state + order.state;
-      })
-      this.setData({
-        isRefund:state.indexOf("REFUND")!=-1,
-        info:res.data,
-        product_model:res.data.order_product_list[0].product_model
-      })
-      this.getCodeImg()
+    let that = this
+    wx.getLocation({
+        type: 'gcj02',
+        success: function (res) {
+          that.setData({lat:res.latitude,lon:res.longitude})
+          that.getOrderInfo()
+        },
+        fail:function(){
+          that.getOrderInfo()
+        }
     })
+
+
   },
 
   /**
diff --git a/pages/user/order/foodOrderInfo/index.json b/pages/user/order/foodOrderInfo/index.json
index 35cf02f..3418379 100644
--- a/pages/user/order/foodOrderInfo/index.json
+++ b/pages/user/order/foodOrderInfo/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "sptj":"/pages/component/proRec/proRec"
   }
 }
\ No newline at end of file
diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml
index 220255e..c015640 100644
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@@ -19,8 +19,9 @@
 
 <!-- 美食的 -->
 
-<view class="box" wx:if="{{product_model=='food'}}" style="padding-bottom:0">
-  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
+<view class="box" wx:if="{{product_model=='food'}}">
+  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}"  wx:for="{{info.order_product_list}}">
+    <view class="product-info">
     <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
       <view class="title textOver2">{{item.product_title}}</view>
@@ -30,53 +31,65 @@
       <view style="margin-bottom:10rpx">￥ {{item.product_price/100}}</view>
       <view>x{{item.product_num}}</view>
     </view>
-  </view>
-  <view class="detail-item">
-    <text>商品总价</text>
-    <text>￥{{info.total_money/100}}</text>
+    </view>
+
+    <view class="reserve-box">
+        <view >{{item.order_product_extend.reserve_username}}</view>
+        <view >{{item.order_product_extend.reserve_mobile}}</view>
+    </view>
+    <view class="state_text">{{item.state_text}}</view>
+
+    <view class="detail-item">
+    <text>商品总额：</text>
+    <text style="font-weight: bold;color: #111111;">￥{{info.total_money/100}}</text>
   </view>
   <view class="detail-item" wx:if="{{info.total_post_fee}}">
     <text>运费</text>
-    <text>￥{{info.total_post_fee/100}}</text>
+    <text style="font-weight: bold;color: #111111;">￥{{info.total_post_fee/100}}</text>
   </view>
   <view class="detail-item" wx:if="{{info.preference_money}}">
-    <text>优惠券抵扣</text>
-    <text>-￥{{info.preference_money/100}}</text>
+    <text>优惠券：</text>
+    <text style="font-weight: bold;color: #111111;">-￥{{info.preference_money/100}}</text>
   </view>
-  <view class="detail-item all-total-item" style="border-bottom:none">
-    <text>需付款</text>
+  <view class="detail-item">
+    <text>实付金额：</text>
     <view class="price">{{info.paid_money/100}}</view>
   </view>
-  <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
-    <navigator url="/pages/info/foodProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
-    <navigator wx:if="{{info.state!='UNPAID'}}" url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
-    <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
-    <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
-    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
-    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
   </view>
+
+
+  
 </view>
 <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">商家信息</view>
-  <view class="detail-item">
-    <text>{{info.order_product_list[0].scene_detail.title}}</text>
-  </view>
-  <view class="detail-item">
-    <text>商家电话：{{info.order_product_list[0].scene_detail.tel}}</text>
-  </view>
-  <view class="detail-item">
-    <text>商家地址：{{info.order_product_list[0].scene_detail.address}}</text>
+
+  <view class=" supplier-mask">
+    <view class="mask-shop-info">
+        <view>{{info.order_product_list[0].supplier_info.shop_name}}</view>
+        <view class="shop-info-item">
+            <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/time.png"></image>
+            <view>
+                <view>营业时间</view>
+                <view class="subtitle">{{info.order_product_list[0].supplier_info.business_hours}}</view>
+            </view>
+        </view>
+        <view class="shop-info-item" style="justify-content: space-between;">
+            <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/address.png"></image>
+            <view style="flex: 1;width: 100rpx;">
+                <view>{{info.order_product_list[0].supplier_info.address}}</view>
+                <view class="subtitle" wx:if="{{info.order_product_list[0].supplier_info.distance>0}}">据您约{{info.order_product_list[0].supplier_info.distance}}km</view>
+            </view>
+            <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+            <image class="icon-phone" catch:tap="gotolocation" src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+        </view>
+
+    </view>
   </view>
 </view>
 <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">订单信息</view>
-  <view class="detail-item">
-    <text>姓名：{{info.order_product_list[0].order_product_extend.reserve_username}}</text>
-  </view>
-  <view class="detail-item">
-    <text>预留手机号：{{info.order_product_list[0].order_product_extend.reserve_mobile}}</text>
-  </view>
+
+
   <view class="detail-item">
     <text>订单编号：{{info.order_id}}</text>
   </view>
@@ -89,18 +102,33 @@
   <view class="detail-item" wx:if="{{info.pay_method}}">
     <text>支付方式：{{pay_methods[info.pay_method]}}</text>
   </view>
+  <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
+    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
+    <navigator url="/pages/info/foodProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
+    <navigator wx:if="{{info.state!='UNPAID'}}" url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
+    <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
+    <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
+    <navigator url="/pages/order/comment/index?id={{info.order_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
+    <navigator url="/pages/order/pay/index?id={{id}}" class="btn active" wx:if="{{info.state=='UNPAID'}}">立即支付</navigator>
+  </view>
 </view>
-<view class="box" wx:if="{{info && product_model=='food'}}">
+<!-- <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">使用说明</view>
   <rich-text class="detail-item" style="display:block;height:auto" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.bookinfo)}}"></rich-text>
-</view>
+</view> -->
 <!-- <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">退款须知</view>
   <rich-text class="detail-item" style="display:block;height:auto" nodes="{{tool.formateRichText(info.order_product_list[0].sku_model.refund_info)}}"></rich-text>
 </view> -->
+
+<sptj ids="{{ ids }}"></sptj>
+
 <navigator url="/pages/user/service/index" wx:if="{{info && info.state!='CLOSED'}}" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
 </navigator>
+
+<view style="width: 100%;height: 50rpx;"></view>
+
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/foodOrderInfo/index.wxss b/pages/user/order/foodOrderInfo/index.wxss
index c0a17a4..053db7d 100644
--- a/pages/user/order/foodOrderInfo/index.wxss
+++ b/pages/user/order/foodOrderInfo/index.wxss
@@ -33,8 +33,6 @@ page {
   color: #333;
   font-size: 24rpx;
   padding-bottom: 20rpx;
-  border-bottom: 1rpx solid #d8d8d8;
-  margin-bottom: 10rpx;
 }
 .product-info image {
   width: 140rpx;
@@ -63,19 +61,18 @@ page {
   justify-content: space-between;
   align-items: center;
   height: 45rpx;
-  color: #333;
-  font-size: 26rpx;
-}
-.all-total-item {
-  font-weight: bold;
-  height: 70rpx;
-  border-bottom: 1rpx solid #d8d8d8;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #666666;
+  margin-bottom: 10rpx;
 }
-.all-total-item .price {
-  color: #D62828;
-  font-size: 36rpx;
+.detail-item .price{
+    color: #D62828;
+    font-size: 34rpx;
+    font-weight: bold;
 }
-.all-total-item .price::before {
+
+.detail-item .price::before {
   content: "￥";
   font-size: 26rpx;
 }
@@ -286,4 +283,64 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
+}
+
+.reserve-box{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #000000;
+}
+.state_text{
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #0B898E;
+    text-align: right;
+    margin: 20rpx 0;
+    padding-bottom: 20rpx;
+    border-bottom: 1px solid #D8D8D8;
+}
+
+.supplier-mask{
+    display: flex;
+    flex-direction: column;
+}
+.supplier-mask .supplier-mask-header{
+    padding: 28rpx 26rpx;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #000000;
+}
+.mask-shop-info{
+    font-weight: 500;
+    font-size: 31rpx;
+    color: #000000;
+}
+.shop-info-item{
+    display: flex;
+    align-items: flex-start;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #000000;
+    padding: 20rpx 0;
+    word-wrap: break-all;
+}
+.shop-info-item .start-icon{
+    width: 28rpx;
+    height: 28rpx;
+    margin: 4rpx 8rpx 0 0;
+    flex-shrink: 0;
+}
+.shop-info-item .subtitle{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-top: 26rpx;
+}
+.shop-info-item .icon-phone{
+    width: 56rpx;
+    height: 56rpx;
+    margin-left: 40rpx;
 }
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 8c27714..acd1c1b 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -38,20 +38,7 @@
 
 <!-- 景点订单详情需要这个 -->
 <!-- <view class="box" wx:if='{{product_model=="ticket"}}'>
-  <view class="scene-box">
-    <view class="scene-box-left">
-      <view wx:if="{{info.state=='UNPAID'}}">库存有限，请尽快完成付款</view>
-      <view wx:if="{{info.state=='CLOSED' || info.state=='REFUND'}}">您的订单已取消，您可以通过苏州文旅总入口再次预订</view>
-      <view wx:if="{{info.order_product_list[0].state=='WAIT_USE'}}">预定已成功，祝您出游愉快</view>
-      <view>订单号：{{info.order_id}}</view>
-      <view>下单时间：{{info.create_time}}</view>
 
-    </view>
-    <view class="scene-box-right">
-      <view class="price">￥{{info.paid_money/100}}</view>
-      <view bindtap="showFeeInfo">费用明细</view>
-    </view>
-  </view>
 </view> -->
 <!--景点订单详情需要这个  -->
 <view class="box" wx:for="{{info.order_product_list}}" wx:for-index='index'>
@@ -135,6 +122,8 @@
 
     </view>
 
+    <view wx:elif=""></view>
+
     <view wx:else>
         <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
             <view class="product-info-top">
diff --git a/project.private.config.json b/project.private.config.json
index 01b81b5..f1281d1 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,18 +7,25 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "pages/info/postProductInfo/index",
-          "query": "id=457638",
+          "name": "pages/activity/huawei/index",
+          "pathName": "pages/activity/huawei/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/list/foodNew/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/info/roadInfo/index",
-          "pathName": "pages/info/roadInfo/index",
-          "query": "id=457643",
-          "scene": null,
-          "launchMode": "default"
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/foodProductInfo/index",
+          "query": "id=457647",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
diff --git a/utils/https.js b/utils/https.js
index d55ab84..b0f9a8b 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From fd4b083c08ed1eaaa84a403ebc1882e897a0aabc Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 26 Sep 2025 16:30:07 +0800
Subject: [PATCH 428/471] =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                   |   6 -
 images/ai.png                              | Bin 17471 -> 8352 bytes
 images/ai_seld.png                         | Bin 25847 -> 10232 bytes
 images/index.png                           | Bin 6130 -> 3498 bytes
 images/index_seld.png                      | Bin 7247 -> 3406 bytes
 images/map.png                             | Bin 11233 -> 5599 bytes
 images/map_seld.png                        | Bin 13725 -> 5737 bytes
 images/place1.png                          | Bin 28063 -> 7184 bytes
 images/place2.png                          | Bin 18443 -> 5993 bytes
 images/user.png                            | Bin 7445 -> 4322 bytes
 images/user_seld.png                       | Bin 11041 -> 4813 bytes
 pages/activity/huawei/form/index.js        | 162 --------------
 pages/activity/huawei/form/index.json      |   5 -
 pages/activity/huawei/form/index.wxml      |  29 ---
 pages/activity/huawei/form/index.wxss      |  72 -------
 pages/activity/huawei/index.js             | 107 ----------
 pages/activity/huawei/index.json           |   5 -
 pages/activity/huawei/index.wxml           |  20 --
 pages/activity/huawei/index.wxss           |  71 -------
 pages/activity/huawei/list/index.js        | 209 ------------------
 pages/activity/huawei/list/index.json      |   5 -
 pages/activity/huawei/list/index.wxml      |  42 ----
 pages/activity/huawei/list/index.wxss      | 163 --------------
 pages/activity/huawei/result/index.js      |  73 -------
 pages/activity/huawei/result/index.json    |   5 -
 pages/activity/huawei/result/index.wxml    |   7 -
 pages/activity/huawei/result/index.wxss    |  30 ---
 pages/activity/huawei/upload/index.js      | 234 ---------------------
 pages/activity/huawei/upload/index.json    |   5 -
 pages/activity/huawei/upload/index.wxml    |  38 ----
 pages/activity/huawei/upload/index.wxss    | 112 ----------
 pages/activity/huawei/uploadres/index.js   |  78 -------
 pages/activity/huawei/uploadres/index.json |   5 -
 pages/activity/huawei/uploadres/index.wxml |   8 -
 pages/activity/huawei/uploadres/index.wxss |  26 ---
 pages/info/foodNew/index.js                |  14 +-
 36 files changed, 7 insertions(+), 1524 deletions(-)
 delete mode 100644 pages/activity/huawei/form/index.js
 delete mode 100644 pages/activity/huawei/form/index.json
 delete mode 100644 pages/activity/huawei/form/index.wxml
 delete mode 100644 pages/activity/huawei/form/index.wxss
 delete mode 100644 pages/activity/huawei/index.js
 delete mode 100644 pages/activity/huawei/index.json
 delete mode 100644 pages/activity/huawei/index.wxml
 delete mode 100644 pages/activity/huawei/index.wxss
 delete mode 100644 pages/activity/huawei/list/index.js
 delete mode 100644 pages/activity/huawei/list/index.json
 delete mode 100644 pages/activity/huawei/list/index.wxml
 delete mode 100644 pages/activity/huawei/list/index.wxss
 delete mode 100644 pages/activity/huawei/result/index.js
 delete mode 100644 pages/activity/huawei/result/index.json
 delete mode 100644 pages/activity/huawei/result/index.wxml
 delete mode 100644 pages/activity/huawei/result/index.wxss
 delete mode 100644 pages/activity/huawei/upload/index.js
 delete mode 100644 pages/activity/huawei/upload/index.json
 delete mode 100644 pages/activity/huawei/upload/index.wxml
 delete mode 100644 pages/activity/huawei/upload/index.wxss
 delete mode 100644 pages/activity/huawei/uploadres/index.js
 delete mode 100644 pages/activity/huawei/uploadres/index.json
 delete mode 100644 pages/activity/huawei/uploadres/index.wxml
 delete mode 100644 pages/activity/huawei/uploadres/index.wxss

diff --git a/app.json b/app.json
index 0a9a26d..2cfabeb 100644
--- a/app.json
+++ b/app.json
@@ -161,12 +161,6 @@
     "pages/activity/redlist/index",
     "pages/activity/subway/index",
     "pages/activity/tenscenic/index",
-      "pages/activity/huawei/index",
-      "pages/activity/huawei/form/index",
-      "pages/activity/huawei/result/index",
-      "pages/activity/huawei/upload/index",
-      "pages/activity/huawei/uploadres/index",
-      "pages/activity/huawei/list/index",
     "pages/kj/index",
     "pages/kj/his/index",
     "pages/kj/info/index",
diff --git a/images/ai.png b/images/ai.png
index 3f74b7e4a51dc9e5ed22558090a3684e81f2681f..6f717493cb9fee3597644f1ff72709978ceb3100 100644
GIT binary patch
literal 8352
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

literal 17471
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
O0000<MNUMnLSTYKPdCW`

diff --git a/images/ai_seld.png b/images/ai_seld.png
index da28b49d482cc1066aee30b111083c61c481b036..aaefadcfed6c87fb28374e0fd6d731ddd4c7e05b 100644
GIT binary patch
literal 10232
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

literal 25847
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
SdSRUa0000<MNUMnLSTZlaDwOn

diff --git a/images/index.png b/images/index.png
index d8cb4f8d1bed46c85f70d3ce6a9624f0e7af64f5..08d6d28a72f4a4e22b2121b309601db8d8d78618 100644
GIT binary patch
literal 3498
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

literal 6130
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
Eg4C(8-v9sr

diff --git a/images/index_seld.png b/images/index_seld.png
index 0d194b06ab36128f60a5a943171fb307dc6afd47..a039bcbc7887249a3b27d6facc75f6034985ab0b 100644
GIT binary patch
literal 3406
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

literal 7247
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
E1HWItoB#j-

diff --git a/images/map.png b/images/map.png
index 417c9359696ac09eb47b9fdcbc135fd2569395a7..5c7769e1d3c416035d73e7ddf951973cde9bba47 100755
GIT binary patch
literal 5599
zcmeHr<yRCA&^0Mbx->|Kbhk81Dk)tnEel9@2`r0rBMt5%(km?sh!Rq}GzdybgLJR-
z`+GjWf57wQnR905%>8)h-ZSS+qLG0%Imr_e92^|-=Q<k3|8>OwBmn=vnx8HT!@<GF
zG14>D)b`Q)5Bb0NUu59n;Q<d1@BaS&?(U9|knrm2>iYVcl9Cb^7nhovnuLS|007+H
z-kzSGGBPqUGcywr5nWtd5D*aD+}!;9`IDBGmYtm)i^cNt@;W#;R904IXJ?a<k#Tc#
zi-?F&P*7M{Sis@%*4EbL<>kG-z1`hiK0ZDpBctTx<br~N+1c5UkdW2YRVWmytgI|2
zC%3S$ps%lQYHIr8#S2MENiQ$2rKP2`v@`($0R{#J1qB6dZSC>#@$KzxF)^{Dqa#jE
z&bGF;p`oF^zP^TrhT!1flamv7clWNYE(``UH#e7<n3$WJo0*w8H8m9;9<HXQHa|cA
z@#DvYgoL1=AP5A~-QC^U*;!Ij0tSP3c6QFs&u3<4tgNic%gfi+)@*HUg@lBnqN3it
zd$+&89}y8TJUl!wFaU$WJUu<PwziN+q`JDgw6yff%8I6@=ETIr#>PfXO^vs=_t@B&
zudnaH!2ueLmXVQhadGkY_eY^nwY9a)&CUG${5pioRR8ThI>6Y#1m}v7=L^uF=|t~(
zHDUgqD0M=NHOwCm_ipQ!;@|A$zB<V%4I|afb2;&now&+hgFZ_^jx8BvV+3HzJTBr#
z(tyMMngg_jlFRuK2jAEF?DYmyrX&V!RiqG|-OIvnWl?8;cl&t%c+f-G1w=-mvNOSO
z{ch`zHp$Bo0SaF2;SiFA|IA25@mxdAG-UpuIM_1VVxhZF!a;PDf*Y3E5I?lcL<w{z
z<urkt6$eI95&YK8;DEx-GzfgXJ@>+B=>y>{N#>E0vmLs;ksr<oq^Nb+yDz}cqTE74
zPS?MUD~+qN|4>)FXCvR%3Gbk{^8UN{Da={4BeMLA+fiL%4>F#@9_8W=Y3n8DPYtkf
zaD`mcK69-2k|r5u45XSVBU{qbd3}ls38tqZ*<52y&z9vXKrw1nQ}VEiW?lYtzq8`T
zk}vj^Na;phShNf!{_uxihgyfhWsceS9_t#a)bwfKzL?T?tsHdYBUh^`r_56he**S%
zOpz5vr<uLIdfNH8txG;|XQuW`U#IS=)h2}gz07@uFk`#Sth+KbM;m)3>U6)lFjr|b
z{r+n6gZ5~+wYxzHQZdsc0~2BY%}glOU1<z<IXs0@yW5&m*+CuO{Jbpv5Uli{?8Cq8
zZI@owez)5RvHhS@<x$+ycKy%&mtfHEXdKcY*(JBbT_N-evt|i+G`KK`UW{!z$*L>p
zRw|W4D9NA~dgQV}-v-{FZxxTl{zBF6IokLt<0~eCUD^_&8F^KSejlrXEhV0{rCodz
zSt9~)&~+Uu1ql+pHJ25$opp!+dd8+mtuk7M{X4}T#4)O;_g-q}MG42beyn(zae%_f
z`V@)7&b6KHMB8`LlR`Uqxs9VQc%_rAnV#S~Q^Z1K*hBp|=-kvL#o6>C;%0?Fk#YU?
z-m@g@Ni^cRuv@2T_tiZ(M||q#ITq6)WG_;9jX-mbwUn3n0`0xbFE-N)3b=SiMs7pe
z<w;NfSlR}ZK_n&k&jQ4VWG(FK_%J}{95dUxWwI^Dj`keBr#cP37r4>ygTo{VSh|7*
zaLdwb$<+dk1CFQiaHzj+^c*ol)BmvLMBC*~V5z_|bdCk(1bENYy)%I@%`S5GuY3i_
z@+1-??O9sA-YMBs7slR{rUBXRz;)_#jZNATJUj=Mxyv^+Nj^@7!gbr-IJ}ep+=uy`
z#7L9b-sTl>EDqfsI*8{d4#+@W{_`A^qUFp`U6`$xgt6Fpd*atm<gah@C6!GpJbGMq
z67O}-IU+Rv87;!Lw!Orr3L6-20%{g?sIoar5mtU1XYHk1K2YkyE&+pb?(X>cKA9z@
z)2XG_?6;8d@zq}lut{Da%4!=wZVoMR3A3bvX;qHJbGwkCE7F)9r~21{-cA{l`^!Dl
zK2B!XuGxwXyhjX#f%-^nM{S6*C2C!6$WMo^$H@RSL_ySbrP1fMjQ4fQuStT}1Aae(
zu2%f*7uUw{NBPlKO0$jB7EBkc_BY_t@^O9r!SYFyd>%4q9Qn5WW6|8lqt9%QE~@u(
z#CcnAtmfXSV?+8o{pne~oS@=OFPa%fqP)UGR+;O61>fW7(2xra$k$F5)Zl*m@-DCT
z@1A_VBzwofdqaV?$F~aG_7-fS@h13hb#7I5f4!DNyW@5<dbJN@e%@le#8U#+HrA6_
z<`hJfl|%9FqfV9{PW|M@+i>z2;4)u^Wi)5WIfd>n=6Sp%-<sQyZP}aq_T61J_4f8Q
zUEYxQcSHP=JwEs{omY6k&-*%ujR$1lmLpKWS<zem?a$fQY`u|j>!M>vj;G%9f%pBs
zD7MLoaj?hxhp8M<XoI82Auc2OvJ;EKjQfx8u_MI=?3Vut{n3|wWe$D3SL)BCyV}(`
zq1PXlpYBOg@evN7+**vlAX_8#$#jOVq``G-HM=!21n)7B`9USY<z?7DNo^Ipk2k)F
zPT&MFzY2#J2fyK^cbM$T_L&NKpsIcE`l{n`C6u?lYkHt$5Z+x0YhKTG6Rb6fb4w7h
zT%!OKwU>;Jr;p)n&jppPpPhMjYnFOO3?6tD;v#Oc2p5T84beM~2a;NdTF@8!#$?iI
zpguLGCm-(w+S5FZ`nH+k6@|xfcnI0%-1k_-qjYC%q_kF`eiK`g%QPlaD$21+$sMvw
zO=Um;vq?q)>hDd7GEG&EHvWA*3za^<l9i3x;1rrC0VJ++)Y-ugHoK-qrNPTA<tLAD
zrDBL%i2xWB0NV@ev}p&}JP^W!Wl;c3KJ0!zc1b6E-Z<IvjzKcD2Y$F$&x;~klCtk*
zLje@L`<kw6q1m_f-th6gw;kwsqdsARn4ofCRU)Ed^0Ti7Sn+bY3@U1DejF+{P7iz=
zm6&{d(aJla&?aTO`tSAyJ|J?i{%B+NluI?i8W9WE7y;LPzt`1VjJTwIoCAbO=y~_`
z<$nK$(^L&@zT1Dx=Rar#bfb7^N=`oh9jUsLMpo!iL*?~pIH|$`m_StwbVBMObbb@!
z^(rmii`|?H%4LRjWJ@p794_EjD%2ae`df_7#kBc8|DahYib!V5D9sY_{YE<WV|3Kg
z2h<`n>aQ<FY+CkA*3f@2=dkd=C>rDL@md&;E?j^was-Ey2h(*nmeF=&uHf93<(0`c
zbe_t2Uu2$Y0YOp@JW4`C3bPb$aoMriQz{RAEO{7rY%K8WU3c8L)Dk@f&YOYzy~RK~
zhoks|eL)YABp#i+I6CL>=X~*n$`YWKkN9e@W9%SJBoa#&Ac`i*t*J2ta<N_i^8KF`
z0)?ZQ*-~Az-$hNeA{TFz2rU8@-gfqu7}8xn=Gia`$emDi6ELu2Y=y*p<bIMgC}C2r
ztp#D?D5|rU!o+eP88}~gG?y~3^Na|EKWHm2hN{?_++Y{R+Q6;S@vCED_iRV)cdlBY
z>qux1z5AzlLCcJiau6T>a4!JBKkw$@;yGKz@U(7f#rm)F#^S0Ovh917>nzVRUbctX
z(}nfy(2>eLyOy(%u<2=U)iB*3)dMIigCbp5UEg;c8YXXkcD->-RrFEz^ZUTU=loik
zFF1$b-$N`b>mK#yfwsUZZMLlz9RnF^Ul6G{^=hovN6DDvj@eK`VlKOogMYZxom^d~
zl{h2FOj>fqQk)0PTPN0Hq(dYTc_v$bjodw$zBZ-^&6`z;#CV8vbvEO^qOoK^cwtI<
z$n<sIU!*%d(1G=vMP1_-`os1j)!3Q()j!OrM2<Ea)T1J+oFy^dULwx|I-%Ryk@Q};
zbNh`s!Ojd>8FbM%8#u>QPtGFOr!#Yh5tjrm+8$E9-i?e2UPLOVhl9m?-y;;gZPd(X
zx9aMko}q)H*bnPVe}4ZaX_Ah8>Ji6IMvlGX#@82&!nl<>^M1E4h<Wb;s-j(N`@20I
zv3GN_FwYhL7WujE{$e6?-aBf4efmy566c>szqBz3h~`w&<9<@k%f8K@|7cQ<3d~>5
zET!TvKY#TlVf@?+8F@WDJ&){i{U^(C6O7;aAd$l^<-qP22rSu!3k_RM7;Wb}tU?2*
z|0qk({2}1#EIwjuJlSDgNjjdo1R#j1v%XKPwl9nKQ701e9N)&1t!l5v#byK#7LFoF
z4CTPyk3MwK8<R9VR{7Vc7t&j1zVf+oTFDh)$fu<F&XDe1ngsrpdgP!10=M>3rkgd_
zyE4)g2KX@_+HL3cJ@6HzH+W99L$D1EV&tL%c`})y`UBroHjoN*>DxpL`jf5~Vbarp
z4o8m#zTK*)*TB{=i~VmjGK`HiHTj&}p@fWMn<bkdWZ?zAx_MT%c{U9#LSo676yOl$
z)Fu|~Dgyn5)UY1<z9(%BA`1(ZAA+1woRg^intOO8vw@h+)7DK;)nGu!DmH9fn)Re^
zdXj(Lui8=i@#JoYnAo8?+Hj;J&~8QgSaK9j-O-~ORrNk+lA5#X-9Si#Mfqw=bmphs
zNNQWvP@$ic!iaTF1=N?C&S`#zm7krV_M|Zp(ehd?Fa}pcYI3<@`jJvBxITXLhbKB?
zL2Muzh^C%n=xg<vzRBEs)?CB(*>ZE_Yy2`=f(Mr7t_61*8LDlUaQrdC@_0qYVCBWN
z7)xCvyM|HOY@brr?uW}Xpjh}(CYAl*lPL$-3A=_#Wsh*{Xdt$eR9oZMTc&_@*`b2E
zNwpLrj&o-`=35dk>GUDNQa2bc2OWJ8M9Bcw@>Fh1WE=laDHH4QlnT+RR%#DP{i;H>
zlZH+knKK=dm!edZS>%>Ba;||~5A=qtK+Fr~E^vyEtjNM(-*GJd1CtliteH8f1J?}!
zNa6cHr=fr^yDu=rs7Y>Dnq5Uo7?a-zvcLW{^65EZSXZ5q=h@8OpgNJAOxl@XQ?g9o
zyVh{~g;*G321R`>(5oEp>o@*V*)!q4(;FfAi!$4YAquokTVwAOB;ph$d_)p9y_dUd
z=-HphZYo{8n;y?}d{fV|S-qxUxbm!u)Y_OD1TjdKIEh*RQ|qD7P6NJZq%{{e=VIMo
zDFyaQSNG7dzEGVk!p^a7zOYg;?WH<5lYTi<!rtq)n=liIS*ZxVXJgsNw3uxl_1@IW
z0-cQaQ#N_hfS%vS@DCHjFIDaulU!KtRoL>=tUaunu1))ixnV$){G`{4?V(&})2F;G
z<0QH4=pXM?3oJpf@<>0jH<O<RMK3AX4?PsS7cJtlUa_VamD+;{c%+}=D%0fM9C>%;
zt?;b2syC#r`06x>yY&)N?%0nra7I*AY&ck0Ib8iMy0AKC{=pb$Jdqs(w2pao_~=Gc
z>!fF33>$TiA>$sv9idjrjt0g|5`&(IVcEWg`r4EFBZVW==$ns=$zVXo{36l@daa&I
zyni}0%kI{N(yvc}AYtAn7pnWSj#9cQ1z#Vc4Q>t%%V{AqB8&2;S-nasmABb(!1a9j
zpRw(5L(`V>W+@dOQVzMz%~S%{o|k+2f9noD4yywWx~#pNzoO-eoxWc?b81l2g))Ur
z%gx(lCjxintF^2A4=GD+VTyBdKVXg^aYVk69v=@4brNy^|33zSOb*0(xyeFj^(O9Q
zk^~%jNC9Xk9lqy{Z3&D@9FJm;tsQVa7=Q%IVLW51PGb2lsiDDg<zb&jB$<RcI5OWj
zDUUN8Uaw21>SySh(%B5jS1Y6>0lRQI41)?m0U^-e5v#<LG&NzI<nlsA(bFzUdU5@s
zsL|)Sfu}``oa-r+ITM+{YLQP`X-VKFy;8Zwt4#zkGO+j!*&T9&+*T^!*;u&RHl1&6
zT}Ez&E|+u2B3E}FFt&T7fj3-`p&*}d;OcrPQhtrDo{fhck;3--b>pX(WW$jOMP@Hw
z^GuzYR)iTMevdQYBK*aaq|ml%Q9*e8Y3qhO9a`1t`M@f3G(Vs!mzHAhBfqzvghB5W
zRpWl8DT2#hpuz;=Hu32Pjg%oMrCCp>h7BxAn8jiMEz!rLrLU?I=$dC$G6s3nnB+L1
zehN_hM7tFVSt;fz&dpF29QLLq@PY*LEZ%>yVcwu|9F3i@=5hQhkNIu>I_BgX^BG|+
z0;L>Q!#k>+HGcJk0@Ta<v#Dz!PKs1Maf@-wb<f_zFgvyIbyd2Q`1G35RYYj*g%)lj
zzuK!rg3W&WdVnt?$6&XNpU%W=OJDY7z-mY-1ElrsGP<A6zw4Is%3Fq&-S&m5QB_Z(
zYU^h?#oCYvDg0C=I8%`uspSYRQa#@J?~$5yod0BZbFFPMf%9_;9jNnDdKQ`%gZ@7P
zrI7-HlrJBhCYeu7n&eGG;}>G(`P5lho)~#jrGZ;Rn2nJ0BS0IHg`$Zu0)YUPAV?Cl
zNV}N1b3Vbk5XIfEDh%P_Bh1S3Ddgk4VT;lH#D%X{DfgR58*TKiD=_bQ)sqGzLSx|t
z+*|T*A51aWHrJ|Y^}Ko;2z{yjNGNS9m0thfM^age8P_D!WzKGw5?o(*Vb6E6Hfk}t
zt;w9)etW>4$G@rshsi4ce#8t4uS(ncoDQ%~<HP$frZJx#9H`bdEmNsIR%*PJ^Ga(x
zbr~mHbs#R#v><nD%b8x<&&8jekKdn|uL@?n{FRKYCLroLw05NOv+*n=15F_6kXn~|
zY2-dOxvb-yFYGie9w6!_OiGmnATY3e`v_BJt?4r^ukR|=hGPuR_~O&w6fktru1=>e
zf!mbK(7*Y^LHE&!x-5n90gb$_CD6;B*>wj}TNx^B$KpxgrJjJ3#4>t;tzKsJW0E2=
zQwYLJS!q{<X7<fMwWCz{tkFJQwMB?j>cC==L@j{$_fJ&XNb8e)*m@M{aFxHQL=x`*
Pd?=r58fbh5*+c&yQ_cV3

literal 11233
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%0D@A
zwuRjy{B9r1h+g~{S3+NpkNZ6ijMy}K2Z*fX-Vfo}4Z*V`Vm(j3m?19q6lb6)3=x+E
zX}mxvx%8NvB_{Il93!}fUbm}D4!wX!C9U3C^L@Phi_|(%=ar3RN$XB3#R0^=4gGm>
zVw1`{Wl?n>4n`wWb<}WDh?Eo&DmmjxRPX`rDcOuHx9tEv0d-nf=7Owr3{Wl;QAMQo
zb^%oKYwg#9JdkbG>v_cqF}{3Bs5zwGvG+&qFWRgGxD2ltkOo1L^l3;X8y9P8NT@yL
zr3ZW4#7g_)&=iO)QDoI)Hd!+x`LAu&J<(r}Q)Xzy*{Ij$5oFmZ;C<PMm$f`BunAXw
z&Cl2Fc+LZB9~01tte~#&loVN&yZppWDLi>Wt}iDtDa6CPIV(RJ%d>?bmIf7ELP?rW
zg#13)LGbfa|GfBufXFoRo4=P^iTa}){y1fSJhV!et!0GsCMHxsyA!+skw*wyfR-Co
zqFExuz*!vEgBrwo3E4qpg{XUgm`IhL@lU3y`JziR32+5Kv>NnLNV46k*Fo8;(|i3P
zVJLIbN<q{~vSTu($I9=Y4>N-S8Gw<UK05bGe&PZMEr39?L7R9_wBX*AaA%6jU})#V
zO$R7#f?9be<&&ZiV>dp_k86)uK81<0p_^0m8iS^O@xWKcw>Lb!#2>vUajJNr^u!dw
z9HtQG7W>LMX!vVbhV9n=j@rJ%-|ns7);~F1E^Hr0c)#EU$!lk1i-3sXUFHm4P#8Q0
zM_KX-xge>#1iZ6|mfnQ_2@MAul(F-Rplu+%S|fbPsl*A(lf4#mG52stBsoL%j0w2g
zs)8G{#ycfklxiX3zA%<3I^(WH=|y=U?Fv!n0Jjqr7^Mx%P_tdgd>&QvMq(+aOPzN}
zP@G|^XMIc=#~0&2t`awdUh(Ktp!4i>exE*f>f^nYl~Q83%0cvtaa6#P&F@G`wE|zA
z%MwJ7$H7%W-1d+V^r=m5;lcM9!?of5nwW=>!5JBHYIoOz3qVSO%K6DyuRzfYE?_H_
z(8}j4@f2LBTR8k>;QQ?H3}ur~-G!63;P6Vt+ShW(#6jGWIm#-oI?+e>x)j`Mk~rQx
zeajVtWo2v&>3(rb+P<!m?!m1L&&<e%$9>HcdHusAwm+VXgQMA1r^9&A8o?@>MU~c5
zRG0hynO?UITzI*4LW$8v_ue%xJz*N6dLRa=G1Lkb!=%_3g&PJ5mePT=DU+@0sEp=B
zM}MaRh<_`K%*g-sve^`+7@KNlC9&M_JmJeCNNX14<CL^@1gzFiZIQL~8uZvF+gEvS
zucS>-86PVgx-&B#uaRsE@SngUPEXMnUW*xS1J)Hx8ZQ#N-Bn131hw(k-aK%#WlUsN
znhDn|BOEK^R|F(Th^F{Uc9jOSqAADO9GhkfJbNhl`+K4VhnP>Kloi~51wifH0y!r_
zflR=b{3hK1cnVJ+uDT=?cCle0UR)=-@LnfTA9O#g$Dp|<tftc<4dE^TdE*x+=-cgp
z`oPvZ*uS|^1r_WnSfP-C*eOKVCK^Nlxwq3rjd73I?xnFC8Vr`}LsE~fEAEFPi`h4<
z86FZxQ~QI!c%pQ4o(ERDqy8*b{nm9)m6)E}PYZ9(Q&4qqCqx6>CH)y&>*^3$<e<+6
zw!H1l(l8{P#dw&vaD$2*KJrel=k?a2oo*(Imygl2kjIHA`#H~vJQUyOpffa70m8@(
z;$8r)6cQyRu%edioKc{L9!_^jU73eZ!ndMDhMeG|ctYP*0uR_C?L$R>cCGOi0mW=f
zrJ=lg5?QS*mAXlgI2y~@WJ*;A3W1j*rB4v{VFl}0R#u!wOFp9dw)~=o$VBAu_iN)}
zCl(pCx>hBHh1*$Ro{QH5mp&qXCDB(Mpk>Pk-w%YN{LIbkq2h^UeGLghg0%Q|#5g#2
mcSGSWz1WMoME{UDJ`NeO^nsGbx(v1iN9BbEv{K$Y?Ee8{%rh<k

diff --git a/images/map_seld.png b/images/map_seld.png
index 25e6d9b6a7b49efe557c7a54bd3fc6981d7fb119..93c018b266a9483756108731302b1abf34f0cb89 100644
GIT binary patch
literal 5737
zcmdsbRaX>@_ch%$4BbPgNOz5NH-dC`_s|STx4_VdgmibeA_xf5<<KS4J^$zT3Eunn
z)Lv_^b@tj9=jz03YbxR6P~jjUA>pei%j^D!rT=Rz)c<B~DlZfX3FT2+U0*@TQ~f{Y
z|I0wcG9f-PA>#fk=8G_p3L8$786{#r0SyHS85s!!75P4j@iCh5HHIlbn&_t+4IL3$
zj3TkOB;k%fJqr+h#f$DGhKZLF0};=hqyi+uLcu{t#zI4WhB5-NQONO7@i34v(2&_l
z(a}(mAEFs=B0zCU#H6^W?&5??UbNig80Vo3|H46f+_($?G;L1YqhJPj06i-Sx}OwL
zi9VSIJB}G2-fbk~q!YCqBbFdFCL=LgnE@G0o79L04<bu6WJgtFLQaW~dJx2L84fxN
zVW1&E>$jm2rN!i<!VHulnsKEOqQOKQCm{|KH~r|oJJZa&(_Tk_)_myhq8K}^C@YM}
z6IFm4zI4AmX<N)GjCt`S=&`o^=+e|lBHsbBG)bQRd^~|Lq^JTp$uKfCNYvPHEco%I
z8L+Gb@D*9Gy(9>qpo|5&qzfLjOhEJ;Es`QVQWsGIL;|xs6ZWb%-CiL5vKO7R2tltk
zRTvoHC`?fIf&A-x@<ua?2`6evVFq&pfxE3(#92zKImMJSO}8~AAwCud3mGv0hk_J8
zTAsMWl5*UUT8Ra_&4SWakf1QdAU;IZ+d-Ov7O*}M@P-0o)PXuHMmySHX};gv$wJIf
z^G$Q9B@HDZ{6{b@4#w+#!bqdjzt!lY`Op9tS!M>{%BWv=mEG?l->DAw5YKmf+*EUY
zUYd%W%5rRoL}r0E)RoyLh$NP-N?UFC=>N`M*;iLn4+#tT<n>|yLcRI<76k)9bxyii
z?fEUXfq<nzerx#;ke!StK-AVKkq@Me6Z&CVC?n@u#Zr<^7FJy5Y&P1zI@S|4RMFNs
zw|3#miiAY`TSZ<@KXCP|Aiz{_rF~)|9%}wYq<oE?QK2b0G}b3$TO&eS-Ug2c8xJkr
z97P$wuZk$0fKfrg>GsVrZJ`(16iETZVSlF3-@zTWw)qsYxgt@ORv^ocEd6)n)dpk7
z^WOgD)*N!yHe>v^x8*I_IHIg+a@euFCcb6fnZ*IP^huE{aUYPs%7{O0kj;AA{pccc
z%s$Xi+u~K%U*8wM$ElI5;CvM|J3Fsnp`^9uOPO9$US3sIRj$DBMqu&xuepFG!2*aR
zt_ws0ezt0Ip7Bl%($iGf*EUu#BPDRPmlB+CKL7D^5!~CSMJzw_n9C2p6}vid0%TgN
zIx9SD_ElO0qt(|~Vm0iP(S5v&>!)OqnOM#ck9BH0+=TpUMWn1drmZkK6DyKzl$eGi
z^tXXw{wG)f8?Qi3d+mww5dfJhj<tL6+t5t#H`g_<#frQ5h8sJ=%HNwcN!4nT9$ZN&
zDQ{e-w5k%Td&$$qe}vTud38*8uNW*Zx*x<LM|XNj8>imks^q}bSz+po>65mnHB(=r
zUQ$~^{&dPQ*@yg`@w?3mTbf;+CRt4#Co8z>S{awUz$`nf_$h`=?cBG#Fui)QVT@w>
z#kNr$-6ZzYrZkE6psbFmEQuWn8eUsv%XS;*6kZnDG{NWbOEWY_InD9%AL1C9P-S{%
z*0MKOy6BiD>5VR3<F!b6r~W7r3uzg*o0cRn$C9DGGZv73#9`~2{A=9bY6)thZ4#0%
z1gwFj{6wG4v7^7Dh*Dx>%p6~mnQV+wsGhC_9DUKokOq`p?3PPwv9~tG7rcDVOXmZq
z76g_RXe!y#`UXEF%d-p4Et~cOVCkRQv1TiCQW={Gv$jr{zzgmC8I|bxXB|jN8p#?|
zvdWXT7}%7`3FvW}A5QTXcRN2(a7AESWSPXPhv^sbpbXSna!*W;4Fg<RS_e-{QGDkk
zsyx}LU3n8VjJVVD+4NU2SV0G>{PcxU_&Q;iLEGI1{^C<pT=ibeD6nS}AjPCU22<%G
z;kqRZP9^r>oKtQ|hC}u1aB=}ds!j*V{*Nw1DCpkJZ;G^f5aqymH5V@G;7cPi<60wz
z>0a7BY)TilHoGsyT~gW<_-|fA`7gm8&R@ENgMX4_?eF#5dnVzz&d41-gATAA-6Uv+
z&TCun)}u?vDHlf$)Ik~-nqN#aQ+4d(j}i$kQsmP%m9%<+@2>K1;+q@0UBZJwZ<xPV
zg;Sxpx9AZ}4EPDF$;pq<j+#v*9pA54dObx|S)!dKLh`6BlEZf_G2^^j%>*3^W>@h$
z^JZNwdhNi((wr^{c0nlxGE&A(8g{ABz$eBQPEu}%KPD%XZ2D0W-cAq{V_ga6S25mn
z;eB>3wOy%HCFW187AHTDdai`aDcO7@b(UbJy)P-=4PLwJDsWFxrmE9%2uT6#eOf+B
z+1q?rit~@t5`oiUFCoY4X^P)*N7Ao<GI^!x9`Z<i1gOTmM9pSdR$*VK8+-gm3qV5r
zY%~tu2AgEEU$p+p+&{E5NIyLcy=d(Wpm%tI8FT|RnaN_liki%vI=36l4`GRszHAah
zlZFigv35cpr>A)7i=;yzcXD_K9<oqV`Rihcar1UJ2vfp1#Z}t{dP+N8C$Lt$0=mci
zm<&V&hkJ+F!tZw~e@&#&Nd=!?YsozC0CQ6vU8~3t@{V_fqU|*8r1)HzuBDCc2dbSe
z{45Ui_QQ?5{jcz&vWYOv@usp$#QhDqRW9IePkWMBQ{qlo*o9o;{j@8VeZ>GN(f++E
z(Pv~YS-6bM{Y_~cA;0wV%}{aVj2ANTl0b+L(vD%MfD_+B7D_RTOJobSlLr~wXs;5G
z=vs?6{5gzd=T4^o8F=rX2@L>KPM?7WH)=l-JJmGg>oWedjwVy2fU)ej&OZOpwH$tu
zd43HjoA?{vNthJK@Ib}6<KE232d={>6ID@B%iQahI6Ym`D4Me-pM=V@DkTClj!ncP
zum@hx4k?Dq214<ZCX+=${rZP<-y&w6mMFkC3b9mqE~hv6+2S1Rhdjk0hc>0C^RQAO
zuou{S;j47gE^jzOA?YG#AbM{-=NH$1tHXKPY1e`j?@EuHTfh#9?O(~T;PEM$TWv!4
zBuG1E{b*J%b<&5<%vhx(V!Es<lLNR|q<DfB4opVITwTkQ0}j=XtXFQ^l0L%BX35(q
z)M2kie8U4_ujHpsPnrrURnMi9vEpQZtG=#L<-zg~sXUmfs;jDcIXKxlwWRACm#eV$
zt@f?3ha+C!S&lsIdsuVrd2B`0HI(gjqFKqY=6+0|p5AO~Gj+3j?jJGy{A)R3LLW=0
zq+{sAl-r%GAnA3g#{m7i`<D&`l7z;1p>TYg=`!k4^X27YHy0iaR@ofNyTtdIY#~Nw
z8^3=~x=~(yY@1+tw(9&#O0f`fyLY7XdT||4JVbPm;L!<{QFlasC93)AB*D@9DVu84
z9$VGAxhs=R|5vNI`(6cp1>boQ@fLcDN5PYYREPvHRXQZ77?mK_>|X{%^@YQd4V_IP
zM(1}K&P-oir@#d#S13Q!Ikv{I-onl1pyE^(8elWPo~?|V`B2D00Xl<+hdlwwL}(;1
zUax+2Af72gTE1lRcJUJadvBxWQrn-AMc(m-Y$*tlk9baUg*p#Ln&jrYnv~YoRYf>~
zR9`TI7nDbZ9q-F<-wuXdHXy?8n3DR#p3esm!6-6wF-pWrMuPWc<033Vc@7L*{QuN-
zy-h+o1Kvh!em?z|maILZ>+~zZY>l=x$0<2`_)1%?Lq0_L;K0Dr!Sb$=4H0y)h<Lr7
z@)!ua*_P279>lDk%)BUmf9=O7b)ms?p`E1l6aM|>0W1!KvT)ggS{DTa3|3uZ9_~5_
zuFq_(9zxhDmjtx#2@_{nwa#VkpAUZ0uZJ`8&o&~kzeR&qBt8>vV`9htY6&_E_>QZh
z&g!&V4+K=NIM@1Y^xEXm&8b)|aF*$axf){O7NzO_n>XKJ3v6n%2IImb02o1HO})U4
zKqq;+PGDOZ-=7DA(vE-&M=mY-PTLmvxf{JJOM*d?Skr;7PjCnUvfE7Ym+gX^-s<O%
zV%E3&cu!BkJ9`SZ4$(h}gK9(=R;ksBle#w0plVroSk~3C*LJ4yU7^(ujS0HzaSz6K
zRtThCpp*%{*LbS<qsYsQ`~rMWK{*BzA%p$H@t(fIHro{i?4pCBcTFydx>7s&j)UAp
ztEj~Ch#P~76qyk^nd`m2KodRhS;mw>dq}B>KN2R?3|B-&7vUO~48u9iD0Q&dv14Xs
z@ckY1!7G(J8BW{#!Ibh7(MEEVU97HV_HggC&-yNP0?93b|K*Inr%e~BLttTaUksM}
z>q)Z*jxx{9qPYT_R@E0gtZ1-Ao~~}F$z?1`uiV&uGRc$PAhE5&!p?p_QC9pe;iB(j
z@#WuI%I`|KRat0oCDX<fehdyhR&LdxJfqF=yUTO?*@=Cv%tyxy*<&7_Z{G(m^UW8{
zEp?UE=J=1DBeB2I`E`n<$2Wd$t4>QzQ~tAJ-hAPXb3v@o0j;_w;WI2@%lyKYFt-ii
z%T+76VcBuWvtyLJGL5StI_}%TJV)o-)2lW}D!?nI8_JeEQ%_Elv;(I~kvs=e6sF^y
zpNBDgh6x(THaxoKCMqZ3C^-}nf%;VOW3&i%H5X%dUFs+sxtHNF#mU92pkN*!iuVky
zeK2W-@kr6_+jrL9<qHxODsc>Kf1)h$vX6vVz`-8~Yo+|JManKg%sQ)9ja1%cT@ai&
z=J6s|VPB#C&A1ROod$0@JZZHII82ZIWbcV2vV6RcbUF(N0u$DYq4^T1Q09Se+Ao*_
z_y6=xembtN(1=T`_LlX_+$Z-6ollH0_9J7?l)AH{%{DP9lm?k-hoGO%6dg&SXSOnA
z6fa^55`?C+hQ_KF6M@?HJclZ_VP_Iuh3Iwt)R+gJ3hzLiM#C4a)Nft-c#k-JbbC}5
z&Xl(?pWg_j>J=6tgQ4c39n3@+59DybN}V!}qZra%&nYCNIRqQv8_q*c#|%IJUN6ws
zE$3@3m0|F96Nn}7j^ccc0_7*zEY((lc@9(0s;HFxYsk6<3;^cF&j_Kbb@*}hdrB00
z<Roa;2s4<3z6c%6+<C@OYpr)@mXvc;3b>X>D}Y+Dw8g+bgvMe4T6buCX(ErL!1`ob
zxp-_K4bPL{yHg^5%$Wq$WI2xLtoX8(ks!WVxtIz~iuW@lpsr_d`r#}URVKCM+=vLe
z(}fjhfJrbPI*bRr)fdKuiTF%C=6iV$&@dr?7F|HCyi8wV8`X4!K>EgeHcxb5j*3tr
z0>jMxh}n&o*-q(+6V3*9^(=^b^_`*vEDb|XMQ#LeGv6^#-M5}TK_@v?KO+vRA$+89
z{xu~2Jdhl0By|QU1YBLO$ecje7f?OZb=6E#;pPXl+S&K4b)w`@Oz&rSNz5`!onIi>
z=mBrU0a|6{qd>uzX39wXsCwe{PbQVNM^i4|DKZ_@D#lpr*8f`%nH;6<ON-{|=VNwr
z?p6kuPBh5_Nj4}ZFl~RvH&6L+byMf3Oj+C#*BsNIbGf6JjxHZXiike3xeR0h>sDe!
zM?H1968V+92TJ3w52()vGqK3FP@Sb>5b>k7Ch3dD0}wKUW0Gc&p#pgPo3935=&2W=
z9rhFtF&~o3gJLjOLK8Us>4dOt8@gCVN!-poqCnEg5Uazt*|Bx?fA6;Ajte=+ISvbe
zQ4_U)D<I&dv!%dH`t`GX0q$y5>}JduJX<=V&q*#qe2fF^lbZc`cc0(2rh5jB%`MmM
zBZF9dtu{~M12)5VYf9d!bPa7ETtyObZ(7g&88Z*ZgCZ)k>1xRrWA`yZ3EJ+L)=H$e
z%N)i_eeyDe^w1Kh#2|H;*~)EFa#ub=JUdqedVOJ!z?tL9Es!^VSnG!Of=08iU+LZ(
z*cN(BB!CZ}nMP;k9)wobnbva?vCDt~SMfwvG@4W2zfn<qFfKBJF4sh3_aR&JQq6FI
z2bGC=lV$|Ky*1=m|F3j_HL@VKY>CCAq3kV|>jBfY%<?++VuX?<8J!)XprSu9No#Kv
z4Z(pxkFbrg>m#7GTfg_t$eCOihx7|u18(#Y-2XKrnP@$Ft03R6-9!9mYbGpbF6v|q
z2KZ{4dsC^%n*F6<gWBs~kR4KS2rQoW;U3D~$(0GP@Dph1J5^Bs1-K=_=EJ9;Z$~$!
z?*z^*lBm-Dl9Sg?FI-sFru366*44<#GUWvI3O;*=42Esxf2*7+y1FVjeA)ZwwrrN0
z4Feh-lXG&4Cx^M<LOgVcKI9F%I8`Os&)Ri>Xd(2y=U#@!{wfwa%!x0z?P&0uW*`b+
zGK*c^#N0nv2}>i`#^Cf!D|G?)RSJS}49(sBv2<jO4L%j3R$o4bUJmV=6xVmMx>qeL
z87}WPYYKxIcm{ZOg6-&7>nzptjo5~p%U9Jj;uEa@-p+wl;cr^ksjFnd>eA@({Ae_=
zF#7T`wrC7qC2MM%<hMD-E0o{2-$ZZt*DTn!Sp|Hs^EOs@s?BZ1LF>aetkEz$5$AMq
zNmlrRVU_WO4_Qx{gk)_c+l;uYdc2#8>C|PYT@Ep>?e^=*U-Wii!sVDI-XzN4bAlaO
zF`S_@)CG3zBtLdfE#<p#&%bRpT&=C~sI7H4W@Z&zYq$=9m+QR*buAG>6g-=hq9lFl
z$%HG<j{a>yZq-$am!F2ttEXr-w>pQv+qczp#a!3(GePl5<l|KGv)THc4I)}gY+BmJ
zddeiWYDZn2B5wRyoxfJcd3i_jB=Sa9J1r;n1Qq6<F*;fM>oMoK`z@c@+j-Q9=@iE=
z33GGPM9kxiSC@d%=1uCGXB%mK*xD3g?cayH9%wv@6QIR3wPcJC07hBKA}2;171rO&
zF>@)azaJyaqV+Rs;F~8IsPi30&2c~blxFxZxpm%x%e;fw<xihY-Ox-qaa|SYQzx~y
z(4wC3?<GH-X5sm?rp5TUG}5WzO#ha)7;dwVc+-U<Lz`ssQJD!O9bZ0ID+roZcTl%%
zsJ5uISpfjLBZ}e6W20`ltz1p9`|bQ~3c7lj8TkzXD@|V1I>-Ycp`jtmF;<q-A~ig=
z6&5r3xDIEwt!x#bOLMc+$Fdp7DpaRJf4zHbP{Sgi<tooW&zWe~wM0~PwNBfl<;WMg
zRfxaoKP|R28kY?M@eZ5zmI6heKR48h=8c9RSAn9W)_I7*a-LJYKtNlE&sv++NBqMu
z4|~zV+q)XqYm#;B|C~j%3M^G(pVYveo5RZYub-l;DUUq1qEve9zi|u27Y%=06yz^%
fZ^gBtOF^L44q@)f$!Kx@?`@`{pebJuwv75euY*qu

literal 13725
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
D`bz3E

diff --git a/images/place1.png b/images/place1.png
index 0c657817e18f6366005afa6545ad49e5b7782285..a8f4016e1c43af0058f83704b14c02556bf45529 100755
GIT binary patch
literal 7184
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

literal 28063
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
R*6^lu0(^OUe)5j^_8&V3YeN74

diff --git a/images/place2.png b/images/place2.png
index 0bf09ad55874403df7d63c4f42d83427005fdeb4..c0d693fcc05bee2ab37bb6e80ed23373aaea84be 100755
GIT binary patch
literal 5993
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

literal 18443
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
Jh?i!e{|h?1E?xit

diff --git a/images/user.png b/images/user.png
index a84c2ac93c3eb5cc92879e39bff9197429c0d333..be1540415e7a7d117e23edf37f1fcf85bdda07d9 100755
GIT binary patch
literal 4322
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
Y#bB)fxdAToe^*p(4Sn@`Roke40l|Ui^#A|>

literal 7445
zcmai3XEa<<*B*UF9Y*wEB8X0O5yKF@x9FXWAP5m<^a&!-gV9U$=%OTHj3I>R6C#lq
zy(L1_(LZ_L@5lG=yKCKh_d0i-z4o*BbIv~d?&rpaT6EML)Bpg0PDfkA^y*#m?*>v{
zJsV62Z2$lmprfH?9!&E4Csn?(o(a`X$ZEdi+RIys>=Y2{($WN8rklb%%o_XA#WA;v
z6L=|OB0k+J1y(t!GD;O2k?>J_NJXQioU-;$|C~SA$ZNm4JVS#{RqVgs{Rydg^RTAo
zO;{+Q*ef!Ll+UafwD5@*k+S_>0A)a}S*Z%aO<0eE5%3u|r$A~MC|3amU34!iu77D$
zXdKlT%5q&L#sJ7rG%$742y#9URYH>Ifw@&u-fTNVaGTbFM4%irUnND55G#Pnc(Aa4
zXB_4Cgd5{*7>>u<lFte6Oh>oVb^hcxj>vn}s<<{{8u1$I9-WnCd}RmIBC~;S{;mZn
z513emZ6z&YAr52LC{*NktfP$>?C$JLL^Du#>dlXkiHVh58H(>K*#eHnSDr|d$}{{B
z+L4X^K=Fr(*o@7le8kh?Ge4a@FE{ARIvzBz?8w-m>~|FP>rvX-`)DunIa$@ljMl*4
zaP4*U=+l?CIv+%3@ge1PawHi$eRYp9(P5MrWxqFA12TDPq+yhky~ObYsz+=@TvPz?
z21%z;vb|C2c4~9b7;)wmL4N+5Zw{CEV6w#Z58&N3Ah*vUw(+tg+LsorT5;HGDsa;`
zJ>U1K$tU;gNk@l5c4Delo_g@(pNbKFQH>EUk2^Xd69+O!ui?mUQjHuzH@+s3$#CwS
z+!NZ{Aco#I$gx}|Q+mqDL0xbhx9ztv$AdmwB15Hn+}s~-zkMGYfJbtH{F6&6PjrBD
zd<EwnSXOe$f-y}R2k8MBhh}NK7k;+}dr5vFy)%UErn;yDJo%o#cUk?^pjjHSr3DEC
zp}jDC_oJdPPwQPO777;^Dq^?i`KK9GaYs{%7pvF;vgDjW<_{Lbyger$^3UR<S;-@W
zc51Ok4x}rN`qr~NH!o+gkyMsCMBZgra|4mvc)#;9JLHay$r^qv*1#o*5<p2!NkK_}
zCb7zbXFVu7JUKO9J|czj1V5e+BPFm0Tg|6M4^UtvcKWaxq%g3tW#xz>gHeGOciLGz
zDU6l)6R=QbV%BLIBk`k?7Y@@TXf7mw<ZTG-ftriD;Gp|@sa88^59duprfr3*%hT_s
z`GWAHZpD+Y*w3WoE3D}-v7L25og0dlJAG+@9Jq?lxD1^CMnZZhJy^szemJvCJ`U(p
zT~kwxFrTlEUL$v4Bj#a6NDJxWnT_}(_`0Wn*Z+|JEePlbUz!`-xn2ssU3YfJUlGdG
zggIi!qm_JH9xN=?5}CyTf7-o#)_f{hIfcN%438a28|cAV77Mb91X<Lnk*P<G=Vz)i
z<X3DLDU8c6G6ubvna<7;QH%M(R|i+$&NwTcECH1mCptA^|Bm3QjX<6ERl}P@ZfIYk
zUyHo2=VKcd%s3wYa{h2Wh4k$rOmOWhV-@pP-NJk0o_CLK29A9$K$yU_)m2mmP_M>v
z7OQXe@kNco%BDa!vtyzPmHca{;%}g2^3%%3^<cZQ;U4?eyK$1|TEYm7qu~V#(4qsR
zlVJg=8Gh3_sr+$}2!Oin9;g2Rbg=v5OFat(&+&pPH+YWJ@uh|Yv;0R&%utyaW-AZf
zXLfU9q9tnS1-fuySRM!FdWM(VX}01YD(bhE^ha6BDUDsqM$5L;XwEK9Pfo7#6Z1vW
z@!uW~h>0?#5r#Hk1~njvx3XZz9wr*r4d}m_S9z(s@sw1v35L!Wk~witzmyno6_mQy
z(W#ICR#kY+P*~*pN3}U*Qa++&172Z`ovjLuz<r@MV}-9KP|Bp}0V#s@xFx$OuaS>p
zd(GKNmh&>#rpzzmd0op!^!M&3O&>(}>*GZi^3s|kXqN2mwq{(@C;(k#=u>jC0FXM3
z126CS%Y1*<dwE@vN*zS7=9|bjHCW_6vuIop_v1up#jKa>9*8a!INizcKGaeUoR(~j
zRJtvjABG(H%OPfyhEvXrV05H`97pPN#yi^8Q{rcrA{|CG!aQk<(H>HtvR7}A=6YxC
z=Uj#raQ)=nk%|`i$Y^%|Np30l@hCya{9dpCT5fnjd4eTBG+AX8^Z}SMY=pLohUq~#
z?&3Ge&3H~96~}{<dlElIJtoLKM<&7%+%x-mQ^VWb!U110Mj%OAJHvJf#|AxTqiK%D
z#Z#W$tmPxj#n~?iRwoJMe`E2F+}p1a*3)}E%c?;o(Fx^-nmzhP?2YBuiBa85lb71_
z?W8U-gY-A73tZoCYvDO#Mf^2Mb9=3KZzpEtZk~SnvXhhZi}{zK83axUwmKRBwaYb>
ziAO^w=ZB?jU1Ho%p|83SCms`hz7^`~^1Z6}KK1LTRqMv&;5QA;7~#G$(%xGI^5KX_
z`Y*a}mPP1dNu#Ut<^x@wOOI)-&>l2GeJb&S%`7enb}TZSZTFulUxT{Y0E<0EFh-tn
zj8o>>6H5&%Q8~In<AeEa7@ICWN?plQ`lYKigHT_67pjKxOF0WYj;LoM+aHNXTd~JD
z71nxq#EDT#-ulL%xuo(;(=8DMJ?hmhVB%}hhFehz^#US79ImYh0ij|D%oipkO3dFQ
zh)zRP1^gau%H?N9BB^w7{$u$aiO9RImqMc%W4hsVpB@j3c!|EEtz(2K{Jm6xQpBd0
zydK%N*?Zvm#V=Vln+v%+dHe&5IF_L7TH(x{BzK9&Da4v>D&)t2ZRkdrPfzN~a#sx5
zu<|E+GLj~P$>JcrbB$1+<Q(4_e2>%U=Hmqpk>U7=K=Eq6DN&T)o}9EGMn!!*{UQ07
z229#+n#VRr&qZmw9q+%I6Qu8-g@BPFQeAxWt=)YtCEv^Cha%Aq1Z%bhYpIyx@0}YS
z;9BEV26mwun1^KR5hpZ?z0?%wslK;KdRCznpc`K80d-R$FMr0VJLLaKjCAFtZCtmP
zV<R$X#NCVWoj`9|b9BMBd53Jwx2b~?52%Ln#c(NO(>GEL3Bt){!Urvs6_v_u)@Mbv
zb}EHC{+>ufo9X)|_0~Yf(FCiiXzLA7Kh<rC;Y+nM3}(gtfioGwk61?=nQOu5S(R+q
zN?l@si>ZavxchOCjDR4jgg6<fM%q_0I^r)yF3PQm4BOa3&w7z5VH8dZ$<`+#6!$4I
zm-+*n<VORb`pX+7DaURq0VY2~(&+vGp}CeHk7`nds#cetl(6HC?mc;Mb9jwiiLj!`
zDkOc(^3ldWMv?VhknNfc-SU#C!c4AP#%Usl)%Y)dcPV|Z!z1Z&*W}}8sOAQqyA2k=
zFoRo$R!oDm&l#KCZQalBeLhJ##!R+|&S4~2w80TRtX%}9H5$d9=mw8yaY-=#$iR;`
zVYq3G^OfEYAk>-lA~gK`Q@MfC2fZ(flZ&>!*LVfC>d;NtfQ&U7Yp^m8@LOd+_p_r>
zx-AB6*Rqa14PGQ4S$xAV{&yxKOhJM6v|u&!Dp>;!mU7fKBxE`uB43UwKw&kagP;<V
zzs9_1boc0!ynaeh)HMOi6<|WZ_i#z~<lG=!qq0Zk^OV(`wxjt=Tu+SofF+&JuAjg+
z{YhiUW0-O_%iQvXZC9I|LBg><g#cJ%z&$?4IiQ@9{~yRUs)c|oj`$#_<Q`+9MChf(
z=-Q=JQu${R9>=kb)AyZHR<2SgFY?1MyK&R*g9ebZQ6_~Vj*ppA=%|ucbnC(XgT$H!
zM|nZNRnz!kzgoK9>8_)iuNy_Ih7Jx($1gTN2V`YV49O2USXR7KX7$MfXE9qF_k(Sm
z6ig2^A*zxxQZ$cROs7=HefTw4@=^48^YMl^K<m?lx%18+`pu_D2d~#Gppb{y_>j_a
zu$V>5a?&aTN9wDCmVVjG3ASE6)+xHN>T@fe@#nmyw$CLDQZT#C5npasY_mnv{49+6
zJ21?d&3dCYC5IR@<Zde>Q2_|e%x#3dsMcD#2;T3sglbf!E0B-nOF>0{*&cgS``NNg
zykJ>=S{S}kX#0>EPEM+Bnh*m0-H5p^Q4z(;I>OT0tngw}tNM)rkg+}<s@B=lx^Snj
zscorceG0Y1Wf&3`&%rQ3e6B7XK3bRj{+r&11P6y*Xt);t7i-@kD{Uw^K6L#v7(Oba
z#zoU!eK#8*UYgxAl!|$MSSJT%HU+<u142{p`U6Y8k;hd1`0AT3@qVoIeL#`P0_bhA
z@$ij{(7`+bJDdz0@$iv?NDMk=CZ<kL-0|J>C_Hd?;ogHOhOycGnU<c?Q$L+?7n9kL
zCk{99g&tbtbudB;usHaQ%Hfq$`O{zXLCC>#Hfk{mi0WK^-!^R+?zVKx5Z#4y-0@V2
zb?LJn6|}}Uki5<@=w9(Ry$*4D6u6)kt=7IfM>=zoH0pj{wZidiJctD?%?$37Er`eF
zE&5bv_ypG({bqNXdOoH-@{TDL6LJ6D8c_oekG){GOgh!nxIBIT<gvtWYk1YzFKVJv
zM}F8y#jx@biC4ZVnM;fg5!!@i|J<nmtIq$|F~24Etjh9$sVfcL9k!X-?{krb1)Bwe
zxCcf)oS`QPgnrF7`8Zae4slWkOHzcaVKr#tngQrCwf>iim&n(tTPUS|?-`3I&%hsK
zVhF_xzi*KQ%tOO*1Q$%mf6Q)q0CL`(K{tK0@;2ZO0vEq}d;~<Q&xeu81#{%Cn>XYG
zOIpz?%$$_xIWAswM^gitsr44Xt|m;$b?Op|N|q9i<GL?B{DM+PY&h~0x2U)o!2pDS
z0#O-4AAw?|&wD6z)EfHT=Hq0f<+k;UtaAxyM#WEf9UQ^V)K5FYB<-3lgjtZg)vG25
zq!dQKO$u|^=br6XV~z$-#+54`ayc#>n+NfzY!3xiSpz*OUoSUHv$&l&t8p~d`mR8z
z{mhW>26&jOJaUa}-j62aNzlqowVmH>PyZ^8(j0Qv%3&pp-X0`xzWF$0t|`k?t^1+V
zj^$*OtvVS8EhDz+ZNzhYr`;RyZPqhcXNbVNo4HY~_7&cYlPJH@A!{{6|A5W#-`d4V
z7|X}GyNJ;0n!?(v#R6UJy)wyO^jWIh+cj>2pTbGNPbo4O*k_sl`pdq1WJHvE__dYX
zXU1q;77OVo{wAW*S8WQPTW<Kb&R-W^Pc$+RLGwE+%s!17)({+Uv^3DNz~oJlR^t{`
z#*d;0eOg3XW8iB*5Fx1c*nOkpCnvIH*nV(9w2Aj^F&&u|^R)Z4F&^e?Y(RX~u|uPX
zM;XuOdWg<;9Y_2e)NZVW^*5(xZfOu>MeiAr!4c9EtYt0=pY$xQU!}d@LN^@{N(R3h
z8!}F<K_6}r6YLQ&a>kL~SYbPn0*`BPA4C%9b}2?OIH7BAPbQgBsd6#}0vHR^@$c}G
zTqA>WHQnad`a$2Ct070^u+!``erL4~nX`v~3^K`M0y7h?Y3B^>%JG#cx(ihJwx#xL
zpPf9n5U6f|#pO3Xr*XJjZ~)<4O*G3F-0NE{G0>Te;s3eH2FrU70MKIo{R<GBGDgRM
zOCe_7AD`Q6Uq9lt>y=+l#V0Jfh0m6(p;GTW&Io+vsJvXh^3als5tnc3%W=a&q+&Iw
z0r*(;OHo5cFFhaHolm_xbQH!FCzvlU?tQsI$rE7{OL?~ZW3G~6a8>74zmYERbK}ju
zI1ZYtGulOxg{%w|M}6nj{xU1OkZVG@L%eu`{&o@^K*oee<17{P`7uRB>A{xCR;g}J
zDyxCcM)wR4%>tYhO`FXIsq^wGSNo$EZb?~CWdM13I=-H{4*-j!^Cu+LmT9uKEV3#E
zP@12Bzwh7m>`$*cQ#Z2=a+0-TA1%sSGi-W!-$UKI_V{=sik+{dnt5$7R1G6dvfO4>
zE9qO?TI|}o*ano~Q_k4Q>Vw@8q<sJ&CXi1|fB0&6XUi(L#@s+|;t!>hydJ~v^&yF?
zbJ6(6+H@Xkq|3wMcY=AExw+ud8a3*c-&B>J8qS;tcgN}T5ARegvXFdtO+2UF+;h8p
z)NSwW>(f1~@hfcM1OkNG5EuN-0uf)@EsBiN6oHRC(<h1;GDRQz*)iD;r%rcx3g?JN
z+u?G0b@=%rC0;qbrJFjpS(BvwxUC*rq&qe&nk02MTdSd{;ub30cZ8DnETwYs8Hr&?
zbI5J@A%rozl9Fts2I&5Z<EDXy0J3BYl~3FD2Q1paX`KDry!03Ylf_IfK@4#Ww3xlJ
zmc3XIOCOfp?KnY#`a)e=BLnzN@^eH@PeOXgXtjmlcl!E>IUJ1!ClhvorjJ9i=ggIn
z%(8SdSq%PY6MhTf^U7P}lT6+mXD%N{nx^w4@HLp8Zg8TZ?o!1%DvxcRHQrgCcArD}
zW5{jZJ-!ShqonOj$8;nDWGb6v&Iy?=&kb1-Tz0V`2_WhyDrX|O_%Vl1s=LClGDVW~
zPzrUi46~p@W&C<Uzg&7ezF_yuDfw_5R`Fv<=>{_E;r=Q5i;9?2_4Km7-%eqrIwO2|
zfnkC=#b~>boo$q5{Y?+3=Y!$*^Tf%n41&1oEEvUnlsn(|W%u+?o?!3u9gwzde#zab
zJvTswZ;F1>Isl>%IDlE;^?MBsTUZ6HTv6XhD{?gZL=8{<q(rxRne!GQ0Ur#+v!%oJ
zODGtTx4%mn*cz<+oEMGVzWZ7F?x|%6^`0IiRA(Mt6EaElD1Hm>eXZ2jQa5ijzer|^
zwA4K1l!8&lYN2X&y0?mP4*|Yd+Obrj>+lfX<|0l5q_st=UnikL5!%ttWMnae$Wl&T
zQT{5jQU7``JH0pGWN}>b3lOE|^H1$-IZx?=p+oM+S2<N8tB0k?h#8Q4I69%_(~?nf
z!O&AN7Z1HayZSA*L{*mkwIzMbgRcx0-he@y#8ZN9e}4Qq|8HxwFO9O~js?m0p}-v9
zP_eRB1Xgx9Ou`!nL)mcpY`*4Gsp2tl^8kTMmNMp)j+plX3Qxg-9c3rxE{{A9;>!;G
zNiGQ166U#;IV?{)D+<A24)TDUrWb&cdBI$r#?rn`?^u@4`7gymUf=G&l?2c8*i>rS
z{$=&e%RuYlbo7|CW6JG`WmE%q6$akb`-^34JJj=`SxO&+5EDNxuDCj!Mx)xx{%352
zeORKT8%Q@!cRnuFUL_4h(xIIxA^pe+>V)u2-c_=vkOLX8w8zjx3n$a_#5JvD6=cnt
zV5Fuh+d#2<T8QCZH912!R>#X)Ss3B%7T%qIP>g*_!Oa*Pta{ut*!s==^IIs%%9_3G
zfqqzX`QQs@4%1;guO1-Rm|7}_WU|uYG{s>(E@C~Q@FW(q{&H>|!(0+BGkpU!XKCiO
z=sL_JO>6|KKALR{D<9UVCyP)=E0#?RcTWbs9TX0KN+0)kLo$_jLR`Npj14<psA_%P
zFFC+|$>zwfA<)(H1~XC}9(JCu6Gq+qt5+#pOMYK{ps;ZL#ppWSfU?Jrx75x-&!7<J
zF=pR(lN);<0~xbs*GlwrLL6UM7+C)uL^r>P`BkfwhJT5Kz3ksnu6VEECuXI}8cf#F
zfcFhlhXraF1>SQE)btHJ;zAZfwV?fM@PuQa0bA|)>B)XR{tw+fztt2E{ez~mt^<hu
z1Z%;>DM`rflO?i<d76u|&`3{O=zi8-CYm)OgRxqP{5INZDsU@BH-7KtndX1=YDFT!
zw{fgb!nUN!4i8i@X(lD@$)4lRG{z&@h0n;e>{X``(=6Q>v4sx#_4n>Fs)GCQe<)iJ
zFE5BuJj56n5#{*6zGdnp90a`_1CDgA+fS0c9w{+<X{=ehs%g+~E98Bx)v4v3>B6-)
znjC>Yg=JJF{tvY6Mwh}JGRGaNq8%E-s^IUMMg}M|_59f;o1;clmLl5;_ncLeq?xIl
z%-S2^6Sjq)FmkXm3#sS$lQ-jlu7A8@ygP9%e1g48eL4ikfb1#yRX#16-sQ6+5&uE&
z0}Gr_JgkhZz#3j2>%lg}ZT;6J`M&<}d#qsjL?U`X;C`FN=S2%M|1q6{=cknR?Jp_U
zQU6Pr^_rKX>q&psd74Kd7xNhhFEz)A@hN+dHv5@Yu#KwlO;w<ng)l*Q70dj}-O3VU
zb?*k?w}I?^VQlBt1^3?h_<sX3YtDNjJw=?r{|Dg?1J7w&>#jTNmMKsSP&|F_r0&sS
z+(E~V4l*5ad#<zUV~z*Ndv$%pO*kK4MA#h>iYi=B{Ks66)bS#x#rS{|!39>#0*}h#
z147#r@;<zZ?2E#a(Vizi_#U0-DcY}Mmz4vYyP5ko#ypSz2u01UCtnziF8y<{V0;V8
z_X+}WBY3)TB=Q3oo?uE?RY+>ncg|Ee^=VxzUo;`f*c;YJ6id<|*&m>yaSxYCf$<Cf
zo8!5}@891XzO*ZjGX8RXGKgMw;Ncev6BVieCm1^q;xuSx)+!gUCOacRF;2JvT4n!l
zNCo~g_vdTIw<mQy;;3<QOu4b8@2iAOHo=+pCRNo|Z{HPvp(viLt_3=kh5OIb0BzUQ
zh_=(dc5`iD(<y;ov7%=EE)8RH$4}V)q#MUq71~!d5@Zh#64$^a@&<SOjQC>AeO7bD
zhXz^{O)1kU!MODM``d{I8=LFDJG=?CKkDaLD0V0!cR<}-*+>2NsVR%D3iqK|7WntE
zxXd#glN3P%4Q~d$Z?E(AT6upf>K~zrmM#w_$b1sU+|U1MF5&;h;zs{$yq!t2PyJdq
z<L=gCfeGLrVTa<`Ud>CWWFK&5wu_-G*=(~Zzg=n6XA94P3jMNuXGlGtu}*=>WLp%u
zSPZc4HVK)9BbJxN*p=#Cj4T6ygWf2=55W@5Siv(~`))Kbv72Z&?Q1@l1y1Cb>d6`j
zv(+u@E2#~a7IR}a`8GZD#1v3Oj3vfJ@@HM)CMIpW&)Tf`fJ#nPM<3FxaI;^RRHTpd
zue`|5Dl&?e8pTQ=$%r#cQQgFsgrV^B@5h#p(ksLGcs1?U{0ey+AUAgRhAh#v6gza6
zJ53rKMSnR7pHEtcW|`q{{6;vl6VNA8@*8!+zidM|n6dI_y#q|H$o}mb6gUP<I>f&Y
zxb@5CKVKyKSc-ZYBkGoXJaHEbFTj6hZ6XwyXM~HcoD#3TI-SvFa@E?I)BedF$U@-(
z54LoD<I6llMUe~s6FaoUu6NZ{@)HWNSyH)mCGeO(8ne=k7C`9@;yI4gu7uO#$6@`Z
z)LhTO;^k^yTsfo$KrIi|FyvQRsJE%4(v_Oz(U`caW{?2c>wmqhbx{OR2C58ZM?aR&
z1smpsQN^69pvFnHXLV@1%@n{)+}`q6!Q1hzEcnq1c3}A(&b(x6ktcSNM9X7zwaw*v
zMi~*G{aY%|D~~4YpN*ey`8?>xea2J341?R3>E73SaLhv@7C0{!TxZ(y-s1D9+<jBG
z%^I?rdE`5L%I)5%eVx*cEi}3c6p?LuOJGYK7|xB@W?CIEg2=4D7a9k2U%6ZujQiOM
z*s4z=m8SN#g`AwfD8R@{*UolJ30+03Q<keu2qiZWa!)eMbABZ{TXvm3iSi#qUJ{)D
zu6o+SZ&mCM6}!5A)Dk?}1MgDWKh>65KTiC|3g;sa&pbFH&ze)@<cR=me6si#eH!II
z#@J_q6KhV{&ANeZ4NI(RKU1&Zs+X#b-ADHOA{pMu>&;H0@|>kErs!fB|3yV(v0ba^
zUtbP%{rlzrKSF;Q`SGqd+)64SnW9wyHGtblJUv#r>S<nH(tKU{ekD-;t7OOkK#ROu
U^FYX_s}X?CJwuIpxKqsk04BaQiU0rr

diff --git a/images/user_seld.png b/images/user_seld.png
index 578fb91c43658dd7e01a989e1aa544e36a42dc24..b4227027924cad5a567c69a33c0c87687744df2c 100644
GIT binary patch
literal 4813
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

literal 11041
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
WIZb;%#D~6H0P->_(sh!iq5lKpXdDXw

diff --git a/pages/activity/huawei/form/index.js b/pages/activity/huawei/form/index.js
deleted file mode 100644
index 194363b..0000000
--- a/pages/activity/huawei/form/index.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// pages/activity/huawei/form/index.js
-import commonApi from "../../../../utils/https/common"
-import userApi from "../../../../utils/https/user"
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    multiArray:[],
-    multiIndex:[],
-    areaList:[],
-    info:{},
-    brands:[],
-    brandIndex:-1,
-    id:null,
-    info:{}
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    commonApi.user_post('actonline/act_online/getActDetail',{
-      id:options.id
-    }).then(res=>{
-      this.setData({
-        info:res.data
-      })
-    })
-    commonApi.user_post('actonline/act_online/getMobileBrand',{}).then(res=>{
-      let brands = []
-      for(let i in res.data){
-        brands.push({
-          name:res.data[i],
-          id:i
-        })
-      }
-      this.setData({
-        brands:brands,
-        id:options.id
-      })
-    })
-  },
-  changeBrand:function(e){
-    this.setData({
-      brandIndex:e.detail.value
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-  changeName:function(e){
-    let info = this.data.info
-    info.name = e.detail.value
-    this.setData({
-      info:info
-    })
-  },
-  changeTel:function(e){
-    let info = this.data.info
-    info.mobile = e.detail.value
-    this.setData({
-      info:info
-    })
-  },
-  changeCard:function(e){
-    let info = this.data.info
-    info.card_number = e.detail.value
-    this.setData({
-      info:info
-    })
-  },
-  submit:function(e){
-    let info = this.data.info;
-    
-    if(!info.name){
-      wx.showToast({
-        title: '请输入姓名',
-        icon:'none'
-      })
-      return;
-    }
-    if(info.mobile.length!=11){
-      wx.showToast({
-        title: '请输入正确的手机号',
-        icon:'none'
-      })
-      return;
-    }
-    if(info.card_number.length!=18){
-      wx.showToast({
-        title: '请输入正确的身份证号码',
-        icon:'none'
-      })
-      return;
-    }
-    if(this.data.brandIndex==-1){
-      wx.showToast({
-        title: '请选择手机品牌',
-        icon:'none'
-      })
-      return;
-    }
-    info.id = this.data.id
-    info.mobile_type = Number(this.data.brands[this.data.brandIndex].id)
-    commonApi.user_post("actonline/act_online/actSign",info).then(res=>{
-      if(res.code==1){
-        wx.navigateTo({
-          url: '../result/index?id='+this.data.id,
-        })
-      }
-    })
-    
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.json b/pages/activity/huawei/form/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/form/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "title":"/pages/component/TitleHeader"
-  }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.wxml b/pages/activity/huawei/form/index.wxml
deleted file mode 100644
index e4a0c2e..0000000
--- a/pages/activity/huawei/form/index.wxml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--pages/activity/huawei/form/index.wxml-->
-<title title="信息填写"></title>
-<image lazy-load src="{{info.head_img}}" mode="widthFix" class="topimg"></image>
-<view class="input-box">
-  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/huawei/regtip.png" mode="widthFix"></image>
-  <view class="input-item">
-    <view>姓名</view>
-    <input bindinput="changeName" type="text" />
-  </view>
-  <view class="input-item">
-    <view>联系方式</view>
-    <input bindinput="changeTel" type="text" />
-  </view>
-  <view class="input-item">
-    <view>身份证</view>
-    <input bindinput="changeCard" type="text" />
-  </view>
-  <view class="input-item">
-    <view>手机品牌</view>
-    <picker mode="selector" value="{{brandIndex}}" range="{{brands}}" range-key="name" bindchange="changeBrand">
-      <view class="picker">
-        <view class="areatext">{{brandIndex==-1?'请选择':brands[brandIndex].name}}</view>
-        <view class="iconfont icon-xia"></view>
-      </view>
-    </picker>
-  </view>
-  <image lazy-load bindtap="submit" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsubmit.png" class="submit-btn" mode="widthFix"></image>
-</view>
-<view style="height:30rpx"></view>
\ No newline at end of file
diff --git a/pages/activity/huawei/form/index.wxss b/pages/activity/huawei/form/index.wxss
deleted file mode 100644
index cacec9b..0000000
--- a/pages/activity/huawei/form/index.wxss
+++ /dev/null
@@ -1,72 +0,0 @@
-/* pages/activity/huawei/form/index.wxss */
-.topimg {
-  display: block;
-  width: 100%;
-}
-page {
-  background: #003323;
-}
-.input-box {
-  margin: 0 42rpx;
-  position: relative;
-  z-index: 1;
-  margin-top: -130rpx;
-  background: white;
-  border-radius: 16rpx;
-  font-size: 31rpx;
-  padding: 30rpx 52rpx;
-}
-.input-box image {
-  display: block;
-  width: 264rpx;
-  height: 68rpx;
-}
-.input-box image.submit-btn {
-  display: block;
-  width: 561rpx;
-  height: 104rpx;
-  margin: 0 auto;
-  margin-top: 35rpx;
-}
-.input-box input {
-  display: block;
-  padding: 10rpx 30rpx;
-  width: 420rpx;
-  height: 71rpx;
-  line-height: 71rpx;
-  background: #FFFFFF;
-  border: 1rpx solid #CCCCCC;
-  border-radius: 10rpx;
-  box-sizing: border-box;
-  color: #333;
-  font-size: 32rpx;
-  font-weight: 500;
-  flex-shrink: 0;
-}
-.input-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #333333;
-  margin-top: 45rpx;
-  margin-bottom: 45rpx;
-}
-.picker {
-  padding: 0 30rpx;
-  width: 420rpx;
-  height: 71rpx;
-  line-height: 71rpx;
-  background: #FFFFFF;
-  border: 1rpx solid #CCCCCC;
-  border-radius: 10rpx;
-  box-sizing: border-box;
-  color: #333;
-  font-size: 32rpx;
-  font-weight: 500;
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/index.js b/pages/activity/huawei/index.js
deleted file mode 100644
index 20e1d98..0000000
--- a/pages/activity/huawei/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// pages/activity/huawei/index.js
-const sys = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect();
-let height = sys.screenHeight - (rect.top - sys.statusBarHeight) * 2 - rect.height - sys.statusBarHeight;
-import commonApi from "../../../utils/https/common"
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    height:height,
-    isReg:false,
-    id:null,
-    info:{},
-    showRuleFlag:false
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    // 判断是否报名
-    this.setData({
-      id:options.id
-    })
-    commonApi.user_post("actonline/act_online/isSign",{id:options.id}).then(res=>{
-      this.setData({
-        isReg:res.data
-      })
-    })
-    commonApi.user_post("actonline/act_online/getActDetail",{
-      id:options.id
-    }).then(res=>{
-      if(res.data){
-        for(let i in res.data){
-          if(i.indexOf('time')!=-1 && res.data[i]){
-            res.data[i] = res.data[i].replace(/-/g,'.')
-            res.data[i] = res.data[i].substr(0,res.data[i].length-3)
-          }
-        }
-        this.setData({
-          info:res.data
-        })
-      }
-    })
-  },
-  showRule:function(){
-    this.setData({
-      showRuleFlag:!this.data.showRuleFlag
-    })
-  },
-  gotoPath:function(e){
-    let path = e.currentTarget.dataset.path;
-    wx.navigateTo({
-      url: path
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/index.json b/pages/activity/huawei/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "title":"/pages/component/TitleHeader"
-  }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxml b/pages/activity/huawei/index.wxml
deleted file mode 100644
index e4be85a..0000000
--- a/pages/activity/huawei/index.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--pages/activity/huawei/index.wxml-->
-<view class="bg">
-  <title title="摄影大赛"></title>
-  <view class="info-box" style="background:url({{info.back_img}});background-size:100% 100%;background-repeat:no-repat;height:{{height}}px">
-    <view bindtap="showRule" class="rule-btn">规则</view>
-    <view wx:if="{{!isReg}}" class="tiptext">线上报名时间：{{info.sign_begin_time}} - {{info.sign_end_time}} </view>
-    <view wx:if="{{!isReg}}" class="tiptext">线上投票时间：{{info.begin_time}} - {{info.end_time}} </view>
-    <image lazy-load bindtap="gotoPath" style="margin-top:40rpx" data-path="form/index?id={{id}}" wx:if="{{!isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regbtn.png" mode="widthFix" class="btnimg"></image>
-    <image lazy-load bindtap="gotoPath" data-path="upload/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix" class="btnimg"></image>
-    <image lazy-load bindtap="gotoPath" data-path="list/index?id={{id}}" wx:if="{{isReg}}" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix" class="btnimg"></image>
-    <view class="bottomtext">{{info.sub_title}}</view>
-  </view>
-</view>
-<view class="mask" wx:if="{{info && showRuleFlag}}">
-  <view bindtap="showRule" class="mask-bg"></view>
-  <view class="mask-content rule-box">
-    <view class="rule-title">• 活动规则 •</view>
-    <rich-text nodes="{{info.rule_desc}}"></rich-text>
-  </view>
-</view>
\ No newline at end of file
diff --git a/pages/activity/huawei/index.wxss b/pages/activity/huawei/index.wxss
deleted file mode 100644
index 54b74f3..0000000
--- a/pages/activity/huawei/index.wxss
+++ /dev/null
@@ -1,71 +0,0 @@
-/* pages/activity/huawei/index.wxss */
-.info-box {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: url(https://static.ticket.sz-trip.com/xcxImages/huawei/bg.png);
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-  align-items: center;
-}
-.bg {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  top: 0;
-}
-.btnimg {
-  display: block;
-  width: 558rpx;
-  height: 104rpx;
-  margin-bottom: 23rpx;
-}
-.bottomtext {
-  color: #fff;
-  text-align: center;
-  font-size: 24rpx;
-  margin-bottom: 45rpx;
-}
-.rule-btn {
-  font-size: 27rpx;
-  color: #fff;
-  font-weight: 500;
-  width: 73rpx;
-  height: 73rpx;
-  border: 1rpx solid;
-  border-radius: 50%;
-  position: absolute;
-  right: 30rpx;
-  top: 30rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-sizing: border-box;
-}
-.tiptext {
-  color: #fff;
-  font-size: 25rpx;
-  margin-top: 20rpx;
-}
-.rule-box {
-  height: 50%;
-  overflow-y: auto;
-  font-size: 27rpx;
-  color: #010101;
-  padding: 0 50rpx;
-  width: 500rpx;
-  padding-bottom: 30rpx;
-  line-height: 46rpx;
-}
-.rule-title {
-  text-align: center;
-  font-size: 32rpx;
-  color: #000;
-  font-weight: 500;
-  line-height: 100rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.js b/pages/activity/huawei/list/index.js
deleted file mode 100644
index b97fc66..0000000
--- a/pages/activity/huawei/list/index.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// pages/activity/huawei/list/index.js
-import commonApi from "../../../../utils/https/common"
-let app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    id:null,
-    types:[],
-    typeIndex:0,
-    list:[],
-    detail:{},
-    showRuleFlag:false,
-    user_id:null,
-    isReg:false
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      id:options.id
-    })
-    if(options.user_id){
-      let user_id = wx.getStorageSync('jstrip_userid');
-      if(user_id!=options.user_id){
-        app.globalData.weburl = 'https://m.cloud.sz-trip.com/photoWorksDetail?id='+options.id+'&type_id='+options.type_id
-        wx.redirectTo({
-          url: '/pages/pbService/web/index'
-        })
-        return;
-      }
-    }
-    commonApi.user_post("actonline/act_online/isSign",{id:options.id}).then(res=>{
-      if(res.code==1){
-        this.setData({
-          isReg:res.data
-        })
-      }
-    })
-    commonApi.user_post("actonline/act_online/getActDetail",{id:options.id}).then(res=>{
-      this.setData({
-        detail:res.data
-      })
-    })
-    commonApi.user_post("actonline/act_online/getActTypeList",{
-      act_id:this.data.id
-    }).then(res=>{
-      this.setData({
-        types:res.data
-      })
-      if(res.data.length>0){
-        this.getList()
-      }
-      
-    })
-  },
-  showRule:function(){
-    this.setData({
-      showRuleFlag:!this.data.showRuleFlag
-    })
-  },
-  reUpload:function(){
-    let that = this;
-    wx.showModal({
-      title:"提示",
-      content:"一个分类的作品多次提交，平台只保留最近上传的作品。",
-      cancelText:"否",
-      confirmText:"是",
-      success:function(res){
-        if(res.confirm){
-          that.gotoUpload()
-        }
-      }
-    })
-  },
-  changeType:function(e){
-    this.setData({
-      typeIndex:e.currentTarget.dataset.type,
-      list:[]
-    })
-    this.getList()
-  },
-  getList:function(){
-    commonApi.user_post("actonline/act_online/myWork",{
-      type_id:this.data.types[this.data.typeIndex].id,
-      id:this.data.id,
-      page:1,
-      limit:100,
-      user_id:this.data.user_id || null
-    }).then(res=>{
-      if(this.data.user_id && res.data.data[0].status!=1){
-        res.data.data = []
-      }
-      this.setData({
-        list:res.data.data
-      })
-     
-      this.onShareAppMessage()
-    })
-  },
-  gotoUpload:function(){
-    if(this.data.isReg){
-      wx.navigateTo({
-        url: '../upload/index?id='+this.data.id
-      })
-    }
-    else {
-      wx.navigateTo({
-        url: '../index?id='+this.data.id
-      })
-    }
-  },
-  vote:function(e){
-    let that = this
-    commonApi.user_post("actonline/act_online/vote",{
-      id:this.data.list[0].id
-    }).then(res=>{
-      if(res.code==1){
-        wx.showToast({
-          title: '投票成功',
-          icon:'success'
-        })
-        let list = this.data.list;
-        list[0].votes = Number(list[0].votes) + 1;
-      }
-      else if(res.code==-1){
-        wx.showModal({
-          title:"提示",
-          content:res.msg,
-          confirmText:"关闭",
-          cancelText:"前往报名",
-          success:function(res){
-            if(!res.confirm){
-              wx.navigateTo({
-                url: '/pages/activity/huawei/index?id='+that.data.id
-              })
-            }
-          }
-        })
-      }
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-    if(this.data.list.length>0){
-      return {
-        title:"帮我投一票吧~",
-        path:'/pages/activity/huawei/list/index?id='+this.data.list[0].act_online_id+'&type_id='+this.data.list[0].act_online_type+'&user_id='+this.data.list[0].user.id+'&did='+this.data.list[0].id,
-        imageUrl:this.data.list[0].img
-      }
-    }
-    else {
-      return {
-        title:"君到苏州摄影大赛作品",
-        path:"/pages/pbService/web/index?url="+encodeURIComponent('https://m.cloud.sz-trip.com/photoWorksList?id=6'),
-        imageUrl:"https://m.cloud.sz-trip.com/static/images/logobai.png"
-      }
-    }
-  }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.json b/pages/activity/huawei/list/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/list/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "title":"/pages/component/TitleHeader"
-  }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.wxml b/pages/activity/huawei/list/index.wxml
deleted file mode 100644
index dbb0d71..0000000
--- a/pages/activity/huawei/list/index.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--pages/activity/huawei/list/index.wxml-->
-<title title="{{user_id?'作品详情':'我的作品'}}"></title>
-<view class="tabs">
-  <view wx:for="{{types}}" bindtap="changeType" data-type="{{index}}" class="tab{{typeIndex==index?' active':''}}">{{item.title}}</view>
-</view>
-<view wx:if="{{list.length!=0}}">
-  <view class="title">{{list[0].title}}</view>
-  <view class="work-tips-my" wx:if="{{user_id}}">
-    <image lazy-load src="{{list[0].user.avatar}}" mode="aspectFill"></image>
-    <view class="nickname">{{list[0].user.nickname}}</view>
-    <text style="color:#333">作品id：{{list[0].id}}</text>
-  </view>
-  <view class="work-tips-my" wx:else>
-    <view>作品id：{{list[0].id}}</view>
-    <text>作品状态：</text>
-    <text class="status{{list[0].status==1?' active':''}}">{{list[0].status_text}}</text>
-  </view>
-  <view class="refund-msg" wx:if="{{!user_id && list[0].status==2 && list[0].refund_msg}}">拒绝理由：{{list[0].refund_msg}}</view>
-  <image lazy-load src="{{list[0].img}}" class="mainimg" mode="widthFix"></image>
-  <view class="vote-box">
-    <view class="count-num">当前得票：{{list[0].votes}}</view>
-    <view class="vote-btn" wx:if="{{user_id}}" bindtap="vote">投票</view>
-  </view>
-  <view class="content">
-    {{list[0].desc}}
-  </view>
-  <view wx:if="{{!user_id}}" class="rule-btn" bindtap="showRule">规则</view>
-  <!-- <image lazy-load wx:if="{{!user_id}}" style="width:646rpx" bindtap="reUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/reupload.png" mode="widthFix"></image> -->
-  <view wx:if="{{!user_id}}" style="height:50rpx"></view>
-</view>
-<view wx:else>
-  <image lazy-load class="emptyimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/emptyimg.png" mode="widthFix"></image>
-  <view class="tip1">投票已开始，无法上传作品！</view>
-  <!-- <image lazy-load bindtap="gotoUpload" class="btnimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image> -->
-</view>
-<view class="mask" wx:if="{{detail && showRuleFlag}}">
-  <view bindtap="showRule" class="mask-bg"></view>
-  <view class="mask-content rule-box">
-    <view class="rule-title">• 活动规则 •</view>
-    <rich-text nodes="{{detail.rule_desc}}"></rich-text>
-  </view>
-</view>
\ No newline at end of file
diff --git a/pages/activity/huawei/list/index.wxss b/pages/activity/huawei/list/index.wxss
deleted file mode 100644
index 6ceb225..0000000
--- a/pages/activity/huawei/list/index.wxss
+++ /dev/null
@@ -1,163 +0,0 @@
-/* pages/activity/huawei/list/index.wxss */
-.tabs {
-  display: flex;
-  align-items: center;
-  flex-wrap: nowrap;
-  overflow-x: auto;
-  margin: 0 27rpx;
-  height: 92rpx;
-  border-bottom: 1rpx solid #cccccc;
-  color: #666;
-  font-size: 31rpx;
-  padding: 0 28rpx;
-}
-.tab {
-  margin-right: 140rpx;
-  position: relative;
-  line-height: 92rpx;
-  flex-shrink: 0;
-}
-.tab:last-child {
-  margin-right: 0;
-}
-.tab.active {
-  color: #000;
-  font-weight: 500;
-}
-.tab.active::after {
-  content: "1";
-  font-size: 0;
-  display: block;
-  position: absolute;
-  width: 60rpx;
-  left: 50%;
-  margin-left: -30rpx;
-  bottom: 0;
-  height: 7rpx;
-  background: linear-gradient(0deg, rgba(251, 197, 34, 0.93), rgba(255, 252, 0, 0.93));
-  border-radius: 3rpx;
-}
-.title {
-  text-align: center;
-  padding: 39rpx 30rpx;
-  margin-top: 12rpx;
-  font-size: 36rpx;
-  color: #333;
-  font-weight: bold;
-}
-.mainimg {
-  display: block;
-  margin: 0 auto;
-  width: 625rpx;
-  border: 13rpx solid #FEE5C6;
-  margin-bottom: 50rpx;
-}
-.content {
-  margin: 0 52rpx;
-  padding-bottom: 30rpx;
-  font-size: 27rpx;
-  color: #333333;
-}
-.emptyimg {
-  display: block;
-  margin: 91rpx auto;
-  width: 414rpx;
-  height: 193rpx;
-}
-.tip1 {
-  text-align: center;
-  font-size: 35rpx;
-  color: #000000;
-}
-.btnimg {
-  width: 558rpx;
-  margin: 0 auto;
-  margin-top: 86rpx;
-  display: block;
-}
-.work-tips-my {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 31rpx;
-  color: #666;
-  margin: 0 53rpx;
-  padding: 20rpx 0;
-}
-.work-tips-my view {
-  flex: 1;
-}
-.work-tips-my .status {
-  color: #CC0000;
-}
-.work-tips-my .status.active {
-  color: #169900;
-}
-.count-num {
-  color: #333;
-  font-size: 31rpx;
-  font-weight: 500;
-}
-.rule-btn {
-  width: 143rpx;
-  position: fixed;
-  text-align: center;
-  line-height: 66rpx;
-  background: #FFFC00;
-  border-top-left-radius: 33rpx;
-  border-bottom-left-radius: 33rpx;
-  font-size: 31rpx;
-  color: #333333;
-  padding-right: 10rpx;
-  right: 0;
-  bottom: 246rpx;
-}
-.rule-box {
-  height: 50%;
-  overflow-y: auto;
-  font-size: 27rpx;
-  color: #010101;
-  padding: 0 50rpx;
-  width: 500rpx;
-  padding-bottom: 30rpx;
-  line-height: 46rpx;
-}
-.rule-title {
-  text-align: center;
-  font-size: 32rpx;
-  color: #000;
-  font-weight: 500;
-  line-height: 100rpx;
-}
-.vote-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 0 53rpx;
-  padding-bottom: 50rpx;
-}
-.vote-btn {
-  width: 175rpx;
-  line-height: 64rpx;
-  background: linear-gradient(0deg, rgba(251, 197, 34, 0.93), rgba(255, 252, 0, 0.93));
-  border-radius: 32rpx;
-  text-align: center;
-  color: #333333;
-  font-size: 31rpx;
-  font-weight: 500;
-}
-.work-tips-my image {
-  display: block;
-  width: 53rpx;
-  height: 53rpx;
-  border-radius: 50%;
-}
-.work-tips-my view.nickname {
-  font-size: 28rpx;
-  margin: 0 20rpx;
-}
-.refund-msg {
-  color: #CC0000;
-  margin: 30rpx 53rpx;
-  margin-top: 10rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/result/index.js b/pages/activity/huawei/result/index.js
deleted file mode 100644
index 11a206b..0000000
--- a/pages/activity/huawei/result/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// pages/activity/huawei/result/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    id:null
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      id:options.id
-    })
-  },
-  upload:function(e){
-    wx.navigateTo({
-      url: '../upload/index?id='+this.data.id
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/result/index.json b/pages/activity/huawei/result/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/result/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "title":"/pages/component/TitleHeader"
-  }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/result/index.wxml b/pages/activity/huawei/result/index.wxml
deleted file mode 100644
index c322998..0000000
--- a/pages/activity/huawei/result/index.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--pages/activity/huawei/result/index.wxml-->
-<title title="报名成功"></title>
-<image lazy-load class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/regsuccess.png" mode="widthFix"></image>
-<view class="text">恭喜您已报名成功！</view>
-<view>点击下方按钮开始进行作品上传</view>
-<image lazy-load class="arrowimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/resarrow.png" mode="widthFix"></image>
-<image lazy-load bindtap="upload" class="uploadimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png"></image>
diff --git a/pages/activity/huawei/result/index.wxss b/pages/activity/huawei/result/index.wxss
deleted file mode 100644
index 8961d11..0000000
--- a/pages/activity/huawei/result/index.wxss
+++ /dev/null
@@ -1,30 +0,0 @@
-/* pages/activity/huawei/result/index.wxss */
-.logo {
-  margin: 64rpx auto;
-  width: 415rpx;
-  height: 393rpx;
-  display: block;
-}
-page {
-  text-align: center;
-  color: #666666;
-  font-size: 28rpx;
-}
-.uploadimg {
-  display: block;
-  width: 558rpx;
-  height: 104rpx;
-  margin: 0 auto;
-}
-.arrowimg {
-  display: block;
-  margin: 35rpx auto;
-  width: 42rpx;
-  height: 58rpx;
-}
-.text {
-  font-size: 45rpx;
-  font-weight: 500;
-  color: #000000;
-  margin-bottom: 20rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.js b/pages/activity/huawei/upload/index.js
deleted file mode 100644
index b638fdc..0000000
--- a/pages/activity/huawei/upload/index.js
+++ /dev/null
@@ -1,234 +0,0 @@
-// pages/activity/huawei/upload/index.js
-import commonApi from "../../../../utils/https/common"
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    id:null,
-    types:[],
-    typeIndex:-1,
-    title:"",
-    img:null,
-    desc:"",
-    date:null,
-    address:""
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      id:options.id
-    })
-    commonApi.user_post('actonline/act_online/getActTypeList',{
-      act_id:options.id
-    }).then(res=>{
-      this.setData({
-        types:res.data
-      })
-    })
-  },
-  changeType:function(e){
-    this.setData({
-      typeIndex:e.detail.value
-    })
-  },
-  changeTitle:function(e){
-    this.setData({
-      title:e.detail.value
-    })
-  },
-  changeContent:function(e){
-    this.setData({
-      desc:e.detail.value
-    })
-  },
-  uploadImg:function(){
-    let that = this;
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success (res) {
-        // tempFilePath可以作为img标签的src属性显示图片
-        const tempFilePaths = res.tempFilePaths[0]
-        if(tempFilePaths.substr(tempFilePaths.length-4,4)=='.gif'){
-          wx.showToast({
-            title: '图片格式错误',
-            icon:'none'
-          })
-          return;
-        }
-        wx.showLoading({
-          title: '图片上传中，请稍后'
-        })
-        wx.uploadFile({
-          url: 'https://api.cloud.sz-trip.com/api/pbservice.other/upload', //这里是上传的服务器地址
-          filePath: tempFilePaths,
-          header:{
-            token: wx.getStorageSync('jstrip_token'),
-          },
-          name: "file",
-          success: function (res) {
-            var res = JSON.parse(res.data);
-            let img = res.data.url;
-            that.setData({
-              img:img
-            })
-            wx.hideLoading();
-          },
-          fail:function(res){
-            wx.hideLoading();
-          }
-        })
-      }
-    })
-  },
-  bindDateChange:function(e){
-    this.setData({
-      date:e.detail.value
-    })
-  },
-  changeAddress:function(e){
-    this.setData({
-      address:e.detail.value
-    })
-  },
-  submit:function(){
-    if(!this.data.title){
-      wx.showToast({
-        title: '请输入作品标题',
-        icon:'none'
-      })
-      return;
-    }
-    if(this.getCNLen(this.data.title)>30){
-      wx.showToast({
-        title: '作品标题过长',
-        icon:'none'
-      })
-      return;
-    }
-    if(this.data.typeIndex==-1){
-      wx.showToast({
-        title: '请选择分类',
-        icon:'none'
-      })
-      return;
-    }
-    if(!this.data.date){
-      wx.showToast({
-        title: '请选择拍摄时间',
-        icon:'none'
-      })
-      return;
-    }
-    if(!this.data.address){
-      wx.showToast({
-        title: '请输入您所上传照片的拍摄地点',
-        icon:'none'
-      })
-      return;
-    }
-    if(!this.data.img){
-      wx.showToast({
-        title: '请上传图片',
-        icon:'none'
-      })
-      return;
-    }
-    if(!this.data.desc){
-      wx.showToast({
-        title: '请输入作品描述',
-        icon:'none'
-      })
-      return;
-    }
-    if(this.getCNLen(this.data.desc)>600){
-      wx.showToast({
-        title: '作品描述过长',
-        icon:'none'
-      })
-      return;
-    }
-    commonApi.user_post("actonline/act_online/uploadWork",{
-      title:this.data.title,
-      img:this.data.img,
-      desc:this.data.desc,
-      type_id:this.data.types[this.data.typeIndex].id,
-      id:this.data.id,
-      shot_time:this.data.date,
-      shot_address:this.data.address
-    }).then(res=>{
-      if(res.code==1){
-        wx.navigateTo({
-          url: '../uploadres/index?id='+this.data.id
-        })
-      }
-    })
-    
-  },
-  getCNLen:function(str){
-    var len = 0; 
-    for (var i=0; i<str.length; i++) { 
-      if (str.charCodeAt(i)>127 || str.charCodeAt(i)==94) { 
-         len += 2; 
-       } else { 
-         len ++; 
-       } 
-     } 
-    return len; 
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.json b/pages/activity/huawei/upload/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/upload/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "title":"/pages/component/TitleHeader"
-  }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.wxml b/pages/activity/huawei/upload/index.wxml
deleted file mode 100644
index f35bff1..0000000
--- a/pages/activity/huawei/upload/index.wxml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--pages/activity/huawei/upload/index.wxml-->
-<title title="作品上传"></title>
-<image lazy-load class="topimg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadtop.png" mode="widthFix"></image>
-<view class="input-box">
-  <view class="input-item">
-    <text>作品标题</text>
-    <input type="text" bindinput="changeTitle" placeholder="标题长度限制15个中文字符" />
-  </view>
-  <view class="input-item">
-    <text>选择分类</text>
-    <picker mode="selector" value="{{typeIndex}}" range="{{types}}" range-key="title" bindchange="changeType">
-      <view class="picker">
-        <view class="areatext">{{typeIndex==-1?'请选择':types[typeIndex].title}}</view>
-        <view class="iconfont icon-xia"></view>
-      </view>
-    </picker>
-  </view>
-  <view class="input-item">
-    <text>拍摄时间</text>
-    <picker mode="date" value="{{date}}" start="2015-09-01" end="2022-09-01" bindchange="bindDateChange">
-      <view class="picker">
-        <view class="areatext">{{!date?'请选择':date}}</view>
-        <view class="iconfont icon-xia"></view>
-      </view>
-    </picker>
-  </view>
-  <view class="input-item">
-    <text>拍摄地点</text>
-    <input type="text" bindinput="changeAddress" placeholder="请输入您所上传照片的拍摄地点" />
-  </view>
-</view>
-<view class="tip1">上传图片</view>
-<image lazy-load wx:if="{{img}}" class="uploadimg" bindtap="uploadImg" src="{{img}}" mode="aspectFill"></image>
-<image lazy-load wx:else class="uploadimg" bindtap="uploadImg" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadimg.png" mode="widthFix"></image>
-<view class="tip1">作品描述</view>
-<textarea bindinput="changeContent" placeholder="请添加您作品的描述（最多300字）" class="textarea"></textarea>
-<image lazy-load bindtap="submit" class="uploadbtn" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadbtn.png" mode="widthFix"></image>
-<view class="tip2">一个分类的作品多次提交，平台只保留最近上传的作品</view>
\ No newline at end of file
diff --git a/pages/activity/huawei/upload/index.wxss b/pages/activity/huawei/upload/index.wxss
deleted file mode 100644
index 7eb9cd8..0000000
--- a/pages/activity/huawei/upload/index.wxss
+++ /dev/null
@@ -1,112 +0,0 @@
-/* pages/activity/huawei/upload/index.wxss */
-.topimg {
-  display: block;
-  width: 100%;
-}
-page {
-  background: #F7F7F7;
-}
-.input-box {
-  margin: 0 24rpx;
-  margin-top: -60rpx;
-  position: relative;
-  z-index: 1;
-  border-radius: 7rpx;
-  background: white;
-  padding: 32rpx 28rpx;
-  font-size: 31rpx;
-  color: #333333;
-}
-.input-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 24rpx;
-  margin-bottom: 27rpx;
-}
-.input-box text {
-  margin-right: 20rpx;
-  flex-shrink: 0;
-  font-size: 31rpx;
-}
-.input-box input {
-  width: 483rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  box-sizing: border-box;
-  display: block;
-  padding: 0 15rpx;
-  border: 1rpx solid #CCCCCC;
-  border-radius: 4rpx;
-}
-.input-box .input-item:last-child{
-  margin-bottom: 0;
-}
-.picker {
-  display: flex;
-  width: 483rpx;
-  height: 80rpx;
-  box-sizing: border-box;
-  padding-left: 15rpx;
-  border: 1rpx solid #CCCCCC;
-  border-radius: 4rpx;
-  align-items: center;
-  justify-content: space-between;
-}
-.picker .iconfont {
-  width: 80rpx;
-  text-align: center;
-  line-height: 80rpx;
-  border-left: 1rpx solid #CCCCCC;
-  flex-shrink: 0;
-}
-.picker .areatext {
-  flex: 1;
-}
-.tip1 {
-  font-size: 36rpx;
-  padding-left: 52rpx;
-  margin-top: 46rpx;
-  margin-bottom: 26rpx;
-  position: relative;
-  line-height: 33rpx;
-}
-.tip1::before {
-  content:"1";
-  font-size: 0;
-  position: absolute;
-  width: 10rpx;
-  height: 33rpx;
-  left: 24rpx;
-  top: 0;
-  background: linear-gradient(0deg, rgba(251, 197, 34, 0.93), rgba(255, 252, 0, 0.93));
-}
-.uploadimg {
-  display: block;
-  margin-left: 24rpx;
-  width: 249rpx;
-  height: 191rpx;
-  margin-bottom: 50rpx;
-}
-.textarea {
-  font-size: 24rpx;
-  margin: 24rpx;
-  padding: 20rpx 30rpx;
-  border-radius: 7rpx;
-  background: white;
-  display: block;
-  height: 230rpx;
-  width: 640rpx;
-}
-.uploadbtn {
-  display: block;
-  margin: 40rpx auto;
-  width: 558rpx;
-  height: 104rpx;
-}
-.tip2 {
-  text-align: center;
-  font-size: 24rpx;
-  color: #b2b2b2;
-  padding-bottom: 40rpx;
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.js b/pages/activity/huawei/uploadres/index.js
deleted file mode 100644
index 4fd04e0..0000000
--- a/pages/activity/huawei/uploadres/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// pages/activity/huawei/uploadres/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    id:null
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      id:options.id
-    })
-  },
-  gotoPath:function(e){
-    wx.navigateTo({
-      url: e.currentTarget.dataset.path,
-    })
-  },
-  backhome:function(){
-    wx.switchTab({
-      url: '/pages/index/index'
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.json b/pages/activity/huawei/uploadres/index.json
deleted file mode 100644
index 35cf02f..0000000
--- a/pages/activity/huawei/uploadres/index.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "title":"/pages/component/TitleHeader"
-  }
-}
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxml b/pages/activity/huawei/uploadres/index.wxml
deleted file mode 100644
index 76a59da..0000000
--- a/pages/activity/huawei/uploadres/index.wxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--pages/activity/huawei/uploadres/index.wxml-->
-<title title="上传成功"></title>
-<image lazy-load class="logo" src="https://static.ticket.sz-trip.com/xcxImages/huawei/uploadres.png" mode="widthFix"></image>
-<view class="tip1">恭喜您的作品已上传完成！</view>
-<image lazy-load class="btnimg" bindtap="backhome" data-path="/pages/index/index" src="https://static.ticket.sz-trip.com/xcxImages/huawei/gobtn.png" mode="widthFix"></image>
-<image lazy-load class="btnimg" bindtap="gotoPath" data-path="../list/index?id={{id}}" style="margin-bottom:92rpx" src="https://static.ticket.sz-trip.com/xcxImages/huawei/mybtn.png" mode="widthFix"></image>
-<view class="tip2">通过第一轮评审的摄影作品将在9月1号后</view>
-<view class="tip2">进行线上展示，请注意查看平台通知</view>
\ No newline at end of file
diff --git a/pages/activity/huawei/uploadres/index.wxss b/pages/activity/huawei/uploadres/index.wxss
deleted file mode 100644
index 3c5cf0f..0000000
--- a/pages/activity/huawei/uploadres/index.wxss
+++ /dev/null
@@ -1,26 +0,0 @@
-/* pages/activity/huawei/uploadres/index.wxss */
-.logo {
-  display: block;
-  margin: 64rpx auto;
-  width: 414rpx;
-  height: 393rpx;
-}
-.tip1 {
-  font-size: 45rpx;
-  color: #000000;
-  font-weight: 500;
-  margin-bottom: 90rpx;
-  text-align: center;
-}
-.btnimg {
-  display: block;
-  margin: 24rpx auto;
-  width: 558rpx;
-  height: 104rpx;
-}
-.tip2 {
-  text-align: center;
-  font-size: 28rpx;
-  color: #666;
-  margin-bottom: 20rpx;
-}
\ No newline at end of file
diff --git a/pages/info/foodNew/index.js b/pages/info/foodNew/index.js
index 6d25d54..0e38492 100644
--- a/pages/info/foodNew/index.js
+++ b/pages/info/foodNew/index.js
@@ -3,7 +3,7 @@ let device = wx.getSystemInfoSync();
 const ratio = device.windowWidth / 750;
 import commonApi from "../../../utils/https/common"
 import QRCode from '../../../utils/weapp-qrcode.js'
-import util from '../../../utils/util'
+import {pagePoint, gotoDetail} from '../../../utils/util'
 let app = getApp()
 Page({
 
@@ -316,7 +316,7 @@ Page({
                 return;
             } else {
                 if (skuFlag == 'order') {
-                    util.pagePoint({
+                    pagePoint({
                         event: 'product_order',
                         param: {
                             id: this.data.info.id,
@@ -390,7 +390,7 @@ Page({
     // 分享
     share: function () {
         if (!wx.getStorageSync("jstrip_token")) {
-            util.pagePoint({
+            pagePoint({
                 event: 'product_share_login',
                 type: this.data.info.type,
                 id: this.data.info.id
@@ -429,7 +429,7 @@ Page({
                         that.setData({
                             showShareFlag: !this.data.showShareFlag
                         })
-                        util.pagePoint({
+                        pagePoint({
                             event: 'product_share_save',
                             type: that.data.info.type,
                             id: that.data.info.id
@@ -463,7 +463,7 @@ Page({
 
     },
     pagePoint: function (e) {
-        util.pagePoint(e)
+        pagePoint(e)
     },
     // 绘制海报
     drawImg: function () {
@@ -656,7 +656,7 @@ Page({
     },
     gotoDetail: function (e) {
         let item = e.currentTarget.dataset.item;
-        util.pagePoint({
+        pagePoint({
             event: 'recommend_click',
             param: {
                 id: item.id,
@@ -669,7 +669,7 @@ Page({
                 url: '/pages/info/strategyInfo/index?id=' + item.s_id,
             })
         } else {
-            util.gotoDetail(item);
+            gotoDetail(item);
         }
     },
 

From 6c58f5aa64c249bfc9c7fd3de6bd7d6de44ed11b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 27 Sep 2025 15:11:28 +0800
Subject: [PATCH 429/471] =?UTF-8?q?=E7=BE=8E=E9=A3=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                        |  2 +-
 pages/info/foodNew/index.wxml |  1 -
 pages/list/foodNew/index.js   | 14 +++++++++-----
 pages/list/foodNew/index.wxml | 12 ++++++++----
 pages/list/foodNew/index.wxss |  4 +++-
 pages/order/food/index.js     |  4 ++++
 pages/search/list/index.wxss  |  2 ++
 utils/https.js                |  4 ++--
 8 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index 3ece948..87c748c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest136? true : false;
+            data.isTest = data.isTest137? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/foodNew/index.wxml b/pages/info/foodNew/index.wxml
index 93f199b..3feb5be 100644
--- a/pages/info/foodNew/index.wxml
+++ b/pages/info/foodNew/index.wxml
@@ -112,7 +112,6 @@
 </view>
 
 <view class="scroll-all-box"  wx:if="{{info}}">
-    <view style="height:85rpx" wx:if="{{fixed}}"></view>
     <view class="info-box" id="box1">
         <view class="info-title">套餐详情</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
diff --git a/pages/list/foodNew/index.js b/pages/list/foodNew/index.js
index d928f30..0f66bfa 100644
--- a/pages/list/foodNew/index.js
+++ b/pages/list/foodNew/index.js
@@ -12,8 +12,8 @@ Page({
     tagList: [
         {id: 9, name: "品苏式面"},
         {id: 10, name: "尝农家乐"},
-        {id: 11, name: "鉴苏帮菜"},
-        {id: 12, name: "寻夜食堂"},
+        // {id: 11, name: "鉴苏帮菜"},
+        // {id: 12, name: "寻夜食堂"},
     ], // 父标签477
     total:1,
     type:9,
@@ -88,7 +88,7 @@ Page({
     let list = this.data.list,that = this;
     if(list.length>=this.data.total) return;0
     // // 距离排序
-    if(this.data.needDistance && !this.data.lon){
+     if(this.data.needDistance && !this.data.lon){
       wx.getLocation({
         type: 'gcj02',
         success: function (res) {
@@ -111,13 +111,17 @@ Page({
   realgetList:function(){
     let list = this.data.list;
 
+    let param = {}
+    if (this.data.needDistance) {
+        param = {lat:this.data.lat,lon:this.data.lon}
+    }
+
     commonApi._post("supplier/get_supplier_list",{
       supplier_tag_id: this.data.type,
       area_id: (this.data.areas[this.data.areaIndex] || {id: 0}).id,
       offset:list.length,
       limit:10,
-    //   lat:this.data.lat,
-    //   lon:this.data.lon,
+        ...param,
     keyword:this.data.keywords
     }).then(res=>{
       this.setData({
diff --git a/pages/list/foodNew/index.wxml b/pages/list/foodNew/index.wxml
index 718e178..d877f08 100644
--- a/pages/list/foodNew/index.wxml
+++ b/pages/list/foodNew/index.wxml
@@ -11,12 +11,12 @@
         <view>
             <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="name" bindchange="changeArea">
                 <view class="picker feiyi-picker">
-                    <text>{{areaIndex>0?areas[areaIndex].name:'选择地区'}}</text>
+                    <text style="color: {{areaIndex>0?'#FF8530':'#000000'}};">{{areaIndex>0?areas[areaIndex].name:'选择地区'}}</text>
                     <view class="trian-down"></view>
                 </view>
             </picker>
         </view>
-        <view bind:tap="selectDistance">距离最近</view>
+        <view bind:tap="selectDistance" style="color: {{needDistance?'#FF8530':'#000000'}};">距离最近</view>
     </view>
 
 </view>
@@ -29,13 +29,17 @@
   <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2 title">{{item.supplier_name}}</view>
-    <view class="textOver subtitle">{{item.address}}</view>
+    <view class=" subtitle" style="display: flex;">
+        <text class="textOver" style="flex: 1;width: 100rpx;padding-right: 40rpx;">{{item.address}}</text>
+
+        <text style="flex-shrink: 0;" wx:if="{{item.distance>0}}">{{item.distance}}km</text>
+    </view>
     <view class="line" wx:if="{{item.hot_products.length>0}}"></view>
     <view class="prod-container" wx:for="{{item.hot_products}}" wx:for-item="prod" wx:for-index="indexs" wx:key="indexs">
       <view class="prod-item textOver">
             <text class="hot">热</text>
             <text class="price">￥{{prod.price?prod.price/100:0}}</text>
-            <text class="prod-name">{{prod.title}}</text>
+            <text class="prod-name textOver">{{prod.title}}</text>
       </view>
     </view>
   </view>
diff --git a/pages/list/foodNew/index.wxss b/pages/list/foodNew/index.wxss
index 593b84d..52e5e37 100644
--- a/pages/list/foodNew/index.wxss
+++ b/pages/list/foodNew/index.wxss
@@ -26,7 +26,7 @@ page{
     display: flex;
     align-items: flex-end;
     padding: 0 26rpx 50rpx;
-    justify-content: space-between;
+    /* justify-content: space-between; */
     box-sizing: border-box;
 }
 .sale-type {
@@ -40,6 +40,7 @@ page{
     background-size: 100% 100%;
     text-align: center;
     line-height: 77rpx;
+    margin-right: 40rpx;
 }
 .sale-type.active {
     font-weight: bold;
@@ -144,6 +145,7 @@ page{
     text-align: center;
     line-height: 31rpx;
     margin-right: 17rpx;
+    flex-shrink: 0;
 }
 .prod-item .price{
     font-weight: bold;
diff --git a/pages/order/food/index.js b/pages/order/food/index.js
index 6af10de..bac89b3 100644
--- a/pages/order/food/index.js
+++ b/pages/order/food/index.js
@@ -35,6 +35,7 @@ Page({
       })
     })
     console.log(app.globalData.product)
+    this.showAllPrice()
   },
   showNotice:function(){
     this.setData({
@@ -95,11 +96,14 @@ Page({
       productNum:(this.data.productNum-1),
       coupon:null
     })
+    this.showAllPrice()
   },
   add:function(){
     this.setData({
       productNum:this.data.productNum+1
     })
+    this.showAllPrice()
+
   },
   userInput:function(e){
     this.setData({
diff --git a/pages/search/list/index.wxss b/pages/search/list/index.wxss
index 547b428..f0f819c 100644
--- a/pages/search/list/index.wxss
+++ b/pages/search/list/index.wxss
@@ -50,6 +50,7 @@ page {
   font-size: 29rpx;
   color: #333;
   overflow-x: auto;
+  overflow-y: hidden;
 }
 .search-type {
   flex-shrink: 0;
@@ -160,6 +161,7 @@ page {
   font-size: 20rpx;
   line-height: 20rpx;
   align-items: center;
+  overflow: visible;
 }
 .scene-tag {
   position: relative;
diff --git a/utils/https.js b/utils/https.js
index b0f9a8b..d55ab84 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 98fd9eb03d4c69048ad36fe0dec993304e6b654c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 27 Sep 2025 16:45:52 +0800
Subject: [PATCH 430/471] fix

---
 pages/info/foodNew/index.wxss         |  4 ++--
 pages/info/foodProductInfo/index.wxss |  4 ++--
 pages/order/food/index.wxss           |  1 +
 project.private.config.json           | 16 ++++++++--------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pages/info/foodNew/index.wxss b/pages/info/foodNew/index.wxss
index f3c5af7..1714e91 100644
--- a/pages/info/foodNew/index.wxss
+++ b/pages/info/foodNew/index.wxss
@@ -48,10 +48,10 @@ page {
 
 .swiper {
   width: 100%;
-  height: 750rpx;
+  height: 466.67rpx;
 }
 .swiper image,.swiper video {
-  height: 750rpx;
+height: 466.67rpx;
   display: block;
   width: 100%;
 }
diff --git a/pages/info/foodProductInfo/index.wxss b/pages/info/foodProductInfo/index.wxss
index 35fe5d5..3043e62 100644
--- a/pages/info/foodProductInfo/index.wxss
+++ b/pages/info/foodProductInfo/index.wxss
@@ -5,10 +5,10 @@ page {
 
 .swiper {
   width: 100%;
-  height: 750rpx;
+  height: 466.67rpx;
 }
 .swiper image,.swiper video {
-  height: 750rpx;
+  height: 466.67rpx;
   display: block;
   width: 100%;
 }
diff --git a/pages/order/food/index.wxss b/pages/order/food/index.wxss
index 0b1e087..f9ec664 100644
--- a/pages/order/food/index.wxss
+++ b/pages/order/food/index.wxss
@@ -60,6 +60,7 @@ margin-top: 30rpx;
     font-size: 33rpx;
     color: #000000;
     flex-shrink: 0;
+    flex-shrink: 0;
 }
 .info-tips  text {
   font-size: 24rpx;
diff --git a/project.private.config.json b/project.private.config.json
index f1281d1..bd11fff 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,23 +7,23 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/activity/huawei/index",
-          "pathName": "pages/activity/huawei/index",
-          "query": "",
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/foodProductInfo/index",
+          "query": "id=464484",
           "scene": null,
           "launchMode": "default"
         },
         {
-          "name": "pages/info/roadInfo/index",
-          "pathName": "pages/list/foodNew/index",
+          "name": "pages/activity/huawei/index",
+          "pathName": "pages/activity/huawei/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "pages/info/foodProductInfo/index",
-          "query": "id=457647",
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/list/foodNew/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         }

From c2a215a40cd95dd6fd468d8110a5f5cfab952e74 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 30 Sep 2025 15:45:28 +0800
Subject: [PATCH 431/471] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 app.json                                      |  8 +-
 pages/component/kefu/index.js                 | 58 ++++++++++++
 pages/component/kefu/index.json               |  4 +
 pages/component/kefu/index.wxml               | 24 +++++
 pages/component/kefu/index.wxss               | 88 +++++++++++++++++++
 pages/index/index.js                          |  9 +-
 pages/index/index.wxml                        | 43 +++++++--
 pages/index/index.wxss                        | 64 ++++++++++++++
 pages/info/foodProductInfo/index.js           | 16 ++--
 pages/info/foodProductInfo/index.wxml         | 12 +--
 pages/map/index.wxml                          | 17 ++--
 pages/map/index.wxss                          |  2 +-
 pages/order/components/date/index.wxss        |  1 +
 pages/order/food/index.js                     | 14 +--
 pages/order/food/index.wxml                   |  4 +-
 pages/order/orderList/index.wxml              |  2 +-
 pages/order/scene/index.js                    |  7 +-
 pages/user/order/foodOrderInfo/index.js       |  2 +-
 pages/user/order/foodOrderInfo/index.wxml     | 73 ++++++++++-----
 pages/user/order/list.js                      |  7 +-
 pages/user/order/postOrderInfo/index.js       | 61 ++++++++++++-
 pages/user/order/postOrderInfo/index.wxml     | 53 +++++++++++
 pages/user/order/postOrderInfo/index.wxss     | 63 ++++++++++++-
 pages/user/order/sceneOrderInfo/index.wxml    |  6 +-
 pages/user/service/info/index.json            |  3 +-
 pages/user/service/info/index.wxml            |  6 +-
 pages/user/service/list/index.js              |  3 +-
 pages/user/service/list/index.json            |  3 +-
 pages/user/service/list/index.wxml            | 27 +-----
 pages/user/user.json                          |  4 +-
 pages/user/user.wxml                          |  5 +-
 project.private.config.json                   | 20 +----
 .../foodListNew}/index.js                     | 12 +--
 .../foodListNew}/index.json                   |  0
 .../foodListNew}/index.wxml                   |  2 +-
 .../foodListNew}/index.wxss                   |  0
 {pages/info => subPackages}/foodNew/index.js  | 25 +++---
 .../info => subPackages}/foodNew/index.json   |  3 +-
 .../info => subPackages}/foodNew/index.wxml   | 14 +--
 .../info => subPackages}/foodNew/index.wxss   |  0
 subPackages/gwcOrder/index.js                 |  7 +-
 subPackages/gwcOrder/index.wxml               |  7 +-
 utils/util.js                                 |  9 ++
 44 files changed, 626 insertions(+), 164 deletions(-)
 create mode 100644 pages/component/kefu/index.js
 create mode 100644 pages/component/kefu/index.json
 create mode 100644 pages/component/kefu/index.wxml
 create mode 100644 pages/component/kefu/index.wxss
 rename {pages/list/foodNew => subPackages/foodListNew}/index.js (93%)
 rename {pages/list/foodNew => subPackages/foodListNew}/index.json (100%)
 rename {pages/list/foodNew => subPackages/foodListNew}/index.wxml (97%)
 rename {pages/list/foodNew => subPackages/foodListNew}/index.wxss (100%)
 rename {pages/info => subPackages}/foodNew/index.js (97%)
 rename {pages/info => subPackages}/foodNew/index.json (57%)
 rename {pages/info => subPackages}/foodNew/index.wxml (96%)
 rename {pages/info => subPackages}/foodNew/index.wxss (100%)

diff --git a/app.js b/app.js
index 87c748c..f062e34 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest137? true : false;
+            data.isTest = data.isTest139? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/app.json b/app.json
index 2cfabeb..0847ea2 100644
--- a/app.json
+++ b/app.json
@@ -182,9 +182,7 @@
     "pages/order/WineSceneOrder/index",
     "pages/order/showOrderNew/index",
     "pages/user/order/showOrderInfo/index",
-    "pages/user/suggest/suggest",
-    "pages/list/foodNew/index",
-    "pages/info/foodNew/index"
+    "pages/user/suggest/suggest"
   ],
   "subpackages": [
     {
@@ -204,7 +202,9 @@
         "goods/oneCardTour/info/index",
         "feiyiNew/CGCIndex/index",
         "feiyiNew/CGCLetter/index",
-        "feiyiNew/CGCTime/index"
+        "feiyiNew/CGCTime/index",
+        "foodListNew/index",
+        "foodNew/index"
       ]
     },
     {
diff --git a/pages/component/kefu/index.js b/pages/component/kefu/index.js
new file mode 100644
index 0000000..c3f255b
--- /dev/null
+++ b/pages/component/kefu/index.js
@@ -0,0 +1,58 @@
+// pages/component/kefu/index.js
+import commonApi from "../../../utils/https/common.js"
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    
+  },
+  data: {
+      show: false,
+      showPhone: false,
+      info: "",
+      phones: []
+  },
+  lifetimes: {
+    attached() {
+      console.log('组件已挂载到页面');
+      this.initData();
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+
+
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    initData () {
+        commonApi._post("kefu_tips/getTips", {platform:'miniapp'}).then(res=>{
+            if (res.data) {
+                this.setData({
+                    showPhone: res.data.is_online,
+                    info: res.data.content,
+                    phones: res.data.emergency_phones
+                })
+            }
+        })
+    },
+
+    hideModal: function () {
+        this.setData({
+            show: false,
+        })
+        this.triggerEvent('hideModal');
+    },
+    phoneCall:function(e){
+        let phone = e.currentTarget.dataset.phone;
+        wx.makePhoneCall({
+          phoneNumber: phone,
+        })
+    },
+  }
+})
\ No newline at end of file
diff --git a/pages/component/kefu/index.json b/pages/component/kefu/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/component/kefu/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/component/kefu/index.wxml b/pages/component/kefu/index.wxml
new file mode 100644
index 0000000..5cb1074
--- /dev/null
+++ b/pages/component/kefu/index.wxml
@@ -0,0 +1,24 @@
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<view class="bg">
+    <view class="modal-mask" bindtap="hideModal" catchtouchmove="preventTouchMove"></view>
+    <view class="modal-dialog">
+        <view class="iconfont icon-close" bindtap="hideModal">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250929/75f708ed1c580afdefd3aed82d53f94a.png"></image>
+        </view>
+        <view class="modal-content">
+            
+            <rich-text style="width: 100%;word-break: break-all;"
+            nodes="{{tool.formateRichText(info)}}"></rich-text>
+        
+            <view class="phone-container" wx:for="{{phones}}" wx:if="{{showPhone}}">
+                <view bind:tap="phoneCall" data-phone="{{item}}">{{item}}</view>
+            </view>
+        </view>
+
+        <view class="modal-footer">
+            <view  class="btn-confirms two" style="border-right: 1px solid #D8D8D8;" bindtap="hideModal">取消</view>
+            <button class="btn-confirms"
+            open-type="contact" bindcontact="handleContact">确定</button>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/component/kefu/index.wxss b/pages/component/kefu/index.wxss
new file mode 100644
index 0000000..493b418
--- /dev/null
+++ b/pages/component/kefu/index.wxss
@@ -0,0 +1,88 @@
+.bg{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.modal-mask {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000;
+    opacity: 0.5;
+    overflow: hidden;
+    z-index: 200;
+    color: #fff;
+}
+
+.modal-dialog {
+    width: 540rpx;
+    overflow: hidden;
+    position: relative;
+    z-index: 9999;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+}
+.modal-content{
+    padding: 38rpx 26rpx;
+}
+
+
+.modal-footer {
+    display: flex;
+    flex-direction: row;
+    height: 112rpx;
+    border-top: 1px solid #dedede;
+    
+    
+    color: #000000;
+    padding:  30rpx 0;
+    box-sizing: border-box;
+}
+
+
+
+
+.btn-confirms {
+    flex: 1;
+    text-align: center;
+    font-weight: normal !important;
+    box-sizing: border-box;
+    width: 50% !important;
+    padding: 0 !important;
+    line-height: 50rpx;
+    background: none;
+    color: #0C898F;
+    font-weight: 500;
+    font-size: 32rpx;
+}
+.btn-confirms.two {
+    color: #000000;
+}
+
+.icon-close{
+    position: absolute;
+    width: 27.33rpx;
+    height: 27.33rpx;
+    top: 39rpx;
+    right: 26rpx;
+}
+.icon-close image{
+    width: 100%;
+    height: 100%;
+}
+.phone-container{
+    text-align: center;
+    font-weight: 500;
+font-size: 27rpx;
+color: #0C898F;
+line-height: 1.8;
+}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 1b0e9ea..f15e290 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -7,6 +7,7 @@ import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 import https from "../../utils/https.js"
+import { unix } from "dayjs"
 
 Page({
 	data: {
@@ -1050,7 +1051,13 @@ Page({
         if (app.globalData.innerAudioContext) {
             app.globalData.innerAudioContext.stop()
         }
-	},
+    },
+    
+    goAIUrl () {
+        wx.switchTab({
+          url: '/pages/pbService/aiHelpYou/index',
+        })
+    },
 
 	/**
 	 * 用户点击右上角分享
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 234c7dd..c69fb11 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -52,7 +52,6 @@
                 </block>
             </swiper> -->
             <view class="top-icons no-scrollbar">
-            
                 <view bindtap="mainNavClick" class="top-icon-item" data-item="{{item}}" wx:for="{{mainTypeList}}" wx:key="index">
                     <image lazy-load src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
                     <view class="top-icon-text">{{item.menu_name}}</view>
@@ -85,10 +84,14 @@
             </view>
 
             <!-- 限时特惠--新版-->
-            <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{func_data.hot_deals}}">
+            <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.hot_deals}}">
+                <image lazy-load class="common-header-img" mode="widthFix" src="{{indexSeason.hotBac}}"></image>
+                <!-- <image lazy-load class="common-header-img" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20250929/49cb17e72c8841c9a72f2d109901de83.png"></image> -->
+                
+            </view>
                 <!-- 上方标题部分 -->
-                <view class="xsth-title">
-                    <view class="xsth-left" style="display: flex;">
+                <!-- <view class="xsth-title">
+                     <view class="xsth-left" style="display: flex;">
                         <image lazy-load  wx:if="{{xpthIndex==0}}" mode="widthFix" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
                         <image lazy-load   wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="widthFix" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
                         
@@ -96,11 +99,12 @@
                             <image lazy-load  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="widthFix" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
                             <image lazy-load   wx:else  mode="widthFix" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
                         </view>
-                        
                     </view>
-                </view>
+                </view> -->
+       
+            <view style="margin-top: -38rpx;" wx:if="{{func_data.hot_deals}}">
                 <!-- 热门 -->
-                <view style="width: 100%;" wx:if="{{xpthIndex==0}}">
+                <view style="width: 100%;" wx:if="{{false}}">
                     <scroll-view scroll-x style="height:372rpx;padding-top: 25rpx;">
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}" data-source="当季热门">
@@ -121,7 +125,7 @@
                 </view>
 
                 <!-- 显示特惠 -->
-                <view class="xpth-product" wx:else="">
+                <view class="xpth-product" wx:if="{{false}}">
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id" data-source="限时特惠">
@@ -152,6 +156,26 @@
                         </view> -->
                     </view>
                 </view>
+
+                <view class="hot-prod-new">
+
+                    <view class="hot-prod-left" bindtap="productGotoDetail" data-item="{{list[0]}}" wx:key="id" data-source="当季热门">
+                        <image lazy-load class="prod-img" src="{{list[0].headimg}}" mode="aspectFill" />
+                        <view class="xpth-item-title">{{list[0].subtitle}}</view>
+                    </view>
+
+                    <view class="hot-prod-right">
+                        <view class="hot-right-item hot-prod-left" bindtap="productGotoDetail" data-item="{{list[1]}}" wx:key="id" data-source="当季热门">
+                            <image lazy-load class="prod-img" src="{{list[1].headimg}}" mode="aspectFill" />
+                            <view class="xpth-item-title">{{list[1].subtitle}}</view>
+                        </view>
+                        <view class="hot-right-item hot-prod-left" bindtap="productGotoDetail" data-item="{{list[2]}}" wx:key="id" data-source="当季热门">
+                            <image lazy-load class="prod-img" src="{{list[2].headimg}}" mode="aspectFill" />
+                            <view class="xpth-item-title">{{list[2].subtitle}}</view>
+                        </view>
+                    </view>
+                </view>
+
             </view>
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
@@ -332,6 +356,9 @@
         </view>
     </view>
 
+
+    <!-- 底部AI伴你游 -->
+    <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20250929/6f29f557e80a331e84f01f2a5083d933.gif"></image>
 </view>
 
 
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5a361aa..0e33f6c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -7,6 +7,7 @@
     overflow-y: auto;
     background-size: 100% 100%;
     background-repeat: no-repeat;
+    padding-bottom: 220rpx;
     /* background-color:#E8F9FA; */
 
 }
@@ -1038,4 +1039,67 @@
     margin-top: 20rpx;
     margin-left: -6rpx;
     margin-right: 0rpx;
+  }
+
+  .ai-fix{
+      position: fixed;
+      width: 150.33rpx;
+      height: 200rpx;
+      bottom: 30rpx;
+      right: 24rpx;
+      z-index: 100;
+  }
+  .hot-prod-new{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
+  .hot-prod-left{
+      width: 400rpx;
+      height: 350rpx;
+      position: relative;
+  }
+  .hot-prod-left .prod-img{
+      width: 100%;
+      height: 100%;
+      border-radius: 20rpx;
+  }
+  .hot-prod-left .xpth-item-title{
+      position: absolute;
+      width: 100%;
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #FFFFFF;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      top: 0;
+      height: 100%;
+      width: 100%;
+      background: linear-gradient(to bottom, rgba(0,0,0,0),rgba(0,0,0,0.5)) ;
+      display: flex;
+      border-radius: 20rpx;
+      padding: 0 8rpx 6rpx;
+      box-sizing: border-box;
+      overflow: hidden;
+      align-items: flex-end;
+  }
+
+  .hot-prod-right{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 350rpx;
+    align-items: flex-end;
+    flex: 1;
+    width: 100rpx;
+    padding-left: 14rpx;
+  }
+
+  .hot-prod-right .hot-right-item{
+      
+      height: 167rpx;
+      width: 100%;
+
   }
\ No newline at end of file
diff --git a/pages/info/foodProductInfo/index.js b/pages/info/foodProductInfo/index.js
index 6a7fde7..316515d 100644
--- a/pages/info/foodProductInfo/index.js
+++ b/pages/info/foodProductInfo/index.js
@@ -62,12 +62,12 @@ Page({
             id: options.id
         })
         // 获取购物车按钮的位置
-        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-        //     console.log(res)
-        //     that.setData({
-        //         cartTop: res.top
-        //     })
-        // }).exec()
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
         if (options.ZTPoint) {
             this.setData({
                 ZTPoint: options.ZTPoint
@@ -141,8 +141,8 @@ Page({
             console.log(swiperRange)
             this.setData({
                 info: resData,
-                supplierId: res.data.supplier_id,
-                iShop: res.data.supplier_id ? true : false,
+                supplierId: res.data.scene_id,
+                iShop: res.data.scene_id ? true : false,
                 swiperRange: swiperRange,
             })
 
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index df11404..52d4c9c 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/info/hotelProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
-<view class="share-icon" bindtap="share"></view>
+<!-- <view class="share-icon" bindtap="share"></view> -->
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
@@ -127,7 +127,7 @@
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
-  <navigator wx:if="{{iShop}}" url="/pages/info/foodNew/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <navigator wx:if="{{iShop}}" url="/subPackages/foodNew/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
   <view class="shop-box">
     <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
     <view>店铺</view>
@@ -146,16 +146,16 @@
 
 
   <view class="btns">
-    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
-    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn" bindtap="order">加入购物车</view>
+    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" >立即购买</view>
     <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator> -->
+</navigator>
 <view class="mask" wx:if="{{skuFlag}}">
   <view class="mask-bg" bindtap="hideSku"></view>
   <view class="mask-content">
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 1f467da..473e478 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -24,18 +24,23 @@
       <image lazy-load class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
       <text class="text">场馆</text>
     </view>
-    <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+    <!-- <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
       <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
-    </view>
+    </view> -->
     <!-- <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
       <image lazy-load class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
       <text class="text">公共自行车</text>
     </view> -->
+    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
+      <image lazy-load class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
+      <text class="text">行李寄存</text>
+    </view>
     <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
       <image lazy-load class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
       <text class="text">运河十景</text>
     </view>
+
   </view>
 </view>
 <view class="menus2" wx:else>
@@ -59,18 +64,18 @@
       <image lazy-load class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
       <text class="text">游客中心</text>
     </view>
-    <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+    <!-- <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
       <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
-    </view>
+    </view> -->
     <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
       <image lazy-load class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
       <text class="text">行李寄存</text>
     </view>
-    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
+    <!-- <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
       <image lazy-load class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
       <text class="text">特产</text>
-    </view>
+    </view> -->
     <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
       <image lazy-load class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
       <text class="text">美食</text>
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 9faef2f..240c678 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -583,7 +583,7 @@
   display: flex;
   /* justify-content: space-around; */
   flex-wrap: wrap;
-  width: calc(170rpx * 7);
+  width: calc(170rpx * 6);
   margin: 0 20rpx;
 }
 
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index 4c5d8e8..3ee82a9 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -123,6 +123,7 @@
   right: 0;
   bottom: 0;
   padding-bottom: 50rpx;
+  z-index: 50;
 }
 .short-date {
   font-weight: 500;
diff --git a/pages/order/food/index.js b/pages/order/food/index.js
index bac89b3..1a3cf66 100644
--- a/pages/order/food/index.js
+++ b/pages/order/food/index.js
@@ -116,13 +116,13 @@ Page({
     })
   },
   order:function(){
-    if(!this.data.user){
-      wx.showToast({
-        title: '请输入联系人',
-        icon: 'none'
-      })
-      return;
-    }
+    // if(!this.data.user){
+    //   wx.showToast({
+    //     title: '请输入联系人',
+    //     icon: 'none'
+    //   })
+    //   return;
+    // }
     if(!this.data.tel){
       wx.showToast({
         title: '请输入手机号',
diff --git a/pages/order/food/index.wxml b/pages/order/food/index.wxml
index 91d0358..4f4c5c3 100644
--- a/pages/order/food/index.wxml
+++ b/pages/order/food/index.wxml
@@ -19,10 +19,10 @@
     <view class="number-box">{{productNum}}</view>
     <view class="iconfont icon-add-select" bindtap="add"></view>
   </view>
-  <view class="box-title">
+  <!-- <view class="box-title">
     <view style="flex-shrink:0">联系人：</view>
     <input type="text" value="{{user}}" bindinput="userInput" placeholder="输入您的名字"></input>
-  </view>
+  </view> -->
   <view class="box-title">
     <view style="flex-shrink:0">手机号：</view>
     <input type="number" value="{{tel}}" bindinput="telInput" placeholder="请输入手机号"></input>
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index d5c8c9c..2245a77 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -37,7 +37,7 @@
 			<view>X{{item.num}}</view>
 		</view>
         <view class="item-box item-title" style="padding-top: 27rpx;">出行人信息</view>
-        <view wx:if="{{item.sku.sku_model.is_authentication != 0}}">
+        <view wx:if="{{item.sku.sku_model.is_authentication}}">
             <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
                 <view>
                     <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index eb8dba9..6d9a940 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -65,7 +65,7 @@ Page({
 	  ticket_type:app.globalData.product.sku.ticket_type || 1,
       isCar:options.isCar,
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
-      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
       date: app.globalData.product.date,
       time: app.globalData.product.time || {},
@@ -505,6 +505,8 @@ Page({
         remark: remark,
         product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
         phone:this.data.phone,// 不实名的时候传的手机号参数
+        // 美食预定
+        reserve_mobile: product.product.type=="food"?this.data.phone:"",
       }],
       originate_order_id: this.data.kjId,
       gp_id: app.globalData.gp_id,
@@ -541,8 +543,9 @@ Page({
 	if(app.globalData.list){
     app.globalData.list[app.globalData.index] = this.data.product
     // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
-    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+    if (!app.globalData.list[app.globalData.index].sku.sku_model.is_authentication) {
       app.globalData.list[app.globalData.index].phone = this.data.phone
+    //   app.globalData.list[app.globalData.index].reserve_mobile = this.data.phone
       app.globalData.list[app.globalData.index].linkmanList = []
     }else {
       app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
diff --git a/pages/user/order/foodOrderInfo/index.js b/pages/user/order/foodOrderInfo/index.js
index 18adada..a21abf8 100644
--- a/pages/user/order/foodOrderInfo/index.js
+++ b/pages/user/order/foodOrderInfo/index.js
@@ -194,7 +194,7 @@ Page({
 
 callPhone :function () {
     wx.makePhoneCall({
-        phoneNumber: this.data.info.order_product_list[0].supplier_info.phone,
+        phoneNumber: this.data.info.order_product_list[0].scene_detail.tel,
     })
 },
 
diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml
index c015640..267a3d1 100644
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@@ -19,8 +19,8 @@
 
 <!-- 美食的 -->
 
-<view class="box" wx:if="{{product_model=='food'}}">
-  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}"  wx:for="{{info.order_product_list}}">
+<view  wx:if="{{product_model=='food'}}">
+  <view class="box" wx:if="{{info.order_product_list && info.order_product_list.length>0}}"  wx:for="{{info.order_product_list}}">
     <view class="product-info">
     <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
@@ -39,30 +39,42 @@
     </view>
     <view class="state_text">{{item.state_text}}</view>
 
-    <view class="detail-item">
-    <text>商品总额：</text>
-    <text style="font-weight: bold;color: #111111;">￥{{info.total_money/100}}</text>
-  </view>
-  <view class="detail-item" wx:if="{{info.total_post_fee}}">
-    <text>运费</text>
-    <text style="font-weight: bold;color: #111111;">￥{{info.total_post_fee/100}}</text>
-  </view>
-  <view class="detail-item" wx:if="{{info.preference_money}}">
-    <text>优惠券：</text>
-    <text style="font-weight: bold;color: #111111;">-￥{{info.preference_money/100}}</text>
-  </view>
-  <view class="detail-item">
-    <text>实付金额：</text>
-    <view class="price">{{info.paid_money/100}}</view>
-  </view>
-  </view>
+    <view class="detail-item" wx:if="{{item.paid_money}}">
+        <text>小计</text>
+        <text style="color: #DC2525;font-weight: bold;">￥{{item.paid_money/100}}</text>
+    </view>
+
+
+    <view class="box-title">商家信息</view>
+        <view class=" supplier-mask">
+            <view class="mask-shop-info">
+                <view>{{info.order_product_list[0].supplier_info.shop_name}}</view>
+                <view class="shop-info-item">
+                    <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/time.png"></image>
+                    <view>
+                        <view>营业时间</view>
+                        <view class="subtitle">{{info.order_product_list[0].supplier_info.business_hours}}</view>
+                    </view>
+                </view>
+                <view class="shop-info-item" style="justify-content: space-between;">
+                    <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/address.png"></image>
+                    <view style="flex: 1;width: 100rpx;">
+                        <view>{{info.order_product_list[0].supplier_info.address}}</view>
+                        <view class="subtitle" wx:if="{{info.order_product_list[0].supplier_info.distance>0}}">据您约{{info.order_product_list[0].supplier_info.distance}}km</view>
+                    </view>
+                    <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+                    <image class="icon-phone" catch:tap="gotolocation" src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+                </view>
+
+            </view>
+        </view>
+    </view>
 
 
   
 </view>
-<view class="box" wx:if="{{info && product_model=='food'}}">
+<!-- <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">商家信息</view>
-
   <view class=" supplier-mask">
     <view class="mask-shop-info">
         <view>{{info.order_product_list[0].supplier_info.shop_name}}</view>
@@ -85,7 +97,7 @@
 
     </view>
   </view>
-</view>
+</view> -->
 <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">订单信息</view>
 
@@ -102,8 +114,23 @@
   <view class="detail-item" wx:if="{{info.pay_method}}">
     <text>支付方式：{{pay_methods[info.pay_method]}}</text>
   </view>
+  <view class="detail-item">
+    <text>商品总额：￥{{info.total_money/100}}</text>
+  </view>
+  <view class="detail-item" wx:if="{{info.total_post_fee}}">
+    <text>运费：￥{{info.total_post_fee/100}}</text>
+  </view>
+  <view class="detail-item" wx:if="{{info.preference_money}}">
+    <text>优惠券：-￥{{info.preference_money/100}}</text>
+  </view>
+  <view class="detail-item">
+    <text>实付金额：<text>{{info.paid_money/100}}</text></text>
+  </view>
+  <view class="detail-item" style="font-weight: bold;" wx:if="{{info.state=='UNPAID'}}">
+    <text>剩余时间：00:{{minute}}:{{second}}</text>
+  </view>
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
+    <!-- <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view> -->
     <navigator url="/pages/info/foodProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index 584fcc5..978a08f 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -114,6 +114,11 @@ Page({
           ajaxes.push(ajax);
           indexes.push(index);
         }
+        // 权益卡只展示第一个
+        if (item.is_order_card_product==1) {
+            item.order_product_list = [item.order_product_list[0]]
+        }
+
         item.orderNum = orderNum;
       })
       console.log(ajaxes)
@@ -141,7 +146,7 @@ Page({
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
-    item = this.getChild(item)
+    // item = this.getChild(item)
     util.gotoOrder(item)
   },
   
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 6325b72..75339e3 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -23,7 +23,12 @@ Page({
     pay_methods:app.globalData.pay_methods,
     tjList:[],
     showLoading:true,
-    ids:[]
+    ids:[],
+
+    // 权益卡
+    isCard: false,
+    cardPostList: [],
+    deliveryNum: 0,
   },
 
   /**
@@ -309,11 +314,36 @@ getInfo () {
           state = state + order.state;
           order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
         })
+
+        // 权益卡 
+        let cardPostList = [];
+        let isCard= false;
+        let deliveryNum = 0;
+        if (res.data.order_product_list.some(v=>v.order_card_product)) {
+            cardPostList = res.data.order_product_list.slice(1)
+            res.data.order_product_list = [res.data.order_product_list[0]]
+            isCard = true;
+            cardPostList.forEach(v=>{
+                console.log(v)
+                if (v.order_card_product) {
+                        v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
+                        v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
+                        v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
+                }
+                if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) {
+                    deliveryNum += 1
+                }
+            })
+        }
+
         this.setData({
           isRefund:state.indexOf("REFUND")!=-1,
           info:res.data,
           product_model:res.data.order_product_list[0].product_model,
-          ids: proId.join(",")
+          ids: proId.join(","),
+          cardPostList: cardPostList,
+          isCard: isCard,
+          deliveryNum: deliveryNum
         })
         this.getCodeImg()
       })
@@ -377,12 +407,35 @@ getInfo () {
       } else {
            res.data.is_all_confirm = false;
       }
-
+      // 权益卡 
+      let cardPostList = [];
+      let isCard= false;
+      let deliveryNum = 0;
+      if (res.data.order_product_list.some(v=>v.order_card_product)) {
+          cardPostList = res.data.order_product_list.slice(1)
+          res.data.order_product_list = [res.data.order_product_list[0]]
+          isCard = true;
+          cardPostList.forEach(v=>{
+              console.log(v)
+              if (v.order_card_product) {
+                    v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
+                    v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
+                    v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
+              }
+              if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) {
+                deliveryNum += 1
+              }
+          })
+      }
+      console.log(res.data, 'aaa')
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
         product_model:res.data.order_product_list[0].product_model,
-        ids: proId.join(",")
+        ids: proId.join(","),
+        cardPostList: cardPostList,
+        isCard: isCard,
+        deliveryNum: deliveryNum
       })
       this.getCodeImg()
     })
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index e7e887a..563d837 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -120,6 +120,57 @@
             </view>
             <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
         </view>
+
+        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" wx:if="{{isCard&&cardPostList.length>0}}">
+            <view class="box-title" style="position: relative;">
+                物流信息
+                <text bind:tap="expandPost" data-index="{{index}}" class="expand-tip" >{{item.showMore?"收起":"展开"}}</text>
+            </view>
+            <view style="height:{{item.showMore?'auto':'340rpx'}};overflow: hidden;">
+                <view class="detail-item post-line-info">
+                    <text>当前已发：{{deliveryNum}}</text>
+                </view>
+                <view class="detail-item post-line-info" style="margin-bottom: 20rpx;">
+                    <text>当前待发：{{cardPostList.length - deliveryNum}}</text>
+                </view>
+
+
+                <view class="my-shipment-place" style="display: flex;" wx:for="{{cardPostList}}" wx:for-item="shipment" wx:for-index="shipIndex">
+                <view class="line-card">
+                    <view wx:if="{{shipIndex==0}}" class="first-line"></view>
+                    <view wx:if="{{shipIndex==(cardPostList.length-1)}}" class="last-line"></view>
+                    <view class="line-dot ">
+                        <image wx:if="{{shipment.post_detail_list&&shipment.post_detail_list[0]}}" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20250928/397edd1ef1daba7026d2900f1a59ff7d.png"></image>
+                    </view>
+                    <view class="{{shipment.post_detail_list&&shipment.post_detail_list[0]?'completed':''}}">{{shipment.order_card_product.month}}月</view>
+                </view>
+
+                <view class="post-child-item" style="margin-bottom: 0;">
+                    <view class="detail-item post-line-info">
+                        <text class="textOver" style="font-weight: bold;font-size: 27rpx;width: 400rpx;">{{shipment.sku_name}}</text>
+                        <text style="color: #0B898E;">{{shipment.state_text}}</text>
+                    </view>
+                    <view  wx:if="{{shipment.post_detail_list&&shipment.post_detail_list[0]}}">
+                    <view class="detail-item post-line-info">
+                        <text>快递公司：{{shipment.post_detail_list[0].express_name}}</text>
+                    </view>
+                    <view class="detail-item post-line-info">
+                        <text>快递单号：</text>
+                        <view style="flex:1;width: 1rpx;">
+                            {{shipment.post_detail_list[0].courier_number}} <text data-num="{{shipment.post_detail_list[0].courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                        </view>
+                    </view>
+                    </view>
+
+                    <view class="detail-item post-line-info">
+                        <text>发货时间：{{shipment.order_card_product.delivery_start_date}} 至 {{shipment.order_card_product.delivery_end_date}} </text>
+                    </view>
+                </view>
+            </view>
+            </view>
+            
+        </view>
+
     </view>
 </view>
 
@@ -169,6 +220,8 @@
         <!-- <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator> -->
         <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
         <view class="btn" wx:if="{{info.is_all_confirm}}" bind:tap="toConfirmPost">确认收货</view>
+        <view class="btn" wx:if="{{isCard}}" bind:tap="toConfirmPost">确认收货</view>
+
         <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
         <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
         <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>
diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss
index 6d3e75b..e02e564 100644
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@@ -371,11 +371,72 @@ color: #333333;
     width: fit-content;
     margin: 0 auto;
     box-sizing: border-box;
-    margin-top: 20rpx;
 }
 .expand-tip{
     position: absolute;
     color: #0B898E;
     right: 0;
     bottom: 0;
+}
+
+.line-card{
+    
+    width: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    font-weight: bold;
+    font-size: 23rpx;
+    color: #999999;
+    position: relative;
+    /* height: 100%; */
+}
+.line-card .line-dot{
+    width: 33rpx;
+    height: 33rpx;
+    background: #CCCCCC;
+    border-radius: 50%;
+    position: absolute;
+    left: -16.5rpx;
+    top: calc(50% - 16.5rpx);
+    z-index: 3;
+}
+.first-line{
+    height: 50%;
+    position: absolute;
+    top: 0;
+    width: 4rpx;
+    left: -2rpx;
+    z-index: 2;
+    background: white;
+    z-index: 2;
+}
+.last-line{
+    height: 50%;
+    position: absolute;
+    bottom: 0;
+    width: 4rpx;
+    left: -2rpx;
+    z-index: 2;
+    background: white;
+    z-index: 2;
+}
+.my-shipment-place{
+    box-sizing: border-box;
+    margin-left: 20rpx;
+    border-left: 1px solid #ccc;
+    padding-bottom: 20rpx;
+}
+.my-shipment-place:last-of-type{
+    
+    padding-bottom: 0rpx;
+}
+.completed{
+    color: #0b898e;
+}
+.line-dot image{
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
 }
\ No newline at end of file
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index acd1c1b..8d5d702 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -85,9 +85,9 @@
                 </text>
             </view>
             <view class="post-child" style="padding-top: 12rpx;">
-                <view wx:if="{{item.sku_model.is_authentication == 0}}">
+                <view wx:if="{{!item.sku_model.is_authentication}}">
                     <view class="detail-item">
-                        <text>手机号： {{item.phone}}</text>
+                        <text>手机号： {{item.phone || item.reserve_mobile}}</text>
                     </view>
                 </view>
                 <view wx:else style="overflow: hidden; max-height:{{item.showMore?'100vh':'180rpx'}};">
@@ -122,8 +122,6 @@
 
     </view>
 
-    <view wx:elif=""></view>
-
     <view wx:else>
         <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
             <view class="product-info-top">
diff --git a/pages/user/service/info/index.json b/pages/user/service/info/index.json
index 35cf02f..d1688bb 100644
--- a/pages/user/service/info/index.json
+++ b/pages/user/service/info/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "kefuCom": "/pages/component/kefu"
   }
 }
\ No newline at end of file
diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml
index 4de9a47..cc678e9 100644
--- a/pages/user/service/info/index.wxml
+++ b/pages/user/service/info/index.wxml
@@ -21,7 +21,7 @@
 </view>
 
 
-<view class="mask" wx:if="{{showPhoneMask}}">
+<!-- <view class="mask" wx:if="{{showPhoneMask}}">
   <view class="mask-bg" bindtap="closePhoneMask"></view>
   <view class="mask-content" style="text-align:center;width:70%;border-radius:10rpx">
     <view class="num-pay-top" style="font-weight: bold;padding: 30rpx 60rpx;font-size: 30rpx;">
@@ -33,4 +33,6 @@
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</view> -->
+
+<kefuCom wx:if="{{showPhoneMask}}" bind:hideModal="closePhoneMask"></kefuCom>
\ No newline at end of file
diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js
index b9eedb9..f83638e 100644
--- a/pages/user/service/list/index.js
+++ b/pages/user/service/list/index.js
@@ -14,8 +14,7 @@ Page({
     page_no:1,
     keyword:"",
     showModal: false,
-    // 成功
-    ses:true,
+
 
   },
 
diff --git a/pages/user/service/list/index.json b/pages/user/service/list/index.json
index 35cf02f..d1688bb 100644
--- a/pages/user/service/list/index.json
+++ b/pages/user/service/list/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "kefuCom": "/pages/component/kefu"
   }
 }
\ No newline at end of file
diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml
index 1081b19..2b3adbc 100644
--- a/pages/user/service/list/index.wxml
+++ b/pages/user/service/list/index.wxml
@@ -12,27 +12,6 @@
 <!-- <navigator url="list/index?typeid={{typeId}}" class="more-btn" bindtap="showService">没找到想要的答案？一键呼唤<text>人工客服</text></navigator> -->
 <!-- <button class="more-btn" open-type="contact" bindcontact="handleContact">没找到想要的答案？一键呼唤<text>人工客服</text></button> -->
 <view class="more-btn" bindtap="showDialogBtn">没找到想要的答案？一键呼唤<text>人工客服</text></view>
-<!-- 弹出层 -->
-    <view
-      class="modal-mask"
-      bindtap="hideModal"
-      catchtouchmove="preventTouchMove"
-      wx:if="{{showModal}}"
-    ></view>
-    <!-- 成功 -->
-    <view class="modal-dialog" wx:if="{{showModal && ses}}">
-      <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
- <view>客服服务时间:9:00-12:00,</view>
- <view>13:00-18:00</view>
-如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view><view class="green" bindtap="phoneCall2"> 18915532527 </view></view></view>
-      <view class="modal-footer">
-        <view
-          class="btn-confirms two"
-          bindtap="onConfirm"
-          data-status="confirm"
-          data-name="{{name}}"
-        >取消
-        </view>
-        <button  class="btn-confirms" open-type="contact" bindcontact="handleContact">确定</button>
-      </view>
-    </view>
\ No newline at end of file
+
+
+    <kefuCom wx:if="{{showModal}}" bind:hideModal="hideModal"></kefuCom>
\ No newline at end of file
diff --git a/pages/user/user.json b/pages/user/user.json
index 8835af0..9157b74 100644
--- a/pages/user/user.json
+++ b/pages/user/user.json
@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "kefuCom": "/pages/component/kefu"
+  }
 }
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 94f9bdb..7437bc7 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -131,7 +131,7 @@
     <view>备案号：苏ICP备19064944号-3X@君到苏州</view>
   </view>
 </view>
-<view class="mask" wx:if="{{showModel}}"> 
+<!-- <view class="mask" wx:if="{{showModel}}"> 
   <view class="model">
 
     <view class="model-content">
@@ -148,5 +148,6 @@
         </button>
     </view>
   </view>
-</view>
+</view> -->
+<kefuCom wx:if="{{showModel}}" bind:hideModal="closeModel"></kefuCom>
 <view style="height:20rpx"></view>
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index bd11fff..3255440 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,25 +7,11 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "pages/info/foodProductInfo/index",
-          "query": "id=464484",
+          "name": "subPackages/foodListNew/index",
+          "pathName": "subPackages/foodListNew/index",
+          "query": "",
           "scene": null,
           "launchMode": "default"
-        },
-        {
-          "name": "pages/activity/huawei/index",
-          "pathName": "pages/activity/huawei/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/info/roadInfo/index",
-          "pathName": "pages/list/foodNew/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }
diff --git a/pages/list/foodNew/index.js b/subPackages/foodListNew/index.js
similarity index 93%
rename from pages/list/foodNew/index.js
rename to subPackages/foodListNew/index.js
index 0f66bfa..dd5a222 100644
--- a/pages/list/foodNew/index.js
+++ b/subPackages/foodListNew/index.js
@@ -1,6 +1,6 @@
 // pages/list/theatre/index.js
-import commonApi from "../../../utils/https/common"
-import util from "../../../utils/util"
+import commonApi from "../../utils/https/common"
+import util from "../../utils/util"
 let app = getApp()
 Page({
 
@@ -10,13 +10,13 @@ Page({
   data: {
     list:[],
     tagList: [
-        {id: 9, name: "品苏式面"},
-        {id: 10, name: "尝农家乐"},
+        {id: 521, name: "品苏式面"},
+        {id: 522, name: "尝农家乐"},
         // {id: 11, name: "鉴苏帮菜"},
         // {id: 12, name: "寻夜食堂"},
     ], // 父标签477
     total:1,
-    type:9,
+    type:521,
 
     areas: [],
     areaIndex:0,
@@ -81,7 +81,7 @@ Page({
     //   }
     // },1)
     wx.navigateTo({
-      url: '/pages/info/foodNew/index?id='+item.id,
+      url: '/subPackages/foodNew/index?id='+item.id,
     })
   },
   getList:function(){
diff --git a/pages/list/foodNew/index.json b/subPackages/foodListNew/index.json
similarity index 100%
rename from pages/list/foodNew/index.json
rename to subPackages/foodListNew/index.json
diff --git a/pages/list/foodNew/index.wxml b/subPackages/foodListNew/index.wxml
similarity index 97%
rename from pages/list/foodNew/index.wxml
rename to subPackages/foodListNew/index.wxml
index d877f08..840716d 100644
--- a/pages/list/foodNew/index.wxml
+++ b/subPackages/foodListNew/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/list/theatre/index.wxml-->
-<wxs src="../../../utils/filter.wxs" module="tool" />
+<wxs src="../../utils/filter.wxs" module="tool" />
 <view class="my-header-search">
     <search bind:onload="search" transparent="1"></search>
     <view class="sale-types no-scrollbar">
diff --git a/pages/list/foodNew/index.wxss b/subPackages/foodListNew/index.wxss
similarity index 100%
rename from pages/list/foodNew/index.wxss
rename to subPackages/foodListNew/index.wxss
diff --git a/pages/info/foodNew/index.js b/subPackages/foodNew/index.js
similarity index 97%
rename from pages/info/foodNew/index.js
rename to subPackages/foodNew/index.js
index 0e38492..75f2b02 100644
--- a/pages/info/foodNew/index.js
+++ b/subPackages/foodNew/index.js
@@ -1,9 +1,9 @@
 // pages/info/roadInfo/index.js
 let device = wx.getSystemInfoSync();
 const ratio = device.windowWidth / 750;
-import commonApi from "../../../utils/https/common"
-import QRCode from '../../../utils/weapp-qrcode.js'
-import {pagePoint, gotoDetail} from '../../../utils/util'
+import commonApi from "../../utils/https/common"
+import QRCode from '../../utils/weapp-qrcode.js'
+import {pagePoint, gotoDetail} from '../../utils/util'
 let app = getApp()
 Page({
 
@@ -50,6 +50,7 @@ Page({
         lat: null,
         scrollLeft: 0,
         windowWidth: 375,
+        prod_phone: "",
     },
 
     /**
@@ -64,12 +65,12 @@ Page({
         let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
         this.setData({top: height,id: options.id})
         // 获取购物车按钮的位置
-        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-        //     console.log(res)
-        //     that.setData({
-        //         cartTop: res.top
-        //     })
-        // }).exec()
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
         if (options.ZTPoint) {
             this.setData({
                 ZTPoint: options.ZTPoint
@@ -153,7 +154,6 @@ Page({
                 if (resData.parameter_tag) {
                     resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ')
                 }
-
                 if (resData.supplier_headimg) {
                     resData.supplier_headimg = that.showImg(resData.supplier_headimg)
                 }
@@ -168,6 +168,7 @@ Page({
                 info: resData,
                 // swiperRange: swiperRange,
                 shareImg: null,
+                prod_phone: resData.scene_tel
             })
 
             this.drawImg()
@@ -492,7 +493,7 @@ Page({
         let promise3 = new Promise(function (resolve, reject) {
             let userid = wx.getStorageSync('jstrip_userid')
             new QRCode('myQrcode', {
-                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                text: 'https://m.cloud.sz-trip.com/FoodShopDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
                 width: 500,
                 height: 500,
                 padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
@@ -685,7 +686,7 @@ Page({
 
     callPhone :function () {
         wx.makePhoneCall({
-            phoneNumber: this.data.supplierInfo.phone,
+            phoneNumber: this.data.prod_phone,
         })
     },
 
diff --git a/pages/info/foodNew/index.json b/subPackages/foodNew/index.json
similarity index 57%
rename from pages/info/foodNew/index.json
rename to subPackages/foodNew/index.json
index ab4ec76..2e64977 100644
--- a/pages/info/foodNew/index.json
+++ b/subPackages/foodNew/index.json
@@ -1,7 +1,6 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "code":"../../order/components/wxqrCode/index"
-
+    "code":"/pages/order/components/wxqrCode/index"
   }
 }
\ No newline at end of file
diff --git a/pages/info/foodNew/index.wxml b/subPackages/foodNew/index.wxml
similarity index 96%
rename from pages/info/foodNew/index.wxml
rename to subPackages/foodNew/index.wxml
index 3feb5be..81a0aef 100644
--- a/pages/info/foodNew/index.wxml
+++ b/subPackages/foodNew/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/info/hotelProductInfo/index.wxml-->
-<wxs src="../../../utils/filter.wxs" module="tool" />
+<wxs src="../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="shop-info" bindtap="changeSimpleVal" data-keyname="showShopInfo" data-val="{{true}}">
     <image class="supplier-headImg" src="{{supplierInfo.headimg}}" mode="aspectFill"></image>
@@ -7,7 +7,7 @@
         <view style="display: flex;align-items: flex-start;">
             <view class="shop-title shop-com-width  textOver2">{{supplierInfo.shop_name}}</view>
             <image style="height: 25rpx;margin: 10rpx 68rpx 0 13rpx;" mode="heightFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/postDetail/rightIcon.png"></image>
-            <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+            <image wx:if="{{prod_phone}}" class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
         </view>
         <view class="address" style="display: flex;align-items: center;justify-content: space-between;">
             <view class="shop-com-width textOver" style="padding-right: 98rpx;">{{supplierInfo.address}}</view>
@@ -29,7 +29,7 @@
    
 </scroll-view>
 
-<view class="share-icon" bindtap="share"></view>
+<!-- <view class="share-icon" bindtap="share"></view> -->
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
@@ -143,16 +143,16 @@
 
 
   <view class="btns">
-    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
-    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn" bindtap="order">加入购物车</view>
+    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" >立即购买</view>
     <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator> -->
+</navigator>
 <view class="mask" wx:if="{{skuFlag}}">
   <view class="mask-bg" bindtap="hideSku"></view>
   <view class="mask-content">
diff --git a/pages/info/foodNew/index.wxss b/subPackages/foodNew/index.wxss
similarity index 100%
rename from pages/info/foodNew/index.wxss
rename to subPackages/foodNew/index.wxss
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 6d4ea30..5f410db 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -57,7 +57,7 @@ Page({
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
       isCar:options.isCar,
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
-      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
     })
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
@@ -396,6 +396,9 @@ Page({
         remark: remark,
         product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
         phone:this.data.phone,// 不实名的时候传的手机号参数
+        // 美食类型
+        reserve_mobile: product.product.type=='food'?this.data.phone:"",
+
       }],
       originate_order_id: this.data.kjId,
       gp_id: app.globalData.gp_id,
@@ -427,7 +430,7 @@ Page({
 	if(app.globalData.list){
     app.globalData.list[app.globalData.index] = this.data.product
     // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
-    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+    if (!app.globalData.list[app.globalData.index].sku.sku_model.is_authentication) {
       app.globalData.list[app.globalData.index].phone = this.data.phone
       app.globalData.list[app.globalData.index].linkmanList = []
     }else {
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index c28d857..6d08452 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -15,13 +15,14 @@
   </view>
   <view class="box">
     <view class="box-title">
-      <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
+      <view style="flex:1">{{product && product.isGroup!=1?'数量':'预约人数'}}</view>
       <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="minus"></view>
       <view class="number-box">{{productNum}}</view>
       <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add"></view>
     </view>
   </view>
-  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" 
+  is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
   <!-- 补贴 -->
   <view class="box">
     <view class="box-title allowance" wx:if="{{allowance_price}}">
@@ -63,7 +64,7 @@
   <view class="mask-content1">
       <view class="dialog-top">
         <view class="scene-title">{{product.product.title}}-{{product.sku.sku_name}}</view>
-        <view class="people-message">出行人信息</view>
+        <view class="people-message">{{product.product.type=="food"?'预定人信息':'出行人信息'}}</view>
         <view style="max-height:430rpx;overflow: scroll;" wx:if="{{is_authentication=='1'}}">
           <view class="people" wx:for="{{linkmanList}}">
             <view class="flex">
diff --git a/utils/util.js b/utils/util.js
index 35b9226..ae04163 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -386,12 +386,21 @@ const orderMoreTime = function(item){
   }
 }
 const gotoOrder = function(item){
+
+  // 数量超过两个  购物车下单 跳H5 (小程序二维码没分开)
+  if (item.order_product_list.length>1) {
+    wx.navigateTo({
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
+      })
+      return;
+  }
   if(item.order_product_list[0].product_model=='ticket'){
     wx.navigateTo({
       url: '/pages/user/order/sceneOrderInfo/index?id='+item.order_id,
     })
     return;
   }
+
   if(item.order_product_list[0].product_model=='food'){
     wx.navigateTo({
       url: '/pages/user/order/foodOrderInfo/index?id='+item.order_id,

From 9831cfaee4dc504908cd2fe1d0587424bc23c811 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 3 Oct 2025 15:20:25 +0800
Subject: [PATCH 432/471] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/search/list/index.wxml | 11 +++++++++++
 project.private.config.json  |  4 ++--
 utils/util.js                |  6 ++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index f062e34..a3a5f26 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest139? true : false;
+            data.isTest = data.isTest140? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 6fc1997..a6b8cce 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -71,6 +71,17 @@
       </view>
     </view>
   </view>
+  <!-- 活动 -->
+  <view class="product-item" wx:if="{{item.ext.type=='act_calendar'}}">
+    <image lazy-load class="product-img" src="{{item.ext.post_url}}" mode="aspectFill"></image>
+    <view class="product-info show-info">
+      <view class="product-title">{{item.ext.name}}</view>
+      <view class="show-info">  
+        <view>{{item.ext.begin_date}}-{{item.ext.end_date}}</view>
+        <view>{{item.ext.from_platform}}</view>
+      </view>
+    </view>
+  </view>
   <!-- 电影 -->
   <view class="product-item" wx:if="{{item.ext.type=='movie'}}">
     <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
diff --git a/project.private.config.json b/project.private.config.json
index 3255440..0e91f87 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -10,8 +10,8 @@
           "name": "subPackages/foodListNew/index",
           "pathName": "subPackages/foodListNew/index",
           "query": "",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
diff --git a/utils/util.js b/utils/util.js
index ae04163..8756297 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -297,6 +297,12 @@ const gotoDetail = (item,isPagePoint,queryStr="") =>{
         url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr
       })
       break;
+	case "act_calendar":
+	  // 活动 
+	  wx.navigateTo({
+	    url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr
+	  })
+	  break;
     case "movie":
       // 产品 电影票
       let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title+queryStr

From c61abe2cf7fdd437f736b7e6b3f2f9f9259c9db3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 4 Oct 2025 16:09:02 +0800
Subject: [PATCH 433/471] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/info/foodProductInfo/index.js   | 16 ++++++++++
 pages/info/foodProductInfo/index.wxml | 23 +++++++++++++-
 pages/info/foodProductInfo/index.wxss | 43 +++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index f062e34..caeee4c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest139? true : false;
+            data.isTest = data.isTest131? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/foodProductInfo/index.js b/pages/info/foodProductInfo/index.js
index 316515d..105a45f 100644
--- a/pages/info/foodProductInfo/index.js
+++ b/pages/info/foodProductInfo/index.js
@@ -213,6 +213,22 @@ Page({
         }
     },
 
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+          latitude: Number(info.scene_lat),
+          longitude: Number(info.scene_lon),
+          name:info.scene_name,
+          address:info.scene_address
+        })
+    },
+
+    callPhone :function () {
+        wx.makePhoneCall({
+            phoneNumber: this.data.info.scene_tel,
+        })
+    },
+
     changeAllowance: function () {
         this.setData({
             showAllowance: !this.data.showAllowance
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index 52d4c9c..3491c6f 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -93,7 +93,28 @@
 
 
 <view class="scroll-all-box" id="menus" wx:if="{{info}}">
-    <view style="height:85rpx" wx:if="{{fixed}}"></view>
+    
+
+<view class="shop-info">
+    <image class="supplier-headImg" wx:if="{{info.scene_img}}" src="{{info.scene_img}}" mode="aspectFill"></image>
+    <view class="content">
+        <view style="display: flex;align-items: flex-start;">
+            <view class="shop-title shop-com-width  textOver2">{{info.scene_name}}</view>
+            <!-- <image style="height: 25rpx;margin: 10rpx 68rpx 0 13rpx;" mode="heightFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/postDetail/rightIcon.png"></image> -->
+            <image wx:if="{{info.scene_tel}}" class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+        </view>
+        <view class="address" style="display: flex;align-items: center;justify-content: space-between;">
+            <view class="shop-com-width textOver" style="padding-right: 98rpx;">{{info.scene_address}}</view>
+            <image class="icon-phone" catch:tap="gotolocation" src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+        </view>
+    </view>
+</view>
+
+
+<view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
+
+
+
     <view class="info-box" id="box1">
         <view class="info-title">套餐详情</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>
diff --git a/pages/info/foodProductInfo/index.wxss b/pages/info/foodProductInfo/index.wxss
index 3043e62..90c2938 100644
--- a/pages/info/foodProductInfo/index.wxss
+++ b/pages/info/foodProductInfo/index.wxss
@@ -1278,4 +1278,47 @@ font-size: 23rpx;
 color: #FFFFFF;
 display: inline-block;
 margin-right: 10rpx;
+}
+
+.shop-info{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: white;
+    padding:30rpx 28rpx;
+    box-sizing: border-box;
+    word-break: break-all;
+}
+.shop-info .supplier-headImg{
+    width: 113rpx;
+    height: 113rpx;
+    background: #BCBCBC;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+}
+.shop-info .content{
+    flex: 1;
+    height: 113rpx;
+    width: 1rpx;
+    padding-left: 12rpx;
+    font-weight: bold;
+    font-size: 31rpx;
+    color: #010101;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.shop-info .content .address{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #999999;
+}
+.shop-info .icon-phone{
+    width: 47.33rpx;
+    height: 46.67rpx;
+    flex-shrink: 0;
+}
+.shop-info .shop-com-width{
+    width: 100rpx;
+    flex: 1;
 }
\ No newline at end of file

From 7e31220a5cc56fc8feb9ffcb6c79f3593ee8026d Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 9 Oct 2025 09:06:39 +0800
Subject: [PATCH 434/471] 1

---
 app.js           |  2 +-
 app.wxss         |  2 +-
 utils/filter.wxs | 54 +++++++++++++++++++++++++++++++++++-------------
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index a3a5f26..8393fe5 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest140? true : false;
+            data.isTest = data.isTest141? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/app.wxss b/app.wxss
index 9467548..5d7cb40 100644
--- a/app.wxss
+++ b/app.wxss
@@ -124,7 +124,7 @@ page{
   text-overflow: ellipsis;
 }
 .sz-xcx-fwb-img {
-  max-width: 100%;
+  max-width: 100% !important;
   height: auto;
   object-fit: cover;
 }
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 2821b85..1e7865f 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -1,19 +1,45 @@
-var formateRichText = function(str){
-  if(!str){
-    return "";
+var formateRichText = function(str) {
+  if (!str) {
+    return ""; // 正确：函数内部的return
   }
-  var reg = getRegExp("<img","g");
-  str = str.replace(reg, "<img class='sz-xcx-fwb-img' width='100%'")
-  reg = getRegExp("<IMG","g");
-  str = str.replace(reg, "<img class='sz-xcx-fwb-img' width='100%'")
-  reg = getRegExp("&nbsp;","g");
-  str = str.replace(reg, '<span style="width: 8rpx;display: inline-block;"></span>')
-  reg = getRegExp("section","g");
-  str = str.replace(reg, 'div');
-  reg = getRegExp("↵","g");
-  str = str.replace(reg, '<br />');
+  
+  // 处理img标签
+  var reg = getRegExp("<img", "g");
+  str = str.replace(reg, '<img class="sz-xcx-fwb-img" style="width:100%!important;height:auto!important;"');
+  
+  reg = getRegExp("<IMG", "g");
+  str = str.replace(reg, '<img class="sz-xcx-fwb-img" style="width:100%!important;height:auto!important;"');
+  
+  // 移除width和height属性
+  reg = getRegExp('width="[^"]*"', "gi");
+  str = str.replace(reg, "");
+  
+  reg = getRegExp('height="[^"]*"', "gi");
+  str = str.replace(reg, "");
+  
+  // 清除style中的宽高样式
+  reg = getRegExp('width:[^;]+;', "gi");
+  str = str.replace(reg, "");
+  reg = getRegExp('height:[^;]+;', "gi");
+  str = str.replace(reg, "");
+  reg = getRegExp('width:[^;]+', "gi");
+  str = str.replace(reg, "");
+  reg = getRegExp('height:[^;]+', "gi");
+  str = str.replace(reg, "");
+  
+  // 处理其他标签
+  reg = getRegExp("&nbsp;", "g");
+  str = str.replace(reg, '<span style="width: 8rpx;display: inline-block;"></span>');
+  
+  reg = getRegExp("section", "g");
+  str = str.replace(reg, "div");
+  
+  reg = getRegExp("↵", "g");
+  str = str.replace(reg, "<br />");
+  
   return str;
-}
+};
+
 var gotoUrl = function(item){
   var str = "/pages/info/"
   if(item.frontShowModel=='multisku'){

From 979d245dec56e0b6f2816dfb1d7856a0a7d46846 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 9 Oct 2025 09:06:58 +0800
Subject: [PATCH 435/471] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                         |  2 +-
 subPackages/foodNew/index.js   | 11 +++++++++--
 subPackages/foodNew/index.wxml |  4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index a3a5f26..f8afd78 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest140? true : false;
+            data.isTest = data.isTest142? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/subPackages/foodNew/index.js b/subPackages/foodNew/index.js
index 75f2b02..aa44650 100644
--- a/subPackages/foodNew/index.js
+++ b/subPackages/foodNew/index.js
@@ -49,6 +49,8 @@ Page({
         lon: null,
         lat: null,
         scrollLeft: 0,
+        scrollDom: "",
+        scrollDomLeft:0,
         windowWidth: 375,
         prod_phone: "",
     },
@@ -128,10 +130,15 @@ Page({
             console.log(rect)
             if (rect) {
                 let targetScrollLeft = rect.left + (rect.width / 2) - (windowWidth / 2)+_this.data.scrollLeft;
-                console.log(e, targetScrollLeft)
+                console.log((rect.width / 2) - (windowWidth / 2))
                 this.setData({
-                    scrollLeft: targetScrollLeft
+                    scrollLeft: targetScrollLeft||0,
+                    scrollDomLeft: (rect.width / 2) - (windowWidth / 2),
+                    
                 });
+                this.setData({
+                    scrollDom: domId,
+                })
             }
         }).exec()
 
diff --git a/subPackages/foodNew/index.wxml b/subPackages/foodNew/index.wxml
index 81a0aef..46f0ced 100644
--- a/subPackages/foodNew/index.wxml
+++ b/subPackages/foodNew/index.wxml
@@ -19,7 +19,9 @@
 <view style="height: 20rpx;width: 100%;background: #F7F7F7;"></view>
 
 
-<scroll-view scroll-x scroll-with-animation enable-flex scroll-left="{{scrollLeft}}" id="menus"
+<scroll-view scroll-x scroll-with-animation enable-flex  id="menus" 
+    scroll-into-view="{{scrollDom}}" 	scroll-into-view-offset="{{scrollDomLeft}}"
+
      class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px" wx:if="{{supplierInfo&&supplierInfo.products.length>0}}">
     <view id="scrollView{{index}}" class="scroll-menu-item {{idIndex==index?'active':''}}"
          wx:for="{{supplierInfo.products}}" data-item="{{item}}" data-index="{{index}}"

From 72eebc29a19e2cf1178d52e9f154a36b502f846f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 9 Oct 2025 13:50:31 +0800
Subject: [PATCH 436/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/coupon/index.js | 2 +-
 utils/https.js              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index 5a3d7b1..b11d16a 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -21,7 +21,7 @@ Page({
   },
   getList:function(options){
     if(!this.data.moreFlag) return
-    commonApi.user_post('coupon/use_coupon_list',{
+    commonApi.user_post('coupon/use_coupon_listv3',{
       money:options.money,
       sku_ids:options.sku
     }).then(res=>{
diff --git a/utils/https.js b/utils/https.js
index d55ab84..b0f9a8b 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 5108b2e6989cfa9ff99a32d39b728bb602eef0c0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 9 Oct 2025 15:38:50 +0800
Subject: [PATCH 437/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/coupon/index.js   | 46 +++++++++++++++++++--
 pages/order/components/coupon/index.wxml |  2 +-
 pages/order/coupon/index.js              | 51 ++++++++++++++++++++++--
 pages/order/coupon/index.wxml            | 29 +++++++++-----
 pages/order/coupon/index.wxss            | 26 +++++++++---
 pages/order/orderList/index.js           |  2 +-
 pages/order/orderList/index.wxml         |  2 +-
 pages/order/scene/index.js               | 13 ++++--
 pages/user/cartlist/list.js              |  2 +
 9 files changed, 146 insertions(+), 27 deletions(-)

diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 883a94b..51c09e6 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -26,7 +26,11 @@ Component({
           })
         }
       }
-    }
+    },
+    sourceFrom: {
+        type:String,
+        value:""
+    },
   },
 
   /**
@@ -63,9 +67,45 @@ Component({
         })
         this.triggerEvent('getNewCoupon',null);
       }else{
-        commonApi.user_post('coupon/use_max_coupon_list',{
+        let postList = app.globalData.postProduct || []
+        let ticketList = app.globalData.list || []
+        let signleProduct = app.globalData.product || null
+    
+        let listData = []
+        if (this.properties.sourceFrom == 'cart') {
+            postList.forEach(v=>{
+                listData.push({
+                    sku_id: v.sku.id,
+                    price: v.sku.price,
+                    sell_price: v.sku.price,
+                    num: v.productNum,
+                })
+            })
+            ticketList.forEach(v=>{
+                listData.push({
+                    sku_id: v.sku.id,
+                    price: v.sku.price,
+                    sell_price: v.sku.price,
+                    num: v.num,
+                    use_date: v.time&&v.time.sale_date?v.time.sale_date:''
+                })
+            })
+        } else {
+            if (signleProduct) {
+                listData.push({
+                    sku_id: signleProduct.sku.id,
+                    price: signleProduct.sku.price,
+                    sell_price: signleProduct.sku.price,
+                    num: signleProduct.productNum,
+                    use_date: signleProduct.date&&signleProduct.date.date?signleProduct.date.date:''
+                })
+            }
+        }
+
+        commonApi.user_post('coupon/use_max_coupon_listv2',{
           money:this.data.money,
-          sku_ids:this.data.sku
+          sku_ids:this.data.sku,
+          cart_data: listData
         }).then(res=>{
           if (app.globalData.couponInfo&&app.globalData.couponInfo.hasOwnProperty('SubCoupon')) {
             this.setData({
diff --git a/pages/order/components/coupon/index.wxml b/pages/order/components/coupon/index.wxml
index 0db1d8a..d93a9e6 100644
--- a/pages/order/components/coupon/index.wxml
+++ b/pages/order/components/coupon/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/order/components/coupon/index.wxml-->
-<navigator url="/pages/order/coupon/index?money={{money}}&sku={{sku}}" class="box">
+<navigator url="/pages/order/coupon/index?money={{money}}&sku={{sku}}&sourceFrom={{sourceFrom}}" class="box">
   <view class="box-title">
     <view style="flex:1">优惠券</view>
     <view wx:if="{{coupon}}">
diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index b11d16a..964bf84 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -9,7 +9,9 @@ Page({
    */
   data: {
     list:[],
-    moreFlag:true
+    moreFlag:true,
+
+    productList: [],
   },
 
   /**
@@ -17,13 +19,53 @@ Page({
    */
   
   onLoad: function (options) {
+    console.log(app.globalData.postProduct,app.globalData.list,app.globalData.product)
+    let sourceFrom = options.sourceFrom
+    let postList = app.globalData.postProduct || []
+    let ticketList = app.globalData.list || []
+    let signleProduct = app.globalData.product || null
+
+    let listData = []
+    if (sourceFrom == 'cart') {
+        postList.forEach(v=>{
+            listData.push({
+                sku_id: v.sku.id,
+                price: v.sku.price,
+                sell_price: v.sku.price,
+                num: v.productNum,
+            })
+        })
+        ticketList.forEach(v=>{
+            listData.push({
+                sku_id: v.sku.id,
+                price: v.sku.price,
+                sell_price: v.sku.price,
+                num: v.num,
+                use_date: v.time&&v.time.sale_date?v.time.sale_date:''
+            })
+        })
+    } else {
+        if (signleProduct) {
+            listData.push({
+                sku_id: signleProduct.sku.id,
+                price: signleProduct.sku.price,
+                sell_price: signleProduct.sku.price,
+                num: signleProduct.productNum,
+                use_date: signleProduct.date&&signleProduct.date.date?signleProduct.date.date:''
+            })
+        }
+    }
+    this.setData({
+        productList: listData
+    })
     this.getList(options)
   },
   getList:function(options){
     if(!this.data.moreFlag) return
     commonApi.user_post('coupon/use_coupon_listv3',{
       money:options.money,
-      sku_ids:options.sku
+      sku_ids:options.sku,
+      cart_data: this.data.productList
     }).then(res=>{
       res.data.map(item=>{
         item.selected = false;
@@ -36,9 +78,10 @@ Page({
   },
   //获取最高优惠
   getMaxC(options){
-    commonApi.user_post('coupon/use_max_coupon_list',{
+    commonApi.user_post('coupon/use_max_coupon_listv2',{
       money:options.money,
-      sku_ids:options.sku
+      sku_ids:options.sku,
+      cart_data: this.data.productList
     }).then(res=>{
       console.log(app.globalData.couponInfo);
 
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 7bca12b..3aa31a5 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -1,17 +1,28 @@
 <!--pages/order/coupon/index.wxml-->
 <title title="优惠券"></title>
 <view wx:if="{{list.length>0}}">
-  <view class="coupon-item" wx:for="{{list}}">
-    <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
-    <view class="money1" wx:else>
-      {{item.activity.fold}}
+<view class="coupon-item-box" wx:for="{{list}}">
+    <view class="coupon-item" >
+        <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
+        <view class="money1" wx:else>
+        {{item.activity.fold}}
+        </view>
+        <view class="coupon-info">
+        <view>{{item.activity.name}}</view>
+        <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
+        </view>
+        <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
+        <view class="couon-date" wx:else>不可用</view>
     </view>
-    <view class="coupon-info">
-      <view>{{item.activity.name}}</view>
-      <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
+    <view class="no-reason" wx:if="{{!item.can_use}}">
+        <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
+        <view>{{item.reason}}</view>
     </view>
-    <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
-  </view>
+</view>
+
+
+
+
   <view class="btn" bindtap="submit">确定</view>
 </view>
 <view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
diff --git a/pages/order/coupon/index.wxss b/pages/order/coupon/index.wxss
index a8cfad0..8c2c2e9 100644
--- a/pages/order/coupon/index.wxss
+++ b/pages/order/coupon/index.wxss
@@ -2,20 +2,27 @@
 page {
   background: #f6f6f6;
 }
+.coupon-item-box{
+    width: 700rpx;
+    margin: 26rpx auto;
+    background: white;
+    border-radius: 7rpx;
+    box-sizing: border-box;
+    padding:0 26rpx;
+}
+
 .coupon-item {
+    width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin: 26rpx;
-  background: white;
-  border-radius: 7rpx;
+
   height: 136rpx;
-  padding-right: 27rpx;
 }
 .coupon-item .money {
   color: #D62828;
   font-size: 67rpx;
-  width: 187rpx;
+  width: 147rpx;
   text-align: center;
   font-weight: 500;
   flex-shrink: 0;
@@ -68,4 +75,13 @@ page {
   font-size: 36rpx;
   font-weight: 500;
   text-align: center;
+}
+
+.no-reason{
+    width: 100%;
+    border-top: 1px dashed #e0e0e0;
+    padding: 20rpx 0;
+    color: #666;
+    font-size: 24rpx;
+    box-sizing: border-box;
 }
\ No newline at end of file
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 3fe0fed..6715052 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -41,7 +41,7 @@ Page({
     //   showCoupon: (app.globalData.list || []).length<=0,
       // linkmanList: app.globalData.linkmanList
     })
-    console.log('-------------',this.data.ticketList);
+    console.log('-------------',this.data.ticketList, this.data.goodsList);
     // debugger
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 2245a77..b571935 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -56,7 +56,7 @@
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view> -->
-<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{showCoupon && !kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{showCoupon && !kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}" sourceFrom="cart"></coupon>
 
 <view class="fixed-bottom">
     <view class="fixed-price-box">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6d9a940..8638f01 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -367,16 +367,17 @@ Page({
       }
       console.log('singlePrice',this.data.singlePrice);
   },
-  changeDate: function (e) {
+changeDate: function (e) {
     console.log('打印',e);
     let sku_id = e.detail.sku_id;
+    app.globalData.product.date = e.detail
     this.setData({
       showDate:true
     })
     // debugger
     // this.showAllPrice()
     this.totalPrice(e.detail.price)
-    if (e.detail.price != this.data.singlePrice && this.data.coupon) {
+    if (this.data.coupon) {
       wx.showToast({
         title: '订单价格发生变化，请重新选择优惠券',
         icon: 'none'
@@ -386,7 +387,12 @@ Page({
         singlePrice:e.detail.price
       })
       if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
-        this.couponCom.setNullCoupon()
+          try {
+            this.couponCom = this.selectAllComponents("#coupon")[0];
+            this.couponCom.setNullCoupon()
+          } catch (e) {
+
+          }
       }
       app.globalData.couponInfo = null;
     }
@@ -415,6 +421,7 @@ Page({
     this.setData({
       time: e.detail
     })
+
   },
   changeAllowance: function () {
     this.setData({
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index cae4009..55d0b1c 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -396,7 +396,9 @@ Page({
         app.globalData.index = 0
         app.globalData.productPrice = 0
         app.globalData.ticketPrice = 0
+        app.globalData.product = null
         this.data.productType = ''
+        console.log(app.globalData)
     },
 
     /**

From 942248b028c9f2c4ffa4e3b6d19a5612bad9b763 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 17 Oct 2025 15:45:04 +0800
Subject: [PATCH 438/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/coupon/index.js | 16 +++++++--------
 pages/order/coupon/index.js            | 25 ++++++++++++++---------
 pages/order/coupon/index.wxml          | 28 ++++++++++++++++++++++++--
 pages/order/coupon/index.wxss          | 19 ++++++++++++++++-
 pages/order/scene/index.js             |  2 +-
 utils/https.js                         |  4 ++--
 6 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 51c09e6..07c12e9 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -73,14 +73,6 @@ Component({
     
         let listData = []
         if (this.properties.sourceFrom == 'cart') {
-            postList.forEach(v=>{
-                listData.push({
-                    sku_id: v.sku.id,
-                    price: v.sku.price,
-                    sell_price: v.sku.price,
-                    num: v.productNum,
-                })
-            })
             ticketList.forEach(v=>{
                 listData.push({
                     sku_id: v.sku.id,
@@ -101,6 +93,14 @@ Component({
                 })
             }
         }
+        postList.forEach(v=>{
+            listData.push({
+                sku_id: v.sku.id,
+                price: v.sku.price,
+                sell_price: v.sku.price,
+                num: v.productNum,
+            })
+        })
 
         commonApi.user_post('coupon/use_max_coupon_listv2',{
           money:this.data.money,
diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index 964bf84..d52d3f4 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -8,6 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+      noUseList: [],
     list:[],
     moreFlag:true,
 
@@ -26,15 +27,8 @@ Page({
     let signleProduct = app.globalData.product || null
 
     let listData = []
+    // 门票类
     if (sourceFrom == 'cart') {
-        postList.forEach(v=>{
-            listData.push({
-                sku_id: v.sku.id,
-                price: v.sku.price,
-                sell_price: v.sku.price,
-                num: v.productNum,
-            })
-        })
         ticketList.forEach(v=>{
             listData.push({
                 sku_id: v.sku.id,
@@ -55,6 +49,16 @@ Page({
             })
         }
     }
+    // 特产类
+    postList.forEach(v=>{
+        listData.push({
+            sku_id: v.sku.id,
+            price: v.sku.price,
+            sell_price: v.sku.price,
+            num: v.productNum,
+        })
+    })
+
     this.setData({
         productList: listData
     })
@@ -70,8 +74,11 @@ Page({
       res.data.map(item=>{
         item.selected = false;
       })
+
+
       this.setData({
-        list:res.data
+        list:res.data.filter(x=>x.can_use),
+        noUseList: res.data.filter(x=>!x.can_use),
       })
       this.getMaxC(options)
     })
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 3aa31a5..d164d7a 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -1,6 +1,7 @@
 <!--pages/order/coupon/index.wxml-->
 <title title="优惠券"></title>
-<view wx:if="{{list.length>0}}">
+<view >
+<view wx:if="{{list.length>0}}" class="coupon-title">可使用红包 <text class="couon-date">{{list.length}}张</text></view>
 <view class="coupon-item-box" wx:for="{{list}}">
     <view class="coupon-item" >
         <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
@@ -13,6 +14,29 @@
         </view>
         <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
         <view class="couon-date" wx:else>不可用</view>
+
+    </view>
+    <view class="no-reason" wx:if="{{!item.can_use}}">
+        <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
+        <view>{{item.reason}}</view>
+    </view>
+</view>
+
+<view wx:if="{{noUseList.length>0}}" class="coupon-title">不可使用红包 <text class="couon-date">{{noUseList.length}}张</text></view>
+<view class="coupon-item-box" wx:for="{{noUseList}}">
+    <view class="coupon-item" >
+        <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
+        <view class="money1" wx:else>
+        {{item.activity.fold}}
+        </view>
+        <view class="coupon-info">
+        <view>{{item.activity.name}}</view>
+        <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
+        </view>
+        <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
+        <view class="couon-date" wx:else>不可用</view>
+
+        <view class="cover-no-use" wx:if="{{!item.can_use}}"></view>
     </view>
     <view class="no-reason" wx:if="{{!item.can_use}}">
         <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
@@ -25,7 +49,7 @@
 
   <view class="btn" bindtap="submit">确定</view>
 </view>
-<view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
+<view class="common-empty" wx:if="{{list.length==0&&noUseList.length==0}}" style="z-index:-1;top:0">
   <image lazy-load 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/order/coupon/index.wxss b/pages/order/coupon/index.wxss
index 8c2c2e9..e76b95a 100644
--- a/pages/order/coupon/index.wxss
+++ b/pages/order/coupon/index.wxss
@@ -16,7 +16,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-
+    position: relative;
   height: 136rpx;
 }
 .coupon-item .money {
@@ -84,4 +84,21 @@ page {
     color: #666;
     font-size: 24rpx;
     box-sizing: border-box;
+}
+
+.cover-no-use{
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    height: 100;
+    opacity: 0.5;
+    background: white;
+}
+.coupon-title{
+    padding: 26rpx 26rpx 0;
+    width: 100%;
+    box-sizing: border-box;
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 8638f01..9d4f7ff 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -379,7 +379,7 @@ changeDate: function (e) {
     this.totalPrice(e.detail.price)
     if (this.data.coupon) {
       wx.showToast({
-        title: '订单价格发生变化，请重新选择优惠券',
+        title: '订单时间发生变化，请重新选择优惠券',
         icon: 'none'
       })
       this.setData({
diff --git a/utils/https.js b/utils/https.js
index b0f9a8b..d55ab84 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 74b6fb8e1c7aadb32059479cfea7056e9a15c266 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 17 Oct 2025 15:45:40 +0800
Subject: [PATCH 439/471] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/roadInfo/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 1508b5c..082b6c6 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -218,7 +218,7 @@ Page({
             if (res&&Array.isArray(res.data)&&res.data.length>0) {
                 res.data.forEach(v => {
                     v.sku.is_compose = 1;
-                    v.num = this.data.producNum;
+                    v.num = this.data.producNum * v.producNum;
                     v.sku.compose_sku_id = v.compose_sku_id
                 });
                 app.globalData.list = []

From 9c96813fe23c9a14b7dd4d4e25523809bd0d5ae8 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 17 Oct 2025 19:22:50 +0800
Subject: [PATCH 440/471] des

---
 pages/info/roadInfo/index.js | 2 +-
 pages/search/list/index.wxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 082b6c6..4eaf2b0 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -218,7 +218,7 @@ Page({
             if (res&&Array.isArray(res.data)&&res.data.length>0) {
                 res.data.forEach(v => {
                     v.sku.is_compose = 1;
-                    v.num = this.data.producNum * v.producNum;
+                    v.num = this.data.producNum * v.num;
                     v.sku.compose_sku_id = v.compose_sku_id
                 });
                 app.globalData.list = []
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index a6b8cce..f2d4c5f 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -48,7 +48,7 @@
   <view class="product-item" wx:if="{{item.ext.type=='line'}}">
     <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>
     <view class="product-info">
-      <view class="product-title">{{item.title}}</view>
+      <view class="product-title textOver2">{{item.title}}</view>
       <view class="sale-rate" style="margin-top:15rpx"><text style="color:#D62828;margin-right:20rpx">{{item.ext.rate}}分</text><text>月销{{item.ext.sales_number}}份</text></view>
       <view class="scene-tags textOver" style="margin-top:15rpx;margin-bottom:10rpx">
         <text class="scene-tag textOver" wx:for="{{item.ext.display_tags}}">{{item}}</text>

From eca3607f561b6113cc33b69cd3b7ae0da85fa13e Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 17 Oct 2025 19:55:22 +0800
Subject: [PATCH 441/471] =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.wxml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 5ebbda2..462fa7e 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -4,13 +4,17 @@
 <view class="share-icon" bindtap="share"></view>
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
+    <scroll-view>
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
     interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
-        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+        <scroll-view>
+            <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
+        </scroll-view>
+        
         <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
         </swiper-item>
     </block>
@@ -28,6 +32,7 @@
         </swiper-item>
     </block>
     </swiper>
+    </scroll-view>
     <view class="swiper-bottom" wx:if="{{info}}">
         <view class="swuper-bottom-bg">
             <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 

From 8bc48200edff941d8f4ca0499e363195cdd830ab Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 20 Oct 2025 14:27:30 +0800
Subject: [PATCH 442/471] =?UTF-8?q?ios=E8=A7=86=E9=A2=91=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/info/foodProductInfo/index.wxml |  4 ++++
 subPackages/foodNew/index.js          | 13 +++++++------
 subPackages/foodNew/index.wxml        |  4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index f8afd78..e2c1050 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest142? true : false;
+            data.isTest = data.isTest144? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index 3491c6f..d0c41f3 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -4,14 +4,17 @@
 <!-- <view class="share-icon" bindtap="share"></view> -->
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
+    <scroll-view>
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
     interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
+        <scroll-view>
         <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
+        </scroll-view>
         </swiper-item>
     </block>
     <block wx:for="{{info.listimg}}" wx:key="*this">
@@ -28,6 +31,7 @@
         </swiper-item>
     </block>
     </swiper>
+    </scroll-view>
     <view class="swiper-bottom" wx:if="{{info}}">
         <!-- <view class="swuper-bottom-bg">
             <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 
diff --git a/subPackages/foodNew/index.js b/subPackages/foodNew/index.js
index aa44650..04c4f3d 100644
--- a/subPackages/foodNew/index.js
+++ b/subPackages/foodNew/index.js
@@ -167,15 +167,16 @@ Page({
 
             } catch(e) {} 
 
-            // let swiperRange = this.data.swiperRange;
-            // swiperRange.video = resData.videourl? { min: 0, max: 0 } : { min: -1, max: -1 }
-            // swiperRange.picture = {min:swiperRange.video.max+1, max:swiperRange.video.max+1+resData.listimg.length-1}
-            // swiperRange.sku = {min:swiperRange.picture.max+1,max:swiperRange.picture.max+1+resData.sku.length-1}
+            let swiperRange = this.data.swiperRange;
+            swiperRange.video = resData.videourl? { min: 0, max: 0 } : { min: -1, max: -1 }
+            swiperRange.picture = {min:swiperRange.video.max+1, max:swiperRange.video.max+1+resData.listimg.length-1}
+            swiperRange.sku = {min:swiperRange.picture.max+1,max:swiperRange.picture.max+1+resData.sku.length-1}
             this.setData({
                 info: resData,
-                // swiperRange: swiperRange,
+                swiperRange: swiperRange,
                 shareImg: null,
-                prod_phone: resData.scene_tel
+                prod_phone: resData.scene_tel,
+                swiperCurrent: 0
             })
 
             this.drawImg()
diff --git a/subPackages/foodNew/index.wxml b/subPackages/foodNew/index.wxml
index 46f0ced..f5c7b2a 100644
--- a/subPackages/foodNew/index.wxml
+++ b/subPackages/foodNew/index.wxml
@@ -34,14 +34,17 @@
 <!-- <view class="share-icon" bindtap="share"></view> -->
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
+    <scroll-view>
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
     interval="{{2000}}" duration="{{300}}" bindchange="swiperChange">
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
+        <scroll-view>
         <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
+        </scroll-view>
         </swiper-item>
     </block>
     <block wx:for="{{info.listimg}}" wx:key="*this">
@@ -58,6 +61,7 @@
         </swiper-item>
     </block>
     </swiper>
+    </scroll-view>
     <view class="swiper-bottom" wx:if="{{info}}">
         <!-- <view class="swuper-bottom-bg">
             <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 

From b8bf4c514360a67e32d58978c2335b612f758c97 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 24 Oct 2025 16:54:28 +0800
Subject: [PATCH 443/471] =?UTF-8?q?=E6=9D=83=E7=9B=8A=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                  |    3 +-
 pages/component/TitleHeader.wxss          |    2 +-
 pages/index/index.js                      |   22 +-
 pages/index/index.wxml                    |    8 +-
 pages/index/index.wxss                    |   21 +-
 pages/user/likes/index.js                 |    6 +
 pages/user/order/postOrderInfo/index.js   |    5 +
 pages/user/order/sceneOrderInfo/index.js  |    5 +
 pages/user/order/showOrderInfo/index.js   |    5 +
 pages/user/order/showOrderInfo/index.wxml |    1 +
 project.private.config.json               |    7 +
 subPackages/goods/memberCard/index.js     |  743 +++++++++++++++
 subPackages/goods/memberCard/index.json   |    5 +
 subPackages/goods/memberCard/index.wxml   |  226 +++++
 subPackages/goods/memberCard/index.wxss   | 1025 +++++++++++++++++++++
 utils/util.js                             |   10 +
 16 files changed, 2086 insertions(+), 8 deletions(-)
 create mode 100644 subPackages/goods/memberCard/index.js
 create mode 100644 subPackages/goods/memberCard/index.json
 create mode 100644 subPackages/goods/memberCard/index.wxml
 create mode 100644 subPackages/goods/memberCard/index.wxss

diff --git a/app.json b/app.json
index 0847ea2..cae3269 100644
--- a/app.json
+++ b/app.json
@@ -204,7 +204,8 @@
         "feiyiNew/CGCLetter/index",
         "feiyiNew/CGCTime/index",
         "foodListNew/index",
-        "foodNew/index"
+        "foodNew/index",
+        "goods/memberCard/index"
       ]
     },
     {
diff --git a/pages/component/TitleHeader.wxss b/pages/component/TitleHeader.wxss
index 1b8616b..d0d8a97 100644
--- a/pages/component/TitleHeader.wxss
+++ b/pages/component/TitleHeader.wxss
@@ -12,7 +12,7 @@
   font-size: 32rpx;
   line-height: 90rpx;
   background: #f9f9f9;
-  z-index: 2;
+  z-index: 99;
   top: 0;
 }
 .title-header .icon-fanhui1 {
diff --git a/pages/index/index.js b/pages/index/index.js
index f15e290..357fc06 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -409,6 +409,8 @@ Page({
         cityIndex: 0,
         scrollItem: "scrollItem-0",
 
+        aiStr: "",
+
 		// ---------------2025-5-26改版没用到的------------------
 		fourProduct: [],
 		hotIndex: 0,
@@ -444,8 +446,10 @@ Page({
         this.getHeight()
         this.getWeather()  // 天气
         this.getIndexSeason()
-		this.getBanner()
-       
+        this.getBanner()
+
+        this.setAiStr()
+
         this.getXpthList() // 限时特惠
 
         this.getList()  // 回购榜
@@ -469,6 +473,20 @@ Page({
         this.getUrlToPage()
         this.getShowMore()
     },
+
+    setAiStr :function () {
+        let str = "你好啊，我是卿卿，我来带你游苏州~";
+        let i = 0;
+        let timer = setInterval(()=>{
+            i++
+            this.setData({
+                aiStr: str.slice(0,i)
+            })
+            if (i>str.length) {
+                clearInterval(timer)
+            }
+        },100)
+    },
     
     showImg (img) {
         if (!img) { return img }
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c69fb11..04f80b0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -63,12 +63,16 @@
             </view> -->
         </view>
 
+        <view class="ai-box">
+            <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/aiPlay/banniyou.gif"></image>
+            <view class="ai-text">{{aiStr}}</view>
+        </view>
 
         
 
         <view class="content-box">
             <!-- 苏城环游记 todo-->
-            <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
+            <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">            
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
@@ -358,7 +362,7 @@
 
 
     <!-- 底部AI伴你游 -->
-    <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20250929/6f29f557e80a331e84f01f2a5083d933.gif"></image>
+    <!-- <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20250929/6f29f557e80a331e84f01f2a5083d933.gif"></image> -->
 </view>
 
 
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 0e33f6c..4c53e3e 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1041,13 +1041,30 @@
     margin-right: 0rpx;
   }
 
+  .ai-box{
+      margin:  30rpx 0 30rpx;
+      width: 100%;
+      position: relative;
+  }
+  .ai-text{
+    position: absolute;
+    font-weight: 500;
+    font-size: 25rpx;
+    color: #111111;
+    top: 97rpx;
+    left: 210rpx;
+    width: 320rpx;
+  }
+
   .ai-fix{
-      position: fixed;
+      /* position: fixed;
       width: 150.33rpx;
       height: 200rpx;
       bottom: 30rpx;
       right: 24rpx;
-      z-index: 100;
+      z-index: 100; */
+      width: 100%;
+      display: block;
   }
   .hot-prod-new{
     display: flex;
diff --git a/pages/user/likes/index.js b/pages/user/likes/index.js
index 44d3ca6..a0aca10 100644
--- a/pages/user/likes/index.js
+++ b/pages/user/likes/index.js
@@ -149,6 +149,12 @@ Page({
           });
           return
     }
+    if (item.product &&item.product.is_package==3) {
+        wx.navigateTo({
+            url: '/subPackages/goods/memberCard/index?id='+item.product.id
+          });
+          return
+    }
 
 
     switch(type){
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 75339e3..758a3e6 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -212,6 +212,11 @@ Page({
             url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
           });
           return
+    } else if (item.is_package==3) {
+        wx.navigateTo({
+            url: '/subPackages/goods/memberCard/index?id='+item.product_id
+          });
+          return
     }
 
     if (item.product_model=='ticket') {
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index d00901b..248e463 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -245,6 +245,11 @@ Page({
             url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
           });
           return
+    }  else if (item.is_package==3) {
+        wx.navigateTo({
+            url: '/subPackages/goods/memberCard/index?id='+item.product_id
+          });
+          return
     }
 
     if (item.product_model=='ticket') {
diff --git a/pages/user/order/showOrderInfo/index.js b/pages/user/order/showOrderInfo/index.js
index 428abb1..3888ad1 100644
--- a/pages/user/order/showOrderInfo/index.js
+++ b/pages/user/order/showOrderInfo/index.js
@@ -240,6 +240,11 @@ Page({
             url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
           });
           return
+    }  else if (item.is_package==3) {
+        wx.navigateTo({
+            url: '/subPackages/goods/memberCard/index?id='+item.product_id
+          });
+          return
     }
 
     if (item.product_model=='ticket') {
diff --git a/pages/user/order/showOrderInfo/index.wxml b/pages/user/order/showOrderInfo/index.wxml
index 2cbad7f..414660c 100644
--- a/pages/user/order/showOrderInfo/index.wxml
+++ b/pages/user/order/showOrderInfo/index.wxml
@@ -48,6 +48,7 @@
     <view wx:if="{{info.state!='UNPAID'}}">
         <navigator wx:if="{{info.order_product_list[0].is_package==1}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
         <navigator wx:elif="{{info.order_product_list[0].is_package==2}}" url="/subPackages/goods/oneCardTour/info/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
+        <navigator wx:elif="{{info.order_product_list[0].is_package==3}}" url="/subPackages/goods/memberCard/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
 
         <navigator wx:else  url="/pages/info/showInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
     </view>
diff --git a/project.private.config.json b/project.private.config.json
index 0e91f87..7920a32 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subPackages/goods/memberCard/index",
+          "pathName": "subPackages/goods/memberCard/index",
+          "query": "id=464704",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "subPackages/foodListNew/index",
           "pathName": "subPackages/foodListNew/index",
diff --git a/subPackages/goods/memberCard/index.js b/subPackages/goods/memberCard/index.js
new file mode 100644
index 0000000..e280c4d
--- /dev/null
+++ b/subPackages/goods/memberCard/index.js
@@ -0,0 +1,743 @@
+// pages/info/roadInfo/index.js
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
+import commonApi from "../../../utils/https/common"
+import QRCode from '../../../utils/weapp-qrcode.js'
+import util from '../../../utils/util'
+let app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        autoPlay: false,
+        fixed: false,
+        type: 1,
+        top: 0,
+        isLike: 0,
+
+        info: null,
+        skuFlag: null,
+        producNum: 1,
+        skuIndex: 0,
+        aniSkuIndex: -1,
+        retailId: "",
+        cartTop: 0,
+        cartImgInfo: null,
+        cartCount: 0,
+        shareImg: null,
+        showShareFlag: false,
+        allowance_data: null,
+        showAllowance: false,
+
+        showQrCode: false,
+        wxqrcode: null,
+
+        ZTPoint:'',
+        swiperCurrent: 0,
+        swiperRange: {
+            video: {min:0,max:0},
+            picture: {min:0,max:0},
+            sku: {min:0,max:0}
+        },
+        otherInfoShow: 0,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        console.log(options)
+        //删除临时存储的联系人
+        wx.removeStorageSync('linkMan')
+        let rect = wx.getMenuButtonBoundingClientRect(),
+            that = this;
+        let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+        this.setData({
+            top: height,
+            id: options.id
+        })
+        // 获取购物车按钮的位置
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+            console.log(res)
+            that.setData({
+                cartTop: res.top
+            })
+        }).exec()
+        if (options.ZTPoint) {
+            this.setData({
+                ZTPoint: options.ZTPoint
+            })
+        }
+
+        if (options.retailId) {
+            this.setData({
+                retailId: options.retailId
+            })
+        }
+        commonApi._post("product/get_product_detail", {
+            id: options.id
+        }).then(res => {
+            res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2);
+            if (options.skuid) {
+                let sku = res.data.sku.find(item => item.id == options.skuid);
+                res.data.sku = [sku];
+            }
+
+            res.data.sku.forEach(x=>{
+                x.display_tags = (x.display_tags ? x.display_tags.split(",")[0] : "");
+            })
+           
+
+            let resData = res.data
+            let swiperRange = this.data.swiperRange;
+            swiperRange.video = resData.videourl? { min: 0, max: 0 } : { min: -1, max: -1 }
+            swiperRange.picture = {min:swiperRange.video.max+1, max:swiperRange.video.max+1+resData.listimg.length-1}
+            swiperRange.sku = {min:swiperRange.picture.max+1,max:swiperRange.picture.max+1+resData.sku.length-1}
+            console.log(swiperRange)
+            this.setData({
+                info: resData,
+
+                swiperRange: swiperRange,
+            })
+            this.BroswerRecord()
+        })
+    },
+
+    showImg (img) {
+        if (!img) { return img }
+        if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
+            return img;
+        } else {
+            // return "https://test.api.cloud.sz-trip.com"+img
+            return "https://static.ticket.sz-trip.com" + img;
+        }
+    },
+
+    changeAllowance: function () {
+        this.setData({
+            showAllowance: !this.data.showAllowance
+        })
+    },
+    BroswerRecord: function () {
+        setTimeout(() => {
+            if (app.globalData.uuid) {
+                commonApi._post('browse/browse_record', {
+                    type: "goods",
+                    title: this.data.info.title,
+                    drive: "mini",
+                    source_id: this.data.info.id,
+                    url: "/pages/info/postProductInfo/index?id=" + this.data.info.id,
+                    uuid: app.globalData.uuid
+                }).then(res => {})
+            } else {
+                this.BroswerRecord();
+            }
+        }, 500)
+    },
+    like: function () {
+        let id = this.data.id,
+            isLike = this.data.isLike;
+        commonApi.user_post("product/" + (isLike == 1 ? "product_cancel_collection" : "product_collection"), {
+            product_id: id
+        }).then(res => {
+            if (res.code == 1) {
+                this.setData({
+                    isLike: isLike == 1 ? 0 : 1
+                })
+            }
+        })
+    },
+    changeMenu: function (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            type: index
+        })
+        
+    },
+
+    showCart: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能加购',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                this.setData({
+                    skuFlag: "cart"
+                })
+                let that = this
+                wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
+                    console.log(res)
+                    that.setData({
+                        cartImgInfo: 'top:' + res.top + 'px;left:' + res.left + 'px;'
+                    })
+                }).exec()
+            }
+        })
+    },
+    hideSku: function () {
+        this.setData({
+            skuFlag: null,
+            cartImgInfo: null
+        })
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+    selectSku: function (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            skuIndex: index,
+            swiperCurrent: index+this.data.swiperRange.picture.max+1
+        })
+    },
+    showOrder: function () {
+        commonApi.user_post('wx/get_user_keep', {
+            jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
+            title: this.data.info.title,
+            type: 'mini'
+        }).then(res => {
+            if (res.data.subscribe == 0) {
+                this.setData({
+                    wxqrcode: res.data.qrcode,
+                    showQrCode: true
+                })
+            } else {
+                if (this.data.info.sku.length == 0) {
+                    wx.showToast({
+                        title: '该产品未设置规格，不能购买',
+                        icon: 'none'
+                    })
+                    return;
+                }
+                let swiperCurrent = this.data.swiperCurrent;
+                let skuIndex = swiperCurrent - this.data.swiperRange.sku.min
+                console.log(swiperCurrent, skuIndex)
+                if (skuIndex<0) {skuIndex=0}
+                this.setData({
+                    skuFlag: 'order',
+                    skuIndex: skuIndex,
+                    swiperCurrent: skuIndex+this.data.swiperRange.picture.max+1
+                })
+            }
+        })
+    },
+    order: function () {
+        app.globalData.postProduct = []
+        app.globalData.list = []
+        commonApi.user_post("/product/checkStock", {
+            sku_id: this.data.info.sku[this.data.skuIndex].id,
+        }).then(res => {
+            if (res && res.code != 1) {
+                return;
+            } else {
+                if (this.data.skuFlag == 'order') {
+                    util.pagePoint({
+                        event: 'product_order',
+                        param: {
+                            id: this.data.info.id,
+                            type: this.data.info.type
+                        }
+                    }, 1)
+                    wx.setStorageSync('login_from', 'product_order_login')
+                    wx.setStorageSync('order_from', 'product_order_submit')
+                    app.globalData.couponInfo = null;
+                    // 购买
+                    let product = [{
+                        product: {...this.data.info,ZTPoint:this.data.ZTPoint},
+                        sku: this.data.info.sku[this.data.skuIndex],
+                        productNum: this.data.producNum
+                    }];
+                    app.globalData.postProduct = product;
+                    app.globalData.retailId = this.data.retailId;
+                    app.globalData.listName = null
+
+                    
+                    wx.navigateTo({
+                        url: '/pages/order/postOrder/index',
+                    })
+                    
+                } else {
+                    let tag_id = this.data.info.tag_id,type = ''
+                    if (tag_id.includes(20) || tag_id.includes(19)) {  //文创
+                      type = '1'
+                    }else if (tag_id.includes(5)) { //非遗
+                      type = '2'
+                    }else {
+                      type = ''
+                    }
+                    commonApi.user_post("cart/add_sku", {
+                        sku_id: this.data.info.sku[this.data.skuIndex].id,
+                        num: this.data.producNum,
+                        type:type
+                    }).then(res => {
+                        if (res.code == 1) {
+                            commonApi.user_post('cart/get_list', {}).then(res => {
+                                this.setData({
+                                    cartCount: res.data.length
+                                })
+                            })
+                            // 加动效
+                            this.setData({
+                                skuFlag: null,
+                                aniSkuIndex: this.data.skuIndex,
+                                cartImgInfo: null
+                            })
+                            setTimeout(() => {
+                                this.setData({
+                                    aniSkuIndex: -1
+                                })
+                                wx.showModal({
+                                    title: "提示",
+                                    content: "去购物车结算？",
+                                    success: function (res) {
+                                        if (res.confirm) {
+                                            wx.navigateTo({
+                                                url: '/pages/user/cartlist/list',
+                                            })
+                                        }
+                                    }
+                                })
+                            }, 650)
+                        }
+                    })
+                }
+            }
+        })
+
+    },
+    // 分享
+    share: function () {
+        if (!wx.getStorageSync("jstrip_token")) {
+            util.pagePoint({
+                event: 'product_share_login',
+                type: this.data.info.type,
+                id: this.data.info.id
+            }, 1)
+            commonApi.user_post("user/getMyInfo", {}).then(res => {
+
+            })
+            return;
+        }
+        if (!this.data.shareImg) {
+            wx.showToast({
+                title: '图片生成中，稍后再试',
+                icon: 'none'
+            })
+            return;
+        }
+        this.setData({
+            showShareFlag: !this.data.showShareFlag
+        })
+    },
+    // 保存
+    save() {
+        let url = this.data.shareImg,
+            that = this;
+        wx.authorize({
+            /* 这个就是保存相册的 */
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                wx.saveImageToPhotosAlbum({
+                    filePath: url,
+                    success(res) {
+                        wx.showToast({
+                            title: '保存成功',
+                            icon: "success"
+                        })
+                        that.setData({
+                            showShareFlag: !this.data.showShareFlag
+                        })
+                        util.pagePoint({
+                            event: 'product_share_save',
+                            type: that.data.info.type,
+                            id: that.data.info.id
+                        }, 1)
+                    },
+                    fail(res) {
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none'
+                        })
+                    }
+                })
+            },
+            complete(res) {
+                console.log(res);
+                /* 这里判断一下如果没有授权重新打开设置选项 */
+                wx.getSetting({
+                    success(res) {
+                        if (!res.authSetting['scope.writePhotosAlbum']) {
+                            /* 打开设置的方法 */
+                            // opensit();
+                            wx.showToast({
+                                title: '请打开权限后再试',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
+            }
+        });
+
+    },
+    pagePoint: function (e) {
+        util.pagePoint(e)
+    },
+    // 绘制海报
+    drawImg: function () {
+        var that = this,
+            userinfo = wx.getStorageSync('jstrip_userInfo');
+        if (!userinfo) {
+            // 去登录
+            return false;
+        }
+        const ctx = wx.createCanvasContext('imageCanvas');
+        // const device = wx.getSystemInfoSync();
+        // const ratio = device.screenWidth / 750;
+
+        // 先获取到图片信息
+        let promise2 = new Promise(function (resolve, reject) {
+            wx.getImageInfo({
+                src: that.data.info.headimg,
+                success: function (res) {
+                    resolve(res);
+                },
+                fail: function (res) {
+                    reject(res);
+                }
+            })
+        })
+        let promise3 = new Promise(function (resolve, reject) {
+            let userid = wx.getStorageSync('jstrip_userid')
+            new QRCode('myQrcode', {
+                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                width: 500,
+                height: 500,
+                padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+                correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+                callback: (res) => {
+                    resolve(res);
+                }
+            })
+        })
+        //成功得到图片信息后，开始绘图
+        Promise.all([promise2, promise3]).then(imgs => {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            that.handleBorderRect(ctx, 0, 0, 551 * ratio, 407 * ratio, 25 * ratio, '#ccc')
+            ctx.clip(); //画好了圆 剪切  原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 这也是我们要save上下文的原因
+            ctx.drawImage(imgs[0].path, 0, 0, 551 * ratio, 407 * ratio);
+            ctx.restore();
+            ctx.save();
+            that.handleBorderRect2(ctx, 0, 407 * ratio, 551 * ratio, 236 * ratio, 25 * ratio, '#fff')
+            ctx.restore();
+            // 绘制二维码
+            ctx.drawImage(imgs[1].path, 373 * ratio, 495 * ratio, 137 * ratio, 137 * ratio);
+            // 开始文字绘制
+            ctx.setFillStyle("#000");
+            ctx.setFontSize(30 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            that.drawText(ctx, that.data.info.title, 25 * ratio, 450 * ratio, 480 * ratio, ratio);
+            // 售价
+            ctx.setFillStyle("#D62828");
+            ctx.setFontSize(40 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let price = "￥" + (that.data.info.price / 100);
+            let width = ctx.measureText(price).width;
+            ctx.fillText(price, 25 * ratio, 620 * ratio);
+            // 副标题
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(28 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let subtitle = that.data.info.subtitle;
+            if (that.data.info.subtitle.length > 10) {
+                subtitle = that.data.info.subtitle.substr(0, 10) + '...'
+            }
+            ctx.fillText(subtitle, 25 * ratio, 540 * ratio);
+            // ctx.draw();
+            // 划线价
+            ctx.setFillStyle("#999999");
+            ctx.setFontSize(32 * ratio); //字大小
+            ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            let market_price = "￥" + (that.data.info.market_price / 100)
+            ctx.fillText(market_price, 40 * ratio + width, 620 * ratio);
+            let market_price_width = ctx.measureText(market_price).width;
+            // 划线
+            ctx.beginPath()
+            ctx.setLineWidth(1)
+            ctx.moveTo(40 * ratio + width, 608 * ratio)
+            ctx.lineTo(45 * ratio + width + market_price_width, 608 * ratio)
+            ctx.stroke();
+            // 长按识别二维码
+            // ctx.setFillStyle("#666");
+            // ctx.setFontSize(22 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按识别二维码", 404*ratio, 710*ratio);
+            // 长按图片转发或保存
+            // ctx.setFillStyle("#000");
+            // ctx.setFontSize(24 * ratio); //字大小
+            // ctx.setTextAlign('left'); //是否居中显示，参考点画布中线
+            // ctx.fillText("长按图片保存到本地",(592*ratio - ctx.measureText("长按图片保存到本地").width)/2, 740*ratio);
+            ctx.draw();
+            // 转为图片
+            setTimeout(() => {
+                wx.canvasToTempFilePath({
+                    x: 0,
+                    y: 0,
+                    canvasId: 'imageCanvas',
+                    success: function (res) {
+                        that.setData({
+                            shareImg: res.tempFilePath
+                        })
+                    },
+                    fail(err) {
+                        console.log('agdgjgdajhg', err)
+                    }
+                })
+            }, 500)
+            return false;
+        }).catch(err => {
+            console.log("this err", err)
+        })
+    },
+    // 圆角矩形
+    handleBorderRect(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x + w, y + h);
+        ctx.lineTo(x, y + h)
+        // 左上角
+        ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI);
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(x + w - r, y);
+        ctx.lineTo(x + w, y + r);
+        // 右上角
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI);
+        ctx.lineTo(x + w, y + h);
+        ctx.lineTo(x + w - r, y + h);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    handleBorderRect2(ctx, x, y, w, h, r, color) {
+        ctx.beginPath();
+        ctx.moveTo(x, y);
+        ctx.lineTo(x + w, y)
+        // 右下角
+        ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI);
+        ctx.lineTo(x + r, y + h);
+        ctx.lineTo(x, y + h - r);
+        // 左下角
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI);
+        ctx.lineTo(x, y);
+        ctx.lineTo(x, y);
+        ctx.fillStyle = color;
+        ctx.fill();
+        ctx.closePath();
+    },
+    // 绘制两行文字
+    drawText: function (ctx, str, x, y, canvasWidth, ratio) {
+        let row = [],
+            temp = "",
+            chr = str.split("");
+        for (var a = 0; a < chr.length; a++) {
+            if (ctx.measureText(temp).width < canvasWidth) {
+                temp += chr[a];
+            } else {
+                a--; //这里添加了a-- 是为了防止字符丢失，效果图中有对比
+                row.push(temp);
+                temp = "";
+            }
+        }
+        row.push(temp);
+
+        //如果数组长度大于2 则截取前两个
+        if (row.length > 2) {
+            var rowCut = row.slice(0, 2);
+            var rowPart = rowCut[1];
+            var test = "";
+            var empty = [];
+            for (var a = 0; a < rowPart.length; a++) {
+                if (ctx.measureText(test).width < canvasWidth - 30 * ratio) {
+                    test += rowPart[a];
+                } else {
+                    break;
+                }
+            }
+            empty.push(test);
+            var group = empty[0] + "..." //这里只显示两行，超出的用...表示
+            rowCut.splice(1, 1, group);
+            row = rowCut;
+        }
+        for (var b = 0; b < row.length; b++) {
+            ctx.fillText(row[b], x, y + b * 40 * ratio, canvasWidth);
+        }
+    },
+    gotoDetail: function (e) {
+        let item = e.currentTarget.dataset.item;
+        util.pagePoint({
+            event: 'recommend_click',
+            param: {
+                id: item.id,
+                type: item.type
+            }
+        }, 1)
+        if (item.type == 'travels') {
+            // 游记做特殊处理 其他都按照原来的来
+            wx.navigateTo({
+                url: '/pages/info/strategyInfo/index?id=' + item.s_id,
+            })
+        } else {
+            util.gotoDetail(item);
+        }
+    },
+
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+          latitude: Number(info.scene_lat),
+          longitude: Number(info.scene_lon),
+          name:info.scene_name,
+            address:info.scene_address
+        })
+      },
+
+    viewImg:function(e){
+        let item = e.currentTarget.dataset.item;
+        if (item.img_list.length>0) {
+            wx.previewImage({
+                urls: item.img_list
+            })
+        }
+    },
+
+    swiperChange (e) {
+        return
+        if(e.detail.source == "touch") {
+        let index = e.detail.current
+        this.setData({
+            swiperCurrent: index
+        })
+        }
+        console.log(e, this.data.swiperCurrent)
+    },
+    changeSwiperCurrent (e) {
+        let index = e.currentTarget.dataset.index
+        this.setData({
+            swiperCurrent: index
+        })
+    },
+    changeSimpleVal (e) {
+        let keyname = e.currentTarget.dataset.keyname;
+        let val = e.currentTarget.dataset.val;
+        let param = {}
+        param[keyname] = val
+        this.setData(param)
+        console.log(this.data)
+    },
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        app.globalData.postProduct = []
+        if (!wx.getStorageSync('jstrip_token')) {
+            return;
+        }
+        if (this.data.info && this.data.info.id) {
+            commonApi.user_post("product/is_product_collection", {
+                product_id: this.data.info.id
+            }).then(res => {
+                this.setData({
+                    isLike: res.data
+                })
+                this.drawImg()
+            })
+            // commonApi.user_post('cart/get_list', {}).then(res => {
+            //     this.setData({
+            //         cartCount: res.data.length
+            //     })
+            // })
+            commonApi.user_post('cart/get_count', {noLogin: true}).then(res => {
+                this.setData({
+                  cartCount: res.data //1
+                })
+              })
+        } else {
+            setTimeout(() => {
+                this.onShow()
+            }, 200)
+        }
+    },
+    playVideo() {
+        // 播放视频需要把autoplay暂停
+        this.setData({
+            autoPlay: false
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/subPackages/goods/memberCard/index.json b/subPackages/goods/memberCard/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/subPackages/goods/memberCard/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/goods/memberCard/index.wxml b/subPackages/goods/memberCard/index.wxml
new file mode 100644
index 0000000..a6d34a6
--- /dev/null
+++ b/subPackages/goods/memberCard/index.wxml
@@ -0,0 +1,226 @@
+<!--pages/info/hotelProductInfo/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<title title="产品详情"></title>
+
+<!-- <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image> -->
+<view style="position: relative;">
+    <scroll-view>
+    <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" 
+    interval="{{2000}}" duration="{{300}}" >
+    <block wx:if="{{info.videourl}}" wx:key="*this">
+        <swiper-item>
+        <scroll-view>
+            <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
+            show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
+        </scroll-view>
+        </swiper-item>
+    </block>
+    <block wx:for="{{info.listimg}}" wx:key="*this">
+        <swiper-item>
+        <image lazy-load src="{{item}}" mode="aspectFill"></image>
+        </swiper-item>
+    </block>
+    <!-- <block wx:for="{{info.sku}}" wx:key="*this">
+        <swiper-item style="position: relative;">
+        <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
+        <view class="sku-tips ">
+            <view class="textOver">{{item.sku_name}}</view>
+        </view>
+        </swiper-item>
+    </block> -->
+    </swiper>
+    </scroll-view>
+    <!-- <view class="swiper-bottom" wx:if="{{info}}">
+        <view class="swuper-bottom-bg">
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.video.min&&swiperCurrent<=swiperRange.video.max)?'active':''}}" 
+            wx:if="{{info.videourl}}" bind:tap="changeSwiperCurrent" data-index="{{0}}">视频</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.picture.min&&swiperCurrent<=swiperRange.picture.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.min}}">图片</view>
+            <view class="swiper-bottom-item {{(swiperCurrent>=swiperRange.sku.min&&swiperCurrent<=swiperRange.sku.max)?'active':''}}"
+            bind:tap="changeSwiperCurrent" data-index="{{swiperRange.sku.min}}">款式</view>
+        </view>
+        <view class="swiper-bottom-item bottom-number active">{{swiperCurrent+1}}/{{swiperRange.sku.max+1}}</view>
+    </view> -->
+</view>
+
+<view wx:if="{{info}}">
+    <view class="top-info">
+        <view class="title">{{info.title}}</view>
+        <view class="price-box">
+            <text class="top-price">￥{{info.sku[skuIndex].price / 100}}</text>
+            <text class="old-price">￥{{info.sku[skuIndex].market_price / 100}}</text>
+        </view>
+    </view>
+</view>
+
+<view class="scroll-all-box" id="menus" wx:if="{{info}}">
+    <!-- <view class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px"> -->
+    <view class="scroll-menus">
+        <view class="type-box">
+            <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">{{info.sku[skuIndex].display_tags}}</view>
+            <view class="scroll-menu-item{{type==2?' active':''}}" bindtap="changeMenu" data-index="2">增值权益</view>
+        </view>
+        
+    </view>
+    <!-- <view style="height:85rpx" wx:if="{{fixed}}"></view> -->
+    <view class="info-box" >
+        <rich-text wx:if="{{type==1}}" class="details" nodes="{{tool.formateRichText(info.sku[skuIndex].sku_model.detailinfo)}}"></rich-text>
+
+        <rich-text wx:if="{{type==2}}" class="details" nodes="{{tool.formateRichText(info.sku[skuIndex].sku_model.expenseinfo)}}"></rich-text>
+    </view>
+</view>
+
+<view style="height:140rpx"></view>
+<view class="fixed-bottom">
+<view class="['left-img','no-shop']">
+  <!-- <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <view class="shop-box">
+    <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
+    <view>店铺</view>
+  </view>
+  </navigator> -->
+  <navigator url="/pages/user/service/index"  catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+    <view class="iconfont icon-kefu"></view>
+    <view>客服</view>
+  </navigator>
+  <view bindtap="like" class="kefu-box">
+    <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
+    <view>收藏</view>
+  </view>
+</view>
+
+
+  <view class="btns">
+    <view class="btn" bindtap="showCart">加入购物车</view>
+    <view class="btn" bindtap="showOrder">立即购买</view>
+  </view>
+</view>
+<!-- 购物车悬浮框 -->
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+  <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
+  <view class="cart-num">{{cartCount}}</view>
+</navigator>
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="hideSku"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="hideSku"></view>
+    <view class="sku-info-box">
+      <image lazy-load id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view>
+            <view class="sku-price">{{info.sku[skuIndex].price/100}}
+            <!-- <view class="allowance" wx:if="{{allowance_data}}">
+                补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view> -->
+            </view>
+            <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+        </view>
+        <view style="display: flex;align-items: center;">
+            <view class="number-box">
+                <view class="iconfont icon-sami-select" bindtap="minus"></view>
+                <view class="number">{{producNum}}</view>
+                <view class="iconfont icon-add-select" bindtap="add"></view>
+            </view>
+            <view class="limit-number" wx:if="{{info.sku[skuIndex].sku_model.traveller_limit_num>0}}">限购{{info.sku[skuIndex].sku_model.traveller_limit_num}}件</view>
+        </view>
+      </view>
+    </view>
+    <view style="font-weight: bold;font-size: 33rpx;color: #060001;margin:0rpx 25rpx 27rpx">产品分类（{{info.sku.length}}）</view>
+    <view class="sku-names">
+      <view bindtap="selectSku" data-index="{{index}}" class="sku-name-item {{index==skuIndex?' active':''}}" 
+      wx:for="{{info.sku}}">
+        <image lazy-load src="{{item.headimg}}"></image>
+        <view class="sku-name textOver2">{{item.sku_name}}</view>
+      </view>
+    </view>
+    
+    
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="order" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'确认':'立即购买'}}
+      </view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>
+<view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
+  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
+  </canvas>
+  <canvas class="canvasCode" style="opacity:0;width:500px;height:500px" canvas-id="myQrcode"></canvas>
+</view>
+<view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
+  <view class="mask-bg" bindtap="share"></view>
+  <view class="mask-content share-img-box">
+    <image lazy-load class="share-img" src="{{shareImg}}" mode="widthFix"></image>
+    <view class="share-tips">
+      <view style="position:relative">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/img.png" mode="widthFix">
+        </image>
+        <view>保存图片到相册</view>
+        <view class="tipimg">
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok.png" mode="widthFix"></image>
+        </view>
+      </view>
+      <image lazy-load style="width:36rpx" src="https://static.ticket.sz-trip.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      <view style="position:relative">
+        <image lazy-load class="img" src="https://static.ticket.sz-trip.com/xcxImages/info/code.png" mode="widthFix">
+        </image>
+        <view>微信识别二维码</view>
+        <view class="tipimg">
+          <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+        </view>
+      </view>
+    </view>
+    <view class="save-btn" bindtap="save">保存到相册</view>
+  </view>
+</view>
+<view class="mask mask-allowance" wx:if="{{showAllowance}}">
+  <view bindtap="changeAllowance" class="mask-bg"></view>
+  <view class="mask-content rule-box">
+    <view class="rule-title">{{allowance_data.title}}</view>
+    <rich-text nodes="{{allowance_data.content}}"></rich-text>
+  </view>
+</view>
+<code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
+</code>
+
+<view class="mask" wx:if="{{otherInfoShow>0}}">
+  <view class="mask-bg" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}"></view>
+    <view class="other-info-content">
+        <view class="title">{{otherInfoShow==3?"产品参数":otherInfoShow==2?"服务说明":"发货说明"}}</view>
+        <view wx:if="{{otherInfoShow==1}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.shipment_info)}}"></rich-text>
+            <!-- <view class="key-title">该商品预计13小时内发货</view>
+            <view class="key-content">订单支付成功后48小时内发货，若未在48小时内发货消费者 可联系客服咨询催促发货。</view> -->
+        </view>
+        <view wx:if="{{otherInfoShow==2}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.service_info)}}"></rich-text>
+        </view>
+        
+       
+        <view wx:if="{{otherInfoShow==3}}">
+            <rich-text class="details" nodes="{{tool.formateRichText(info.parameter_info)}}"></rich-text>
+
+            <!-- <view class="prod-param">
+                <view class="prod-key">名称</view>
+                <view class="prod-content">鸡头米</view>
+            </view>
+            <view class="prod-param">
+                <view class="prod-key">购买须知</view>
+                <view class="prod-content">购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知购买须知</view>
+            </view> -->
+        </view>
+    
+    </view>
+ 
+
+    
+    
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="changeSimpleVal" data-keyname="otherInfoShow" data-val="{{0}}">确定</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/subPackages/goods/memberCard/index.wxss b/subPackages/goods/memberCard/index.wxss
new file mode 100644
index 0000000..fdeb6c2
--- /dev/null
+++ b/subPackages/goods/memberCard/index.wxss
@@ -0,0 +1,1025 @@
+/* pages/info/hotelProductInfo/index.wxss */
+page {
+  background: #F7F7F7;
+}
+
+.swiper {
+  width: 100%;
+  height: 367.33rpx;
+}
+.swiper swiper-item{
+    width: 100%;
+    height: 100%;
+    background: #F7F7F7;
+    padding: 26rpx 27rpx 0;
+    box-sizing: border-box;
+}
+
+.swiper image,.swiper video {
+  height: 340rpx;
+  display: block;
+  width: 100%;
+  border-radius: 27rpx 27rpx 0rpx 0rpx;
+}
+.swiper-bottom{
+    position: absolute;
+    /* top: 750rpx; */
+    bottom: 77rpx;
+    right: 0;
+    width: 90rpx;
+    height: fit-content;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    z-index: 10;
+}
+.swuper-bottom-bg{
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 20rpx 0rpx 0rpx 20rpx;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding: 8rpx 0;
+    margin-bottom: 12rpx;
+}
+.swiper-bottom-item{
+    width: 100%;
+    text-align: center;
+    padding: 14rpx 0;
+}
+.swiper-bottom-item.active{
+    color: #fff;
+}
+.swiper-bottom-item.bottom-number{
+    max-width: 100%;
+    width: fit-content;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 13rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 0 10rpx;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+.top-info {
+  background:#FFEDD8;
+  position: relative;
+  z-index: 1;
+  width: 696rpx;
+  margin: 0 auto;
+  padding: 26rpx 28rpx 120rpx;
+  box-sizing: border-box;
+  min-height: 200rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.top-info .title {
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #000000;
+    flex: 1;
+    width: 100rpx;
+    padding-right: 20rpx;
+}
+
+.top-info .price-box{
+    flex-shrink: 0;
+}
+
+.top-info .top-price{
+    font-weight: bold;
+    font-size: 39rpx;
+    color: #FF0000;
+    padding-right: 6rpx;
+}
+.top-info .old-price{
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    text-decoration-line: line-through;
+}
+
+.box {
+  /* margin: 20rpx; */
+  /* background: white; */
+  /* border-radius: 13rpx; */
+  background: #f2f2f2;
+  padding: 20rpx;
+}
+
+
+.scroll-all-box {
+}
+
+.scroll-menus {
+
+  position: relative;
+  margin-top: -120rpx;
+  z-index: 3;
+  width: 100%;
+  height: 654rpx;
+  background-image: url(https://static.ticket.sz-trip.com/jundaosuzhou/images/aiPlay/equityCardBg.png);
+  background-size: 100% 100%;
+  font-weight: bold;
+  font-size: 39rpx;
+  color: #D4A974;
+  padding: 130rpx 26rpx;
+  box-sizing: border-box;
+}
+.scroll-menus .type-box{
+    width: 100%;
+    border-bottom: 2rpx solid #D4A974;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 66rpx 0 46rpx;
+    box-sizing: border-box;
+}
+
+.scroll-menu-item {
+  position: relative;
+  line-height: 84rpx;
+}
+.scroll-menu-item.active{
+     color: #FFFFFF;
+}
+
+.scroll-menu-item.active::after {
+  content: "1";
+  font-size: 0;
+  display: block;
+  position: absolute;
+  left: 50%;
+  margin-left: -42rpx;
+  bottom: -6rpx;
+  width: 84rpx;
+  height: 12rpx;
+  background: #FFEDD8;
+
+}
+
+.fixed-menus {
+  position: fixed;
+  left: 0;
+  right: 0;
+  background: white;
+  z-index: 1;
+}
+.info-box {
+    position: relative;
+    margin-top: -380rpx;
+    z-index: 7;
+    width: 100%;
+    box-sizing: border-box;
+    /* background: #000; */
+}
+
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 151rpx;
+  box-sizing: border-box;
+  background: white;
+  display: flex;
+  align-items: center;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  padding: 0 40rpx;
+  color: #666666;
+  font-size: 23rpx;
+  justify-content: space-between;
+  text-align: center;
+  padding-left: 0;
+  z-index: 10;
+}
+
+.fixed-bottom .iconfont {
+  font-size: 34rpx;
+  line-height: 40rpx;
+}
+
+.btns {
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 500;
+  border-radius: 39rpx;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.btns .btn {
+  width: 216rpx;
+  line-height: 78rpx;
+  background: #D62828;
+}
+
+.btns .btn:nth-child(1) {
+  /* margin-right: 3rpx; */
+  border-radius: 39rpx 0 0 39rpx;
+  background: #FD7601;
+}
+
+.btns .btn:nth-child(2) {
+  border-radius: 0 39rpx 39rpx 0;
+}
+
+.btns .btn.disable {
+  background: #ccc;
+}
+
+.mask-content {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+}
+
+.mask-content .icon-close {
+  position: absolute;
+  right: 40rpx;
+  top: 40rpx;
+}
+
+.sku-info-box {
+  margin: 50rpx 25rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.sku-info-box image {
+    width: 173rpx;
+    height: 173rpx;
+  border-radius: 13rpx;
+  display: block;
+  margin-right: 15rpx;
+  flex-shrink: 0;
+}
+
+.sku-info {
+  flex: 1;
+  width: 100rpx;
+  height: 173rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.sku-price {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #F84A56;
+}
+
+.sku-price::before {
+  content: "￥";
+  font-size: 24rpx;
+  vertical-align: baseline;
+}
+
+.sku-price view {
+  font-size: 24rpx;
+  color: #FFFFFF;
+  background-color: #D62828;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  margin-left: 7rpx;
+  padding: 0 20rpx;
+}
+
+.sku-name {
+  font-size: 27rpx;
+  color: #666666;
+}
+
+.sku-names {
+  display: flex;
+  font-weight: 500;
+  font-size: 27rpx;
+  color: #333333;
+  margin: 0 25rpx;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+  justify-content: space-between;
+  max-height: 800rpx;
+  min-height: 400rpx;
+  align-content: flex-start; 
+}
+
+.sku-name-item {
+    min-height: 67rpx;
+    border-radius: 13rpx;
+  margin-bottom: 34rpx;
+  max-width: 100%;
+  padding-right:15rpx;
+  min-width: 340rpx;
+  background: #EFEFEF;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+}
+.sku-name-item>image{
+    width: 67rpx;
+    height: 100%;
+    border-radius: 13rpx;
+    flex-shrink: 0;
+}
+.sku-name-item .sku-name{
+    flex:1;
+    /* width: 100rpx; */
+    padding-left: 15rpx;
+    color: #333;
+}
+
+.sku-name-item.active{
+  color: #0B898E;
+  border: 1px solid #0B898E;
+  background: rgba(11, 137, 142, 0.1);
+}
+.sku-name-item.active .sku-name{
+    color: #0B898E;
+  }
+
+.number-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #EFEFEF;
+border-radius: 13rpx;
+padding: 10rpx 0;
+box-sizing: border-box;
+height: 53rpx;
+width: 250rpx;
+
+}
+
+.number-box text {
+  flex: 1;
+  font-size: 29rpx;
+  color: #333;
+}
+
+.number-box view {
+  text-align: center;
+  width: 80rpx;
+  height: 33rpx;
+  line-height: 33rpx;
+  font-size: 31rpx;
+  color: #000;
+}
+
+.number-box view.number {
+  width: 94rpx;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+.limit-number{
+    font-weight: 500;font-size: 27rpx;color: #666666;padding-left:20rpx;
+}
+
+.btn-box {
+  height: 138rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.mask-btn {
+  width: 670rpx;
+  line-height: 78rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 33rpx;
+  font-weight: 500;
+}
+
+.mask-btn.disable {
+  background: #ccc;
+}
+
+/* .icon-xin,.icon-shoucang {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  line-height: 60rpx;
+  background: rgba(0, 0, 0, 0.4);
+  border-radius: 50%;
+  text-align: center;
+  color: #fff;
+  font-size: 36rpx;
+  z-index: 1;
+} */
+.share-icon {
+  position: absolute;
+  right: 20rpx;
+  margin-top: 20rpx;
+  width: 60rpx;
+  height: 60rpx;
+  z-index: 1;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250826/81287df192b80ea03318e06b2b19ebe1.png");
+  background-size: 100% 100%;
+}
+
+.icon-shoucang {
+  color: #D62828;
+  font-size: 40rpx !important;
+
+}
+
+/* 购物车 */
+.cart-box {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 80rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.2);
+  border-radius: 50%;
+  right: 20rpx;
+  bottom: 166rpx;
+  z-index: 15;
+}
+
+.cart-box image {
+  display: block;
+  width: 49rpx;
+}
+
+.cart-num {
+  width: 26rpx;
+  border-radius: 50%;
+  line-height: 26rpx;
+  text-align: center;
+  font-size: 23rpx;
+  background: #D62828;
+  position: absolute;
+  right: -2rpx;
+  top: -5rpx;
+  color: #fff;
+}
+
+.headimg {
+  position: fixed;
+  z-index: 3;
+  left: -218rpx;
+  width: 218rpx;
+  height: 180rpx;
+  top: 0;
+}
+
+.headimg.active {
+  transition: left .6s linear, top .6s cubic-bezier(0.5, -0.5, 1, 1), width .6s ease, height .6s ease;
+  width: 80rpx;
+  height: 80rpx;
+  left: 650rpx;
+  border-radius: 50%;
+}
+
+.share-img-box {
+  /* width: 551rpx; */
+  position: static;
+  background: none;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.share-img {
+  display: block;
+  width: 551rpx;
+}
+
+.share-tips {
+  width: 426rpx;
+  height: 150rpx;
+  background: #FFFFFF;
+  border-radius: 25rpx;
+  margin-top: 25rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 65rpx;
+  color: #999;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 40rpx;
+}
+
+.share-tips .img {
+  display: block;
+  width: 55rpx;
+  margin: 0 auto;
+  margin-bottom: 4rpx;
+}
+
+.tipimg {
+  position: absolute;
+  left: 50%;
+  margin-left: 16rpx;
+  width: 24rpx;
+  height: 24rpx;
+  background: #D62828;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: 34rpx;
+}
+
+.tipimg image {
+  width: 21rpx;
+  display: block;
+
+}
+
+.save-btn {
+  width: 403rpx;
+  line-height: 77rpx;
+  background: #D62828;
+  border-radius: 39rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 31rpx;
+  font-weight: 500;
+  margin-top: 50rpx;
+}
+
+.allowance-box {
+  height: 113rpx;
+  background: url("https://static.ticket.sz-trip.com/uploads/20220602/7762b9c4be5adac1f3d0ab5228569821.png");
+  background-size: 100% auto;
+  background-repeat: no-repeat;
+  padding: 30rpx 30rpx 10rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  margin-top: -60rpx;
+  position: relative;
+  display: flex;
+  justify-content: start;
+  align-items: baseline;
+}
+
+.allowance-box .com-price {
+  font-size: 30rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:before {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .com-price:after {
+  font-size: 18rpx;
+  color: #FFFFFF;
+}
+
+.allowance-box .yellow {
+  color: #DF2115;
+  padding: 8rpx 14rpx;
+  background-color: #FDEDD4;
+  margin-left: 20rpx;
+  border-radius: 30rpx;
+}
+
+.mask-allowance .mask-content {
+  margin: auto;
+  width: auto;
+  top: initial;
+  bottom: initial;
+  padding: 20rpx;
+  width: 80%;
+}
+
+.mask-allowance .mask-content .rule-title {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.imgs{
+  width: 133rpx;
+  height: 133rpx;
+  border-radius: 13rpx;
+}
+.img-box{
+    width: 133rpx;
+height: 133rpx;
+  position: relative;
+  overflow: hidden;
+}
+.img-box .more-img{
+    height: 37rpx;
+    line-height: 37rpx;
+    background: #000;
+    border-radius: 13rpx 0rpx 13rpx 0rpx;
+    box-sizing: border-box;
+    padding: 0 5rpx;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    opacity: 0.8;
+}
+.all{
+  color: #fff;
+  position:absolute;
+  bottom: 17rpx;
+  right: 10rpx;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 8rpx;
+  background-color: rgba(0, 0, 0, .5);
+}
+.all view{
+  text-align: center;
+}
+.all view:first-child{
+  font-size: 45rpx;
+  margin-top: 40rpx;
+}
+.all view:last-child{
+  margin-top: 10rpx;
+}
+.sku{
+  margin-left: 10rpx;
+  color: #666;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.proad{
+  margin: 20rpx;
+}
+.proad-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 16rpx;
+}
+.proad-title image{
+  width: 292rpx;
+  height: 34rpx;
+}
+.pro-list{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.proitem{
+  width: 334rpx;
+  height: 497rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+}
+.item-hd image{
+  width: 334rpx;
+  height: 342rpx;
+  border-radius: 13rpx 13rpx;
+}
+.item-bm{
+  padding: 8rpx 12rpx;
+}
+.protitle{
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #000000;
+}
+.pro-price{
+  color: #D62828;
+  font-weight: 500;
+  font-size: 30rpx;
+}
+.pro-price:before {
+  display: inline-block;
+  content:"￥";
+  color: #D62828;
+  font-size: 20rpx;
+}
+
+.pro-price:after {
+  display: inline-block;
+  content:'起';
+  color: #999999;
+  font-size: 10px;
+}
+.icon-shop{
+  width: 34rpx;
+  height: 36rpx;
+}
+.left-img{
+  display: flex;
+  width: 290rpx;
+  flex-shrink: 0;
+  justify-content: space-between;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.no-shop{
+  width: 230rpx;
+}
+.shop-box{
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  height: 70rpx;
+}
+
+ .wineScene-price-container {
+    width: 750rpx;
+    height: 100rpx;
+    /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
+    background: #FD3856;
+    /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    color: #FFFFFF;
+    font-size: 24rpx;
+ }
+
+ .wineScene-price-container .wineSecne-price {
+    font-weight: bold;
+    font-size: 48rpx;
+    color: #FFFFFF;
+}
+.wineScene-price-container .wineSecne-money {
+    font-size: 24rpx;
+    font-weight: 500;
+    /* text-decoration-line: line-through; */
+    padding-left: 14rpx;
+}
+.wineScene-price-container .wineSecne-price::before {
+    font-size: 24rpx;
+    content: '￥';
+}
+
+.hotel-custom-detail{
+    display: flex;
+    /* justify-content: space-between; */
+    height: fit-content;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 20rpx;
+}
+.hotel-custom-detail .tip-info{
+    width: 33rpx;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.hotel-custom-detail .tip-info .tip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    width: 33rpx;
+    height: 33rpx;
+    background: #6394FD;
+    border-radius: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    text-align: center;
+    line-height: 33rpx;
+}
+.hotel-custom-detail .tip-info .info{
+    width: 11rpx;
+    height: 100%;
+    background: #D0DFFE;
+    border-radius: 5rpx;
+}
+
+.hotel-custom-right>view{
+    margin-bottom: 20rpx;
+}
+.hotel-custom-right>view:last-of-type{
+    margin-bottom: 0;
+}
+.map-container{
+    background-image: url('https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/locationBg.png');
+    background-size: 100% 100%;
+    width: 100%;
+    height: 128rpx;
+    padding: 30rpx 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    box-sizing: border-box;
+}
+.map-container image{
+    width: 29rpx;
+    height: 29rpx;
+}
+
+.select-img{
+    display: flex;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 26rpx;
+}
+.select-img image{
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 13rpx;
+    margin-right:20rpx;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+.select-img image.active{
+    border: 2px solid #DC2525;
+}
+.select-img image.no-stock{
+    border: none;
+    opacity: 0.5;
+}
+.select-img .select-img-text{
+    font-weight: bold;
+    font-size: 24rpx;
+    color: #000000;
+    width: 51rpx;
+    height: 80rpx;
+    margin-right:20rpx;
+    display: flex;
+    align-items: center;
+}
+.select-img .other-imgs{
+    flex: 1;
+    width: 100rpx;
+    overflow-x: auto;
+    display: flex;
+}
+.select-img .select-sku{
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 25rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    background: white;
+    font-family: fangsong;
+    color: #999;
+}
+.sku-tips{
+    width: 100%;
+    position: absolute;
+    bottom: 73rpx;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: center;
+}
+.sku-tips>view{
+    width: fit-content;
+    max-width: 533rpx;
+    height: 53rpx;
+    background: rgba(1, 0, 0, 0.6);
+    border-radius: 27rpx;
+    padding: 0 28rpx;
+    line-height: 53rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    margin: 0 auto;
+}
+
+.shop-container{
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    padding: 32rpx 23rpx;
+    width: 100%;
+    background: white;
+    box-sizing: border-box;
+}
+.shop-container .shop-img{
+    width: 113rpx;
+    height: 113rpx;
+    flex-shrink: 0;
+}
+.shop-container .shop-btn{
+    width: 135rpx;
+height: 57rpx;
+border-radius: 13rpx;
+border: 1px solid #0B898E;
+font-weight: 500;
+font-size: 31rpx;
+color: #0B898E;
+text-align: center;
+line-height: 57rpx;
+flex-shrink: 0;
+}
+.shop-container .textOver2{
+    flex: 1;
+    width: 100rpx;
+    padding: 0 50rpx 0 20rpx;
+    font-weight: bold;
+font-size: 32rpx;
+color: #010101;
+}
+
+
+
+.other-info-box{
+}
+.other-info-box .other-info-item{
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+    margin-top: 30rpx;
+}
+.other-info-box .other-info-item image{
+    width: 32rpx;
+    height: 32rpx;
+    flex-shrink: 0;
+}
+.other-info-box .view-arrow{
+    font-family: fangsong;
+    color: #999;
+    width: 25rpx;
+    flex-shrink: 0;
+}
+.other-info-box .other-content{
+    padding: 0 20rpx;
+    overflow: hidden;
+    flex: 1;
+    width: 100rpx;
+    
+}
+
+.other-info-content{
+    min-height: 600rpx;
+    padding: 32rpx 23rpx;
+}
+.other-info-content .title{
+    font-weight: bold;
+    font-size: 33rpx;
+    color: #060001;
+    text-align: center;
+    margin-bottom: 36rpx;
+}
+.other-info-content .key-title{
+    color: #060001;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    font-weight: bold;
+}
+.other-info-content .key-content{
+    color: #666;
+    font-size: 27.67rpx;
+    line-height: 40rpx;
+    margin-top: 6rpx;
+}
+.prod-param{
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 45rpx;
+}
+.prod-param .prod-key{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #666666;
+}
+.prod-param .prod-content{
+    flex: 1;
+    flex-shrink: 0;
+    font-weight: 500;
+font-size: 27rpx;
+color: #000000;
+}
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 8756297..7a1dd16 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -199,6 +199,11 @@ const gotoDetail = (item,isPagePoint,queryStr="") =>{
         url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id+queryStr
       });
       return
+} else if (item.is_package==3) {
+    wx.navigateTo({
+        url: '/subPackages/goods/memberCard/index?id='+item.id+queryStr
+      });
+      return
 }
 
   console.log(item)
@@ -370,6 +375,11 @@ const orderMoreTime = function(item){
             url: '/subPackages/goods/oneCardTour/info/index?id='+info.scene_id
           });
           return
+    }  else if (info.is_package==3) {
+        wx.navigateTo({
+            url: '/subPackages/goods/memberCard/index?id='+info.product_id
+          });
+          return
     }
     else if(info.product_model=='movie'){
     //   wx.navigateTo({

From 43c7573c8177c5bf3c6937b47507d673d03cda28 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 28 Oct 2025 09:32:55 +0800
Subject: [PATCH 444/471] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8D=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                  | 2 +-
 pages/index/index.js                    | 2 +-
 pages/index/index.wxss                  | 2 +-
 pages/info/foodProductInfo/index.wxml   | 2 +-
 pages/info/postProductInfo/index.wxml   | 2 +-
 pages/info/sceneProductInfo/index.wxml  | 2 +-
 subPackages/foodNew/index.wxml          | 2 +-
 subPackages/goods/memberCard/index.wxml | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index e2c1050..2d2126a 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest144? true : false;
+            data.isTest = data.isTest145? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 357fc06..23652be 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -485,7 +485,7 @@ Page({
             if (i>str.length) {
                 clearInterval(timer)
             }
-        },100)
+        },125)
     },
     
     showImg (img) {
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 4c53e3e..5209040 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1042,7 +1042,7 @@
   }
 
   .ai-box{
-      margin:  30rpx 0 30rpx;
+      margin:  15rpx 0 40rpx;
       width: 100%;
       position: relative;
   }
diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml
index d0c41f3..5e5ce93 100644
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@@ -10,7 +10,7 @@
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
         <scroll-view>
-        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{false}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 462fa7e..0082018 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -10,7 +10,7 @@
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
         <scroll-view>
-            <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{false}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         </scroll-view>
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 6975956..530f8ba 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -6,7 +6,7 @@
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{false}}" interval="{{2000}}" duration="{{300}}">
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
-        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{false}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             ></video>
         </swiper-item>
diff --git a/subPackages/foodNew/index.wxml b/subPackages/foodNew/index.wxml
index f5c7b2a..725d622 100644
--- a/subPackages/foodNew/index.wxml
+++ b/subPackages/foodNew/index.wxml
@@ -40,7 +40,7 @@
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
         <scroll-view>
-        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+        <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{false}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         <!-- <image lazy-load src="{{info.headimg}}" mode="aspectFill"></image> -->
diff --git a/subPackages/goods/memberCard/index.wxml b/subPackages/goods/memberCard/index.wxml
index a6d34a6..cafe501 100644
--- a/subPackages/goods/memberCard/index.wxml
+++ b/subPackages/goods/memberCard/index.wxml
@@ -10,7 +10,7 @@
     <block wx:if="{{info.videourl}}" wx:key="*this">
         <swiper-item>
         <scroll-view>
-            <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{true}}" muted="{{true}}"
+            <video bindplay="playVideo" src="{{info.videourl}}"  autoplay="{{false}}" muted="{{true}}"
             show-mute-btn="{{true}}"  show-background-playback-button="{{false}}"
             show-progress="{{false}}" 	enable-progress-gesture="{{false}}"></video>
         </scroll-view>

From a6d3c00b92bcf3cd61eee8fdac9e7fac59bc22df Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 30 Oct 2025 10:26:41 +0800
Subject: [PATCH 445/471] =?UTF-8?q?=E8=87=AA=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |   3 +-
 app.wxss                                      |   2 +-
 pages/component/proRec/proRec.js              |   4 +-
 pages/info/postProductInfo/index.js           |  25 +-
 pages/info/postProductInfo/index.wxml         |  21 ++
 pages/info/postProductInfo/index.wxss         |  47 ++-
 pages/order/components/address/index.wxml     |   2 +-
 pages/order/components/address/index.wxss     |   4 +-
 pages/order/orderList/index.js                |  29 +-
 pages/order/orderList/index.wxml              |  34 ++-
 pages/order/orderList/index.wxss              |   3 +
 pages/order/postOrder/index.js                | 289 +++++++++++++++---
 pages/order/postOrder/index.wxml              | 151 +++++----
 pages/order/postOrder/index.wxss              |  59 +++-
 pages/user/cartlist/list.js                   |  45 ++-
 pages/user/cartlist/list.wxml                 |   7 +-
 pages/user/cartlist/list.wxss                 |  24 +-
 pages/user/order/postOrderInfo/index.js       | 168 +++++-----
 pages/user/order/postOrderInfo/index.wxml     | 237 ++++++++------
 pages/user/order/postOrderInfo/index.wxss     |  51 +++-
 project.private.config.json                   |  25 +-
 subPackages/techanNew/index.js                |  92 ++++--
 subPackages/techanNew/index.wxml              |  30 +-
 subPackages/techanNew/index.wxss              |  56 +++-
 subPackages/techanNew/selfPickPoint/index.js  | 152 +++++++++
 .../techanNew/selfPickPoint/index.json        |   5 +
 .../techanNew/selfPickPoint/index.wxml        |  35 +++
 .../techanNew/selfPickPoint/index.wxss        | 124 ++++++++
 utils/https.js                                |   4 +-
 utils/util.js                                 |   1 -
 30 files changed, 1373 insertions(+), 356 deletions(-)
 create mode 100644 subPackages/techanNew/selfPickPoint/index.js
 create mode 100644 subPackages/techanNew/selfPickPoint/index.json
 create mode 100644 subPackages/techanNew/selfPickPoint/index.wxml
 create mode 100644 subPackages/techanNew/selfPickPoint/index.wxss

diff --git a/app.json b/app.json
index cae3269..e9fa437 100644
--- a/app.json
+++ b/app.json
@@ -205,7 +205,8 @@
         "feiyiNew/CGCTime/index",
         "foodListNew/index",
         "foodNew/index",
-        "goods/memberCard/index"
+        "goods/memberCard/index",
+        "techanNew/selfPickPoint/index"
       ]
     },
     {
diff --git a/app.wxss b/app.wxss
index 5d7cb40..0963daa 100644
--- a/app.wxss
+++ b/app.wxss
@@ -45,7 +45,7 @@ page{
   position: relative;
   z-index: 1;
   width: 80%;
-  max-height: 1000rpx;
+  max-height: 1200rpx;
   background: white;
   border-radius: 12rpx;
   overflow-y: auto;
diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js
index cb14dc9..d2b7f87 100644
--- a/pages/component/proRec/proRec.js
+++ b/pages/component/proRec/proRec.js
@@ -31,8 +31,8 @@ Component({
   },
   observers:{
     'ids': function(newVal,oldVal){
-      console.log('newVal--------',newVal)
-      console.log('oldVal--------',oldVal)
+    //   console.log('newVal--------',newVal)
+    //   console.log('oldVal--------',oldVal)
       if (newVal && this.data.tjList.length<=0) {
         this.getTj(newVal)
       }
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 43e1c90..02155f1 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -45,6 +45,8 @@ Page({
             sku: {min:0,max:0}
         },
         otherInfoShow: 0,
+
+        user_type: null,
     },
 
     /**
@@ -351,9 +353,18 @@ Page({
         let index = e.currentTarget.dataset.index;
         this.setData({
             skuIndex: index,
-            swiperCurrent: index+this.data.swiperRange.picture.max+1
+            swiperCurrent: index+this.data.swiperRange.picture.max+1,
+            user_type: null,
+        })
+    },
+
+    changeSelectSkuPost: function(e) {
+        let value = e.currentTarget.dataset.value;
+        this.setData({
+            user_type: value,
         })
     },
+
     showOrder: function () {
         commonApi.user_post('wx/get_user_keep', {
             jumpurl: '/pages/info/postProductInfo/index?id=' + this.data.id,
@@ -437,10 +448,20 @@ Page({
                     }else {
                       type = ''
                     }
+                    // 非酒景 要选配送方式
+                    if (this.data.info.is_package!=1 && ![0,1].includes(this.data.user_type)) {
+                        wx.showToast({
+                            title: "请选择配送方式",
+                            icon:"none"
+                        })
+                        return
+                    }
+
                     commonApi.user_post("cart/add_sku", {
                         sku_id: this.data.info.sku[this.data.skuIndex].id,
                         num: this.data.producNum,
-                        type:type
+                        type:type,
+                        delivery_method: this.data.user_type
                     }).then(res => {
                         if (res.code == 1) {
                             commonApi.user_post('cart/get_list', {}).then(res => {
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 0082018..0e6aec5 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -301,6 +301,27 @@
         <view class="sku-name textOver2">{{item.sku_name}}</view>
       </view>
     </view>
+
+    <view class="delivery-method" wx:if="{{info.is_package!=1}}">
+        <view class="delivery-title">配送方式</view>
+        <view class="flex" style="display: flex;">
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=1}}" bind:tap="changeSelectSkuPost" data-value="{{0}}">
+                <view class="select-cycle" wx:if="{{user_type!==0}}"></view>
+                <view class="select-cycle selected" wx:else>
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">邮寄</view>
+            </view>
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=0}}" bind:tap="changeSelectSkuPost" data-value="{{1}}">
+                <view class="select-cycle" wx:if="{{user_type!==1}}"></view>
+                <view class="select-cycle selected" wx:else="">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">自提</view>
+            </view>
+        </view>
+
+    </view>
     
     
     <view style="height:138rpx"></view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 74cd9b1..83d34dd 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -550,8 +550,7 @@ page {
   flex-wrap: wrap;
   margin-bottom: 20rpx;
   justify-content: space-between;
-  max-height: 800rpx;
-  min-height: 400rpx;
+  height: 400rpx;
   align-content: flex-start; 
 }
 
@@ -1264,4 +1263,46 @@ color: #010101;
     font-weight: 500;
 font-size: 27rpx;
 color: #000000;
-}
\ No newline at end of file
+}
+
+.delivery-method{
+    font-weight: 400;
+    font-size: 29rpx;
+    color: #1E1E1E;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 25rpx 40rpx;
+}
+.delivery-method .select-cycle{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+    border: 1px solid #999999;
+    overflow: hidden;
+    flex-shrink: 0;
+    
+}
+.delivery-method .select-cycle image{
+    width: 100%;
+    height: 100%;
+}
+.delivery-method .select-cycle.selected {
+    border: none;
+}
+.delivery-method .select-cycle.selected image{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+}
+.delivery-method .method-str{
+    padding-left: 10rpx;
+    flex-shrink: 0;
+}
+.delivery-method .flex-center{
+    width: 150rpx;
+    justify-content: flex-end;
+    display: flex;
+    align-items: center;
+}
+
diff --git a/pages/order/components/address/index.wxml b/pages/order/components/address/index.wxml
index 950f01c..ad0299e 100644
--- a/pages/order/components/address/index.wxml
+++ b/pages/order/components/address/index.wxml
@@ -1,4 +1,4 @@
-<view class="box">
+<view class="address-box">
   <view class="box-title">
     <view style="flex:1">收货地址</view>
     <view class="contact-add" bindtap="showLinkman" wx:if="{{selectLinkman}}"><text class="iconfont icon-add-select"></text>选择</view>
diff --git a/pages/order/components/address/index.wxss b/pages/order/components/address/index.wxss
index 2065a88..41a4d12 100644
--- a/pages/order/components/address/index.wxss
+++ b/pages/order/components/address/index.wxss
@@ -49,8 +49,8 @@
   flex-shrink: 0;
   font-size: 37rpx;
 }
-.box {
-  margin: 30rpx 25rpx;
+.address-box {
+  margin: 30rpx 0rpx;
   background: white;
   border-radius: 9rpx;
 }
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 3fe0fed..72a50a2 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -9,7 +9,11 @@ Page({
   data: {
   goodsList: [],
   ticketList: [],
-	productPrice: 0,
+  // 仅展示用，区分邮寄自提
+  postList: [],
+  pickUpList: [],
+
+  productPrice: 0,
   ticketPrice: 0,
   product:"",
   sku_id: '',
@@ -33,18 +37,18 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      goodsList: app.globalData.postProduct,
-      ticketList: app.globalData.list,
+      goodsList: app.globalData.postProduct || [],
+      ticketList: app.globalData.list || [],
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       flag:options.flag,
     //   showCoupon: (app.globalData.list || []).length<=0,
       // linkmanList: app.globalData.linkmanList
     })
-    console.log('-------------',this.data.ticketList);
+    console.log('-------------',this.data.ticketList, this.data.goodsList);
     // debugger
     let price = 0, sku_id = [] ,postFee= 0; 
-    app.globalData.postProduct.map(item => {
+    this.data.goodsList.map(item => {
         try {
             item.postFee = parseFloat(item.postFee)
         } catch(e){
@@ -60,7 +64,7 @@ Page({
       }
       sku_id.push(item.sku.id)
     })
-    app.globalData.list.map(item => {
+    this.data.ticketList.map(item => {
       // price = price + item.sku.price * item.linkmanList.length;
       price = price + item.sku.price * item.num;
       sku_id.push(item.sku.id)
@@ -70,10 +74,23 @@ Page({
       postFee:postFee,
       sku_id: sku_id.join(",")
     })
+
+    this.handlePostData()
+
     if (!this.data.kjId && !this.data.gp_id) {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
   },
+
+  handlePostData () {
+    let postList = this.data.goodsList.filter(x=>x.user_select_type === 0) 
+    let pickUpList = this.data.goodsList.filter(x=>x.user_select_type === 1)
+    this.setData({
+        postList: postList,
+        pickUpList: pickUpList,
+    })
+  },
+
   order: function (){
     console.log(app.globalData.createDate);
 
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 2245a77..ca4d072 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,6 +1,7 @@
 <title title="订单列表"></title>
-<view class="box" wx:if="{{goodsList.length != 0}}">
-	<view class="goods-item" wx:for="{{goodsList}}" wx:key="index">
+<!-- 邮寄 -->
+<view class="box" wx:if="{{postList.length != 0}}">
+	<view class="goods-item" wx:for="{{postList}}" wx:key="index">
 		<view class="item-box item-title">
 			<view>{{item.product.title}}</view>
 			<view class="price">￥{{item.sku.price/100}}</view>
@@ -26,6 +27,31 @@
         </view>
 	</view>
 </view>
+<!-- 自提 -->
+<view class="box" wx:if="{{pickUpList.length != 0}}">
+	<view class="goods-item" wx:for="{{pickUpList}}" wx:key="index">
+		<view class="item-box item-title">
+			<view>{{item.product.title}}</view>
+			<view class="price">￥{{item.sku.price/100}}</view>
+		</view>
+		<view class="item-box">
+			<view>{{item.sku.sku_name}}</view>
+			<view>X{{item.productNum}}</view>
+		</view>
+		<view class="item-box item-title" style="padding-top: 27rpx;">自提信息</view>
+        <view style="padding: 10rpx;">
+            <view class="text"><view class="text-left">预留手机号：</view>{{item.phone}}</view>
+            <view class="text">
+                <view class="text-left">自提地址：</view>
+                <view>
+                    <view>{{item.pickupAddress.title}}</view>
+                    <view style="padding-top: 20rpx;">{{item.pickupAddress.address}}</view>
+                </view>
+            </view>
+        </view>
+	</view>
+</view>
+<!-- 门票 -->
 <view class="box" wx:if="{{ticketList.length != 0}}">
 	<view class="goods-item" wx:for="{{ticketList}}" wx:key="index">
 		<view class="item-box item-title">
@@ -37,7 +63,7 @@
 			<view>X{{item.num}}</view>
 		</view>
         <view class="item-box item-title" style="padding-top: 27rpx;">出行人信息</view>
-        <view wx:if="{{item.sku.sku_model.is_authentication}}">
+        <view style="padding: 10rpx;" wx:if="{{item.sku.sku_model.is_authentication}}">
             <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
                 <view>
                     <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>
@@ -46,7 +72,7 @@
                 </view>
             </view>
         </view>
-        <view wx:else>
+        <view style="padding: 10rpx;" wx:else>
             <view class="text"><view class="text-left">手机号：</view>{{item.phone}}</view>
         </view>
 	</view>
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index fdf5877..c9d8534 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -66,6 +66,9 @@ page{
 font-size: 27rpx;
 color: #666666;
 }
+.text .text-left{
+    flex-shrink: 0;
+}
 
 
 .goods-item{
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 425694b..2e795bb 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -7,6 +7,9 @@ Page({
    * 页面的初始数据
    */
   data: {
+    pageUseType: 0, // 0 邮寄  1 自提 3邮寄或自提 购物车用 不考虑3
+    allProduct: [],
+
     product: [],
     showPrice: 0,
     from: null,
@@ -23,7 +26,9 @@ Page({
     showAllowance: false,
     flag:null,
     isCar:'single',
-    showYhq:null
+    showYhq:null,
+
+    pickupIndex: null,
   },
 
   /**
@@ -39,28 +44,80 @@ Page({
       isCar:options.isCar,
       showYhq:app.globalData.listName?false:true
     })
-    let price = 0, sku_id = [];
-    app.globalData.postProduct.map(item => {
-      if (!app.globalData.kjId && !this.data.gp_id) {
-        price = price + item.sku.price * item.productNum;
-      }
-      else if (this.data.gp_id) {
-        price = price + item.sku.event_price * item.productNum;
-      }
+    this.handleProduct()
+  },
+
+  handleProduct () {
+    app.globalData.postProduct.forEach((item,index) => {
+      item.keyIndex = index
       item.sku.batch_shipment = item.sku.batch_shipment?item.sku.batch_shipment:0;
-      sku_id.push(item.sku.id)
+      // 用户选择的配送方式
+      item.user_select_type = item.sku.use_type === 1 ? 1 : 0 
+    })
+
+    this.setData({
+      allProduct: app.globalData.postProduct,
+    })
+
+    if (this.data.from == "cart") {
+        if (this.data.pageUseType == 0) {
+            let pageUseType = app.globalData.postProduct.some(x=>x.user_select_type==0)?0:1
+            let productList = app.globalData.postProduct.filter(x=>x.user_select_type == pageUseType)
+            this.setData({
+                product: productList,
+                pageUseType: pageUseType,
+            })
+        } else {
+            let productList = app.globalData.postProduct.filter(x=>x.user_select_type == 1)
+            this.setData({
+                product: productList,
+                pageUseType: 1,
+            })
+        }
+    } else {
+        this.setData({
+            product: app.globalData.postProduct,
+        })
+    }
+
+    console.log(this.data.product, "页面数据")
+
+    let price = 0, sku_id = [];
+    this.data.product.forEach(item=>{
+        if (!app.globalData.kjId && !this.data.gp_id) {
+            price = price + item.sku.price * item.productNum;
+        }
+        else if (this.data.gp_id) {
+            price = price + item.sku.event_price * item.productNum;
+        }
+        sku_id.push(item.sku.id)
     })
+
     this.setData({
-      product: app.globalData.postProduct,
-      showPrice: app.globalData.kjId ? 0 : price,
-      sku_id: sku_id.join(",")
+        showPrice: app.globalData.kjId ? 0 : price,
+        sku_id: sku_id.join(","),
     })
-    console.log(this.data.product)
+
+
     if (!this.data.kjId && !this.data.gp_id) {
-      this.couponCom = this.selectAllComponents("#coupon")[0];
+        this.couponCom = this.selectAllComponents("#coupon")[0];
     }
-	console.log(this.data.showPrice)
+
   },
+
+  changeUserPost (e) {
+    let item = e.currentTarget.dataset.item
+    let value = e.currentTarget.dataset.value
+    let index = e.currentTarget.dataset.index
+    item.user_select_type = value
+
+    this.data.product[index] = item
+
+    this.setData({
+        product: this.data.product
+    })
+  },
+
   price() {
     let allPrice
     if (this.data.coupon) {
@@ -83,6 +140,23 @@ Page({
       product: product
     })
   },
+
+  phoneInput: function (e) {
+    let index = e.currentTarget.dataset.index, product = this.data.product;
+    product[index].phone = e.detail.value;
+    this.setData({
+      product: product
+    })
+  },
+
+  delTel: function(e) {
+    let index = e.currentTarget.dataset.index, product = this.data.product;
+    product[index].phone = "";
+    this.setData({
+      product: product
+    })
+  },
+
   setAddress: function (e) {
     console.log('我触发了');
       this.setData({
@@ -90,6 +164,31 @@ Page({
       })
     this.getPostFee()
   },
+
+  changePickup:function (e) {
+        let index = e.currentTarget.dataset.index;
+        let item = e.currentTarget.dataset.item
+        this.setData({
+            pickupIndex: index
+        })
+
+        wx.navigateTo({
+            url:`/subPackages/techanNew/selfPickPoint/index?pickupId=null&goodsId=${item.product.id}&skuId=${item.sku.id}`
+        })
+
+  },
+
+  setPickUpPoint: function (data) {
+      console.log(data)
+      let goods = this.data.product[this.data.pickupIndex]
+      if (goods) {
+          goods.pickupAddress = data
+      }
+      this.setData({
+          product: this.data.product
+      })
+  },
+
   minus: function (e) {
     let index = e.currentTarget.dataset.index, product = this.data.product;
     let productNum = product[index].productNum;
@@ -140,27 +239,80 @@ Page({
     })
   },
   order: function () {
-    if (!this.data.address) {
-      wx.showToast({
-        title: '请选择收货地址！',
-        icon: 'none'
-      })
-      return;
+    
+    for(let info of this.data.product)  {
+        if (info.user_select_type == 0) {
+            if (!this.data.address) {
+                wx.showToast({title: '请选择收货地址',icon: 'none'});
+                return;
+            }
+        }
+        if (info.user_select_type == 1) {
+            if (!info.pickupAddress||!info.pickupAddress.id) {
+                wx.showToast({title: '请选择自提点',icon: 'none'});
+                return;
+            }
+            if (!info.phone) {
+                wx.showToast({title: '请输入预留手机号',icon: 'none'});
+                return;
+            }
+        }
+
+        let allProductIndex = this.data.allProduct.findIndex(x=>x.keyIndex == info.keyIndex)
+        if (allProductIndex>=0) {
+            this.data.allProduct[allProductIndex] = info
+        }
     }
-    let product = this.data.product, product_list = [];
-    product.map(item => {
-      let productItem = {
-        type: item.product.type,
-        product_id: item.product.id,
-        sku_id: item.sku.id,
-        post: this.data.address.id,
-        product_num: item.productNum,
-        remark: item.remark,
-        is_batch_shipment: item.sku.batch_shipment,
-        compose_sku_id: item.sku.compose_sku_id,
-      }
-      product_list.push(productItem)
-    })
+
+
+
+    // 判断邮寄自提下单结束
+    let canEnd = this.data.from == "cart"?false:true;
+    if (!canEnd) {
+        // 还有自提的产品
+        if (this.data.pageUseType==0 && this.data.allProduct.some(x=>x.user_select_type==1)) {
+            canEnd = false
+        } else {
+            canEnd = true
+        }
+    }
+
+    if (!canEnd) {
+        this.setData({
+            pageUseType: 1
+        })
+        this.handleProduct()
+        return
+    }
+
+
+    // 真下单
+    let product_list = [];
+    for(let info of this.data.allProduct)  {
+        let param = {
+            type: info.product.type,
+            product_id: info.product.id,
+            sku_id: info.sku.id,
+            // post: this.data.address.id,
+            product_num: info.productNum,
+            remark: info.remark,
+            is_batch_shipment: info.sku.batch_shipment,
+            compose_sku_id: info.sku.compose_sku_id,
+            supplier_id: info.product.supplier_id,
+        }
+        if (info.user_select_type == 0) {
+            param.use_type = 1
+			param.post = this.data.address.id
+        }
+        if (info.user_select_type == 1) {
+            param.use_type = 2
+            param.pickup_shop_id = info.pickupAddress.id
+            param.pickup_shop_info = info.pickupAddress
+            
+        }
+        product_list.push(param)
+    }
+
     let data = {
       source: "WECHATXCX",
       product_list: product_list,
@@ -189,8 +341,19 @@ Page({
         data.partner_code = ZTPointProduct.product.ZTPoint
         data.channel = ZTPointProduct.product.ZTPoint
     }
-	console.log(app.globalData.list)
+    console.log(app.globalData.list,this.data.flag)
 	if(!app.globalData.list || app.globalData.list.length == 0){
+        // 判断混合下单
+        let use_type = product_list[0].use_type
+        if (product_list.some(x=>x.use_type!=use_type)) {
+            app.globalData.productPrice = (this.data.showPrice + this.data.postFee - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+		    app.globalData.createDate = data
+            wx.redirectTo({
+                url: '/pages/order/orderList/index?flag=mix'
+            })
+            return
+        }
+
 		commonApi.user_post("order/create", {
 		  data: JSON.stringify(data)
 		}).then(res => {
@@ -199,22 +362,22 @@ Page({
 		    this.setData({
 		      kjId: null
 		    })
-		    this.onLoad({})
+		    // this.onLoad({})
 		  }
 		  app.globalData.gp_id = null;
 		  app.globalData.team_id = null;
 		  this.setData({
 		    gp_id: null
 		  })
-		  this.onLoad({});
+		//   this.onLoad({});
 		})
 	}else{
 		app.globalData.productPrice = (this.data.showPrice + this.data.postFee - (this.data.coupon?this.data.coupon.activity.money:0))/100;
 		app.globalData.createDate = data
-    console.log(app.globalData.product)
-    if (!app.globalData.product) {
-      app.globalData.product = app.globalData.list[0]
-    }
+        console.log(app.globalData.product)
+        if (!app.globalData.product) {
+        app.globalData.product = app.globalData.list[0]
+        }
 		wx.redirectTo({
 		  url: '/pages/order/scene/index?flag='+this.data.flag+'&isCar='+this.data.isCar,
 		})
@@ -222,7 +385,39 @@ Page({
   },
   getPostFee: function () {
     if (!this.data.address) return;
-    let product = this.data.product, list = [], that = this;
+    let  list = [], indexList = [],that = this;
+    let product = this.data.product.filter((x,i)=>{
+        if (x.user_select_type == 0) {
+            indexList.push(i)
+            return x
+        }
+    });
+
+    if (product.length<=0) {
+        let postFee = 0;
+        this.data.product.forEach(x=>{
+            x.postFee = 0;
+        })
+        if (this.data.coupon && this.data.postFee != postFee) {
+            wx.showToast({
+              title: '订单价格发生变化，请重新选择优惠券',
+              icon: 'none'
+            })
+            app.globalData.couponInfo = null;
+            if (!this.data.kjId && !this.data.gp_id) {
+              this.couponCom.setNullCoupon()
+            }
+            this.setData({
+                coupon: null
+            })
+        }
+        this.setData({
+        postFee: postFee,
+        product: this.data.product,
+        })
+        return
+    }
+
     product.map(item => {
       list.push(commonApi.user_post("order/get_post_price", {
         sku_id: item.sku.id,
@@ -268,9 +463,13 @@ Page({
           coupon: null
         })
       }
+      for(let i=0;i<indexList.length;i++) {
+          this.data.product[indexList[i]] = product[i] 
+      }
+
       this.setData({
         postFee: postFee,
-        product: product
+        product: this.data.product
       })
     })
   },
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index fced9b1..3686fd0 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -1,70 +1,105 @@
 <!--pages/order/post/index.wxml-->
 <title title="订单填写"></title>
-<address bind:setAddress="setAddress"></address>
-<view class="box topbox" wx:for="{{product}}">
-  <view class="header-title textOver" wx:if="{{from=='cart'}}">
-    供应商：{{item.product.supplier_name}}
-  </view>
-  <view class="skuinfo">
-    <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill"></image>
-    <view class="right-info">
-      <view class="sku-name textOver">
-        <text class="textOver">{{item.product.title}}</text>
-        <view class="price"><text>￥</text>{{item.sku.price/100}}</view>
-      </view>
-      <view class="info-tips">
-        <text>{{item.sku.sku_name}}</text>
-        <text>x{{item.productNum}}</text>
-        <!-- <view bindtap="showNotice">购买须知 <text class="iconfont icon-you"></text> </view> -->
-      </view>
+
+<view class="box topbox" wx:for="{{product}}" wx:key="index">
+    <!-- 选择配送方式 -->
+    <view class="sendwayArea" wx:if="{{from!='cart'}}">
+        <view class="sendway-item {{item.user_select_type==0?'active':''}}" wx:if="{{item.sku.use_type==0||item.sku.use_type==3}}"
+            bind:tap="changeUserPost" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">邮寄</view>
+        <view class="sendway-item {{item.user_select_type==1?'active':''}}"  wx:if="{{item.sku.use_type==1||item.sku.use_type==3}}"
+        bind:tap="changeUserPost" data-item="{{item}}" data-value="{{1}}" data-index="{{index}}">自提</view>
     </view>
-  </view>
-  <view class="box-title" wx:if="{{from!='cart'}}">
-    <view style="flex:1">购票数量</view>
-    <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-sami-select" bindtap="minus" data-index="{{index}}"></view>
-    <view class="number-box">{{item.productNum}}</view>
-    <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
-  </view>
-  <view class="box-title" style="height:auto;min-height:126rpx;position: relative;" wx:if="{{item.sku.is_batch_shipment}}">
-    <view style="flex:1;white-space:nowrap;margin-right:20rpx;">收货方式</view>
-    <view class="batch-view">
-        <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">
-            <view class="no-select" wx:if="{{item.sku.batch_shipment==1}}"></view>
-            <image lazy-load class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
-            <text>一次性收货</text>
-        </view>
-        <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{1}}" data-index="{{index}}"
-             style="margin-left: 30rpx;" wx:if="{{item.sku.is_batch_shipment}}">
-            <view class="no-select" wx:if="{{item.sku.batch_shipment==0}}"></view>
-            <image lazy-load class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
-            <text>分批收货<text style="font-size: 24rpx;">(共{{item.sku.batch_count}}次)</text></text>
+
+    <address bind:setAddress="setAddress" wx:if="{{index==0&&item.user_select_type==0}}"></address>
+
+    <view class="pickup-container" wx:if="{{item.user_select_type==1}}">
+        <view bind:tap="changePickup" data-index="{{index}}" data-item="{{item}}"  class="box-title">
+            <view  style="flex-shrink:0" >自提点</view>
+            <view class="flex-1 textOver">
+                <text wx:if="{{!item.pickupAddress}}" style="color: #666666;">选择提货地址</text>
+                <text wx:else>{{item.pickupAddress.title}}</text>
+            </view>
+            <image lazy-load class="cha"
+            src="https://static.ticket.sz-trip.com/uploads/20251028/7b4c134eef979fb0540205d18e168ae1.png" mode=""/>
         </view>
 
-        <view class="batch-info-tip" wx:if="{{item.sku.is_batch_shipment && item.sku.batch_remark}}">{{item.sku.batch_remark}}</view>
+        <view class="box-title">
+            <view  style="flex-shrink:0" >预留手机号</view>
+            <view class="flex-1">
+                <input bindinput="phoneInput" type="number" value="{{item.phone}}" data-item="{{item}}"
+                data-index="{{index}}" class="weui-input" placeholder="请输入手机号" />
+            </view>
+            <image lazy-load class="cha" bindtap="delTel" wx:if="{{item.phone}}" data-index="{{index}}"
+            src="https://static.ticket.sz-trip.com/jundaosuzhou/images/scenicNew/cha.png" mode=""/>
+            <view class="cha" v-else></view>
+        </view>
     </view>
-  </view>
 
-  <view class="box-title" style="height:auto;min-height:113rpx;">
-    <view style="flex:1;white-space:nowrap;margin-right:20rpx;">运费</view>
-    <view style="display: flex;">
-        <!-- <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text> -->
-        <text>{{item.postFee?("￥"+(item.postFee/100)):"包邮"}}</text>
-        <view wx:if="{{item.postFee>0 && item.sku.batch_shipment==1}}">
-            <text style="padding-left: 10rpx;">x{{item.sku.batch_count}}</text>
-            <text style="padding-left: 40rpx;">￥{{(item.postFee/100)*item.sku.batch_count}}</text>
+    <view class="sku-info-container">
+        <view class="header-title textOver" wx:if="{{from=='cart'}}">
+            供应商：{{item.product.supplier_name}}
+        </view>
+        <view class="skuinfo">
+            <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill"></image>
+            <view class="right-info">
+            <view class="sku-name textOver">
+                <text class="textOver">{{item.product.title}}</text>
+                <view class="price"><text>￥</text>{{item.sku.price/100}}</view>
+            </view>
+            <view class="info-tips">
+                <text>{{item.sku.sku_name}}</text>
+                <text>x{{item.productNum}}</text>
+                <!-- <view bindtap="showNotice">购买须知 <text class="iconfont icon-you"></text> </view> -->
+            </view>
+            </view>
+        </view>
+        <view class="box-title"  wx:if="{{from!='cart'}}">
+            <view style="flex:1">购票数量</view>
+            <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-sami-select" bindtap="minus" data-index="{{index}}"></view>
+            <view class="number-box">{{item.productNum}}</view>
+            <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
+        </view>
+        <view class="box-title" style="height:auto;min-height:126rpx;position: relative;" wx:if="{{item.sku.is_batch_shipment}}">
+            <view style="flex:1;white-space:nowrap;margin-right:20rpx;">收货方式</view>
+            <view class="batch-view">
+                <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">
+                    <view class="no-select" wx:if="{{item.sku.batch_shipment==1}}"></view>
+                    <image lazy-load class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
+                    <text>一次性收货</text>
+                </view>
+                <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{1}}" data-index="{{index}}"
+                    style="margin-left: 30rpx;" wx:if="{{item.sku.is_batch_shipment}}">
+                    <view class="no-select" wx:if="{{item.sku.batch_shipment==0}}"></view>
+                    <image lazy-load class="select-img" mode="aspectFill" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/show/dui.png" wx:else></image>
+                    <text>分批收货<text style="font-size: 24rpx;">(共{{item.sku.batch_count}}次)</text></text>
+                </view>
+
+                <view class="batch-info-tip" wx:if="{{item.sku.is_batch_shipment && item.sku.batch_remark}}">{{item.sku.batch_remark}}</view>
+            </view>
+        </view>
+
+        <view class="box-title" style="height:auto;min-height:113rpx;" wx:if="{{item.user_select_type==0}}">
+            <view style="flex:1;white-space:nowrap;margin-right:20rpx;">运费</view>
+            <view style="display: flex;">
+                <!-- <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text> -->
+                <text>{{item.postFee?("￥"+(item.postFee/100)):"包邮"}}</text>
+                <view wx:if="{{item.postFee>0 && item.sku.batch_shipment==1}}">
+                    <text style="padding-left: 10rpx;">x{{item.sku.batch_count}}</text>
+                    <text style="padding-left: 40rpx;">￥{{(item.postFee/100)*item.sku.batch_count}}</text>
+                </view>
+            </view>
+        </view>
+        <view class="box-title" style="border-bottom: {{from=='cart'?1:0}}px solid #ccc;"  wx:if="{{flag!='mix'}}">
+            <view  style="flex-shrink:0" >订单备注：</view>
+            <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
+        </view>
+        <view class="all-money-box" wx:if="{{from=='cart'}}">
+            小计：<text class="unit">￥</text>
+            <text class="s-price" wx:if="{{item.sku.batch_shipment==1}}">{{(item.sku.price * item.productNum + item.postFee*item.sku.batch_count || 0) /100}}</text>
+            <text class="s-price" wx:else>{{(item.sku.price * item.productNum + item.postFee || 0) /100}}</text>
+            
         </view>
     </view>
-  </view>
-  <view class="box-title" wx:if="{{flag!='mix'}}">
-    <view  style="flex-shrink:0" >订单备注：</view>
-    <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
-  </view>
-  <view class="all-money-box" wx:if="{{from=='cart'}}">
-    小计：<text class="unit">￥</text>
-    <text class="s-price" wx:if="{{item.sku.batch_shipment==1}}">{{(item.sku.price * item.productNum + item.postFee*item.sku.batch_count || 0) /100}}</text>
-    <text class="s-price" wx:else>{{(item.sku.price * item.productNum + item.postFee || 0) /100}}</text>
-    
-  </view>
   <!-- 补贴 -->
   <view class="box-title allowance" wx:if="{{allowance_price}}">
     <view bindtap="changeAllowance">惠民补贴</view>
diff --git a/pages/order/postOrder/index.wxss b/pages/order/postOrder/index.wxss
index b85f0ea..f391cfc 100644
--- a/pages/order/postOrder/index.wxss
+++ b/pages/order/postOrder/index.wxss
@@ -3,10 +3,34 @@ page {
   background: #f6f6f6;
 }
 
+.sendwayArea{
+	display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+}
+.sendwayArea .sendway-item{
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #111111;
+    width: 333rpx;
+    text-align: center;
+    height: 57rpx;
+    line-height: 57rpx;
+    background: #FFFFFF;
+    border-radius: 29rpx;
+}
+.sendwayArea .sendway-item.active{
+    border: 1px solid #0E8790;
+    color: #0E8790;
+}
+
+.sku-info-container{
+    background: #FFFFFF;
+    border-radius: 9rpx;
+}
+
 .box {
   margin: 30rpx 25rpx;
-  background: white;
-  border-radius: 9rpx;
 }
 
 .box-title {
@@ -19,6 +43,30 @@ page {
   align-items: center;
 }
 
+.sku-info-container .box-title{
+    border-bottom: 1px solid #CCCCCC;
+}
+
+.pickup-container .box-title{
+    justify-content: space-between;
+    background: #FFFFFF;
+    margin: 26rpx 0;
+    border-radius: 13rpx;
+    padding: 0 20rpx;
+}
+.pickup-container .flex-1{
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    padding-right: 34rpx;
+    text-align: right;
+}
+.cha {
+    width: 20rpx;
+    height: 20rpx;
+}
+
+
 .allowance {
   justify-content: space-between;
 }
@@ -56,7 +104,6 @@ page {
   display: flex;
   justify-content: space-between;
   padding: 30rpx 20rpx;
-  margin-bottom: 30rpx;
 }
 
 .skuinfo image {
@@ -129,10 +176,6 @@ page {
   height: 1rpx;
 }
 
-.topbox .box-title {
-  border-top: 1rpx solid #ccc;
-}
-
 .box-title input {
   flex: 1;
   display: block;
@@ -187,7 +230,7 @@ page {
   font-size: 27rpx;
   height: 80rpx;
   align-items: center;
-  border-top: 1rpx solid #ccc;
+  /* border-top: 1rpx solid #ccc; */
   color: #000;
 }
 
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index cae4009..d9aae1a 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -67,6 +67,15 @@ Page({
                 limit:999,
             }).then(res => {
                 let resData = this.data.list.concat((res.data || []))
+                resData.forEach(x=>{
+                    if (x.product&&x.product.type == 'post'&&x.product.is_package===0&&x.delivery_method===null) {
+                        if (x.sku.sku_model.use_type == 1) {
+                            x.delivery_method = 1
+                        } else {
+                            x.delivery_method = 0
+                        }
+                    }
+                })
                 this.setData({
                     list: resData
                 })
@@ -143,7 +152,7 @@ Page({
     },
     changeNumber(item) {
         commonApi.user_post("cart/update_sku", {
-            sku_id: item.sku.id,
+            id: item.id,
             num: item.num
         }).then(res => { })
     },
@@ -160,6 +169,8 @@ Page({
         })
     },
     order: function () {
+
+
         commonApi.user_post('wx/get_user_keep', {
             jumpurl: '/pages/user/cartlist/list',
             title: '购物车',
@@ -179,13 +190,15 @@ Page({
                     price = 0,
                     product = [],
                     product1 = []
-                list.map(item => {
+                list.map((item,index) => {
                     if (item.checked) {
                         // item.product.type="post";
                         if (item.product.type == 'post') {
                             product.push({
                                 product: item.product,
-                                sku: item.sku,
+                                // todo
+                                // sku: {...item.sku, use_type: item.sku.sku_model.use_type||index},
+                                sku: {...item.sku, use_type: item.delivery_method||0},
                                 productNum: item.num
                             })
                         } else {
@@ -205,14 +218,32 @@ Page({
                     return;
                 }
 
-                this.setData({flag:''})
+                let postSkuIds = product.map(x=>x.sku.id)
+                if(postSkuIds.some(x=>postSkuIds.filter(v=>v==x).length>1)) {
+                    wx.showToast({
+                      title: '相同规格产品不可重复购买',
+                      icon: "none"
+                    })
+                    return
+                } 
 
+
+                this.setData({flag:''})
+                let use_type = product[0].sku.use_type
+                if (product.some(x=>x.sku.use_type!=use_type)) {
+                    this.setData({
+                        flag: 'mix',
+                        isCar: 'multiple'
+                    })
+                }
                 if (product.length > 0 && product1.length > 0) {
                     this.setData({
                         flag: 'mix',
                         isCar: 'multiple'
                     })
                 }
+
+
                 if (product1.length > 1) {
                     this.setData({
                         isCar: 'multiple'
@@ -330,7 +361,7 @@ Page({
         let index = e.currentTarget.dataset.index,
             list = this.data.list;
         commonApi.user_post("cart/del_sku", {
-            sku_id: list[index].sku_id
+            id: list[index].id
         }).then(res => {
             if (res.code == 1) {
                 wx.showToast({
@@ -350,7 +381,7 @@ Page({
         let suid = []
         arr.forEach(item => {
             if (item.checked) {
-                suid.push(item.sku_id)
+                suid.push(item.id)
             }
         });
         let skuids = suid.join(',')
@@ -360,7 +391,7 @@ Page({
             success: function (res) {
                 if (res.confirm) {
                     commonApi.user_post("cart/del_sku", {
-                        sku_id: skuids
+                        id: skuids
                     }).then(res => {
                         if (res.code == 1) {
                             wx.showToast({
diff --git a/pages/user/cartlist/list.wxml b/pages/user/cartlist/list.wxml
index d05a364..085d857 100644
--- a/pages/user/cartlist/list.wxml
+++ b/pages/user/cartlist/list.wxml
@@ -5,7 +5,12 @@
 <view wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
   <view class="item{{(item.product.flag!=1 || item.sku.flag!='on')?' disable':''}}">
     <view class="iconfont{{item.checked?' icon-gou':' icon-quan'}}" bindtap="select" data-index="{{index}}"></view>
-    <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill" bindtap="gotoDetail" data-item="{{item}}"></image>
+    <view class="img-container" bindtap="gotoDetail"  data-item="{{item}}">
+        <image lazy-load src="{{item.sku.headimg}}" mode="aspectFill" ></image>
+        <view class="use-type" wx:if="{{item.delivery_method===0||item.delivery_method===1}}">
+            {{item.delivery_method===1?"自提":"邮寄"}}
+        </view>
+    </view>
     <view class="item-info textOver">
       <view class="title textOver">{{item.product.title}}</view>
       <view class="sku-title textOver">
diff --git a/pages/user/cartlist/list.wxss b/pages/user/cartlist/list.wxss
index c5c40fd..82942ff 100644
--- a/pages/user/cartlist/list.wxss
+++ b/pages/user/cartlist/list.wxss
@@ -58,12 +58,34 @@ page {
   flex-shrink: 0;
   font-size: 40rpx;
 }
-.item image {
+.item .img-container{
   margin: 0 25rpx;
   flex-shrink: 0;
   width: 173rpx;
   height: 173rpx;
   border-radius: 7rpx;
+  overflow: hidden;
+    position: relative;
+}
+
+.item .img-container image {
+  width: 173rpx;
+  height: 173rpx;
+  border-radius: 7rpx;
+}
+.item .img-container .use-type{
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    border-radius: 0rpx 0rpx 7rpx 7rpx;
+    height: 33rpx;
+    background: rgba(0,0,0,0.3);
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 33rpx;
 }
 .item-info {
   flex: 1;
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 758a3e6..bce81f4 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -10,6 +10,8 @@ Page({
    */
   data: {
     info:null,
+    isPickup: false, // 是否自提 
+
     orderState:app.globalData.orderState,
     productState:app.globalData.productState,
     product_model:null,
@@ -17,6 +19,7 @@ Page({
     feeInfoFlag:false,
     codeIndex:0,
     codeImgs:[],
+    imgLen: [],
     minute:"",
     second:"",
     id:null,
@@ -99,26 +102,40 @@ Page({
     })
   },
   getCodeImg:function(){
-    let code = "111";
-    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
-    qrcode.map((item,index)=>{
-      new QRCode('damocode'+index,{
-        text: item.use_code,
-        width: 300 * radio,
-        height: 300 * radio,
-        padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-        correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
-        callback: (res) => {
-          codeImgs.push(res.path);
-          if(codeImgs.length==qrcode.length){
+    let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,
+    qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0,arr = [];
+
+    this.data.info.order_product_list.forEach(qrcode=>{
+        qrcode.qrcode.map((item,index)=>{
+          console.log(qrcode.is_force_display_code);
+          item.is_force_display_code = qrcode.is_force_display_code
+          console.log(item.is_force_display_code);
+          arr.push(index)
+          this.setData({imgLen:arr})
+          if(item.use_url&&item.use_code){
+            codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
             that.setData({
               codeImgs:codeImgs
             })
           }
-          console.log(res)
-        }
+          else {
+            new QRCode('damocode'+codeId,{
+              text: item.use_code,
+              width: 300 * radio,
+              height: 300 * radio,
+              padding:10, // 生成二维码四周自动留边宽度，不传入默认为0
+              correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
+              callback: (res) => {
+                codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
+                that.setData({
+                  codeImgs:codeImgs
+                })
+              }
+            })
+            codeId = codeId + 1
+          }
+        }) 
       })
-    }) 
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;
@@ -318,8 +335,28 @@ getInfo () {
           order.consignee_info = order.consignee_info?JSON.parse(order.consignee_info):null;
           state = state + order.state;
           order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
-        })
 
+          if (order.pickup_shop_id>0) {
+              try {
+                  order.pickupShop = JSON.parse(order.pickup_shop_info)
+              } catch(e) {
+                order.pickupShop = null
+              }
+          }
+
+        })
+  
+        // 2025-7-21能否确认收货
+        res.data.is_all_confirm = true;
+        if (res.data.state=='PAID' && res.data.stateNums.WAIT_DELIVERY==res.data.order_product_list.length) {
+          res.data.order_product_list.forEach(v=>{
+              if (v.shipped_batch_count < v.batch_count ) {
+                  res.data.is_all_confirm = false
+              }
+          })
+        } else {
+             res.data.is_all_confirm = false;
+        }
         // 权益卡 
         let cardPostList = [];
         let isCard= false;
@@ -331,18 +368,19 @@ getInfo () {
             cardPostList.forEach(v=>{
                 console.log(v)
                 if (v.order_card_product) {
-                        v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
-                        v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
-                        v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
+                      v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
+                      v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
+                      v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
                 }
                 if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) {
-                    deliveryNum += 1
+                  deliveryNum += 1
                 }
             })
         }
-
+        console.log(res.data, 'aaa')
         this.setData({
           isRefund:state.indexOf("REFUND")!=-1,
+          isPickup: res.data.order_product_list.some(v=>v.pickup_shop_id>0),
           info:res.data,
           product_model:res.data.order_product_list[0].product_model,
           ids: proId.join(","),
@@ -372,78 +410,30 @@ getInfo () {
       util.gotoDetail(item);
     }
   },
+
+  callPhone: function (e) {
+      let item = e.currentTarget.dataset.item
+      let phone = item.pickupShop.tel
+    wx.makePhoneCall({
+        phoneNumber: phone
+    })
+  },
+
+  gotolocation: function(e) {
+    let item = e.currentTarget.dataset.item
+    let info = item.pickupShop
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon),
+      name:info.title,
+      address:info.address
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post("order/query",{
-      order_id:this.data.id
-    }).then(res=>{
-      if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
-        let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000);
-        this.daojishi(time);
-      }
-      let proId = []
-      res.data.order_product_list.forEach(item => {
-        proId.push(item.product_id)
-      })
-      let state = "";
-      res.data.stateNums = {}
-      res.data.order_product_list.map(order=>{
-        if(res.data.stateNums[order.state]){
-          res.data.stateNums[order.state]++;
-        }
-        else {
-          res.data.stateNums[order.state] = 1;
-        }
-        order.consignee_info = order.consignee_info?JSON.parse(order.consignee_info):null;
-        state = state + order.state;
-        order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
-      })
-
-      // 2025-7-21能否确认收货
-      res.data.is_all_confirm = true;
-      if (res.data.state=='PAID' && res.data.stateNums.WAIT_DELIVERY==res.data.order_product_list.length) {
-        res.data.order_product_list.forEach(v=>{
-            if (v.shipped_batch_count < v.batch_count ) {
-                res.data.is_all_confirm = false
-            }
-        })
-      } else {
-           res.data.is_all_confirm = false;
-      }
-      // 权益卡 
-      let cardPostList = [];
-      let isCard= false;
-      let deliveryNum = 0;
-      if (res.data.order_product_list.some(v=>v.order_card_product)) {
-          cardPostList = res.data.order_product_list.slice(1)
-          res.data.order_product_list = [res.data.order_product_list[0]]
-          isCard = true;
-          cardPostList.forEach(v=>{
-              console.log(v)
-              if (v.order_card_product) {
-                    v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
-                    v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
-                    v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
-              }
-              if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) {
-                deliveryNum += 1
-              }
-          })
-      }
-      console.log(res.data, 'aaa')
-      this.setData({
-        isRefund:state.indexOf("REFUND")!=-1,
-        info:res.data,
-        product_model:res.data.order_product_list[0].product_model,
-        ids: proId.join(","),
-        cardPostList: cardPostList,
-        isCard: isCard,
-        deliveryNum: deliveryNum
-      })
-      this.getCodeImg()
-    })
+    this.getInfo()
   },
 
   /**
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 563d837..f2845b8 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -2,8 +2,9 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="订单详情"></title>
 <view class="top-bg"></view>
+<canvas wx:for="{{imgLen}}" wx:key="index" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
 <view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
-<view class="box" wx:if="{{info}}" style="color:#333">
+<view class="box" wx:if="{{info&&!isPickup}}" style="color:#333">
   <view class="scene-box-left" wx:if="{{info.state=='REFUND'}}" style="width:100%">您的退款已成功，退款金额预计在1-7个工作日内退还到您支付的账户</view>
   <view class="scene-box-left" wx:elif="{{info.state=='WAIT_REFUND'}}" style="width:100%">您已成功发起退款申请，请耐心等待</view>
   <view class="scene-box-left" wx:elif="{{info.state=='UNPAID'}}" style="width:100%">请在00:{{minute}}:{{second}}内支付，逾期订单将自动取消</view>
@@ -13,6 +14,25 @@
   <view style="font-size:26rpx;color:#333;line-height:50rpx"><text style="color:#0B898E;margin-right:10rpx" class="iconfont icon-location"></text>{{info.order_product_list[0].consignee_info.address}}</view>
 </view>
 
+<view class="code-box box" wx:if="{{info && isPickup && codeImgs.length>0}}">
+  <!-- <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view> -->
+  <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;"  wx:key="index">
+    <image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;height: 300rpx;"></image>
+    <!-- 代表核销后是否继续展示二维码（0否1是） -->
+    <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
+      <view class="text-shadow-state">
+        {{item.state}}
+      </view>
+    </view>
+  </view>
+  <!-- <view bindtap="nextCodeImg" class="iconfont icon-you"></view> -->
+  <view class="code-text">
+    核销码:{{codeImgs[codeIndex].code}}  
+    <!-- <view class="copy-box" data-num="{{codeImgs[codeIndex].code}}" bindtap="copy">复制</view> -->
+  </view>
+  <!-- <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view> -->
+</view>
+
 <view class="box" wx:if="{{info && info.order_product_list && info.order_product_list.length>0}}" 
     wx:for="{{info.order_product_list}}">
     <view>
@@ -30,47 +50,96 @@
             </view>
             <view class="product-state">{{item.state_text}}</view>
         </view>
-        <view class="detail-item">
-            <text>收货方式：</text>
-            <text wx:if="{{item.is_batch_shipment==1}}">分批收货 (共{{item.batch_count}}次)</text>
-            <text wx:else>一次性收货</text>
-        </view>
-        <view class="detail-item">
-            <text>运费：</text>
-            <view>
-                <text style="padding-right: 56rpx;" wx:if="{{item.post_fee&&item.is_batch_shipment==1}}">￥{{item.post_fee/item.batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
-                <text>{{item.post_fee?("￥"+item.post_fee/100):"包邮"}}</text>
-            </view>
-        </view>
-        <view class="detail-item">
-            <text>小计：</text>
-            <text>￥{{item.paid_money/100}}</text>
-        </view>
 
-        <!-- <view wx:if="{{item.post_detail_list.length>0}}"> -->
-        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" 
-            wx:if="{{item.is_batch_shipment==1 || (item.is_batch_shipment==0&&item.post_detail_list.length>=1)}}">
-            <view class="box-title" style="position: relative;">
-                物流信息
-                <text bind:tap="expandPost" data-index="{{index}}" class="expand-tip" wx:if="{{item.is_batch_shipment==1}}">
-                {{item.showMore?"收起":"展开"}}
-                </text>
+        <view >
+            <view wx:if="{{isPickup}}" class="detail-item"><text>收货方式：</text><text>自提</text></view>
+
+            <view wx:else class="detail-item">
+                <text>收货方式：</text>
+                <text wx:if="{{item.is_batch_shipment==1}}">分批收货 (共{{item.batch_count}}次)</text>
+                <text wx:else>一次性收货</text>
             </view>
-            <!-- 多批次发货 -->
-            <view wx:if="{{item.is_batch_shipment==1}}">
-                <view class="detail-item post-line-info">
-                    <text>当前已发：{{item.shipped_batch_count}}</text>
+            <!-- <view class="detail-item">
+                <text>运费：</text>
+                <view>
+                    <text style="padding-right: 56rpx;" wx:if="{{item.post_fee&&item.is_batch_shipment==1}}">￥{{item.post_fee/item.batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
+                    <text>{{item.post_fee?("￥"+item.post_fee/100):"包邮"}}</text>
                 </view>
-                <view class="detail-item post-line-info">
-                    <text>当前待发：{{item.batch_count - item.shipped_batch_count}}</text>
+            </view>
+            <view class="detail-item">
+                <text>小计：</text>
+                <text>￥{{item.paid_money/100}}</text>
+            </view> -->
+
+            <!-- <view wx:if="{{item.post_detail_list.length>0}}"> -->
+            
+            <view class="detail-item">
+                <text>商品总价：</text>
+                <text>￥{{info.total_money/100}}</text>
+            </view>
+            <view class="detail-item" wx:if="{{!isPickup}}">
+                <text>运费：</text>
+                <view>
+                    <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
+                    <text>{{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}}</text>
                 </view>
-                <view class="detail-item post-line-info">
-                    <text>物流备注：{{item.batch_remark}}</text>
+            </view>
+            <view class="detail-item" wx:if="{{info.preference_money}}" >
+                <text>优惠券：</text>
+                <text>-￥{{info.preference_money/100}}</text>
+            </view>
+            <view class="detail-item">
+                <text>实付款</text>
+                <view class="price">￥{{info.paid_money/100}}</view>
+            </view>
+
+
+            <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" 
+                wx:if="{{item.is_batch_shipment==1 || (item.is_batch_shipment==0&&item.post_detail_list.length>=1)}}">
+                <view class="box-title" style="position: relative;">
+                    物流信息
+                    <text bind:tap="expandPost" data-index="{{index}}" class="expand-tip" wx:if="{{item.is_batch_shipment==1}}">
+                    {{item.showMore?"收起":"展开"}}
+                    </text>
                 </view>
+                <!-- 多批次发货 -->
+                <view wx:if="{{item.is_batch_shipment==1}}">
+                    <view class="detail-item post-line-info">
+                        <text>当前已发：{{item.shipped_batch_count}}</text>
+                    </view>
+                    <view class="detail-item post-line-info">
+                        <text>当前待发：{{item.batch_count - item.shipped_batch_count}}</text>
+                    </view>
+                    <view class="detail-item post-line-info">
+                        <text>物流备注：{{item.batch_remark}}</text>
+                    </view>
+
+                    <view class="post-child" style="padding-top: 12rpx;" wx:if="{{item.showMore}}">
+                        <view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
+                            <view class="detail-item">快递{{shipIndex+1}}</view>
+                            <view class="detail-item post-line-info">
+                                <text>快递公司：{{shipment.express_name}}</text>
+                            </view>
+                            <view class="detail-item post-line-info">
+                                <text>快递单号：</text>
+                                <view style="flex:1;width: 1rpx;">
+                                    {{shipment.courier_number}} <text data-num="{{shipment.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                                </view>
+                            </view>
+                            <view class="detail-item post-line-info">
+                                <text>发货时间：{{shipment.post_time}}</text>
+                            </view>
+                        </view>
+                    </view>
 
-                <view class="post-child" style="padding-top: 12rpx;" wx:if="{{item.showMore}}">
+                    <!-- <view class="post-child-btn" bind:tap="expandPost" data-index="{{index}}">{{item.showMore?"收起":"展开"}}</view> -->
+
+
+                </view>
+                
+                <!-- 一次性发货 -->
+                <view wx:elif="{{item.post_detail_list.length>=1}}">
                     <view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
-                        <view class="detail-item">快递{{shipIndex+1}}</view>
                         <view class="detail-item post-line-info">
                             <text>快递公司：{{shipment.express_name}}</text>
                         </view>
@@ -81,45 +150,24 @@
                             </view>
                         </view>
                         <view class="detail-item post-line-info">
-                            <text>发货时间：{{shipment.post_time}}</text>
+                            <text>发货时间：{{shipment.post_time}} </text>
                         </view>
                     </view>
+                    
                 </view>
-
-                <!-- <view class="post-child-btn" bind:tap="expandPost" data-index="{{index}}">{{item.showMore?"收起":"展开"}}</view> -->
-
-
             </view>
-            
-            <!-- 一次性发货 -->
-            <view wx:elif="{{item.post_detail_list.length>=1}}">
-                <view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
-                    <view class="detail-item post-line-info">
-                        <text>快递公司：{{shipment.express_name}}</text>
-                    </view>
-                    <view class="detail-item post-line-info">
-                        <text>快递单号：</text>
-                        <view style="flex:1;width: 1rpx;">
-                            {{shipment.courier_number}} <text data-num="{{shipment.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
-                        </view>
-                    </view>
-                    <view class="detail-item post-line-info">
-                        <text>发货时间：{{shipment.post_time}} </text>
-                    </view>
+
+            <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" wx:if="{{!isPickup}}">
+                <view class="box-title" style="position: relative;">
+                    使用说明
+                    <text bind:tap="expandMsg" data-index="{{index}}" class="expand-tip">
+                    {{item.showMsg?"收起":"展开"}}
+                    </text>
                 </view>
-                
+                <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
             </view>
         </view>
 
-        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;">
-            <view class="box-title" style="position: relative;">
-                使用说明
-                <text bind:tap="expandMsg" data-index="{{index}}" class="expand-tip">
-                {{item.showMsg?"收起":"展开"}}
-                </text>
-            </view>
-            <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
-        </view>
 
         <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" wx:if="{{isCard&&cardPostList.length>0}}">
             <view class="box-title" style="position: relative;">
@@ -174,29 +222,46 @@
     </view>
 </view>
 
-<view class="box" wx:if="{{info}}">
-    <view class="box-title">订单信息</view>
-    <view class="detail-item">
-        <text>商品总价：</text>
-        <text>￥{{info.total_money/100}}</text>
-    </view>
-    <view class="detail-item">
-        <text>运费：</text>
-        <view>
-            <text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}}</text>
-            <text>{{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}}</text>
+<view class="box" wx:if="{{info && isPickup}}">
+    <view class="box-title">自提信息</view>
+
+    <view class="mask-shop-info">
+        <view class="shop-info-item">
+            <image class="start-icon" src="https://static.ticket.sz-trip.com/uploads/20251029/c84b0c0c8d99504a059b7e41035da67c.png"></image>
+            <view>预留手机号：{{info.order_product_list[0].phone}}</view>
         </view>
+        <view class="shop-info-item" style="justify-content: space-between;">
+            <image class="start-icon" src="https://static.ticket.sz-trip.com/uploads/20251029/a49d29cb9ad295752f298d7240fea88b.png"></image>
+            <view style="flex: 1;width: 100rpx;">
+                <view>{{info.order_product_list[0].pickupShop.title}}</view>
+                <view class="subtitle">{{info.order_product_list[0].pickupShop.address}}</view>
+                <!-- <view class="subtitle" wx:if="{{info.order_product_list[0].supplier_info.distance>0}}">据您约{{info.order_product_list[0].supplier_info.distance}}km</view> -->
+            </view>
+            <view style="display: flex;flex-direction: column;align-items: center;padding-left: 40rpx;"
+             catch:tap="callPhone" data-item="{{info.order_product_list[0]}}">
+                <image class="icon-phone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+                <view style="font-size: 24rpx;color: #666666;margin-top: 14rpx;font-weight: 500;">电话</view>
+            </view>
+
+            <view style="display: flex;flex-direction: column;align-items: center;padding-left: 40rpx;"
+             catch:tap="gotolocation" data-item="{{info.order_product_list[0]}}">
+                <image class="icon-phone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+                <view style="font-size: 24rpx;color: #666666;margin-top: 14rpx;font-weight: 500;">导航</view>
+            </view>
+
+        </view>
+
     </view>
-    <view class="detail-item" wx:if="{{info.preference_money}}" >
-        <text>优惠券：</text>
-        <text>-￥{{info.preference_money/100}}</text>
-    </view>
-    <view class="detail-item">
-        <text>实付款</text>
-        <view class="price">￥{{info.paid_money/100}}</view>
-    </view>
 
-    <view style="border-top:1rpx solid #ccc;margin: 12rpx 0;"></view>
+</view>
+
+
+
+<view class="box" wx:if="{{info}}">
+    <view class="box-title">订单信息</view>
+    
+
+    <!-- <view style="border-top:1rpx solid #ccc;margin: 12rpx 0;"></view> -->
 
     <view class="detail-item">
         <text>订单编号：</text>
diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss
index e02e564..c1bd603 100644
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@@ -16,6 +16,18 @@ page {
   color: #fff;
   font-size: 48rpx;
 }
+.copy-box {
+	width: 73rpx;
+	line-height: 35rpx;
+	border-radius: 7rpx;
+	border: 1rpx solid #09898C;
+	margin-left: 15rpx;
+	text-align: center;
+	font-weight: 500;
+	font-size: 23rpx;
+    color: #0E8790;
+    height: 40rpx;
+}
 .box {
   padding: 20rpx;
   background: white;
@@ -202,8 +214,8 @@ page {
   top: 30rpx;
 }
 .code-box {
-  text-align: center;
-  height: 530rpx;
+    text-align: center;
+  min-height: 340rpx;
   position: relative;
 }
 .code-box .iconfont {
@@ -240,6 +252,8 @@ page {
   font-size: 30rpx;
   font-weight: 500;
   margin: 25rpx;
+  display: flex;
+  justify-content: center;
 }
 .code-btn {
   width: 220rpx;
@@ -439,4 +453,37 @@ color: #333333;
     width: 100%;
     height: 100%;
     border-radius: 50%;
+}
+
+
+.mask-shop-info{
+    font-weight: 500;
+    font-size: 31rpx;
+    color: #000000;
+}
+.shop-info-item{
+    display: flex;
+    align-items: flex-start;
+    font-family: PingFang SC;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #000000;
+    padding: 20rpx 0;
+    word-wrap: break-all;
+}
+.shop-info-item .start-icon{
+    width: 33.33rpx;
+    height: 33.33rpx;
+    margin: 4rpx 17rpx 0 0;
+    flex-shrink: 0;
+}
+.shop-info-item .subtitle{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-top: 26rpx;
+}
+.shop-info-item .icon-phone{
+    width: 56rpx;
+    height: 56rpx;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 7920a32..25fe308 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,12 +6,33 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/order/orderList/index",
+          "pathName": "pages/order/orderList/index",
+          "query": "flag=mix",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "subPackages/techanNew/selfPickPoint/index",
+          "pathName": "subPackages/techanNew/selfPickPoint/index",
+          "query": "pickupId=null&goodsId=457654&skuId=190836",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=457654",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/goods/memberCard/index",
           "pathName": "subPackages/goods/memberCard/index",
           "query": "id=464704",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "subPackages/foodListNew/index",
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index ee85e0f..995f4b0 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -52,7 +52,9 @@ Page({
     seachFlag:false, //搜索模式
     totalPrice:0, //获取购物车总价--打开购物车后勾选的产品价格
     name:'文创特产',
-    nowAddListId:[]
+    nowAddListId:[],
+
+    user_type: null,
   },
 
   /**
@@ -87,10 +89,10 @@ Page({
   delAll() {
     let ids = []
     this.data.gwcList.forEach(item => {
-      ids.push(item.sku_id)
+      ids.push(item.id)
     })
     commonApi.user_post("cart_within/del_sku", {
-      sku_id: ids+'',
+      id: ids+'',
       type:'1'
     }).then(res => {
         if (res.code == 1) {
@@ -107,11 +109,12 @@ Page({
   },
   // 减少一个
   del(e) {
-    let item = e.currentTarget.dataset.item
-    let gwcList = this.data.gwcList
+    let item = e.currentTarget.dataset.item;
+    let gwcList = this.data.gwcList;
+    let valueNum = e.currentTarget.dataset.value
     commonApi.user_post("cart_within/update_sku", {
-      num:item.num-1,
-      sku_id: item.sku_id,
+      num:item.num + valueNum,
+      id: item.id,
       type:'1'
     }).then(res => {
         if (res.code == 1) {
@@ -134,6 +137,9 @@ Page({
                   if (item.selected ==1) {
                     totalPrice += item.num*item.sku.price
                   }
+                  if (item.delivery_method === null) {
+                      item.delivery_method = item.sku.sku_model.use_type == 1?1:0
+                  }
                 })
               }
               let status = res.data.every(el => el.selected === 1)
@@ -149,6 +155,14 @@ Page({
   },
   // 添加产品到购物车
   addCart: function (e) {
+    if (![0,1].includes(this.data.user_type)) {
+        wx.showToast({
+            title: "请选择配送方式",
+            icon:"none"
+        })
+        return
+    }
+
     let item = e.currentTarget.dataset.item
     app.globalData.postProduct = []
     app.globalData.list = []
@@ -161,7 +175,8 @@ Page({
           commonApi.user_post("cart_within/add_sku", {
             sku_id: this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id,
             num: this.data.producNum,
-            type:"1"
+            type:"1",
+            delivery_method: this.data.user_type
         }).then(res => {
           if (res.code == 1) {
               let sku_id = this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id
@@ -195,6 +210,9 @@ Page({
                     if (element.selected == 1) {
                       totalPrice += Number(element.num*element.sku.price)
                     }
+                    if (element.delivery_method === null) {
+                        element.delivery_method = element.sku.sku_model.use_type == 1?1:0
+                    }
                   })
                   console.log(res.data);
                   let status = res.data.every(el => el.selected === 1)
@@ -261,7 +279,7 @@ Page({
                     if (item.product.type == 'post') {
                         product.push({
                             product: item.product,
-                            sku: item.sku,
+                            sku: {...item.sku, use_type: item.delivery_method||0},
                             productNum: item.num
                         })
                     } else {
@@ -280,21 +298,26 @@ Page({
                 // })
                 return;
             }
-            if (product.length > 0 && product1.length > 0) {
-                this.setData({
-                    flag: 'mix',
-                    isCar: 'multiple'
-                })
-            }
-            if (product1.length > 1) {
-                this.setData({
-                    isCar: 'multiple'
-                })
-            } else {
-                this.setData({
-                    isCar: 'single'
+            let postSkuIds = product.map(x=>x.sku.id)
+            if(postSkuIds.some(x=>postSkuIds.filter(v=>v==x).length>1)) {
+                wx.showToast({
+                    title: '相同规格产品不可重复购买',
+                    icon: "none"
                 })
+                return
+            } 
+
+            let useType = product[0].sku.use_type
+            let flag = this.data.flag, isCar = "single";
+            if (product.some(x=>x.sku.use_type!=useType)) {
+                flag = "mix"
+                isCar = "multiple"
             }
+            this.setData({
+                flag: flag,
+                isCar: isCar
+            })
+
             console.log(product1);
             app.globalData.postProduct = product;
             if (app.globalData.list) {
@@ -414,14 +437,12 @@ Page({
   },
   // 获取历史购物车详情
   getCount() {
-    // debugger
     commonApi.user_post('cart_within/get_list', {
       type:'1'
     }).then(res => {
       let arr = res.data,totalPrice = 0,cartCount=0
       if (arr.length>0) {
         arr.forEach(item=> {
-          // totalPrice += item.num*item.sku.price
           cartCount += item.num
         })
       }
@@ -433,15 +454,17 @@ Page({
             }
           })
         })
-        // debugger
+
         arr.forEach(item=> {
           if(item.selected == 1) {
             totalPrice += item.num*item.sku.price
           }
+          if (item.delivery_method === null) {
+            item.delivery_method = item.sku.sku_model.use_type == 1?1:0
+          }
         })
       }
-      // console.log(arr);
-      // debugger
+
       this.setData({
           cartCount: cartCount, //1
           gwcList:arr,
@@ -605,6 +628,10 @@ Page({
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
+    this.setData({
+        user_type: null
+    })
+
     let item = e.currentTarget.dataset.item
     console.log(item);
     commonApi._post("product/get_product_detail", {
@@ -661,9 +688,18 @@ Page({
   selectSku: function (e) {
       let index = e.currentTarget.dataset.index;
       this.setData({
-          skuIndex: index
+          skuIndex: index,
+          user_type: null,
       })
   },
+
+  changeSelectSkuPost: function(e) {
+    let value = e.currentTarget.dataset.value;
+    this.setData({
+        user_type: value,
+    })
+},
+
   // 关闭弹窗
   hideSku: function () {
     this.setData({
diff --git a/subPackages/techanNew/index.wxml b/subPackages/techanNew/index.wxml
index 0a7fe57..dc8afb7 100644
--- a/subPackages/techanNew/index.wxml
+++ b/subPackages/techanNew/index.wxml
@@ -177,6 +177,27 @@
       <view class="number">{{producNum}}</view>
       <view class="iconfont icon-add-select" bindtap="add"></view>
     </view>
+
+    <view class="delivery-method" wx:if="{{info.is_package!=1}}">
+        <view class="delivery-title">配送方式</view>
+        <view class="flex" style="display: flex;">
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=1}}" bind:tap="changeSelectSkuPost" data-value="{{0}}">
+                <view class="select-cycle" wx:if="{{user_type!==0}}"></view>
+                <view class="select-cycle selected" wx:else>
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">邮寄</view>
+            </view>
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=0}}" bind:tap="changeSelectSkuPost" data-value="{{1}}">
+                <view class="select-cycle" wx:if="{{user_type!==1}}"></view>
+                <view class="select-cycle selected" wx:else="">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">自提</view>
+            </view>
+        </view>
+    </view>
+
     <view style="height:138rpx"></view>
     <view class="btn-box">
       <!-- <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'加入购物车':'立即购买'}}
@@ -208,7 +229,10 @@
           <image lazy-load wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
         </view>
-        <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <view style="position: relative;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;">
+            <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;" src="{{item.sku.headimg}}" mode="" />
+            <view class="use-type">{{item.delivery_method==1?"自提":"邮寄"}}</view>
+        </view>
         <view class="main">
           <view>
             <view class="title textOver">{{item.product.title}}</view>
@@ -217,9 +241,9 @@
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
             <view class="num-box">
-              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" data-value="{{-1}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
               <view style="margin: 0 25.33rpx;">{{item.num}}</view>
-              <image lazy-load class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="grow" catchtap="del" data-item="{{item}}" data-value="{{1}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
diff --git a/subPackages/techanNew/index.wxss b/subPackages/techanNew/index.wxss
index 3c7b928..06663f1 100644
--- a/subPackages/techanNew/index.wxss
+++ b/subPackages/techanNew/index.wxss
@@ -442,7 +442,7 @@ page {
   display: flex;
   font-size: 29rpx;
   color: #333;
-  margin: 0 40rpx;
+  margin: 0 30rpx;
   text-align: center;
   flex-wrap: wrap;
   margin-bottom: 20rpx;
@@ -740,3 +740,57 @@ page {
 .phcolor {
   color: #ccc;
 }
+.delivery-method{
+    font-weight: 400;
+    font-size: 29rpx;
+    color: #1E1E1E;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 40rpx 40rpx;
+}
+.delivery-method .select-cycle{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+    border: 1px solid #999999;
+    overflow: hidden;
+    flex-shrink: 0;
+    
+}
+.delivery-method .select-cycle image{
+    width: 100%;
+    height: 100%;
+}
+.delivery-method .select-cycle.selected {
+    border: none;
+}
+.delivery-method .select-cycle.selected image{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+}
+.delivery-method .method-str{
+    padding-left: 10rpx;
+    flex-shrink: 0;
+}
+.delivery-method .flex-center{
+    width: 150rpx;
+    justify-content: flex-end;
+    display: flex;
+    align-items: center;
+}
+ .use-type{
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    border-radius: 0rpx 0rpx 7rpx 7rpx;
+    height: 33rpx;
+    background: rgba(0,0,0,0.3);
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 33rpx;
+}
\ No newline at end of file
diff --git a/subPackages/techanNew/selfPickPoint/index.js b/subPackages/techanNew/selfPickPoint/index.js
new file mode 100644
index 0000000..beab8bc
--- /dev/null
+++ b/subPackages/techanNew/selfPickPoint/index.js
@@ -0,0 +1,152 @@
+// subPackages/techanNew/selfPickPoint/index.js
+import commonApi from "../../../utils/https/common"
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list: [],
+	pickupId: null,
+	goodsId: null,
+	skuId: null,
+    selectIndex: null,
+    
+    lat:23,
+    lon:113,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData({
+        goodsId: options.goodsId,
+        skuId: options.skuId,
+    })
+
+    let _this = this
+    wx.getLocation({
+        type: 'gcj02',
+        success: function (res) {
+            _this.getList()
+        },
+        fail: function(e) {
+            _this.getList()
+        },
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+    getList() {
+        let param = {
+            product_id: this.data.goodsId,
+            lon: this.data.lon || '113',
+            lat: this.data.lat || '23',
+        }
+        commonApi.user_post("product/getDeliverShop", param).then(res => {
+            let resData = res.data || []
+            resData.forEach(x=>{
+                if (x.distance) {
+                    x.distance = (x.distance / 1000).toFixed(2)
+                }
+            })
+            this.setData({
+                list: res.data || []
+            })
+        })
+    },
+
+    selectPoint (e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            selectIndex: index
+        })
+    },
+
+    goMap (e) {
+        let item = e.currentTarget.dataset.item;
+        console.log(123)
+        wx.openLocation({
+            latitude: Number(item.lat),
+            longitude: Number(item.lon),
+            name:item.title,
+            address:item.address,
+
+            fail: function (e) {
+                console.log(e)
+            }
+        })
+    },
+
+    confirmPoint () {
+        if(this.data.selectIndex==null) {
+            wx.showToast({icon: "none",title: "请先选择自提点"})
+            return;
+        }
+        // 返回上一个页面并带回selectItem
+        let selectItem = this.data.list[this.data.selectIndex]
+        
+        const pages = getCurrentPages();
+        const prevPage = pages[pages.length - 2];
+        if (prevPage && prevPage.setPickUpPoint) {
+            console.log(prevPage)
+            prevPage.setPickUpPoint(selectItem)
+        }
+
+        wx.navigateBack()
+    },
+
+
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/subPackages/techanNew/selfPickPoint/index.json b/subPackages/techanNew/selfPickPoint/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/subPackages/techanNew/selfPickPoint/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}
\ No newline at end of file
diff --git a/subPackages/techanNew/selfPickPoint/index.wxml b/subPackages/techanNew/selfPickPoint/index.wxml
new file mode 100644
index 0000000..a27a10e
--- /dev/null
+++ b/subPackages/techanNew/selfPickPoint/index.wxml
@@ -0,0 +1,35 @@
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<title title="选择自提点"></title>
+<view class="bg">
+    <view class="item-bg'{{selectIndex==index?'active':''}}" wx:for="{{list}}"
+        wx:key="index" data-index="{{index}}"  bind:tap="selectPoint" data-item="{{item}}">
+        <view class="item">
+            <view class="item-point-title">
+                <view class="name">{{item.title}}</view>
+                <!-- <view style="padding: 10rpx 0;">营业时间：{{item.remark}}</view> -->
+                <view >地址：{{item.address}}</view>
+            </view>
+            <view class="item-point-guide" catchtap="goMap" data-item="{{item}}">
+                <view>
+                    <image src="https://static.ticket.sz-trip.com/uploads/20251028/071021313e5d04d98ca82f1f9e0678fd.png" mode="aspectFill" class="mapPoint"></image>
+                </view>
+                <!-- <view class="distance" wx:if="{{item.distance}}">距离{{item.distance}}km</view> -->
+                <view class="distance" >去这里</view>
+                
+            </view>
+        </view>
+    </view>
+    <view class="no-data" wx:if="{{list.length==0}}">
+        <image src="https://static.ticket.sz-trip.com/dongtai/images/user/noAddress.png" mode="aspectFill" class="no-address"></image>
+        <view class="">
+            暂无自提点地址
+        </view>
+    </view>
+    <view class="btn-bottom">
+        <view class="addBox" bind:tap="confirmPoint">
+            确定
+        </view>
+    </view>
+    
+    
+</view>
\ No newline at end of file
diff --git a/subPackages/techanNew/selfPickPoint/index.wxss b/subPackages/techanNew/selfPickPoint/index.wxss
new file mode 100644
index 0000000..4fb3687
--- /dev/null
+++ b/subPackages/techanNew/selfPickPoint/index.wxss
@@ -0,0 +1,124 @@
+
+.bg {
+    /* position: relative; */
+    background: #F7F7F7;
+    padding-bottom: 170rpx;
+    box-sizing: border-box;
+    min-height: 100vh;
+    padding-top: 20rpx;
+}
+.flex-shrink-0{
+    flex-shrink: 0;
+}
+.item-bg{
+    width: 697rpx;
+    min-height: 160rpx;
+    height: 160rpx;
+    background: #FFFFFF;
+    border-radius: 13rpx;
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+}
+.item-bg.active{
+    border:1px solid #0E8790;
+}
+
+.item {
+    padding: 24rpx;
+    padding-right: 0;
+    display: flex;
+    background: #FFFFFF;
+    border-radius: 13rpx;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+}
+.item  .item-point-title{
+    flex: 1;
+    width: 10rpx;
+    padding-right: 78rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    font-weight: 500;
+    font-size: 27rpx;
+    color: #999999;
+}
+.item  .item-point-guide{
+    width:140rpx;
+    flex-shrink: 0;
+    border-left: 1px solid #D8D8D8;
+    color: #515150;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    font-size: 24rpx;
+}
+.item .mapPoint{
+    width: 33rpx;
+    height: 33rpx;
+}
+.name {
+    display: flex;
+    font-size: 31rpx;
+    font-weight: bold;
+    color: #333333;
+}
+
+
+.no-data {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    padding: 300rpx 0;
+}
+.no-data view:nth-child(2) {
+    font-size: 30rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    margin-top: 25rpx;
+}
+
+.no-data image {
+    width: 160rpx;
+    height: 160rpx;
+}
+
+.btn-bottom{
+    position: fixed;
+    bottom: 0;
+    width: 750rpx;
+    height: 150rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(6, 0, 1, 0.1);
+    display: flex;
+    justify-content: space-between;
+    padding: 30rpx 50rpx 30rpx 50rpx;
+    box-sizing: border-box;
+}
+    
+.btn-bottom .addBox{
+    margin: 0 auto;
+    width: 697rpx;
+    height: 73rpx;
+    background: #D62828;
+    border-radius: 39rpx;
+    font-size: 36rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+    line-height: 80rpx;
+    text-align: center;
+}
+.distance{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #0E8790;
+    text-align: center;
+    padding-top: 11rpx;
+    word-wrap: break-all;
+}
diff --git a/utils/https.js b/utils/https.js
index d55ab84..b0f9a8b 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"
diff --git a/utils/util.js b/utils/util.js
index 7a1dd16..688dcf1 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -569,7 +569,6 @@ const pagePointPostUrl = [
 
 const detailPagePoint = function (url, res) {
     try {
-        console.log(res)
         let pagePointRoute = pagePointPostUrl.find(v=>url.indexOf(v.url)>=0)
             if (pagePointRoute) {
             // 如果是产品详情的话 需要加埋点

From 8ac8388fa6ec75710fb7c4f04cab56b35160366b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 30 Oct 2025 10:41:14 +0800
Subject: [PATCH 446/471] 1

---
 pages/info/postProductInfo/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 0082018..7939279 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -192,7 +192,7 @@
 
 <view class="shop-container" wx:if="{{iShop}}">
     <image lazy-load class="shop-img" src="{{info.supplier_headimg}}" mode="aspectFill"></image>
-    <view class="textOver2">{{info.supplier_name}}</view>
+    <view class="textOver2">{{info.shop_name}}</view>
     <navigator class="shop-btn" url="/pages/list/store/index?id={{supplierId}}">进店</navigator>
 </view>
 

From 7923bdee74af4f0c40bb3e448cca8d1c7ae88ea9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 30 Oct 2025 15:39:43 +0800
Subject: [PATCH 447/471] =?UTF-8?q?=E8=87=AA=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/postProductInfo/index.wxml |  2 +-
 pages/order/postOrder/index.js        |  5 +++--
 pages/user/cartlist/list.js           | 12 +++++++-----
 subPackages/techanNew/index.js        | 12 +++++++-----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index dbb3706..c23f9b3 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -302,7 +302,7 @@
       </view>
     </view>
 
-    <view class="delivery-method" wx:if="{{info.is_package!=1}}">
+    <view class="delivery-method" wx:if="{{info.is_package!=1&&skuFlag=='cart'}}">
         <view class="delivery-title">配送方式</view>
         <view class="flex" style="display: flex;">
             <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=1}}" bind:tap="changeSelectSkuPost" data-value="{{0}}">
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 2e795bb..f0879f7 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -301,13 +301,14 @@ Page({
             supplier_id: info.product.supplier_id,
         }
         if (info.user_select_type == 0) {
-            param.use_type = 1
+            param.use_type = 0
 			param.post = this.data.address.id
         }
         if (info.user_select_type == 1) {
-            param.use_type = 2
+            param.use_type = 1
             param.pickup_shop_id = info.pickupAddress.id
             param.pickup_shop_info = info.pickupAddress
+            param.phone = info.phone
             
         }
         product_list.push(param)
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index d9aae1a..c9d5806 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -218,11 +218,13 @@ Page({
                     return;
                 }
 
-                let postSkuIds = product.map(x=>x.sku.id)
-                if(postSkuIds.some(x=>postSkuIds.filter(v=>v==x).length>1)) {
-                    wx.showToast({
-                      title: '相同规格产品不可重复购买',
-                      icon: "none"
+                let repeatSku = product.find(x=>product.filter(v=>v.sku.id == x.sku.id).length>1)
+                if(repeatSku) {
+                    let str = `${repeatSku.product.title}-${repeatSku.sku.sku_name}邮寄和自提只能选择一种`
+                    wx.showModal({
+                      content: str,
+                      showCancel: false,
+                      complete: (res) => {}
                     })
                     return
                 } 
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index 995f4b0..48cdd2e 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -298,11 +298,13 @@ Page({
                 // })
                 return;
             }
-            let postSkuIds = product.map(x=>x.sku.id)
-            if(postSkuIds.some(x=>postSkuIds.filter(v=>v==x).length>1)) {
-                wx.showToast({
-                    title: '相同规格产品不可重复购买',
-                    icon: "none"
+            let repeatSku = product.find(x=>product.filter(v=>v.sku.id == x.sku.id).length>1)
+            if(repeatSku) {
+                let str = `${repeatSku.product.title}-${repeatSku.sku.sku_name}邮寄和自提只能选择一种`
+                wx.showModal({
+                    content: str,
+                    showCancel: false,
+                    complete: (res) => {}
                 })
                 return
             } 

From e21699be210a8fdc54a3fa2565fdaf0964e53b71 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 31 Oct 2025 17:35:17 +0800
Subject: [PATCH 448/471] =?UTF-8?q?gotoOrder=E8=B7=B3=E6=B5=8B=E8=AF=95=20?=
 =?UTF-8?q?todo=20=E6=AD=A3=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  2 +-
 app.wxss                         |  6 ++++++
 pages/order/postOrder/index.js   |  2 ++
 pages/order/postOrder/index.wxml |  2 +-
 utils/util.js                    | 11 ++++++++---
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 2d2126a..9ec3084 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest145? true : false;
+            data.isTest = data.isTest146? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/app.wxss b/app.wxss
index 0963daa..4e78857 100644
--- a/app.wxss
+++ b/app.wxss
@@ -171,6 +171,12 @@ page{
 .flex-shrink-0{
     flex-shrink: 0;
 }
+
+.hidden{
+    opacity: 0;
+    display: none;
+}
+
 /* page {
   filter: grayscale(100%);
 } */
\ No newline at end of file
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index f0879f7..3d62ee7 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -116,6 +116,8 @@ Page({
     this.setData({
         product: this.data.product
     })
+    this.getPostFee()
+    this.changePrice()
   },
 
   price() {
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 3686fd0..5bd8e1b 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -10,7 +10,7 @@
         bind:tap="changeUserPost" data-item="{{item}}" data-value="{{1}}" data-index="{{index}}">自提</view>
     </view>
 
-    <address bind:setAddress="setAddress" wx:if="{{index==0&&item.user_select_type==0}}"></address>
+    <address class="{{item.user_select_type==0?'':'hidden'}}" bind:setAddress="setAddress" wx:if="{{index==0}}"></address>
 
     <view class="pickup-container" wx:if="{{item.user_select_type==1}}">
         <view bind:tap="changePickup" data-index="{{index}}" data-item="{{item}}"  class="box-title">
diff --git a/utils/util.js b/utils/util.js
index 688dcf1..47e540e 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -405,10 +405,15 @@ const gotoOrder = function(item){
 
   // 数量超过两个  购物车下单 跳H5 (小程序二维码没分开)
   if (item.order_product_list.length>1) {
+    // wx.navigateTo({
+    //     url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
+    // })
+    // return;
+
     wx.navigateTo({
-        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
-      })
-      return;
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://test.m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
+    })
+    return;
   }
   if(item.order_product_list[0].product_model=='ticket'){
     wx.navigateTo({

From 803d8ef7c0b49f03934cf365773c5808bc8226d6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 31 Oct 2025 17:42:23 +0800
Subject: [PATCH 449/471] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/bindtel/index.js   | 50 +++++++++++++++++++++--------------
 pages/user/bindtel/index.wxml |  2 +-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/pages/user/bindtel/index.js b/pages/user/bindtel/index.js
index 82055f8..65e8932 100644
--- a/pages/user/bindtel/index.js
+++ b/pages/user/bindtel/index.js
@@ -110,31 +110,41 @@ Page({
           sendFlag: false,
           codeId: res.data.id
         })
-        // 获取成功之后需要马上改变成倒计时
-        let time = 59;
-        var timer = setInterval(() => {
-          // 倒计时结束需要重置可发送验证码状态和按钮文字
-          if (time < 0) {
-            // 清除定时器
-            clearInterval(timer)
-            this.setData({
-              buttonText: "重新发送",
-              sendFlag: true
-            })
-            return false;
-          }
+      }
+      else {
+          this.changeImgCode()
           this.setData({
-            buttonText: time + "秒后重新发送"
+            picCode: ""
+          })
+          wx.showModal({
+            content: res.msg,
+            showCancel: false,
           })
-          time--;
-        }, 1000)
+
+        // this.setData({
+        //   buttonText: "重新发送",
+        //   sendFlag: true
+        // })
       }
-      else {
+
+      // 获取成功之后需要马上改变成倒计时
+      let time = 59;
+      var timer = setInterval(() => {
+        // 倒计时结束需要重置可发送验证码状态和按钮文字
+        if (time < 0) {
+          // 清除定时器
+          clearInterval(timer)
+          this.setData({
+            buttonText: "重新发送",
+            sendFlag: true
+          })
+          return false;
+        }
         this.setData({
-          buttonText: "重新发送",
-          sendFlag: true
+          buttonText: time + "秒后重新发送"
         })
-      }
+        time--;
+      }, 1000)
       
     })
     // wx.navigateToMiniProgram({
diff --git a/pages/user/bindtel/index.wxml b/pages/user/bindtel/index.wxml
index 2d12221..229442b 100644
--- a/pages/user/bindtel/index.wxml
+++ b/pages/user/bindtel/index.wxml
@@ -8,7 +8,7 @@
     </view>
     <view class="bind-item" wx:if="{{imgCodeInfo}}">
       <view class="bind-item-left">图形验证码</view>
-      <input type="number" bindinput="picCodeInput" class="weui-input" placeholder="请输入图形验证码" />
+      <input type="number" value="{{picCode}}" bindinput="picCodeInput" class="weui-input" placeholder="请输入图形验证码" />
       <image lazy-load bindtap="changeImgCode" class="code-img" src="{{imgCodeInfo.code}}" mode="aspectFill"></image>
       <!-- <input bindinput="telInput" class="weui-input" auto-focus placeholder="请输入手机号" /> -->
     </view>

From c8b262ec4aead59c1ba6b062868b7bcbe8d460c3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 7 Nov 2025 13:05:38 +0800
Subject: [PATCH 450/471] =?UTF-8?q?=E8=87=AA=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/postOrder/index.js   |  3 ++
 project.private.config.json      | 11 ++++-
 subPackages/feiyiNew/index.js    | 82 +++++++++++++++++++++++---------
 subPackages/feiyiNew/index.wxml  | 30 ++++++++++--
 subPackages/feiyiNew/index.wxss  | 56 +++++++++++++++++++++-
 subPackages/techanNew/index.wxml |  2 +-
 utils/https.js                   |  4 +-
 utils/util.js                    | 12 ++---
 8 files changed, 161 insertions(+), 39 deletions(-)

diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 3d62ee7..c9e6397 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -103,6 +103,9 @@ Page({
         this.couponCom = this.selectAllComponents("#coupon")[0];
     }
 
+    this.getPostFee()
+    this.changePrice()
+
   },
 
   changeUserPost (e) {
diff --git a/project.private.config.json b/project.private.config.json
index 25fe308..66b3e05 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,12 +6,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=464888",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/order/orderList/index",
           "pathName": "pages/order/orderList/index",
           "query": "flag=mix",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "subPackages/techanNew/selfPickPoint/index",
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index 8402dc5..3114fec 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -44,7 +44,9 @@ Page({
     seachFlag:false, //搜索模式
     totalPrice:0, //获取购物车总价
     name:'非遗专卖',
-    nowAddListId:[]
+    nowAddListId:[],
+
+    user_type: null,
   },
 
   /**
@@ -69,10 +71,10 @@ Page({
   delAll() {
     let ids = []
     this.data.gwcList.forEach(item => {
-      ids.push(item.sku_id)
+      ids.push(item.id)
     })
     commonApi.user_post("cart_within/del_sku", {
-      sku_id: ids+'',
+      id: ids+'',
       type:'2'
     }).then(res => {
         if (res.code == 1) {
@@ -92,10 +94,11 @@ Page({
   del(e) {
     let item = e.currentTarget.dataset.item
     let gwcList = this.data.gwcList
+    let valueNum = e.currentTarget.dataset.value
     commonApi.user_post("cart_within/update_sku", {
-      num:item.num-1,
-      sku_id: item.sku_id,
-      type:'2'
+      num:item.num + valueNum,
+      id: item.id,
+      type:'1'
     }).then(res => {
         if (res.code == 1) {
             // this.getCount()
@@ -117,6 +120,9 @@ Page({
                   if (item.selected ==1) {
                     totalPrice += item.num*item.sku.price
                   }
+                  if (item.delivery_method === null) {
+                    item.delivery_method = item.sku.sku_model.use_type == 1?1:0
+                  }
                 })
               }
               let status = res.data.every(el => el.selected === 1)
@@ -132,6 +138,13 @@ Page({
   },
   // 添加产品到购物车
   addCart: function (e) {
+    if (![0,1].includes(this.data.user_type)) {
+        wx.showToast({
+            title: "请选择配送方式",
+            icon:"none"
+        })
+        return
+    }
     let item = e.currentTarget.dataset.item
     app.globalData.postProduct = []
     app.globalData.list = []
@@ -144,7 +157,8 @@ Page({
           commonApi.user_post("cart_within/add_sku", {
             sku_id: this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id,
             num: this.data.producNum,
-            type:"2"
+            type:"2",
+            delivery_method: this.data.user_type
         }).then(res => {
             if (res.code == 1) {
               let sku_id = this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id
@@ -187,6 +201,9 @@ Page({
                     if (element.selected == 1) {
                       totalPrice += Number(element.num*element.sku.price)
                     }
+                    if (element.delivery_method === null) {
+                        element.delivery_method = element.sku.sku_model.use_type == 1?1:0
+                    }
                   })
                   let status = res.data.every(el => el.selected === 1)
                     this.setData({
@@ -252,7 +269,7 @@ Page({
                     if (item.product.type == 'post') {
                         product.push({
                             product: item.product,
-                            sku: item.sku,
+                            sku: {...item.sku, use_type: item.delivery_method||0},
                             productNum: item.num
                         })
                     } else {
@@ -271,21 +288,27 @@ Page({
                 // })
                 return;
             }
-            if (product.length > 0 && product1.length > 0) {
-                this.setData({
-                    flag: 'mix',
-                    isCar: 'multiple'
-                })
-            }
-            if (product1.length > 1) {
-                this.setData({
-                    isCar: 'multiple'
-                })
-            } else {
-                this.setData({
-                    isCar: 'single'
+            let repeatSku = product.find(x=>product.filter(v=>v.sku.id == x.sku.id).length>1)
+            if(repeatSku) {
+                let str = `${repeatSku.product.title}-${repeatSku.sku.sku_name}邮寄和自提只能选择一种`
+                wx.showModal({
+                    content: str,
+                    showCancel: false,
+                    complete: (res) => {}
                 })
+                return
+            } 
+
+            let useType = product[0].sku.use_type
+            let flag = this.data.flag, isCar = "single";
+            if (product.some(x=>x.sku.use_type!=useType)) {
+                flag = "mix"
+                isCar = "multiple"
             }
+            this.setData({
+                flag: flag,
+                isCar: isCar
+            })
             console.log(product1);
             app.globalData.postProduct = product;
             if (app.globalData.list) {
@@ -427,6 +450,9 @@ Page({
           if(item.selected == 1) {
             totalPrice += item.num*item.sku.price
           }
+          if (item.delivery_method === null) {
+            item.delivery_method = item.sku.sku_model.use_type == 1?1:0
+          }
         })
       }
       this.setData({
@@ -581,6 +607,9 @@ Page({
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
+    this.setData({
+        user_type: null
+    })
     let item = e.currentTarget.dataset.item
     console.log(item);
     commonApi._post("product/get_product_detail", {
@@ -637,9 +666,16 @@ Page({
   selectSku: function (e) {
       let index = e.currentTarget.dataset.index;
       this.setData({
-          skuIndex: index
-      })
+        skuIndex: index,
+        user_type: null,
+    })
   },
+  changeSelectSkuPost: function(e) {
+    let value = e.currentTarget.dataset.value;
+    this.setData({
+        user_type: value,
+    })
+},
   // 关闭弹窗
   hideSku: function () {
     this.setData({
diff --git a/subPackages/feiyiNew/index.wxml b/subPackages/feiyiNew/index.wxml
index 39b1351..d8511f2 100644
--- a/subPackages/feiyiNew/index.wxml
+++ b/subPackages/feiyiNew/index.wxml
@@ -197,6 +197,25 @@
       <view class="number">{{producNum}}</view>
       <view class="iconfont icon-add-select" bindtap="add"></view>
     </view>
+    <view class="delivery-method" wx:if="{{info.is_package!=1}}">
+        <view class="delivery-title">配送方式</view>
+        <view class="flex" style="display: flex;">
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=1}}" bind:tap="changeSelectSkuPost" data-value="{{0}}">
+                <view class="select-cycle" wx:if="{{user_type!==0}}"></view>
+                <view class="select-cycle selected" wx:else>
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">邮寄</view>
+            </view>
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=0}}" bind:tap="changeSelectSkuPost" data-value="{{1}}">
+                <view class="select-cycle" wx:if="{{user_type!==1}}"></view>
+                <view class="select-cycle selected" wx:else="">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">自提</view>
+            </view>
+        </view>
+    </view>
     <view style="height:138rpx"></view>
     <view class="btn-box">
       <!-- <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'加入购物车':'立即购买'}}
@@ -209,7 +228,7 @@
 <!-- 购物车的弹窗 -->
 <view class="mask" wx:if="{{showPopup}}">
   <view bindtap="openPopup" class="mask-bg"></view>
-  <view class="mask-content" style="padding: 40rpx 0 180rpx;min-height: 600rpx;">
+  <view class="mask-content" style="padding: 40rpx 0 180rpx;height: 900rpx;">
     <view style="margin: 0 26.67rpx;">
       <!-- 顶部操作按钮 -->
       <view class="flex" style="margin-bottom: 56.67rpx;">
@@ -228,7 +247,10 @@
           <image lazy-load wx:if="{{item.selected ==1}}" style="width: 40rpx;height: 40rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
         </view>
-        <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <view style="position: relative;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;">
+            <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;" src="{{item.sku.headimg}}" mode="" />
+            <view class="use-type">{{item.delivery_method==1?"自提":"邮寄"}}</view>
+        </view>
         <view class="main">
           <view>
             <view class="title textOver">{{item.product.title}}</view>
@@ -237,9 +259,9 @@
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
             <view class="num-box">
-              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" data-value="{{-1}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
               <view style="margin: 0 25.33rpx;">{{item.num}}</view>
-              <image lazy-load class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="grow" catchtap="del" data-item="{{item}}" data-value="{{1}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
diff --git a/subPackages/feiyiNew/index.wxss b/subPackages/feiyiNew/index.wxss
index 2a0bd5b..94b4285 100644
--- a/subPackages/feiyiNew/index.wxss
+++ b/subPackages/feiyiNew/index.wxss
@@ -440,7 +440,7 @@ page {
   display: flex;
   font-size: 29rpx;
   color: #333;
-  margin: 0 40rpx;
+  margin: 0 30rpx;
   text-align: center;
   flex-wrap: wrap;
   margin-bottom: 20rpx;
@@ -777,3 +777,57 @@ page {
 .phcolor {
   color: #ccc;
 }
+.delivery-method{
+    font-weight: 400;
+    font-size: 29rpx;
+    color: #1E1E1E;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 40rpx 40rpx;
+}
+.delivery-method .select-cycle{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+    border: 1px solid #999999;
+    overflow: hidden;
+    flex-shrink: 0;
+    
+}
+.delivery-method .select-cycle image{
+    width: 100%;
+    height: 100%;
+}
+.delivery-method .select-cycle.selected {
+    border: none;
+}
+.delivery-method .select-cycle.selected image{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+}
+.delivery-method .method-str{
+    padding-left: 10rpx;
+    flex-shrink: 0;
+}
+.delivery-method .flex-center{
+    width: 150rpx;
+    justify-content: flex-end;
+    display: flex;
+    align-items: center;
+}
+ .use-type{
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    border-radius: 0rpx 0rpx 7rpx 7rpx;
+    height: 33rpx;
+    background: rgba(0,0,0,0.3);
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 33rpx;
+}
\ No newline at end of file
diff --git a/subPackages/techanNew/index.wxml b/subPackages/techanNew/index.wxml
index dc8afb7..106f2fc 100644
--- a/subPackages/techanNew/index.wxml
+++ b/subPackages/techanNew/index.wxml
@@ -210,7 +210,7 @@
 <!-- 购物车的弹窗 -->
 <view class="mask" wx:if="{{showPopup}}">
   <view bindtap="openPopup" class="mask-bg"></view>
-  <view class="mask-content" style="padding: 40rpx 0 180rpx;min-height: 600rpx;">
+  <view class="mask-content" style="padding: 40rpx 0 180rpx;height: 900rpx;">
     <view style="margin: 0 26.67rpx;">
       <!-- 顶部操作按钮 -->
       <view class="flex" style="margin-bottom: 56.67rpx;">
diff --git a/utils/https.js b/utils/https.js
index b0f9a8b..d55ab84 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"
diff --git a/utils/util.js b/utils/util.js
index 47e540e..4f1ac45 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -405,15 +405,15 @@ const gotoOrder = function(item){
 
   // 数量超过两个  购物车下单 跳H5 (小程序二维码没分开)
   if (item.order_product_list.length>1) {
-    // wx.navigateTo({
-    //     url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
-    // })
-    // return;
-
     wx.navigateTo({
-        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://test.m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
     })
     return;
+
+    // wx.navigateTo({
+    //     url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://test.m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
+    // })
+    // return;
   }
   if(item.order_product_list[0].product_model=='ticket'){
     wx.navigateTo({

From 485e533fb0b0dbe35bb80eb9976e1c5a6a383b9f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Nov 2025 15:29:52 +0800
Subject: [PATCH 451/471] 1

---
 app.js                                |  2 +-
 pages/info/postProductInfo/index.wxml |  2 ++
 pages/info/postProductInfo/index.wxss |  5 ++++-
 pages/user/cartlist/list.js           | 15 +++++++++------
 project.private.config.json           |  9 ++++++++-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 9ec3084..7326dea 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest146? true : false;
+            data.isTest = data.isTest150? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index c23f9b3..9f1fdd5 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -68,6 +68,8 @@
                     <image lazy-load wx:for="{{info.sku}}" wx:key="index" bind:tap="changeSwiperCurrent" data-index="{{swiperRange.picture.max+1+index}}"
                     class="{{swiperCurrent==swiperRange.picture.max+1+index?'active':''}}"
                     src="{{item.headimg}}"></image>
+
+                    <view style="width: 20rpx;height: 100%;flex-shrink: 0;"></view>
                 </view>
  
                 <view class="select-sku" bind:tap="showOrder">></view>
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 83d34dd..1f5ccf0 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -438,6 +438,7 @@ page {
   justify-content: space-between;
   text-align: center;
   padding-left: 0;
+  z-index: 77;
 }
 
 .fixed-bottom .iconfont {
@@ -552,6 +553,8 @@ page {
   justify-content: space-between;
   height: 400rpx;
   align-content: flex-start; 
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 .sku-name-item {
@@ -696,7 +699,7 @@ width: 250rpx;
   border-radius: 50%;
   right: 20rpx;
   bottom: 166rpx;
-  z-index: 15;
+  z-index: 88;
 }
 
 .cart-box image {
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index c9d5806..5ad5dec 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -231,13 +231,16 @@ Page({
 
 
                 this.setData({flag:''})
-                let use_type = product[0].sku.use_type
-                if (product.some(x=>x.sku.use_type!=use_type)) {
-                    this.setData({
-                        flag: 'mix',
-                        isCar: 'multiple'
-                    })
+                if (product.length>0) {
+                    let use_type = product[0].sku.use_type
+                    if (product.some(x=>x.sku.use_type!=use_type)) {
+                        this.setData({
+                            flag: 'mix',
+                            isCar: 'multiple'
+                        })
+                    }
                 }
+                
                 if (product.length > 0 && product1.length > 0) {
                     this.setData({
                         flag: 'mix',
diff --git a/project.private.config.json b/project.private.config.json
index 66b3e05..96a56ce 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -9,10 +9,17 @@
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",
-          "query": "id=464888",
+          "query": "id=462080",
           "scene": null,
           "launchMode": "default"
         },
+        {
+          "name": "pages/info/postProductInfo/index",
+          "pathName": "pages/info/postProductInfo/index",
+          "query": "id=464888",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/order/orderList/index",
           "pathName": "pages/order/orderList/index",

From 5c4a5221e7cf9d4c432bebda216dd6a1525a7af5 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 14 Nov 2025 16:03:00 +0800
Subject: [PATCH 452/471] =?UTF-8?q?=E7=89=B9=E4=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project.private.config.json       | 11 ++++-
 subPackages/postSearch/index.js   | 76 ++++++++++++++++++++++++++-----
 subPackages/postSearch/index.wxml | 36 ++++++++++++---
 subPackages/postSearch/index.wxss | 56 ++++++++++++++++++++++-
 4 files changed, 157 insertions(+), 22 deletions(-)

diff --git a/project.private.config.json b/project.private.config.json
index 96a56ce..d731040 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,12 +6,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subPackages/postSearch/index",
+          "pathName": "subPackages/postSearch/index",
+          "query": "type_id=1&ids=",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",
           "query": "id=462080",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/info/postProductInfo/index",
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
index 2f9224d..9773beb 100644
--- a/subPackages/postSearch/index.js
+++ b/subPackages/postSearch/index.js
@@ -26,7 +26,9 @@ Page({
     totalPrice:0, //获取购物车总价--打开购物车后勾选的产品价格
     nowAddListId:[],
     type:'', //购物车分类1文创，2非遗
-    show:false
+    show:false,
+
+    user_type: null,
   },
 
   /**
@@ -60,6 +62,14 @@ Page({
   },
   // 添加产品到购物车
   addCart: function (e) {
+    if (![0,1].includes(this.data.user_type)) {
+        wx.showToast({
+            title: "请选择配送方式",
+            icon:"none"
+        })
+        return
+    }
+
     let item = e.currentTarget.dataset.item
     app.globalData.postProduct = []
     app.globalData.list = []
@@ -72,7 +82,8 @@ Page({
           commonApi.user_post("cart_within/add_sku", {
             sku_id: this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id,
             num: this.data.producNum,
-            type:this.data.type
+            type:this.data.type,
+            delivery_method: this.data.user_type
         }).then(res => {
           if (res.code == 1) {
               let sku_id = this.data.showPopup ? item.sku.id :this.data.info.sku[this.data.skuIndex].id
@@ -107,6 +118,9 @@ Page({
                     if (element.selected == 1) {
                       totalPrice += Number(element.num*element.sku.price)
                     }
+                    if (element.delivery_method === null) {
+                        element.delivery_method = element.sku.sku_model.use_type == 1?1:0
+                    }
                   })
                   console.log(res.data);
                   let status = res.data.every(el => el.selected === 1)
@@ -173,7 +187,7 @@ Page({
                   if (item.product.type == 'post') {
                       product.push({
                           product: item.product,
-                          sku: item.sku,
+                          sku: {...item.sku, use_type: item.delivery_method||0},
                           productNum: item.num
                       })
                   } else {
@@ -207,6 +221,29 @@ Page({
                   isCar: 'single'
               })
           }
+
+            let repeatSku = product.find(x=>product.filter(v=>v.sku.id == x.sku.id).length>1)
+            if(repeatSku) {
+                let str = `${repeatSku.product.title}-${repeatSku.sku.sku_name}邮寄和自提只能选择一种`
+                wx.showModal({
+                    content: str,
+                    showCancel: false,
+                    complete: (res) => {}
+                })
+                return
+            } 
+
+
+            let useType = product[0].sku.use_type
+            let flag = this.data.flag, isCar = "single";
+            if (product.some(x=>x.sku.use_type!=useType)) {
+                flag = "mix"
+                isCar = "multiple"
+            }
+            this.setData({
+                flag: flag,
+                isCar: isCar
+            })
           console.log(product1);
           app.globalData.postProduct = product;
           if (app.globalData.list) {
@@ -248,10 +285,10 @@ selectedIt(e) {
 delAll() {
   let ids = []
   this.data.gwcList.forEach(item => {
-    ids.push(item.sku_id)
+    ids.push(item.id)
   })
   commonApi.user_post("cart_within/del_sku", {
-    sku_id: ids+'',
+    id: ids+'',
     type:this.data.type
   }).then(res => {
       if (res.code == 1) {
@@ -270,9 +307,10 @@ delAll() {
 del(e) {
   let item = e.currentTarget.dataset.item
   let gwcList = this.data.gwcList
+  let valueNum = e.currentTarget.dataset.value
   commonApi.user_post("cart_within/update_sku", {
-    num:item.num-1,
-    sku_id: item.sku_id,
+    num:item.num + valueNum,
+    id: item.id,
     type:this.data.type
   }).then(res => {
       if (res.code == 1) {
@@ -295,6 +333,9 @@ del(e) {
                 if (item.selected ==1) {
                   totalPrice += item.num*item.sku.price
                 }
+                if (item.delivery_method === null) {
+                    item.delivery_method = item.sku.sku_model.use_type == 1?1:0
+                  }
               })
             }
             let status = res.data.every(el => el.selected === 1)
@@ -367,6 +408,9 @@ openPopup() {
         if (item.selected == 1) {
           totalPrice += item.num*item.sku.price
         }
+        if (item.delivery_method === null) {
+            item.delivery_method = item.sku.sku_model.use_type == 1?1:0
+          }
       })
       // console.log(arr);
       // debugger
@@ -380,7 +424,8 @@ openPopup() {
   },
   search() {
     this.setData({
-      list:[]
+      list:[],
+      show:false
     })
     this.getList()
   },
@@ -390,9 +435,6 @@ openPopup() {
     })
   },
   getList() {
-    this.setData({
-      show:false
-    })
     let list= this.data.list;
     if (this.data.keywords == '' || this.data.keywords.indexOf(' ')!==-1) {
       return
@@ -445,6 +487,9 @@ openPopup() {
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
+    this.setData({
+        user_type: null
+    })
     let item = e.currentTarget.dataset.item
     console.log(item);
     commonApi._post("product/get_product_detail", {
@@ -501,9 +546,16 @@ openPopup() {
   selectSku: function (e) {
       let index = e.currentTarget.dataset.index;
       this.setData({
-          skuIndex: index
+          skuIndex: index,
+          user_type: null,
       })
   },
+  changeSelectSkuPost: function(e) {
+    let value = e.currentTarget.dataset.value;
+    this.setData({
+        user_type: value,
+    })
+},
   // 关闭弹窗
   hideSku: function () {
     this.setData({
diff --git a/subPackages/postSearch/index.wxml b/subPackages/postSearch/index.wxml
index e6bcff6..88569f7 100644
--- a/subPackages/postSearch/index.wxml
+++ b/subPackages/postSearch/index.wxml
@@ -1,18 +1,18 @@
 <view class="title-box{{transparent==1?' bg-box':''}}" style="height:{{isScene==1?'0':(height+padHeight)}}px;">
   <view class="title-header" style="padding-top:{{padHeight}}px;height:{{height}}px">
     <icon bindtap="back" class="iconfont icon-fanhui1"></icon>
-    <view bindtap="indexFocus" class="search-box" style="margin-right:{{right + 5}}px;">
+    <view class="search-box" style="margin-right:{{right + 5}}px;">
       <icon class="iconfont icon-sousuo"></icon>
       <input placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="searchInput" class="weui-input" placeholder="请输入商品名称" />
       <!-- <input bindfocus="inputFocus" placeholder-class="{{transparent==1?'phcolor':''}}" bindinput="getVal" class="weui-input" placeholder="搜索" /> -->
       <view wx:if="{{isScene!=1}}" style="display: flex;padding-right: 12rpx;">
         <view style="color: #ccc;">|</view>
-        <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;" bindtap="getList">搜索</view>
+        <view style="margin-left:22rpx;font-weight: 400;font-size: 29rpx;color: #0B898E;" bindtap="search">搜索</view>
       </view>
     </view>
   </view>
 </view>
-<view wx:if="{{show}}">
+<view>
     <view class="hot-list" wx:if="{{list.length>0}}">
       <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="this">
         <view class="hot-item" wx:if="{{index%2==number}}" wx:for="{{list}}" bindtap="goodsDetail" data-goods="{{item}}" wx:key="id">
@@ -83,6 +83,25 @@
       <view class="number">{{producNum}}</view>
       <view class="iconfont icon-add-select" bindtap="add"></view>
     </view>
+    <view class="delivery-method" wx:if="{{info.is_package!=1}}">
+        <view class="delivery-title">配送方式</view>
+        <view class="flex" style="display: flex;">
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=1}}" bind:tap="changeSelectSkuPost" data-value="{{0}}">
+                <view class="select-cycle" wx:if="{{user_type!==0}}"></view>
+                <view class="select-cycle selected" wx:else>
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">邮寄</view>
+            </view>
+            <view class="flex-center" wx:if="{{info.sku[skuIndex].use_type!=0}}" bind:tap="changeSelectSkuPost" data-value="{{1}}">
+                <view class="select-cycle" wx:if="{{user_type!==1}}"></view>
+                <view class="select-cycle selected" wx:else="">
+                    <image src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png"></image>
+                </view>
+                <view class="method-str">自提</view>
+            </view>
+        </view>
+    </view>
     <view style="height:138rpx"></view>
     <view class="btn-box">
       <!-- <view class="mask-btn" bindtap="addCart" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'加入购物车':'立即购买'}}
@@ -95,7 +114,7 @@
 <!-- 购物车的弹窗 -->
 <view class="mask" wx:if="{{showPopup}}">
   <view bindtap="openPopup" class="mask-bg"></view>
-  <view class="mask-content" style="padding: 40rpx 0 180rpx;min-height: 600rpx;">
+  <view class="mask-content" style="padding: 40rpx 0 180rpx;height: 900rpx;">
     <view style="margin: 0 26.67rpx;">
       <!-- 顶部操作按钮 -->
       <view class="flex" style="margin-bottom: 56.67rpx;">
@@ -114,7 +133,10 @@
           <image lazy-load wx:if="{{item.selected ==1}}" style="width: 43rpx;height: 43rpx;" src="https://static.ticket.sz-trip.com/uploads/20240715/a961604bc708670cbdc76d1580eb3f3c.png" mode="" />
           <view wx:else style="width: 40rpx;height: 40rpx;border-radius: 50%;border: 1px solid #999999;"></view>
         </view>
-        <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;" src="{{item.sku.headimg}}" mode="" />
+        <view style="position: relative;height: 179rpx;border-radius: 13rpx;flex-shrink: 0;margin-right: 26rpx;">
+            <image lazy-load style="width:179rpx;height: 179rpx;border-radius: 13rpx;" src="{{item.sku.headimg}}" mode="" />
+            <view class="use-type">{{item.delivery_method==1?"自提":"邮寄"}}</view>
+        </view>
         <view class="main">
           <view>
             <view class="title textOver">{{item.product.title}}</view>
@@ -123,9 +145,9 @@
           <view class="main-bottom">
             <view class="price">{{item.sku.price/100}}</view>
             <view class="num-box">
-              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
+              <image lazy-load class="reduce" catchtap="del" data-item="{{item}}" data-value="{{-1}}" src="https://static.ticket.sz-trip.com/uploads/20240715/054627e5d3864a9a4a8b397cae47754e.png" mode="" />
               <view style="margin: 0 25.33rpx;">{{item.num}}</view>
-              <image lazy-load class="grow" catchtap="addCart" data-item="{{item}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
+              <image lazy-load class="grow" catchtap="del" data-item="{{item}}" data-value="{{1}}" src="https://static.ticket.sz-trip.com/uploads/20240715/3ad59eac0088d47ff4bc2fec6ffd8f56.png" mode="" />
             </view>
           </view>
         </view>
diff --git a/subPackages/postSearch/index.wxss b/subPackages/postSearch/index.wxss
index b6f55f5..4786b53 100644
--- a/subPackages/postSearch/index.wxss
+++ b/subPackages/postSearch/index.wxss
@@ -318,7 +318,7 @@
   display: flex;
   font-size: 29rpx;
   color: #333;
-  margin: 0 40rpx;
+  margin: 0 30rpx;
   text-align: center;
   flex-wrap: wrap;
   margin-bottom: 20rpx;
@@ -472,3 +472,57 @@
   font-size: 24rpx;
   font-weight: 500;
 }
+.delivery-method{
+    font-weight: 400;
+    font-size: 29rpx;
+    color: #1E1E1E;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 40rpx 40rpx;
+}
+.delivery-method .select-cycle{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+    border: 1px solid #999999;
+    overflow: hidden;
+    flex-shrink: 0;
+    
+}
+.delivery-method .select-cycle image{
+    width: 100%;
+    height: 100%;
+}
+.delivery-method .select-cycle.selected {
+    border: none;
+}
+.delivery-method .select-cycle.selected image{
+    width: 32rpx;
+    height: 32rpx;
+    border-radius: 50%;
+}
+.delivery-method .method-str{
+    padding-left: 10rpx;
+    flex-shrink: 0;
+}
+.delivery-method .flex-center{
+    width: 150rpx;
+    justify-content: flex-end;
+    display: flex;
+    align-items: center;
+}
+ .use-type{
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    border-radius: 0rpx 0rpx 7rpx 7rpx;
+    height: 33rpx;
+    background: rgba(0,0,0,0.3);
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 33rpx;
+}
\ No newline at end of file

From 7465746e5382799c1e9ffd004383911050a64d06 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 20 Nov 2025 17:11:12 +0800
Subject: [PATCH 453/471] =?UTF-8?q?=E6=99=BA=E8=83=BD=E4=BD=93=E8=AE=B2?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/index/index.wxml                 |  2 +-
 pages/info/sceneProductInfo/index.js   | 82 ++++++++++++++++++++++++++
 pages/info/sceneProductInfo/index.wxml | 11 ++++
 pages/info/sceneProductInfo/index.wxss | 14 +++++
 pages/order/orderList/index.js         | 59 ++++++++++++++++++
 pages/order/orderList/index.wxml       | 45 +++++++++++++-
 pages/order/orderList/index.wxss       | 78 +++++++++++++++++++++++-
 pages/order/scene/index.js             | 51 +++++++++++++++-
 pages/order/scene/index.wxml           | 51 +++++++++++++++-
 pages/order/scene/index.wxss           | 59 ++++++++++++++++++
 pages/user/cartlist/list.js            | 15 ++++-
 pages/user/order/list.js               |  6 +-
 pages/user/order/list.wxml             | 17 +++---
 project.private.config.json            | 25 +++++++-
 15 files changed, 497 insertions(+), 20 deletions(-)

diff --git a/app.js b/app.js
index 7326dea..0ad51d5 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest150? true : false;
+            data.isTest = data.isTest151? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 04f80b0..e557a89 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -74,7 +74,7 @@
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">            
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
-                bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
+                bindchange="changeBannerIndex" data-keyname="ztBannerIndex" circular>
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
                     <!-- 原 圆角77rpx，现改为13rpx -->
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index fe8ccb4..6514471 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -62,6 +62,8 @@ Page({
     skuShowDomId: "",
 
     skuDays: 30,
+
+    advList: [],
   },
 
   /**
@@ -211,6 +213,9 @@ Page({
       }, 1)
       this.BroswerRecord()
     })
+
+    this.getAdv()
+
     // 获取收藏的状态
     if (wx.getStorageSync("jstrip_token")) {
       commonApi.user_post("scene/is_scene_collection", {
@@ -261,6 +266,83 @@ Page({
     
 
   },
+
+  // 获取广告
+  getAdv() {
+    commonApi._post("adv/getAdv", {
+      position: 9,
+      type_id: 3,
+      scenic_id: this.data.id
+    }).then(res => {
+      try {
+        this.setData({advList: res.data || []})
+      } catch (error) {
+        console.log(error);
+      }
+    })
+  },
+
+  bannerClick: function(e) {
+    if (this.data.isTest) return;
+    let item = e.currentTarget.dataset.item;
+    switch (item.jump_type) {
+        case 0:
+            break;
+        case 1:
+            util.gotoDetail(item.product_model)
+            break;
+        case 2:
+            if (item.front_model && item.front_model.mini) {
+                wx.navigateTo({
+                    url: "/" + item.front_model.mini
+                })
+            }
+            break;
+        case 3:
+            // 外部h5
+            console.log(item)
+            app.globalData.weburl = item.tdata.url;
+            wx.navigateTo({
+                url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+                    .url)
+            })
+            
+
+            break;
+        case 4:
+            if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
+                // 如果是苏心游的小程序 直接把authCode带过去
+                userApi.user_post("user/getJumpThirdAppCode", {}).then(res => {
+                    let weburl = item.tdata.page
+                    if (weburl.indexOf('?') != -1) {
+                        weburl += '&authCode=' + res.data;
+                    } else {
+                        weburl += '?authCode=' + res.data
+                    }
+                    wx.navigateToMiniProgram({
+                        appId: item.tdata.appid,
+                        path: weburl
+                    })
+                }).catch(err => {
+                    wx.navigateToMiniProgram({
+                        appId: item.tdata.appid,
+                        path: item.tdata.page
+                    })
+                })
+            } else {
+                wx.navigateToMiniProgram({
+                    appId: item.tdata.appid,
+                    path: item.tdata.page
+                })
+            }
+            break;
+        default:
+            break;
+    }
+    return;
+
+  },
+
   // 获取日期
   changeDate: function (e) {
       // 2025-7-2 合并票日期变更 需要获取sku并重新赋值 
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 530f8ba..4a52486 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -47,6 +47,17 @@
   <view class="status-text{{info.garden_flag==0?' disable':''}}" wx:if="{{info.garden_flag_text && info.garden_flag!=1}}">{{info.garden_flag_text}}</view>
 </view>
 
+<view class="adv-container" wx:if="{{advList.length > 0 && info}}">
+    <swiper class="adv-swiper" indicator-dots="{{false}}" autoplay="{{true}}" circular interval="{{2000}}" duration="{{300}}">
+        <block wx:for="{{advList}}" wx:key="*this" >
+            <swiper-item>
+                <image lazy-load src="{{item.head_img}}" mode="aspectFill" bindtap="bannerClick" data-item="{{item}}"></image>
+            </swiper-item>
+        </block>
+    </swiper>
+</view>
+
+
 <view class="tab-info-container" wx:if="{{info}}">
     <view class="tab-item {{showTabIndex==0?'active':''}}" bind:tap="changeTabIndex" data-value="0">预订</view>
     <view class="tab-item {{showTabIndex==2?'active':''}}" bind:tap="changeTabIndex" data-value="2">详情/政策</view>
diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss
index d02a1b6..44aad27 100644
--- a/pages/info/sceneProductInfo/index.wxss
+++ b/pages/info/sceneProductInfo/index.wxss
@@ -1068,4 +1068,18 @@ line-height: 93rpx;
 .mask-scroll-content{
     flex: 1;
     height: 100rpx;
+}
+
+.adv-container{
+    padding-top: 20rpx;
+    width: 100%;
+}
+.adv-container image{
+    width: 672rpx;
+    height: 166.67rpx;
+    margin: 0 auto;
+    display: block;
+}
+.adv-swiper{
+    height: 166.67rpx;
 }
\ No newline at end of file
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 72a50a2..17844ef 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -30,6 +30,10 @@ Page({
   finalPrice: 0,
 
   showCoupon: true,
+
+  explainDataList: [],
+  showContent: null,
+
   },
 
   /**
@@ -80,6 +84,8 @@ Page({
     if (!this.data.kjId && !this.data.gp_id) {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
+
+    this.getExplain()
   },
 
   handlePostData () {
@@ -93,6 +99,15 @@ Page({
 
   order: function (){
     console.log(app.globalData.createDate);
+    let explainData = (this.data.explainDataList || []).filter(x=>x.selectExplain).map(x=>{
+        return {
+            product_id: x.product.id,
+            product_num: 1,
+            sku_id: x.sku.id,
+            type: x.product.type,
+        }
+    })
+    app.globalData.createDate.product_list = app.globalData.createDate.product_list.concat(explainData)
 
     app.globalData.createDate.coupon_id= this.data.coupon ? this.data.coupon.id : null;
 	  let service = "order/create", postData = {data: JSON.stringify(app.globalData.createDate)}
@@ -147,6 +162,50 @@ Page({
        })
      },
 
+    // 讲解
+    getExplain () {
+        if (this.data.ticketList.length>0) {
+            let explainArr = []
+            let productId = this.data.ticketList.map(x=>x.product.id)
+            Promise.all(
+                productId.map(x=>commonApi._post("product/get_product_compose_list", {
+                    product_id: x
+                }))
+            ).then(res=>{
+                if (res) {
+                    res.forEach(x=>{
+                        if (x.data && x.data[0] && !explainArr.find(v=>v.sku.id == x.data[0].sku.id)) {
+                            explainArr.push(x.data[0])
+                        }
+                    })
+                    this.setData({
+                        explainDataList: explainArr
+                    })
+                }
+                console.log(res)
+            })
+        }
+    },
+
+    changeSeletExplain (e) {
+        let val = e.currentTarget.dataset.val;
+        let index = e.currentTarget.dataset.index;
+
+        let explainDataList =  this.data.explainDataList
+        let explainData = this.data.explainDataList[index]
+        explainData.selectExplain = val
+
+        this.setData({
+            explainDataList: explainDataList
+        })
+    },
+
+    changeContent (e) {
+        let val = e.currentTarget.dataset.val;
+        this.setData({
+          showContent: val
+        })
+    },
 
 
   /**
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index ca4d072..c999734 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -84,6 +84,28 @@
   </view> -->
 <coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{showCoupon && !kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
+
+<view class="explain-box" wx:if="{{explainDataList.length>0}}">
+    <view class="explain-title">景点讲解服务</view>
+    <view class="explain-prod" wx:for="{{explainDataList}}" wx:key="index">
+        <image class="explain-img" src="{{item.product.headimg}}"></image>
+        <view class="explain-content">
+            <view class="explain-goods textOver2">{{item.product.title}}</view>
+            <view class="explain-sku textOver2">{{item.sku.sku_name}}</view>
+            <view class="explain-price">0</view>
+        </view>
+        <view class="explain-sku" style="font-size: 28rpx;" bind:tap="changeContent" data-val="{{item}}"
+            style="align-self: flex-start;flex-shrink: 0;padding: 0 20rpx 0 0;">
+            详情 >
+        </view>
+        <view style="align-self: flex-start;">
+            <view class="iconfont icon-quan" wx:if="{{!item.selectExplain}}" bind:tap="changeSeletExplain" data-val="{{true}}" data-index="{{index}}"></view>
+            <view class="iconfont icon-gou1" wx:else bind:tap="changeSeletExplain" data-val="{{false}}" data-index="{{index}}"></view>
+        </view>
+    </view>
+  </view>
+
+
 <view class="fixed-bottom">
     <view class="fixed-price-box">
         
@@ -98,4 +120,25 @@
 
     </view>
     <view class="fixed-btn" bindtap="order">下一步</view>
-</view>
\ No newline at end of file
+</view>
+
+<view class="mask" wx:if="{{showContent}}">
+    <view class="mask-bg" bind:tap="changeContent" data-val="{{null}}"></view>
+    <view class="mask-content2" >
+        <view class="iconfont icon-close" bind:tap="changeContent" data-val="{{null}}"></view>
+        <view style="text-align: center;padding: 20rpx 0;">产品详情</view>
+        <view style="max-height: 65vh;overflow-y: auto;">
+            <view style="width: 100%;padding:20rpx 20rpx 0;box-sizing: border-box;">
+                <image style="width: 100%;border-radius: 20rpx;height: 200rpx;" mode="widthFix" src="{{showContent.product.headimg}}"></image>
+                <view style="font-weight: bold;padding:20rpx 0">{{showContent.product.title}}</view>
+            </view>
+            <view style="height: 10rpx;background:#f2f2f2"></view>
+            <view style="padding:20rpx">
+                <view style="font-weight: bold;padding:0 0 20rpx">产品详情</view>
+                <rich-text class="detail" nodes="{{tool.formateRichText(showContent.product.content)}}"></rich-text>
+            </view>
+            <view style="height: 50rpx;"></view>
+        </view>
+
+    </view>
+  </view>
\ No newline at end of file
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index c9d8534..2d2b10d 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -97,4 +97,80 @@ color: #666666;
 .item-box.item-title .price{
     color: #D62828;
     font-weight: bold;
-}
\ No newline at end of file
+}
+
+.explain-box{
+    width: 699rpx;
+    background: #FFFFFF;
+    border-radius: 9rpx;
+    margin: 0 auto;
+    padding: 26rpx 22rpx;
+    box-sizing: border-box;
+}
+.explain-box .explain-title{
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #000000;
+    /* margin-bottom: 26rpx; */
+}
+.explain-box .explain-prod{
+    display: flex;
+    width: 100%;
+    align-items: center;
+    margin-top: 25rpx;
+}
+.explain-box .explain-img{
+    width: 135.33rpx;
+    height: 112rpx;
+    flex-shrink: 0;
+}
+.explain-box .explain-content{
+    flex: 1;
+    width: 1rpx;
+    padding: 0 36rpx;
+    box-sizing: border-box;
+    line-height: 1;
+}
+.explain-box .explain-goods{
+    font-weight: 500;
+font-size: 31rpx;
+color: #000000;
+}
+.explain-box .explain-sku{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #999999;
+    padding: 20rpx 0;
+}
+.explain-box .explain-price{
+    font-weight: 500;
+    font-size: 33.33rpx;
+    color: #E30000;
+}
+.explain-box .explain-price::before{
+    content: "￥";
+    font-size: 24rpx;
+}
+.icon-quan{
+    font-size: 33rpx;
+}
+.icon-gou1{
+    color: #D62828;
+    font-size: 33rpx;
+}
+
+.mask-content2 {
+    position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      width: 100%;
+      background: white;
+      border-radius: 12rpx;
+      min-height: 1100rpx;
+  }
+  .icon-close {
+    position: absolute;
+    top: 30rpx;
+    right: 30rpx;
+  }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6d9a940..f302080 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -48,6 +48,10 @@ Page({
     couponFlag:false,
 
     skuDays: 30,
+
+    selectExplain: false,
+    explainData: null,
+    showContent: false,
   },
 
   /**
@@ -115,7 +119,13 @@ Page({
       // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
     console.log(this.data.singlePrice);
-    this.getNewCoupon()
+
+    this.getExplain()
+
+    try {
+        this.getNewCoupon()
+    } catch (e) {}
+   
     // this.showAllPrice()
   //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
@@ -513,6 +523,17 @@ Page({
       team_id: app.globalData.team_id,
       linkmanList:this.data.is_authentication == 1?this.data.linkmanList:[]
     }
+    if (this.data.selectExplain && this.data.explainData) {
+        let explainData = this.data.explainData
+        let explain_prod = {
+            type: explainData.product.type,
+            product_id: explainData.product.id,
+            sku_id: explainData.sku.id,
+            product_num: 1,
+        }
+        data.product_list.push(explain_prod)
+    }
+
     if (app.globalData.from) {
       data.system_name = app.globalData.from;
     }
@@ -835,6 +856,34 @@ Page({
    this.showAllPrice()
   },
 
+  // 讲解
+  getExplain () {
+      console.log(this.data.product)
+    commonApi._post("product/get_product_compose_list", {
+        product_id: this.data.product.product.id
+    }).then(res => {
+        if (res.data && res.data.length>0) {
+            this.setData({
+                explainData: res.data[0]
+            })
+        }
+    })
+  },
+
+  changeSeletExplain (e) {
+    let val = e.currentTarget.dataset.val;
+    this.setData({
+        selectExplain: val
+    })
+  },
+
+  changeContent (e) {
+      let val = e.currentTarget.dataset.val;
+      this.setData({
+        showContent: val
+      })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 32de400..e054729 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -1,4 +1,5 @@
 <!--pages/order/scene/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
 <view  class="{{product && product.isGroup==1?'group-order':''}}">
   <title title="订单填写"></title>
   <!-- <view class="product-info" wx:if="{{product}}">
@@ -80,7 +81,33 @@
     </view>
   </view> -->
 
-  <view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view>
+  <!-- 景点讲解 -->
+  <view class="explain-box" wx:if="{{explainData && explainData.id}}">
+    <view class="explain-title">景点讲解服务</view>
+    <view class="explain-prod">
+        <image class="explain-img" src="{{explainData.product.headimg}}"></image>
+        <view class="explain-content">
+            <view class="explain-goods textOver2">{{explainData.product.title}}</view>
+            <view class="explain-sku textOver2">{{explainData.sku.sku_name}}</view>
+            <view class="explain-price">0</view>
+        </view>
+        <view class="explain-sku" style="font-size: 28rpx;" bind:tap="changeContent" data-val="{{true}}"
+            style="align-self: flex-start;flex-shrink: 0;padding: 0 20rpx 0 0;">
+            详情 >
+        </view>
+        <view style="align-self: flex-start;flex-shrink: 0;">
+            <view class="iconfont icon-quan" wx:if="{{!selectExplain}}" bind:tap="changeSeletExplain" data-val="{{true}}"></view>
+            <view class="iconfont icon-gou1" wx:else bind:tap="changeSeletExplain" data-val="{{false}}"></view>
+        </view>
+    </view>
+  </view>
+
+
+
+  <!-- <view style="{{type=='museum' || type=='activity'?'height:138rpx':'height:113rpx'}}"></view> -->
+  <view style="height:138rpx"></view>
+
+
   <view class="fixed-bottom" wx:if="{{type!='museum' && type!='activity'}}">
     <view class="fixed-price-box" wx:if="{{kjId || prizeId}}"><text>合计：</text><text class="price">¥0</text></view>
     <!-- <view class="fixed-price-box" wx:elif="{{prizeId}}"><text>合计：</text><text class="price">¥0</text></view> -->
@@ -150,4 +177,26 @@
       </view>
     </view>
   </view>
+
+
+  <view class="mask" wx:if="{{showContent && explainData}}">
+    <view class="mask-bg" bind:tap="changeContent" data-val="{{false}}"></view>
+    <view class="mask-content2" style="min-height: 1100rpx;">
+        <view class="iconfont icon-close" bind:tap="changeContent" data-val="{{false}}"></view>
+        <view style="text-align: center;padding: 20rpx 0;">产品详情</view>
+        <view style="max-height: 65vh;overflow-y: auto;">
+            <view style="width: 100%;padding:20rpx 20rpx 0;box-sizing: border-box;">
+                <image style="width: 100%;border-radius: 20rpx;height: 200rpx;" mode="widthFix" src="{{explainData.product.headimg}}"></image>
+                <view style="font-weight: bold;padding:20rpx 0">{{explainData.product.title}}</view>
+            </view>
+            <view style="height: 10rpx;background:#f2f2f2"></view>
+            <view style="padding:20rpx">
+                <view style="font-weight: bold;padding:0 0 20rpx">产品详情</view>
+                <rich-text class="detail" nodes="{{tool.formateRichText(explainData.product.content)}}"></rich-text>
+            </view>
+            <view style="height: 50rpx;"></view>
+        </view>
+
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index c3e18f0..36c3e24 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -450,4 +450,63 @@ page {
 .s-price::before {
   content: "￥";
   font-size: 24rpx;
+}
+
+.explain-box{
+    width: 699rpx;
+    background: #FFFFFF;
+    border-radius: 9rpx;
+    margin: 0 auto;
+    padding: 26rpx 22rpx;
+    box-sizing: border-box;
+}
+.explain-box .explain-title{
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #000000;
+    margin-bottom: 26rpx;
+}
+.explain-box .explain-prod{
+    display: flex;
+    width: 100%;
+    align-items: center;
+}
+.explain-box .explain-img{
+    width: 135.33rpx;
+    height: 112rpx;
+    flex-shrink: 0;
+}
+.explain-box .explain-content{
+    flex: 1;
+    width: 1rpx;
+    padding: 0 36rpx;
+    box-sizing: border-box;
+    line-height: 1;
+}
+.explain-box .explain-goods{
+    font-weight: 500;
+font-size: 31rpx;
+color: #000000;
+}
+.explain-box .explain-sku{
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #999999;
+    padding: 20rpx 0;
+}
+.explain-box .explain-price{
+    font-weight: 500;
+    font-size: 33.33rpx;
+    color: #E30000;
+}
+.explain-box .explain-price::before{
+    content: "￥";
+    font-size: 24rpx;
+}
+.icon-quan{
+    font-size: 33rpx;
+}
+.icon-gou1{
+    color: #D62828;
+    font-size: 33rpx;
 }
\ No newline at end of file
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 5ad5dec..7d21426 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -275,9 +275,18 @@ Page({
                         url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
                     })
                 } else {
-                    wx.navigateTo({
-                        url: '/subPackages/gwcOrder/index?isCar=' + this.data.isCar,
-                    })
+                    if (this.data.isCar == "single") {
+                        console.log("123")
+                        wx.navigateTo({
+                            url: '/pages/order/scene/index',
+                        })
+                    } else {
+                        wx.navigateTo({
+                            url: '/subPackages/gwcOrder/index?isCar=' + this.data.isCar,
+                        })
+                    }
+
+                    
                 }
             }
         })
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index 978a08f..573bb1c 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -94,7 +94,10 @@ Page({
       res.data.list.map((item,index)=>{
         let orderNum = 0;
         item.order_product_list.map(order=>{
-          orderNum = orderNum + order.product_num;
+          if (!order.is_bind_agent) {
+            orderNum = orderNum + order.product_num;
+          }
+          
           ///
           // 景点线路场馆酒店四类产品的订单 如果是已支付未出票的显示出票中
           if(order.state=='PAID' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){
@@ -118,7 +121,6 @@ Page({
         if (item.is_order_card_product==1) {
             item.order_product_list = [item.order_product_list[0]]
         }
-
         item.orderNum = orderNum;
       })
       console.log(ajaxes)
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 7d50a4d..3c7cf0b 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -18,18 +18,21 @@
   </view>
 </view>
 <view style="height:176rpx"></view>
-<view class="order-item" bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}">
+<view class="order-item" bindtap="gotoDetail" data-item="{{item}}" wx:for="{{list}}" >
   <view class="order-top">
     <text>订单号：{{item.order_id}}</text>
     <text class="status">{{item.orderStateText?item.orderStateText:orderState[item.state]}}</text>
   </view>
-  <view data-item="{{item}}" class="order-info" wx:for="{{item.order_product_list}}">
-    <image lazy-load src="{{item.product_model=='movie'?item.product_img:item.sku_headimg}}" mode="aspectFill"></image>
-    <view class="sku-title textOver2">{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}</view>
-    <view class="sku-tips">
-      <view class="sku-price">￥{{item.product_price/100}}</view>
-      <view class="sku-number">x{{item.product_num}}</view>
+  <view data-item="{{order}}"  wx:for="{{item.order_product_list}}" wx:for-item="order">
+    <view class="order-info" wx:if="{{!order.is_bind_agent}}">
+        <image lazy-load src="{{order.product_model=='movie'?order.product_img:order.sku_headimg}}" mode="aspectFill"></image>
+        <view class="sku-title textOver2">{{order.product_model=='movie'?order.product_title:(order.product_title+order.sku_name)}}</view>
+            <view class="sku-tips">
+            <view class="sku-price">￥{{order.product_price/100}}</view>
+            <view class="sku-number">x{{order.product_num}}</view>
+        </view>
     </view>
+    
   </view>
   <view style="text-align:right;font-size:28rpx;margin-right:30rpx;color:#333">
     <text>共{{item.orderNum}}件商品</text>
diff --git a/project.private.config.json b/project.private.config.json
index d731040..b7b65f7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,12 +6,33 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https://test.m.cloud.sz-trip.com/selectedHotels",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "pages/group/index",
+          "pathName": "pages/group/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/info/sceneProductInfo/index",
+          "pathName": "pages/info/sceneProductInfo/index",
+          "query": "id=5257",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/postSearch/index",
           "pathName": "subPackages/postSearch/index",
           "query": "type_id=1&ids=",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/info/postProductInfo/index",

From 5f863f88f4356b055913624bb024178acaf9543a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 21 Nov 2025 11:40:47 +0800
Subject: [PATCH 454/471] fix

---
 app.js                                           | 2 +-
 pages/index/index.wxml                           | 2 +-
 pages/order/orderList/index.wxml                 | 1 +
 pages/order/scene/index.js                       | 4 ++--
 pages/order/scene/index.wxml                     | 2 +-
 pages/user/cartlist/list.js                      | 2 +-
 pages/user/order/list.wxml                       | 4 ++--
 pages/user/order/list.wxss                       | 2 +-
 subPackageCheckPoint/app.js                      | 2 +-
 subPackageCheckPoint/pages/detailsmap/index.wxml | 8 +++++++-
 subPackageCheckPoint/pages/detailsmap/index.wxss | 8 +++++++-
 subPackageCheckPoint/pages/index/index.js        | 2 +-
 12 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index 0ad51d5..7ecc533 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest151? true : false;
+            data.isTest = data.isTest152? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e557a89..8feeb80 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -184,7 +184,7 @@
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
-                bindchange="changeBannerIndex" data-keyname="smBannerIndex">
+                bindchange="changeBannerIndex" data-keyname="smBannerIndex" circular>
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
                     <!-- 原 圆角77rpx，现改为13rpx -->
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index c999734..11b92c8 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,3 +1,4 @@
+<wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="订单列表"></title>
 <!-- 邮寄 -->
 <view class="box" wx:if="{{postList.length != 0}}">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index f302080..c9b069c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -67,7 +67,7 @@ Page({
       flag:options.flag,
       date:null,
 	  ticket_type:app.globalData.product.sku.ticket_type || 1,
-      isCar:options.isCar,
+      isCar:options.isCar || 'single',
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
       is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
@@ -75,7 +75,7 @@ Page({
       time: app.globalData.product.time || {},
       showYhq:app.globalData.listName?false:true
     })
-    console.log('-------',this.data.product,this.data.time);
+    console.log('-------',this.data.product,this.data.time, app.globalData);
     // debugger
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index e054729..e0d01d4 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -71,7 +71,7 @@
     </view>
   </view>
 
-  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum' && showYhq}}" id="coupon"
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}" couponFlag="{{couponFlag}}"></coupon>
 
   <!-- <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 7d21426..85281cd 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -278,7 +278,7 @@ Page({
                     if (this.data.isCar == "single") {
                         console.log("123")
                         wx.navigateTo({
-                            url: '/pages/order/scene/index',
+                            url: '/pages/order/scene/index?isCar=' + this.data.isCar,
                         })
                     } else {
                         wx.navigateTo({
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 3c7cf0b..63433d9 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -28,8 +28,8 @@
         <image lazy-load src="{{order.product_model=='movie'?order.product_img:order.sku_headimg}}" mode="aspectFill"></image>
         <view class="sku-title textOver2">{{order.product_model=='movie'?order.product_title:(order.product_title+order.sku_name)}}</view>
             <view class="sku-tips">
-            <view class="sku-price">￥{{order.product_price/100}}</view>
-            <view class="sku-number">x{{order.product_num}}</view>
+            <view class="sku-price">￥{{order.paid_money/100}}</view>
+            <view class="sku-number">共{{order.product_num}}件</view>
         </view>
     </view>
     
diff --git a/pages/user/order/list.wxss b/pages/user/order/list.wxss
index 2d1b215..7c2fd89 100644
--- a/pages/user/order/list.wxss
+++ b/pages/user/order/list.wxss
@@ -84,7 +84,7 @@ page {
   line-height: 40rpx;
 }
 .sku-tips .sku-price {
-  margin-bottom: 10rpx;
+  /* margin-bottom: 10rpx; */
 }
 .total {
   text-align: right;
diff --git a/subPackageCheckPoint/app.js b/subPackageCheckPoint/app.js
index 8133c65..3031fe6 100644
--- a/subPackageCheckPoint/app.js
+++ b/subPackageCheckPoint/app.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("./common/vendor.js");Math;const o={globalData:{baseUrl:null,innerAudioContext:t.index.createInnerAudioContext(),T:""},onLaunch:function(){this.globalData.baseUrl="https://jdsz.ispush.com",this.globalData.innerAudioContext.src=`${this.globalData.baseUrl}/static/audio/bg.mp3`,this.globalData.innerAudioContext.obeyMuteSwitch=!1,this.globalData.innerAudioContext.autoplay=!1,this.globalData.innerAudioContext.loop=!0,console.log("App Launch")},onShow:function(){console.log("App Show")},onHide:function(){console.log("App Hide")},onShareAppMessage:t=>({title:"君到苏州最美打卡点",path:"pages/index/index"}),onShareTimeline:()=>({title:"君到苏州最美打卡点",path:"pages/index/index"})};function e(){return{app:t.createSSRApp(o)}}e().app.mount("#app"),exports.createApp=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("./common/vendor.js");Math;const o={globalData:{baseUrl:null,innerAudioContext:t.index.createInnerAudioContext(),T:""},onLaunch:function(){this.globalData.baseUrl="https://jdsz.ispush.com",this.globalData.innerAudioContext.src=`${this.globalData.baseUrl}/static/audio/bg.mp3`,this.globalData.innerAudioContext.obeyMuteSwitch=!1,this.globalData.innerAudioContext.autoplay=!1,this.globalData.innerAudioContext.loop=!0,console.log("App Launch")},onShow:function(){console.log("App Show")},onHide:function(){console.log("App Hide")},onShareAppMessage:t=>({title:"君到苏州最美打卡点",path:"subPackageCheckPoint/pages/index/index"}),onShareTimeline:()=>({title:"君到苏州最美打卡点",path:"subPackageCheckPoint/pages/index/index"})};function e(){return{app:t.createSSRApp(o)}}e().app.mount("#app"),exports.createApp=e;
diff --git a/subPackageCheckPoint/pages/detailsmap/index.wxml b/subPackageCheckPoint/pages/detailsmap/index.wxml
index f8c29b6..0a3b35a 100644
--- a/subPackageCheckPoint/pages/detailsmap/index.wxml
+++ b/subPackageCheckPoint/pages/detailsmap/index.wxml
@@ -1 +1,7 @@
-<audio-com wx:if="{{a}}" class="r data-v-5f2d6979" u-r="audioCom" u-i="5f2d6979-0" bind:__l="__l"></audio-com><view class="content data-v-5f2d6979" style="{{'background:' + w}}"><view class="bgBox data-v-5f2d6979"><view class="bgItem bgGusuItem data-v-5f2d6979" style="{{'width:' + d + ';' + ('height:' + e)}}"><image lazy-load class="data-v-5f2d6979" src="{{c}}"/></view></view><movable-area class="movableArea data-v-5f2d6979" style="width:100vw;height:100vh"><movable-view class="data-v-5f2d6979" style="{{'width:' + h + ';' + ('height:' + i)}}" disabled="{{j}}" animation="{{false}}" scale-value="{{k}}" scale-min="{{l}}" x="{{m}}" y="{{n}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{o}}" bindscale="{{p}}"><view class="detailsMap data-v-5f2d6979"><image lazy-load class="data-v-5f2d6979" src="{{f}}"/></view><view wx:for="{{g}}" wx:for-item="item" wx:key="a" class="detailsMapPoint data-v-5f2d6979" style="{{'width:' + item.b + ';' + ('height:' + item.c) + ';' + ('left:' + item.d) + ';' + ('top:' + item.e) + ';' + ('z-index:' + item.f)}}" bindtap="{{item.g}}" data-name="{{item.h}}"></view><view class="stickyMask data-v-5f2d6979"></view></movable-view></movable-area><view class="stickyMask data-v-5f2d6979"><view class="stickyItem data-v-5f2d6979"><view class="stickyTitle data-v-5f2d6979" style="{{'width:' + r + ';' + ('height:' + s) + ';' + ('left:' + t) + ';' + ('top:' + v)}}"><image lazy-load class="data-v-5f2d6979" src="{{q}}"/></view></view></view></view>
\ No newline at end of file
+<audio-com wx:if="{{a}}" class="r data-v-5f2d6979" u-r="audioCom" u-i="5f2d6979-0" bind:__l="__l"></audio-com>
+<view class="content data-v-5f2d6979" style="{{'background:' + w}}">
+<view class="bgBox data-v-5f2d6979">
+<view class="bgItem bgGusuItem data-v-5f2d6979" style="{{'width:' + d + ';' + ('height:' + e)}}">
+<image lazy-load class="data-v-5f2d6979" src="{{c}}"/></view></view>
+<movable-area class="movableArea data-v-5f2d6979" style="width:100vw;height:100vh;overflow: hidden;">
+<movable-view class="data-v-5f2d6979" style="{{'width:' + h + ';' + ('height:' + i)}}" disabled="{{true}}" animation="{{false}}" scale-value="{{k}}" scale-min="{{l}}" x="{{m}}" y="{{n}}" scale="true" direction="all" out-of-bounds="true" bindchange="{{o}}" bindscale="{{p}}"><view class="detailsMap data-v-5f2d6979"><image lazy-load class="data-v-5f2d6979" src="{{f}}"/></view><view wx:for="{{g}}" wx:for-item="item" wx:key="a" class="detailsMapPoint data-v-5f2d6979" style="{{'width:' + item.b + ';' + ('height:' + item.c) + ';' + ('left:' + item.d) + ';' + ('top:' + item.e) + ';' + ('z-index:' + item.f)}}" bindtap="{{item.g}}" data-name="{{item.h}}"></view><view class="stickyMask data-v-5f2d6979"></view></movable-view></movable-area><view class="stickyMask data-v-5f2d6979"><view class="stickyItem data-v-5f2d6979"><view class="stickyTitle data-v-5f2d6979" style="{{'width:' + r + ';' + ('height:' + s) + ';' + ('left:' + t) + ';' + ('top:' + v)}}"><image lazy-load class="data-v-5f2d6979" src="{{q}}"/></view></view></view></view>
\ No newline at end of file
diff --git a/subPackageCheckPoint/pages/detailsmap/index.wxss b/subPackageCheckPoint/pages/detailsmap/index.wxss
index 3fbae8c..8da2eab 100644
--- a/subPackageCheckPoint/pages/detailsmap/index.wxss
+++ b/subPackageCheckPoint/pages/detailsmap/index.wxss
@@ -1,2 +1,8 @@
 @import "../../app.wxss";
-.content.data-v-5f2d6979{background:#eeeeed}.detailsMap.data-v-5f2d6979{width:100%;height:100%}.detailsMap>image.data-v-5f2d6979{width:100%;height:100%}.detailsMapPoint.data-v-5f2d6979{position:absolute}.detailsMapPoint>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask.data-v-5f2d6979{position:absolute;pointer-events:none;width:750rpx;height:1334rpx;z-index:999;top:0}.stickyMask .stickyItem.data-v-5f2d6979{position:absolute;left:0;top:0;width:750rpx;height:1334rpx}.stickyMask .stickyItem .stickyTitle.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*1188rpx);height:calc(var(--base-width)*378rpx);left:calc(var(--base-width)*708rpx);top:calc(var(--base-width)*200rpx);transform:translate(150%);opacity:0;animation:1s stickyTitleAnime-5f2d6979 ease-in-out forwards}.stickyMask .stickyItem .stickyTitle>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask .stickyItem .stickyGusuLeft.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*1067rpx);height:calc(var(--base-width)*759rpx);left:calc(var(--base-width)*0rpx);top:calc(var(--base-width)*2388rpx);transform:translate(-150%);opacity:0;animation:1s stickyGusuLeftAnime-5f2d6979 ease-in-out forwards}.stickyMask .stickyItem .stickyGusuLeft>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask .stickyItem .stickyGusuRight.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*601rpx);height:calc(var(--base-width)*258rpx);right:0;top:calc(var(--base-width)*3260rpx);transform:translate(150%);opacity:0;animation:1s ease-in-out stickyGusuRightAnime-5f2d6979 forwards}.stickyMask .stickyItem .stickyGusuRight>image.data-v-5f2d6979{width:100%;height:100%}.bgBox.data-v-5f2d6979{position:absolute;width:calc(var(--base-width) * 2160rpx);height:calc(var(--base-width) * 3840rpx);top:0}.bgBox .bgItem.data-v-5f2d6979{width:100%;height:100%;top:0}.bgBox .bgItem>image.data-v-5f2d6979{width:100%;height:100%}@keyframes stickyTitleAnime-5f2d6979{0%{transform:translate(150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes stickyGusuLeftAnime-5f2d6979{0%{transform:translate(-150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes stickyGusuRightAnime-5f2d6979{0%{transform:translate(150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes bgGusuItemAnime-5f2d6979{0%{transform:scale(.8);opacity:0}to{transform:scale(1);opacity:1}}
+.content.data-v-5f2d6979{background:#eeeeed;overflow: hidden;}
+.detailsMap.data-v-5f2d6979{width:100%;height:100%;overflow: hidden;}
+.detailsMap>image.data-v-5f2d6979{width:100%;height:100%}
+.detailsMapPoint.data-v-5f2d6979{position:absolute}
+.detailsMapPoint>image.data-v-5f2d6979{width:100%;height:100%}
+.stickyMask.data-v-5f2d6979{position:absolute;pointer-events:none;width:750rpx;height:1334rpx;z-index:999;top:0}
+.stickyMask .stickyItem.data-v-5f2d6979{position:absolute;left:0;top:0;width:750rpx;height:1334rpx}.stickyMask .stickyItem .stickyTitle.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*1188rpx);height:calc(var(--base-width)*378rpx);left:calc(var(--base-width)*708rpx);top:calc(var(--base-width)*200rpx);transform:translate(150%);opacity:0;animation:1s stickyTitleAnime-5f2d6979 ease-in-out forwards}.stickyMask .stickyItem .stickyTitle>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask .stickyItem .stickyGusuLeft.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*1067rpx);height:calc(var(--base-width)*759rpx);left:calc(var(--base-width)*0rpx);top:calc(var(--base-width)*2388rpx);transform:translate(-150%);opacity:0;animation:1s stickyGusuLeftAnime-5f2d6979 ease-in-out forwards}.stickyMask .stickyItem .stickyGusuLeft>image.data-v-5f2d6979{width:100%;height:100%}.stickyMask .stickyItem .stickyGusuRight.data-v-5f2d6979{position:absolute;width:calc(var(--base-width)*601rpx);height:calc(var(--base-width)*258rpx);right:0;top:calc(var(--base-width)*3260rpx);transform:translate(150%);opacity:0;animation:1s ease-in-out stickyGusuRightAnime-5f2d6979 forwards}.stickyMask .stickyItem .stickyGusuRight>image.data-v-5f2d6979{width:100%;height:100%}.bgBox.data-v-5f2d6979{position:absolute;width:calc(var(--base-width) * 2160rpx);height:calc(var(--base-width) * 3840rpx);top:0}.bgBox .bgItem.data-v-5f2d6979{width:100%;height:100%;top:0}.bgBox .bgItem>image.data-v-5f2d6979{width:100%;height:100%}@keyframes stickyTitleAnime-5f2d6979{0%{transform:translate(150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes stickyGusuLeftAnime-5f2d6979{0%{transform:translate(-150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes stickyGusuRightAnime-5f2d6979{0%{transform:translate(150%);opacity:0}to{transform:translate(0);opacity:1}}@keyframes bgGusuItemAnime-5f2d6979{0%{transform:scale(.8);opacity:0}to{transform:scale(1);opacity:1}}
diff --git a/subPackageCheckPoint/pages/index/index.js b/subPackageCheckPoint/pages/index/index.js
index 46a57d2..6fced32 100644
--- a/subPackageCheckPoint/pages/index/index.js
+++ b/subPackageCheckPoint/pages/index/index.js
@@ -1,2 +1,2 @@
 require('../../app.js');
-"use strict";const e=require("../../common/vendor.js"),t=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,homeShowState:!0,scopeMapShowState:!1,x:0,y:0,old:{x:0,y:0},scopePointList:[{w:"76rpx",h:"55rpx",x:"270rpx",y:"715rpx",tag:"姑苏区",source:"/subPackageCheckPoint/static/images/scopeMap/gusuqu.png",state:!0},{w:"76rpx",h:"54rpx",x:"177rpx",y:"667rpx",tag:"高新区",source:"/subPackageCheckPoint/static/images/scopeMap/gaoxinqu.png",state:!0},{w:"73rpx",h:"60rpx",x:"520rpx",y:"710rpx",tag:"昆山市",source:"/subPackageCheckPoint/static/images/scopeMap/kunshanshi.png",state:!0},{w:"76rpx",h:"58rpx",x:"616rpx",y:"510rpx",tag:"太仓市",source:"/subPackageCheckPoint/static/images/scopeMap/taicangshi.png",state:!0},{w:"100rpx",h:"56rpx",x:"360rpx",y:"706rpx",tag:"工业园区",source:"/subPackageCheckPoint/static/images/scopeMap/gongyeyuanqu.png",state:!0},{w:"75rpx",h:"58rpx",x:"390rpx",y:"464rpx",tag:"常熟市",source:"/subPackageCheckPoint/static/images/scopeMap/changshushi.png",state:!0},{w:"76rpx",h:"55rpx",x:"343rpx",y:"940rpx",tag:"吴江区",source:"/subPackageCheckPoint/static/images/scopeMap/wujiangqu.png",state:!0},{w:"75rpx",h:"54rpx",x:"220rpx",y:"810rpx",tag:"吴中区",source:"/subPackageCheckPoint/static/images/scopeMap/wuzhongqu.png",state:!0},{w:"76rpx",h:"56rpx",x:"278rpx",y:"613rpx",tag:"相城区",source:"/subPackageCheckPoint/static/images/scopeMap/xiangchengqu.png",state:!0},{w:"101rpx",h:"49rpx",x:"236rpx",y:"284rpx",tag:"张家港市",source:"/subPackageCheckPoint/static/images/scopeMap/zhangjiagangshi.png",state:!0}]}),async onLoad(){},onShareAppMessage:e=>({title:"君到苏州最美打卡点",path:"pages/index/index"}),onShareTimeline:()=>({title:"君到苏州最美打卡点",path:"pages/index/index"}),onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{openMap(){e.index.navigateTo({url:"/subPackageCheckPoint/pages/scopemap/index"})},getClass:e=>`scopePoint${e+1}`,showScopeMap(){this.homeShowState=!1,this.scopeMapShowState=!0},getScopePointStyle:e=>({width:e.w,height:e.h,left:e.x,top:e.y}),openDetailsMap(t){t.state?e.index.navigateTo({url:`/subPackageCheckPoint/pages/detailsmap/index?tag=${t.tag}`}):e.index.showToast({title:"暂未开放",icon:"error",duration:2e3})},onChange(e){this.old.x=e.detail.x,this.old.y=e.detail.y}}};if(!Array){e.resolveComponent("audio-com")()}const a=e._export_sfc(o,[["render",function(o,a,p,s,i,r){return e.e({a:i.comDom},i.comDom?{b:e.sr("audioCom","46c0ccd2-0")}:{},{c:t._imports_0,d:t._imports_1,e:i.homeShowState,f:e.o(((...e)=>r.showScopeMap&&r.showScopeMap(...e))),g:t._imports_2,h:t._imports_3,i:i.scopeMapShowState,j:t._imports_4,k:e.f(i.scopePointList,((t,o,a)=>({a:t.source,b:e.n(r.getClass(o)),c:o,d:e.s(r.getScopePointStyle(t)),e:t.tag,f:e.o((e=>r.openDetailsMap(t)),o)}))),l:"750rpx",m:"1334rpx",n:i.x,o:i.y,p:e.o(((...e)=>r.onChange&&r.onChange(...e))),q:i.scopeMapShowState,r:t._imports_5,s:i.scopeMapShowState,t:t._imports_6,v:i.scopeMapShowState})}],["__scopeId","data-v-46c0ccd2"]]);o.__runtimeHooks=6,wx.createPage(a);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,homeShowState:!0,scopeMapShowState:!1,x:0,y:0,old:{x:0,y:0},scopePointList:[{w:"76rpx",h:"55rpx",x:"270rpx",y:"715rpx",tag:"姑苏区",source:"/subPackageCheckPoint/static/images/scopeMap/gusuqu.png",state:!0},{w:"76rpx",h:"54rpx",x:"177rpx",y:"667rpx",tag:"高新区",source:"/subPackageCheckPoint/static/images/scopeMap/gaoxinqu.png",state:!0},{w:"73rpx",h:"60rpx",x:"520rpx",y:"710rpx",tag:"昆山市",source:"/subPackageCheckPoint/static/images/scopeMap/kunshanshi.png",state:!0},{w:"76rpx",h:"58rpx",x:"616rpx",y:"510rpx",tag:"太仓市",source:"/subPackageCheckPoint/static/images/scopeMap/taicangshi.png",state:!0},{w:"100rpx",h:"56rpx",x:"360rpx",y:"706rpx",tag:"工业园区",source:"/subPackageCheckPoint/static/images/scopeMap/gongyeyuanqu.png",state:!0},{w:"75rpx",h:"58rpx",x:"390rpx",y:"464rpx",tag:"常熟市",source:"/subPackageCheckPoint/static/images/scopeMap/changshushi.png",state:!0},{w:"76rpx",h:"55rpx",x:"343rpx",y:"940rpx",tag:"吴江区",source:"/subPackageCheckPoint/static/images/scopeMap/wujiangqu.png",state:!0},{w:"75rpx",h:"54rpx",x:"220rpx",y:"810rpx",tag:"吴中区",source:"/subPackageCheckPoint/static/images/scopeMap/wuzhongqu.png",state:!0},{w:"76rpx",h:"56rpx",x:"278rpx",y:"613rpx",tag:"相城区",source:"/subPackageCheckPoint/static/images/scopeMap/xiangchengqu.png",state:!0},{w:"101rpx",h:"49rpx",x:"236rpx",y:"284rpx",tag:"张家港市",source:"/subPackageCheckPoint/static/images/scopeMap/zhangjiagangshi.png",state:!0}]}),async onLoad(){},onShareAppMessage:e=>({title:"君到苏州最美打卡点",path:"subPackageCheckPoint/pages/index/index"}),onShareTimeline:()=>({title:"君到苏州最美打卡点",path:"subPackageCheckPoint/pages/index/index"}),onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{openMap(){e.index.navigateTo({url:"/subPackageCheckPoint/pages/scopemap/index"})},getClass:e=>`scopePoint${e+1}`,showScopeMap(){this.homeShowState=!1,this.scopeMapShowState=!0},getScopePointStyle:e=>({width:e.w,height:e.h,left:e.x,top:e.y}),openDetailsMap(t){t.state?e.index.navigateTo({url:`/subPackageCheckPoint/pages/detailsmap/index?tag=${t.tag}`}):e.index.showToast({title:"暂未开放",icon:"error",duration:2e3})},onChange(e){this.old.x=e.detail.x,this.old.y=e.detail.y}}};if(!Array){e.resolveComponent("audio-com")()}const a=e._export_sfc(o,[["render",function(o,a,p,s,i,r){return e.e({a:i.comDom},i.comDom?{b:e.sr("audioCom","46c0ccd2-0")}:{},{c:t._imports_0,d:t._imports_1,e:i.homeShowState,f:e.o(((...e)=>r.showScopeMap&&r.showScopeMap(...e))),g:t._imports_2,h:t._imports_3,i:i.scopeMapShowState,j:t._imports_4,k:e.f(i.scopePointList,((t,o,a)=>({a:t.source,b:e.n(r.getClass(o)),c:o,d:e.s(r.getScopePointStyle(t)),e:t.tag,f:e.o((e=>r.openDetailsMap(t)),o)}))),l:"750rpx",m:"1334rpx",n:i.x,o:i.y,p:e.o(((...e)=>r.onChange&&r.onChange(...e))),q:i.scopeMapShowState,r:t._imports_5,s:i.scopeMapShowState,t:t._imports_6,v:i.scopeMapShowState})}],["__scopeId","data-v-46c0ccd2"]]);o.__runtimeHooks=6,wx.createPage(a);

From ed48ff7640a23dd27857ddab5f1098d83339e5fb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 27 Nov 2025 10:43:35 +0800
Subject: [PATCH 455/471] =?UTF-8?q?=E5=8D=81=E5=85=A8=E5=8D=81=E7=BE=8E?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E5=88=9B=E9=BB=98=E8=AE=A4=E3=80=81=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |   2 +-
 pages/info/postProductInfo/index.js         |   5 +-
 pages/list/six/index.wxml                   |   2 +-
 pages/order/pay/index.js                    |   4 +-
 pages/order/pay/index.wxml                  |   2 +-
 pages/user/user.wxml                        |   3 +-
 project.config.json                         | 192 ++++++++++----------
 project.private.config.json                 |  11 +-
 subPackages/feiyiNew/index.js               |   3 +-
 subPackages/password/overview/overview.wxml |   2 +-
 subPackages/password/setting/setting.js     |   2 +-
 subPackages/postSearch/index.js             |   7 +-
 subPackages/techanNew/index.js              |   7 +-
 13 files changed, 125 insertions(+), 117 deletions(-)

diff --git a/app.js b/app.js
index 7ecc533..53235e3 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest152? true : false;
+            data.isTest = data.isTest154? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 02155f1..e68235c 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -320,7 +320,8 @@ Page({
                     return;
                 }
                 this.setData({
-                    skuFlag: "cart"
+                    skuFlag: "cart",
+                    user_type: this.data.info.sku[this.data.skuIndex].use_type>1?null:this.data.info.sku[this.data.skuIndex].use_type
                 })
                 let that = this
                 wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
@@ -354,7 +355,7 @@ Page({
         this.setData({
             skuIndex: index,
             swiperCurrent: index+this.data.swiperRange.picture.max+1,
-            user_type: null,
+            user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
         })
     },
 
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 74e84bb..15b06fc 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/list/six/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
-<title title="十全十美"></title>
+<title title="苏邑十景"></title>
 
 <!-- <image lazy-load src="https://resource.sz-trip.com/uploads/20190831/3ecfcb81bab36027606676737788110c.png" mode="aspectFill" class="topbg"></image> -->
 <image lazy-load src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 387593c..57db0a2 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -441,11 +441,11 @@ Page({
                                 title: '您的支付密码已过期',
                                 content: resCode,
                                 cancelText: '修改密码',
-                                confirmText:'忘记密码',
+                                confirmText:'重置密码',
                                 confirmColor:"#0E8790",
                                 success(res){
                                     if (res.confirm) {
-                                        console.log('忘记密码')
+                                        console.log('重置密码')
                                         _this.goReset()
                                       } else if (res.cancel) {
                                         console.log('修改密码')
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index e943460..c7781e9 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -137,7 +137,7 @@
         </view>
         
         <view class="resetPassword">
-            <view bind:tap="goReset" url="/subPackages/password/setting/setting?type=reset">忘记密码</view>
+            <view bind:tap="goReset" url="/subPackages/password/setting/setting?type=reset">重置密码</view>
         </view>
     </view>
 
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 7437bc7..6d1dc76 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -66,9 +66,10 @@
     <!-- <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
       团体预约订单
     </navigator> -->
-    <navigator url="videoCoupon/index" class="user-box-line">
+    <navigator url="/pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/PrizeLog" class="user-box-line">
     		中奖记录
     </navigator>
+    
     <!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
       在线客服
     </navigator> -->
diff --git a/project.config.json b/project.config.json
index 744f8a8..e04ed97 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,102 +1,102 @@
 {
-  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "packNpmRelationList": [
-      {
-        "packageJsonPath": "./package.json",
-        "miniprogramNpmDistDir": "./miniprogram/"
-      }
-    ],
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "packOptions": {
+        "ignore": [],
+        "include": []
     },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "minifyWXSS": true,
-    "lazyloadPlaceholderEnable": false,
-    "useStaticServer": true,
-    "showES6CompileOption": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "minifyWXML": true,
-    "condition": false,
-    "ignoreUploadUnusedFiles": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "3.8.9",
-  "appid": "wx4bb7b6050831f585",
-  "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "pages/user/bindtel/index",
-          "pathName": "pages/user/bindtel/index",
-          "query": "id=0000000000LINELINEINFO18082257199008",
-          "scene": null
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmRelationList": [
+            {
+                "packageJsonPath": "./package.json",
+                "miniprogramNpmDistDir": "./miniprogram/"
+            }
+        ],
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
         },
-        {
-          "name": "好行",
-          "pathName": "pages/list/haoxing/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/list/activitynew/index",
-          "pathName": "pages/list/activitynew/index",
-          "query": "id=0000000000LINELINEINFO18082257199008",
-          "scene": null
-        },
-        {
-          "name": "微旅行",
-          "pathName": "pages/list/minitrip/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "一日游",
-          "pathName": "pages/list/oneday/index",
-          "query": "",
-          "scene": null
+        "enableEngineNative": false,
+        "bundle": false,
+        "useIsolateContext": true,
+        "useCompilerModule": false,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "minifyWXSS": true,
+        "lazyloadPlaceholderEnable": false,
+        "useStaticServer": true,
+        "showES6CompileOption": false,
+        "disableUseStrict": false,
+        "useCompilerPlugins": false,
+        "minifyWXML": true,
+        "condition": false,
+        "ignoreUploadUnusedFiles": true
+    },
+    "compileType": "miniprogram",
+    "libVersion": "3.8.9",
+    "appid": "wx4bb7b6050831f585",
+    "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "pages/user/bindtel/index",
+                    "pathName": "pages/user/bindtel/index",
+                    "query": "id=0000000000LINELINEINFO18082257199008",
+                    "scene": null
+                },
+                {
+                    "name": "好行",
+                    "pathName": "pages/list/haoxing/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/list/activitynew/index",
+                    "pathName": "pages/list/activitynew/index",
+                    "query": "id=0000000000LINELINEINFO18082257199008",
+                    "scene": null
+                },
+                {
+                    "name": "微旅行",
+                    "pathName": "pages/list/minitrip/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "一日游",
+                    "pathName": "pages/list/oneday/index",
+                    "query": "",
+                    "scene": null
+                }
+            ]
         }
-      ]
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 2
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index b7b65f7..a2d084f 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,12 +6,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=465058",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
           "query": "weburl=https://test.m.cloud.sz-trip.com/selectedHotels",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/group/index",
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index 3114fec..eb5bb0d 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -623,6 +623,7 @@ Page({
         this.setData({
             info: res.data,
             // skuFlag: "cart"
+            user_type: res.data.sku[0].use_type>1?null:res.data.sku[0].use_type,
         })
         this.showCart()
         this.BroswerRecord()
@@ -667,7 +668,7 @@ Page({
       let index = e.currentTarget.dataset.index;
       this.setData({
         skuIndex: index,
-        user_type: null,
+        user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
     })
   },
   changeSelectSkuPost: function(e) {
diff --git a/subPackages/password/overview/overview.wxml b/subPackages/password/overview/overview.wxml
index 6f8d57c..8d587e0 100644
--- a/subPackages/password/overview/overview.wxml
+++ b/subPackages/password/overview/overview.wxml
@@ -14,7 +14,7 @@
   <view class="iconfont icon-you"></view>
 </view>
 <view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword&&!isLock}}">
-  <text>忘记密码</text>
+  <text>重置密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
 </view>
diff --git a/subPackages/password/setting/setting.js b/subPackages/password/setting/setting.js
index f1a03b2..8ec34be 100644
--- a/subPackages/password/setting/setting.js
+++ b/subPackages/password/setting/setting.js
@@ -41,7 +41,7 @@ Page({
   onLoad: function (options) {
     this.setData({
         type: options.type||'add',
-        title: options.type=='reset'?'忘记密码':options.type=='edit'?'修改密码':'设置支付密码',
+        title: options.type=='reset'?'重置密码':options.type=='edit'?'修改密码':'设置支付密码',
         editConfrim: options.type == 'edit'?true:false
     })
   },
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
index 9773beb..0ca1297 100644
--- a/subPackages/postSearch/index.js
+++ b/subPackages/postSearch/index.js
@@ -487,9 +487,6 @@ openPopup() {
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
-    this.setData({
-        user_type: null
-    })
     let item = e.currentTarget.dataset.item
     console.log(item);
     commonApi._post("product/get_product_detail", {
@@ -503,6 +500,8 @@ openPopup() {
         this.setData({
             info: res.data,
             // skuFlag: "cart"
+            skuIndex: 0,
+            user_type: res.data.sku[0].use_type>1?1:res.data.sku[0].use_type
         })
         this.showCart()
         this.BroswerRecord()
@@ -547,7 +546,7 @@ openPopup() {
       let index = e.currentTarget.dataset.index;
       this.setData({
           skuIndex: index,
-          user_type: null,
+          user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
       })
   },
   changeSelectSkuPost: function(e) {
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index 48cdd2e..ffa6c76 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -630,9 +630,6 @@ Page({
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
-    this.setData({
-        user_type: null
-    })
 
     let item = e.currentTarget.dataset.item
     console.log(item);
@@ -646,6 +643,8 @@ Page({
         res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
         this.setData({
             info: res.data,
+            skuIndex: 0,
+            user_type: res.data.sku[0].use_type>1?null:res.data.sku[0].use_type
             // skuFlag: "cart"
         })
         this.showCart()
@@ -691,7 +690,7 @@ Page({
       let index = e.currentTarget.dataset.index;
       this.setData({
           skuIndex: index,
-          user_type: null,
+          user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
       })
   },
 

From 77d20396e4610a3d0fc1c25f1e542d8855b7d078 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 28 Nov 2025 12:37:55 +0800
Subject: [PATCH 456/471] =?UTF-8?q?=E5=86=AC=E5=AD=A3=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json               |   2 +-
 images/ai.png          | Bin 8352 -> 5991 bytes
 images/ai_seld.png     | Bin 10232 -> 5487 bytes
 images/index.png       | Bin 3498 -> 2122 bytes
 images/index_seld.png  | Bin 3406 -> 2109 bytes
 images/map.png         | Bin 5599 -> 4024 bytes
 images/map_seld.png    | Bin 5737 -> 4066 bytes
 images/user.png        | Bin 4322 -> 2538 bytes
 images/user_seld.png   | Bin 4813 -> 2268 bytes
 pages/index/index.js   |   2 +-
 pages/index/index.wxml |  37 +++++++++++++++++++------------------
 pages/index/index.wxss |  39 ++++++++++++++++++++++++++++-----------
 12 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/app.json b/app.json
index e9fa437..2e942eb 100644
--- a/app.json
+++ b/app.json
@@ -248,7 +248,7 @@
   "sitemapLocation": "sitemap.json",
   "tabBar": {
     "color": "#000000",
-    "selectedColor": "#000000",
+    "selectedColor": "#CE3B2B",
     "borderStyle": "white",
     "list": [
       {
diff --git a/images/ai.png b/images/ai.png
index 6f717493cb9fee3597644f1ff72709978ceb3100..d9155437d5f45fc6c0dfbf2368d5db2c4452f8e7 100644
GIT binary patch
literal 5991
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
V?(V0!iH!gN002ovPDHLkV1nVK&8GkW

literal 8352
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

diff --git a/images/ai_seld.png b/images/ai_seld.png
index aaefadcfed6c87fb28374e0fd6d731ddd4c7e05b..6076a4b0249cd8db61695e04050386739dd14b14 100644
GIT binary patch
literal 5487
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

literal 10232
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

diff --git a/images/index.png b/images/index.png
index 08d6d28a72f4a4e22b2121b309601db8d8d78618..c8d5d3ed81883c2e21f08c1c92989dfa78596af1 100644
GIT binary patch
literal 2122
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
AhX4Qo

literal 3498
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

diff --git a/images/index_seld.png b/images/index_seld.png
index a039bcbc7887249a3b27d6facc75f6034985ab0b..34a2ff87af18c8df36fa298f377f8c780fb2534b 100644
GIT binary patch
literal 2109
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

literal 3406
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

diff --git a/images/map.png b/images/map.png
index 5c7769e1d3c416035d73e7ddf951973cde9bba47..9638f97258e4778f63c648ecbcae13fb0ea5ab8a 100755
GIT binary patch
literal 4024
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

literal 5599
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
Pd?=r58fbh5*+c&yQ_cV3

diff --git a/images/map_seld.png b/images/map_seld.png
index 93c018b266a9483756108731302b1abf34f0cb89..16acbfec97905f2f6d3ac20aefd2cb9485ebd182 100644
GIT binary patch
literal 4066
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
U{mKQtaR2}S07*qoM6N<$f*DZmjQ{`u

literal 5737
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

diff --git a/images/user.png b/images/user.png
index be1540415e7a7d117e23edf37f1fcf85bdda07d9..ecdcef5bc0ac93a97d935d8d05c066442770ac7f 100755
GIT binary patch
literal 2538
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
A-v9sr

literal 4322
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
Y#bB)fxdAToe^*p(4Sn@`Roke40l|Ui^#A|>

diff --git a/images/user_seld.png b/images/user_seld.png
index b4227027924cad5a567c69a33c0c87687744df2c..f536a35905f5ff174393feb04357d45c227b164f 100644
GIT binary patch
literal 2268
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

literal 4813
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

diff --git a/pages/index/index.js b/pages/index/index.js
index 23652be..933286c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -542,7 +542,7 @@ Page({
             })
         } else {
             // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
+            commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8feeb80..eacb6b9 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,17 +1,17 @@
 <!--index.wxml-->
-<view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});background: linear-gradient(165deg, #FF8623 213px, #FFE68A 213px); ">
+<view class="bg" wx:if="{{!isTest}}">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;padding-top: 200rpx;">
         <view class="top-box" style="top: {{systemStyle.padHeight}}px;right:{{systemStyle.right+10}}px">
-            <view wx:if="{{weather}}" style="display: flex;flex-shrink: 0;">
+            <view wx:if="{{weather}}" style="display: flex;flex-shrink: 0;color: white;">
                 <image lazy-load src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
-                <view class="weather-num">{{weather.max_temp}}°</view>
-                <view class="weather">{{weather.weather}}</view>
+                <view class="weather-num" style="color: white;">{{weather.max_temp}}°</view>
+                <view class="weather" style="color: white;">{{weather.weather}}</view>
                 <image lazy-load style="margin: 0 30rpx;" bindtap="gotoPath"  data-path="/pages/user/service/index"
-                    src="https://static.ticket.sz-trip.com/uploads/20250714/1f3ac6a7144c6e6849edad89289061cc.png" mode="aspectFill"></image>
+                    src="https://static.ticket.sz-trip.com/jundaosuzhou/images/indexWinter2025/kefu.png" mode="aspectFill"></image>
             </view>
             <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
-                <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20250916/7d6a5865ffc145ba762fb5a977e4bb37.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
+                <image lazy-load src="https://static.ticket.sz-trip.com/uploads/20251127/c274a7019d42aaf969a6a51422951bb9.png" class="iconfont" style="width: 26rpx;height: 26rpx;"></image>
                 <view class="textOver" style="color:#000000">搜索您想要的</view>
             </navigator>
         </view>
@@ -63,8 +63,8 @@
             </view> -->
         </view>
 
-        <view class="ai-box">
-            <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/aiPlay/banniyou.gif"></image>
+        <view class="ai-box" style="padding: 0 25rpx;box-sizing: border-box;">
+            <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/indexWinter2025/banniyou.gif"></image>
             <view class="ai-text">{{aiStr}}</view>
         </view>
 
@@ -72,6 +72,7 @@
 
         <view class="content-box">
             <!-- 苏城环游记 todo-->
+            
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">            
                 <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex" circular>
@@ -207,7 +208,7 @@
                 </navigator>
             </view>
             <view wx:if="{{func_data.service_public}}">
-                <view class="ggfw-list" style="width:100%;margin-top: -40rpx;position: relative;z-index: 1;">
+                <view class="ggfw-list" style="width:100%;margin-top: 16rpx;position: relative;z-index: 1;">
                     <view class="ggfw" wx:for="{{publicSerivce}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick">
                         <image lazy-load src="{{item.icon}}" mode="aspectFill"></image>
                     </view>
@@ -219,7 +220,7 @@
                 <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.lyzs}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[1]}}" mode="" style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="pic-list" style="margin-top:-40rpx;position: relative;z-index: 1;" wx:if="{{func_data.helper_travel}}">
+            <view class="pic-list" style="margin-top:5rpx;position: relative;z-index: 1;" wx:if="{{func_data.helper_travel}}">
                 <image lazy-load class="new-pic"  wx:for="{{travelData}}" wx:key="index" data-item="{{item}}" bindtap="mainNavClick"
                 src="{{item.icon}}" mode="aspectFill"></image>
             </view>
@@ -262,13 +263,9 @@
                 <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.sqj}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[2]}}" mode="" /> -->
             </view>
-            <view class="six-box-new"  wx:if="{{func_data.scenery_ten}}" >
-                <view class="big-image-box">
+            <view class="six-box-new" style="margin-top: 18rpx;" wx:if="{{func_data.scenery_ten}}" >
+                <!-- <view class="big-image-box">
                     <image lazy-load src="{{SQSM[cityIndex].icon}}" mode="aspectFill" bindtap="mainNavClick" data-item="{{SQSM[cityIndex]}}"></image>
-                    <!-- <view class="text-container">
-                        <view style="font-weight: bold;font-size: 32rpx;">昆山市</view>
-                        <view>小昆山势卧麒麟，独角撑空甓塔新</view>
-                    </view> -->
                 </view>
                 <scroll-view scroll-x enable-flex scroll-with-animation class="small-image-box" scroll-into-view="{{scrollItem}}">
                     <view id="scrollItem-{{index}}" class="small-image-item {{cityIndex==index?'active':''}}" wx:for="{{SQSM}}" bind:tap="changeSimpleVal" 
@@ -276,7 +273,11 @@
                         <image lazy-load  src="{{item.icon}}"  mode="aspectFill"></image>
                         <view class="text-box">{{item.menu_name}}</view>
                     </view>
-                </scroll-view>
+                </scroll-view> -->
+
+                <view class="big-image-box" style="height: 333rpx;">
+                    <image style="border-radius: 0;" lazy-load src="{{SQSM[cityIndex].icon}}" mode="aspectFill" bindtap="mainNavClick" data-item="{{SQSM[cityIndex]}}"></image>
+                </view>
 
             </view>
 
@@ -297,7 +298,7 @@
                 <image lazy-load mode="widthFix" class="common-header-img" src="{{indexSeason.rmtj}}"></image>
                 <!-- <image lazy-load class="rmtj-right" src="{{imageSourceList.CBTP[4]}}" mode=""  style="width: 276rpx;height: 100rpx;"/> -->
             </view>
-            <view class="hot-list" style="margin-top: -40rpx;position: relative;z-index: 1;" wx:if="{{func_data.repurchase}}">
+            <view class="hot-list" style="margin-top: 7rpx;position: relative;z-index: 1;" wx:if="{{func_data.repurchase}}">
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
                 <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" data-source="回购榜" wx:key="id">
                     <view class="hot-item">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5209040..d692b64 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -5,10 +5,12 @@
     min-height: 100vh;
     overflow-x: hidden;
     overflow-y: auto;
-    background-size: 100% 100%;
+    background-size: 100% auto;
     background-repeat: no-repeat;
-    padding-bottom: 220rpx;
-    /* background-color:#E8F9FA; */
+    padding-bottom: 200rpx;
+    background-color:#F8E0C6;
+    background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/indexWinter2025/topGif.gif");
+
 
 }
 .swiper{
@@ -49,13 +51,13 @@
   width: 100%;
   height: 64rpx;
   border-radius: 36rpx;
-  color: #666666;
+  color: #000000;
   display: flex;
   align-items: center;
   font-size: 25rpx;
   padding: 2rpx 5rpx;
   box-sizing: border-box;
-  background: #FFEEAD;
+  background: rgba(253, 227, 208, 0.6);
 }
 .search-box .iconfont {
   font-size: 30rpx;
@@ -99,13 +101,15 @@
   display: flex;
   flex-wrap: wrap;
   border-radius: 20rpx;
-  background: #FFEEAD;
+  /* background: #FFEEAD; */
   padding-top: 13rpx;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20251127/971ccf61fe5446130501fb26ac7e8ffc.png");
+  background-size: 100% 100%;
 }
 .top-icon-item {
   margin-bottom: 37rpx;
   line-height: 37rpx;
-  font-size: 25rpx;
+  font-size: 24rpx;
   color: #000;
   text-align: center;
   flex-shrink: 0;
@@ -139,8 +143,17 @@
 .content-box {
   margin: 0 25rpx;
 }
+
+.content-margin{
+    margin: 0 25rpx;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 25rpx;
+}
+
 .common-header-img{
-    width: 220.67rpx;
+    width: 100%;
+    position: relative;
 }
 
 .small-swiper {
@@ -168,6 +181,8 @@
   margin-top: 48rpx;
   position: relative;
   align-items: flex-end;
+  width: 750rpx;
+  left: -25rpx;
 }
 
 /* 元旦修改新增样式 */
@@ -503,15 +518,16 @@
 .hot-item {
   background: white;
   /* box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); */
-  border-radius: 15rpx;
+  border-radius: 20rpx;
   margin-bottom: 20rpx;
   height: 498rpx;
+  overflow: hidden;
 }
 .hot-item image:nth-child(1) {
   display: block;
   width: 100%;
   height: 327rpx;
-  border-radius: 15rpx 15rpx 0 0;
+  /* border-radius: 15rpx 15rpx 0 0; */
 }
 .hot-item .hot-info {
   padding: 12rpx;
@@ -520,6 +536,7 @@
   flex-direction: column;
   justify-content: space-between;
   box-sizing: border-box;
+  background: #FFFCEE;
 }
 .hot-item .hot-title {
     font-weight: bold;
@@ -894,7 +911,7 @@
 
 /* 春节金刚区字体颜色样式更换 */
 .top-icon-text {
-  color: #111111;
+  color: #FFFFFF;
 }
 
 .rmtj-right {

From 87c92eefa3438a5c46a02e10d76b4856911644ba Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 28 Nov 2025 13:43:41 +0800
Subject: [PATCH 457/471] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=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/order/road/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 53235e3..ccb16dc 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest154? true : false;
+            data.isTest = data.isTest155? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 96de141..9c368f0 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -69,7 +69,7 @@ Page({
     })
   },
   initDate(){
-    let today = new Date(),month1 = today.getMonth()+1,month2 = (month1 + 1) % 12,year = today.getFullYear(),year2 = month1<month2?year:(year+1);
+    let today = new Date(),month1 = today.getMonth()+1,month2 = (month1 + 1)>12? (month1 + 1)% 12:(month1+1),year = today.getFullYear(),year2 = month1<month2?year:(year+1);
     let monthDays1 = this.getMonthDays(month1,year);
     let monthDays2 = this.getMonthDays(month2,year2);
     this.setData({

From 25ef6964e9fc3474b765d6b4a687ef793d1749de Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 3 Dec 2025 10:27:00 +0800
Subject: [PATCH 458/471] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml | 2 +-
 pages/index/index.wxss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index eacb6b9..880e628 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -63,7 +63,7 @@
             </view> -->
         </view>
 
-        <view class="ai-box" style="padding: 0 25rpx;box-sizing: border-box;">
+        <view class="ai-box" style="padding: 0 25rpx;box-sizing: border-box;" wx:if="{{mainTypeList.length>0}}">
             <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/indexWinter2025/banniyou.gif"></image>
             <view class="ai-text">{{aiStr}}</view>
         </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d692b64..f51492c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -9,7 +9,7 @@
     background-repeat: no-repeat;
     padding-bottom: 200rpx;
     background-color:#F8E0C6;
-    background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/indexWinter2025/topGif.gif");
+    background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/indexWinter2025/topGifs.gif");
 
 
 }

From 7e9c26b035815c70232a9033ff9ad2a50c2de6be Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 3 Dec 2025 10:27:18 +0800
Subject: [PATCH 459/471] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/index.wxss        | 8 ++++++--
 pages/user/bindtel/index.wxss | 8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/login/index.wxss b/pages/login/index.wxss
index 70a7d8b..c83f997 100644
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -22,6 +22,10 @@ page {
   margin-top: 40rpx;
   line-height: 40rpx;
 }
+.iconfont {
+    font-size: 20px;
+}
+
 .login-tip-box .icon-gou1 {
   line-height: 80rpx;
   margin-top: -20rpx;
@@ -43,8 +47,8 @@ page {
     border-radius: 50%;
     color: transparent;
     border: 1px solid #666;
-    width: 24rpx;
-    height: 24rpx;
+    width: 32rpx;
+    height: 32rpx;
     flex-shrink: 0;
     margin-right: 34rpx;
     margin-top: 7rpx;
diff --git a/pages/user/bindtel/index.wxss b/pages/user/bindtel/index.wxss
index b7f2e59..24334aa 100644
--- a/pages/user/bindtel/index.wxss
+++ b/pages/user/bindtel/index.wxss
@@ -54,13 +54,15 @@
     margin-right: 30rpx;
     color: #666;
   }
-  
+  .iconfont {
+    font-size: 20px;
+}
   .select-icon{
       border-radius: 50%;
       color: transparent;
       border: 1px solid #666;
-      width: 24rpx;
-      height: 24rpx;
+      width: 32rpx;
+      height: 32rpx;
       flex-shrink: 0;
       margin-right: 34rpx;
       margin-top: 7rpx;

From 01f1dfacd5833e60c4ba518854694069f9529019 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Dec 2025 10:21:26 +0800
Subject: [PATCH 460/471] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E3=80=81=E7=99=BB=E5=BD=95=E7=83=AD=E5=8C=BA=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/activityOrderInfo/index.wxml | 11 ++++++++---
 pages/user/order/activityOrderInfo/index.wxss |  5 +++++
 pages/user/order/couponOrderInfo/index.wxml   | 11 ++++++++---
 pages/user/order/couponOrderInfo/index.wxss   |  5 +++++
 pages/user/order/foodOrderInfo/index.wxml     | 11 ++++++++---
 pages/user/order/foodOrderInfo/index.wxss     |  5 +++++
 pages/user/order/hotelOrderInfo/index.wxml    |  7 ++++++-
 pages/user/order/hotelOrderInfo/index.wxss    |  5 +++++
 pages/user/order/lineOrderInfo/index.wxml     | 11 ++++++++---
 pages/user/order/lineOrderInfo/index.wxss     |  5 +++++
 pages/user/order/museumOrderInfo/index.wxml   | 11 ++++++++---
 pages/user/order/museumOrderInfo/index.wxss   |  5 +++++
 pages/user/order/postOrderInfo/index.wxml     | 11 ++++++++---
 pages/user/order/postOrderInfo/index.wxss     |  5 +++++
 pages/user/order/sceneOrderInfo/index.wxml    | 11 ++++++++---
 pages/user/order/sceneOrderInfo/index.wxss    |  5 +++++
 pages/user/order/showOrderInfo/index.wxml     | 11 ++++++++---
 pages/user/order/showOrderInfo/index.wxss     |  5 +++++
 project.private.config.json                   | 11 +++++++++--
 19 files changed, 124 insertions(+), 27 deletions(-)

diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml
index a8f91db..3c59aa2 100644
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -81,9 +86,9 @@
 </view>
 
 
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/activityOrderInfo/index.wxss b/pages/user/order/activityOrderInfo/index.wxss
index c20a26f..020f170 100644
--- a/pages/user/order/activityOrderInfo/index.wxss
+++ b/pages/user/order/activityOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/couponOrderInfo/index.wxml b/pages/user/order/couponOrderInfo/index.wxml
index be4ebc8..4972815 100644
--- a/pages/user/order/couponOrderInfo/index.wxml
+++ b/pages/user/order/couponOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -92,9 +97,9 @@
     <text>下单时间：{{info.create_time}}</text>
   </view>
 </view>
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/couponOrderInfo/index.wxss b/pages/user/order/couponOrderInfo/index.wxss
index c20a26f..020f170 100644
--- a/pages/user/order/couponOrderInfo/index.wxss
+++ b/pages/user/order/couponOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml
index 267a3d1..3bf1488 100644
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -150,9 +155,9 @@
 
 <sptj ids="{{ ids }}"></sptj>
 
-<navigator url="/pages/user/service/index" wx:if="{{info && info.state!='CLOSED'}}" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" wx:if="{{info && info.state!='CLOSED'}}" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 
 <view style="width: 100%;height: 50rpx;"></view>
 
diff --git a/pages/user/order/foodOrderInfo/index.wxss b/pages/user/order/foodOrderInfo/index.wxss
index 053db7d..a6e3f61 100644
--- a/pages/user/order/foodOrderInfo/index.wxss
+++ b/pages/user/order/foodOrderInfo/index.wxss
@@ -20,7 +20,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index ccfdfa0..9ff02ac 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
diff --git a/pages/user/order/hotelOrderInfo/index.wxss b/pages/user/order/hotelOrderInfo/index.wxss
index dc9d442..53199b4 100644
--- a/pages/user/order/hotelOrderInfo/index.wxss
+++ b/pages/user/order/hotelOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml
index 146f690..141aedc 100644
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -86,9 +91,9 @@
     </view>
   </view>
 </view>
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/lineOrderInfo/index.wxss b/pages/user/order/lineOrderInfo/index.wxss
index c20a26f..020f170 100644
--- a/pages/user/order/lineOrderInfo/index.wxss
+++ b/pages/user/order/lineOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 03f2665..cf88f68 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}" style="position: relative;">
@@ -125,9 +130,9 @@
     </view>
   </view>
 </view>
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/museumOrderInfo/index.wxss b/pages/user/order/museumOrderInfo/index.wxss
index f1178f1..d84ea0b 100644
--- a/pages/user/order/museumOrderInfo/index.wxss
+++ b/pages/user/order/museumOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index f2845b8..a8c5c6d 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{imgLen}}" wx:key="index" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <view class="box" wx:if="{{info&&!isPickup}}" style="color:#333">
   <view class="scene-box-left" wx:if="{{info.state=='REFUND'}}" style="width:100%">您的退款已成功，退款金额预计在1-7个工作日内退还到您支付的账户</view>
   <view class="scene-box-left" wx:elif="{{info.state=='WAIT_REFUND'}}" style="width:100%">您已成功发起退款申请，请耐心等待</view>
@@ -297,9 +302,9 @@
 
 <sptj ids="{{ ids }}"></sptj>
 
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view style="height: 40rpx;"></view>
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss
index c1bd603..543081c 100644
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .copy-box {
 	width: 73rpx;
 	line-height: 35rpx;
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 8d5d702..b2bd512 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{imgLen}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 <!-- <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -293,9 +298,9 @@
 
 <sptj ids="{{ ids }}"></sptj>
 
-<navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 
 <view style="height: 40rpx;"></view>
 
diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss
index f384d99..dc33848 100644
--- a/pages/user/order/sceneOrderInfo/index.wxss
+++ b/pages/user/order/sceneOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/pages/user/order/showOrderInfo/index.wxml b/pages/user/order/showOrderInfo/index.wxml
index 414660c..76c6012 100644
--- a/pages/user/order/showOrderInfo/index.wxml
+++ b/pages/user/order/showOrderInfo/index.wxml
@@ -3,7 +3,12 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{imgLen}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    {{info.state_text}}
+    <navigator url="/pages/user/service/index" class="kefu-img">
+        <image lazy-load src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png" mode="widthFix"></image>
+    </navigator>
+</view>
 
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
@@ -131,9 +136,9 @@
   </view>
 </view>
 
-<navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator wx:if="{{info && info.state!='CLOSED'}}" url="/pages/user/service/index" class="bottom-btn">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
diff --git a/pages/user/order/showOrderInfo/index.wxss b/pages/user/order/showOrderInfo/index.wxss
index a7621ab..633459b 100644
--- a/pages/user/order/showOrderInfo/index.wxss
+++ b/pages/user/order/showOrderInfo/index.wxss
@@ -15,7 +15,12 @@ page {
   line-height: 100rpx;
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
+.kefu-img{width: 85rpx;height: 85rpx;}
+.kefu-img image{width: 85rpx;height: 85rpx;}
 .box {
   padding: 20rpx;
   background: white;
diff --git a/project.private.config.json b/project.private.config.json
index a2d084f..cb9eb09 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,12 +6,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/user/order/postOrderInfo/index",
+          "pathName": "pages/user/order/showOrderInfo/index",
+          "query": "id=28182512031604485734",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/info/roadInfo/index",
           "pathName": "pages/info/roadInfo/index",
           "query": "id=465058",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/pbService/web/index",

From b0610e9584c9218d304b2eff3512e1420850a7b0 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Dec 2025 11:05:06 +0800
Subject: [PATCH 461/471] 1

---
 pages/login/index.wxml        | 7 +++++--
 pages/order/road/index.js     | 1 +
 pages/user/bindtel/index.wxml | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index a97a59e..14d695f 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -7,8 +7,11 @@
   <text>获得你的公开信息（昵称、头像、地区及性别）</text>
 </view>
 <view class="login-tip-box">
-  <view class="select-icon" wx:if="{{!isApproval}}" bindtap="changeIsApproval"></view>
-  <icon class="iconfont icon-gou1" wx:else bindtap="changeIsApproval"></icon>
+<view bindtap="changeIsApproval" style="height: 60rpx;">
+    <view class="select-icon" wx:if="{{!isApproval}}" ></view>
+    <icon class="iconfont icon-gou1" wx:else></icon>
+</view>
+
   <view>
     <text>选中代表您已阅读同意</text>
     <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=9">《君到苏州用户协议》</navigator>
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 9c368f0..0886f16 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -83,6 +83,7 @@ Page({
       start_date:util.formatDate(today),
       end_date:year2+"/"+month2+"/"+monthDays2[0]
     }).then(res=>{
+        if (!res || res.code != 1) return
       let prices={};
       res.data.map(item=>{
         // 给规格排序
diff --git a/pages/user/bindtel/index.wxml b/pages/user/bindtel/index.wxml
index 229442b..66225a2 100644
--- a/pages/user/bindtel/index.wxml
+++ b/pages/user/bindtel/index.wxml
@@ -20,8 +20,11 @@
   </view>
 
   <view class="login-tip-box" wx:if="{{regToken}}">
-    <view class="select-icon" wx:if="{{!isApproval}}" bindtap="changeIsApproval"></view>
-    <icon class="iconfont icon-gou1" wx:else bindtap="changeIsApproval"></icon>
+  <view style="height: 60rpx;" bindtap="changeIsApproval">
+    <view class="select-icon" wx:if="{{!isApproval}}" ></view>
+    <icon class="iconfont icon-gou1" wx:else></icon>
+  </view>
+
     <view>
         <text>选中代表您已阅读同意</text>
         <navigator class="navigator-file" url="/pages/user/userPrivacy/index?id=9">《君到苏州用户协议》</navigator>

From 02287afa947f4c0db69608475d28d3654959662e Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 4 Dec 2025 21:15:20 +0800
Subject: [PATCH 462/471] =?UTF-8?q?=E9=9C=80=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/road/index.js          | 3 +--
 pages/pbService/aiHelpYou/index.js | 5 ++++-
 utils/https.js                     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 0886f16..294bf84 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -83,7 +83,6 @@ Page({
       start_date:util.formatDate(today),
       end_date:year2+"/"+month2+"/"+monthDays2[0]
     }).then(res=>{
-        if (!res || res.code != 1) return
       let prices={};
       res.data.map(item=>{
         // 给规格排序
@@ -125,7 +124,7 @@ Page({
         monthIndex:selectMonth==month1?0:1
       })
       this.changePrice()
-    })
+    }).catch(e=>{console.log(e)})
   },
   // 获取这个月有几天
   getMonthDays:function(month,year){
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index 7d6e0ae..e47995b 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -18,7 +18,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
+    // let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
+    let weburl = "https://test.m.cloud.sz-trip.com/OneDayTravelNew?token=c6374181-3976-4e73-b82a-7b66cf504e0e"
+    this.setUrl(weburl)
+    return
     if (app.globalData.configJson.isTest) {
         weburl = "https://m.cloud.sz-trip.com/ScenicComfort?a=1"
     }
diff --git a/utils/https.js b/utils/https.js
index d55ab84..b0f9a8b 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-let baseUrl = "https://api.cloud.sz-trip.com/api/";
+const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+// let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 2ccb4acad770cf1d2033bb456566f7593cf26c4d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 5 Dec 2025 09:31:20 +0800
Subject: [PATCH 463/471] 1

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index ccb16dc..c7f1316 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest155? true : false;
+            data.isTest = data.isTest156? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

From 4cc05d88823527c89e53320139e5801ac18e8b7a Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 8 Dec 2025 15:06:52 +0800
Subject: [PATCH 464/471] 1

---
 pages/order/road/index.js          | 47 +++++++++++++++++++++++++-----
 pages/order/road/index.wxml        |  7 +++--
 pages/pbService/aiHelpYou/index.js |  5 +---
 pages/user/coupon/index.wxml       |  2 +-
 pages/user/couponCenter/index.wxml |  2 +-
 project.private.config.json        | 12 ++++----
 utils/https.js                     |  4 +--
 7 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 294bf84..560b19a 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -43,11 +43,11 @@ Page({
         let sku = res.data.sku.find(item=>item.id==options.skuid);
         res.data.sku = [sku];
       }
-      res.data.sku.map(item=>{
-        console.log(item);
-        item.stock>0?nums.push(1):nums.push(0)
+    //   res.data.sku.map(item=>{
+    //     console.log(item);
+    //     item.stock>0?nums.push(1):nums.push(0)
         
-      })
+    //   })
       for(let i=0;i<res.data.sku.length;i++){
         for(let j=i+1;j<res.data.sku.length;j++){
           if(res.data.sku[i].id>res.data.sku[j].id){
@@ -58,7 +58,7 @@ Page({
       this.setData({
         productInfo:res.data,
         sku:res.data.sku,
-        nums:nums
+        nums:[0,0],
       })
     })
     this.initDate()
@@ -119,9 +119,16 @@ Page({
       let info = prices[selectMonth+'-'+selectDate];
       info.selectMonth = selectMonth;
       info.selectDate = selectDate;
+
+      let nums = []
+      info.info.forEach(x=>{
+          nums.push(x.stock>0?1:0)
+      })
+
       this.setData({
         selectDate:info,
-        monthIndex:selectMonth==month1?0:1
+        monthIndex:selectMonth==month1?0:1,
+        nums: nums
       })
       this.changePrice()
     }).catch(e=>{console.log(e)})
@@ -153,8 +160,26 @@ Page({
     if(info && info.product_price && info.product_price!==null && info.stock!=0){
       info.selectMonth = selectMonth;
       info.selectDate = item+1;
+      
+      let setBuyNum = false
+      let currentNums = this.data.nums
+      info.info.forEach((x,i)=>{
+        if (currentNums[i]>x.stock) {
+            currentNums[i] = x.stock
+            setBuyNum = true
+        }
+      })
+
+      if (setBuyNum) {
+          wx.showToast({
+            title: '部分规格库存不足，已自动调整购买数量',
+            icon:"none",
+          })
+      }
+
       this.setData({
-        selectDate:info
+        selectDate:info,
+        nums:currentNums
       })
       this.changePrice()
     }
@@ -184,7 +209,13 @@ Page({
       })
       return;
     }
-    if(selectDate.info[index].stock==nums[index]) return;
+    if(selectDate.info[index].stock<=nums[index]) {
+        wx.showToast({
+          title: '库存不足',
+          icon:"none",
+        })
+        return;
+    } 
     nums[index] = nums[index] + 1;
     this.setData({
       nums:nums
diff --git a/pages/order/road/index.wxml b/pages/order/road/index.wxml
index 35cbc24..2805bf9 100644
--- a/pages/order/road/index.wxml
+++ b/pages/order/road/index.wxml
@@ -35,9 +35,10 @@
   <view class="box-top">
     <view class="box-title">{{item.sku_name}}</view>
     <view class="box-tip textOver">{{item.sku_type_info}}</view>
-    <view class="iconfont icon-sami-select {{nums[index]==0?' disable':''}}" bindtap="minus" data-index="{{index}}"></view>
-    <view class="number">{{nums[index]}}</view>
-    <view class="iconfont icon-add-select {{nums[index]==selectDate.info[index].stock?' disable':''}}" bindtap="add" data-index="{{index}}"></view>
+    <view wx:if="{{selectDate.info[index].stock>0}}" class="iconfont icon-sami-select {{nums[index]==0?' disable':''}}" bindtap="minus" data-index="{{index}}"></view>
+    <view wx:if="{{selectDate.info[index].stock>0}}" class="number">{{nums[index]}}</view>
+    <view wx:if="{{selectDate.info[index].stock>0}}" class="iconfont icon-add-select {{nums[index]==selectDate.info[index].stock?' disable':''}}" bindtap="add" data-index="{{index}}"></view>
+    <view wx:else style="color: #D62828;">已售罄</view>
   </view>
   <view class="single-price" wx:if="{{selectDate}}">{{selectDate.info[index].price/100}}</view>
 </view>
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index e47995b..7d6e0ae 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -18,10 +18,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
-    let weburl = "https://test.m.cloud.sz-trip.com/OneDayTravelNew?token=c6374181-3976-4e73-b82a-7b66cf504e0e"
-    this.setUrl(weburl)
-    return
+    let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
     if (app.globalData.configJson.isTest) {
         weburl = "https://m.cloud.sz-trip.com/ScenicComfort?a=1"
     }
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 1fffc3d..0f6b373 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -48,7 +48,7 @@
   <view class="coupon-rule">使用规则 <text class="iconfont icon-xia"></text></view>
 </view> -->
 <view style="height:110rpx"></view>
-<navigator url="../couponCenter/index" class="fixed-btn">前往<text>领券中心</text></navigator>
+<navigator url="../couponCenter/index" class="fixed-btn">前往<text>兑换中心</text></navigator>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
 	<image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
 	<view>暂无内容</view>
diff --git a/pages/user/couponCenter/index.wxml b/pages/user/couponCenter/index.wxml
index 347b155..42374fa 100644
--- a/pages/user/couponCenter/index.wxml
+++ b/pages/user/couponCenter/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/user/couponCenter/index.wxml-->
-<title title="领取优惠券"></title>
+<title title="兑换中心"></title>
 <image lazy-load class="bg-img" style="height:calc(100% - {{height}}px)" src="https://static.ticket.sz-trip.com/xcxImages/user/coupon-bg.png" mode="aspectFill"></image>
 <view class="content" style="top:{{height}}px">
   <view class="coupon-title">【兑换优惠券】</view>
diff --git a/project.private.config.json b/project.private.config.json
index cb9eb09..0ac6dc1 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,16 +7,16 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/user/order/postOrderInfo/index",
-          "pathName": "pages/user/order/showOrderInfo/index",
-          "query": "id=28182512031604485734",
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=3897",
           "scene": null,
           "launchMode": "default"
         },
         {
-          "name": "pages/info/roadInfo/index",
-          "pathName": "pages/info/roadInfo/index",
-          "query": "id=465058",
+          "name": "pages/user/order/postOrderInfo/index",
+          "pathName": "pages/user/order/showOrderInfo/index",
+          "query": "id=28182512031604485734",
           "launchMode": "default",
           "scene": null
         },
diff --git a/utils/https.js b/utils/https.js
index b0f9a8b..d55ab84 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"

From 07f93cd7bd1d09249ce787a9df6fdbe956ad3dab Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 9 Dec 2025 17:38:55 +0800
Subject: [PATCH 465/471] 1

---
 app.js                      | 2 +-
 pages/index/index.js        | 4 ++--
 pages/order/road/index.js   | 6 ++++--
 pages/order/road/index.wxml | 6 +++---
 project.private.config.json | 9 ++++++++-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index c7f1316..ada7707 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest156? true : false;
+            data.isTest = data.isTest158? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/index/index.js b/pages/index/index.js
index 933286c..dd5bdeb 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -541,8 +541,8 @@ Page({
                 func_data: (app.globalData.configJson.func_data||{})
             })
         } else {
-            // 小程序是3
-            commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
+            // 小程序是3 测试H5  15
+            commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
                 let obj = {};
                 (res.data.content||[]).forEach(item => {
                     obj[item.id] = item.image
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 560b19a..7a18266 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -98,20 +98,22 @@ Page({
           stock = stock+i.stock;
         })
         item.stock = stock;
-        if(item.stock>0){
+        // if(item.stock>0){
+        if (item.info.some(x=>x.stock!=null)){
           let date = item.date.split("-").splice(1,2),newDate=[];
           console.log(date)
           date.map(d=>{
             d = parseInt(d);
             newDate.push(d)
           })
-          if(!selectDate){
+          if(!selectDate&&item.stock>0){
             selectDate = newDate[1];
             selectMonth = newDate[0];
           }
           prices[newDate.join("-")] = item;
         }
       })
+      console.log(prices, "---------------")
       this.setData({
         prices:prices
       })
diff --git a/pages/order/road/index.wxml b/pages/order/road/index.wxml
index 2805bf9..f35be0e 100644
--- a/pages/order/road/index.wxml
+++ b/pages/order/road/index.wxml
@@ -23,9 +23,9 @@
     </view>
      <view class="day-item{{selectDate.selectMonth==month[monthIndex] && selectDate.selectDate==(index+1)?' active':''}}" wx:for="{{monthIndex==1?monthDays2[0]:monthDays1[0]}}">
       <view class="date-item-in" bindtap="selectDate" data-item="{{item}}">
-        <view class="date-num{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!=null?' active':''}}">{{(index+1)>=10?(index+1):("0"+(index+1))}}</view>
-        <view class="price" wx:if="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!==null && prices[month[monthIndex]+'-'+(index+1)].stock!==null}}">￥{{prices[month[monthIndex]+'-'+(index+1)].m_price/100}}</view>
-        <view class="date-price-place" wx:elif="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].stock==0}}">售罄</view>
+        <view class="date-num{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!=null&& prices[month[monthIndex]+'-'+(index+1)].stock>0?' active':''}}">{{(index+1)>=10?(index+1):("0"+(index+1))}}</view>
+        <view class="price" wx:if="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!==null && prices[month[monthIndex]+'-'+(index+1)].stock>0}}">￥{{prices[month[monthIndex]+'-'+(index+1)].m_price/100}}</view>
+        <view class="date-price-place" style="font-size: 23rpx;color: #999;" wx:elif="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].stock===0}}">售罄</view>
         <view class="date-price-place" wx:else></view>
       </view>
     </view>
diff --git a/project.private.config.json b/project.private.config.json
index 0ac6dc1..e6ba547 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -9,10 +9,17 @@
         {
           "name": "pages/info/roadInfo/index",
           "pathName": "pages/info/roadInfo/index",
-          "query": "id=3897",
+          "query": "id=457033",
           "scene": null,
           "launchMode": "default"
         },
+        {
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=3897",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/user/order/postOrderInfo/index",
           "pathName": "pages/user/order/showOrderInfo/index",

From cfe9b1217e6aa602d09355c3f5bbae7b981d5c4f Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Dec 2025 14:35:14 +0800
Subject: [PATCH 466/471] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             |  1 +
 pages/component/TitleHeader.js     |  1 +
 pages/index/index.js               |  1 +
 pages/map/index.js                 |  1 +
 pages/order/orderList/index.js     |  1 +
 pages/order/orderList/index.wxml   |  6 ++++++
 pages/order/orderList/index.wxss   | 17 ++++++++++++++++-
 pages/order/postOrder/index.wxml   |  4 ++++
 pages/order/postOrder/index.wxss   | 17 +++++++++++++++++
 pages/order/scene/index.js         |  7 +++++--
 pages/order/scene/index.wxml       |  9 ++++++++-
 pages/order/scene/index.wxss       | 21 +++++++++++++++++++++
 pages/pbService/aiHelpYou/index.js |  2 +-
 pages/user/cartlist/list.js        |  6 ++++++
 pages/user/order/list.js           |  1 +
 pages/user/user.js                 |  1 +
 subPackages/gwcOrder/index.js      |  4 ++++
 subPackages/gwcOrder/index.wxml    | 13 +++++++++++--
 subPackages/gwcOrder/index.wxss    | 23 ++++++++++++++++++++++-
 subPackages/techanCart/index.js    |  1 +
 utils/https.js                     |  1 +
 21 files changed, 130 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index ada7707..c4dc4ce 100644
--- a/app.js
+++ b/app.js
@@ -13,6 +13,7 @@ App({
     this.updateApp()
     
     this.globalData.appLaunchFlag = false
+    this.globalData.isCartBuy = false
   },
 
   onShow: function () {
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 07c67a8..0c36fd2 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -97,6 +97,7 @@ Component({
             console.log("清除购物车")
             app.globalData.list = null;app.globalData.createDate = null;
             app.globalData.index = 0;app.globalData.productPrice = 0;app.globalData.ticketPrice = 0;
+            app.globalData.isCartBuy = false
         } catch(e) {  console.log("清空购物车失败", e) }
 		  wx.navigateTo({
 		    url: '/pages/user/cartlist/list'
diff --git a/pages/index/index.js b/pages/index/index.js
index dd5bdeb..0814ac5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1069,6 +1069,7 @@ Page({
         if (app.globalData.innerAudioContext) {
             app.globalData.innerAudioContext.stop()
         }
+        app.globalData.isCartBuy = false
     },
     
     goAIUrl () {
diff --git a/pages/map/index.js b/pages/map/index.js
index 31627d0..fa8e639 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -815,6 +815,7 @@ gotoUrls() {
     util.pagePoint({
       event:'mapshow_view'
     },1)
+    app.globalData.isCartBuy = false
   },
 
   /**
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 17844ef..eb09b25 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -248,6 +248,7 @@ Page({
         app.globalData.index = 0
         app.globalData.productPrice = 0
         app.globalData.ticketPrice = 0
+        app.globalData.isCartBuy = false
     } catch(e) {
         console.log("清空购物车失败", e)
     }
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 785d25f..cee8f3e 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,5 +1,11 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="订单列表"></title>
+
+<view class="warning-tip">
+    <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
+    购买须知：使用优惠券的组合订单均不支持部分退款
+</view>
+
 <!-- 邮寄 -->
 <view class="box" wx:if="{{postList.length != 0}}">
 	<view class="goods-item" wx:for="{{postList}}" wx:key="index">
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 2d2b10d..cfe939d 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -173,4 +173,19 @@ color: #000000;
     position: absolute;
     top: 30rpx;
     right: 30rpx;
-  }
\ No newline at end of file
+  }
+  .warning-tip{
+    display: flex;
+    height: 67rpx;
+    background: #D62828;
+    align-items: center;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #FFFFFF;
+    padding-left: 13rpx;
+}
+.warning-tip image{
+    width: 26.67rpx;
+    height: 26.67rpx;
+    margin-right: 12rpx;
+}
\ No newline at end of file
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 5bd8e1b..02baf62 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -36,6 +36,10 @@
     </view>
 
     <view class="sku-info-container">
+        <view class="warning-tip" wx:if="{{from=='cart'}}">
+            <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
+            购买须知：使用优惠券的组合订单均不支持部分退款
+        </view>
         <view class="header-title textOver" wx:if="{{from=='cart'}}">
             供应商：{{item.product.supplier_name}}
         </view>
diff --git a/pages/order/postOrder/index.wxss b/pages/order/postOrder/index.wxss
index f391cfc..5cb30b8 100644
--- a/pages/order/postOrder/index.wxss
+++ b/pages/order/postOrder/index.wxss
@@ -294,4 +294,21 @@ page {
     font-weight: 500;
     font-size: 23rpx;
     color: #D62828;
+}
+
+.warning-tip{
+    display: flex;
+    height: 67rpx;
+    background: #D62828;
+    border-radius: 9rpx 9rpx 0rpx 0rpx;
+    align-items: center;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #FFFFFF;
+    padding-left: 13rpx;
+}
+.warning-tip image{
+    width: 26.67rpx;
+    height: 26.67rpx;
+    margin-right: 12rpx;
 }
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index b460fb6..cb9ceef 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -28,7 +28,7 @@ Page({
     allowance_price: 0,
     pIndex: 0,
     flag:null,
-		ticket_type:1,
+	ticket_type:1,
     isCar:'single',
     showMask: false,
     price:0,
@@ -52,6 +52,8 @@ Page({
     selectExplain: false,
     explainData: null,
     showContent: false,
+
+    isCartBuy: false,
   },
 
   /**
@@ -73,7 +75,8 @@ Page({
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
       date: app.globalData.product.date,
       time: app.globalData.product.time || {},
-      showYhq:app.globalData.listName?false:true
+      showYhq:app.globalData.listName?false:true,
+      isCartBuy:app.globalData.isCartBuy,
     })
     console.log('-------',this.data.product,this.data.time, app.globalData);
     // debugger
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index e0d01d4..e3b855d 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -57,7 +57,14 @@
       <text wx:for="{{product.sku.display_tags}}" style="margin-right: 15rpx;">{{item}}</text>
     </view> -->
   </view>
-  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+
+  <view class="{{isCartBuy?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{isCartBuy}}">
+        <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
+        购买须知：使用优惠券的组合订单均不支持部分退款
+    </view>
+    <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+  </view>
   <!-- 补贴 -->
   <view class="box">
     <view class="box-title allowance" wx:if="{{allowance_price}}">
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index 36c3e24..05c01c3 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -509,4 +509,25 @@ color: #000000;
 .icon-gou1{
     color: #D62828;
     font-size: 33rpx;
+}
+.warning-tip{
+    display: flex;
+    height: 67rpx;
+    background: #D62828;
+    border-radius: 9rpx 9rpx 0rpx 0rpx;
+    align-items: center;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #FFFFFF;
+    padding-left: 13rpx;
+    margin: 0 25rpx;
+}
+.warning-tip image{
+    width: 26.67rpx;
+    height: 26.67rpx;
+    margin-right: 12rpx;
+}
+.warning-container .box{
+    margin-top: 0;
+    border-radius: 0 0 9rpx 9rpx;
 }
\ No newline at end of file
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index 7d6e0ae..885e909 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -84,7 +84,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    app.globalData.isCartBuy = false
   },
 
   /**
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 4317760..62a9583 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -266,6 +266,10 @@ Page({
                 }
 
                 app.globalData.postProduct = product;
+
+                // 是否从购物车下单
+                app.globalData.isCartBuy = true;
+
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]
                 }
@@ -442,7 +446,9 @@ Page({
         app.globalData.productPrice = 0
         app.globalData.ticketPrice = 0
         app.globalData.product = null
+        app.globalData.isCartBuy = false
         this.data.productType = ''
+        app.globalData.isCartBuy = false
         console.log(app.globalData)
     },
 
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index 573bb1c..ff88633 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -261,6 +261,7 @@ Page({
       list:[]
     })
     this.getList()
+    app.globalData.isCartBuy = false
   },
 
   /**
diff --git a/pages/user/user.js b/pages/user/user.js
index 2986d71..1bbe1d2 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -89,6 +89,7 @@ Page({
       event:'mine_view'
     },1)
     this.getList()
+    app.globalData.isCartBuy = false
   },
   pagePoint: function(e){
     util.pagePoint(e)
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 5f410db..17216f0 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -39,6 +39,8 @@ Page({
     status:false,
 
     skuDays: 30,
+    
+    isCartBuy: false,
   },
 
   /**
@@ -59,6 +61,8 @@ Page({
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
       is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
+      isCartBuy:app.globalData.isCartBuy,
+
     })
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 6d08452..43b717d 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -21,8 +21,17 @@
       <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add"></view>
     </view>
   </view>
-  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" 
-  is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+
+  <view class="{{isCartBuy?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{isCartBuy}}">
+        <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
+        购买须知：使用优惠券的组合订单均不支持部分退款
+    </view>
+    <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" 
+    is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+  </view>
+
+
   <!-- 补贴 -->
   <view class="box">
     <view class="box-title allowance" wx:if="{{allowance_price}}">
diff --git a/subPackages/gwcOrder/index.wxss b/subPackages/gwcOrder/index.wxss
index 04cb740..f44ddc7 100644
--- a/subPackages/gwcOrder/index.wxss
+++ b/subPackages/gwcOrder/index.wxss
@@ -373,4 +373,25 @@ page {
     color: white;
     font-size: 36rpx;
     background: #D62828;
-  }
\ No newline at end of file
+  }
+  .warning-tip{
+    display: flex;
+    height: 67rpx;
+    background: #D62828;
+    border-radius: 9rpx 9rpx 0rpx 0rpx;
+    align-items: center;
+    font-weight: bold;
+    font-size: 27rpx;
+    color: #FFFFFF;
+    padding-left: 13rpx;
+    margin: 0 25rpx;
+}
+.warning-tip image{
+    width: 26.67rpx;
+    height: 26.67rpx;
+    margin-right: 12rpx;
+}
+.warning-container .box{
+    margin-top: 0;
+    border-radius: 0 0 9rpx 9rpx;
+}
\ No newline at end of file
diff --git a/subPackages/techanCart/index.js b/subPackages/techanCart/index.js
index 203f68d..8672d1e 100644
--- a/subPackages/techanCart/index.js
+++ b/subPackages/techanCart/index.js
@@ -372,6 +372,7 @@ Page({
         app.globalData.productPrice = 0
         app.globalData.ticketPrice = 0
         this.data.productType = ''
+        app.globalData.isCartBuy = false
     },
 
     /**
diff --git a/utils/https.js b/utils/https.js
index d55ab84..435b522 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -232,6 +232,7 @@ function user_post_new(url, data = {}, type) {
                     let app = getApp()
                     app.globalData.list = null;app.globalData.createDate = null;
                     app.globalData.index = 0;app.globalData.productPrice = 0;app.globalData.ticketPrice = 0;
+                    app.globalData.isCartBuy = false
                 } catch(e) {  console.log("清空购物车失败", e) }
 
               if (res.data.data.pay_status == 1) {

From b1abf4ee69f5c3b9847bded99803928563ecfb18 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Dec 2025 15:23:52 +0800
Subject: [PATCH 467/471] 1

---
 pages/order/coupon/index.js      | 62 ++++----------------------------
 pages/order/postOrder/index.wxml |  2 +-
 pages/order/scene/index.wxml     |  4 +--
 pages/user/cartlist/list.js      |  2 +-
 4 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index d52d3f4..5a3d7b1 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -8,11 +8,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-      noUseList: [],
     list:[],
-    moreFlag:true,
-
-    productList: [],
+    moreFlag:true
   },
 
   /**
@@ -20,75 +17,28 @@ Page({
    */
   
   onLoad: function (options) {
-    console.log(app.globalData.postProduct,app.globalData.list,app.globalData.product)
-    let sourceFrom = options.sourceFrom
-    let postList = app.globalData.postProduct || []
-    let ticketList = app.globalData.list || []
-    let signleProduct = app.globalData.product || null
-
-    let listData = []
-    // 门票类
-    if (sourceFrom == 'cart') {
-        ticketList.forEach(v=>{
-            listData.push({
-                sku_id: v.sku.id,
-                price: v.sku.price,
-                sell_price: v.sku.price,
-                num: v.num,
-                use_date: v.time&&v.time.sale_date?v.time.sale_date:''
-            })
-        })
-    } else {
-        if (signleProduct) {
-            listData.push({
-                sku_id: signleProduct.sku.id,
-                price: signleProduct.sku.price,
-                sell_price: signleProduct.sku.price,
-                num: signleProduct.productNum,
-                use_date: signleProduct.date&&signleProduct.date.date?signleProduct.date.date:''
-            })
-        }
-    }
-    // 特产类
-    postList.forEach(v=>{
-        listData.push({
-            sku_id: v.sku.id,
-            price: v.sku.price,
-            sell_price: v.sku.price,
-            num: v.productNum,
-        })
-    })
-
-    this.setData({
-        productList: listData
-    })
     this.getList(options)
   },
   getList:function(options){
     if(!this.data.moreFlag) return
-    commonApi.user_post('coupon/use_coupon_listv3',{
+    commonApi.user_post('coupon/use_coupon_list',{
       money:options.money,
-      sku_ids:options.sku,
-      cart_data: this.data.productList
+      sku_ids:options.sku
     }).then(res=>{
       res.data.map(item=>{
         item.selected = false;
       })
-
-
       this.setData({
-        list:res.data.filter(x=>x.can_use),
-        noUseList: res.data.filter(x=>!x.can_use),
+        list:res.data
       })
       this.getMaxC(options)
     })
   },
   //获取最高优惠
   getMaxC(options){
-    commonApi.user_post('coupon/use_max_coupon_listv2',{
+    commonApi.user_post('coupon/use_max_coupon_list',{
       money:options.money,
-      sku_ids:options.sku,
-      cart_data: this.data.productList
+      sku_ids:options.sku
     }).then(res=>{
       console.log(app.globalData.couponInfo);
 
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 02baf62..dd15e4b 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -36,7 +36,7 @@
     </view>
 
     <view class="sku-info-container">
-        <view class="warning-tip" wx:if="{{from=='cart'}}">
+        <view class="warning-tip" wx:if="{{from=='cart'&&coupon}}">
             <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
             购买须知：使用优惠券的组合订单均不支持部分退款
         </view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index e3b855d..dee95c0 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -58,8 +58,8 @@
     </view> -->
   </view>
 
-  <view class="{{isCartBuy?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{isCartBuy}}">
+  <view class="{{isCartBuy&&coupon?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{isCartBuy&&coupon}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 62a9583..73d672e 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -268,7 +268,7 @@ Page({
                 app.globalData.postProduct = product;
 
                 // 是否从购物车下单
-                app.globalData.isCartBuy = true;
+                // app.globalData.isCartBuy = true;
 
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]

From 7e41f047974379d14a00fbfac77cf19bf769470d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Dec 2025 15:29:52 +0800
Subject: [PATCH 468/471] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/coupon/index.js | 46 ++-------------------
 pages/order/coupon/index.wxml          | 57 +++++---------------------
 pages/order/coupon/index.wxss          | 43 +++----------------
 3 files changed, 19 insertions(+), 127 deletions(-)

diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 07c12e9..883a94b 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -26,11 +26,7 @@ Component({
           })
         }
       }
-    },
-    sourceFrom: {
-        type:String,
-        value:""
-    },
+    }
   },
 
   /**
@@ -67,45 +63,9 @@ Component({
         })
         this.triggerEvent('getNewCoupon',null);
       }else{
-        let postList = app.globalData.postProduct || []
-        let ticketList = app.globalData.list || []
-        let signleProduct = app.globalData.product || null
-    
-        let listData = []
-        if (this.properties.sourceFrom == 'cart') {
-            ticketList.forEach(v=>{
-                listData.push({
-                    sku_id: v.sku.id,
-                    price: v.sku.price,
-                    sell_price: v.sku.price,
-                    num: v.num,
-                    use_date: v.time&&v.time.sale_date?v.time.sale_date:''
-                })
-            })
-        } else {
-            if (signleProduct) {
-                listData.push({
-                    sku_id: signleProduct.sku.id,
-                    price: signleProduct.sku.price,
-                    sell_price: signleProduct.sku.price,
-                    num: signleProduct.productNum,
-                    use_date: signleProduct.date&&signleProduct.date.date?signleProduct.date.date:''
-                })
-            }
-        }
-        postList.forEach(v=>{
-            listData.push({
-                sku_id: v.sku.id,
-                price: v.sku.price,
-                sell_price: v.sku.price,
-                num: v.productNum,
-            })
-        })
-
-        commonApi.user_post('coupon/use_max_coupon_listv2',{
+        commonApi.user_post('coupon/use_max_coupon_list',{
           money:this.data.money,
-          sku_ids:this.data.sku,
-          cart_data: listData
+          sku_ids:this.data.sku
         }).then(res=>{
           if (app.globalData.couponInfo&&app.globalData.couponInfo.hasOwnProperty('SubCoupon')) {
             this.setData({
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index d164d7a..7bca12b 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -1,55 +1,20 @@
 <!--pages/order/coupon/index.wxml-->
 <title title="优惠券"></title>
-<view >
-<view wx:if="{{list.length>0}}" class="coupon-title">可使用红包 <text class="couon-date">{{list.length}}张</text></view>
-<view class="coupon-item-box" wx:for="{{list}}">
-    <view class="coupon-item" >
-        <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
-        <view class="money1" wx:else>
-        {{item.activity.fold}}
-        </view>
-        <view class="coupon-info">
-        <view>{{item.activity.name}}</view>
-        <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
-        </view>
-        <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
-        <view class="couon-date" wx:else>不可用</view>
-
+<view wx:if="{{list.length>0}}">
+  <view class="coupon-item" wx:for="{{list}}">
+    <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
+    <view class="money1" wx:else>
+      {{item.activity.fold}}
     </view>
-    <view class="no-reason" wx:if="{{!item.can_use}}">
-        <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
-        <view>{{item.reason}}</view>
+    <view class="coupon-info">
+      <view>{{item.activity.name}}</view>
+      <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
     </view>
-</view>
-
-<view wx:if="{{noUseList.length>0}}" class="coupon-title">不可使用红包 <text class="couon-date">{{noUseList.length}}张</text></view>
-<view class="coupon-item-box" wx:for="{{noUseList}}">
-    <view class="coupon-item" >
-        <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
-        <view class="money1" wx:else>
-        {{item.activity.fold}}
-        </view>
-        <view class="coupon-info">
-        <view>{{item.activity.name}}</view>
-        <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
-        </view>
-        <view wx:if="{{item.can_use}}" class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
-        <view class="couon-date" wx:else>不可用</view>
-
-        <view class="cover-no-use" wx:if="{{!item.can_use}}"></view>
-    </view>
-    <view class="no-reason" wx:if="{{!item.can_use}}">
-        <view style="color: #D62828;margin-bottom: 8rpx;">不可用原因</view>
-        <view>{{item.reason}}</view>
-    </view>
-</view>
-
-
-
-
+    <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
+  </view>
   <view class="btn" bindtap="submit">确定</view>
 </view>
-<view class="common-empty" wx:if="{{list.length==0&&noUseList.length==0}}" style="z-index:-1;top:0">
+<view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
   <image lazy-load 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/order/coupon/index.wxss b/pages/order/coupon/index.wxss
index e76b95a..a8cfad0 100644
--- a/pages/order/coupon/index.wxss
+++ b/pages/order/coupon/index.wxss
@@ -2,27 +2,20 @@
 page {
   background: #f6f6f6;
 }
-.coupon-item-box{
-    width: 700rpx;
-    margin: 26rpx auto;
-    background: white;
-    border-radius: 7rpx;
-    box-sizing: border-box;
-    padding:0 26rpx;
-}
-
 .coupon-item {
-    width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
-    position: relative;
+  margin: 26rpx;
+  background: white;
+  border-radius: 7rpx;
   height: 136rpx;
+  padding-right: 27rpx;
 }
 .coupon-item .money {
   color: #D62828;
   font-size: 67rpx;
-  width: 147rpx;
+  width: 187rpx;
   text-align: center;
   font-weight: 500;
   flex-shrink: 0;
@@ -75,30 +68,4 @@ page {
   font-size: 36rpx;
   font-weight: 500;
   text-align: center;
-}
-
-.no-reason{
-    width: 100%;
-    border-top: 1px dashed #e0e0e0;
-    padding: 20rpx 0;
-    color: #666;
-    font-size: 24rpx;
-    box-sizing: border-box;
-}
-
-.cover-no-use{
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    width: 100%;
-    height: 100;
-    opacity: 0.5;
-    background: white;
-}
-.coupon-title{
-    padding: 26rpx 26rpx 0;
-    width: 100%;
-    box-sizing: border-box;
 }
\ No newline at end of file

From 55313e3a3c7b80c1f73d374e3521d6f93a47f0b9 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 10 Dec 2025 15:37:23 +0800
Subject: [PATCH 469/471] 1

---
 app.js                           | 2 +-
 pages/order/orderList/index.wxml | 4 ++--
 pages/order/postOrder/index.wxml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index c4dc4ce..6dce1b2 100644
--- a/app.js
+++ b/app.js
@@ -39,7 +39,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest158? true : false;
+            data.isTest = data.isTest159? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index cee8f3e..4da2ce1 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,10 +1,10 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="订单列表"></title>
 
-<view class="warning-tip">
+<!-- <view class="warning-tip" >
     <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
     购买须知：使用优惠券的组合订单均不支持部分退款
-</view>
+</view> -->
 
 <!-- 邮寄 -->
 <view class="box" wx:if="{{postList.length != 0}}">
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index dd15e4b..8862eb3 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -36,7 +36,7 @@
     </view>
 
     <view class="sku-info-container">
-        <view class="warning-tip" wx:if="{{from=='cart'&&coupon}}">
+        <view class="warning-tip" wx:if="{{false}}">
             <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
             购买须知：使用优惠券的组合订单均不支持部分退款
         </view>

From b1a7bbe34c8bdc3ae200923e2ce9269ce7980445 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Dec 2025 13:12:24 +0800
Subject: [PATCH 470/471] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8F=90=E6=96=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/order/orderList/index.wxml | 4 ++--
 pages/order/postOrder/index.wxml | 2 +-
 pages/order/scene/index.wxml     | 4 ++--
 pages/user/cartlist/list.js      | 2 +-
 subPackages/feiyiNew/index.js    | 3 +++
 subPackages/gwcOrder/index.wxml  | 4 ++--
 subPackages/postSearch/index.js  | 3 +++
 subPackages/techanCart/index.js  | 2 ++
 subPackages/techanNew/index.js   | 3 +++
 10 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 6dce1b2..c4dc4ce 100644
--- a/app.js
+++ b/app.js
@@ -39,7 +39,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest159? true : false;
+            data.isTest = data.isTest158? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 4da2ce1..85f9a82 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,10 +1,10 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="订单列表"></title>
 
-<!-- <view class="warning-tip" >
+<view class="warning-tip" wx:if="{{coupon}}">
     <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
     购买须知：使用优惠券的组合订单均不支持部分退款
-</view> -->
+</view>
 
 <!-- 邮寄 -->
 <view class="box" wx:if="{{postList.length != 0}}">
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 8862eb3..7b8cb56 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -36,7 +36,7 @@
     </view>
 
     <view class="sku-info-container">
-        <view class="warning-tip" wx:if="{{false}}">
+        <view class="warning-tip" wx:if="{{flag=='mix'||(from=='cart'&&coupon)}}">
             <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
             购买须知：使用优惠券的组合订单均不支持部分退款
         </view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index dee95c0..8cfeeb6 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -58,8 +58,8 @@
     </view> -->
   </view>
 
-  <view class="{{isCartBuy&&coupon?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{isCartBuy&&coupon}}">
+  <view class="{{flag=='mix'||(isCartBuy&&coupon)?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{flag=='mix'||(isCartBuy&&coupon)}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 73d672e..62a9583 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -268,7 +268,7 @@ Page({
                 app.globalData.postProduct = product;
 
                 // 是否从购物车下单
-                // app.globalData.isCartBuy = true;
+                app.globalData.isCartBuy = true;
 
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index eb5bb0d..f6a0d7b 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -311,6 +311,8 @@ Page({
             })
             console.log(product1);
             app.globalData.postProduct = product;
+            // 是否从购物车下单
+            app.globalData.isCartBuy = true;
             if (app.globalData.list) {
                 app.globalData.product = app.globalData.list[app.globalData.index]
             }
@@ -763,6 +765,7 @@ Page({
     //   flag:true
     // })
     // this.getList()
+    app.globalData.isCartBuy = true;
   },
 
   /**
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 43b717d..77e5023 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -22,8 +22,8 @@
     </view>
   </view>
 
-  <view class="{{isCartBuy?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{isCartBuy}}">
+  <view class="{{isCartBuy&&coupon?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{isCartBuy&&coupon}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
index 0ca1297..33307ae 100644
--- a/subPackages/postSearch/index.js
+++ b/subPackages/postSearch/index.js
@@ -246,6 +246,8 @@ Page({
             })
           console.log(product1);
           app.globalData.postProduct = product;
+          // 是否从购物车下单
+          app.globalData.isCartBuy = true;
           if (app.globalData.list) {
               app.globalData.product = app.globalData.list[app.globalData.index]
           }
@@ -592,6 +594,7 @@ openPopup() {
     })
     this.getHeight()
     this.getCount()
+    app.globalData.isCartBuy = true;
   },
 
   /**
diff --git a/subPackages/techanCart/index.js b/subPackages/techanCart/index.js
index 8672d1e..dade9f1 100644
--- a/subPackages/techanCart/index.js
+++ b/subPackages/techanCart/index.js
@@ -209,6 +209,8 @@ Page({
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]
                 }
+                // 是否从购物车下单
+                app.globalData.isCartBuy = true;
                 if (this.data.productType == 'post') {
                     console.log(this.data.flag);
                     wx.navigateTo({
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index ffa6c76..7557f50 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -325,6 +325,8 @@ Page({
             if (app.globalData.list) {
                 app.globalData.product = app.globalData.list[app.globalData.index]
             }
+            // 是否从购物车下单
+            app.globalData.isCartBuy = true;
             wx.navigateTo({
               url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
           })
@@ -783,6 +785,7 @@ Page({
       // debugger
       this.getCount()
     }
+    app.globalData.isCartBuy = true;
     // debugger
   },
 

From 2421f96c5cf47665fa1881941222a56f95a8042b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Dec 2025 13:12:28 +0800
Subject: [PATCH 471/471] 1

---
 app.js                           | 2 +-
 pages/order/postOrder/index.wxml | 3 +--
 pages/order/scene/index.wxml     | 4 ++--
 subPackages/feiyiNew/index.js    | 3 ++-
 subPackages/gwcOrder/index.wxml  | 4 ++--
 subPackages/postSearch/index.js  | 3 ++-
 subPackages/techanNew/index.js   | 3 ++-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index c4dc4ce..6dce1b2 100644
--- a/app.js
+++ b/app.js
@@ -39,7 +39,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest158? true : false;
+            data.isTest = data.isTest159? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 7b8cb56..582fcf4 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -1,6 +1,5 @@
 <!--pages/order/post/index.wxml-->
 <title title="订单填写"></title>
-
 <view class="box topbox" wx:for="{{product}}" wx:key="index">
     <!-- 选择配送方式 -->
     <view class="sendwayArea" wx:if="{{from!='cart'}}">
@@ -36,7 +35,7 @@
     </view>
 
     <view class="sku-info-container">
-        <view class="warning-tip" wx:if="{{flag=='mix'||(from=='cart'&&coupon)}}">
+        <view class="warning-tip" wx:if="{{flag=='mix'||(from=='cart'&&coupon&&product.length>1)}}">
             <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
             购买须知：使用优惠券的组合订单均不支持部分退款
         </view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 8cfeeb6..dbadf31 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -58,8 +58,8 @@
     </view> -->
   </view>
 
-  <view class="{{flag=='mix'||(isCartBuy&&coupon)?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{flag=='mix'||(isCartBuy&&coupon)}}">
+  <view class="{{flag=='mix'?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{flag=='mix'}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index f6a0d7b..12910fc 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -765,7 +765,8 @@ Page({
     //   flag:true
     // })
     // this.getList()
-    app.globalData.isCartBuy = true;
+    app.globalData.isCartBuy = false;
+    app.globalData.listName = null
   },
 
   /**
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 77e5023..43b717d 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -22,8 +22,8 @@
     </view>
   </view>
 
-  <view class="{{isCartBuy&&coupon?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{isCartBuy&&coupon}}">
+  <view class="{{isCartBuy?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{isCartBuy}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
index 33307ae..750c19b 100644
--- a/subPackages/postSearch/index.js
+++ b/subPackages/postSearch/index.js
@@ -594,7 +594,8 @@ openPopup() {
     })
     this.getHeight()
     this.getCount()
-    app.globalData.isCartBuy = true;
+    app.globalData.isCartBuy = false;
+    app.globalData.listName = null
   },
 
   /**
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index 7557f50..717122a 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -785,7 +785,8 @@ Page({
       // debugger
       this.getCount()
     }
-    app.globalData.isCartBuy = true;
+    app.globalData.isCartBuy = false;
+    app.globalData.listName = null
     // debugger
   },